Merge branches 'pm-cpufreq' and 'pm-cpuidle'

Browse source

* pm-cpufreq:
  cpufreq: intel_pstate: Add one more OOB control bit

* pm-cpuidle:
  cpuidle: Rearrange s2idle-specific idle state entry code
  PM: s2idle: Clear _TIF_POLLING_NRFLAG before suspend to idle

...

This commit is contained in:

Rafael J. Wysocki 2020-06-26 17:09:49 +02:00

parent 0659d4205d 589bab6bb3 10e8b11eb3

commit 0e3fb2a128

3 changed files with 19 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

drivers/cpufreq/intel_pstate.c

View file

5

drivers/cpuidle/cpuidle.c

View file

15

kernel/sched/idle.c

View file