| Message ID | 1467695274-14667-41-git-send-email-benh@kernel.crashing.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, 2016-05-07 at 05:07:54 UTC, Benjamin Herrenschmidt wrote: > For memory hotplug to work, the MMU code needs to provide the functions > create_section_mapping() and remove_section_mapping() to respectively > map and unmap portions of the linear mapping. > > At the moment only hash64 provides these, so we provide weak stubs that > just error out. This fixes the build with configurations such as 64-bit > BookE with CONFIG_MEMORY_HOTPLUG enabled. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/fecbfabe1dc940525f26eb1683 cheers
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 2fd57fa..b0b8f25 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -116,6 +116,16 @@ int memory_add_physaddr_to_nid(u64 start) } #endif +int __weak create_section_mapping(unsigned long start, unsigned long end) +{ + return -ENODEV; +} + +int __weak remove_section_mapping(unsigned long start, unsigned long end) +{ + return -ENODEV; +} + int arch_add_memory(int nid, u64 start, u64 size, bool for_device) { struct pglist_data *pgdata;
For memory hotplug to work, the MMU code needs to provide the functions create_section_mapping() and remove_section_mapping() to respectively map and unmap portions of the linear mapping. At the moment only hash64 provides these, so we provide weak stubs that just error out. This fixes the build with configurations such as 64-bit BookE with CONFIG_MEMORY_HOTPLUG enabled. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- arch/powerpc/mm/mem.c | 10 ++++++++++ 1 file changed, 10 insertions(+)