---

yaml --- r: 297393 b: refs/heads/master c: 68fe7b2 h: refs/heads/master i: 297391: dc6e124 v: v3
git-mirror · Mar 24, 2012 · 09073ed · 09073ed
1 parent cd58c6f
commit 09073ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f293474c4c6c4dc2baaf2dfd486748b5986de76
+refs/heads/master: 68fe7b23d559763a2e19e5fc1cf7036e4aaecb10
diff --git a/trunk/arch/x86/kernel/vsyscall_64.c b/trunk/arch/x86/kernel/vsyscall_64.c
@@ -83,9 +83,10 @@ void update_vsyscall_tz(void)
 void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
 			struct clocksource *clock, u32 mult)
 {
-	write_seqcount_begin(&vsyscall_gtod_data.seq);
 	struct timespec monotonic;
 
+	write_seqcount_begin(&vsyscall_gtod_data.seq);
+
 	/* copy vsyscall data */
 	vsyscall_gtod_data.clock.vclock_mode	= clock->archdata.vclock_mode;
 	vsyscall_gtod_data.clock.cycle_last	= clock->cycle_last;