diff options
author | Michal Simek <monstr@monstr.eu> | 2011-11-10 07:38:54 -0500 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2012-01-05 02:34:26 -0500 |
commit | b6d5b28e446896278a0b02d6cc1bf4447ed07019 (patch) | |
tree | f7edafa04863371005035fb1e82df781597d232a /arch/microblaze/kernel | |
parent | a8c2e555b05d6203576e396eba01f17cb2516e66 (diff) |
microblaze: Remove eprintk macro
eprintk macro was used for printing early_printk
messages. Early console registration was changed
that's why this is not needed.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/kernel')
-rw-r--r-- | arch/microblaze/kernel/setup.c | 18 | ||||
-rw-r--r-- | arch/microblaze/kernel/timer.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index 0e654a12d37e..604cd9dd1333 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c | |||
@@ -145,32 +145,32 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, | |||
145 | setup_early_printk(NULL); | 145 | setup_early_printk(NULL); |
146 | #endif | 146 | #endif |
147 | 147 | ||
148 | eprintk("Ramdisk addr 0x%08x, ", ram); | 148 | printk("Ramdisk addr 0x%08x, ", ram); |
149 | if (fdt) | 149 | if (fdt) |
150 | eprintk("FDT at 0x%08x\n", fdt); | 150 | printk("FDT at 0x%08x\n", fdt); |
151 | else | 151 | else |
152 | eprintk("Compiled-in FDT at 0x%08x\n", | 152 | printk("Compiled-in FDT at 0x%08x\n", |
153 | (unsigned int)_fdt_start); | 153 | (unsigned int)_fdt_start); |
154 | 154 | ||
155 | #ifdef CONFIG_MTD_UCLINUX | 155 | #ifdef CONFIG_MTD_UCLINUX |
156 | eprintk("Found romfs @ 0x%08x (0x%08x)\n", | 156 | printk("Found romfs @ 0x%08x (0x%08x)\n", |
157 | romfs_base, romfs_size); | 157 | romfs_base, romfs_size); |
158 | eprintk("#### klimit %p ####\n", old_klimit); | 158 | printk("#### klimit %p ####\n", old_klimit); |
159 | BUG_ON(romfs_size < 0); /* What else can we do? */ | 159 | BUG_ON(romfs_size < 0); /* What else can we do? */ |
160 | 160 | ||
161 | eprintk("Moved 0x%08x bytes from 0x%08x to 0x%08x\n", | 161 | printk("Moved 0x%08x bytes from 0x%08x to 0x%08x\n", |
162 | romfs_size, romfs_base, (unsigned)&_ebss); | 162 | romfs_size, romfs_base, (unsigned)&_ebss); |
163 | 163 | ||
164 | eprintk("New klimit: 0x%08x\n", (unsigned)klimit); | 164 | printk("New klimit: 0x%08x\n", (unsigned)klimit); |
165 | #endif | 165 | #endif |
166 | 166 | ||
167 | #if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR | 167 | #if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR |
168 | if (msr) | 168 | if (msr) |
169 | eprintk("!!!Your kernel has setup MSR instruction but " | 169 | printk("!!!Your kernel has setup MSR instruction but " |
170 | "CPU don't have it %x\n", msr); | 170 | "CPU don't have it %x\n", msr); |
171 | #else | 171 | #else |
172 | if (!msr) | 172 | if (!msr) |
173 | eprintk("!!!Your kernel not setup MSR instruction but " | 173 | printk("!!!Your kernel not setup MSR instruction but " |
174 | "CPU have it %x\n", msr); | 174 | "CPU have it %x\n", msr); |
175 | #endif | 175 | #endif |
176 | 176 | ||
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index 52e3eaf7f304..3cb0bf640135 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c | |||
@@ -267,7 +267,7 @@ void __init time_init(void) | |||
267 | timer_num = be32_to_cpup(of_get_property(timer, | 267 | timer_num = be32_to_cpup(of_get_property(timer, |
268 | "xlnx,one-timer-only", NULL)); | 268 | "xlnx,one-timer-only", NULL)); |
269 | if (timer_num) { | 269 | if (timer_num) { |
270 | eprintk(KERN_EMERG "Please enable two timers in HW\n"); | 270 | printk(KERN_EMERG "Please enable two timers in HW\n"); |
271 | BUG(); | 271 | BUG(); |
272 | } | 272 | } |
273 | 273 | ||