summaryrefslogtreecommitdiffstats
path: root/arch/m68k/q40
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2020-09-24 16:37:37 +0200
committerArnd Bergmann <arnd@arndb.de>2020-10-30 21:57:05 +0100
commitd6444094042b4f4b4623dc1a2437f61309b9b34b (patch)
tree0ffc5fc790b78e17fda3efb60976c293a20406ce /arch/m68k/q40
parent275e70e4b9dd4d59639e43fb859d0c953a374752 (diff)
downloadlinux-stable-d6444094042b4f4b4623dc1a2437f61309b9b34b.tar.gz
linux-stable-d6444094042b4f4b4623dc1a2437f61309b9b34b.tar.bz2
linux-stable-d6444094042b4f4b4623dc1a2437f61309b9b34b.zip
m68k: split heartbeat out of timer function
The heartbeat functionality is mostly separate from the actual timer interrupt handling, and it is only used on five platforms. Split it out into a separate function and call that directly from the timer irq on those platforms. Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Tested-by: Geert Uytterhoeven <geert@linux-m68k.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/m68k/q40')
-rw-r--r--arch/m68k/q40/q40ints.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c
index 1c696906c159..b01b545a2db0 100644
--- a/arch/m68k/q40/q40ints.c
+++ b/arch/m68k/q40/q40ints.c
@@ -17,6 +17,7 @@
#include <linux/interrupt.h>
#include <linux/irq.h>
+#include <asm/machdep.h>
#include <asm/ptrace.h>
#include <asm/traps.h>
@@ -144,6 +145,7 @@ static irqreturn_t q40_timer_int(int irq, void *dev_id)
local_irq_save(flags);
timer_routine(0, NULL);
+ timer_heartbeat();
local_irq_restore(flags);
}
return IRQ_HANDLED;