diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-02-01 11:05:27 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-02-01 11:05:27 +0100 |
| commit | cbffab6825731f1baac7a950f6b7dd9239f55594 (patch) | |
| tree | adfabfb62e78d5893a659196d94e8d99fe503052 | |
| parent | PM-runtime: Fix deadlock with ktime_get() (diff) | |
| parent | cpuidle: poll_state: Fix default time limit (diff) | |
| download | linux-cbffab6825731f1baac7a950f6b7dd9239f55594.tar.xz linux-cbffab6825731f1baac7a950f6b7dd9239f55594.zip | |
Merge branch 'pm-cpuidle-fixes'
* pm-cpuidle-fixes:
cpuidle: poll_state: Fix default time limit
| -rw-r--r-- | drivers/cpuidle/poll_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpuidle/poll_state.c b/drivers/cpuidle/poll_state.c index b17d153e724f..23a1b27579a5 100644 --- a/drivers/cpuidle/poll_state.c +++ b/drivers/cpuidle/poll_state.c @@ -21,7 +21,7 @@ static int __cpuidle poll_idle(struct cpuidle_device *dev, local_irq_enable(); if (!current_set_polling_and_test()) { unsigned int loop_count = 0; - u64 limit = TICK_USEC; + u64 limit = TICK_NSEC; int i; for (i = 1; i < drv->state_count; i++) { |