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

Merge branches 'pm-cpuidle' and 'pm-sleep' 

* pm-cpuidle:
  intel_idle: Fix max_cstate for processor models without C-state tables

* pm-sleep:
  PM: sleep: fix typo in kernel/power/process.c
parents d1e7c299 4e0ba557 4d4ce805

drivers/idle/intel_idle.c

+1 −1
Original line number Diff line number Diff line
@@ -1239,7 +1239,7 @@ static void __init intel_idle_init_cstates_acpi(struct cpuidle_driver *drv) 
		struct acpi_processor_cx *cx;

		struct cpuidle_state *state;



		if (intel_idle_max_cstate_reached(cstate))

		if (intel_idle_max_cstate_reached(cstate - 1))

			break;



		cx = &acpi_state_table.states[cstate];

kernel/power/process.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ int freeze_processes(void) 
	BUG_ON(in_atomic());



	/*

	 * Now that the whole userspace is frozen we need to disbale

	 * Now that the whole userspace is frozen we need to disable

	 * the OOM killer to disallow any further interference with

	 * killable tasks. There is no guarantee oom victims will

	 * ever reach a point they go away we have to wait with a timeout.