Merge tag 'y2038-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground

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

kernel os linux

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

Linus Torvalds 7 years ago 78e10b5e 6ea98b4b

1 changed file

expand all

kernel

sys_ni.c

kernel/sys_ni.c

··· 202 202 COND_SYSCALL(old_msgctl); 203 203 COND_SYSCALL(msgctl); 204 204 COND_SYSCALL_COMPAT(msgctl); 205 + COND_SYSCALL_COMPAT(old_msgctl); 205 206 COND_SYSCALL(msgrcv); 206 207 COND_SYSCALL_COMPAT(msgrcv); 207 208 COND_SYSCALL(msgsnd); ··· 213 212 COND_SYSCALL(old_semctl); 214 213 COND_SYSCALL(semctl); 215 214 COND_SYSCALL_COMPAT(semctl); 215 + COND_SYSCALL_COMPAT(old_semctl); 216 216 COND_SYSCALL(semtimedop); 217 217 COND_SYSCALL(semtimedop_time32); 218 218 COND_SYSCALL(semop); ··· 223 221 COND_SYSCALL(old_shmctl); 224 222 COND_SYSCALL(shmctl); 225 223 COND_SYSCALL_COMPAT(shmctl); 224 + COND_SYSCALL_COMPAT(old_shmctl); 226 225 COND_SYSCALL(shmat); 227 226 COND_SYSCALL_COMPAT(shmat); 228 227 COND_SYSCALL(shmdt);