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/mips-boards/generic/memory.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/mips-boards/generic/memory.c')
-rw-r--r-- | arch/mips/mips-boards/generic/memory.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mips-boards/generic/memory.c index ebf0e16c5a0d..ae39953da2c4 100644 --- a/arch/mips/mips-boards/generic/memory.c +++ b/arch/mips/mips-boards/generic/memory.c | |||
@@ -59,11 +59,12 @@ struct prom_pmemblock * __init prom_getmdesc(void) | |||
59 | /* otherwise look in the environment */ | 59 | /* otherwise look in the environment */ |
60 | memsize_str = prom_getenv("memsize"); | 60 | memsize_str = prom_getenv("memsize"); |
61 | if (!memsize_str) { | 61 | if (!memsize_str) { |
62 | prom_printf("memsize not set in boot prom, set to default (32Mb)\n"); | 62 | printk(KERN_WARNING |
63 | "memsize not set in boot prom, set to default (32Mb)\n"); | ||
63 | physical_memsize = 0x02000000; | 64 | physical_memsize = 0x02000000; |
64 | } else { | 65 | } else { |
65 | #ifdef DEBUG | 66 | #ifdef DEBUG |
66 | prom_printf("prom_memsize = %s\n", memsize_str); | 67 | pr_debug("prom_memsize = %s\n", memsize_str); |
67 | #endif | 68 | #endif |
68 | physical_memsize = simple_strtol(memsize_str, NULL, 0); | 69 | physical_memsize = simple_strtol(memsize_str, NULL, 0); |
69 | } | 70 | } |
@@ -141,12 +142,12 @@ void __init prom_meminit(void) | |||
141 | struct prom_pmemblock *p; | 142 | struct prom_pmemblock *p; |
142 | 143 | ||
143 | #ifdef DEBUG | 144 | #ifdef DEBUG |
144 | prom_printf("YAMON MEMORY DESCRIPTOR dump:\n"); | 145 | pr_debug("YAMON MEMORY DESCRIPTOR dump:\n"); |
145 | p = prom_getmdesc(); | 146 | p = prom_getmdesc(); |
146 | while (p->size) { | 147 | while (p->size) { |
147 | int i = 0; | 148 | int i = 0; |
148 | prom_printf("[%d,%p]: base<%08lx> size<%08lx> type<%s>\n", | 149 | pr_debug("[%d,%p]: base<%08lx> size<%08lx> type<%s>\n", |
149 | i, p, p->base, p->size, mtypes[p->type]); | 150 | i, p, p->base, p->size, mtypes[p->type]); |
150 | p++; | 151 | p++; |
151 | i++; | 152 | i++; |
152 | } | 153 | } |