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

[kvmfornfv.git] / kernel / arch / x86 / platform / uv / uv_time.c

diff --git a/kernel/arch/x86/platform/uv/uv_time.c b/kernel/arch/x86/platform/uv/uv_time.c
index a718fe0..5e0b122 100644 (file)
--- a/kernel/arch/x86/platform/uv/uv_time.c
+++ b/kernel/arch/x86/platform/uv/uv_time.c
@@ -32,8 +32,7 @@
 
 static cycle_t uv_read_rtc(struct clocksource *cs);
 static int uv_rtc_next_event(unsigned long, struct clock_event_device *);
-static void uv_rtc_timer_setup(enum clock_event_mode,
-                               struct clock_event_device *);
+static int uv_rtc_shutdown(struct clock_event_device *evt);
 
 static struct clocksource clocksource_uv = {
        .name           = RTC_NAME,
@@ -44,14 +43,14 @@ static struct clocksource clocksource_uv = {
 };
 
 static struct clock_event_device clock_event_device_uv = {
-       .name           = RTC_NAME,
-       .features       = CLOCK_EVT_FEAT_ONESHOT,
-       .shift          = 20,
-       .rating         = 400,
-       .irq            = -1,
-       .set_next_event = uv_rtc_next_event,
-       .set_mode       = uv_rtc_timer_setup,
-       .event_handler  = NULL,
+       .name                   = RTC_NAME,
+       .features               = CLOCK_EVT_FEAT_ONESHOT,
+       .shift                  = 20,
+       .rating                 = 400,
+       .irq                    = -1,
+       .set_next_event         = uv_rtc_next_event,
+       .set_state_shutdown     = uv_rtc_shutdown,
+       .event_handler          = NULL,
 };
 
 static DEFINE_PER_CPU(struct clock_event_device, cpu_ced);
@@ -326,24 +325,14 @@ static int uv_rtc_next_event(unsigned long delta,
 }
 
 /*
- * Setup the RTC timer in oneshot mode
+ * Shutdown the RTC timer
  */
-static void uv_rtc_timer_setup(enum clock_event_mode mode,
-                              struct clock_event_device *evt)
+static int uv_rtc_shutdown(struct clock_event_device *evt)
 {
        int ced_cpu = cpumask_first(evt->cpumask);
 
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-       case CLOCK_EVT_MODE_ONESHOT:
-       case CLOCK_EVT_MODE_RESUME:
-               /* Nothing to do here yet */
-               break;
-       case CLOCK_EVT_MODE_UNUSED:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-               uv_rtc_unset_timer(ced_cpu, 1);
-               break;
-       }
+       uv_rtc_unset_timer(ced_cpu, 1);
+       return 0;
 }
 
 static void uv_rtc_interrupt(void)