Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86: convert to asm-generic ptrace.h

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Sergei Shtylyov <sshtylyov@mvista.com>
Cc: Dongdong Deng <dongdong.deng@windriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Mike Frysinger and committed by
Linus Torvalds
c46dd6b4 82258c66

+5 -13
+5 -13
arch/x86/include/asm/ptrace.h
··· 136 136 struct task_struct; 137 137 138 138 extern unsigned long profile_pc(struct pt_regs *regs); 139 + #define profile_pc profile_pc 139 140 140 141 extern unsigned long 141 142 convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs); ··· 203 202 #endif 204 203 } 205 204 206 - static inline unsigned long instruction_pointer(struct pt_regs *regs) 207 - { 208 - return regs->ip; 209 - } 205 + #define GET_IP(regs) ((regs)->ip) 206 + #define GET_FP(regs) ((regs)->bp) 207 + #define GET_USP(regs) ((regs)->sp) 210 208 211 - static inline unsigned long frame_pointer(struct pt_regs *regs) 212 - { 213 - return regs->bp; 214 - } 215 - 216 - static inline unsigned long user_stack_pointer(struct pt_regs *regs) 217 - { 218 - return regs->sp; 219 - } 209 + #include <asm-generic/ptrace.h> 220 210 221 211 /* Query offset/name of register from its name/offset */ 222 212 extern int regs_query_register_offset(const char *name);