diff options
Diffstat (limited to 'arch/ppc/kernel/setup.c')
| -rw-r--r-- | arch/ppc/kernel/setup.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index 6c0c38273..67387cca0 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c @@ -75,9 +75,6 @@ extern void gemini_init(unsigned long r3, 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 @@ unsigned long SYSRQ_KEY; 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 @@ struct screen_info screen_info = { }; /* - * 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 @@ int get_cpuinfo(char *buffer) 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 @@ void __init setup_arch(char **cmdline_p) 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")) |