aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/machzwd.c
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
committerGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
commitc71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch)
treeecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/watchdog/machzwd.c
parentea53c912f8a86a8567697115b6a0d8152beee5c8 (diff)
parent6a00f206debf8a5c8899055726ad127dbeeed098 (diff)
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts: litmus/sched_cedf.c
Diffstat (limited to 'drivers/watchdog/machzwd.c')
-rw-r--r--drivers/watchdog/machzwd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/machzwd.c b/drivers/watchdog/machzwd.c
index 2d118cf022fc..1332b838cc58 100644
--- a/drivers/watchdog/machzwd.c
+++ b/drivers/watchdog/machzwd.c
@@ -54,7 +54,7 @@
54 54
55/* indexes */ /* size */ 55/* indexes */ /* size */
56#define ZFL_VERSION 0x02 /* 16 */ 56#define ZFL_VERSION 0x02 /* 16 */
57#define CONTROL 0x10 /* 16 */ 57#define CONTROL 0x10 /* 16 */
58#define STATUS 0x12 /* 8 */ 58#define STATUS 0x12 /* 8 */
59#define COUNTER_1 0x0C /* 16 */ 59#define COUNTER_1 0x0C /* 16 */
60#define COUNTER_2 0x0E /* 8 */ 60#define COUNTER_2 0x0E /* 8 */
@@ -143,7 +143,7 @@ static unsigned long next_heartbeat;
143#ifndef ZF_DEBUG 143#ifndef ZF_DEBUG
144# define dprintk(format, args...) 144# define dprintk(format, args...)
145#else 145#else
146# define dprintk(format, args...) printk(KERN_DEBUG PFX 146# define dprintk(format, args...) printk(KERN_DEBUG PFX \
147 ":%s:%d: " format, __func__, __LINE__ , ## args) 147 ":%s:%d: " format, __func__, __LINE__ , ## args)
148#endif 148#endif
149 149
@@ -388,7 +388,7 @@ static struct notifier_block zf_notifier = {
388 388
389static void __init zf_show_action(int act) 389static void __init zf_show_action(int act)
390{ 390{
391 char *str[] = { "RESET", "SMI", "NMI", "SCI" }; 391 static const char * const str[] = { "RESET", "SMI", "NMI", "SCI" };
392 392
393 printk(KERN_INFO PFX ": Watchdog using action = %s\n", str[act]); 393 printk(KERN_INFO PFX ": Watchdog using action = %s\n", str[act]);
394} 394}