* 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()
Showing the changes to kernel (1 of 5 files). Show all
Unified · Split
| @@ -300,12 +300,12 @@ static int create_image(int platform_mode) · 299 unmodified lines | |||
| 300 | save_processor_state(); | 300 | save_processor_state(); |
| 301 | trace_suspend_resume(TPS("machine_suspend"), PM_EVENT_HIBERNATE, true); | 301 | trace_suspend_resume(TPS("machine_suspend"), PM_EVENT_HIBERNATE, true); |
| 302 | error = swsusp_arch_suspend(); | 302 | error = swsusp_arch_suspend(); |
| 303 | /* Restore control flow magically appears here */ | ||
| 304 | restore_processor_state(); | ||
| 303 | trace_suspend_resume(TPS("machine_suspend"), PM_EVENT_HIBERNATE, false); | 305 | trace_suspend_resume(TPS("machine_suspend"), PM_EVENT_HIBERNATE, false); |
| 304 | if (error) | 306 | if (error) |
| 305 | printk(KERN_ERR "PM: Error %d creating hibernation image\n", | 307 | printk(KERN_ERR "PM: Error %d creating hibernation image\n", |
| 306 | error); | 308 | error); |
| 307 | /* Restore control flow magically appears here */ | ||
| 308 | restore_processor_state(); | ||
| 309 | if (!in_suspend) | 309 | if (!in_suspend) |
| 310 | events_check_enabled = false; | 310 | events_check_enabled = false; |
| 311 | 311 | ||