Merge branches 'pm-cpuidle-fixes' and 'pm-sleep-fixes'

Browse source

* pm-cpuidle-fixes:
  cpuidle: Fix last_residency division

* pm-sleep-fixes:
  x86/power/64: Fix kernel text mapping corruption during image restoration

...

This commit is contained in:

Rafael J. Wysocki 2016-07-07 23:17:20 +02:00

parent a99cde438d dbd1b8ea43 65c0554b73

commit 7fe39a2155

3 changed files with 113 additions and 51 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

97

arch/x86/power/hibernate_64.c

View file

55

arch/x86/power/hibernate_asm_64.S

View file

12

drivers/cpuidle/cpuidle.c

View file