]> git.baikalelectronics.ru Git - kernel.git/commitdiff
epoll: fix compat syscall wire up of epoll_pwait2
authorHeiko Carstens <hca@linux.ibm.com>
Sun, 20 Dec 2020 09:58:30 +0000 (10:58 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Dec 2020 18:01:38 +0000 (10:01 -0800)
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>
arch/arm64/include/asm/unistd32.h
arch/mips/kernel/syscalls/syscall_n32.tbl
arch/s390/kernel/syscalls/syscall.tbl
arch/sparc/kernel/syscalls/syscall.tbl

index f4bca2b90218c89e8355dc1c3131d1f4ffccf270..cccfbbefbf952e2c37d3cb39e046a3877df40638 100644 (file)
@@ -890,7 +890,7 @@ __SYSCALL(__NR_faccessat2, sys_faccessat2)
 #define __NR_process_madvise 440
 __SYSCALL(__NR_process_madvise, sys_process_madvise)
 #define __NR_epoll_pwait2 441
-__SYSCALL(__NR_epoll_pwait2, sys_epoll_pwait2)
+__SYSCALL(__NR_epoll_pwait2, compat_sys_epoll_pwait2)
 
 /*
  * Please add new compat syscalls above this comment and update
index ad9c3dd0ab1f9d946c7281aa9114d8cdb067f69a..0f03ad223f332cfe755c019fada0fbbaf958149c 100644 (file)
 438    n32     pidfd_getfd                     sys_pidfd_getfd
 439    n32     faccessat2                      sys_faccessat2
 440    n32     process_madvise                 sys_process_madvise
-441    n32     epoll_pwait2                    sys_epoll_pwait2
+441    n32     epoll_pwait2                    compat_sys_epoll_pwait2
index 14f6525886a83096e31fe1bfc10fca391dfe72a0..d443423495e565e49a8e57527f00dfdd4ffbea17 100644 (file)
 438  common    pidfd_getfd             sys_pidfd_getfd                 sys_pidfd_getfd
 439  common    faccessat2              sys_faccessat2                  sys_faccessat2
 440  common    process_madvise         sys_process_madvise             sys_process_madvise
-441  common    epoll_pwait2            sys_epoll_pwait2                sys_epoll_pwait2
+441  common    epoll_pwait2            sys_epoll_pwait2                compat_sys_epoll_pwait2
index c7da4c3271e62b6b77bbff6254627285e7daa6a9..40d8c7cd82984b44ddf9f95074835961114547eb 100644 (file)
 438    common  pidfd_getfd                     sys_pidfd_getfd
 439    common  faccessat2                      sys_faccessat2
 440    common  process_madvise                 sys_process_madvise
-441    common  epoll_pwait2                    sys_epoll_pwait2
+441    common  epoll_pwait2                    sys_epoll_pwait2                compat_sys_epoll_pwait2