1 files changed, 16 insertions, 17 deletions

diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index b07ba9393564..7515cf0e1805 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -52,10 +52,7 @@
 #include "vsyscall_trace.h"
 
 DEFINE_VVAR(int, vgetcpu_mode);
-DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
-{
-        .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
-};
+DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data);
 
 static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
 
@@ -80,20 +77,15 @@ early_param("vsyscall", vsyscall_setup);
 
 void update_vsyscall_tz(void)
 {
-        unsigned long flags;
-
-        write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
-        /* sys_tz has changed */
         vsyscall_gtod_data.sys_tz = sys_tz;
-        write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags);
 }
 
 void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
                         struct clocksource *clock, u32 mult)
 {
-        unsigned long flags;
+        struct timespec monotonic;
 
-        write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
+        write_seqcount_begin(&vsyscall_gtod_data.seq);
 
         /* copy vsyscall data */
         vsyscall_gtod_data.clock.vclock_mode    = clock->archdata.vclock_mode;
@@ -101,12 +93,19 @@ void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
         vsyscall_gtod_data.clock.mask           = clock->mask;
         vsyscall_gtod_data.clock.mult           = mult;
         vsyscall_gtod_data.clock.shift          = clock->shift;
+
         vsyscall_gtod_data.wall_time_sec        = wall_time->tv_sec;
         vsyscall_gtod_data.wall_time_nsec       = wall_time->tv_nsec;
-        vsyscall_gtod_data.wall_to_monotonic    = *wtm;
+
+        monotonic = timespec_add(*wall_time, *wtm);
+        vsyscall_gtod_data.monotonic_time_sec   = monotonic.tv_sec;
+        vsyscall_gtod_data.monotonic_time_nsec  = monotonic.tv_nsec;
+
         vsyscall_gtod_data.wall_time_coarse     = __current_kernel_time();
+        vsyscall_gtod_data.monotonic_time_coarse =
+                timespec_add(vsyscall_gtod_data.wall_time_coarse, *wtm);
 
-        write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags);
+        write_seqcount_end(&vsyscall_gtod_data.seq);
 }
 
 static void warn_bad_vsyscall(const char *level, struct pt_regs *regs,
@@ -153,7 +152,7 @@ static bool write_ok_or_segv(unsigned long ptr, size_t size)
 
                 thread->error_code      = 6;  /* user fault, no page, write */
                 thread->cr2             = ptr;
-                thread->trap_no         = 14;
+                thread->trap_nr         = X86_TRAP_PF;
 
                 memset(&info, 0, sizeof(info));
                 info.si_signo           = SIGSEGV;
@@ -217,9 +216,9 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
         current_thread_info()->sig_on_uaccess_error = 1;
 
         /*
-         * 0 is a valid user pointer (in the access_ok sense) on 32-bit and
+         * NULL is a valid user pointer (in the access_ok sense) on 32-bit and
          * 64-bit, so we don't need to special-case it here.  For all the
-         * vsyscalls, 0 means "don't write anything" not "write it at
+         * vsyscalls, NULL means "don't write anything" not "write it at
          * address 0".
          */
         ret = -EFAULT;
@@ -248,7 +247,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
 
                 ret = sys_getcpu((unsigned __user *)regs->di,
                                  (unsigned __user *)regs->si,
-                                 0);
+                                 NULL);
                 break;
         }