diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 20:29:26 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 20:29:26 -0500 |
| commit | 5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee (patch) | |
| tree | 4f4e321a1ca0baf64d8af528080c71f93495a7d7 /arch/sh/include/asm/ptrace.h | |
| parent | 98d27b8abf413a310df6676f7d2128ada1cccc08 (diff) | |
| parent | 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/ptrace.h')
| -rw-r--r-- | arch/sh/include/asm/ptrace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/ptrace.h b/arch/sh/include/asm/ptrace.h index f6edc10aa0d3..de167d3a1a80 100644 --- a/arch/sh/include/asm/ptrace.h +++ b/arch/sh/include/asm/ptrace.h | |||
| @@ -40,8 +40,8 @@ | |||
| 40 | #include <asm/system.h> | 40 | #include <asm/system.h> |
| 41 | 41 | ||
| 42 | #define user_mode(regs) (((regs)->sr & 0x40000000)==0) | 42 | #define user_mode(regs) (((regs)->sr & 0x40000000)==0) |
| 43 | #define user_stack_pointer(regs) ((unsigned long)(regs)->regs[15]) | 43 | #define user_stack_pointer(_regs) ((unsigned long)(_regs)->regs[15]) |
| 44 | #define kernel_stack_pointer(regs) ((unsigned long)(regs)->regs[15]) | 44 | #define kernel_stack_pointer(_regs) ((unsigned long)(_regs)->regs[15]) |
| 45 | #define instruction_pointer(regs) ((unsigned long)(regs)->pc) | 45 | #define instruction_pointer(regs) ((unsigned long)(regs)->pc) |
| 46 | 46 | ||
| 47 | extern void show_regs(struct pt_regs *); | 47 | extern void show_regs(struct pt_regs *); |