Skip to content

Commit

Permalink
microblaze: Report if only one timer is used
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michal Simek committed Oct 21, 2010
1 parent 7d43209 commit 6971760
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 6 additions & 0 deletions arch/microblaze/include/asm/setup.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 0 additions & 6 deletions arch/microblaze/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/kernel/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down

0 comments on commit 6971760

Please sign in to comment.