Revert "3.0.x: hrtimer: Fix clock_was_set so it is safe to call from irq context"

This reverts commit c51e012012e48ca262d4b489e33bc113bb5ac74d.

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 250b2b5205a3e05c53d31abe9f1a8ef9a663bbff..2043c08d36c89d44731fb70ff01679816704f3a0 100644 (file)
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -746,7 +746,7 @@ static inline void retrigger_next_event(void *arg) { }
  * resolution timer interrupts. On UP we just disable interrupts and
  * call the high resolution interrupt code.
  */
-static void do_clock_was_set(unsigned long data)
+void clock_was_set(void)
 {
 #ifdef CONFIG_HIGH_RES_TIMERS
        /* Retrigger the CPU local events everywhere */
@@ -755,21 +755,6 @@ static void do_clock_was_set(unsigned long data)
        timerfd_clock_was_set();
 }
 
-static DEFINE_TIMER(clock_was_set_timer, do_clock_was_set , 0, 0);
-
-void clock_was_set(void)
-{
-       /*
-        * We can't call on_each_cpu() from irq context,
-        * so if irqs are disabled , schedule the clock_was_set
-        * via a timer_list timer for right after.
-        */
-       if (irqs_disabled())
-               mod_timer(&clock_was_set_timer, jiffies);
-       else
-               do_clock_was_set(0);
-}
-
 /*
  * During resume we might have to reprogram the high resolution timer
  * interrupt (on the local CPU):