diff options
| author | Linaro CI <ci_notify@linaro.org> | 2017-09-24 20:35:18 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2017-09-24 20:35:18 +0000 |
| commit | c03adb6848aa7e80ad0c0e46b9f6d96ba0a91822 (patch) | |
| tree | 05de08cd2d77fc5697e9e6fc1fae5ef23a1d0a85 /drivers/cpuidle/cpuidle.c | |
| parent | 6ce85a78b6151e8ab2eac57e1447d90d3efb551d (diff) | |
| parent | 357fdc8959dc79696d9c43c2a3f7a93e3a503d87 (diff) | |
Merge remote-tracking branch 'sumit-lts/lts-4.4.y-hikey' into linux-4.4.y4.4.89-rc1-hikey-20170924
Diffstat (limited to 'drivers/cpuidle/cpuidle.c')
| -rw-r--r-- | drivers/cpuidle/cpuidle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index d40b2c077746..151971627757 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -192,7 +192,7 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv, } /* Take note of the planned idle state. */ - sched_idle_set_state(target_state); + sched_idle_set_state(target_state, index); trace_cpu_idle_rcuidle(index, dev->cpu); time_start = ktime_get(); @@ -205,7 +205,7 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv, trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu); /* The cpu is no longer idle or about to enter idle. */ - sched_idle_set_state(NULL); + sched_idle_set_state(NULL, -1); if (broadcast) { if (WARN_ON_ONCE(!irqs_disabled())) |