aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/setup.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2005-06-21 09:56:30 -0400
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 14:30:18 -0400
commitc83cfc9c9477d0bc0e0a1ba29dfc58e0d42b2faf (patch)
tree86c613b44ae25af1808b81dde2a4dc0274647194 /arch/mips/kernel/setup.c
parent8c93650890a33318263880dec36603a6d5749b7e (diff)
Get rid of early_init. There's more need to make this form of
initialization actually useful and as is certainly unmergable with upstream. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/setup.c')
-rw-r--r--arch/mips/kernel/setup.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 12b531c295c4..6fc51b298304 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -510,31 +510,7 @@ static inline void resource_init(void)
510#undef MAXMEM 510#undef MAXMEM
511#undef MAXMEM_PFN 511#undef MAXMEM_PFN
512 512
513static int __initdata earlyinit_debug; 513extern void plat_setup(void);
514
515static int __init earlyinit_debug_setup(char *str)
516{
517 earlyinit_debug = 1;
518 return 1;
519}
520__setup("earlyinit_debug", earlyinit_debug_setup);
521
522extern initcall_t __earlyinitcall_start, __earlyinitcall_end;
523
524static void __init do_earlyinitcalls(void)
525{
526 initcall_t *call, *start, *end;
527
528 start = &__earlyinitcall_start;
529 end = &__earlyinitcall_end;
530
531 for (call = start; call < end; call++) {
532 if (earlyinit_debug)
533 printk("calling earlyinitcall 0x%p\n", *call);
534
535 (*call)();
536 }
537}
538 514
539void __init setup_arch(char **cmdline_p) 515void __init setup_arch(char **cmdline_p)
540{ 516{
@@ -551,7 +527,7 @@ void __init setup_arch(char **cmdline_p)
551#endif 527#endif
552 528
553 /* call board setup routine */ 529 /* call board setup routine */
554 do_earlyinitcalls(); 530 plat_setup();
555 531
556 strlcpy(command_line, arcs_cmdline, sizeof(command_line)); 532 strlcpy(command_line, arcs_cmdline, sizeof(command_line));
557 strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE); 533 strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);