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

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

diff --git a/kernel/arch/tile/kernel/time.c b/kernel/arch/tile/kernel/time.c
index 00178ec..178989e 100644 (file)
--- a/kernel/arch/tile/kernel/time.c
+++ b/kernel/arch/tile/kernel/time.c
@@ -140,10 +140,10 @@ static int tile_timer_set_next_event(unsigned long ticks,
  * Whenever anyone tries to change modes, we just mask interrupts
  * and wait for the next event to get set.
  */
-static void tile_timer_set_mode(enum clock_event_mode mode,
-                               struct clock_event_device *evt)
+static int tile_timer_shutdown(struct clock_event_device *evt)
 {
        arch_local_irq_mask_now(INT_TILE_TIMER);
+       return 0;
 }
 
 /*
@@ -157,7 +157,9 @@ static DEFINE_PER_CPU(struct clock_event_device, tile_timer) = {
        .rating = 100,
        .irq = -1,
        .set_next_event = tile_timer_set_next_event,
-       .set_mode = tile_timer_set_mode,
+       .set_state_shutdown = tile_timer_shutdown,
+       .set_state_oneshot = tile_timer_shutdown,
+       .tick_resume = tile_timer_shutdown,
 };
 
 void setup_tile_timer(void)