diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/kernel/cpu/cpufreq/longhaul.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c index e940e00b96c9..b679aaf0c6b4 100644 --- a/arch/i386/kernel/cpu/cpufreq/longhaul.c +++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c | |||
@@ -76,7 +76,6 @@ static u8 longhaul_flags; | |||
76 | 76 | ||
77 | /* Module parameters */ | 77 | /* Module parameters */ |
78 | static int scale_voltage; | 78 | static int scale_voltage; |
79 | static int ignore_latency; | ||
80 | 79 | ||
81 | #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "longhaul", msg) | 80 | #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "longhaul", msg) |
82 | 81 | ||
@@ -680,8 +679,7 @@ static int __init longhaul_cpu_init(struct cpufreq_policy *policy) | |||
680 | /* Check ACPI support for C3 state */ | 679 | /* Check ACPI support for C3 state */ |
681 | if ((pr != NULL) && (longhaul_version == TYPE_POWERSAVER)) { | 680 | if ((pr != NULL) && (longhaul_version == TYPE_POWERSAVER)) { |
682 | cx = &pr->power.states[ACPI_STATE_C3]; | 681 | cx = &pr->power.states[ACPI_STATE_C3]; |
683 | if (cx->address > 0 && | 682 | if (cx->address > 0 && cx->latency <= 1000) { |
684 | (cx->latency <= 1000 || ignore_latency != 0) ) { | ||
685 | longhaul_flags |= USE_ACPI_C3; | 683 | longhaul_flags |= USE_ACPI_C3; |
686 | goto print_support_type; | 684 | goto print_support_type; |
687 | } | 685 | } |
@@ -800,8 +798,6 @@ static void __exit longhaul_exit(void) | |||
800 | 798 | ||
801 | module_param (scale_voltage, int, 0644); | 799 | module_param (scale_voltage, int, 0644); |
802 | MODULE_PARM_DESC(scale_voltage, "Scale voltage of processor"); | 800 | MODULE_PARM_DESC(scale_voltage, "Scale voltage of processor"); |
803 | module_param(ignore_latency, int, 0644); | ||
804 | MODULE_PARM_DESC(ignore_latency, "Skip ACPI C3 latency test"); | ||
805 | 801 | ||
806 | MODULE_AUTHOR ("Dave Jones <davej@codemonkey.org.uk>"); | 802 | MODULE_AUTHOR ("Dave Jones <davej@codemonkey.org.uk>"); |
807 | MODULE_DESCRIPTION ("Longhaul driver for VIA Cyrix processors."); | 803 | MODULE_DESCRIPTION ("Longhaul driver for VIA Cyrix processors."); |