Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebieder...

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

diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c
index 07003f3f1bfc991e860feb9628a4dd943a238d04..e7c596dea947e3e09f4c74aeac426cf3687cfe39 100644 (file)
--- a/arch/x86/entry/vsyscall/vsyscall_64.c
+++ b/arch/x86/entry/vsyscall/vsyscall_64.c
@@ -110,7 +110,7 @@ static bool write_ok_or_segv(unsigned long ptr, size_t size)
                thread->cr2             = ptr;
                thread->trap_nr         = X86_TRAP_PF;
 
-               force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *)ptr, current);
+               force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *)ptr);
                return false;
        } else {
                return true;
@@ -289,7 +289,7 @@ do_ret:
        return true;
 
 sigsegv:
-       force_sig(SIGSEGV, current);
+       force_sig(SIGSEGV);
        return true;
 }