hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

brcm47xx: fix 831-old_gpio_wdt.patch for linux 4.19 

Fix the following compilation error when using linux 4.19 on brcm47xx:
drivers/watchdog/old_gpio_wdt.c:236:2: error: implicit declaration of function 'setup_timer'

setup_timer was removed and replaced by timer_setup in linux >=4.15:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=513ae785

Update the patch to use the timer_setup interface

Signed-off-by: Zachary Cook <zachcook1991@gmail.com>
master
Zachary Cook 2019-07-11 16:09:15 -04:00 committed by Petr Štetiar
parent 0893f28e19
commit 4d3c8872f8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/brcm47xx/patches-4.19/831-old_gpio_wdt.patch
View File

@ -111,7 +111,7 @@ Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
+ int first_interval; + int first_interval;
+} gpio_wdt_device; +} gpio_wdt_device;
+ +
+static void gpio_wdt_trigger(unsigned long unused) +static void gpio_wdt_trigger(struct timer_list *unused)
+{ +{
+ spin_lock(&gpio_wdt_device.lock); + spin_lock(&gpio_wdt_device.lock);
+ if (gpio_wdt_device.running && ticks > 0) + if (gpio_wdt_device.running && ticks > 0)
@ -268,7 +268,7 @@ Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
+ init_completion(&gpio_wdt_device.stop); + init_completion(&gpio_wdt_device.stop);
+ gpio_wdt_device.queue = 0; + gpio_wdt_device.queue = 0;
+ clear_bit(0, &gpio_wdt_device.inuse); + clear_bit(0, &gpio_wdt_device.inuse);
+ setup_timer(&gpio_wdt_device.timer, gpio_wdt_trigger, 0L); + timer_setup(&gpio_wdt_device.timer, gpio_wdt_trigger, 0L);
+ gpio_wdt_device.default_ticks = ticks; + gpio_wdt_device.default_ticks = ticks;
+ +
+ gpio_wdt_start(); + gpio_wdt_start();