diff options
| author | Richard Weinberger <richard@nod.at> | 2014-03-05 09:31:04 -0500 |
|---|---|---|
| committer | Richard Weinberger <richard@sigma-star.at> | 2014-08-06 07:04:10 -0400 |
| commit | d83961b733519b43c31d13d8d35fd0f6c17aa31f (patch) | |
| tree | c0b563e0a7a22d43e84ad99677b04f6a04607d80 /arch/metag | |
| parent | 36992f2893d224add9a1e4b9114aa04f4640853b (diff) | |
metag: Use sigsp()
Use sigsp() instead of the open coded variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
Acked-by: James Hogan <james.hogan@imgtec.com>
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, | |||
| 140 | /* | 140 | /* |
| 141 | * Determine which stack to use.. | 141 | * Determine which stack to use.. |
| 142 | */ | 142 | */ |
| 143 | static void __user *get_sigframe(struct k_sigaction *ka, unsigned long sp, | 143 | static void __user *get_sigframe(struct ksignal *ksig, unsigned long sp) |
| 144 | size_t frame_size) | ||
| 145 | { | 144 | { |
| 146 | /* Meta stacks grows upwards */ | 145 | sp = sigsp(sp, ksig); |
| 147 | if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags(sp) == 0)) | ||
| 148 | sp = current->sas_ss_sp; | ||
| 149 | |||
| 150 | sp = (sp + 7) & ~7; /* 8byte align stack */ | 146 | sp = (sp + 7) & ~7; /* 8byte align stack */ |
| 151 | 147 | ||
| 152 | return (void __user *)sp; | 148 | return (void __user *)sp; |
| @@ -159,7 +155,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, | |||
| 159 | int err; | 155 | int err; |
| 160 | unsigned long code; | 156 | unsigned long code; |
| 161 | 157 | ||
| 162 | frame = get_sigframe(&ksig->ka, regs->REG_SP, sizeof(*frame)); | 158 | frame = get_sigframe(ksig, regs->REG_SP); |
| 163 | if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) | 159 | if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) |
| 164 | return -EFAULT; | 160 | return -EFAULT; |
| 165 | 161 | ||