diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-14 21:30:12 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-14 21:30:12 +0100 |
| commit | 54d5f88f25c38e5500a17b16240cb3775af00876 (patch) | |
| tree | 09208d460e2f5aa93f5d2cdbbb2c5972758994ea /arch/sparc/include/uapi | |
| parent | tty: of_serial: fix return value check in of_platform_serial_setup() (diff) | |
| parent | Linux 3.7-rc5 (diff) | |
| download | linux-54d5f88f25c38e5500a17b16240cb3775af00876.tar.xz linux-54d5f88f25c38e5500a17b16240cb3775af00876.zip | |
Merge v3.7-rc5 into tty-next
This pulls in the 3.7-rc5 fixes into tty-next to make it easier to test.
Diffstat (limited to 'arch/sparc/include/uapi')
| -rw-r--r-- | arch/sparc/include/uapi/asm/unistd.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/sparc/include/uapi/asm/unistd.h b/arch/sparc/include/uapi/asm/unistd.h index 8974ef7ae920..cac719d1bc5c 100644 --- a/arch/sparc/include/uapi/asm/unistd.h +++ b/arch/sparc/include/uapi/asm/unistd.h @@ -405,8 +405,13 @@ #define __NR_setns 337 #define __NR_process_vm_readv 338 #define __NR_process_vm_writev 339 +#define __NR_kern_features 340 +#define __NR_kcmp 341 -#define NR_syscalls 340 +#define NR_syscalls 342 + +/* Bitmask values returned from kern_features system call. */ +#define KERN_FEATURE_MIXED_MODE_STACK 0x00000001 #ifdef __32bit_syscall_numbers__ /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, |