clockevent: Don't remove broadcast device when cpu is dead

[safe/jmp/linux-2.6] / kernel / time / tick-oneshot.c

diff --git a/kernel/time/tick-oneshot.c b/kernel/time/tick-oneshot.c
index a96c0e2..0a8a213 100644 (file)
--- a/kernel/time/tick-oneshot.c
+++ b/kernel/time/tick-oneshot.c
@@ -50,9 +50,9 @@ int tick_dev_program_event(struct clock_event_device *dev, ktime_t expires,
                                dev->min_delta_ns += dev->min_delta_ns >> 1;
 
                        printk(KERN_WARNING
-                              "CE: %s increasing min_delta_ns to %lu nsec\n",
+                              "CE: %s increasing min_delta_ns to %llu nsec\n",
                               dev->name ? dev->name : "?",
-                              dev->min_delta_ns << 1);
+                              (unsigned long long) dev->min_delta_ns << 1);
 
                        i = 0;
                }