mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-27 03:10:12 +00:00
Code Issues Releases Wiki Activity

MIPS: Wire up sendmmsg and renumber setns syscall.

Browse source 
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 7b21fddd08 [ns: Wire up the setns
system call] resulting in a conflict.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle 2011-05-28 13:22:58 +01:00
parent 731f90fae9
commit b12acf163f
5 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
arch/mips/include/asm/unistd.h
View file

@ -363,17 +363,18 @@
#define __NR_open_by_handle_at (__NR_Linux + 340) #define __NR_open_by_handle_at (__NR_Linux + 340)
#define __NR_clock_adjtime (__NR_Linux + 341) #define __NR_clock_adjtime (__NR_Linux + 341)
#define __NR_syncfs (__NR_Linux + 342) #define __NR_syncfs (__NR_Linux + 342)
#define __NR_setns (__NR_Linux + 343) #define __NR_sendmmsg (__NR_Linux + 343)
#define __NR_setns (__NR_Linux + 344)
/* /*
* Offset of the last Linux o32 flavoured syscall * Offset of the last Linux o32 flavoured syscall
*/ */
#define __NR_Linux_syscalls 343 #define __NR_Linux_syscalls 344
#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
#define __NR_O32_Linux 4000 #define __NR_O32_Linux 4000
#define __NR_O32_Linux_syscalls 343 #define __NR_O32_Linux_syscalls 344
#if _MIPS_SIM == _MIPS_SIM_ABI64 #if _MIPS_SIM == _MIPS_SIM_ABI64
@ -683,17 +684,18 @@
#define __NR_open_by_handle_at (__NR_Linux + 299) #define __NR_open_by_handle_at (__NR_Linux + 299)
#define __NR_clock_adjtime (__NR_Linux + 300) #define __NR_clock_adjtime (__NR_Linux + 300)
#define __NR_syncfs (__NR_Linux + 301) #define __NR_syncfs (__NR_Linux + 301)
#define __NR_setns (__NR_Linux + 302) #define __NR_sendmmsg (__NR_Linux + 302)
#define __NR_setns (__NR_Linux + 303)
/* /*
* Offset of the last Linux 64-bit flavoured syscall * Offset of the last Linux 64-bit flavoured syscall
*/ */
#define __NR_Linux_syscalls 302 #define __NR_Linux_syscalls 303
#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
#define __NR_64_Linux 5000 #define __NR_64_Linux 5000
#define __NR_64_Linux_syscalls 302 #define __NR_64_Linux_syscalls 303
#if _MIPS_SIM == _MIPS_SIM_NABI32 #if _MIPS_SIM == _MIPS_SIM_NABI32
@ -1008,17 +1010,18 @@
#define __NR_open_by_handle_at (__NR_Linux + 304) #define __NR_open_by_handle_at (__NR_Linux + 304)
#define __NR_clock_adjtime (__NR_Linux + 305) #define __NR_clock_adjtime (__NR_Linux + 305)
#define __NR_syncfs (__NR_Linux + 306) #define __NR_syncfs (__NR_Linux + 306)
#define __NR_setns (__NR_Linux + 307) #define __NR_sendmmsg (__NR_Linux + 307)
#define __NR_setns (__NR_Linux + 308)
/* /*
* Offset of the last N32 flavoured syscall * Offset of the last N32 flavoured syscall
*/ */
#define __NR_Linux_syscalls 307 #define __NR_Linux_syscalls 308
#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
#define __NR_N32_Linux 6000 #define __NR_N32_Linux 6000
#define __NR_N32_Linux_syscalls 307 #define __NR_N32_Linux_syscalls 308
#ifdef __KERNEL__ #ifdef __KERNEL__

1
arch/mips/kernel/scall32-o32.S
View file

@ -589,6 +589,7 @@ einval: li v0, -ENOSYS
sys sys_open_by_handle_at 3 /* 4340 */ sys sys_open_by_handle_at 3 /* 4340 */
sys sys_clock_adjtime 2 sys sys_clock_adjtime 2
sys sys_syncfs 1 sys sys_syncfs 1
sys sys_sendmmsg 4
sys sys_setns 2 sys sys_setns 2
.endm .endm

1
arch/mips/kernel/scall64-64.S
View file

@ -428,5 +428,6 @@ sys_call_table:
PTR sys_open_by_handle_at PTR sys_open_by_handle_at
PTR sys_clock_adjtime /* 5300 */ PTR sys_clock_adjtime /* 5300 */
PTR sys_syncfs PTR sys_syncfs
PTR sys_sendmmsg
PTR sys_setns PTR sys_setns
.size sys_call_table,.-sys_call_table .size sys_call_table,.-sys_call_table

1
arch/mips/kernel/scall64-n32.S
View file

@ -428,5 +428,6 @@ EXPORT(sysn32_call_table)
PTR sys_open_by_handle_at PTR sys_open_by_handle_at
PTR compat_sys_clock_adjtime /* 6305 */ PTR compat_sys_clock_adjtime /* 6305 */
PTR sys_syncfs PTR sys_syncfs
PTR compat_sys_sendmmsg
PTR sys_setns PTR sys_setns
.size sysn32_call_table,.-sysn32_call_table .size sysn32_call_table,.-sysn32_call_table

1
arch/mips/kernel/scall64-o32.S
View file

@ -546,5 +546,6 @@ sys_call_table:
PTR compat_sys_open_by_handle_at /* 4340 */ PTR compat_sys_open_by_handle_at /* 4340 */
PTR compat_sys_clock_adjtime PTR compat_sys_clock_adjtime
PTR sys_syncfs PTR sys_syncfs
PTR compat_sys_sendmmsg
PTR sys_setns PTR sys_setns
.size sys_call_table,.-sys_call_table .size sys_call_table,.-sys_call_table