diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-09 09:58:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-09 09:58:12 -0700 |
| commit | 63b12bdb0d21aca527996fb2c547387bfd3e14b8 (patch) | |
| tree | 6ab83b2a1c289f30fea18b88f04138ee69c37c6f /arch/metag | |
| parent | ad1f5caf34390bb20fdbb4eaf71b0494e89936f0 (diff) | |
| parent | 059ade650ae57cfd371af690fdba887af04aded8 (diff) | |
Merge branch 'signal-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc
Pull arch signal handling cleanup from Richard Weinberger:
"This patch series moves all remaining archs to the get_signal(),
signal_setup_done() and sigsp() functions.
Currently these archs use open coded variants of the said functions.
Further, unused parameters get removed from get_signal_to_deliver(),
tracehook_signal_handler() and signal_delivered().
At the end of the day we save around 500 lines of code."
* 'signal-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc: (43 commits)
powerpc: Use sigsp()
openrisc: Use sigsp()
mn10300: Use sigsp()
mips: Use sigsp()
microblaze: Use sigsp()
metag: Use sigsp()
m68k: Use sigsp()
m32r: Use sigsp()
hexagon: Use sigsp()
frv: Use sigsp()
cris: Use sigsp()
c6x: Use sigsp()
blackfin: Use sigsp()
avr32: Use sigsp()
arm64: Use sigsp()
arc: Use sigsp()
sas_ss_flags: Remove nested ternary if
Rip out get_signal_to_deliver()
Clean up signal_delivered()
tracehook_signal_handler: Remove sig, info, ka and regs
...
Diffstat (limited to 'arch/metag')
| -rw-r--r-- | arch/metag/kernel/signal.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/metag/kernel/signal.c b/arch/metag/kernel/signal.c index b9e4a82d2bd4..0d100d5c1407 100644 --- a/arch/metag/kernel/signal.c +++ b/arch/metag/kernel/signal.c @@ -140,13 +140,9 @@ static int setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, /* * Determine which stack to use.. */ -static void __user *get_sigframe(struct k_sigaction *ka, unsigned long sp, - size_t frame_size) +static void __user *get_sigframe(struct ksignal *ksig, unsigned long sp) { - /* Meta stacks grows upwards */ - if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags(sp) == 0)) - sp = current->sas_ss_sp; - + sp = sigsp(sp, ksig); sp = (sp + 7) & ~7; /* 8byte align stack */ return (void __user *)sp; @@ -159,7 +155,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, int err; unsigned long code; - frame = get_sigframe(&ksig->ka, regs->REG_SP, sizeof(*frame)); + frame = get_sigframe(ksig, regs->REG_SP); if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) return -EFAULT; |