1 files changed, 11 insertions, 6 deletions

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index f6787f90e158..cd525d709072 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -54,7 +54,7 @@
 #include <asm/swiotlb.h>
 #include <asm/rtas.h>
 
-#include "mmu_decl.h"
+#include <mm/mmu_decl.h>
 
 #ifndef CPU_FTR_COHERENT_ICACHE
 #define CPU_FTR_COHERENT_ICACHE 0       /* XXX for now */
@@ -109,8 +109,8 @@ int __weak remove_section_mapping(unsigned long start, unsigned long end)
         return -ENODEV;
 }
 
-int __meminit arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,
-                bool want_memblock)
+int __ref arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,
+                          bool want_memblock)
 {
         unsigned long start_pfn = start >> PAGE_SHIFT;
         unsigned long nr_pages = size >> PAGE_SHIFT;
@@ -131,8 +131,8 @@ int __meminit arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *
 }
 
 #ifdef CONFIG_MEMORY_HOTREMOVE
-int __meminit arch_remove_memory(int nid, u64 start, u64 size,
-                                        struct vmem_altmap *altmap)
+int __ref arch_remove_memory(int nid, u64 start, u64 size,
+                             struct vmem_altmap *altmap)
 {
         unsigned long start_pfn = start >> PAGE_SHIFT;
         unsigned long nr_pages = size >> PAGE_SHIFT;
@@ -161,7 +161,8 @@ int __meminit arch_remove_memory(int nid, u64 start, u64 size,
          */
         vm_unmap_aliases();
 
-        resize_hpt_for_hotplug(memblock_phys_mem_size());
+        if (resize_hpt_for_hotplug(memblock_phys_mem_size()) == -ENOSPC)
+                pr_warn("Hash collision while resizing HPT\n");
 
         return ret;
 }
@@ -309,6 +310,10 @@ void __init mem_init(void)
         mem_init_print_info(NULL);
 #ifdef CONFIG_PPC32
         pr_info("Kernel virtual memory layout:\n");
+#ifdef CONFIG_KASAN
+        pr_info("  * 0x%08lx..0x%08lx  : kasan shadow mem\n",
+                KASAN_SHADOW_START, KASAN_SHADOW_END);
+#endif
         pr_info("  * 0x%08lx..0x%08lx  : fixmap\n", FIXADDR_START, FIXADDR_TOP);
 #ifdef CONFIG_HIGHMEM
         pr_info("  * 0x%08lx..0x%08lx  : highmem PTEs\n",