Commit db7eba29 authored May 31, 2011 by Paul Mundt

sh: Fix up asm-generic/ptrace.h fallout.



There was an ordering issue with regards to instruction_pointer() being
used in profile_pc() prior to the asm-generic/ptrace.h include, which
subsequently provided the instruction_pointer() definition. In the
interest of simplicity we simply open-code the regs->pc deref for the
profile_pc() definition instead.

The FP functions were also broken due to a lack of a common regs->fp,
so provide a common GET_FP() that is safe for both architectures in order
to fix up the frame pointer helpers too.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

parent 3f9b8520

arch/sh/include/asm/ptrace.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -41,6 +41,8 @@

		#define user_mode(regs) (((regs)->sr & 0x40000000)==0)
		#define kernel_stack_pointer(_regs) ((unsigned long)(_regs)->regs[15])

		#define GET_FP(regs) ((regs)->regs[14])
		#define GET_USP(regs) ((regs)->regs[15])

		extern void show_regs(struct pt_regs *);
		@@ -131,7 +133,7 @@ extern void ptrace_triggered(struct perf_event *bp, int nmi,

		static inline unsigned long profile_pc(struct pt_regs *regs)
		{
		unsigned long pc = instruction_pointer(regs);
		unsigned long pc = regs->pc;

		if (virt_addr_uncached(pc))
		return CAC_ADDR(pc);