Skip to content

Commit

Permalink
[POWERPC] Consolidate sys_sigaltstack
Browse files Browse the repository at this point in the history
sys_sigaltstack is the same on 32bit and 64 and we can consolidate it
to signal.c.  The only difference is that the 32bit code uses ints
for the unused register paramaters and 64bit unsigned long.  I've
changed it to unsigned long because it's the same width on 32bit.

(I also wonder who came up with this awkward calling convention.. :))

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Christoph Hellwig authored and Paul Mackerras committed Jun 14, 2007
1 parent 22e38f2 commit 69d15f6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 23 deletions.
7 changes: 7 additions & 0 deletions arch/powerpc/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,10 @@ void check_syscall_restart(struct pt_regs *regs, struct k_sigaction *ka,
regs->ccr |= 0x10000000;
}
}

long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
unsigned long r5, unsigned long r6, unsigned long r7,
unsigned long r8, struct pt_regs *regs)
{
return do_sigaltstack(uss, uoss, regs->gpr[1]);
}
8 changes: 0 additions & 8 deletions arch/powerpc/kernel/signal_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -253,14 +253,6 @@ long sys_sigsuspend(old_sigset_t mask)
return -ERESTARTNOHAND;
}

#ifdef CONFIG_PPC32
long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, int r5,
int r6, int r7, int r8, struct pt_regs *regs)
{
return do_sigaltstack(uss, uoss, regs->gpr[1]);
}
#endif

long sys_sigaction(int sig, struct old_sigaction __user *act,
struct old_sigaction __user *oact)
{
Expand Down
8 changes: 0 additions & 8 deletions arch/powerpc/kernel/signal_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,6 @@ struct rt_sigframe {
char abigap[288];
} __attribute__ ((aligned (16)));

long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, unsigned long r5,
unsigned long r6, unsigned long r7, unsigned long r8,
struct pt_regs *regs)
{
return do_sigaltstack(uss, uoss, regs->gpr[1]);
}


/*
* Set up the sigcontext for the signal frame.
*/
Expand Down
7 changes: 0 additions & 7 deletions include/asm-powerpc/syscalls.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,9 @@ asmlinkage long ppc_newuname(struct new_utsname __user * name);

asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset,
size_t sigsetsize);

#ifndef __powerpc64__
asmlinkage long sys_sigaltstack(const stack_t __user *uss,
stack_t __user *uoss, int r5, int r6, int r7, int r8,
struct pt_regs *regs);
#else /* __powerpc64__ */
asmlinkage long sys_sigaltstack(const stack_t __user *uss,
stack_t __user *uoss, unsigned long r5, unsigned long r6,
unsigned long r7, unsigned long r8, struct pt_regs *regs);
#endif /* __powerpc64__ */

#endif /* __KERNEL__ */
#endif /* __ASM_POWERPC_SYSCALLS_H */

0 comments on commit 69d15f6

Please sign in to comment.