|
|
|
@ -39,7 +39,15 @@ Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com> |
|
|
|
|
void twd_local_timer_of_register(void);
|
|
|
|
|
--- a/arch/arm/kernel/smp_twd.c
|
|
|
|
|
+++ b/arch/arm/kernel/smp_twd.c
|
|
|
|
|
@@ -376,6 +376,13 @@ int __init twd_local_timer_register(stru
|
|
|
|
|
@@ -10,6 +10,7 @@
|
|
|
|
|
*/
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
|
+#include <linux/export.h>
|
|
|
|
|
#include <linux/clk.h>
|
|
|
|
|
#include <linux/delay.h>
|
|
|
|
|
#include <linux/device.h>
|
|
|
|
|
@@ -376,6 +377,13 @@ int __init twd_local_timer_register(stru
|
|
|
|
|
return twd_local_timer_common_register();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -55,7 +63,7 @@ Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com> |
|
|
|
|
{ .compatible = "arm,cortex-a9-twd-timer", },
|
|
|
|
|
--- a/drivers/watchdog/mpcore_wdt.c
|
|
|
|
|
+++ b/drivers/watchdog/mpcore_wdt.c
|
|
|
|
|
@@ -101,9 +101,7 @@ static void mpcore_wdt_keepalive(struct
|
|
|
|
|
@@ -101,9 +101,7 @@ static void mpcore_wdt_keepalive(struct
|
|
|
|
|
|
|
|
|
|
spin_lock(&wdt_lock);
|
|
|
|
|
/* Assume prescale is set to 256 */
|
|
|
|
|