Commit 78e10b5e authored by Linus Torvalds's avatar Linus Torvalds

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
parents 6ea98b4b 7e89a37c
...@@ -202,6 +202,7 @@ COND_SYSCALL(msgget); ...@@ -202,6 +202,7 @@ COND_SYSCALL(msgget);
COND_SYSCALL(old_msgctl); COND_SYSCALL(old_msgctl);
COND_SYSCALL(msgctl); COND_SYSCALL(msgctl);
COND_SYSCALL_COMPAT(msgctl); COND_SYSCALL_COMPAT(msgctl);
COND_SYSCALL_COMPAT(old_msgctl);
COND_SYSCALL(msgrcv); COND_SYSCALL(msgrcv);
COND_SYSCALL_COMPAT(msgrcv); COND_SYSCALL_COMPAT(msgrcv);
COND_SYSCALL(msgsnd); COND_SYSCALL(msgsnd);
...@@ -212,6 +213,7 @@ COND_SYSCALL(semget); ...@@ -212,6 +213,7 @@ COND_SYSCALL(semget);
COND_SYSCALL(old_semctl); COND_SYSCALL(old_semctl);
COND_SYSCALL(semctl); COND_SYSCALL(semctl);
COND_SYSCALL_COMPAT(semctl); COND_SYSCALL_COMPAT(semctl);
COND_SYSCALL_COMPAT(old_semctl);
COND_SYSCALL(semtimedop); COND_SYSCALL(semtimedop);
COND_SYSCALL(semtimedop_time32); COND_SYSCALL(semtimedop_time32);
COND_SYSCALL(semop); COND_SYSCALL(semop);
...@@ -221,6 +223,7 @@ COND_SYSCALL(shmget); ...@@ -221,6 +223,7 @@ COND_SYSCALL(shmget);
COND_SYSCALL(old_shmctl); COND_SYSCALL(old_shmctl);
COND_SYSCALL(shmctl); COND_SYSCALL(shmctl);
COND_SYSCALL_COMPAT(shmctl); COND_SYSCALL_COMPAT(shmctl);
COND_SYSCALL_COMPAT(old_shmctl);
COND_SYSCALL(shmat); COND_SYSCALL(shmat);
COND_SYSCALL_COMPAT(shmat); COND_SYSCALL_COMPAT(shmat);
COND_SYSCALL(shmdt); COND_SYSCALL(shmdt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment