linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: linux-xtensa@linux-xtensa.org, linux-s390@vger.kernel.org,
	linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-riscv@lists.infradead.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 01/11] powerpc: remove dead ifdefs in <asm/checksum.h>
Date: Wed, 13 Feb 2019 18:39:55 +0100	[thread overview]
Message-ID: <20190213174005.28785-2-hch@lst.de> (raw)
In-Reply-To: <20190213174005.28785-1-hch@lst.de>

__KERNEL__ is never not defined for non-uapi headers, and GENERIC_CSUM
isn't ever set for powerpc either.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 arch/powerpc/include/asm/checksum.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/arch/powerpc/include/asm/checksum.h b/arch/powerpc/include/asm/checksum.h
index a78a57e5058d..37c309500260 100644
--- a/arch/powerpc/include/asm/checksum.h
+++ b/arch/powerpc/include/asm/checksum.h
@@ -1,6 +1,5 @@
 #ifndef _ASM_POWERPC_CHECKSUM_H
 #define _ASM_POWERPC_CHECKSUM_H
-#ifdef __KERNEL__
 
 /*
  * This program is free software; you can redistribute it and/or
@@ -9,9 +8,6 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#ifdef CONFIG_GENERIC_CSUM
-#include <asm-generic/checksum.h>
-#else
 #include <linux/bitops.h>
 #include <linux/in6.h>
 /*
@@ -217,6 +213,4 @@ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
 			const struct in6_addr *daddr,
 			__u32 len, __u8 proto, __wsum sum);
 
-#endif
-#endif /* __KERNEL__ */
-#endif
+#endif /* _ASM_POWERPC_CHECKSUM_H */
-- 
2.20.1


  reply	other threads:[~2019-02-13 17:44 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-13 17:39 consolidate a few more arch support config options Christoph Hellwig
2019-02-13 17:39 ` Christoph Hellwig [this message]
2019-02-14  8:26   ` [PATCH 01/11] powerpc: remove dead ifdefs in <asm/checksum.h> Christophe Leroy
2019-02-14 17:05     ` Christoph Hellwig
2019-02-15  8:17       ` Christophe Leroy
2019-02-15  9:30         ` Masahiro Yamada
2019-02-14  8:54   ` Andreas Schwab
2019-02-13 17:39 ` [PATCH 02/11] riscv: remove the HAVE_KPROBES option Christoph Hellwig
2019-02-15  9:32   ` Masahiro Yamada
2019-02-19 15:17     ` Christoph Hellwig
2019-02-19 21:55       ` Palmer Dabbelt
2019-02-13 17:39 ` [PATCH 03/11] kernel/locks: consolidate RWSEM_GENERIC_* options Christoph Hellwig
2019-02-14  8:10   ` Geert Uytterhoeven
2019-02-14 10:52   ` Geert Uytterhoeven
2019-02-14 15:26     ` Waiman Long
2019-02-14 17:04       ` Christoph Hellwig
2019-02-14 17:24         ` Waiman Long
2019-02-13 17:39 ` [PATCH 04/11] tracing: consolidate the STACKTRACE_SUPPORT symbol Christoph Hellwig
2019-02-13 17:39 ` [PATCH 05/11] tracing: consolidate the TRACE_IRQFLAGS_SUPPORT symbol Christoph Hellwig
2019-02-15  7:55   ` Masahiro Yamada
2019-02-19  1:40     ` Ley Foon Tan
2019-02-13 17:40 ` [PATCH 06/11] lockdep: consolidate the LOCKDEP_SUPPORT symbol Christoph Hellwig
2019-02-15  7:16   ` Masahiro Yamada
2019-02-15  7:58     ` Greentime Hu
2019-02-13 17:40 ` [PATCH 07/11] init: consolidate the GENERIC_CALIBRATE_DELAY symbol Christoph Hellwig
2019-02-14  8:11   ` Geert Uytterhoeven
2019-02-13 17:40 ` [PATCH 08/11] lib: consolidate the GENERIC_BUG symbol Christoph Hellwig
2019-02-15  8:42   ` Masahiro Yamada
2019-02-13 17:40 ` [PATCH 09/11] lib: consolidate the GENERIC_CSUM symbol Christoph Hellwig
2019-02-14  8:12   ` Geert Uytterhoeven
2019-02-15  8:03   ` Masahiro Yamada
2019-02-13 17:40 ` [PATCH 10/11] lib: consolidate the GENERIC_HWEIGHT symbol Christoph Hellwig
2019-02-14  8:13   ` Geert Uytterhoeven
2019-02-18  3:06   ` Masahiro Yamada
2019-02-13 17:40 ` [PATCH 11/11] s390: don't redefined the HAS_IOMEM symbol Christoph Hellwig
2019-02-15  7:44   ` Masahiro Yamada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190213174005.28785-2-hch@lst.de \
    --to=hch@lst.de \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=linux-xtensa@linux-xtensa.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=yamada.masahiro@socionext.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).