Merge ../linux-2.6 by hand

1 files changed, 47 insertions, 3 deletions

diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index b5c90e548195..a88cdb7232f8 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -421,6 +421,37 @@ static void __init memory_less_nodes(void)
         return;
 }
 
+#ifdef CONFIG_SPARSEMEM
+/**
+ * register_sparse_mem - notify SPARSEMEM that this memory range exists.
+ * @start: physical start of range
+ * @end: physical end of range
+ * @arg: unused
+ *
+ * Simply calls SPARSEMEM to register memory section(s).
+ */
+static int __init register_sparse_mem(unsigned long start, unsigned long end,
+        void *arg)
+{
+        int nid;
+
+        start = __pa(start) >> PAGE_SHIFT;
+        end = __pa(end) >> PAGE_SHIFT;
+        nid = early_pfn_to_nid(start);
+        memory_present(nid, start, end);
+
+        return 0;
+}
+
+static void __init arch_sparse_init(void)
+{
+        efi_memmap_walk(register_sparse_mem, NULL);
+        sparse_init();
+}
+#else
+#define arch_sparse_init() do {} while (0)
+#endif
+
 /**
  * find_memory - walk the EFI memory map and setup the bootmem allocator
  *
@@ -524,12 +555,18 @@ void show_mem(void)
         show_free_areas();
         printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
         for_each_pgdat(pgdat) {
-                unsigned long present = pgdat->node_present_pages;
+                unsigned long present;
+                unsigned long flags;
                 int shared = 0, cached = 0, reserved = 0;
+
                 printk("Node ID: %d\n", pgdat->node_id);
+                pgdat_resize_lock(pgdat, &flags);
+                present = pgdat->node_present_pages;
                 for(i = 0; i < pgdat->node_spanned_pages; i++) {
-                        struct page *page = pgdat_page_nr(pgdat, i);
-                        if (!ia64_pfn_valid(pgdat->node_start_pfn+i))
+                        struct page *page;
+                        if (pfn_valid(pgdat->node_start_pfn + i))
+                                page = pfn_to_page(pgdat->node_start_pfn + i);
+                        else
                                 continue;
                         if (PageReserved(page))
                                 reserved++;
@@ -538,6 +575,7 @@ void show_mem(void)
                         else if (page_count(page))
                                 shared += page_count(page)-1;
                 }
+                pgdat_resize_unlock(pgdat, &flags);
                 total_present += present;
                 total_reserved += reserved;
                 total_cached += cached;
@@ -648,12 +686,16 @@ void __init paging_init(void)
 
         max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT;
 
+        arch_sparse_init();
+
         efi_memmap_walk(filter_rsvd_memory, count_node_pages);
 
+#ifdef CONFIG_VIRTUAL_MEM_MAP
         vmalloc_end -= PAGE_ALIGN(max_low_pfn * sizeof(struct page));
         vmem_map = (struct page *) vmalloc_end;
         efi_memmap_walk(create_mem_map_page_table, NULL);
         printk("Virtual mem_map starts at 0x%p\n", vmem_map);
+#endif
 
         for_each_online_node(node) {
                 memset(zones_size, 0, sizeof(zones_size));
@@ -690,7 +732,9 @@ void __init paging_init(void)
 
                 pfn_offset = mem_data[node].min_pfn;
 
+#ifdef CONFIG_VIRTUAL_MEM_MAP
                 NODE_DATA(node)->node_mem_map = vmem_map + pfn_offset;
+#endif
                 free_area_init_node(node, NODE_DATA(node), zones_size,
                                     pfn_offset, zholes_size);
         }