Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-24 20:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

ppc64: Move init_boot_text call and conswitchp init into setup_arch

Browse Source 
This way they get done in one place for all platforms, and it is
more consistent with what ppc32 does.

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras 2005-10-20 21:00:20 +10:00
parent 399fe2bdd3
commit 0458060c1c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/powerpc/kernel/setup_64.c
View File

@ -586,6 +586,10 @@ void __init setup_system(void)
*/ */
finish_device_tree(); finish_device_tree();
#ifdef CONFIG_BOOTX_TEXT
init_boot_display();
#endif
/* /*
* Initialize xmon * Initialize xmon
*/ */
@ -1039,6 +1043,10 @@ void __init setup_arch(char **cmdline_p)
/* initialize the syscall map in systemcfg */ /* initialize the syscall map in systemcfg */
setup_syscall_map(); setup_syscall_map();
#ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con;
#endif
ppc_md.setup_arch(); ppc_md.setup_arch();
/* Use the default idle loop if the platform hasn't provided one. */ /* Use the default idle loop if the platform hasn't provided one. */

4
arch/powerpc/platforms/pseries/setup.c
View File

@ -241,10 +241,6 @@ static void __init pSeries_setup_arch(void)
find_and_init_phbs(); find_and_init_phbs();
eeh_init(); eeh_init();
#ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con;
#endif
pSeries_nvram_init(); pSeries_nvram_init();
/* Choose an idle loop */ /* Choose an idle loop */