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

1 files changed, 4 insertions, 1 deletions

diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
index fd8fa9aa7c4e..5b3add31f9f1 100755
--- a/scripts/checksyscalls.sh
+++ b/scripts/checksyscalls.sh
@@ -25,7 +25,7 @@ cat << EOF
 #define __IGNORE_rmdir          /* unlinkat */
 #define __IGNORE_lchown         /* fchownat */
 #define __IGNORE_access         /* faccessat */
-#define __IGNORE_rename         /* renameat */
+#define __IGNORE_rename         /* renameat2 */
 #define __IGNORE_readlink       /* readlinkat */
 #define __IGNORE_symlink        /* symlinkat */
 #define __IGNORE_utimes         /* futimesat */
@@ -37,6 +37,9 @@ cat << EOF
 #define __IGNORE_lstat64        /* fstatat64 */
 #endif
 
+/* Missing flags argument */
+#define __IGNORE_renameat       /* renameat2 */
+
 /* CLOEXEC flag */
 #define __IGNORE_pipe           /* pipe2 */
 #define __IGNORE_dup2           /* dup3 */