diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-03-01 06:56:43 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-03-04 14:02:37 -0500 |
commit | 36a885306fdf7bb557c773309c993bfb2d0d693c (patch) | |
tree | 643b246c90653c9451ff7fecff74a79c3de8042c /arch/mips/arc/init.c | |
parent | ca471c86043f4a8b01cba02ba2d3431fddcaf606 (diff) |
[MIPS] Fix and cleanup the mess that a dozen prom_printf variants are.
early_printk is a so much saner thing.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/arc/init.c')
-rw-r--r-- | arch/mips/arc/init.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/mips/arc/init.c b/arch/mips/arc/init.c index 76ab505ca693..0ac8f42d3752 100644 --- a/arch/mips/arc/init.c +++ b/arch/mips/arc/init.c | |||
@@ -24,12 +24,15 @@ void __init prom_init(void) | |||
24 | { | 24 | { |
25 | PSYSTEM_PARAMETER_BLOCK pb = PROMBLOCK; | 25 | PSYSTEM_PARAMETER_BLOCK pb = PROMBLOCK; |
26 | romvec = ROMVECTOR; | 26 | romvec = ROMVECTOR; |
27 | ULONG cnt; | ||
28 | CHAR c; | ||
29 | |||
27 | prom_argc = fw_arg0; | 30 | prom_argc = fw_arg0; |
28 | _prom_argv = (LONG *) fw_arg1; | 31 | _prom_argv = (LONG *) fw_arg1; |
29 | _prom_envp = (LONG *) fw_arg2; | 32 | _prom_envp = (LONG *) fw_arg2; |
30 | 33 | ||
31 | if (pb->magic != 0x53435241) { | 34 | if (pb->magic != 0x53435241) { |
32 | prom_printf("Aieee, bad prom vector magic %08lx\n", pb->magic); | 35 | printk(KERN_CRIT "Aieee, bad prom vector magic %08lx\n", pb->magic); |
33 | while(1) | 36 | while(1) |
34 | ; | 37 | ; |
35 | } | 38 | } |
@@ -41,8 +44,8 @@ void __init prom_init(void) | |||
41 | prom_meminit(); | 44 | prom_meminit(); |
42 | 45 | ||
43 | #ifdef DEBUG_PROM_INIT | 46 | #ifdef DEBUG_PROM_INIT |
44 | prom_printf("Press a key to reboot\n"); | 47 | pr_info("Press a key to reboot\n"); |
45 | prom_getchar(); | 48 | ArcRead(0, &c, 1, &cnt); |
46 | ArcEnterInteractiveMode(); | 49 | ArcEnterInteractiveMode(); |
47 | #endif | 50 | #endif |
48 | } | 51 | } |