Skip to content

Commit

Permalink
Merge branch 'pm-cpuidle-fixes'
Browse files Browse the repository at this point in the history
* pm-cpuidle-fixes:
  cpuidle: poll_state: Fix default time limit
  • Loading branch information
Rafael J. Wysocki committed Feb 1, 2019
2 parents 15efb47 + 1617971 commit cbffab6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/cpuidle/poll_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand Down

0 comments on commit cbffab6

Please sign in to comment.