[rt] Refresh "watchdog: prevent deferral of watchdogd wakeup on RT" for context changes in 4.19.141
This commit is contained in:
parent
9d7f237d9b
commit
3ffefa8cda
|
@ -547,6 +547,8 @@ linux (4.19.141-1) UNRELEASED; urgency=medium
|
||||||
4.19.138
|
4.19.138
|
||||||
* [rt] Refresh "timers: Redo the notification of canceling timers on -RT"
|
* [rt] Refresh "timers: Redo the notification of canceling timers on -RT"
|
||||||
for context changes in 4.19.138
|
for context changes in 4.19.138
|
||||||
|
* [rt] Refresh "watchdog: prevent deferral of watchdogd wakeup on RT" for
|
||||||
|
context changes in 4.19.141
|
||||||
|
|
||||||
-- Salvatore Bonaccorso <carnil@debian.org> Tue, 04 Aug 2020 16:33:40 +0200
|
-- Salvatore Bonaccorso <carnil@debian.org> Tue, 04 Aug 2020 16:33:40 +0200
|
||||||
|
|
||||||
|
|
|
@ -39,11 +39,9 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||||
drivers/watchdog/watchdog_dev.c | 8 ++++----
|
drivers/watchdog/watchdog_dev.c | 8 ++++----
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
|
|
||||||
index 10b2090f3e5e..c04384aa94a5 100644
|
|
||||||
--- a/drivers/watchdog/watchdog_dev.c
|
--- a/drivers/watchdog/watchdog_dev.c
|
||||||
+++ b/drivers/watchdog/watchdog_dev.c
|
+++ b/drivers/watchdog/watchdog_dev.c
|
||||||
@@ -145,7 +145,7 @@ static inline void watchdog_update_worker(struct watchdog_device *wdd)
|
@@ -145,7 +145,7 @@
|
||||||
ktime_t t = watchdog_next_keepalive(wdd);
|
ktime_t t = watchdog_next_keepalive(wdd);
|
||||||
|
|
||||||
if (t > 0)
|
if (t > 0)
|
||||||
|
@ -52,7 +50,7 @@ index 10b2090f3e5e..c04384aa94a5 100644
|
||||||
} else {
|
} else {
|
||||||
hrtimer_cancel(&wd_data->timer);
|
hrtimer_cancel(&wd_data->timer);
|
||||||
}
|
}
|
||||||
@@ -164,7 +164,7 @@ static int __watchdog_ping(struct watchdog_device *wdd)
|
@@ -164,7 +164,7 @@
|
||||||
if (ktime_after(earliest_keepalive, now)) {
|
if (ktime_after(earliest_keepalive, now)) {
|
||||||
hrtimer_start(&wd_data->timer,
|
hrtimer_start(&wd_data->timer,
|
||||||
ktime_sub(earliest_keepalive, now),
|
ktime_sub(earliest_keepalive, now),
|
||||||
|
@ -61,8 +59,8 @@ index 10b2090f3e5e..c04384aa94a5 100644
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -948,7 +948,7 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)
|
@@ -957,7 +957,7 @@
|
||||||
return -ENODEV;
|
dev_set_name(&wd_data->dev, "watchdog%d", wdd->id);
|
||||||
|
|
||||||
kthread_init_work(&wd_data->work, watchdog_ping_work);
|
kthread_init_work(&wd_data->work, watchdog_ping_work);
|
||||||
- hrtimer_init(&wd_data->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
|
- hrtimer_init(&wd_data->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
|
||||||
|
@ -70,7 +68,7 @@ index 10b2090f3e5e..c04384aa94a5 100644
|
||||||
wd_data->timer.function = watchdog_timer_expired;
|
wd_data->timer.function = watchdog_timer_expired;
|
||||||
|
|
||||||
if (wdd->id == 0) {
|
if (wdd->id == 0) {
|
||||||
@@ -1005,7 +1005,7 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)
|
@@ -1005,7 +1005,7 @@
|
||||||
__module_get(wdd->ops->owner);
|
__module_get(wdd->ops->owner);
|
||||||
get_device(&wd_data->dev);
|
get_device(&wd_data->dev);
|
||||||
if (handle_boot_enabled)
|
if (handle_boot_enabled)
|
||||||
|
@ -79,6 +77,3 @@ index 10b2090f3e5e..c04384aa94a5 100644
|
||||||
else
|
else
|
||||||
pr_info("watchdog%d running and kernel based pre-userspace handler disabled\n",
|
pr_info("watchdog%d running and kernel based pre-userspace handler disabled\n",
|
||||||
wdd->id);
|
wdd->id);
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue