Commit a07a6e41 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 4571bc5a 8971e1c7
...@@ -387,3 +387,4 @@ SYSCALL(copy_file_range) ...@@ -387,3 +387,4 @@ SYSCALL(copy_file_range)
COMPAT_SYS_SPU(preadv2) COMPAT_SYS_SPU(preadv2)
COMPAT_SYS_SPU(pwritev2) COMPAT_SYS_SPU(pwritev2)
SYSCALL(kexec_file_load) SYSCALL(kexec_file_load)
SYSCALL(statx)
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <uapi/asm/unistd.h> #include <uapi/asm/unistd.h>
#define NR_syscalls 383 #define NR_syscalls 384
#define __NR__exit __NR_exit #define __NR__exit __NR_exit
......
...@@ -393,5 +393,6 @@ ...@@ -393,5 +393,6 @@
#define __NR_preadv2 380 #define __NR_preadv2 380
#define __NR_pwritev2 381 #define __NR_pwritev2 381
#define __NR_kexec_file_load 382 #define __NR_kexec_file_load 382
#define __NR_statx 383
#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */ #endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */
...@@ -751,7 +751,9 @@ void __init hpte_init_pseries(void) ...@@ -751,7 +751,9 @@ void __init hpte_init_pseries(void)
mmu_hash_ops.flush_hash_range = pSeries_lpar_flush_hash_range; mmu_hash_ops.flush_hash_range = pSeries_lpar_flush_hash_range;
mmu_hash_ops.hpte_clear_all = pseries_hpte_clear_all; mmu_hash_ops.hpte_clear_all = pseries_hpte_clear_all;
mmu_hash_ops.hugepage_invalidate = pSeries_lpar_hugepage_invalidate; mmu_hash_ops.hugepage_invalidate = pSeries_lpar_hugepage_invalidate;
mmu_hash_ops.resize_hpt = pseries_lpar_resize_hpt;
if (firmware_has_feature(FW_FEATURE_HPT_RESIZE))
mmu_hash_ops.resize_hpt = pseries_lpar_resize_hpt;
} }
void radix_init_pseries(void) void radix_init_pseries(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment