diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-19 20:44:51 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-19 20:44:51 +0400 |
| commit | 4aa2d56b2149e70a0b944b4f21e4aed33d9ab94e (patch) | |
| tree | 79cb2115c36799406fa477ca80adeab041c31509 /arch/microblaze/kernel/timer.c | |
| parent | d46c7d9ab8289f23a5e161060b84fd7e63de7921 (diff) | |
| parent | 1fef7891755d99039592aa8d1ed02e981f38de15 (diff) | |
| download | linux-4aa2d56b2149e70a0b944b4f21e4aed33d9ab94e.tar.xz | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Update Microblaze defconfigs
microblaze: Use klimit instead of _end for memory init
microblaze: Enable ppoll syscall
microblaze: Sane handling of missing timer/intc in device tree
microblaze: use the generic ack_bad_irq implementation
Diffstat (limited to 'arch/microblaze/kernel/timer.c')
| -rw-r--r-- | arch/microblaze/kernel/timer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index bdfa2f9f0c81..5499deae7fa6 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c @@ -22,6 +22,7 @@ #include <linux/clocksource.h> #include <linux/clockchips.h> #include <linux/io.h> +#include <linux/bug.h> #include <asm/cpuinfo.h> #include <asm/setup.h> #include <asm/prom.h> @@ -234,6 +235,7 @@ void __init time_init(void) if (timer) break; } + BUG_ON(!timer); timer_baseaddr = *(int *) of_get_property(timer, "reg", NULL); timer_baseaddr = (unsigned long) ioremap(timer_baseaddr, PAGE_SIZE); |