summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-26 10:14:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-26 10:14:37 -0700
commit0dfdf77ab81040e9e4569c9cdaaae5419d18aaaa (patch)
tree26897c01b2448a51ed086ab55a44fc4e0a6f405a
parentc5e6fd28e5776200a737e9df337a529d36fa9a54 (diff)
parent551dec47bb5964478db594385a896eb0d4ab2b0a (diff)
downloadconfigs-0dfdf77ab81040e9e4569c9cdaaae5419d18aaaa.tar.gz
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
-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 d8a56cddf7f..b163da79bb6 100644
--- a/include/asm-sparc64/ptrace.h
+++ b/include/asm-sparc64/ptrace.h
@@ -126,6 +126,8 @@ struct sparc_trapf {
#define TRACEREG32_SZ sizeof(struct pt_regs32)
#define STACKFRAME32_SZ sizeof(struct sparc_stackf32)
+#ifdef __KERNEL__
+
struct global_reg_snapshot {
unsigned long tstate;
unsigned long tpc;
@@ -137,8 +139,6 @@ struct global_reg_snapshot {
unsigned long pad2;
};
-#ifdef __KERNEL__
-
#define __ARCH_WANT_COMPAT_SYS_PTRACE
#define force_successful_syscall_return() \
@@ -306,6 +306,8 @@ extern void __show_regs(struct pt_regs *);
#define SF_XARG5 0x58
#define SF_XXARG 0x5c
+#ifdef __KERNEL__
+
/* global_reg_snapshot offsets */
#define GR_SNAP_TSTATE 0x00
#define GR_SNAP_TPC 0x08
@@ -316,6 +318,8 @@ extern void __show_regs(struct pt_regs *);
#define GR_SNAP_PAD1 0x30
#define GR_SNAP_PAD2 0x38
+#endif /* __KERNEL__ */
+
/* Stuff for the ptrace system call */
#define PTRACE_SPARC_DETACH 11
#define PTRACE_GETREGS 12