diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-24 15:24:37 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-24 15:24:37 -0700 |
commit | d04f90ffecb7f6d7358197d7544f5536b6d4d8cc (patch) | |
tree | 304b7d46e6f378171310e5a00495dd92e9d9b6e7 /arch/nios2 | |
parent | 5d22c5ab85e4de3c14d9e79eefc2835f4a8f9b2a (diff) | |
parent | b0da6d44157aa6e652de7634343708251ba64146 (diff) | |
download | linux-d04f90ffecb7f6d7358197d7544f5536b6d4d8cc.tar.gz linux-d04f90ffecb7f6d7358197d7544f5536b6d4d8cc.tar.bz2 linux-d04f90ffecb7f6d7358197d7544f5536b6d4d8cc.zip |
Merge tag 'asm-generic-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic cleanup from Arnd Bergmann:
"I have only one patch for asm-generic in this release, this one is
from James Hogan and updates the generic system call table for
renameat2 so we don't need to provide both renameat and renameat2 in
newly added architectures"
* tag 'asm-generic-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
asm-generic: Drop renameat syscall from default list
Diffstat (limited to 'arch/nios2')
-rw-r--r-- | arch/nios2/include/uapi/asm/unistd.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/nios2/include/uapi/asm/unistd.h b/arch/nios2/include/uapi/asm/unistd.h index c4bf79510461..51a32c71ce2b 100644 --- a/arch/nios2/include/uapi/asm/unistd.h +++ b/arch/nios2/include/uapi/asm/unistd.h @@ -17,6 +17,8 @@ #define sys_mmap2 sys_mmap_pgoff +#define __ARCH_WANT_RENAMEAT + /* Use the standard ABI for syscalls */ #include <asm-generic/unistd.h> |