Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / arch / x86 / kernel / vsyscall_64.c

diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index d5c69860b524bc85f1e5eea1685466e42c6c2945..f386dc49f988d753c5b9f8167c80313d5be72178 100644 (file)
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -152,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;