patch-2.4.0-test4 linux/arch/ppc/mm/init.c

• Lines: 22
• Date: Thu Jul 13 09:42:51 2000
• Orig file: v2.4.0-test3/linux/arch/ppc/mm/init.c
• Orig date: Fri Jun 23 21:55:08 2000

diff -u --recursive --new-file v2.4.0-test3/linux/arch/ppc/mm/init.c linux/arch/ppc/mm/init.c
@@ -931,6 +931,9 @@
 	/* How about ppc_md.md_find_end_of_memory instead of these
 	 * ifdefs?  -- Dan.
 	 */
+#ifdef CONFIG_BOOTX_TEXT
+extern boot_infos_t *disp_bi;
+#endif
 void __init MMU_init(void)
 {
 	if ( ppc_md.progress ) ppc_md.progress("MMU:enter", 0x111);
@@ -1050,6 +1053,11 @@
 #endif
 #endif /* CONFIG_8xx */
 	if ( ppc_md.progress ) ppc_md.progress("MMU:exit", 0x211);
+#ifdef CONFIG_BOOTX_TEXT
+	/* Must be done last, or ppc_md.progress will die */
+	if (_machine == _MACH_Pmac)
+		map_bootx_text();
+#endif
 }
 #endif /* CONFIG_4xx */