aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorTorben Hohn <torbenh@gmx.de>2011-01-27 09:58:55 -0500
committerThomas Gleixner <tglx@linutronix.de>2011-01-31 08:55:41 -0500
commit871cf1e5f2a17702f58539a3af8b18fc8666ad4c (patch)
treeda80fbad2c79dee33d4ac559c8881ce4c77476b7 /kernel/timer.c
parent70d1f365568e0cdbc9f4ab92428e1830fdb09ab0 (diff)
time: Move do_timer() to kernel/time/timekeeping.c
do_timer() is primary timekeeping related. calc_global_load() is called from do_timer() as well, but that's more for historical reasons. [ tglx: Fixed up the calc_global_load() reject andmassaged changelog ] Signed-off-by: Torben Hohn <torbenh@gmx.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: johnstul@us.ibm.com Cc: yong.zhang0@gmail.com Cc: hch@infradead.org LKML-Reference: <20110127145855.23248.56933.stgit@localhost> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index 43ca9936f2d0..87f656cc2a55 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1293,19 +1293,6 @@ void run_local_timers(void)
1293 raise_softirq(TIMER_SOFTIRQ); 1293 raise_softirq(TIMER_SOFTIRQ);
1294} 1294}
1295 1295
1296/*
1297 * The 64-bit jiffies value is not atomic - you MUST NOT read it
1298 * without sampling the sequence number in xtime_lock.
1299 * jiffies is defined in the linker script...
1300 */
1301
1302void do_timer(unsigned long ticks)
1303{
1304 jiffies_64 += ticks;
1305 update_wall_time();
1306 calc_global_load(ticks);
1307}
1308
1309#ifdef __ARCH_WANT_SYS_ALARM 1296#ifdef __ARCH_WANT_SYS_ALARM
1310 1297
1311/* 1298/*