diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-07-17 11:45:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-07-17 11:45:29 +0200 |
| commit | b5e4111f027c4be85dbe97e090530d03c55c4cf4 (patch) | |
| tree | 11e0a37cb59314f4e9a7b2810124a4a7a33140e5 /arch/x86/kernel/signal.c | |
| parent | 72d5305dcb3637913c2c37e847a4de9028e49244 (diff) | |
| parent | 9de8033f1bbcce5ed23fe5da9ca1a5060207f7ed (diff) | |
Merge branch 'locking/urgent' into locking/core, before applying larger changes and to refresh the branch with fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/signal.c')
| -rw-r--r-- | arch/x86/kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index a0da58db43a8..2851d63c1202 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c @@ -363,7 +363,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, /* Set up to return from userspace. */ restorer = current->mm->context.vdso + - selected_vdso32->sym___kernel_sigreturn; + selected_vdso32->sym___kernel_rt_sigreturn; if (ksig->ka.sa.sa_flags & SA_RESTORER) restorer = ksig->ka.sa.sa_restorer; put_user_ex(restorer, &frame->pretcode); |