Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Pull powerpc fix from Ben Herrenschmidt:
"Here's just one trivial patch to wire up sys_renameat2 which I seem to
have completely missed so far.

(My test build scripts fwd me warnings but miss the ones generated for
missing syscalls)"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Wire renameat2() syscall

Changed files
+3 -1
arch
powerpc
include
asm
uapi
asm
+1
arch/powerpc/include/asm/systbl.h
··· 361 361 SYSCALL(ni_syscall) /* sys_kcmp */ 362 362 SYSCALL_SPU(sched_setattr) 363 363 SYSCALL_SPU(sched_getattr) 364 + SYSCALL_SPU(renameat2)
+1 -1
arch/powerpc/include/asm/unistd.h
··· 12 12 #include <uapi/asm/unistd.h> 13 13 14 14 15 - #define __NR_syscalls 357 15 + #define __NR_syscalls 358 16 16 17 17 #define __NR__exit __NR_exit 18 18 #define NR_syscalls __NR_syscalls
+1
arch/powerpc/include/uapi/asm/unistd.h
··· 379 379 #define __NR_kcmp 354 380 380 #define __NR_sched_setattr 355 381 381 #define __NR_sched_getattr 356 382 + #define __NR_renameat2 357 382 383 383 384 #endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */