diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-19 18:49:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-19 18:49:28 -0700 |
| commit | a07a6e4121f1d4e1bbaead8210404a7f37139267 (patch) | |
| tree | 6d4a06a64c146616df97859ab9aa9a0b94b7c8ab /arch/powerpc/include/asm/unistd.h | |
| parent | 4571bc5abfba3bed8cb18f640bfcaf336473aee3 (diff) | |
| parent | 8971e1c79d3f6c9a5e6f7a65c50c41f434a4dae6 (diff) | |
Merge tag 'powerpc-4.11-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull more powerpc fixes from Michael Ellerman:
"A couple of minor powerpc fixes for 4.11:
- wire up statx() syscall
- don't print a warning on memory hotplug when HPT resizing isn't
available
Thanks to: David Gibson, Chandan Rajendra"
* tag 'powerpc-4.11-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/pseries: Don't give a warning when HPT resizing isn't available
powerpc: Wire up statx() syscall
Diffstat (limited to 'arch/powerpc/include/asm/unistd.h')
| -rw-r--r-- | arch/powerpc/include/asm/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h index eb1acee91a20..9ba11dbcaca9 100644 --- a/arch/powerpc/include/asm/unistd.h +++ b/arch/powerpc/include/asm/unistd.h @@ -12,7 +12,7 @@ #include <uapi/asm/unistd.h> -#define NR_syscalls 383 +#define NR_syscalls 384 #define __NR__exit __NR_exit |