From 0dd6ec3a33cab9ee890c9ff671edea9202246c27 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 29 Jun 2010 15:05:31 -0700 Subject: [PATCH] ipmi: set schedule_timeout_wait() value back to one 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 Signed-off-by: Corey Minyard Tested-by: Thomas Jarosch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- drivers/char/ipmi/ipmi_si_intf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 9ead05d3cc89..7198491b6166 100644 --- 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; } -- 2.39.5