summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-07-22 09:22:49 -0400
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-07-22 09:22:49 -0400
commitbe4f53876d5191af4dd340cdccf8bc4ddf1db337 (patch)
treee863bbb4a1a63ef884600c13f8ec0e7756e28267 /arch
parent1fc74af81b556d0582fd8aed1cef4a039b7b5051 (diff)
parent02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff)
Merge commit 'v3.0' into linaro-3.0
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/include/asm/ptrace.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/ptrace.h b/arch/sparc/include/asm/ptrace.h
index c7ad3fe2b25..b928b31424b 100644
--- a/arch/sparc/include/asm/ptrace.h
+++ b/arch/sparc/include/asm/ptrace.h
@@ -205,6 +205,7 @@ do { current_thread_info()->syscall_noerror = 1; \
} while (0)
#define user_mode(regs) (!((regs)->tstate & TSTATE_PRIV))
#define instruction_pointer(regs) ((regs)->tpc)
+#define instruction_pointer_set(regs, val) ((regs)->tpc = (val))
#define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP])
#define regs_return_value(regs) ((regs)->u_regs[UREG_I0])
#ifdef CONFIG_SMP