ARM: rpc: use legacy_timer_tick

rpc is the only user of the timer_tick() function now, and can
just call the newly added generic version instead.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 31391147315da0376b578d6460aa8d88061e85b6..a652686c3b329de5b984a46e38eb73c2adb19109 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -452,6 +452,7 @@ config ARCH_RPC
        select HAVE_IDE
        select HAVE_PATA_PLATFORM
        select ISA_DMA_API
+       select LEGACY_TIMER_TICK
        select NEED_MACH_IO_H
        select NEED_MACH_MEMORY_H
        select NO_IOPORT_MAP

diff --git a/arch/arm/include/asm/mach/time.h b/arch/arm/include/asm/mach/time.h
index d75d39280db75516542915e271fa815ddd725ffe..5f522916ec99aa4449fa75d6a1cba13f26921ed7 100644 (file)
--- a/arch/arm/include/asm/mach/time.h
+++ b/arch/arm/include/asm/mach/time.h
@@ -7,8 +7,6 @@
 #ifndef __ASM_ARM_MACH_TIME_H
 #define __ASM_ARM_MACH_TIME_H
 
-extern void timer_tick(void);
-
 typedef void (*clock_access_fn)(struct timespec64 *);
 extern int register_persistent_clock(clock_access_fn read_persistent);
 

diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 09b149b09c43850b8ae9c87e9c8609944f43260c..b3836c94dc74895fb9efc207fe0f5c4fbf1b3338 100644 (file)
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -60,20 +60,6 @@ unsigned long profile_pc(struct pt_regs *regs)
 EXPORT_SYMBOL(profile_pc);
 #endif
 
-#ifndef CONFIG_GENERIC_CLOCKEVENTS
-/*
- * Kernel system timer support.
- */
-void timer_tick(void)
-{
-       profile_tick(CPU_PROFILING);
-       xtime_update(1);
-#ifndef CONFIG_SMP
-       update_process_times(user_mode(get_irq_regs()));
-#endif
-}
-#endif
-
 static void dummy_clock_access(struct timespec64 *ts)
 {
        ts->tv_sec = 0;

diff --git a/arch/arm/mach-rpc/time.c b/arch/arm/mach-rpc/time.c
index da85cac761ba0fb5893853fe35953d93371188a5..9f8edcfe9357f70bfc7c59951d15cdee278da013 100644 (file)
--- a/arch/arm/mach-rpc/time.c
+++ b/arch/arm/mach-rpc/time.c
@@ -81,7 +81,7 @@ static irqreturn_t
 ioc_timer_interrupt(int irq, void *dev_id)
 {
        ioc_time += RPC_LATCH;
-       timer_tick();
+       legacy_timer_tick(1);
        return IRQ_HANDLED;
 }