diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-09-30 10:44:04 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-09-30 10:44:04 -0400 |
| commit | 6c8ff877cdf13cd5287ed9d700cfb6cb70e2bfa1 (patch) | |
| tree | 2ab49b7d19fb69cdae5b6be9e7ba44f6cf3d45ef /arch/sparc/include/uapi/asm/unistd.h | |
| parent | 35e1efd25a9e7d5cf2884fa23441ab87353849bb (diff) | |
| parent | 19583ca584d6f574384e17fe7613dfaeadcdc4a6 (diff) | |
Merge commit 'v3.16' into next
Diffstat (limited to 'arch/sparc/include/uapi/asm/unistd.h')
| -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 b73274fb961a..42f2bca1d338 100644 --- a/arch/sparc/include/uapi/asm/unistd.h +++ b/arch/sparc/include/uapi/asm/unistd.h | |||
| @@ -410,8 +410,9 @@ | |||
| 410 | #define __NR_finit_module 342 | 410 | #define __NR_finit_module 342 |
| 411 | #define __NR_sched_setattr 343 | 411 | #define __NR_sched_setattr 343 |
| 412 | #define __NR_sched_getattr 344 | 412 | #define __NR_sched_getattr 344 |
| 413 | #define __NR_renameat2 345 | ||
| 413 | 414 | ||
| 414 | #define NR_syscalls 345 | 415 | #define NR_syscalls 346 |
| 415 | 416 | ||
| 416 | /* Bitmask values returned from kern_features system call. */ | 417 | /* Bitmask values returned from kern_features system call. */ |
| 417 | #define KERN_FEATURE_MIXED_MODE_STACK 0x00000001 | 418 | #define KERN_FEATURE_MIXED_MODE_STACK 0x00000001 |