Merge branch 'linux-2.6'

[linux-2.6] / arch / ppc / mm / init.c

diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c
index dd898d32480ef981d65267637da2bfecfa083641..7444df3889c5ef1da02f21e665531104df95b33f 100644 (file)
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -241,12 +241,6 @@ void __init MMU_init(void)
        if (__max_memory && total_memory > __max_memory)
                total_memory = __max_memory;
        total_lowmem = total_memory;
-#ifdef CONFIG_FSL_BOOKE
-       /* Freescale Book-E parts expect lowmem to be mapped by fixed TLB
-        * entries, so we need to adjust lowmem to match the amount we can map
-        * in the fixed entries */
-       adjust_total_lowmem();
-#endif /* CONFIG_FSL_BOOKE */
        if (total_lowmem > __max_low_memory) {
                total_lowmem = __max_low_memory;
 #ifndef CONFIG_HIGHMEM