summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-17 19:20:46 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-17 19:20:46 +1000
commit30cd4a4e9c25e154ba087848a839bd0c6d024092 (patch)
tree8ba678b5e025b1d5e1f1b18e14662d2da720a0f7 /arch/powerpc/mm
parent7dffb72028bfd909ac51a1546d182de2df4d2426 (diff)
downloadlinux-30cd4a4e9c25e154ba087848a839bd0c6d024092.tar.gz
linux-30cd4a4e9c25e154ba087848a839bd0c6d024092.tar.bz2
linux-30cd4a4e9c25e154ba087848a839bd0c6d024092.zip
powerpc: Initialize btext subsystem later, after prom_init
We were initializing the btext stuff from prom_init(), thus breaking the rule that all communication between prom_init() and the rest of the kernel has to be via the flattened device tree. This removes the btext initialization calls from prom_init() and initializes it instead after the device tree is unflattened. It would be nice to do it earlier, but that needs some more infrastructure to find the properties we need in the flattened device tree. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r--arch/powerpc/mm/init_32.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index bf13c14e66b3..caeb02ee72c5 100644
--- a/arch/powerpc/mm/init_32.c
+++ b/arch/powerpc/mm/init_32.c
@@ -188,13 +188,6 @@ void __init MMU_init(void)
if (ppc_md.progress)
ppc_md.progress("MMU:exit", 0x211);
-
-#ifdef CONFIG_BOOTX_TEXT
- /* By default, we are no longer mapped */
- boot_text_mapped = 0;
- /* Must be done last, or ppc_md.progress will die. */
- map_boot_text();
-#endif
}
/* This is only called until mem_init is done. */