Merge branch 'akpm' (patches from Andrew)

[platform/kernel/linux-rpi.git] / arch / powerpc / mm / mem.c

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index ec68c9e..42e2587 100644 (file)
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -126,8 +126,6 @@ int __ref arch_add_memory(int nid, u64 start, u64 size,
        unsigned long nr_pages = size >> PAGE_SHIFT;
        int rc;
 
-       resize_hpt_for_hotplug(memblock_phys_mem_size());
-
        start = (unsigned long)__va(start);
        rc = create_section_mapping(start, start + size, nid,
                                    params->pgprot);
@@ -160,9 +158,6 @@ void __ref arch_remove_memory(int nid, u64 start, u64 size,
         * hit that section of memory
         */
        vm_unmap_aliases();
-
-       if (resize_hpt_for_hotplug(memblock_phys_mem_size()) == -ENOSPC)
-               pr_warn("Hash collision while resizing HPT\n");
 }
 #endif