diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 20:16:40 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 20:16:40 +0400 |
| commit | b159d7a989e53ab3529084348aa80441520b8575 (patch) | |
| tree | 416512130cf80ded4cd88fc064d0b28c8220616f /include/asm-x86/ptrace.h | |
| parent | 0962f402af1bb0b53ccee626785d202a10c12fff (diff) | |
| parent | 4ab4ba32aa16b012cb0faabf1a27952508fe67f2 (diff) | |
| download | linux-b159d7a989e53ab3529084348aa80441520b8575.tar.xz | |
Merge branch 'x86/tracehook' into x86-v28-for-linus-phase1
Conflicts:
arch/x86/kernel/signal_64.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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-x86/ptrace.h b/include/asm-x86/ptrace.h index 33a034be8b5c..d64a61097165 100644 --- a/include/asm-x86/ptrace.h +++ b/include/asm-x86/ptrace.h @@ -250,6 +250,11 @@ static inline unsigned long frame_pointer(struct pt_regs *regs) return regs->bp; } +static inline unsigned long user_stack_pointer(struct pt_regs *regs) +{ + return regs->sp; +} + /* * These are defined as per linux/ptrace.h, which see. */ |