diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
| commit | 4791d63bd40ec63c533060707dae0232b9969dc0 (patch) | |
| tree | 8e10fe91cea556c10f7d211b65c5f6bdd7ffeb55 /arch/parisc/include/asm/ptrace.h | |
| parent | b3623080ff6974e696710b6c6eb4cdbf2bbab347 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'arch/parisc/include/asm/ptrace.h')
| -rw-r--r-- | arch/parisc/include/asm/ptrace.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/ptrace.h b/arch/parisc/include/asm/ptrace.h index 7f09533da771..250ae35aa062 100644 --- a/arch/parisc/include/asm/ptrace.h +++ b/arch/parisc/include/asm/ptrace.h | |||
| @@ -56,7 +56,6 @@ struct pt_regs { | |||
| 56 | #define instruction_pointer(regs) ((regs)->iaoq[0] & ~3) | 56 | #define instruction_pointer(regs) ((regs)->iaoq[0] & ~3) |
| 57 | #define user_stack_pointer(regs) ((regs)->gr[30]) | 57 | #define user_stack_pointer(regs) ((regs)->gr[30]) |
| 58 | unsigned long profile_pc(struct pt_regs *); | 58 | unsigned long profile_pc(struct pt_regs *); |
| 59 | extern void show_regs(struct pt_regs *); | ||
| 60 | 59 | ||
| 61 | 60 | ||
| 62 | #endif /* __KERNEL__ */ | 61 | #endif /* __KERNEL__ */ |