diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-26 06:24:59 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-04 17:17:03 (GMT) |
| commit | 5565736e44fff06dc5f5c6559e04ac58d2d560ab (patch) | |
| tree | 08fd6982f1659a4a77439aa19498297e226b1b1b /arch/sparc | |
| parent | b4f4372f96e0573d752d9e45beda02fabf716cc8 (diff) | |
| download | linux-5565736e44fff06dc5f5c6559e04ac58d2d560ab.tar.xz | |
sparc64: Make special trap return path for TRAP_NMI().
We don't want the rtrap path to try and run softirqs or
anything like that when returning from a PIL==15 NMI.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/ttable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/ttable.h b/arch/sparc/include/asm/ttable.h index bb2c077..48f2807 100644 --- a/arch/sparc/include/asm/ttable.h +++ b/arch/sparc/include/asm/ttable.h @@ -162,7 +162,7 @@ mov level, %o0; \ call routine; \ add %sp, PTREGS_OFF, %o1; \ - ba,a,pt %xcc, rtrap_irq; + ba,a,pt %xcc, rtrap_nmi; #define TRAP_IVEC TRAP_NOSAVE(do_ivec) |