summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-06-15 21:13:25 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-06-18 17:17:42 +0200
commit7d4fdc19fc134f69f3711c14e63caef56aee0f2a (patch)
tree85d88f7807f295284cc05afd747e95c56ba2bc57 /arch/arm
parent[ARM] Replace extramask with a full copy of the sigmask (diff)
downloadlinux-7d4fdc19fc134f69f3711c14e63caef56aee0f2a.tar.xz
linux-7d4fdc19fc134f69f3711c14e63caef56aee0f2a.zip
[ARM] Merge sigcontext and sigmask members of sigframe
ucontext contains both the sigcontext and sigmask structures, and is also used for rt signal contexts. Re-use this structure for non-rt signals. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/kernel/signal.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 7a4213ef0f46..9f1e1768e4a6 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -193,8 +193,7 @@ struct aux_sigframe {
* Do a signal return; undo the signal stack. These are aligned to 64-bit.
*/
struct sigframe {
- struct sigcontext sc;
- sigset_t sigmask;
+ struct ucontext uc;
unsigned long retcode[2];
struct aux_sigframe aux __attribute__((aligned(8)));
};
@@ -264,7 +263,7 @@ asmlinkage int sys_sigreturn(struct pt_regs *regs)
if (!access_ok(VERIFY_READ, frame, sizeof (*frame)))
goto badframe;
- if (__copy_from_user(&set, &frame->sigmask, sizeof(set)))
+ if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
goto badframe;
sigdelsetmask(&set, ~_BLOCKABLE);
@@ -273,7 +272,7 @@ asmlinkage int sys_sigreturn(struct pt_regs *regs)
recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock);
- if (restore_sigcontext(regs, &frame->sc, &frame->aux))
+ if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &frame->aux))
goto badframe;
/* Send SIGTRAP if we're single-stepping */
@@ -482,8 +481,8 @@ setup_frame(int usig, struct k_sigaction *ka, sigset_t *set, struct pt_regs *reg
if (!frame)
return 1;
- err |= setup_sigcontext(&frame->sc, &frame->aux, regs, set->sig[0]);
- err |= __copy_to_user(&frame->sigmask, set, sizeof(*set));
+ err |= setup_sigcontext(&frame->uc.uc_mcontext, &frame->aux, regs, set->sig[0]);
+ err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
if (err == 0)
err = setup_return(regs, ka, frame->retcode, frame, usig);