aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-10-18 18:52:17 -0400
committerRalf Baechle <ralf@linux-mips.org>2006-10-19 12:55:14 -0400
commitd2bcf87d0fcdc10d1be65b03fd032bec05efe49f (patch)
treee5b2ebb6a0d7dd85f2cf7c524b4cb6babafaeca8
parente7a6f9c1f4e46f7fd776c6ee38bdb8f8ae131a82 (diff)
[MIPS] Reserve syscall numbers for kexec_load.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/kernel/scall32-o32.S3
-rw-r--r--arch/mips/kernel/scall64-64.S1
-rw-r--r--arch/mips/kernel/scall64-n32.S1
-rw-r--r--arch/mips/kernel/scall64-o32.S1
-rw-r--r--include/asm-mips/unistd.h15
5 files changed, 14 insertions, 7 deletions
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 61362e6fa9ec..720fac3435d5 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -652,7 +652,8 @@ einval: li v0, -EINVAL
652 sys sys_vmsplice 4 652 sys sys_vmsplice 4
653 sys sys_move_pages 6 653 sys sys_move_pages 6
654 sys sys_set_robust_list 2 654 sys sys_set_robust_list 2
655 sys sys_get_robust_list 3 655 sys sys_get_robust_list 3 /* 4310 */
656 sys sys_ni_syscall 0
656 .endm 657 .endm
657 658
658 /* We pre-compute the number of _instruction_ bytes needed to 659 /* We pre-compute the number of _instruction_ bytes needed to
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index 6c7b5ed0ea6e..3a34f62c8b1b 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -468,3 +468,4 @@ sys_call_table:
468 PTR sys_move_pages 468 PTR sys_move_pages
469 PTR sys_set_robust_list 469 PTR sys_set_robust_list
470 PTR sys_get_robust_list 470 PTR sys_get_robust_list
471 PTR sys_ni_syscall /* 5270 */
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 8c453f8ffea6..67b92a1d6c72 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -394,3 +394,4 @@ EXPORT(sysn32_call_table)
394 PTR sys_move_pages 394 PTR sys_move_pages
395 PTR compat_sys_set_robust_list 395 PTR compat_sys_set_robust_list
396 PTR compat_sys_get_robust_list 396 PTR compat_sys_get_robust_list
397 PTR sys_ni_syscall
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index d105917d6d93..2875c4a3fa58 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -516,4 +516,5 @@ sys_call_table:
516 PTR compat_sys_move_pages 516 PTR compat_sys_move_pages
517 PTR compat_sys_set_robust_list 517 PTR compat_sys_set_robust_list
518 PTR compat_sys_get_robust_list /* 4310 */ 518 PTR compat_sys_get_robust_list /* 4310 */
519 PTR sys_ni_syscall
519 .size sys_call_table,.-sys_call_table 520 .size sys_call_table,.-sys_call_table
diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h
index 685c91467e63..30240a445dbb 100644
--- a/include/asm-mips/unistd.h
+++ b/include/asm-mips/unistd.h
@@ -331,16 +331,17 @@
331#define __NR_move_pages (__NR_Linux + 308) 331#define __NR_move_pages (__NR_Linux + 308)
332#define __NR_set_robust_list (__NR_Linux + 309) 332#define __NR_set_robust_list (__NR_Linux + 309)
333#define __NR_get_robust_list (__NR_Linux + 310) 333#define __NR_get_robust_list (__NR_Linux + 310)
334#define __NR_kexec_load (__NR_Linux + 311)
334 335
335/* 336/*
336 * Offset of the last Linux o32 flavoured syscall 337 * Offset of the last Linux o32 flavoured syscall
337 */ 338 */
338#define __NR_Linux_syscalls 310 339#define __NR_Linux_syscalls 311
339 340
340#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ 341#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
341 342
342#define __NR_O32_Linux 4000 343#define __NR_O32_Linux 4000
343#define __NR_O32_Linux_syscalls 310 344#define __NR_O32_Linux_syscalls 311
344 345
345#if _MIPS_SIM == _MIPS_SIM_ABI64 346#if _MIPS_SIM == _MIPS_SIM_ABI64
346 347
@@ -618,16 +619,17 @@
618#define __NR_move_pages (__NR_Linux + 267) 619#define __NR_move_pages (__NR_Linux + 267)
619#define __NR_set_robust_list (__NR_Linux + 268) 620#define __NR_set_robust_list (__NR_Linux + 268)
620#define __NR_get_robust_list (__NR_Linux + 269) 621#define __NR_get_robust_list (__NR_Linux + 269)
622#define __NR_kexec_load (__NR_Linux + 270)
621 623
622/* 624/*
623 * Offset of the last Linux 64-bit flavoured syscall 625 * Offset of the last Linux 64-bit flavoured syscall
624 */ 626 */
625#define __NR_Linux_syscalls 269 627#define __NR_Linux_syscalls 270
626 628
627#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ 629#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
628 630
629#define __NR_64_Linux 5000 631#define __NR_64_Linux 5000
630#define __NR_64_Linux_syscalls 269 632#define __NR_64_Linux_syscalls 270
631 633
632#if _MIPS_SIM == _MIPS_SIM_NABI32 634#if _MIPS_SIM == _MIPS_SIM_NABI32
633 635
@@ -909,16 +911,17 @@
909#define __NR_move_pages (__NR_Linux + 271) 911#define __NR_move_pages (__NR_Linux + 271)
910#define __NR_set_robust_list (__NR_Linux + 272) 912#define __NR_set_robust_list (__NR_Linux + 272)
911#define __NR_get_robust_list (__NR_Linux + 273) 913#define __NR_get_robust_list (__NR_Linux + 273)
914#define __NR_kexec_load (__NR_Linux + 274)
912 915
913/* 916/*
914 * Offset of the last N32 flavoured syscall 917 * Offset of the last N32 flavoured syscall
915 */ 918 */
916#define __NR_Linux_syscalls 273 919#define __NR_Linux_syscalls 274
917 920
918#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ 921#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
919 922
920#define __NR_N32_Linux 6000 923#define __NR_N32_Linux 6000
921#define __NR_N32_Linux_syscalls 273 924#define __NR_N32_Linux_syscalls 274
922 925
923#ifdef __KERNEL__ 926#ifdef __KERNEL__
924 927