Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3cea45c6ef459b776123a4855eba6dafd506f3ce

Authored by Mike Frysinger
Committed by Linus Torvalds
1 parent c46dd6b48d
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

sh: 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>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

arch/sh/include/asm/ptrace.h
Diff comments   View file @ 3cea45c
... ... @@ -40,9 +40,8 @@
40 40 #include <asm/system.h>
41 41  
42 42 #define user_mode(regs) (((regs)->sr & 0x40000000)==0)
43   -#define user_stack_pointer(_regs) ((unsigned long)(_regs)->regs[15])
44 43 #define kernel_stack_pointer(_regs) ((unsigned long)(_regs)->regs[15])
45   -#define instruction_pointer(regs) ((unsigned long)(regs)->pc)
  44 +#define GET_USP(regs) ((regs)->regs[15])
46 45  
47 46 extern void show_regs(struct pt_regs *);
48 47  
... ... @@ -139,6 +138,9 @@
139 138  
140 139 return pc;
141 140 }
  141 +#define profile_pc profile_pc
  142 +
  143 +#include <asm-generic/ptrace.h>
142 144 #endif /* __KERNEL__ */
143 145  
144 146 #endif /* __ASM_SH_PTRACE_H */