Messages in this thread Patch in this message | | | Date | Fri, 30 Jul 2010 10:51:45 -0700 | From | Greg KH <> | Subject | [088/205] ipmi: set schedule_timeout_wait() value back to one |
| |
2.6.34-stable review patch. If anyone has any objections, please let us know.
------------------
From: Martin Wilck <martin.wilck@ts.fujitsu.com>
commit 8d1f66dc9b4f80a1441bc1c33efa98aca99e8813 upstream.
Fix a regression introduced by ae74e823cb7d ("ipmi: add parameter to limit CPU usage in kipmid").
Some systems were seeing CPU usage go up dramatically with the recent changes to try to reduce timer usage in the IPMI driver. This was traced down to schedule_timeout_interruptible(1) being changed to schedule_timeout_interruptbile(0). Revert that part of the change.
Addresses https://bugzilla.kernel.org/show_bug.cgi?id=16147
Reported-by: Thomas Jarosch <thomas.jarosch@intra2net.com> Signed-off-by: Corey Minyard <cminyard@mvista.com> Tested-by: Thomas Jarosch <thomas.jarosch@intra2net.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/char/ipmi/ipmi_si_intf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -1003,7 +1003,7 @@ static int ipmi_thread(void *data) else if (smi_result == SI_SM_CALL_WITH_DELAY && busy_wait) schedule(); else - schedule_timeout_interruptible(0); + schedule_timeout_interruptible(1); } return 0; }
| |