summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitaly Wool <vitalywool@gmail.com>2006-09-11 12:42:39 +0200
committerWim Van Sebroeck <wim@iguana.be>2006-10-02 23:05:38 +0200
commit65a64ec3b4fc904932b832c53e5a86d56b972682 (patch)
tree59f5a01ae048fbe47b43263bd8efd4927a2778f2
parent[WATCHDOG] pnx4008_wdt.c - spinlock fixes. (diff)
downloadlinux-65a64ec3b4fc904932b832c53e5a86d56b972682.tar.xz
linux-65a64ec3b4fc904932b832c53e5a86d56b972682.zip
[WATCHDOG] pnx4008: add cpu_relax()
Added cpu_relax as suggested by Alan Cox. Signed-off-by: Vitaly Wool <vitalywool@gmail.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--drivers/char/watchdog/pnx4008_wdt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/watchdog/pnx4008_wdt.c b/drivers/char/watchdog/pnx4008_wdt.c
index 359168e63c1d..e7f0450a939d 100644
--- a/drivers/char/watchdog/pnx4008_wdt.c
+++ b/drivers/char/watchdog/pnx4008_wdt.c
@@ -104,7 +104,8 @@ static void wdt_enable(void)
/* stop counter, initiate counter reset */
__raw_writel(RESET_COUNT, WDTIM_CTRL(wdt_base));
/*wait for reset to complete. 100% guarantee event */
- while (__raw_readl(WDTIM_COUNTER(wdt_base)));
+ while (__raw_readl(WDTIM_COUNTER(wdt_base)))
+ cpu_relax();
/* internal and external reset, stop after that */
__raw_writel(M_RES2 | STOP_COUNT0 | RESET_COUNT0,
WDTIM_MCTRL(wdt_base));