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

* pm-cpufreq:
cpufreq: intel_pstate: Only mention the BIOS disabling turbo mode once

* pm-sleep:
PM: hibernate: Freeze kernel threads in software_resume()

Changed files
+8 -1
drivers
cpufreq
kernel
power
+1 -1
drivers/cpufreq/intel_pstate.c
··· 1059 1059 1060 1060 update_turbo_state(); 1061 1061 if (global.turbo_disabled) { 1062 - pr_warn("Turbo disabled by BIOS or unavailable on processor\n"); 1062 + pr_notice_once("Turbo disabled by BIOS or unavailable on processor\n"); 1063 1063 mutex_unlock(&intel_pstate_limits_lock); 1064 1064 mutex_unlock(&intel_pstate_driver_lock); 1065 1065 return -EPERM;
+7
kernel/power/hibernate.c
··· 898 898 error = freeze_processes(); 899 899 if (error) 900 900 goto Close_Finish; 901 + 902 + error = freeze_kernel_threads(); 903 + if (error) { 904 + thaw_processes(); 905 + goto Close_Finish; 906 + } 907 + 901 908 error = load_image_and_restore(); 902 909 thaw_processes(); 903 910 Finish: