git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[sfrench/cifs-2.6.git]
/
arch
/
ppc
/
mm
/
init.c
diff --git
a/arch/ppc/mm/init.c
b/arch/ppc/mm/init.c
index 7444df3889c5ef1da02f21e665531104df95b33f..1a63711081b5f96443433f61dae2b71321d1b4ed 100644
(file)
--- a/
arch/ppc/mm/init.c
+++ b/
arch/ppc/mm/init.c
@@
-109,7
+109,6
@@
void show_mem(void)
printk("Mem-info:\n");
show_free_areas();
- printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
i = max_mapnr;
while (i-- > 0) {
total++;