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

[linux-2.6] / arch / parisc / mm / init.c

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 9bb6136d77c2cecb3f5b3751f2a2aa19f513c330..ce0da689a89dac1e1eaf7ae45d77986b550796ac 100644 (file)
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -547,6 +547,7 @@ void __init mem_init(void)
 }
 
 unsigned long *empty_zero_page __read_mostly;
+EXPORT_SYMBOL(empty_zero_page);
 
 void show_mem(void)
 {
@@ -555,8 +556,6 @@ void show_mem(void)
 
        printk(KERN_INFO "Mem-info:\n");
        show_free_areas();
-       printk(KERN_INFO "Free swap:     %6ldkB\n",
-                               nr_swap_pages<<(PAGE_SHIFT-10));
 #ifndef CONFIG_DISCONTIGMEM
        i = max_mapnr;
        while (i-- > 0) {
@@ -606,9 +605,9 @@ void show_mem(void)
                int i, j;
 
                for (i = 0; i < npmem_ranges; i++) {
-                       zl = node_zonelist(i);
+                       zl = node_zonelist(i, 0);
                        for (j = 0; j < MAX_NR_ZONES; j++) {
-                               struct zone **z;
+                               struct zoneref *z;
                                struct zone *zone;
 
                                printk("Zone list for zone %d on node %d: ", j, i);