diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-01-25 23:14:16 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-01-27 11:19:46 +0000 |
| commit | 68f4eae781dd25aca2eb84ca2279663689db8d19 (patch) | |
| tree | be273fafd19473e4cf587cbe588512557ff752d5 | |
| parent | 9a859da287870715a22ce05d6ae377ae8ac79cc3 (diff) | |
| download | linux-next-68f4eae781dd25aca2eb84ca2279663689db8d19.tar.gz | |
net: checksum: drop the linux/uaccess.h include
net/checksum.h pulls in linux/uaccess.h which is large.
In the x86 header the include seems to not be needed at all.
ARM on the other hand does not include uaccess.h, even tho
it calls access_ok().
In the generic implementation guard the include of linux/uaccess.h
with the same condition as the code that needs it.
With this change pre-processed net/checksum.h shrinks on x86
from 30616 lines to just 1193.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/arm/include/asm/checksum.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/checksum_64.h | 1 | ||||
| -rw-r--r-- | include/net/checksum.h | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h index f0f54aef3724..d8a13959bff0 100644 --- a/arch/arm/include/asm/checksum.h +++ b/arch/arm/include/asm/checksum.h @@ -11,6 +11,7 @@ #define __ASM_ARM_CHECKSUM_H #include <linux/in6.h> +#include <linux/uaccess.h> /* * computes the checksum of a memory block at buff, length len, diff --git a/arch/x86/include/asm/checksum_64.h b/arch/x86/include/asm/checksum_64.h index 407beebadaf4..4d4a47a3a8ab 100644 --- a/arch/x86/include/asm/checksum_64.h +++ b/arch/x86/include/asm/checksum_64.h @@ -9,7 +9,6 @@ */ #include <linux/compiler.h> -#include <linux/uaccess.h> #include <asm/byteorder.h> /** diff --git a/include/net/checksum.h b/include/net/checksum.h index 6bc783b7a06c..1338cb92c8e7 100644 --- a/include/net/checksum.h +++ b/include/net/checksum.h @@ -18,8 +18,10 @@ #include <linux/errno.h> #include <asm/types.h> #include <asm/byteorder.h> -#include <linux/uaccess.h> #include <asm/checksum.h> +#if !defined(_HAVE_ARCH_COPY_AND_CSUM_FROM_USER) || !defined(HAVE_CSUM_COPY_USER) +#include <linux/uaccess.h> +#endif #ifndef _HAVE_ARCH_COPY_AND_CSUM_FROM_USER static __always_inline |