diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-26 22:39:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-26 22:39:08 -0400 |
| commit | b1513c35317c106a1588f3ab32f6888f0e2afd71 (patch) | |
| tree | b2cd68a0d34dd04eb89fcf28e173e5ee22f898fd /arch/sparc/include/uapi | |
| parent | 78a57b482aa53b040fbc2b2ef0208b54f004161b (diff) | |
| parent | f83246089ca09308425175d47f5e71e6da68b2ef (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/uapi')
| -rw-r--r-- | arch/sparc/include/uapi/asm/unistd.h | 8 |
1 files changed, 7 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 @@ #define __NR_copy_file_range 357 #define __NR_preadv2 358 #define __NR_pwritev2 359 +#define __NR_statx 360 -#define NR_syscalls 360 +#define NR_syscalls 361 /* Bitmask values returned from kern_features system call. */ #define KERN_FEATURE_MIXED_MODE_STACK 0x00000001 @@ -442,4 +443,9 @@ #define __IGNORE_getresgid #endif +/* Sparc doesn't have protection keys. */ +#define __IGNORE_pkey_mprotect +#define __IGNORE_pkey_alloc +#define __IGNORE_pkey_free + #endif /* _UAPI_SPARC_UNISTD_H */ |