| Message ID | 20170317011119.31091-1-david@gibson.dropbear.id.au (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7339390d772ddee0447886d72c3aebc3b58d9583 |
| Headers | show |
On Fri, 2017-03-17 at 01:11:19 UTC, David Gibson wrote: > As of 438cc81a41 "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 available we'll give a harmless, > but scary warning. This patch suppresses the warning in this case. It > will still warn if the feature is supposed to be available, but didn't > work. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/7339390d772ddee0447886d72c3aeb cheers
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index c554768..cc16e4f 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c @@ -771,7 +771,7 @@ void resize_hpt_for_hotplug(unsigned long new_mem_size) int rc; rc = mmu_hash_ops.resize_hpt(target_hpt_shift); - if (rc) + if (rc && (rc != -ENODEV)) printk(KERN_WARNING "Unable to resize hash page table to target order %d: %d\n", target_hpt_shift, rc);
As of 438cc81a41 "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 available we'll give a harmless, but scary warning. This patch suppresses the warning in this case. It will still warn if the feature is supposed to be available, but didn't work. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- arch/powerpc/mm/hash_utils_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Kind of cosmetic, but getting an error message on every memory hot plug/unplug attempt if your host doesn't support HPT resizing is pretty ugly. So I think this is a candidate for quick inclusion.