upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / arch / ia64 / mm / discontig.c

diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index eb464cb..3c2b76a 100644 (file)
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -16,6 +16,8 @@
 #include <linux/bootmem.h>
 #include <linux/acpi.h>
 #include <linux/efi.h>
+#include <linux/nodemask.h>
+#include <linux/module.h>
 #include <asm/pgalloc.h>
 #include <asm/tlb.h>
 #include <asm/meminit.h>
@@ -544,6 +546,8 @@ void show_mem(void)
        printk("%d free buffer pages\n", nr_free_buffer_pages());
 }
 
+EXPORT_SYMBOL_GPL(show_mem);
+
 /**
  * call_pernode_memory - use SRAT to call callback functions with node info
  * @start: physical start of range
@@ -601,7 +605,7 @@ void call_pernode_memory(unsigned long start, unsigned long len, void *arg)
  * for each piece of usable memory and will setup these values for each node.
  * Very similar to build_maps().
  */
-static int count_node_pages(unsigned long start, unsigned long len, int node)
+static __init int count_node_pages(unsigned long start, unsigned long len, int node)
 {
        unsigned long end = start + len;
 
@@ -626,7 +630,7 @@ static int count_node_pages(unsigned long start, unsigned long len, int node)
  * paging_init() sets up the page tables for each node of the system and frees
  * the bootmem allocator memory for general use.
  */
-void paging_init(void)
+void __init paging_init(void)
 {
        unsigned long max_dma;
        unsigned long zones_size[MAX_NR_ZONES];
@@ -680,7 +684,7 @@ void paging_init(void)
                                PAGE_ALIGN(max_low_pfn * sizeof(struct page));
                        vmem_map = (struct page *) vmalloc_end;
 
-                       efi_memmap_walk(create_mem_map_page_table, 0);
+                       efi_memmap_walk(create_mem_map_page_table, NULL);
                        printk("Virtual mem_map starts at 0x%p\n", vmem_map);
                }