summaryrefslogtreecommitdiffstats
path: root/kernel/sched
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-08-05 22:48:56 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-08-05 22:48:56 +0200
commiteada238f48309da47535d7de0ab2217f25ebb9c2 (patch)
tree7bcd9c5333b4bdbe6591ab8a67a6201f893b5673 /kernel/sched
parent7672b969b15b844bbfab1b4d7ecf40206aaf6602 (diff)
parentdd38c9d35ba8e40011b36659cae2719aefd11904 (diff)
downloadlinux-eada238f48309da47535d7de0ab2217f25ebb9c2.tar.bz2
Merge branch 'pm-cpuidle'
* pm-cpuidle: cpuidle: Remove time measurement in poll state cpuidle: Remove manual selection of the multiple driver support cpuidle: ladder governor - use macro instead of hardcoded value cpuidle: big_little: Fix build error cpuidle: menu governor - remove unused macro STDDEV_THRESH cpuidle: fix permission for driver name sysfs node cpuidle: move idle traces to cpuidle_enter_state()
Diffstat (limited to 'kernel/sched')
-rw-r--r--kernel/sched/idle.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index cf009fb0bc25..658a58dc30f4 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -147,8 +147,6 @@ use_default:
clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu))
goto use_default;
- trace_cpu_idle_rcuidle(next_state, dev->cpu);
-
/*
* Enter the idle state previously returned by the governor decision.
* This function will block until an interrupt occurs and will take
@@ -156,8 +154,6 @@ use_default:
*/
entered_state = cpuidle_enter(drv, dev, next_state);
- trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
-
if (broadcast)
clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);