compat: always include linux/compat.h from net/compat.h
Subsystems (2)
Jakub Kicinski
maintainerPATCH v2 1/1 compat: always include linux/compat.h from net/compat.h
We're about to do reshuffling in networking headers and eliminate some implicit includes. This results in:
In file included from ../net/ipv4/netfilter/arp_tables.c:26:include/net/compat.h:60:40: error: unknown type name ‘compat_uptr_t’; did you mean ‘compat_ptr_ioctl’?
struct sockaddr __user **save_addr, compat_uptr_t *ptr,
^~~~~~~~~~~~~
compat_ptr_ioctlinclude/net/compat.h:61:4: error: unknown type name ‘compat_size_t’; did you mean ‘compat_sigset_t’?
compat_size_t *len);
^~~~~~~~~~~~~
compat_sigset_tCurrently net/compat.h depends on linux/compat.h being included first. After the upcoming changes this would break the 32bit build.
--
v2:
- correct the commit message
- remove the ifdef completely (Arnd)
--- include/net/compat.h | 10 ---------- 1 file changed, 10 deletions(-)
include/net/compat.h +0 -10
@@ -5,8 +5,6 @@struct sock ; -#if defined(CONFIG_COMPAT ) -#include <linux/compat.h> struct compat_msghdr {
@@ -48,14 +46,6 @@ struct compat_rtentry {unsigned short rt_irtt;/* Initial RTT */ }; -#else /* defined(CONFIG_COMPAT) */ -/* -* To avoid compiler warnings: -*/ -#define compat_msghdr msghdr -#define compat_mmsghdr mmsghdr -#endif /* defined(CONFIG_COMPAT) */ -int __get_compat_msghdr (struct msghdr *kmsg,struct compat_msghdr __user *umsg,struct sockaddr __user **save_addr,compat_uptr_t *ptr,compat_size_t *len);
Signature · 1 line
2.24.1
Quoted 10 lines · Jakub Kicinski
We're about to do reshuffling in networking headers and eliminate some implicit includes. This results in:
In file included from
../net/ipv4/netfilter/arp_tables.c:26:include/net/compat.h:60:40: error: unknown type name ‘compat_uptr_t’; did you mean ‘compat_ptr_ioctl’?
struct sockaddr__user**save_addr,compat_uptr_t*ptr,
^~~~~~~~~~~~~
compat_ptr_ioctlinclude/net/compat.h:61:4: error: unknown type name ‘compat_size_t’; did you mean ‘compat_sigset_t’?
Quoted 8 lines
compat_size_t *len); ^~~~~~~~~~~~~ compat_sigset_tCurrently
net/compat.hdepends onlinux/compat.hbeing included first. After the upcoming changes this would break the 32bit build.Signed-off-by Jakub Kicinski <[email protected]>
Looks good,
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 9 lines · On Sat, 21 Nov 2020 13:48:44 -0800 you wrote:
We're about to do reshuffling in networking headers and eliminate some implicit includes. This results in:
In file included from
../net/ipv4/netfilter/arp_tables.c:26:include/net/compat.h:60:40: error: unknown type name ‘compat_uptr_t’; did you mean ‘compat_ptr_ioctl’?
struct sockaddr__user**save_addr,compat_uptr_t*ptr,
^~~~~~~~~~~~~
compat_ptr_ioctlinclude/net/compat.h:61:4: error: unknown type name ‘compat_size_t’; did you mean ‘compat_sigset_t’?
Quoted 5 lines
compat_size_t *len); ^~~~~~~~~~~~~ compat_sigset_t[...]
Here is the summary with links:
- [net-next,v2] compat: always include linux/compat.h from net/compat.h
https://git.kernel.org/netdev/net-next/c/fc0d3b24bdb7
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html