Merge ../linux-2.6 by hand

[linux-2.6-omap-h63xx.git] / arch / ppc / kernel / time.c

diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c
index 67797184f4eb3f99e9ae35147f8d6e438233997d..53ea723af60aa5fff91a1ff057986584098f7285 100644 (file)
--- a/arch/ppc/kernel/time.c
+++ b/arch/ppc/kernel/time.c
@@ -116,6 +116,15 @@ unsigned long profile_pc(struct pt_regs *regs)
 EXPORT_SYMBOL(profile_pc);
 #endif
 
+void wakeup_decrementer(void)
+{
+       set_dec(tb_ticks_per_jiffy);
+       /* No currently-supported powerbook has a 601,
+        * so use get_tbl, not native
+        */
+       last_jiffy_stamp(0) = tb_last_stamp = get_tbl();
+}
+
 /*
  * timer_interrupt - gets called when the decrementer overflows,
  * with interrupts disabled.