Commit 0afc2edf 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:
  [SPARC32]: Use regsets in arch_ptrace().
  [SPARC64]: Use regsets in arch_ptrace().
  [SPARC32]: Use regsets for ELF core dumping.
  [SPARC64]: Use regsets for ELF core dumping.
  [SPARC64]: Remove unintentional ptrace debugging messages.
  [SPARC]: Move over to arch_ptrace().
  [SPARC]: Remove PTRACE_SUN* handling.
  [SPARC]: Kill DEBUG_PTRACE code.
  [SPARC32]: Add user regset support.
  [SPARC64]: Add user regsets.
  [SPARC64]: Fix booting on non-zero cpu.
parents a8e98d6d d256eb8d

arch/sparc/kernel/entry.S

+0 −17
Original line number Diff line number Diff line
@@ -1224,23 +1224,6 @@ sys_nis_syscall: 
	call	c_sys_nis_syscall

	 mov	%l5, %o7



	.align 4

	.globl	sys_ptrace

sys_ptrace:

	call	do_ptrace

	 add	%sp, STACKFRAME_SZ, %o0



	ld	[%curptr + TI_FLAGS], %l5

	andcc	%l5, _TIF_SYSCALL_TRACE, %g0

	be	1f

	 nop



	call	syscall_trace

	 nop



1:

	RESTORE_ALL



	.align	4

	.globl	sys_execve

sys_execve:

arch/sparc/kernel/ptrace.c

+340 −473

File changed.

Preview size limit exceeded, changes collapsed.

arch/sparc64/kernel/binfmt_elf32.c

+4 −27
Original line number Diff line number Diff line 
/*

 * binfmt_elf32.c: Support 32-bit Sparc ELF binaries on Ultra.

 *

 * Copyright (C) 1995, 1996, 1997, 1998 David S. Miller	(davem@davemloft.net)

 * Copyright (C) 1995, 1996, 1997, 1998, 2008 David S. Miller (davem@davemloft.net)

 * Copyright (C) 1995, 1996, 1997, 1998 Jakub Jelinek	(jj@ultra.linux.cz)

 */
@@ -9,13 +9,6 @@ 
#define ELF_CLASS		ELFCLASS32

#define ELF_DATA		ELFDATA2MSB;



/* For the most part we present code dumps in the format

 * Solaris does.

 */

typedef unsigned int elf_greg_t;

#define ELF_NGREG 38

typedef elf_greg_t elf_gregset_t[ELF_NGREG];



/* Format is:

 * 	G0 --> G7

 *	O0 --> O7
@@ -23,25 +16,9 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG]; 
 *	I0 --> I7

 *	PSR, PC, nPC, Y, WIM, TBR

 */

#include <asm/psrcompat.h>

#define ELF_CORE_COPY_REGS(__elf_regs, __pt_regs)	\

do {	unsigned int *dest = &(__elf_regs[0]);		\

	struct pt_regs *src = (__pt_regs);		\

	unsigned int __user *sp;			\

	int i;						\

	for(i = 0; i < 16; i++)				\

		dest[i] = (unsigned int) src->u_regs[i];\

	/* Don't try this at home kids... */		\

	sp = (unsigned int __user *) (src->u_regs[14] &	\

		0x00000000fffffffc);			\

	for(i = 0; i < 16; i++)				\

		__get_user(dest[i+16], &sp[i]);		\

	dest[32] = tstate_to_psr(src->tstate);		\

	dest[33] = (unsigned int) src->tpc;		\

	dest[34] = (unsigned int) src->tnpc;		\

	dest[35] = src->y;				\

	dest[36] = dest[37] = 0; /* XXX */		\

} while(0);

typedef unsigned int elf_greg_t;

#define ELF_NGREG 38

typedef elf_greg_t elf_gregset_t[ELF_NGREG];



typedef struct {

	union {

arch/sparc64/kernel/entry.S

+0 −4
Original line number Diff line number Diff line
@@ -1477,10 +1477,6 @@ sys32_rt_sigreturn: 
		 add		%o7, 1f-.-4, %o7

		nop

#endif

sys_ptrace:	add		%sp, PTREGS_OFF, %o0

		call		do_ptrace

		 add		%o7, 1f-.-4, %o7

		nop

		.align		32

1:		ldx		[%curptr + TI_FLAGS], %l5

		andcc		%l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %g0

arch/sparc64/kernel/head.S

+25 −0

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE