Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

kernel/sys_ni.c

+3 −0
Original line number Diff line number Diff line
@@ -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);