From: Andrew Morton <akpm@linux-foundation.org>

Cc: Jeff Dike <jdike@addtoit.com>
Cc: Jeff Dike <jdike@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/um/kernel/time.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff -puN arch/um/kernel/time.c~uml-clocksource-support-fix arch/um/kernel/time.c
--- a/arch/um/kernel/time.c~uml-clocksource-support-fix
+++ a/arch/um/kernel/time.c
@@ -121,17 +121,16 @@ static void __init setup_itimer(void)
 		printk(KERN_ERR "register_timer : request_irq failed - "
 		       "errno = %d\n", -err);
 
-	err = clocksource_register(&itimer_clocksource);
-	if (err) {
-		printk(KERN_ERR "clocksource_register returned %d\n", err);
-		return;
-	}
-
 	itimer_clockevent.mult = div_sc(HZ, NSEC_PER_SEC, 32);
 	itimer_clockevent.max_delta_ns =
 		clockevent_delta2ns(60 * HZ, &itimer_clockevent);
 	itimer_clockevent.min_delta_ns =
 		clockevent_delta2ns(1, &itimer_clockevent);
+	err = clocksource_register(&itimer_clocksource);
+	if (err) {
+		printk(KERN_ERR "clocksource_register returned %d\n", err);
+		return;
+	}
 	clockevents_register_device(&itimer_clockevent);
 }
 
_