patch-2.4.0-test4 linux/arch/ppc/kernel/setup.c

• Lines: 64
• Date: Thu Jul 13 09:42:50 2000
• Orig file: v2.4.0-test3/linux/arch/ppc/kernel/setup.c
• Orig date: Fri Jun 23 21:55:07 2000

diff -u --recursive --new-file v2.4.0-test3/linux/arch/ppc/kernel/setup.c linux/arch/ppc/kernel/setup.c
@@ -75,9 +75,6 @@
                       unsigned long r6,
                       unsigned long r7);
 
-#ifdef CONFIG_BOOTX_TEXT
-extern void map_bootx_text(void);
-#endif
 #ifdef CONFIG_XMON
 extern void xmon_map_scc(void);
 #endif
@@ -110,6 +107,14 @@
 struct machdep_calls ppc_md;
 
 /*
+ * These are used in binfmt_elf.c to put aux entries on the stack
+ * for each elf executable being started.
+ */
+int dcache_bsize;
+int icache_bsize;
+int ucache_bsize;
+
+/*
  * Perhaps we can put the pmac screen_info[] here
  * on pmac as well so we don't need the ifdef's.
  * Until we get multiple-console support in here
@@ -131,14 +136,6 @@
 };
 
 /*
- * These are used in binfmt_elf.c to put aux entries on the stack
- * for each elf executable being started.
- */
-int dcache_bsize;
-int icache_bsize;
-int ucache_bsize;
-
-/*
  * I really need to add multiple-console support... -- Cort
  */
 int __init pmac_display_supported(char *name)
@@ -286,7 +283,7 @@
 		case 0x000C:
 			len += sprintf(len+buffer, "7400 (G4");
 #ifdef CONFIG_ALTIVEC
-			len += sprintf(len+buffer, ", altivec enabled");
+			len += sprintf(len+buffer, ", altivec supported");
 #endif /* CONFIG_ALTIVEC */
 			len += sprintf(len+buffer, ")\n");
 			break;
@@ -686,14 +683,9 @@
 	extern char *klimit;
 	extern void do_init_bootmem(void);
 
-#ifdef CONFIG_BOOTX_TEXT
-	map_bootx_text();
-#endif
-
 #ifdef CONFIG_ALL_PPC
 	feature_init();
 #endif
-
 #ifdef CONFIG_XMON
 	xmon_map_scc();
 	if (strstr(cmd_line, "xmon"))