diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2014-03-03 04:44:03 -0500 |
|---|---|---|
| committer | Heiko Carstens <heiko.carstens@de.ibm.com> | 2014-03-04 03:05:33 -0500 |
| commit | 0473c9b5f05948df780bbc7b996dd7aefc4ec41d (patch) | |
| tree | 3413bbef3bcaa444bb051f7a9c9de9579d0e0374 /include | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
compat: let architectures define __ARCH_WANT_COMPAT_SYS_GETDENTS64
For architecture dependent compat syscalls in common code an architecture
must define something like __ARCH_WANT_<WHATEVER> if it wants to use the
code.
This however is not true for compat_sys_getdents64 for which architectures
must define __ARCH_OMIT_COMPAT_SYS_GETDENTS64 if they do not want the code.
This leads to the situation where all architectures, except mips, get the
compat code but only x86_64, arm64 and the generic syscall architectures
actually use it.
So invert the logic, so that architectures actively must do something to
get the compat code.
This way a couple of architectures get rid of otherwise dead code.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/compat.h | 2 | ||||
| -rw-r--r-- | include/uapi/asm-generic/unistd.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index 3f448c65511b..beded18f992d 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h | |||
| @@ -502,9 +502,11 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd, | |||
| 502 | asmlinkage long compat_sys_getdents(unsigned int fd, | 502 | asmlinkage long compat_sys_getdents(unsigned int fd, |
| 503 | struct compat_linux_dirent __user *dirent, | 503 | struct compat_linux_dirent __user *dirent, |
| 504 | unsigned int count); | 504 | unsigned int count); |
| 505 | #ifdef __ARCH_WANT_COMPAT_SYS_GETDENTS64 | ||
| 505 | asmlinkage long compat_sys_getdents64(unsigned int fd, | 506 | asmlinkage long compat_sys_getdents64(unsigned int fd, |
| 506 | struct linux_dirent64 __user *dirent, | 507 | struct linux_dirent64 __user *dirent, |
| 507 | unsigned int count); | 508 | unsigned int count); |
| 509 | #endif | ||
| 508 | asmlinkage long compat_sys_vmsplice(int fd, const struct compat_iovec __user *, | 510 | asmlinkage long compat_sys_vmsplice(int fd, const struct compat_iovec __user *, |
| 509 | unsigned int nr_segs, unsigned int flags); | 511 | unsigned int nr_segs, unsigned int flags); |
| 510 | asmlinkage long compat_sys_open(const char __user *filename, int flags, | 512 | asmlinkage long compat_sys_open(const char __user *filename, int flags, |
diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index dde8041f40d2..6db66783d268 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h | |||
| @@ -191,6 +191,7 @@ __SYSCALL(__NR_quotactl, sys_quotactl) | |||
| 191 | 191 | ||
| 192 | /* fs/readdir.c */ | 192 | /* fs/readdir.c */ |
| 193 | #define __NR_getdents64 61 | 193 | #define __NR_getdents64 61 |
| 194 | #define __ARCH_WANT_COMPAT_SYS_GETDENTS64 | ||
| 194 | __SC_COMP(__NR_getdents64, sys_getdents64, compat_sys_getdents64) | 195 | __SC_COMP(__NR_getdents64, sys_getdents64, compat_sys_getdents64) |
| 195 | 196 | ||
| 196 | /* fs/read_write.c */ | 197 | /* fs/read_write.c */ |
