Thread (35 messages) 35 messages, 8 authors, 2019-02-19

Re: [PATCH 01/11] powerpc: remove dead ifdefs in <asm/checksum.h>

From: Christophe Leroy <hidden>
Date: 2019-02-14 08:26:23
Also in: linux-kbuild, linux-riscv, linux-s390, lkml


Le 13/02/2019 à 18:39, Christoph Hellwig a écrit :
__KERNEL__ is never not defined for non-uapi headers, and GENERIC_CSUM
isn't ever set for powerpc either.
GENERIC_CSUM was abandonned by commit d4fde568a34a ("powerpc/64: Use 
optimized checksum routines on little-endian")

Could you also remove the 'config GENERIC_CSUM' item in 
arch/powerpc/Kconfig ?

Christophe
quoted hunk ↗ jump to hunk
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 */
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help