diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-17 16:35:06 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-17 16:35:06 -0400 |
| commit | 58dfe82fbab9779e5213b674e0c83c0446e58c87 (patch) | |
| tree | f66ee60eaae9f3a641c384ee93f42c2c32193b23 | |
| parent | f9b4574dc70d340dd4049529a8bc00d0afe5f488 (diff) | |
| download | longterm-queue-5.2-58dfe82fbab9779e5213b674e0c83c0446e58c87.tar.gz | |
wdt: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/watchdog-initialize-device-before-misc_register.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/queue/watchdog-initialize-device-before-misc_register.patch b/queue/watchdog-initialize-device-before-misc_register.patch index 3a3163a5..e747226e 100644 --- a/queue/watchdog-initialize-device-before-misc_register.patch +++ b/queue/watchdog-initialize-device-before-misc_register.patch @@ -1,4 +1,4 @@ -From cb36e29bb0e4b0c33c3d5866a0a4aebace4c99b7 Mon Sep 17 00:00:00 2001 +From 5ca68cf74b1bf092ad004ee37b29728704b863bf Mon Sep 17 00:00:00 2001 From: Krzysztof Sobota <krzysztof.sobota@nokia.com> Date: Fri, 17 Jul 2020 12:31:09 +0200 Subject: [PATCH] watchdog: initialize device before misc_register @@ -73,10 +73,10 @@ Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org> diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c -index b277eebd377e..b7d750b24e49 100644 +index 4e0b308eadee..00bba772afbc 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c -@@ -994,6 +994,15 @@ static int watchdog_cdev_register(struct watchdog_device *wdd) +@@ -947,6 +947,15 @@ static int watchdog_cdev_register(struct watchdog_device *wdd) if (IS_ERR_OR_NULL(watchdog_kworker)) return -ENODEV; @@ -90,9 +90,9 @@ index b277eebd377e..b7d750b24e49 100644 + 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_HARD); + hrtimer_init(&wd_data->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); wd_data->timer.function = watchdog_timer_expired; -@@ -1014,15 +1023,6 @@ static int watchdog_cdev_register(struct watchdog_device *wdd) +@@ -967,15 +976,6 @@ static int watchdog_cdev_register(struct watchdog_device *wdd) } } |