Commit 4bb9374e0bd40d8fe97860ea0d61a0330b7c3925
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
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
Showing 2 changed files Side-by-side Diff
drivers/thermal/intel_powerclamp.c
| ... | ... | @@ -435,7 +435,6 @@ |
| 435 | 435 | * allowed. thus jiffies are updated properly. |
| 436 | 436 | */ |
| 437 | 437 | preempt_disable(); |
| 438 | - tick_nohz_idle_enter(); | |
| 439 | 438 | /* mwait until target jiffies is reached */ |
| 440 | 439 | while (time_before(jiffies, target_jiffies)) { |
| 441 | 440 | unsigned long ecx = 1; |
| ... | ... | @@ -451,7 +450,6 @@ |
| 451 | 450 | start_critical_timings(); |
| 452 | 451 | atomic_inc(&idle_wakeup_counter); |
| 453 | 452 | } |
| 454 | - tick_nohz_idle_exit(); | |
| 455 | 453 | preempt_enable(); |
| 456 | 454 | } |
| 457 | 455 | del_timer_sync(&wakeup_timer); |
kernel/time/tick-sched.c
| ... | ... | @@ -847,7 +847,6 @@ |
| 847 | 847 | |
| 848 | 848 | local_irq_enable(); |
| 849 | 849 | } |
| 850 | -EXPORT_SYMBOL_GPL(tick_nohz_idle_enter); | |
| 851 | 850 | |
| 852 | 851 | /** |
| 853 | 852 | * tick_nohz_irq_exit - update next tick event from interrupt exit |
| ... | ... | @@ -974,7 +973,6 @@ |
| 974 | 973 | |
| 975 | 974 | local_irq_enable(); |
| 976 | 975 | } |
| 977 | -EXPORT_SYMBOL_GPL(tick_nohz_idle_exit); | |
| 978 | 976 | |
| 979 | 977 | static int tick_nohz_reprogram(struct tick_sched *ts, ktime_t now) |
| 980 | 978 | { |