Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 297724
b: refs/heads/master
c: 8513942
h: refs/heads/master
v: v3
  • Loading branch information
H. Peter Anvin committed Feb 20, 2012
1 parent fc92583 commit b3f13d3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f28f0c23576662fb293defe9b1884d5a6e1bd85c
refs/heads/master: 851394229e79c11b0b5b74c509817848e9a80564
5 changes: 5 additions & 0 deletions trunk/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 trunk/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 b3f13d3

Please sign in to comment.