diff options
author | David S. Miller <davem@davemloft.net> | 2017-04-23 21:28:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-04-23 21:28:55 -0400 |
commit | f6ebf0bb1a983a7b60a26acf282975b5da5b3202 (patch) | |
tree | d5e26df3b4af027141df0c7dd3859b3c6052aa61 | |
parent | b7c02b733c010eb65ab8957dc0d023763a3182bc (diff) |
sparc: Update syscall tables.
Hook up statx.
Ignore pkeys system calls, we don't have protection keeys
on SPARC.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/include/uapi/asm/unistd.h | 8 | ||||
-rw-r--r-- | arch/sparc/kernel/systbls_32.S | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/systbls_64.S | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/arch/sparc/include/uapi/asm/unistd.h b/arch/sparc/include/uapi/asm/unistd.h index 36eee8132c22..ae77df75bffa 100644 --- a/arch/sparc/include/uapi/asm/unistd.h +++ b/arch/sparc/include/uapi/asm/unistd.h | |||
@@ -425,8 +425,9 @@ | |||
425 | #define __NR_copy_file_range 357 | 425 | #define __NR_copy_file_range 357 |
426 | #define __NR_preadv2 358 | 426 | #define __NR_preadv2 358 |
427 | #define __NR_pwritev2 359 | 427 | #define __NR_pwritev2 359 |
428 | #define __NR_statx 360 | ||
428 | 429 | ||
429 | #define NR_syscalls 360 | 430 | #define NR_syscalls 361 |
430 | 431 | ||
431 | /* Bitmask values returned from kern_features system call. */ | 432 | /* Bitmask values returned from kern_features system call. */ |
432 | #define KERN_FEATURE_MIXED_MODE_STACK 0x00000001 | 433 | #define KERN_FEATURE_MIXED_MODE_STACK 0x00000001 |
@@ -442,4 +443,9 @@ | |||
442 | #define __IGNORE_getresgid | 443 | #define __IGNORE_getresgid |
443 | #endif | 444 | #endif |
444 | 445 | ||
446 | /* Sparc doesn't have protection keys. */ | ||
447 | #define __IGNORE_pkey_mprotect | ||
448 | #define __IGNORE_pkey_alloc | ||
449 | #define __IGNORE_pkey_free | ||
450 | |||
445 | #endif /* _UAPI_SPARC_UNISTD_H */ | 451 | #endif /* _UAPI_SPARC_UNISTD_H */ |
diff --git a/arch/sparc/kernel/systbls_32.S b/arch/sparc/kernel/systbls_32.S index eac7f0db5c8c..5253e895b81b 100644 --- a/arch/sparc/kernel/systbls_32.S +++ b/arch/sparc/kernel/systbls_32.S | |||
@@ -89,3 +89,4 @@ sys_call_table: | |||
89 | /*345*/ .long sys_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf | 89 | /*345*/ .long sys_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf |
90 | /*350*/ .long sys_execveat, sys_membarrier, sys_userfaultfd, sys_bind, sys_listen | 90 | /*350*/ .long sys_execveat, sys_membarrier, sys_userfaultfd, sys_bind, sys_listen |
91 | /*355*/ .long sys_setsockopt, sys_mlock2, sys_copy_file_range, sys_preadv2, sys_pwritev2 | 91 | /*355*/ .long sys_setsockopt, sys_mlock2, sys_copy_file_range, sys_preadv2, sys_pwritev2 |
92 | /*360*/ .long sys_statx | ||
diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S index b0f17ff2ddba..82339f6be0b2 100644 --- a/arch/sparc/kernel/systbls_64.S +++ b/arch/sparc/kernel/systbls_64.S | |||
@@ -90,6 +90,7 @@ sys_call_table32: | |||
90 | .word sys32_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf | 90 | .word sys32_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf |
91 | /*350*/ .word sys32_execveat, sys_membarrier, sys_userfaultfd, sys_bind, sys_listen | 91 | /*350*/ .word sys32_execveat, sys_membarrier, sys_userfaultfd, sys_bind, sys_listen |
92 | .word compat_sys_setsockopt, sys_mlock2, sys_copy_file_range, compat_sys_preadv2, compat_sys_pwritev2 | 92 | .word compat_sys_setsockopt, sys_mlock2, sys_copy_file_range, compat_sys_preadv2, compat_sys_pwritev2 |
93 | /*360*/ .word sys_statx | ||
93 | 94 | ||
94 | #endif /* CONFIG_COMPAT */ | 95 | #endif /* CONFIG_COMPAT */ |
95 | 96 | ||
@@ -171,3 +172,4 @@ sys_call_table: | |||
171 | .word sys_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf | 172 | .word sys_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create, sys_bpf |
172 | /*350*/ .word sys64_execveat, sys_membarrier, sys_userfaultfd, sys_bind, sys_listen | 173 | /*350*/ .word sys64_execveat, sys_membarrier, sys_userfaultfd, sys_bind, sys_listen |
173 | .word sys_setsockopt, sys_mlock2, sys_copy_file_range, sys_preadv2, sys_pwritev2 | 174 | .word sys_setsockopt, sys_mlock2, sys_copy_file_range, sys_preadv2, sys_pwritev2 |
175 | /*360*/ .word sys_statx | ||