tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

MIPS: Wire up sendmmsg and renumber setns syscall.

Renumbering was necessary because I had already wired up setns(2) in the
linux-mips.org tree in commit c3fce54644cabbb90700cc3acc040718a377f609
[MIPS: Wire up new sendmmsg syscall.] but the same syscall numbers were
used by 7b21fddd087678a70ad64afc0f632e0f1071b092 [ns: Wire up the setns
system call] resulting in a conflict.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Ralf Baechle b12acf16 731f90fa

+16 -9
+12 -9
arch/mips/include/asm/unistd.h
··· 363 363 #define __NR_open_by_handle_at (__NR_Linux + 340) 364 364 #define __NR_clock_adjtime (__NR_Linux + 341) 365 365 #define __NR_syncfs (__NR_Linux + 342) 366 - #define __NR_setns (__NR_Linux + 343) 366 + #define __NR_sendmmsg (__NR_Linux + 343) 367 + #define __NR_setns (__NR_Linux + 344) 367 368 368 369 /* 369 370 * Offset of the last Linux o32 flavoured syscall 370 371 */ 371 - #define __NR_Linux_syscalls 343 372 + #define __NR_Linux_syscalls 344 372 373 373 374 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ 374 375 375 376 #define __NR_O32_Linux 4000 376 - #define __NR_O32_Linux_syscalls 343 377 + #define __NR_O32_Linux_syscalls 344 377 378 378 379 #if _MIPS_SIM == _MIPS_SIM_ABI64 379 380 ··· 684 683 #define __NR_open_by_handle_at (__NR_Linux + 299) 685 684 #define __NR_clock_adjtime (__NR_Linux + 300) 686 685 #define __NR_syncfs (__NR_Linux + 301) 687 - #define __NR_setns (__NR_Linux + 302) 686 + #define __NR_sendmmsg (__NR_Linux + 302) 687 + #define __NR_setns (__NR_Linux + 303) 688 688 689 689 /* 690 690 * Offset of the last Linux 64-bit flavoured syscall 691 691 */ 692 - #define __NR_Linux_syscalls 302 692 + #define __NR_Linux_syscalls 303 693 693 694 694 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ 695 695 696 696 #define __NR_64_Linux 5000 697 - #define __NR_64_Linux_syscalls 302 697 + #define __NR_64_Linux_syscalls 303 698 698 699 699 #if _MIPS_SIM == _MIPS_SIM_NABI32 700 700 ··· 1010 1008 #define __NR_open_by_handle_at (__NR_Linux + 304) 1011 1009 #define __NR_clock_adjtime (__NR_Linux + 305) 1012 1010 #define __NR_syncfs (__NR_Linux + 306) 1013 - #define __NR_setns (__NR_Linux + 307) 1011 + #define __NR_sendmmsg (__NR_Linux + 307) 1012 + #define __NR_setns (__NR_Linux + 308) 1014 1013 1015 1014 /* 1016 1015 * Offset of the last N32 flavoured syscall 1017 1016 */ 1018 - #define __NR_Linux_syscalls 307 1017 + #define __NR_Linux_syscalls 308 1019 1018 1020 1019 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ 1021 1020 1022 1021 #define __NR_N32_Linux 6000 1023 - #define __NR_N32_Linux_syscalls 307 1022 + #define __NR_N32_Linux_syscalls 308 1024 1023 1025 1024 #ifdef __KERNEL__ 1026 1025
+1
arch/mips/kernel/scall32-o32.S
··· 589 589 sys sys_open_by_handle_at 3 /* 4340 */ 590 590 sys sys_clock_adjtime 2 591 591 sys sys_syncfs 1 592 + sys sys_sendmmsg 4 592 593 sys sys_setns 2 593 594 .endm 594 595
+1
arch/mips/kernel/scall64-64.S
··· 428 428 PTR sys_open_by_handle_at 429 429 PTR sys_clock_adjtime /* 5300 */ 430 430 PTR sys_syncfs 431 + PTR sys_sendmmsg 431 432 PTR sys_setns 432 433 .size sys_call_table,.-sys_call_table
+1
arch/mips/kernel/scall64-n32.S
··· 428 428 PTR sys_open_by_handle_at 429 429 PTR compat_sys_clock_adjtime /* 6305 */ 430 430 PTR sys_syncfs 431 + PTR compat_sys_sendmmsg 431 432 PTR sys_setns 432 433 .size sysn32_call_table,.-sysn32_call_table
+1
arch/mips/kernel/scall64-o32.S
··· 546 546 PTR compat_sys_open_by_handle_at /* 4340 */ 547 547 PTR compat_sys_clock_adjtime 548 548 PTR sys_syncfs 549 + PTR compat_sys_sendmmsg 549 550 PTR sys_setns 550 551 .size sys_call_table,.-sys_call_table