diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/ia32/ia32_signal.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/signal.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c index bccfca68430e..665a730307f2 100644 --- a/arch/x86/ia32/ia32_signal.c +++ b/arch/x86/ia32/ia32_signal.c | |||
@@ -457,7 +457,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig, | |||
457 | else | 457 | else |
458 | put_user_ex(0, &frame->uc.uc_flags); | 458 | put_user_ex(0, &frame->uc.uc_flags); |
459 | put_user_ex(0, &frame->uc.uc_link); | 459 | put_user_ex(0, &frame->uc.uc_link); |
460 | err |= __compat_save_altstack(&frame->uc.uc_stack, regs->sp); | 460 | compat_save_altstack_ex(&frame->uc.uc_stack, regs->sp); |
461 | 461 | ||
462 | if (ksig->ka.sa.sa_flags & SA_RESTORER) | 462 | if (ksig->ka.sa.sa_flags & SA_RESTORER) |
463 | restorer = ksig->ka.sa.sa_restorer; | 463 | restorer = ksig->ka.sa.sa_restorer; |
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index cf913587d4dd..d859eea07db7 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c | |||
@@ -358,7 +358,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, | |||
358 | else | 358 | else |
359 | put_user_ex(0, &frame->uc.uc_flags); | 359 | put_user_ex(0, &frame->uc.uc_flags); |
360 | put_user_ex(0, &frame->uc.uc_link); | 360 | put_user_ex(0, &frame->uc.uc_link); |
361 | err |= __save_altstack(&frame->uc.uc_stack, regs->sp); | 361 | save_altstack_ex(&frame->uc.uc_stack, regs->sp); |
362 | 362 | ||
363 | /* Set up to return from userspace. */ | 363 | /* Set up to return from userspace. */ |
364 | restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); | 364 | restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); |
@@ -423,7 +423,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, | |||
423 | else | 423 | else |
424 | put_user_ex(0, &frame->uc.uc_flags); | 424 | put_user_ex(0, &frame->uc.uc_flags); |
425 | put_user_ex(0, &frame->uc.uc_link); | 425 | put_user_ex(0, &frame->uc.uc_link); |
426 | err |= __save_altstack(&frame->uc.uc_stack, regs->sp); | 426 | save_altstack_ex(&frame->uc.uc_stack, regs->sp); |
427 | 427 | ||
428 | /* Set up to return from userspace. If provided, use a stub | 428 | /* Set up to return from userspace. If provided, use a stub |
429 | already in userspace. */ | 429 | already in userspace. */ |
@@ -490,7 +490,7 @@ static int x32_setup_rt_frame(struct ksignal *ksig, | |||
490 | else | 490 | else |
491 | put_user_ex(0, &frame->uc.uc_flags); | 491 | put_user_ex(0, &frame->uc.uc_flags); |
492 | put_user_ex(0, &frame->uc.uc_link); | 492 | put_user_ex(0, &frame->uc.uc_link); |
493 | err |= __compat_save_altstack(&frame->uc.uc_stack, regs->sp); | 493 | compat_save_altstack_ex(&frame->uc.uc_stack, regs->sp); |
494 | put_user_ex(0, &frame->uc.uc__pad0); | 494 | put_user_ex(0, &frame->uc.uc__pad0); |
495 | 495 | ||
496 | if (ksig->ka.sa.sa_flags & SA_RESTORER) { | 496 | if (ksig->ka.sa.sa_flags & SA_RESTORER) { |