diff options
| author | Len Brown <len.brown@intel.com> | 2013-02-18 06:25:53 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2013-02-18 06:25:53 +0100 |
| commit | ca62cf59ceef10ff2ebca0e7f764507186870270 (patch) | |
| tree | 480ebfd5551db27052f501917a7e0314043c6778 /drivers | |
| parent | Merge branches 'idle-remove-statedata', 'pm_idle' and 'idle-hsw-turbostat' in... (diff) | |
| parent | x86 idle: remove 32-bit-only "no-hlt" parameter, hlt_works_ok flag (diff) | |
| download | linux-ca62cf59ceef10ff2ebca0e7f764507186870270.tar.xz linux-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')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 8b433cb08a33..fc95308e9a11 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; } |