[2.6 patch] fix watchdog/wdt285.c compilation

[2.6 patch] fix watchdog/wdt285.c compilation

[Adrian Bunk]

This patch fixes the following compile error caused by
commit d0e58eed05f9baf77c4f75e794ae245f6dae240a
([WATCHDOG 55/57] wdt285: switch to unlocked_ioctl and tidy up ...):

<--  snip  -->

...
  CC [M]  drivers/watchdog/wdt285.o
wdt285.c: In function 'footbridge_watchdog_init':
wdt285.c:211: error: 'KERN_WARN' undeclared (first use in this function)
wdt285.c:211: error: (Each undeclared identifier is reported only once
wdt285.c:211: error: for each function it appears in.)
wdt285.c:212: error: expected ')' before string constant
make[3]: *** [drivers/watchdog/wdt285.o] Error 1

<--  snip  -->

Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>

---
9b218bec5065288e8ffe5479e534d3c0da52c3d0 
diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c
index fea398a..06a743e 100644
--- a/drivers/watchdog/wdt285.c
+++ b/drivers/watchdog/wdt285.c
@@ -208,7 +208,7 @@ static int __init footbridge_watchdog_init(void)
 								soft_margin);
 
 	if (machine_is_cats())
-		printk(KERN_WARN
+		printk(KERN_WARNING
 		  "Warning: Watchdog reset may not work on this machine.\n");
 	return 0;
 }

Re: [2.6 patch] fix watchdog/wdt285.c compilation

[Russell King]

On Fri, Aug 08, 2008 at 07:03:46PM +0300, Adrian Bunk wrote:
> wdt285.c:211: error: 'KERN_WARN' undeclared (first use in this function)

It might be worth having the kernel provide an alias for KERN_WARN
to avoid these kinds of errors in the future.  Many people have
said that they make this mistake as well, I certainly have many a
time.

The problem is that we have things like KERN_ERR, KERN_CRIT rather
than KERN_ERROR and KERN_CRITICAL, but so we think "oh, we're using
shortened versions" but then you come to KERN_WARNING rather than
KERN_WARN.

However, since xxx_WARNING is a recognised name for the severity
level (see syslog(3)) we shouldn't get rid of that.

Needless to say, this fix for wdt285 still needs to get to Linus ASAP.

Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of: