[rt] Refresh "watchdog: prevent deferral of watchdogd wakeup on RT" for context changes in 4.19.141

debian/changelog

@@ -547,6 +547,8 @@ linux (4.19.141-1) UNRELEASED; urgency=medium
     4.19.138
   * [rt] Refresh "timers: Redo the notification of canceling timers on -RT"
     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
 

debian/patches-rt/0250-watchdog-prevent-deferral-of-watchdogd-wakeup-on-RT.patch

@@ -39,11 +39,9 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  drivers/watchdog/watchdog_dev.c | 8 ++++----
  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
 +++ 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);
  
  		if (t > 0)
@@ -52,7 +50,7 @@ index 10b2090f3e5e..c04384aa94a5 100644
  	} else {
  		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)) {
  		hrtimer_start(&wd_data->timer,
  			      ktime_sub(earliest_keepalive, now),
@@ -61,8 +59,8 @@ index 10b2090f3e5e..c04384aa94a5 100644
  		return 0;
  	}
  
-@@ -948,7 +948,7 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)
- 		return -ENODEV;
+@@ -957,7 +957,7 @@
+ 	dev_set_name(&wd_data->dev, "watchdog%d", wdd->id);
  
  	kthread_init_work(&wd_data->work, watchdog_ping_work);
 -	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;
  
  	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);
  		get_device(&wd_data->dev);
  		if (handle_boot_enabled)
@@ -79,6 +77,3 @@ index 10b2090f3e5e..c04384aa94a5 100644
  		else
  			pr_info("watchdog%d running and kernel based pre-userspace handler disabled\n",
  				wdd->id);
--- 
-2.17.1
-