From e2704970d3cfb5f201d82ed1b77ce6eea1680c92 Mon Sep 17 00:00:00 2001
From: Johannes Weiner <hannes@saeurebad.de>
Date: Mon, 10 Mar 2008 21:10:57 +0100
Subject: [PATCH] --- yaml --- r: 88765 b: refs/heads/master c:
 1415d160c7f7fe8f1026735d5b6cc19aec7a367f h: refs/heads/master i:   88763:
 e381370503d735a932bb85d2704562fc5d3272a7 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/mm/init_64.c    | 3 ---
 trunk/arch/x86/mm/pgtable_32.c | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 42c072fa45b6..a7925fe0d69e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b0e508415a83989fe704b4718a1a214bc333ca7
+refs/heads/master: 1415d160c7f7fe8f1026735d5b6cc19aec7a367f
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
index 4cb6c7f80f07..255e51feb157 100644
--- a/trunk/arch/x86/mm/init_64.c
+++ b/trunk/arch/x86/mm/init_64.c
@@ -89,9 +89,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));
-
 	for_each_online_pgdat(pgdat) {
 		for (i = 0; i < pgdat->node_spanned_pages; ++i) {
 			/*
diff --git a/trunk/arch/x86/mm/pgtable_32.c b/trunk/arch/x86/mm/pgtable_32.c
index 76e4f4d26272..3165ec0672bd 100644
--- a/trunk/arch/x86/mm/pgtable_32.c
+++ b/trunk/arch/x86/mm/pgtable_32.c
@@ -36,7 +36,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));
 	for_each_online_pgdat(pgdat) {
 		pgdat_resize_lock(pgdat, &flags);
 		for (i = 0; i < pgdat->node_spanned_pages; ++i) {