Commit 80932ec1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'renameat2' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs 

Pull renameat2 arch support from Miklos Szeredi:
 "I've collected architecture patches for the renameat2 syscall that
  maintainers acked and/or asked me to queue.

  This adds architecture support for the renameat2 syscall to m68k,
  parisc, ia64 and through asm-generic to arc, arm64, c6x, hexagon,
  metag, openrisc, score, tile, unicore32"

* 'renameat2' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  scripts/checksyscalls.sh: Make renameat optional
  asm-generic: Add renameat2 syscall
  ia64: add renameat2 syscall
  parisc: add renameat2 syscall
  m68k: add renameat2 syscall
parents 989d216f 68b77524

arch/ia64/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 






#define NR_syscalls			314 /* length of syscall table */

#define NR_syscalls			315 /* length of syscall table */



/*

 * The following defines stop scripts/checksyscalls.sh from complaining about

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

+1 −0
Original line number Diff line number Diff line
@@ -327,5 +327,6 @@ 
#define __NR_finit_module		1335

#define __NR_sched_setattr		1336

#define __NR_sched_getattr		1337

#define __NR_renameat2			1338



#endif /* _UAPI_ASM_IA64_UNISTD_H */

arch/ia64/kernel/entry.S

+1 −0
Original line number Diff line number Diff line
@@ -1775,6 +1775,7 @@ sys_call_table: 
	data8 sys_finit_module			// 1335

	data8 sys_sched_setattr

	data8 sys_sched_getattr

	data8 sys_renameat2



	.org sys_call_table + 8*NR_syscalls	// guard against failures to increase NR_syscalls

#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */

arch/m68k/include/asm/unistd.h

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





#define NR_syscalls		351

#define NR_syscalls		352



#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_OLD_STAT

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

+1 −0
Original line number Diff line number Diff line
@@ -356,5 +356,6 @@ 
#define __NR_finit_module	348

#define __NR_sched_setattr	349

#define __NR_sched_getattr	350

#define __NR_renameat2		351



#endif /* _UAPI_ASM_M68K_UNISTD_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE