diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-06 09:07:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-06 09:07:08 -0800 |
| commit | 78e10b5e5a849fdfd910dd7b0170a1c2ca0f3483 (patch) | |
| tree | d0297a8ec3c28c33e05bf596377e8cd32003a06c /kernel | |
| parent | Merge branch 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | ipc: Fix building compat mode without sysvipc (diff) | |
| download | linux-dev-78e10b5e5a849fdfd910dd7b0170a1c2ca0f3483.tar.xz linux-dev-78e10b5e5a849fdfd910dd7b0170a1c2ca0f3483.zip | |
Merge tag 'y2038-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
Pull y2038 build fix for compat mode from Arnd Bergmann:
"Here is one more patch on top of the y2038 changes already pulled for
linux-5.1, for some reason this had escaped all testing"
* tag 'y2038-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground:
ipc: Fix building compat mode without sysvipc
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sys_ni.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index 85e5ccec0955..62a6c8707799 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c @@ -202,6 +202,7 @@ COND_SYSCALL(msgget); COND_SYSCALL(old_msgctl); COND_SYSCALL(msgctl); COND_SYSCALL_COMPAT(msgctl); +COND_SYSCALL_COMPAT(old_msgctl); COND_SYSCALL(msgrcv); COND_SYSCALL_COMPAT(msgrcv); COND_SYSCALL(msgsnd); @@ -212,6 +213,7 @@ COND_SYSCALL(semget); COND_SYSCALL(old_semctl); COND_SYSCALL(semctl); COND_SYSCALL_COMPAT(semctl); +COND_SYSCALL_COMPAT(old_semctl); COND_SYSCALL(semtimedop); COND_SYSCALL(semtimedop_time32); COND_SYSCALL(semop); @@ -221,6 +223,7 @@ COND_SYSCALL(shmget); COND_SYSCALL(old_shmctl); COND_SYSCALL(shmctl); COND_SYSCALL_COMPAT(shmctl); +COND_SYSCALL_COMPAT(old_shmctl); COND_SYSCALL(shmat); COND_SYSCALL_COMPAT(shmat); COND_SYSCALL(shmdt); |