---

yaml --- r: 48602 b: refs/heads/master c: acc9a9d h: refs/heads/master v: v3
git-mirror · Feb 16, 2007 · 6360a9f · 6360a9f
1 parent 730f856
commit 6360a9f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88ad0bf6890505cbd9ca1dbb79944a27b5c8697d
+refs/heads/master: acc9a9dcdd0dd1d295c2f2ee02c27c761bd63cb1
diff --git a/trunk/include/linux/clocksource.h b/trunk/include/linux/clocksource.h
@@ -47,6 +47,7 @@ struct clocksource;
  * @mult:		cycle to nanosecond multiplier
  * @shift:		cycle to nanosecond divisor (power of two)
  * @flags:		flags describing special properties
+ * @vread:		vsyscall based read
  * @cycle_interval:	Used internally by timekeeping core, please ignore.
  * @xtime_interval:	Used internally by timekeeping core, please ignore.
  */
@@ -59,6 +60,7 @@ struct clocksource {
 	u32 mult;
 	u32 shift;
 	unsigned long flags;
+	cycle_t (*vread)(void);
 
 	/* timekeeping specific data, ignore */
 	cycle_t cycle_last, cycle_interval;
@@ -197,4 +199,12 @@ extern int clocksource_register(struct clocksource*);
 extern struct clocksource* clocksource_get_next(void);
 extern void clocksource_change_rating(struct clocksource *cs, int rating);
 
+#ifdef CONFIG_GENERIC_TIME_VSYSCALL
+extern void update_vsyscall(struct timespec *ts, struct clocksource *c);
+#else
+static inline void update_vsyscall(struct timespec *ts, struct clocksource *c)
+{
+}
+#endif
+
 #endif /* _LINUX_CLOCKSOURCE_H */
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
@@ -1174,6 +1174,7 @@ static void update_wall_time(void)
 
 	/* check to see if there is a new clocksource to use */
 	change_clocksource();
+	update_vsyscall(&xtime, clock);
 }
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -1174,6 +1174,7 @@ static void update_wall_time(void) @@
     	/* check to see if there is a new clocksource to use */
     	change_clocksource();
+    	update_vsyscall(&xtime, clock);
     }
     /*
@@ Expand Down @@