Skip to content

Commit

Permalink
x32: Export setup/restore_sigcontext from signal.c
Browse files Browse the repository at this point in the history
Export setup_sigcontext() and restore_sigcontext() from signal.c, so
we can use the 64-bit versions verbatim for x32.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
  • Loading branch information
H. Peter Anvin committed Feb 20, 2012
1 parent f28f0c2 commit 8513942
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
5 changes: 5 additions & 0 deletions arch/x86/include/asm/sighandling.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,9 @@

void signal_fault(struct pt_regs *regs, void __user *frame, char *where);

int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
unsigned long *pax);
int setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate,
struct pt_regs *regs, unsigned long mask);

#endif /* _ASM_X86_SIGHANDLING_H */
10 changes: 4 additions & 6 deletions arch/x86/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@
regs->seg = GET_SEG(seg) | 3; \
} while (0)

static int
restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
unsigned long *pax)
int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
unsigned long *pax)
{
void __user *buf;
unsigned int tmpflags;
Expand Down Expand Up @@ -117,9 +116,8 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
return err;
}

static int
setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate,
struct pt_regs *regs, unsigned long mask)
int setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate,
struct pt_regs *regs, unsigned long mask)
{
int err = 0;

Expand Down

0 comments on commit 8513942

Please sign in to comment.