diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2015-09-30 08:24:31 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2015-09-30 08:24:31 -0400 |
commit | 96fc7a9cee671f10e14aaca44833696a71f1ebdb (patch) | |
tree | c1e9f4f7e9660380db52d5653f954b726acfb823 /arch | |
parent | e060f6ed281669b6d2f22d8dafd664b532386918 (diff) |
MIPS: Wire up userfaultfd and membarrier syscalls.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/include/uapi/asm/unistd.h | 18 | ||||
-rw-r--r-- | arch/mips/kernel/scall32-o32.S | 2 | ||||
-rw-r--r-- | arch/mips/kernel/scall64-64.S | 2 | ||||
-rw-r--r-- | arch/mips/kernel/scall64-n32.S | 2 | ||||
-rw-r--r-- | arch/mips/kernel/scall64-o32.S | 2 |
5 files changed, 20 insertions, 6 deletions
diff --git a/arch/mips/include/uapi/asm/unistd.h b/arch/mips/include/uapi/asm/unistd.h index c03088f9f514..cfabadb135d9 100644 --- a/arch/mips/include/uapi/asm/unistd.h +++ b/arch/mips/include/uapi/asm/unistd.h | |||
@@ -377,16 +377,18 @@ | |||
377 | #define __NR_memfd_create (__NR_Linux + 354) | 377 | #define __NR_memfd_create (__NR_Linux + 354) |
378 | #define __NR_bpf (__NR_Linux + 355) | 378 | #define __NR_bpf (__NR_Linux + 355) |
379 | #define __NR_execveat (__NR_Linux + 356) | 379 | #define __NR_execveat (__NR_Linux + 356) |
380 | #define __NR_userfaultfd (__NR_Linux + 357) | ||
381 | #define __NR_membarrier (__NR_Linux + 358) | ||
380 | 382 | ||
381 | /* | 383 | /* |
382 | * Offset of the last Linux o32 flavoured syscall | 384 | * Offset of the last Linux o32 flavoured syscall |
383 | */ | 385 | */ |
384 | #define __NR_Linux_syscalls 356 | 386 | #define __NR_Linux_syscalls 358 |
385 | 387 | ||
386 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ | 388 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ |
387 | 389 | ||
388 | #define __NR_O32_Linux 4000 | 390 | #define __NR_O32_Linux 4000 |
389 | #define __NR_O32_Linux_syscalls 356 | 391 | #define __NR_O32_Linux_syscalls 358 |
390 | 392 | ||
391 | #if _MIPS_SIM == _MIPS_SIM_ABI64 | 393 | #if _MIPS_SIM == _MIPS_SIM_ABI64 |
392 | 394 | ||
@@ -711,16 +713,18 @@ | |||
711 | #define __NR_memfd_create (__NR_Linux + 314) | 713 | #define __NR_memfd_create (__NR_Linux + 314) |
712 | #define __NR_bpf (__NR_Linux + 315) | 714 | #define __NR_bpf (__NR_Linux + 315) |
713 | #define __NR_execveat (__NR_Linux + 316) | 715 | #define __NR_execveat (__NR_Linux + 316) |
716 | #define __NR_userfaultfd (__NR_Linux + 317) | ||
717 | #define __NR_membarrier (__NR_Linux + 318) | ||
714 | 718 | ||
715 | /* | 719 | /* |
716 | * Offset of the last Linux 64-bit flavoured syscall | 720 | * Offset of the last Linux 64-bit flavoured syscall |
717 | */ | 721 | */ |
718 | #define __NR_Linux_syscalls 316 | 722 | #define __NR_Linux_syscalls 318 |
719 | 723 | ||
720 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ | 724 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ |
721 | 725 | ||
722 | #define __NR_64_Linux 5000 | 726 | #define __NR_64_Linux 5000 |
723 | #define __NR_64_Linux_syscalls 316 | 727 | #define __NR_64_Linux_syscalls 318 |
724 | 728 | ||
725 | #if _MIPS_SIM == _MIPS_SIM_NABI32 | 729 | #if _MIPS_SIM == _MIPS_SIM_NABI32 |
726 | 730 | ||
@@ -1049,15 +1053,17 @@ | |||
1049 | #define __NR_memfd_create (__NR_Linux + 318) | 1053 | #define __NR_memfd_create (__NR_Linux + 318) |
1050 | #define __NR_bpf (__NR_Linux + 319) | 1054 | #define __NR_bpf (__NR_Linux + 319) |
1051 | #define __NR_execveat (__NR_Linux + 320) | 1055 | #define __NR_execveat (__NR_Linux + 320) |
1056 | #define __NR_userfaultfd (__NR_Linux + 321) | ||
1057 | #define __NR_membarrier (__NR_Linux + 322) | ||
1052 | 1058 | ||
1053 | /* | 1059 | /* |
1054 | * Offset of the last N32 flavoured syscall | 1060 | * Offset of the last N32 flavoured syscall |
1055 | */ | 1061 | */ |
1056 | #define __NR_Linux_syscalls 320 | 1062 | #define __NR_Linux_syscalls 322 |
1057 | 1063 | ||
1058 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ | 1064 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ |
1059 | 1065 | ||
1060 | #define __NR_N32_Linux 6000 | 1066 | #define __NR_N32_Linux 6000 |
1061 | #define __NR_N32_Linux_syscalls 320 | 1067 | #define __NR_N32_Linux_syscalls 322 |
1062 | 1068 | ||
1063 | #endif /* _UAPI_ASM_UNISTD_H */ | 1069 | #endif /* _UAPI_ASM_UNISTD_H */ |
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 4cc13508d967..d06e30c1e4cd 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
@@ -599,3 +599,5 @@ EXPORT(sys_call_table) | |||
599 | PTR sys_memfd_create | 599 | PTR sys_memfd_create |
600 | PTR sys_bpf /* 4355 */ | 600 | PTR sys_bpf /* 4355 */ |
601 | PTR sys_execveat | 601 | PTR sys_execveat |
602 | PTR sys_userfaultfd | ||
603 | PTR sys_membarrier | ||
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index a6f6b762c47a..428c2cd2326c 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
@@ -436,4 +436,6 @@ EXPORT(sys_call_table) | |||
436 | PTR sys_memfd_create | 436 | PTR sys_memfd_create |
437 | PTR sys_bpf /* 5315 */ | 437 | PTR sys_bpf /* 5315 */ |
438 | PTR sys_execveat | 438 | PTR sys_execveat |
439 | PTR sys_userfaultfd | ||
440 | PTR sys_membarrier | ||
439 | .size sys_call_table,.-sys_call_table | 441 | .size sys_call_table,.-sys_call_table |
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 4b2010654c46..3868cf4c83df 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
@@ -429,4 +429,6 @@ EXPORT(sysn32_call_table) | |||
429 | PTR sys_memfd_create | 429 | PTR sys_memfd_create |
430 | PTR sys_bpf | 430 | PTR sys_bpf |
431 | PTR compat_sys_execveat /* 6320 */ | 431 | PTR compat_sys_execveat /* 6320 */ |
432 | PTR sys_userfaultfd | ||
433 | PTR sys_membarrier | ||
432 | .size sysn32_call_table,.-sysn32_call_table | 434 | .size sysn32_call_table,.-sysn32_call_table |
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index f543ff4feef9..6622980d82ea 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
@@ -584,4 +584,6 @@ EXPORT(sys32_call_table) | |||
584 | PTR sys_memfd_create | 584 | PTR sys_memfd_create |
585 | PTR sys_bpf /* 4355 */ | 585 | PTR sys_bpf /* 4355 */ |
586 | PTR compat_sys_execveat | 586 | PTR compat_sys_execveat |
587 | PTR sys_userfaultfd | ||
588 | PTR sys_membarrier | ||
587 | .size sys32_call_table,.-sys32_call_table | 589 | .size sys32_call_table,.-sys32_call_table |