diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-18 19:28:54 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-18 19:28:54 +0100 |
| commit | 0a59228168d3722b71f8e3dbc623316fb4be78f4 (patch) | |
| tree | 90533da9ccb9cc79b05cfc1198c67365d251df4d /arch/tile/include/asm/signal.h | |
| parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | arch/tile: handle rt_sigreturn() more cleanly (diff) | |
| download | linux-0a59228168d3722b71f8e3dbc623316fb4be78f4.tar.xz linux-0a59228168d3722b71f8e3dbc623316fb4be78f4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile: handle rt_sigreturn() more cleanly
arch/tile: handle CLONE_SETTLS in copy_thread(), not user space
Diffstat (limited to 'arch/tile/include/asm/signal.h')
| -rw-r--r-- | arch/tile/include/asm/signal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/include/asm/signal.h b/arch/tile/include/asm/signal.h index c1ee1d61d44c..81d92a45cd4b 100644 --- a/arch/tile/include/asm/signal.h +++ b/arch/tile/include/asm/signal.h @@ -25,7 +25,7 @@ #if defined(__KERNEL__) && !defined(__ASSEMBLY__) struct pt_regs; -int restore_sigcontext(struct pt_regs *, struct sigcontext __user *, long *); +int restore_sigcontext(struct pt_regs *, struct sigcontext __user *); int setup_sigcontext(struct sigcontext __user *, struct pt_regs *); void do_signal(struct pt_regs *regs); #endif |