diff --git a/[refs] b/[refs] index ca3c1f84d664..7fab84d3a082 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8043ecb17bd2e4b034006bee315efeea3936278 +refs/heads/master: b64af9b54c17008705367f554131415793a03fba diff --git a/trunk/arch/parisc/mm/init.c b/trunk/arch/parisc/mm/init.c index 1f012843150f..4ce60556d45d 100644 --- a/trunk/arch/parisc/mm/init.c +++ b/trunk/arch/parisc/mm/init.c @@ -555,8 +555,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) {