diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2017-03-17 16:02:35 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-03-17 16:10:58 +1100 |
| commit | 8971e1c79d3f6c9a5e6f7a65c50c41f434a4dae6 (patch) | |
| tree | dcdab00a415a31400f3eca1e2eabc6e27557921a /arch | |
| parent | f717629c7f834ab2efa05c7dbf0826f1d7c32ade (diff) | |
| download | linux-stable-8971e1c79d3f6c9a5e6f7a65c50c41f434a4dae6.tar.gz linux-stable-8971e1c79d3f6c9a5e6f7a65c50c41f434a4dae6.tar.bz2 linux-stable-8971e1c79d3f6c9a5e6f7a65c50c41f434a4dae6.zip | |
powerpc/pseries: Don't give a warning when HPT resizing isn't available
As of commit 438cc81a41e8 ("powerpc/pseries: Automatically resize HPT
for memory hot add/remove"), when running on the pseries platform, we
always attempt to use the PAPR extension to resize the hashed page
table (HPT) when we add or remove memory.
This is fine, but when the extension is not available we'll give a
harmless, but scary warning. Instead check if the firmware supports HPT
resizing before populating the mmu_hash_ops.resize_hpt pointer.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/pseries/lpar.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c index 251060cf1713..8b1fe895daa3 100644 --- a/arch/powerpc/platforms/pseries/lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c @@ -751,7 +751,9 @@ void __init hpte_init_pseries(void) mmu_hash_ops.flush_hash_range = pSeries_lpar_flush_hash_range; mmu_hash_ops.hpte_clear_all = pseries_hpte_clear_all; 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) |