diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-21 17:20:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-21 17:20:57 -0700 |
commit | 1f922d07704c501388a306c78536bca7432b3934 (patch) | |
tree | 8b4f3abcfa0dc15e5c1a8e48615adbbce832939c | |
parent | 2bafc7a275436da4a1ece4ecfcbacb82a0560efb (diff) | |
parent | 33d8881af5584fb7994f6b3d17fc11dcaf07b3b2 (diff) | |
download | linux-3.10-1f922d07704c501388a306c78536bca7432b3934.tar.gz linux-3.10-1f922d07704c501388a306c78536bca7432b3934.tar.bz2 linux-3.10-1f922d07704c501388a306c78536bca7432b3934.zip |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
sparc,kgdbts: fix compile regression with kgdb test suite
-rw-r--r-- | arch/sparc/include/asm/ptrace.h | 1 |
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 |