Commit a5383996 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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()
parents a9b760b0 8c539776 2351f8d2

drivers/cpufreq/intel_pstate.c

+1 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ static ssize_t store_no_turbo(struct kobject *a, struct kobj_attribute *b, 


	update_turbo_state();

	if (global.turbo_disabled) {

		pr_warn("Turbo disabled by BIOS or unavailable on processor\n");

		pr_notice_once("Turbo disabled by BIOS or unavailable on processor\n");

		mutex_unlock(&intel_pstate_limits_lock);

		mutex_unlock(&intel_pstate_driver_lock);

		return -EPERM;

kernel/power/hibernate.c

+7 −0
Original line number Diff line number Diff line
@@ -898,6 +898,13 @@ static int software_resume(void) 
	error = freeze_processes();

	if (error)

		goto Close_Finish;



	error = freeze_kernel_threads();

	if (error) {

		thaw_processes();

		goto Close_Finish;

	}



	error = load_image_and_restore();

	thaw_processes();

 Finish: