[PATCH 01/11] powerpc: remove dead ifdefs in <asm/checksum.h>
From: Christoph Hellwig <hch@lst.de>
Date: 2019-02-13 17:40:21
Also in:
linux-kbuild, linux-riscv, linux-s390, lkml
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Michael Ellerman, Linus Torvalds
__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