summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2013-02-18 00:25:53 -0500
committerLen Brown <len.brown@intel.com>2013-02-18 00:25:53 -0500
commitca62cf59ceef10ff2ebca0e7f764507186870270 (patch)
tree480ebfd5551db27052f501917a7e0314043c6778 /drivers/acpi
parent2e7d0f60d8b976c951621c1bc82acf0654089c0b (diff)
parent27be457000211a6903968dfce06d5f73f051a217 (diff)
downloadlinux-3.10-ca62cf59ceef10ff2ebca0e7f764507186870270.tar.gz
linux-3.10-ca62cf59ceef10ff2ebca0e7f764507186870270.tar.bz2
linux-3.10-ca62cf59ceef10ff2ebca0e7f764507186870270.zip
Merge branch 'misc' into release
Conflicts: arch/x86/kernel/process.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/processor_idle.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 8b433cb08a3..fc95308e9a1 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -71,7 +71,6 @@ static struct acpi_processor_cx *acpi_cstate[CPUIDLE_STATE_MAX];
static int disabled_by_idle_boot_param(void)
{
return boot_option_idle_override == IDLE_POLL ||
- boot_option_idle_override == IDLE_FORCE_MWAIT ||
boot_option_idle_override == IDLE_HALT;
}