diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-09-09 06:48:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-09-09 06:48:07 +0200 |
| commit | bdea534db894ea19320f470ce2e63b1d9de96a15 (patch) | |
| tree | 8ec2a0a93d9bb5e7205253c67aa624b9ec227477 /arch/xtensa/include/uapi/asm/unistd.h | |
| parent | 39b5a56ec0be5effe9b7d0f18cb27724bf2e5d47 (diff) | |
| parent | 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd (diff) | |
| download | op-kernel-dev-bdea534db894ea19320f470ce2e63b1d9de96a15.zip op-kernel-dev-bdea534db894ea19320f470ce2e63b1d9de96a15.tar.gz | |
Merge tag 'v3.17-rc4' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/xtensa/include/uapi/asm/unistd.h')
| -rw-r--r-- | arch/xtensa/include/uapi/asm/unistd.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/xtensa/include/uapi/asm/unistd.h b/arch/xtensa/include/uapi/asm/unistd.h index b939552..8883fc8 100644 --- a/arch/xtensa/include/uapi/asm/unistd.h +++ b/arch/xtensa/include/uapi/asm/unistd.h @@ -739,7 +739,10 @@ __SYSCALL(334, sys_sched_setattr, 2) #define __NR_sched_getattr 335 __SYSCALL(335, sys_sched_getattr, 3) -#define __NR_syscall_count 336 +#define __NR_renameat2 336 +__SYSCALL(336, sys_renameat2, 5) + +#define __NR_syscall_count 337 /* * sysxtensa syscall handler |
