skge: default WOL should be magic only (rev2)

[powerpc.git] / kernel / posix-timers.c

diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 210f462..588c99d 100644 (file)
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -31,7 +31,6 @@
  * POSIX clocks & timers
  */
 #include <linux/mm.h>
-#include <linux/smp_lock.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/time.h>
@@ -356,7 +355,7 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer)
                if (timr->it.real.interval.tv64 != 0) {
                        timr->it_overrun +=
                                hrtimer_forward(timer,
-                                               timer->base->softirq_time,
+                                               hrtimer_cb_get_time(timer),
                                                timr->it.real.interval);
                        ret = HRTIMER_RESTART;
                        ++timr->it_requeue_pending;