diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-07 03:12:17 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 03:12:17 -0500 |
| commit | 4f4ae0d42680889c62db4e1f3e6b4aa7787a7257 (patch) | |
| tree | 4263a1b014b59ee8d5557da570570571c8ea0297 /drivers/acpi | |
| parent | d870ec7281d8429ab17d2e0324f4d8ca3f3de62d (diff) | |
| parent | 623b78c39c4525731f852072edd742cc4fba6786 (diff) | |
| download | linux-4f4ae0d42680889c62db4e1f3e6b4aa7787a7257.tar.gz linux-4f4ae0d42680889c62db4e1f3e6b4aa7787a7257.tar.bz2 linux-4f4ae0d42680889c62db4e1f3e6b4aa7787a7257.zip | |
Merge branches 'release' and 'ppc-workaround' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/processor_perflib.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index 463b0247cbc5..f32010bee4d5 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c @@ -60,6 +60,11 @@ static DEFINE_MUTEX(performance_mutex); * policy is adjusted accordingly. */ +static unsigned int ignore_ppc = 0; +module_param(ignore_ppc, uint, 0644); +MODULE_PARM_DESC(ignore_ppc, "If the frequency of your machine gets wrongly" \ + "limited by BIOS, this should help"); + #define PPC_REGISTERED 1 #define PPC_IN_USE 2 @@ -72,6 +77,9 @@ static int acpi_processor_ppc_notifier(struct notifier_block *nb, struct acpi_processor *pr; unsigned int ppc = 0; + if (ignore_ppc) + return 0; + mutex_lock(&performance_mutex); if (event != CPUFREQ_INCOMPATIBLE) @@ -130,7 +138,13 @@ static int acpi_processor_get_platform_limit(struct acpi_processor *pr) int acpi_processor_ppc_has_changed(struct acpi_processor *pr) { - int ret = acpi_processor_get_platform_limit(pr); + int ret; + + if (ignore_ppc) + return 0; + + ret = acpi_processor_get_platform_limit(pr); + if (ret < 0) return (ret); else |