1 files changed, 4 insertions, 29 deletions

diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
index d1f7439d173..3daefa04ace 100644
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@ -194,7 +194,7 @@ void *alloc_remap(int nid, unsigned long size)
         size = ALIGN(size, L1_CACHE_BYTES);
 
         if (!allocation || (allocation + size) >= node_remap_end_vaddr[nid])
-                return 0;
+                return NULL;
 
         node_remap_alloc_vaddr[nid] += size;
         memset(allocation, 0, size);
@@ -416,39 +416,14 @@ void __init initmem_init(unsigned long start_pfn,
         for_each_online_node(nid)
                 propagate_e820_map_node(nid);
 
-        for_each_online_node(nid)
+        for_each_online_node(nid) {
                 memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
+                NODE_DATA(nid)->bdata = &bootmem_node_data[nid];
+        }
 
-        NODE_DATA(0)->bdata = &bootmem_node_data[0];
         setup_bootmem_allocator();
 }
 
-void __init set_highmem_pages_init(void)
-{
-#ifdef CONFIG_HIGHMEM
-        struct zone *zone;
-        int nid;
-
-        for_each_zone(zone) {
-                unsigned long zone_start_pfn, zone_end_pfn;
-
-                if (!is_highmem(zone))
-                        continue;
-
-                zone_start_pfn = zone->zone_start_pfn;
-                zone_end_pfn = zone_start_pfn + zone->spanned_pages;
-
-                nid = zone_to_nid(zone);
-                printk(KERN_INFO "Initializing %s for node %d (%08lx:%08lx)\n",
-                                zone->name, nid, zone_start_pfn, zone_end_pfn);
-
-                add_highpages_with_active_regions(nid, zone_start_pfn,
-                                 zone_end_pfn);
-        }
-        totalram_pages += totalhigh_pages;
-#endif
-}
-
 #ifdef CONFIG_MEMORY_HOTPLUG
 static int paddr_to_nid(u64 addr)
 {