These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / alpha / kernel / time.c

diff --git a/kernel/arch/alpha/kernel/time.c b/kernel/arch/alpha/kernel/time.c
index 643a9dc..5b6202a 100644 (file)
--- a/kernel/arch/alpha/kernel/time.c
+++ b/kernel/arch/alpha/kernel/time.c
@@ -93,7 +93,7 @@ rtc_timer_interrupt(int irq, void *dev)
        struct clock_event_device *ce = &per_cpu(cpu_ce, cpu);
 
        /* Don't run the hook for UNUSED or SHUTDOWN.  */
-       if (likely(ce->mode == CLOCK_EVT_MODE_PERIODIC))
+       if (likely(clockevent_state_periodic(ce)))
                ce->event_handler(ce);
 
        if (test_irq_work_pending()) {
@@ -104,13 +104,6 @@ rtc_timer_interrupt(int irq, void *dev)
        return IRQ_HANDLED;
 }
 
-static void
-rtc_ce_set_mode(enum clock_event_mode mode, struct clock_event_device *ce)
-{
-       /* The mode member of CE is updated in generic code.
-          Since we only support periodic events, nothing to do.  */
-}
-
 static int
 rtc_ce_set_next_event(unsigned long evt, struct clock_event_device *ce)
 {
@@ -129,7 +122,6 @@ init_rtc_clockevent(void)
                .features = CLOCK_EVT_FEAT_PERIODIC,
                .rating = 100,
                .cpumask = cpumask_of(cpu),
-               .set_mode = rtc_ce_set_mode,
                .set_next_event = rtc_ce_set_next_event,
        };
 
@@ -161,12 +153,12 @@ static struct clocksource qemu_cs = {
  * The QEMU alarm as a clock_event_device primitive.
  */
 
-static void
-qemu_ce_set_mode(enum clock_event_mode mode, struct clock_event_device *ce)
+static int qemu_ce_shutdown(struct clock_event_device *ce)
 {
        /* The mode member of CE is updated for us in generic code.
           Just make sure that the event is disabled.  */
        qemu_set_alarm_abs(0);
+       return 0;
 }
 
 static int
@@ -197,7 +189,9 @@ init_qemu_clockevent(void)
                .features = CLOCK_EVT_FEAT_ONESHOT,
                .rating = 400,
                .cpumask = cpumask_of(cpu),
-               .set_mode = qemu_ce_set_mode,
+               .set_state_shutdown = qemu_ce_shutdown,
+               .set_state_oneshot = qemu_ce_shutdown,
+               .tick_resume = qemu_ce_shutdown,
                .set_next_event = qemu_ce_set_next_event,
        };