Merge tag 'timers-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / kernel / time / tick-sched.c

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 5fbc748..e10a4af 100644 (file)
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -293,10 +293,8 @@ static void nohz_full_kick_func(struct irq_work *work)
        /* Empty, the tick restart happens on tick_nohz_irq_exit() */
 }
 
        /* Empty, the tick restart happens on tick_nohz_irq_exit() */
 }
 

-static DEFINE_PER_CPU(struct irq_work, nohz_full_kick_work) = {
-       .func = nohz_full_kick_func,
-       .flags = ATOMIC_INIT(IRQ_WORK_HARD_IRQ),
-};
+static DEFINE_PER_CPU(struct irq_work, nohz_full_kick_work) =
+       IRQ_WORK_INIT_HARD(nohz_full_kick_func);

 
 /*
  * Kick this CPU if it's full dynticks in order to force it to
 
 /*
  * Kick this CPU if it's full dynticks in order to force it to