diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-06-06 01:55:06 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-06-06 01:55:06 -0400 |
commit | ec00010972a0971b2c1da4fbe4e5c7d8ed1ecb05 (patch) | |
tree | c28975d7daf6d8a3aa23afe8f42837b71105b269 /include/uapi/asm-generic/unistd.h | |
parent | 8c6e549a447c51f4f8c0ba7f1e444469f75a354a (diff) | |
parent | e041e328c4b41e1db79bfe5ba9992c2ed771ad19 (diff) |
Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches
Conflicts:
arch/x86/kernel/traps.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/asm-generic/unistd.h')
-rw-r--r-- | include/uapi/asm-generic/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 6db66783d268..333640608087 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h | |||
@@ -697,9 +697,11 @@ __SYSCALL(__NR_finit_module, sys_finit_module) | |||
697 | __SYSCALL(__NR_sched_setattr, sys_sched_setattr) | 697 | __SYSCALL(__NR_sched_setattr, sys_sched_setattr) |
698 | #define __NR_sched_getattr 275 | 698 | #define __NR_sched_getattr 275 |
699 | __SYSCALL(__NR_sched_getattr, sys_sched_getattr) | 699 | __SYSCALL(__NR_sched_getattr, sys_sched_getattr) |
700 | #define __NR_renameat2 276 | ||
701 | __SYSCALL(__NR_renameat2, sys_renameat2) | ||
700 | 702 | ||
701 | #undef __NR_syscalls | 703 | #undef __NR_syscalls |
702 | #define __NR_syscalls 276 | 704 | #define __NR_syscalls 277 |
703 | 705 | ||
704 | /* | 706 | /* |
705 | * All syscalls below here should go away really, | 707 | * All syscalls below here should go away really, |