diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-11 21:23:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-11 21:23:05 -0700 |
| commit | 96061a91a1265d2f8dae6f4a6064bd77faec4df5 (patch) | |
| tree | 4fe080ca676f05f8f0fa979fed88e47d5e7b23c1 /arch/sparc/kernel/head_32.S | |
| parent | 716a5d73a787a3d1f6e2bd8ce34a788bb8bf368f (diff) | |
sparc32: Restore SMP build and rectify sun4m NMI when non-SMP.
The non-SMP sun4m NMI handler was still accessing SUN4C registers.
Fix that and share the sun4m NMI trap code between SMP and non-SMP
cases.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/head_32.S')
| -rw-r--r-- | arch/sparc/kernel/head_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/head_32.S b/arch/sparc/kernel/head_32.S index 85623f9da6ff..ea45894db0bd 100644 --- a/arch/sparc/kernel/head_32.S +++ b/arch/sparc/kernel/head_32.S @@ -111,7 +111,7 @@ t_irq12:TRAP_ENTRY_INTERRUPT(12) /* IRQ Zilog serial chip */ t_irq13:TRAP_ENTRY_INTERRUPT(13) /* IRQ Audio Intr. */ t_irq14:TRAP_ENTRY_INTERRUPT(14) /* IRQ Timer #2 */ .globl t_nmi -t_nmi: TRAP_ENTRY(0x1f, linux_trap_ipi15) +t_nmi: TRAP_ENTRY(0x1f, linux_trap_ipi15_sun4m) t_racc: TRAP_ENTRY(0x20, do_reg_access) /* General Register Access Error */ t_iacce:BAD_TRAP(0x21) /* Instr Access Error */ |