diff options
| author | Reza Arbab | 2017-01-03 21:39:51 +0100 |
|---|---|---|
| committer | Michael Ellerman | 2017-01-17 00:05:43 +0100 |
| commit | 32b53c012e0bfe20b2745962a89db0dc72ef3270 (patch) | |
| tree | 4f6d713c1b48f508bdfe0bd802204aba11a40ec5 /arch/powerpc/mm/pgtable-book3s64.c | |
| parent | Linux 4.10-rc4 (diff) | |
| download | kernel-qcow2-linux-32b53c012e0bfe20b2745962a89db0dc72ef3270.tar.gz kernel-qcow2-linux-32b53c012e0bfe20b2745962a89db0dc72ef3270.tar.xz kernel-qcow2-linux-32b53c012e0bfe20b2745962a89db0dc72ef3270.zip | |
powerpc/mm: Fix memory hotplug BUG() on radix
Memory hotplug is leading to hash page table calls, even on radix:
arch_add_memory
create_section_mapping
htab_bolt_mapping
BUG_ON(!ppc_md.hpte_insert);
To fix, refactor {create,remove}_section_mapping() into hash__ and
radix__ variants. Leave the radix versions stubbed for now.
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Reza Arbab <arbab@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/mm/pgtable-book3s64.c')
| -rw-r--r-- | arch/powerpc/mm/pgtable-book3s64.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/powerpc/mm/pgtable-book3s64.c b/arch/powerpc/mm/pgtable-book3s64.c index ebf9782bacf9..653ff6c74ebe 100644 --- a/arch/powerpc/mm/pgtable-book3s64.c +++ b/arch/powerpc/mm/pgtable-book3s64.c @@ -126,3 +126,21 @@ void mmu_cleanup_all(void) else if (mmu_hash_ops.hpte_clear_all) mmu_hash_ops.hpte_clear_all(); } + +#ifdef CONFIG_MEMORY_HOTPLUG +int create_section_mapping(unsigned long start, unsigned long end) +{ + if (radix_enabled()) + return -ENODEV; + + return hash__create_section_mapping(start, end); +} + +int remove_section_mapping(unsigned long start, unsigned long end) +{ + if (radix_enabled()) + return -ENODEV; + + return hash__remove_section_mapping(start, end); +} +#endif /* CONFIG_MEMORY_HOTPLUG */ |