diff options
| author | Michal Simek <monstr@monstr.eu> | 2010-08-06 14:13:13 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2010-10-21 15:51:30 +1000 |
| commit | 69717607f028d7d4f4b355afb86556f3dd9363fc (patch) | |
| tree | 2ce5c9e625ec9049ebb5167a986b8abc01b42975 | |
| parent | 7d4320956f0f8aa2c36c23f209acc3e4c3ae52d6 (diff) | |
| download | linux-3.10-69717607f028d7d4f4b355afb86556f3dd9363fc.tar.gz linux-3.10-69717607f028d7d4f4b355afb86556f3dd9363fc.tar.bz2 linux-3.10-69717607f028d7d4f4b355afb86556f3dd9363fc.zip | |
microblaze: Report if only one timer is used
Kernel needs two timers because of clocksource and clockevent.
It is better to show warning message directly on early
console if available. If it isn't available kernel log buffer
contains it.
Signed-off-by: Michal Simek <monstr@monstr.eu>
| -rw-r--r-- | arch/microblaze/include/asm/setup.h | 6 | ||||
| -rw-r--r-- | arch/microblaze/kernel/setup.c | 6 | ||||
| -rw-r--r-- | arch/microblaze/kernel/timer.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h index 782b5c89248..5f910ebe032 100644 --- a/arch/microblaze/include/asm/setup.h +++ b/arch/microblaze/include/asm/setup.h @@ -25,6 +25,12 @@ void early_printk(const char *fmt, ...); int setup_early_printk(char *opt); void disable_early_printk(void); +#if defined(CONFIG_EARLY_PRINTK) && defined(CONFIG_SERIAL_UARTLITE_CONSOLE) +#define eprintk early_printk +#else +#define eprintk printk +#endif + void heartbeat(void); void setup_heartbeat(void); diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index f5f76884235..bb1558e4b28 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c @@ -92,12 +92,6 @@ inline unsigned get_romfs_len(unsigned *addr) } #endif /* CONFIG_MTD_UCLINUX_EBSS */ -#if defined(CONFIG_EARLY_PRINTK) && defined(CONFIG_SERIAL_UARTLITE_CONSOLE) -#define eprintk early_printk -#else -#define eprintk printk -#endif - void __init machine_early_init(const char *cmdline, unsigned int ram, unsigned int fdt, unsigned int msr) { diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index b1380ae93ae..ec7df67006b 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c @@ -278,7 +278,7 @@ void __init time_init(void) timer_num = *(int *) of_get_property(timer, "xlnx,one-timer-only", NULL); if (timer_num) { - printk(KERN_EMERG "Please enable two timers in HW\n"); + eprintk(KERN_EMERG "Please enable two timers in HW\n"); BUG(); } |