Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 204fe038 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 568180a5 8212f58a

arch/powerpc/include/asm/systbl.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -361,3 +361,4 @@ SYSCALL(finit_module) 
SYSCALL(ni_syscall) /* sys_kcmp */

SYSCALL(ni_syscall) /* sys_kcmp */

SYSCALL_SPU(sched_setattr)

SYSCALL_SPU(sched_setattr)

SYSCALL_SPU(sched_getattr)

SYSCALL_SPU(sched_getattr)

SYSCALL_SPU(renameat2)

arch/powerpc/include/asm/unistd.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <uapi/asm/unistd.h>

#include <uapi/asm/unistd.h>









#define __NR_syscalls		357

#define __NR_syscalls		358





#define __NR__exit __NR_exit

#define __NR__exit __NR_exit

#define NR_syscalls	__NR_syscalls

#define NR_syscalls	__NR_syscalls

arch/powerpc/include/uapi/asm/unistd.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -379,5 +379,6 @@ 
#define __NR_kcmp		354

#define __NR_kcmp		354

#define __NR_sched_setattr	355

#define __NR_sched_setattr	355

#define __NR_sched_getattr	356

#define __NR_sched_getattr	356

#define __NR_renameat2		357





#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */
 
#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */