From 09073edfac49c68f3eaf09b25b8757fbf7f120c7 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 24 Mar 2012 09:29:22 +0100 Subject: [PATCH] --- yaml --- r: 297393 b: refs/heads/master c: 68fe7b23d559763a2e19e5fc1cf7036e4aaecb10 h: refs/heads/master i: 297391: dc6e124c97fe580e1aed7a88612c71f04815ae52 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/vsyscall_64.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d7ef997db4f2..487fcfb4a49c 100644 --- 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 index 4285f1f404c2..d5c69860b524 100644 --- 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;