Skip to content

Commit

Permalink
arm64: signal: return struct rt_sigframe from get_sigframe
Browse files Browse the repository at this point in the history
We only have one type of frame (rt_sigframe) for arm64, so just return
that type directly and dispense with the framesize argument, which is
presumably a hangover from code copied from arch/arm/.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  • Loading branch information
Will Deacon authored and Catalin Marinas committed Nov 23, 2012
1 parent 060a18c commit b64e1c6
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions arch/arm64/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,11 @@ static int setup_sigframe(struct rt_sigframe __user *sf,
return err;
}

static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
int framesize)
static struct rt_sigframe __user *get_sigframe(struct k_sigaction *ka,
struct pt_regs *regs)
{
unsigned long sp, sp_top;
void __user *frame;
struct rt_sigframe __user *frame;

sp = sp_top = regs->sp;

Expand All @@ -216,8 +216,8 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
if ((ka->sa.sa_flags & SA_ONSTACK) && !sas_ss_flags(sp))
sp = sp_top = current->sas_ss_sp + current->sas_ss_size;

sp = (sp - framesize) & ~15;
frame = (void __user *)sp;
sp = (sp - sizeof(struct rt_sigframe)) & ~15;
frame = (struct rt_sigframe __user *)sp;

/*
* Check that we can actually write to the signal frame.
Expand Down Expand Up @@ -253,7 +253,7 @@ static int setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
stack_t stack;
int err = 0;

frame = get_sigframe(ka, regs, sizeof(*frame));
frame = get_sigframe(ka, regs);
if (!frame)
return 1;

Expand Down

0 comments on commit b64e1c6

Please sign in to comment.