diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-21 22:34:57 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-21 22:34:57 +0200 |
commit | 80932ec1c0da97674417b35ac5aec31732993d8d (patch) | |
tree | 235132f5bafc3af4a29628b37aafc827d0cb1054 /arch/m68k/kernel | |
parent | Merge tag 'iommu-fixes-v3.15-rc5' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | scripts/checksyscalls.sh: Make renameat optional (diff) | |
download | linux-80932ec1c0da97674417b35ac5aec31732993d8d.tar.xz linux-80932ec1c0da97674417b35ac5aec31732993d8d.zip |
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
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r-- | arch/m68k/kernel/syscalltable.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S index b6223dc41d82..501e10212789 100644 --- a/arch/m68k/kernel/syscalltable.S +++ b/arch/m68k/kernel/syscalltable.S @@ -371,4 +371,5 @@ ENTRY(sys_call_table) .long sys_finit_module .long sys_sched_setattr .long sys_sched_getattr /* 350 */ + .long sys_renameat2 |