timekeeping: remove xtime_update

There are no more users of xtime_update aside from legacy_timer_tick(),
so fold it into that function and remove the declaration.

update_process_times() is now only called inside of the kernel/time/
code, so the declaration can be moved there.

Reviewed-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>

diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 3670cb1670ffec559e217c79849dc5c2bf5e9ae3..d47009611109790b92e40e0b2c17bb57cc43afbe 100644 (file)
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -10,8 +10,6 @@ void timekeeping_init(void);
 extern int timekeeping_suspended;
 
 /* Architecture timer tick functions: */
-extern void update_process_times(int user);
-extern void xtime_update(unsigned long ticks);
 extern void legacy_timer_tick(unsigned long ticks);
 
 /*

diff --git a/kernel/time/tick-legacy.c b/kernel/time/tick-legacy.c
index 73c5a0af474337f06ad0522851c62665b518f491..af225b32f5b37ed2195039614ca2a2b970ec9cbd 100644 (file)
--- a/kernel/time/tick-legacy.c
+++ b/kernel/time/tick-legacy.c
@@ -10,10 +10,28 @@
 
 #include "tick-internal.h"
 
+/**
+ * legacy_timer_tick() - advances the timekeeping infrastructure
+ * @ticks:     number of ticks, that have elapsed since the last call.
+ *
+ * This is used by platforms that have not been converted to
+ * generic clockevents.
+ *
+ * If 'ticks' is zero, the CPU is not handling timekeeping, so
+ * only perform process accounting and profiling.
+ *
+ * Must be called with interrupts disabled.
+ */
 void legacy_timer_tick(unsigned long ticks)
 {
-       if (ticks)
-               xtime_update(ticks);
+       if (ticks) {
+               raw_spin_lock(&jiffies_lock);
+               write_seqcount_begin(&jiffies_seq);
+               do_timer(ticks);
+               write_seqcount_end(&jiffies_seq);
+               raw_spin_unlock(&jiffies_lock);
+               update_wall_time();
+       }
        update_process_times(user_mode(get_irq_regs()));
        profile_tick(CPU_PROFILING);
 }

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 52fff7e9edcd75f0ea4636e2fc4823dfdd62937c..daa0ff01781987f02c13718acc78c2d7dfed08d3 100644 (file)
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -2438,19 +2438,3 @@ void hardpps(const struct timespec64 *phase_ts, const struct timespec64 *raw_ts)
 }
 EXPORT_SYMBOL(hardpps);
 #endif /* CONFIG_NTP_PPS */
-
-/**
- * xtime_update() - advances the timekeeping infrastructure
- * @ticks:     number of ticks, that have elapsed since the last call.
- *
- * Must be called with interrupts disabled.
- */
-void xtime_update(unsigned long ticks)
-{
-       raw_spin_lock(&jiffies_lock);
-       write_seqcount_begin(&jiffies_seq);
-       do_timer(ticks);
-       write_seqcount_end(&jiffies_seq);
-       raw_spin_unlock(&jiffies_lock);
-       update_wall_time();
-}

diff --git a/kernel/time/timekeeping.h b/kernel/time/timekeeping.h
index 099737f6f10c77bc8e27e75d2c09fe6f107d37cf..d94b69c5b869af3a057819993d8f0c2e7878a2f7 100644 (file)
--- a/kernel/time/timekeeping.h
+++ b/kernel/time/timekeeping.h
@@ -22,6 +22,7 @@ static inline int sched_clock_suspend(void) { return 0; }
 static inline void sched_clock_resume(void) { }
 #endif
 
+extern void update_process_times(int user);
 extern void do_timer(unsigned long ticks);
 extern void update_wall_time(void);