Messages in this thread Patch in this message | | | From | Torben Hohn <> | Subject | [PATCH 01/18] move do_timer() from kernel/timer.c into kernel/time/timekeeping.c | Date | Sat, 22 Jan 2011 00:06:47 +0100 |
| |
Signed-off-by: Torben Hohn <torbenh@gmx.de> --- kernel/time/timekeeping.c | 12 ++++++++++++ kernel/timer.c | 13 ------------- 2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index d27c756..546d82f 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -946,3 +946,15 @@ struct timespec get_monotonic_coarse(void) now.tv_nsec + mono.tv_nsec); return now; } + +/* + * The 64-bit jiffies value is not atomic - you MUST NOT read it + * without sampling the sequence number in xtime_lock. + * jiffies is defined in the linker script... + */ +void do_timer(unsigned long ticks) +{ + jiffies_64 += ticks; + update_wall_time(); + calc_global_load(ticks); +} diff --git a/kernel/timer.c b/kernel/timer.c index 43ca993..87f656c 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1293,19 +1293,6 @@ void run_local_timers(void) raise_softirq(TIMER_SOFTIRQ); } -/* - * The 64-bit jiffies value is not atomic - you MUST NOT read it - * without sampling the sequence number in xtime_lock. - * jiffies is defined in the linker script... - */ - -void do_timer(unsigned long ticks) -{ - jiffies_64 += ticks; - update_wall_time(); - calc_global_load(ticks); -} - #ifdef __ARCH_WANT_SYS_ALARM /* -- 1.7.2.3
| |