History

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

* 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()

Rafael J. Wysocki committed 10 years ago

Commit 0aeeb3e3 parents 29b4817 62822e2 8e859465 files · +36 −14Browse files

Showing the changes to kernel (1 of 5 files). Show all

Unified · Split

kernel/power/hibernate.c+2−2
@@ -300,12 +300,12 @@ static int create_image(int platform_mode) · 299 unmodified lines
300300 save_processor_state();
301301 trace_suspend_resume(TPS("machine_suspend"), PM_EVENT_HIBERNATE, true);
302302 error = swsusp_arch_suspend();
303+ /* Restore control flow magically appears here */
304+ restore_processor_state();
303305 trace_suspend_resume(TPS("machine_suspend"), PM_EVENT_HIBERNATE, false);
304306 if (error)
305307 printk(KERN_ERR "PM: Error %d creating hibernation image\n",
306308 error);
307− /* Restore control flow magically appears here */
308− restore_processor_state();
309309 if (!in_suspend)
310310 events_check_enabled = false;
311311