diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 16:18:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 18:06:53 +0200 |
| commit | 0962f402af1bb0b53ccee626785d202a10c12fff (patch) | |
| tree | 26fa57193f16e45c6e0557049d02164f129077ed /include/asm-x86/ptrace.h | |
| parent | Merge branch 'x86/pebs' into x86-v28-for-linus-phase1 (diff) | |
| parent | Merge commit 'v2.6.27-rc3' into x86/prototypes (diff) | |
| download | linux-0962f402af1bb0b53ccee626785d202a10c12fff.tar.xz linux-0962f402af1bb0b53ccee626785d202a10c12fff.zip | |
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
Conflicts:
arch/x86/kernel/process_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/ptrace.h')
| -rw-r--r-- | include/asm-x86/ptrace.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-x86/ptrace.h b/include/asm-x86/ptrace.h index 45c75238cd08..33a034be8b5c 100644 --- a/include/asm-x86/ptrace.h +++ b/include/asm-x86/ptrace.h @@ -182,6 +182,9 @@ extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, void signal_fault(struct pt_regs *regs, void __user *frame, char *where); #endif +extern long syscall_trace_enter(struct pt_regs *); +extern void syscall_trace_leave(struct pt_regs *); + static inline unsigned long regs_return_value(struct pt_regs *regs) { return regs->ax; |