Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 252985
b: refs/heads/master
c: db7eba2
h: refs/heads/master
i:
  252983: 2ba3162
v: v3
  • Loading branch information
Paul Mundt committed May 31, 2011
1 parent c815762 commit ad5c5cb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3f9b8520b06013939ad247ba08b69529b5f14be1
refs/heads/master: db7eba292e913390fa881272bfbc3da0a5380513
6 changes: 4 additions & 2 deletions trunk/arch/sh/include/asm/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@

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

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

extern void show_regs(struct pt_regs *);

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit ad5c5cb

Please sign in to comment.