AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

microblaze: Report if only one timer is used

Browse Source 
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>
This commit is contained in:
Michal Simek 2010-08-06 14:13:13 +02:00
parent 7d4320956f
commit 69717607f0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/microblaze/include/asm/setup.h
View File

@ -25,6 +25,12 @@ void early_printk(const char *fmt, ...);
int setup_early_printk(char *opt); int setup_early_printk(char *opt);
void disable_early_printk(void); 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 heartbeat(void);
void setup_heartbeat(void); void setup_heartbeat(void);

6
arch/microblaze/kernel/setup.c
View File

@ -92,12 +92,6 @@ inline unsigned get_romfs_len(unsigned *addr)
} }
#endif /* CONFIG_MTD_UCLINUX_EBSS */ #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, void __init machine_early_init(const char *cmdline, unsigned int ram,
unsigned int fdt, unsigned int msr) unsigned int fdt, unsigned int msr)
{ {

2
arch/microblaze/kernel/timer.c
View File

@ -278,7 +278,7 @@ void __init time_init(void)
timer_num = timer_num =
*(int *) of_get_property(timer, "xlnx,one-timer-only", NULL); *(int *) of_get_property(timer, "xlnx,one-timer-only", NULL);
if (timer_num) { if (timer_num) {
printk(KERN_EMERG "Please enable two timers in HW\n"); eprintk(KERN_EMERG "Please enable two timers in HW\n");
BUG(); BUG();
} }