diff options
Diffstat (limited to 'arch/sparc64/kernel/etrap.S')
| -rw-r--r-- | arch/sparc64/kernel/etrap.S | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/sparc64/kernel/etrap.S b/arch/sparc64/kernel/etrap.S index b49d3b60bc0c..29ce489bc188 100644 --- a/arch/sparc64/kernel/etrap.S +++ b/arch/sparc64/kernel/etrap.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: etrap.S,v 1.46 2002/02/09 19:49:30 davem Exp $ | 1 | /* |
| 2 | * etrap.S: Preparing for entry into the kernel on Sparc V9. | 2 | * etrap.S: Preparing for entry into the kernel on Sparc V9. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1996, 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996, 1997 David S. Miller (davem@caip.rutgers.edu) |
| @@ -27,11 +27,12 @@ | |||
| 27 | 27 | ||
| 28 | .text | 28 | .text |
| 29 | .align 64 | 29 | .align 64 |
| 30 | .globl etrap, etrap_irq, etraptl1 | 30 | .globl etrap_syscall, etrap, etrap_irq, etraptl1 |
| 31 | etrap: rdpr %pil, %g2 | 31 | etrap: rdpr %pil, %g2 |
| 32 | etrap_irq: | 32 | etrap_irq: clr %g3 |
| 33 | TRAP_LOAD_THREAD_REG(%g6, %g1) | 33 | etrap_syscall: TRAP_LOAD_THREAD_REG(%g6, %g1) |
| 34 | rdpr %tstate, %g1 | 34 | rdpr %tstate, %g1 |
| 35 | or %g1, %g3, %g1 | ||
| 35 | sllx %g2, 20, %g3 | 36 | sllx %g2, 20, %g3 |
| 36 | andcc %g1, TSTATE_PRIV, %g0 | 37 | andcc %g1, TSTATE_PRIV, %g0 |
| 37 | or %g1, %g3, %g1 | 38 | or %g1, %g3, %g1 |