projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with /home/shaggy/git/linus-clean/
[powerpc.git]
/
arch
/
mips
/
mm
/
pgtable.c
diff --git
a/arch/mips/mm/pgtable.c
b/arch/mips/mm/pgtable.c
index
3b88fde
..
3fe9420
100644
(file)
--- a/
arch/mips/mm/pgtable.c
+++ b/
arch/mips/mm/pgtable.c
@@
-5,7
+5,7
@@
void show_mem(void)
{
-#ifndef CONFIG_
DISCONTIGMEM
/* XXX(hch): later.. */
+#ifndef CONFIG_
NEED_MULTIPLE_NODES
/* XXX(hch): later.. */
int pfn, total = 0, reserved = 0;
int shared = 0, cached = 0;
int highmem = 0;