Merge branch 'akpm-current/current'

[karo-tx-linux.git] / arch / metag / mm / init.c

diff --git a/arch/metag/mm/init.c b/arch/metag/mm/init.c
index 123919534b80fe3724612b61697441305d5b10a6..11fa51c89617deb1a303c6bfdbf82b2a32a1e4db 100644 (file)
--- a/arch/metag/mm/init.c
+++ b/arch/metag/mm/init.c
@@ -12,7 +12,6 @@
 #include <linux/percpu.h>
 #include <linux/memblock.h>
 #include <linux/initrd.h>
-#include <linux/of_fdt.h>
 
 #include <asm/setup.h>
 #include <asm/page.h>
@@ -149,7 +148,7 @@ static void __init bootmem_init_one_node(unsigned int nid)
        if (!p->node_spanned_pages)
                return;
 
-       end_pfn = p->node_start_pfn + p->node_spanned_pages;
+       end_pfn = pgdat_end_pfn(p);
 #ifdef CONFIG_HIGHMEM
        if (end_pfn > max_low_pfn)
                end_pfn = max_low_pfn;
@@ -205,7 +204,8 @@ static void __init do_init_bootmem(void)
                start_pfn = memblock_region_memory_base_pfn(reg);
                end_pfn = memblock_region_memory_end_pfn(reg);
                memblock_set_node(PFN_PHYS(start_pfn),
-                                 PFN_PHYS(end_pfn - start_pfn), 0);
+                                 PFN_PHYS(end_pfn - start_pfn),
+                                 &memblock.memory, 0);
        }
 
        /* All of system RAM sits in node 0 for the non-NUMA case */
@@ -405,11 +405,3 @@ void free_initrd_mem(unsigned long start, unsigned long end)
                           "initrd");
 }
 #endif
-
-#ifdef CONFIG_OF_FLATTREE
-void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
-{
-       pr_err("%s(%llx, %llx)\n",
-              __func__, start, end);
-}
-#endif /* CONFIG_OF_FLATTREE */