GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-01 03:11:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branches 'pm-sleep' and 'pm-cpufreq'

Browse source 
* pm-sleep:
  PM / hibernate: Restore processor state before using per-CPU variables
  x86/power/64: Always create temporary identity mapping correctly

* pm-cpufreq:
  cpufreq: powernv: Fix crash in gpstate_timer_handler()
This commit is contained in:
Rafael J. Wysocki 2016-08-12 22:53:58 +02:00
commit 0aeeb3e73f
5 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/power/hibernate.c
View file

@ -300,12 +300,12 @@ static int create_image(int platform_mode)
save_processor_state();
trace_suspend_resume(TPS("machine_suspend"), PM_EVENT_HIBERNATE, true);
error = swsusp_arch_suspend();
/* Restore control flow magically appears here */
restore_processor_state();
trace_suspend_resume(TPS("machine_suspend"), PM_EVENT_HIBERNATE, false);
if (error)
printk(KERN_ERR "PM: Error %d creating hibernation image\n",
error);
/* Restore control flow magically appears here */
restore_processor_state();
if (!in_suspend)
events_check_enabled = false;