sh: fix no sys_timer case

Handle the case with a sys_timer set to NULL.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/kernel/time_32.c b/arch/sh/kernel/time_32.c
index ca22eef669ae4e7850149705f1a999746cb6a97d..766554ba2a5b0ec70311b36c2e3ca90a2b8691d4 100644 (file)
--- a/arch/sh/kernel/time_32.c
+++ b/arch/sh/kernel/time_32.c
@@ -181,7 +181,12 @@ static struct sysdev_class timer_sysclass = {
 
 static int __init timer_init_sysfs(void)
 {
-       int ret = sysdev_class_register(&timer_sysclass);
+       int ret;
+
+       if (!sys_timer)
+               return 0;
+
+       ret = sysdev_class_register(&timer_sysclass);
        if (ret != 0)
                return ret;
 
@@ -230,5 +235,8 @@ void __init time_init(void)
         * initialized for us.
         */
        sys_timer = get_sys_timer();
+       if (unlikely(!sys_timer))
+               panic("System timer missing.\n");
+
        printk(KERN_INFO "Using %s for system timer\n", sys_timer->name);
 }