diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
| commit | ebc01f593b58e1896150fc2e3cbdd0116323c52c (patch) | |
| tree | 23e905a3fdbee3fc8a66ef760b9ed5ef5455e9dd /arch/sparc/include | |
| parent | 3f7256fe5fc64132a2dd19695255c990aa2188cf (diff) | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
Merge tag 'v3.18-rc3' into asoc-sgtl5000
Linux 3.18-rc3
Diffstat (limited to 'arch/sparc/include')
| -rw-r--r-- | arch/sparc/include/uapi/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/include/uapi/asm/unistd.h b/arch/sparc/include/uapi/asm/unistd.h index c842a89b1190..46d83842eddc 100644 --- a/arch/sparc/include/uapi/asm/unistd.h +++ b/arch/sparc/include/uapi/asm/unistd.h | |||
| @@ -414,8 +414,9 @@ | |||
| 414 | #define __NR_seccomp 346 | 414 | #define __NR_seccomp 346 |
| 415 | #define __NR_getrandom 347 | 415 | #define __NR_getrandom 347 |
| 416 | #define __NR_memfd_create 348 | 416 | #define __NR_memfd_create 348 |
| 417 | #define __NR_bpf 349 | ||
| 417 | 418 | ||
| 418 | #define NR_syscalls 349 | 419 | #define NR_syscalls 350 |
| 419 | 420 | ||
| 420 | /* Bitmask values returned from kern_features system call. */ | 421 | /* Bitmask values returned from kern_features system call. */ |
| 421 | #define KERN_FEATURE_MIXED_MODE_STACK 0x00000001 | 422 | #define KERN_FEATURE_MIXED_MODE_STACK 0x00000001 |