diff options
| author | Mike Frysinger <[email protected]> | 2011-05-26 16:25:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-05-26 17:12:36 -0700 |
| commit | c46dd6b48db02c1fa2f0644809605344660d3956 (patch) | |
| tree | 020a99daa99f49372e31852906ec0e60b2f8607a | |
| parent | 82258c661a9175ec10018cf34090f88cf4da4982 (diff) | |
x86: convert to asm-generic ptrace.h
Signed-off-by: Mike Frysinger <[email protected]>
Cc: Oleg Nesterov <[email protected]>
Cc: Jason Wessel <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Paul Mundt <[email protected]>
Cc: Sergei Shtylyov <[email protected]>
Cc: Dongdong Deng <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
| -rw-r--r-- | arch/x86/include/asm/ptrace.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h index 1babf8adecdf..94e7618fcac8 100644 --- a/arch/x86/include/asm/ptrace.h +++ b/arch/x86/include/asm/ptrace.h @@ -136,6 +136,7 @@ struct cpuinfo_x86; struct task_struct; extern unsigned long profile_pc(struct pt_regs *regs); +#define profile_pc profile_pc extern unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs); @@ -202,20 +203,11 @@ static inline unsigned long kernel_stack_pointer(struct pt_regs *regs) #endif } -static inline unsigned long instruction_pointer(struct pt_regs *regs) -{ - return regs->ip; -} - -static inline unsigned long frame_pointer(struct pt_regs *regs) -{ - return regs->bp; -} +#define GET_IP(regs) ((regs)->ip) +#define GET_FP(regs) ((regs)->bp) +#define GET_USP(regs) ((regs)->sp) -static inline unsigned long user_stack_pointer(struct pt_regs *regs) -{ - return regs->sp; -} +#include <asm-generic/ptrace.h> /* Query offset/name of register from its name/offset */ extern int regs_query_register_offset(const char *name); |