From 9ff0272989c24940e189bd6209c5ba04f01c4ad6 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Wed, 17 Oct 2007 18:04:41 +0200 Subject: [PATCH] --- yaml --- r: 71022 b: refs/heads/master c: c861eff88c92d98ee661cf0d2fa978611edeaceb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/vsyscall_64.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8264c3859110..674ba069dc07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b93b6ca3bf822a24e1535ee7c773740628bca1e6 +refs/heads/master: c861eff88c92d98ee661cf0d2fa978611edeaceb diff --git a/trunk/arch/x86/kernel/vsyscall_64.c b/trunk/arch/x86/kernel/vsyscall_64.c index 5684e5a1282b..8a67e282cb5e 100644 --- a/trunk/arch/x86/kernel/vsyscall_64.c +++ b/trunk/arch/x86/kernel/vsyscall_64.c @@ -78,7 +78,6 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock) vsyscall_gtod_data.wall_time_sec = wall_time->tv_sec; vsyscall_gtod_data.wall_time_nsec = wall_time->tv_nsec; vsyscall_gtod_data.sys_tz = sys_tz; - vsyscall_gtod_data.wall_time_nsec = wall_time->tv_nsec; vsyscall_gtod_data.wall_to_monotonic = wall_to_monotonic; write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); }