---

yaml --- r: 54634 b: refs/heads/master c: 8524070 h: refs/heads/master v: v3
git-mirror · May 8, 2007 · df9588d · df9588d
1 parent 587bf72
commit df9588d
Show file tree

Hide file tree

Showing 5 changed files with 480 additions and 460 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 329c8d84ca1946c037d9859dc251b56d8b1b4630
+refs/heads/master: 8524070b7982d76258942275908b7434cfcab4b4
diff --git a/trunk/include/linux/time.h b/trunk/include/linux/time.h
@@ -119,6 +119,7 @@ extern void getnstimeofday(struct timespec *tv);
 
 extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
 extern int timekeeping_is_continuous(void);
+extern void update_wall_time(void);
 
 /**
  * timespec_to_ns - Convert timespec to nanoseconds

diff --git a/trunk/kernel/time/Makefile b/trunk/kernel/time/Makefile
@@ -1,4 +1,4 @@
-obj-y += ntp.o clocksource.o jiffies.o timer_list.o
+obj-y += timekeeping.o ntp.o clocksource.o jiffies.o timer_list.o
 
 obj-$(CONFIG_GENERIC_CLOCKEVENTS)		+= clockevents.o
 obj-$(CONFIG_GENERIC_CLOCKEVENTS)		+= tick-common.o