Commit 0dfdf77a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c5e6fd28 551dec47

include/asm-sparc64/ptrace.h

+6 −2
Original line number Diff line number Diff line
@@ -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