Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://www.linux-watchdog.org/linux-watchdog
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: Initconst section fixes for watchdog
watchdog: lantiq: fix watchdogs timeout handling
watchdog: hpwdt: prevent multiple "NMI occurred" messages
watchdog: WatchDog Timer Driver Core - use passed watchdog_device
+19
-18
+7
-6
drivers/watchdog/hpwdt.c
+7
-6
drivers/watchdog/hpwdt.c
···
494
494
asminline_call(&cmn_regs, cru_rom_addr);
495
495
die_nmi_called = 1;
496
496
spin_unlock_irqrestore(&rom_lock, rom_pl);
497
-
if (!is_icru) {
498
-
if (cmn_regs.u1.ral == 0) {
499
-
printk(KERN_WARNING "hpwdt: An NMI occurred, "
500
-
"but unable to determine source.\n");
501
-
}
502
-
}
503
497
504
498
if (allow_kdump)
505
499
hpwdt_stop();
500
+
501
+
if (!is_icru) {
502
+
if (cmn_regs.u1.ral == 0) {
503
+
panic("An NMI occurred, "
504
+
"but unable to determine source.\n");
505
+
}
506
+
}
506
507
panic("An NMI occurred, please see the Integrated "
507
508
"Management Log for details.\n");
508
509
+4
-4
drivers/watchdog/lantiq_wdt.c
+4
-4
drivers/watchdog/lantiq_wdt.c
···
51
51
static void
52
52
ltq_wdt_enable(void)
53
53
{
54
-
ltq_wdt_timeout = ltq_wdt_timeout *
54
+
unsigned long int timeout = ltq_wdt_timeout *
55
55
(ltq_io_region_clk_rate / LTQ_WDT_DIVIDER) + 0x1000;
56
-
if (ltq_wdt_timeout > LTQ_MAX_TIMEOUT)
57
-
ltq_wdt_timeout = LTQ_MAX_TIMEOUT;
56
+
if (timeout > LTQ_MAX_TIMEOUT)
57
+
timeout = LTQ_MAX_TIMEOUT;
58
58
59
59
/* write the first password magic */
60
60
ltq_w32(LTQ_WDT_PW1, ltq_wdt_membase + LTQ_WDT_CR);
61
61
/* write the second magic plus the configuration and new timeout */
62
62
ltq_w32(LTQ_WDT_SR_EN | LTQ_WDT_SR_PWD | LTQ_WDT_SR_CLKDIV |
63
-
LTQ_WDT_PW2 | ltq_wdt_timeout, ltq_wdt_membase + LTQ_WDT_CR);
63
+
LTQ_WDT_PW2 | timeout, ltq_wdt_membase + LTQ_WDT_CR);
64
64
}
65
65
66
66
static void
+1
-1
drivers/watchdog/sbc_epx_c3.c
+1
-1
drivers/watchdog/sbc_epx_c3.c
···
173
173
.notifier_call = epx_c3_notify_sys,
174
174
};
175
175
176
-
static const char banner[] __initdata = KERN_INFO PFX
176
+
static const char banner[] __initconst = KERN_INFO PFX
177
177
"Hardware Watchdog Timer for Winsystems EPX-C3 SBC: 0.1\n";
178
178
179
179
static int __init watchdog_init(void)
+7
-7
drivers/watchdog/watchdog_dev.c
+7
-7
drivers/watchdog/watchdog_dev.c
···
59
59
60
60
static int watchdog_ping(struct watchdog_device *wddev)
61
61
{
62
-
if (test_bit(WDOG_ACTIVE, &wdd->status)) {
62
+
if (test_bit(WDOG_ACTIVE, &wddev->status)) {
63
63
if (wddev->ops->ping)
64
64
return wddev->ops->ping(wddev); /* ping the watchdog */
65
65
else
···
81
81
{
82
82
int err;
83
83
84
-
if (!test_bit(WDOG_ACTIVE, &wdd->status)) {
84
+
if (!test_bit(WDOG_ACTIVE, &wddev->status)) {
85
85
err = wddev->ops->start(wddev);
86
86
if (err < 0)
87
87
return err;
88
88
89
-
set_bit(WDOG_ACTIVE, &wdd->status);
89
+
set_bit(WDOG_ACTIVE, &wddev->status);
90
90
}
91
91
return 0;
92
92
}
···
105
105
{
106
106
int err = -EBUSY;
107
107
108
-
if (test_bit(WDOG_NO_WAY_OUT, &wdd->status)) {
108
+
if (test_bit(WDOG_NO_WAY_OUT, &wddev->status)) {
109
109
pr_info("%s: nowayout prevents watchdog to be stopped!\n",
110
-
wdd->info->identity);
110
+
wddev->info->identity);
111
111
return err;
112
112
}
113
113
114
-
if (test_bit(WDOG_ACTIVE, &wdd->status)) {
114
+
if (test_bit(WDOG_ACTIVE, &wddev->status)) {
115
115
err = wddev->ops->stop(wddev);
116
116
if (err < 0)
117
117
return err;
118
118
119
-
clear_bit(WDOG_ACTIVE, &wdd->status);
119
+
clear_bit(WDOG_ACTIVE, &wddev->status);
120
120
}
121
121
return 0;
122
122
}