Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp16492rdb; Mon, 4 Dec 2023 18:24:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IFbX6xZYPECVmlc8WV9UXGCQLMlyVuCgOOy/6VT6mmHF0p2Rgn3NtclZWmqPL5YNi0LfP38 X-Received: by 2002:aca:1b0c:0:b0:3b8:45cf:9b2 with SMTP id b12-20020aca1b0c000000b003b845cf09b2mr5175971oib.20.1701743098457; Mon, 04 Dec 2023 18:24:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701743098; cv=none; d=google.com; s=arc-20160816; b=LFBY0Uu6nggUKN7q7945dmAcHEHNW17cL8lt+UqOuyuEeDt4PYYZh8/3hT3XLy5uad dVlcrNs2rRO7HV0wM0UR/dwQCDfB4yX5x9J/rJKjDWx2xJcfSbD/pZS/Aa5Z/oMvNZP1 EEeK+UV+qxiEOA1RBHctdw1xES0pqLEfRcMNl/2twh7J9TTOS5RurYcmdGobIGG8u3bP gkrT0A0lxknFL7x9iyVyVym8f2umZDgkTtOWReElKSTCsHQzFf7XpPRJqcYkBnbbrcbO O1Q8s1Pl5hzFFQ71ObfAwZKDzg1xu8fjfuCfZsf1sNgx3/QkvXBjPkUYq7Cs/IW6Ac+3 EPeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+ftBbukfbbgB/3/4QoTvmiqqpacNNyeFRNlaZmcdRVg=; fh=DgGXwGbnyiv1Rvt/NkXbEKOXDvWVLBCb4IpCdacEJoI=; b=XQNzCbkAv660+0Voo83yiOe2ihFIF8+6MA/+mw+e2sbvkVhA129YhbjQOZWH/4zxSa ptN5JHgisVtBzPCusy1Bsv8hdzup4HL1vs0yHX/K2XxOOUZBp7Xx0OGlehjykPhjcDwL MjPVmbKD7y8iUPx/dJjKyashEJFsT5kSVkIFTQBmd46c9L9fVANaNny639x5vx86oF4Z +xbU+pj5DFdsS1hZUAJlFKWW5S/X1Bonfk5tlSC7aUwHO36DqzC4D00mDqr2tadirNo5 xZyScGCl6KXTCzJjtwFbwE9flKn93ACeI3Xg819Mf0vcSm7fSGFY69DXrSrka+lfDGRC nGmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.org.uk header.s=zeniv-20220401 header.b=ftqyCDwP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zeniv.linux.org.uk Return-Path: Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id i4-20020a63cd04000000b005c663eae37asi4660464pgg.252.2023.12.04.18.24.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:24:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.org.uk header.s=zeniv-20220401 header.b=ftqyCDwP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zeniv.linux.org.uk Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 5B0D18021B38; Mon, 4 Dec 2023 18:24:54 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346337AbjLECY3 (ORCPT + 99 others); Mon, 4 Dec 2023 21:24:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343982AbjLECYR (ORCPT ); Mon, 4 Dec 2023 21:24:17 -0500 Received: from zeniv.linux.org.uk (zeniv.linux.org.uk [IPv6:2a03:a000:7:0:5054:ff:fe1c:15ff]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A014F11F; Mon, 4 Dec 2023 18:24:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=linux.org.uk; s=zeniv-20220401; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=+ftBbukfbbgB/3/4QoTvmiqqpacNNyeFRNlaZmcdRVg=; b=ftqyCDwPPLwgkHLsUwmdm5vWdw 3X8jVP2KGrZwzU8ISQlnPaZR+3nV/h0rwQIbnwWAHv1JjQIguquG0DAAe0sUN9N8xt5/zXi4eki8X 5Kh6Y7Pfu7JuId3EUU+4h99/T757qoM7cEDBC4akHwXD2q9dUa9HQU87f2XAv0PFWsb2K/IZChimn CJYFuYkIe0OAGcQ6GhZBSkfItbtxgyBjxz+xF18eDfYyGKlSkQsp/iC8N8JSQdwZ39MnvdxcbYuF2 h9ksaoDjqeqHqVYtW9jA9j4+Mij2xp6Nlz0H0vCfOtI4g/S4pijHmS6oZ2IxnLqQJw2z5eC2Yfod4 ++f++LEQ==; Received: from viro by zeniv.linux.org.uk with local (Exim 4.96 #2 (Red Hat Linux)) id 1rAL6j-007937-2f; Tue, 05 Dec 2023 02:24:21 +0000 From: Al Viro To: linux-arch@vger.kernel.org Cc: gus Gusenleitner Klaus , Al Viro , Thomas Gleixner , lkml , Ingo Molnar , "bp@alien8.de" , "dave.hansen@linux.intel.com" , "x86@kernel.org" , "David S. Miller" , "dsahern@kernel.org" , "kuba@kernel.org" , Paolo Abeni , Eric Dumazet Subject: [PATCH v2 09/18] mips: pull include of asm-generic/checksum.h out of #if Date: Tue, 5 Dec 2023 02:24:08 +0000 Message-Id: <20231205022418.1703007-17-viro@zeniv.linux.org.uk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231205022418.1703007-1-viro@zeniv.linux.org.uk> References: <20231205022100.GB1674809@ZenIV> <20231205022418.1703007-1-viro@zeniv.linux.org.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Al Viro X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 04 Dec 2023 18:24:54 -0800 (PST) Signed-off-by: Al Viro --- arch/mips/include/asm/checksum.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/mips/include/asm/checksum.h b/arch/mips/include/asm/checksum.h index 1e49fd107da1..061b56163668 100644 --- a/arch/mips/include/asm/checksum.h +++ b/arch/mips/include/asm/checksum.h @@ -12,9 +12,7 @@ #ifndef _ASM_CHECKSUM_H #define _ASM_CHECKSUM_H -#ifdef CONFIG_GENERIC_CSUM -#include -#else +#ifndef CONFIG_GENERIC_CSUM #include @@ -237,7 +235,8 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, return csum_fold(sum); } -#include #endif /* CONFIG_GENERIC_CSUM */ +#include + #endif /* _ASM_CHECKSUM_H */ -- 2.39.2