Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[sfrench/cifs-2.6.git] / arch / m68k / mm / init.c

diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index a2bb01f5964230dccb312006a2832f5f4fac8f53..81bb08ceec18372e16110a86fe38b7ca441ba383 100644 (file)
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -32,8 +32,6 @@
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 
-static bootmem_data_t __initdata bootmem_data[MAX_NUMNODES];
-
 pg_data_t pg_data_map[MAX_NUMNODES];
 EXPORT_SYMBOL(pg_data_map);
 
@@ -58,7 +56,7 @@ void __init m68k_setup_node(int node)
                pg_data_table[i] = pg_data_map + node;
        }
 #endif
-       pg_data_map[node].bdata = bootmem_data + node;
+       pg_data_map[node].bdata = bootmem_node_data + node;
        node_set_online(node);
 }
 
@@ -69,36 +67,7 @@ void __init m68k_setup_node(int node)
  */
 
 void *empty_zero_page;
-
-void show_mem(void)
-{
-       pg_data_t *pgdat;
-       int free = 0, total = 0, reserved = 0, shared = 0;
-       int cached = 0;
-       int i;
-
-       printk("\nMem-info:\n");
-       show_free_areas();
-       for_each_online_pgdat(pgdat) {
-               for (i = 0; i < pgdat->node_spanned_pages; i++) {
-                       struct page *page = pgdat->node_mem_map + i;
-                       total++;
-                       if (PageReserved(page))
-                               reserved++;
-                       else if (PageSwapCache(page))
-                               cached++;
-                       else if (!page_count(page))
-                               free++;
-                       else
-                               shared += page_count(page) - 1;
-               }
-       }
-       printk("%d pages of RAM\n",total);
-       printk("%d free pages\n",free);
-       printk("%d reserved pages\n",reserved);
-       printk("%d pages shared\n",shared);
-       printk("%d pages swap cached\n",cached);
-}
+EXPORT_SYMBOL(empty_zero_page);
 
 extern void init_pointer_table(unsigned long ptable);