diff options
author | Josh Boyer <jwboyer@redhat.com> | 2011-08-30 10:23:12 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2011-08-30 10:23:12 -0400 |
commit | 2af2b0f5ca57a21d14f97505c5f71e8311e57321 (patch) | |
tree | fb968b99dbd532884d2dbd9d3346f0881f0edea3 | |
parent | 5e97a201ac969e408daf84e2c5407d8a4876b519 (diff) | |
download | kernel-2af2b0f5ca57a21d14f97505c5f71e8311e57321.tar.gz kernel-2af2b0f5ca57a21d14f97505c5f71e8311e57321.tar.xz kernel-2af2b0f5ca57a21d14f97505c5f71e8311e57321.zip |
Fixup acpi patch to select CPU_FREQ_TABLE so we don't get an undefined link
error
-rw-r--r-- | acpi-ensure-thermal-limits-match-cpu-freq.patch | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/acpi-ensure-thermal-limits-match-cpu-freq.patch b/acpi-ensure-thermal-limits-match-cpu-freq.patch index 3945af197..9d97b6024 100644 --- a/acpi-ensure-thermal-limits-match-cpu-freq.patch +++ b/acpi-ensure-thermal-limits-match-cpu-freq.patch @@ -1,3 +1,8 @@ +From 9a056a5843ff83db987d6e18625f4a2ee64b5450 Mon Sep 17 00:00:00 2001 +From: Matthew Garrett <mjg@redhat.com> +Date: Tue, 30 Aug 2011 10:07:24 -0400 +Subject: [PATCH] ACPI: Ensure thermal limits match CPU frequencies + The ACPI thermal management code supports slowing down a CPU when it's overheating. Right now that's done by choosing to run it at 100%, 75%, 50% or 25% of full speed. However, most CPUs do not allow an arbitrary @@ -9,9 +14,22 @@ so it uses actual frequencies rather than percentages. Reported by: Gene Snider <snider6982@comcast.net> Signed-off-by: Matthew Garrett <mjg@redhat.com> --- + drivers/acpi/Kconfig | 1 + drivers/acpi/processor_thermal.c | 45 +++++++++++++++++++++---------------- - 1 files changed, 25 insertions(+), 20 deletions(-) + 2 files changed, 26 insertions(+), 20 deletions(-) +diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig +index de0e3df..7d1bdb5 100644 +--- a/drivers/acpi/Kconfig ++++ b/drivers/acpi/Kconfig +@@ -185,6 +185,7 @@ config ACPI_PROCESSOR + tristate "Processor" + select THERMAL + select CPU_IDLE ++ select CPU_FREQ_TABLE + default y + help + This driver installs ACPI as the idle handler for Linux and uses diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c index 870550d..1c4eb60 100644 --- a/drivers/acpi/processor_thermal.c @@ -124,5 +142,5 @@ index 870550d..1c4eb60 100644 if (pr->flags.throttling) max_state += (pr->throttling.state_count -1); -- -1.7.6.1 +1.7.6 |