diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-01 14:54:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-01 14:54:33 -0800 |
| commit | c270ab5a87403f9365c00d3c587aa8000560bdc3 (patch) | |
| tree | 10363ed48b1e048bff9dc50d72ad0cb89b84d8d0 | |
| parent | Merge tag 'v6.14-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | Revert "mips: fix shmctl/semctl/msgctl syscall for o32" (diff) | |
| download | wireguard-linux-c270ab5a87403f9365c00d3c587aa8000560bdc3.tar.xz wireguard-linux-c270ab5a87403f9365c00d3c587aa8000560bdc3.zip | |
Merge tag 'mips_6.14_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS fix from Thomas Bogendoerfer:
"Revert commit breaking sysv ipc for o32 ABI"
* tag 'mips_6.14_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
Revert "mips: fix shmctl/semctl/msgctl syscall for o32"
Diffstat (limited to '')
| -rw-r--r-- | arch/mips/kernel/syscalls/syscall_o32.tbl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/syscalls/syscall_o32.tbl index e8a57c206758..349b8aad1159 100644 --- a/arch/mips/kernel/syscalls/syscall_o32.tbl +++ b/arch/mips/kernel/syscalls/syscall_o32.tbl @@ -382,15 +382,15 @@ 368 o32 io_pgetevents sys_io_pgetevents_time32 compat_sys_io_pgetevents # room for arch specific calls 393 o32 semget sys_semget -394 o32 semctl sys_old_semctl compat_sys_old_semctl +394 o32 semctl sys_semctl compat_sys_semctl 395 o32 shmget sys_shmget -396 o32 shmctl sys_old_shmctl compat_sys_old_shmctl +396 o32 shmctl sys_shmctl compat_sys_shmctl 397 o32 shmat sys_shmat compat_sys_shmat 398 o32 shmdt sys_shmdt 399 o32 msgget sys_msgget 400 o32 msgsnd sys_msgsnd compat_sys_msgsnd 401 o32 msgrcv sys_msgrcv compat_sys_msgrcv -402 o32 msgctl sys_old_msgctl compat_sys_old_msgctl +402 o32 msgctl sys_msgctl compat_sys_msgctl 403 o32 clock_gettime64 sys_clock_gettime sys_clock_gettime 404 o32 clock_settime64 sys_clock_settime sys_clock_settime 405 o32 clock_adjtime64 sys_clock_adjtime sys_clock_adjtime |