aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/time.h
diff options
context:
space:
mode:
authorTorben Hohn <torbenh@gmx.de>2011-01-27 15:58:55 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-01-31 14:55:41 +0100
commit871cf1e5f2a17702f58539a3af8b18fc8666ad4c (patch)
treeda80fbad2c79dee33d4ac559c8881ce4c77476b7 /include/linux/time.h
parentMerge branch 'for-linus' of git://git.infradead.org/ubi-2.6 (diff)
downloadlinux-dev-871cf1e5f2a17702f58539a3af8b18fc8666ad4c.tar.xz
linux-dev-871cf1e5f2a17702f58539a3af8b18fc8666ad4c.zip
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 'include/linux/time.h')
-rw-r--r--include/linux/time.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/time.h b/include/linux/time.h
index 1e6d3b59238d..86a9c487fdd8 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -166,7 +166,6 @@ extern void monotonic_to_bootbased(struct timespec *ts);
extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
extern int timekeeping_valid_for_hres(void);
extern u64 timekeeping_max_deferment(void);
-extern void update_wall_time(void);
extern void timekeeping_leap_insert(int leapsecond);
struct tms;