diff options
-rw-r--r-- | arch/mips/kernel/scall32-o32.S | 2 | ||||
-rw-r--r-- | arch/mips/kernel/scall64-64.S | 3 | ||||
-rw-r--r-- | arch/mips/kernel/scall64-n32.S | 5 | ||||
-rw-r--r-- | arch/mips/kernel/scall64-o32.S | 2 | ||||
-rw-r--r-- | include/asm-mips/unistd.h | 18 |
5 files changed, 23 insertions, 7 deletions
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 7c0b3936ba44..0c9a9ff8cd25 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
@@ -656,6 +656,8 @@ einval: li v0, -EINVAL | |||
656 | sys sys_kexec_load 4 | 656 | sys sys_kexec_load 4 |
657 | sys sys_getcpu 3 | 657 | sys sys_getcpu 3 |
658 | sys sys_epoll_pwait 6 | 658 | sys sys_epoll_pwait 6 |
659 | sys sys_ioprio_set 3 | ||
660 | sys sys_ioprio_get 2 | ||
659 | .endm | 661 | .endm |
660 | 662 | ||
661 | /* We pre-compute the number of _instruction_ bytes needed to | 663 | /* 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 e569b846e9a3..23f3b118f718 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
@@ -471,3 +471,6 @@ sys_call_table: | |||
471 | PTR sys_kexec_load /* 5270 */ | 471 | PTR sys_kexec_load /* 5270 */ |
472 | PTR sys_getcpu | 472 | PTR sys_getcpu |
473 | PTR sys_epoll_pwait | 473 | PTR sys_epoll_pwait |
474 | PTR sys_ioprio_set | ||
475 | PTR sys_ioprio_get | ||
476 | .size sys_call_table,.-sys_call_table | ||
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index f17e31e3bff2..6eac28337423 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
@@ -395,5 +395,8 @@ EXPORT(sysn32_call_table) | |||
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 compat_sys_kexec_load | 397 | PTR compat_sys_kexec_load |
398 | PTR sys_getcpu | 398 | PTR sys_getcpu /* 6275 */ |
399 | PTR compat_sys_epoll_pwait | 399 | PTR compat_sys_epoll_pwait |
400 | PTR sys_ioprio_set | ||
401 | PTR sys_ioprio_get | ||
402 | .size sysn32_call_table,.-sysn32_call_table | ||
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 142c9b70c026..7e74b412a782 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
@@ -519,4 +519,6 @@ sys_call_table: | |||
519 | PTR compat_sys_kexec_load | 519 | PTR compat_sys_kexec_load |
520 | PTR sys_getcpu | 520 | PTR sys_getcpu |
521 | PTR compat_sys_epoll_pwait | 521 | PTR compat_sys_epoll_pwait |
522 | PTR sys_ioprio_set | ||
523 | PTR sys_ioprio_get /* 4315 */ | ||
522 | .size sys_call_table,.-sys_call_table | 524 | .size sys_call_table,.-sys_call_table |
diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h index 696cff39a1d3..2f1087b3a202 100644 --- a/include/asm-mips/unistd.h +++ b/include/asm-mips/unistd.h | |||
@@ -334,16 +334,18 @@ | |||
334 | #define __NR_kexec_load (__NR_Linux + 311) | 334 | #define __NR_kexec_load (__NR_Linux + 311) |
335 | #define __NR_getcpu (__NR_Linux + 312) | 335 | #define __NR_getcpu (__NR_Linux + 312) |
336 | #define __NR_epoll_pwait (__NR_Linux + 313) | 336 | #define __NR_epoll_pwait (__NR_Linux + 313) |
337 | #define __NR_ioprio_set (__NR_Linux + 314) | ||
338 | #define __NR_ioprio_get (__NR_Linux + 315) | ||
337 | 339 | ||
338 | /* | 340 | /* |
339 | * Offset of the last Linux o32 flavoured syscall | 341 | * Offset of the last Linux o32 flavoured syscall |
340 | */ | 342 | */ |
341 | #define __NR_Linux_syscalls 313 | 343 | #define __NR_Linux_syscalls 315 |
342 | 344 | ||
343 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ | 345 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ |
344 | 346 | ||
345 | #define __NR_O32_Linux 4000 | 347 | #define __NR_O32_Linux 4000 |
346 | #define __NR_O32_Linux_syscalls 313 | 348 | #define __NR_O32_Linux_syscalls 315 |
347 | 349 | ||
348 | #if _MIPS_SIM == _MIPS_SIM_ABI64 | 350 | #if _MIPS_SIM == _MIPS_SIM_ABI64 |
349 | 351 | ||
@@ -624,16 +626,18 @@ | |||
624 | #define __NR_kexec_load (__NR_Linux + 270) | 626 | #define __NR_kexec_load (__NR_Linux + 270) |
625 | #define __NR_getcpu (__NR_Linux + 271) | 627 | #define __NR_getcpu (__NR_Linux + 271) |
626 | #define __NR_epoll_pwait (__NR_Linux + 272) | 628 | #define __NR_epoll_pwait (__NR_Linux + 272) |
629 | #define __NR_ioprio_set (__NR_Linux + 273) | ||
630 | #define __NR_ioprio_get (__NR_Linux + 274) | ||
627 | 631 | ||
628 | /* | 632 | /* |
629 | * Offset of the last Linux 64-bit flavoured syscall | 633 | * Offset of the last Linux 64-bit flavoured syscall |
630 | */ | 634 | */ |
631 | #define __NR_Linux_syscalls 272 | 635 | #define __NR_Linux_syscalls 274 |
632 | 636 | ||
633 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ | 637 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ |
634 | 638 | ||
635 | #define __NR_64_Linux 5000 | 639 | #define __NR_64_Linux 5000 |
636 | #define __NR_64_Linux_syscalls 272 | 640 | #define __NR_64_Linux_syscalls 274 |
637 | 641 | ||
638 | #if _MIPS_SIM == _MIPS_SIM_NABI32 | 642 | #if _MIPS_SIM == _MIPS_SIM_NABI32 |
639 | 643 | ||
@@ -918,16 +922,18 @@ | |||
918 | #define __NR_kexec_load (__NR_Linux + 274) | 922 | #define __NR_kexec_load (__NR_Linux + 274) |
919 | #define __NR_getcpu (__NR_Linux + 275) | 923 | #define __NR_getcpu (__NR_Linux + 275) |
920 | #define __NR_epoll_pwait (__NR_Linux + 276) | 924 | #define __NR_epoll_pwait (__NR_Linux + 276) |
925 | #define __NR_ioprio_set (__NR_Linux + 277) | ||
926 | #define __NR_ioprio_get (__NR_Linux + 278) | ||
921 | 927 | ||
922 | /* | 928 | /* |
923 | * Offset of the last N32 flavoured syscall | 929 | * Offset of the last N32 flavoured syscall |
924 | */ | 930 | */ |
925 | #define __NR_Linux_syscalls 276 | 931 | #define __NR_Linux_syscalls 278 |
926 | 932 | ||
927 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ | 933 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ |
928 | 934 | ||
929 | #define __NR_N32_Linux 6000 | 935 | #define __NR_N32_Linux 6000 |
930 | #define __NR_N32_Linux_syscalls 276 | 936 | #define __NR_N32_Linux_syscalls 278 |
931 | 937 | ||
932 | #ifdef __KERNEL__ | 938 | #ifdef __KERNEL__ |
933 | 939 | ||