rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Intel IPS driver so it doesn't run continuously (#703511)

Browse Source
This commit is contained in:
Chuck Ebbert 2011-05-11 09:13:50 -04:00
parent 34f3a6f6cf
commit 8d4bec9c02
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ips-use-interruptible-waits-in-ips-monitor.patch Normal file
View File

@ -0,0 +1,30 @@
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon, 28 Mar 2011 10:36:30 +0000 (-0400)
Subject: ips: use interruptible waits in ips-monitor
X-Git-Tag: v2.6.39-rc1~20^2^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=a3424216e4935221fdaa5ca3c26e024f11297164
ips: use interruptible waits in ips-monitor
This is what I intended to do since:
1) the driver handles variable waits just fine, and
2) interruptible waits aren't reported as load in the load avg.
Reported-and-tested-by: Andreas Hartmann <andihartmann@freenet.de>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
---
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
index 1294a39..85c8ad4 100644
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel_ips.c
@@ -1111,7 +1111,7 @@ static int ips_monitor(void *data)
last_msecs = jiffies_to_msecs(jiffies);
expire = jiffies + msecs_to_jiffies(IPS_SAMPLE_PERIOD);
- __set_current_state(TASK_UNINTERRUPTIBLE);
+ __set_current_state(TASK_INTERRUPTIBLE);
mod_timer(&timer, expire);
schedule();

9
kernel.spec
View File

@ -744,6 +744,9 @@ Patch12404: x86-pci-preserve-existing-pci-bfsort-whitelist-for-dell-systems.patc
# iwlwifi: add {ack,plpc}_check module parameters (#666646)
Patch12405: iwlwifi-add-_ack_plpc_check-module-parameters.patch
# intel_ips driver bug (#703511) causes cooling fan to run
Patch12406: ips-use-interruptible-waits-in-ips-monitor.patch
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@ -1381,6 +1384,9 @@ ApplyPatch bonding-incorrect-tx-queue-offset.patch
# iwlwifi: add {ack,plpc}_check module parameters (#666646) queued for stable
ApplyPatch iwlwifi-add-_ack_plpc_check-module-parameters.patch
# intel_ips driver bug (#703511) causes cooling fan to run
ApplyPatch ips-use-interruptible-waits-in-ips-monitor.patch
# END OF PATCH APPLICATIONS
%endif
@ -1989,6 +1995,9 @@ fi
# and build.
%changelog
* Wed May 11 2011 Chuck Ebbert <cebbert@redhat.com>
- Fix Intel IPS driver so it doesn't run continuously (#703511)
* Tue May 10 2011 Kyle McMartin <kmcmartin@redhat.com>
- [sgruszka@] iwlwifi: add {ack,plpc}_check module parameters (#666646)