git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[sfrench/cifs-2.6.git]
/
arch
/
sparc64
/
kernel
/
entry.S
diff --git
a/arch/sparc64/kernel/entry.S
b/arch/sparc64/kernel/entry.S
index ea257e8283644787d30d7f25f7f1a347828640a4..6be4d2d2904e3c8f0707e94adcb844cdc19209eb 100644
(file)
--- a/
arch/sparc64/kernel/entry.S
+++ b/
arch/sparc64/kernel/entry.S
@@
-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