aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-26 13:14:37 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-26 13:14:37 -0400
commit0dfdf77ab81040e9e4569c9cdaaae5419d18aaaa (patch)
tree26897c01b2448a51ed086ab55a44fc4e0a6f405a /include
parentc5e6fd28e5776200a737e9df337a529d36fa9a54 (diff)
parent551dec47bb5964478db594385a896eb0d4ab2b0a (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: global_reg_snapshot is not for userspace
Diffstat (limited to 'include')
-rw-r--r--include/asm-sparc64/ptrace.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-sparc64/ptrace.h b/include/asm-sparc64/ptrace.h
index d8a56cddf7f2..b163da79bb6d 100644
--- a/include/asm-sparc64/ptrace.h
+++ b/include/asm-sparc64/ptrace.h
@@ -126,6 +126,8 @@ struct sparc_trapf {
126#define TRACEREG32_SZ sizeof(struct pt_regs32) 126#define TRACEREG32_SZ sizeof(struct pt_regs32)
127#define STACKFRAME32_SZ sizeof(struct sparc_stackf32) 127#define STACKFRAME32_SZ sizeof(struct sparc_stackf32)
128 128
129#ifdef __KERNEL__
130
129struct global_reg_snapshot { 131struct global_reg_snapshot {
130 unsigned long tstate; 132 unsigned long tstate;
131 unsigned long tpc; 133 unsigned long tpc;
@@ -137,8 +139,6 @@ struct global_reg_snapshot {
137 unsigned long pad2; 139 unsigned long pad2;
138}; 140};
139 141
140#ifdef __KERNEL__
141
142#define __ARCH_WANT_COMPAT_SYS_PTRACE 142#define __ARCH_WANT_COMPAT_SYS_PTRACE
143 143
144#define force_successful_syscall_return() \ 144#define force_successful_syscall_return() \
@@ -306,6 +306,8 @@ extern void __show_regs(struct pt_regs *);
306#define SF_XARG5 0x58 306#define SF_XARG5 0x58
307#define SF_XXARG 0x5c 307#define SF_XXARG 0x5c
308 308
309#ifdef __KERNEL__
310
309/* global_reg_snapshot offsets */ 311/* global_reg_snapshot offsets */
310#define GR_SNAP_TSTATE 0x00 312#define GR_SNAP_TSTATE 0x00
311#define GR_SNAP_TPC 0x08 313#define GR_SNAP_TPC 0x08
@@ -316,6 +318,8 @@ extern void __show_regs(struct pt_regs *);
316#define GR_SNAP_PAD1 0x30 318#define GR_SNAP_PAD1 0x30
317#define GR_SNAP_PAD2 0x38 319#define GR_SNAP_PAD2 0x38
318 320
321#endif /* __KERNEL__ */
322
319/* Stuff for the ptrace system call */ 323/* Stuff for the ptrace system call */
320#define PTRACE_SPARC_DETACH 11 324#define PTRACE_SPARC_DETACH 11
321#define PTRACE_GETREGS 12 325#define PTRACE_GETREGS 12