Skip to content

Commit 3f1ae22

Browse files
torvaldstorvalds
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] pcwd.c - fix open_allowed type. [WATCHDOG] fix watchdog/ixp4xx_wdt.c compilation [WATCHDOG] fix watchdog/wdt285.c compilation [WATCHDOG] fix watchdog/at91rm9200_wdt.c compilation [WATCHDOG] fix watchdog/shwdt.c compilation [WATCHDOG] fix watchdog/txx9wdt.c compilation [WATCHDOG] MAINTAINERS: remove ZF MACHZ WATCHDOG entry [WATCHDOG] Fix build with CONFIG_ITCO_VENDOR_SUPPORT=n
2 parents e2205a1 + 36cbaa8 commit 3f1ae22

File tree

8 files changed

+21
-24
lines changed

8 files changed

+21
-24
lines changed

‎MAINTAINERS

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4683,12 +4683,6 @@ L: linux-wireless@vger.kernel.org
46834683
L: zd1211-devs@lists.sourceforge.net (subscribers-only)
46844684
S: Maintained
46854685

4686-
ZF MACHZ WATCHDOG
4687-
P: Fernando Fuganti
4688-
M: fuganti@netbank.com.br
4689-
W: http://cvs.conectiva.com.br/drivers/ZFL-watchdog/
4690-
S: Maintained
4691-
46924686
ZR36067 VIDEO FOR LINUX DRIVER
46934687
P: Ronald Bultje
46944688
M: rbultje@ronald.bitfreak.net

‎drivers/watchdog/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ obj-$(CONFIG_IB700_WDT) += ib700wdt.o
6666
obj-$(CONFIG_IBMASR) += ibmasr.o
6767
obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
6868
obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o
69-
obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o iTCO_vendor_support.o
69+
obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o
70+
ifeq ($(CONFIG_ITCO_VENDOR_SUPPORT),y)
71+
obj-$(CONFIG_ITCO_WDT) += iTCO_vendor_support.o
72+
endif
7073
obj-$(CONFIG_IT8712F_WDT) += it8712f_wdt.o
7174
obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o
7275
obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o

‎drivers/watchdog/at91rm9200_wdt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ static struct watchdog_info at91_wdt_info = {
128128
/*
129129
* Handle commands from user-space.
130130
*/
131-
static long at91_wdt_ioct(struct file *file,
131+
static long at91_wdt_ioctl(struct file *file,
132132
unsigned int cmd, unsigned long arg)
133133
{
134134
void __user *argp = (void __user *)arg;

‎drivers/watchdog/ixp4xx_wdt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static int nowayout = WATCHDOG_NOWAYOUT;
2929
static int heartbeat = 60; /* (secs) Default is 1 minute */
3030
static unsigned long wdt_status;
3131
static unsigned long boot_status;
32-
static spin_lock_t wdt_lock;
32+
static DEFINE_SPINLOCK(wdt_lock);
3333

3434
#define WDT_TICK_RATE (IXP4XX_PERIPHERAL_BUS_CLOCK * 1000000UL)
3535

‎drivers/watchdog/pcwd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ static const int heartbeat_tbl[] = {
168168
static int cards_found;
169169

170170
/* internal variables */
171-
static atomic_t open_allowed = ATOMIC_INIT(1);
171+
static unsigned long open_allowed;
172172
static char expect_close;
173173
static int temp_panic;
174174

‎drivers/watchdog/shwdt.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <linux/mm.h>
3131
#include <linux/io.h>
3232
#include <linux/uaccess.h>
33-
#include <linux/watchdog.h>
33+
#include <asm/watchdog.h>
3434

3535
#define PFX "shwdt: "
3636

@@ -68,7 +68,7 @@ static int clock_division_ratio = WTCSR_CKS_4096;
6868
static void sh_wdt_ping(unsigned long data);
6969

7070
static unsigned long shwdt_is_open;
71-
static struct watchdog_info sh_wdt_info;
71+
static const struct watchdog_info sh_wdt_info;
7272
static char shwdt_expect_close;
7373
static DEFINE_TIMER(timer, sh_wdt_ping, 0, 0);
7474
static unsigned long next_heartbeat;
@@ -89,7 +89,7 @@ static void sh_wdt_start(void)
8989
__u8 csr;
9090
unsigned long flags;
9191

92-
spin_lock_irqsave(&wdt_lock, flags);
92+
spin_lock_irqsave(&shwdt_lock, flags);
9393

9494
next_heartbeat = jiffies + (heartbeat * HZ);
9595
mod_timer(&timer, next_ping_period(clock_division_ratio));
@@ -127,7 +127,7 @@ static void sh_wdt_start(void)
127127
csr &= ~RSTCSR_RSTS;
128128
sh_wdt_write_rstcsr(csr);
129129
#endif
130-
spin_unlock_irqrestore(&wdt_lock, flags);
130+
spin_unlock_irqrestore(&shwdt_lock, flags);
131131
}
132132

133133
/**
@@ -139,14 +139,14 @@ static void sh_wdt_stop(void)
139139
__u8 csr;
140140
unsigned long flags;
141141

142-
spin_lock_irqsave(&wdt_lock, flags);
142+
spin_lock_irqsave(&shwdt_lock, flags);
143143

144144
del_timer(&timer);
145145

146146
csr = sh_wdt_read_csr();
147147
csr &= ~WTCSR_TME;
148148
sh_wdt_write_csr(csr);
149-
spin_unlock_irqrestore(&wdt_lock, flags);
149+
spin_unlock_irqrestore(&shwdt_lock, flags);
150150
}
151151

152152
/**
@@ -157,9 +157,9 @@ static inline void sh_wdt_keepalive(void)
157157
{
158158
unsigned long flags;
159159

160-
spin_lock_irqsave(&wdt_lock, flags);
160+
spin_lock_irqsave(&shwdt_lock, flags);
161161
next_heartbeat = jiffies + (heartbeat * HZ);
162-
spin_unlock_irqrestore(&wdt_lock, flags);
162+
spin_unlock_irqrestore(&shwdt_lock, flags);
163163
}
164164

165165
/**
@@ -173,9 +173,9 @@ static int sh_wdt_set_heartbeat(int t)
173173
if (unlikely(t < 1 || t > 3600)) /* arbitrary upper limit */
174174
return -EINVAL;
175175

176-
spin_lock_irqsave(&wdt_lock, flags);
176+
spin_lock_irqsave(&shwdt_lock, flags);
177177
heartbeat = t;
178-
spin_unlock_irqrestore(&wdt_lock, flags);
178+
spin_unlock_irqrestore(&shwdt_lock, flags);
179179
return 0;
180180
}
181181

@@ -189,7 +189,7 @@ static void sh_wdt_ping(unsigned long data)
189189
{
190190
unsigned long flags;
191191

192-
spin_lock_irqsave(&wdt_lock, flags);
192+
spin_lock_irqsave(&shwdt_lock, flags);
193193
if (time_before(jiffies, next_heartbeat)) {
194194
__u8 csr;
195195

@@ -203,7 +203,7 @@ static void sh_wdt_ping(unsigned long data)
203203
} else
204204
printk(KERN_WARNING PFX "Heartbeat lost! Will not ping "
205205
"the watchdog\n");
206-
spin_unlock_irqrestore(&wdt_lock, flags);
206+
spin_unlock_irqrestore(&shwdt_lock, flags);
207207
}
208208

209209
/**

‎drivers/watchdog/txx9wdt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static unsigned long txx9wdt_alive;
4545
static int expect_close;
4646
static struct txx9_tmr_reg __iomem *txx9wdt_reg;
4747
static struct clk *txx9_imclk;
48-
static DECLARE_LOCK(txx9_lock);
48+
static DEFINE_SPINLOCK(txx9_lock);
4949

5050
static void txx9wdt_ping(void)
5151
{

‎drivers/watchdog/wdt285.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ static int __init footbridge_watchdog_init(void)
208208
soft_margin);
209209

210210
if (machine_is_cats())
211-
printk(KERN_WARN
211+
printk(KERN_WARNING
212212
"Warning: Watchdog reset may not work on this machine.\n");
213213
return 0;
214214
}

0 commit comments

Comments
 (0)