epoll: fix compat syscall wire up of epoll_pwait2

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Commit b0a0c2615f6f ("epoll: wire up syscall epoll_pwait2") wired up
the 64 bit syscall instead of the compat variant in a couple of places.

Fixes: b0a0c2615f6f ("epoll: wire up syscall epoll_pwait2")
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: Willem de Bruijn <willemb@google.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Heiko Carstens and committed by

Linus Torvalds 5 years ago 450f68e2 467f8165

+4 -4

4 changed files

expand all

arch

arm64

include

asm

unistd32.h

mips

kernel

syscalls

syscall_n32.tbl

s390

kernel

syscalls

syscall.tbl

sparc

kernel

syscalls

syscall.tbl

+1 -1

arch/arm64/include/asm/unistd32.h

··· 890 890 #define __NR_process_madvise 440 891 891 __SYSCALL(__NR_process_madvise, sys_process_madvise) 892 892 #define __NR_epoll_pwait2 441 893 - __SYSCALL(__NR_epoll_pwait2, sys_epoll_pwait2) 893 + __SYSCALL(__NR_epoll_pwait2, compat_sys_epoll_pwait2) 894 894 895 895 /* 896 896 * Please add new compat syscalls above this comment and update

+1 -1

arch/mips/kernel/syscalls/syscall_n32.tbl

··· 379 379 438 n32 pidfd_getfd sys_pidfd_getfd 380 380 439 n32 faccessat2 sys_faccessat2 381 381 440 n32 process_madvise sys_process_madvise 382 - 441 n32 epoll_pwait2 sys_epoll_pwait2 382 + 441 n32 epoll_pwait2 compat_sys_epoll_pwait2

+1 -1

arch/s390/kernel/syscalls/syscall.tbl

··· 443 443 438 common pidfd_getfd sys_pidfd_getfd sys_pidfd_getfd 444 444 439 common faccessat2 sys_faccessat2 sys_faccessat2 445 445 440 common process_madvise sys_process_madvise sys_process_madvise 446 - 441 common epoll_pwait2 sys_epoll_pwait2 sys_epoll_pwait2 446 + 441 common epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2

+1 -1

arch/sparc/kernel/syscalls/syscall.tbl

··· 486 486 438 common pidfd_getfd sys_pidfd_getfd 487 487 439 common faccessat2 sys_faccessat2 488 488 440 common process_madvise sys_process_madvise 489 - 441 common epoll_pwait2 sys_epoll_pwait2 489 + 441 common epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2