tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds a07a6e41 4571bc5a

options
unified split
Changed files
+6 -2
arch
powerpc
include
asm
systbl.h
unistd.h
uapi
asm
unistd.h
platforms
pseries
lpar.c
+1
arch/powerpc/include/asm/systbl.h
··· 387 387 COMPAT_SYS_SPU(preadv2) 388 388 COMPAT_SYS_SPU(pwritev2) 389 389 SYSCALL(kexec_file_load) 390 + SYSCALL(statx)
+1 -1
arch/powerpc/include/asm/unistd.h
··· 12 12 #include <uapi/asm/unistd.h> 13 13 14 14 15 - #define NR_syscalls 383 15 + #define NR_syscalls 384 16 16 17 17 #define __NR__exit __NR_exit 18 18
+1
arch/powerpc/include/uapi/asm/unistd.h
··· 393 393 #define __NR_preadv2 380 394 394 #define __NR_pwritev2 381 395 395 #define __NR_kexec_file_load 382 396 + #define __NR_statx 383 396 397 397 398 #endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */
+3 -1
arch/powerpc/platforms/pseries/lpar.c
··· 751 751 mmu_hash_ops.flush_hash_range = pSeries_lpar_flush_hash_range; 752 752 mmu_hash_ops.hpte_clear_all = pseries_hpte_clear_all; 753 753 mmu_hash_ops.hugepage_invalidate = pSeries_lpar_hugepage_invalidate; 754 - mmu_hash_ops.resize_hpt = pseries_lpar_resize_hpt; 754 + 755 + if (firmware_has_feature(FW_FEATURE_HPT_RESIZE)) 756 + mmu_hash_ops.resize_hpt = pseries_lpar_resize_hpt; 755 757 } 756 758 757 759 void radix_init_pseries(void)