git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/iommu-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
mm
/
init_32.c
diff --git
a/arch/powerpc/mm/init_32.c
b/arch/powerpc/mm/init_32.c
index
742da43
..
d65b591
100644
(file)
--- a/
arch/powerpc/mm/init_32.c
+++ b/
arch/powerpc/mm/init_32.c
@@
-148,7
+148,7
@@
void __init MMU_init(void)
lowmem_end_addr = memstart_addr + total_lowmem;
#ifndef CONFIG_HIGHMEM
total_memory = total_lowmem;
- memblock_enforce_memory_limit(
lowmem_end_addr
);
+ memblock_enforce_memory_limit(
total_lowmem
);
memblock_analyze();
#endif /* CONFIG_HIGHMEM */
}