diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-27 10:44:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-27 10:44:51 -0700 |
| commit | d3e68cef893c5582a1d54db4126d81245b8382f9 (patch) | |
| tree | 67fd95ad7be7ef125b166fbc2f6c99009afff357 /arch/m68k/include/asm/unistd.h | |
| parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
| parent | e3b1ebd673876f2cdb0b84205e52a33b94a9860f (diff) | |
| download | linux-0-day-d3e68cef893c5582a1d54db4126d81245b8382f9.tar.gz linux-0-day-d3e68cef893c5582a1d54db4126d81245b8382f9.tar.xz | |
Merge tag 'm68k-for-v4.11-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- build warning fix
- defconfig updates
- wire up new statx syscall
* tag 'm68k-for-v4.11-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Wire up statx
m68k/defconfig: Update defconfigs for v4.11-rc1
m68k/bitops: Correct signature of test_bit()
Diffstat (limited to 'arch/m68k/include/asm/unistd.h')
| -rw-r--r-- | arch/m68k/include/asm/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h index a857d82ec5094..aab1edd0d4bad 100644 --- a/arch/m68k/include/asm/unistd.h +++ b/arch/m68k/include/asm/unistd.h @@ -4,7 +4,7 @@ #include <uapi/asm/unistd.h> -#define NR_syscalls 379 +#define NR_syscalls 380 #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT |