diff options
| author | David S. Miller <davem@davemloft.net> | 2020-07-19 18:16:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-19 18:16:41 -0700 |
| commit | 9aa0dfe1fc9920ad2224b53f9be748c030f0a12e (patch) | |
| tree | 1bf043e2d02b8e00b1d54952b3e3799b1be79efa /include/uapi | |
| parent | 089377b7e8e70f00c2290b00cb0024cc6e165a7d (diff) | |
| parent | a44d9e72100f7044ac46e4e6dc475f5b4097830f (diff) | |
| download | cachepc-linux-9aa0dfe1fc9920ad2224b53f9be748c030f0a12e.tar.gz cachepc-linux-9aa0dfe1fc9920ad2224b53f9be748c030f0a12e.zip | |
Merge branch 'sockopt-cleanups'
Christoph Hellwig says:
====================
sockopt cleanups
this series cleans up various lose ends in the sockopt code, most
importantly removing the compat_{get,set}sockopt infrastructure in favor
of just using in_compat_syscall() in the few places that care.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/asm-generic/unistd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index f4a01305d9a6..c8c189a5f0a6 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -606,9 +606,9 @@ __SYSCALL(__NR_sendto, sys_sendto) #define __NR_recvfrom 207 __SC_COMP(__NR_recvfrom, sys_recvfrom, compat_sys_recvfrom) #define __NR_setsockopt 208 -__SC_COMP(__NR_setsockopt, sys_setsockopt, compat_sys_setsockopt) +__SC_COMP(__NR_setsockopt, sys_setsockopt, sys_setsockopt) #define __NR_getsockopt 209 -__SC_COMP(__NR_getsockopt, sys_getsockopt, compat_sys_getsockopt) +__SC_COMP(__NR_getsockopt, sys_getsockopt, sys_getsockopt) #define __NR_shutdown 210 __SYSCALL(__NR_shutdown, sys_shutdown) #define __NR_sendmsg 211 |