Commit 4bb9374e authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull NOHZ update from Thomas Gleixner:
 "Remove the call into the nohz idle code from the fake 'idle' thread in
  the powerclamp driver along with the export of those functions which
  was smuggeled in via the thermal tree.  People have tried to hack
  around it in the nohz core code, but it just violates all rightful
  assumptions of that code about the only valid calling context (i.e.
  the proper idle task).

  The powerclamp trainwreck will still work, it just wont get the
  benefit of long idle sleeps"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tick/powerclamp: Remove tick_nohz_idle abuse
parents ac88ee3b a5fd9733
...@@ -435,7 +435,6 @@ static int clamp_thread(void *arg) ...@@ -435,7 +435,6 @@ static int clamp_thread(void *arg)
* allowed. thus jiffies are updated properly. * allowed. thus jiffies are updated properly.
*/ */
preempt_disable(); preempt_disable();
tick_nohz_idle_enter();
/* mwait until target jiffies is reached */ /* mwait until target jiffies is reached */
while (time_before(jiffies, target_jiffies)) { while (time_before(jiffies, target_jiffies)) {
unsigned long ecx = 1; unsigned long ecx = 1;
...@@ -451,7 +450,6 @@ static int clamp_thread(void *arg) ...@@ -451,7 +450,6 @@ static int clamp_thread(void *arg)
start_critical_timings(); start_critical_timings();
atomic_inc(&idle_wakeup_counter); atomic_inc(&idle_wakeup_counter);
} }
tick_nohz_idle_exit();
preempt_enable(); preempt_enable();
} }
del_timer_sync(&wakeup_timer); del_timer_sync(&wakeup_timer);
......
...@@ -847,7 +847,6 @@ void tick_nohz_idle_enter(void) ...@@ -847,7 +847,6 @@ void tick_nohz_idle_enter(void)
local_irq_enable(); local_irq_enable();
} }
EXPORT_SYMBOL_GPL(tick_nohz_idle_enter);
/** /**
* tick_nohz_irq_exit - update next tick event from interrupt exit * tick_nohz_irq_exit - update next tick event from interrupt exit
...@@ -974,7 +973,6 @@ void tick_nohz_idle_exit(void) ...@@ -974,7 +973,6 @@ void tick_nohz_idle_exit(void)
local_irq_enable(); local_irq_enable();
} }
EXPORT_SYMBOL_GPL(tick_nohz_idle_exit);
static int tick_nohz_reprogram(struct tick_sched *ts, ktime_t now) static int tick_nohz_reprogram(struct tick_sched *ts, ktime_t now)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment