Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
Linus Torvalds committed Feb 7, 2008
2 parents a8e98d6 + d256eb8 commit 0afc2ed
Show file tree
Hide file tree
Showing 11 changed files with 1,079 additions and 1,002 deletions.
17 changes: 0 additions & 17 deletions arch/sparc/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading

0 comments on commit 0afc2ed

Please sign in to comment.