diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-11 09:55:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-11 09:55:48 -0700 |
| commit | 854a989546c12683186c84601d4902591dddd8a9 (patch) | |
| tree | 143362c88a48958bdf68396379c4401f6caa82ae /include/asm-sparc64/ttable.h | |
| parent | 633331f389c2d9c631371d09a54626a5e4749452 (diff) | |
| parent | 28e6103665301ce60634e8a77f0b657c6cc099de (diff) | |
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:
sparc: Fix debugger syscall restart interactions.
sparc: Fix ptrace() detach.
sparc32: Don't twiddle PT_DTRACE in exec.
sparc video: remove open boot prom code
Diffstat (limited to 'include/asm-sparc64/ttable.h')
| -rw-r--r-- | include/asm-sparc64/ttable.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h index 1b55538b944f..52d67d394107 100644 --- a/include/asm-sparc64/ttable.h +++ b/include/asm-sparc64/ttable.h @@ -91,13 +91,14 @@ nop; #define SYSCALL_TRAP(routine, systbl) \ + rdpr %pil, %g2; \ + mov TSTATE_SYSCALL, %g3; \ sethi %hi(109f), %g7; \ - ba,pt %xcc, etrap; \ + ba,pt %xcc, etrap_syscall; \ 109: or %g7, %lo(109b), %g7; \ sethi %hi(systbl), %l7; \ ba,pt %xcc, routine; \ - or %l7, %lo(systbl), %l7; \ - nop; nop; + or %l7, %lo(systbl), %l7; #define TRAP_UTRAP(handler,lvl) \ mov handler, %g3; \ |