diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2012-05-11 13:35:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-12 04:27:44 +0200 |
| commit | 2c1cfb2db61474040a394962872f4cde613f89fb (patch) | |
| tree | d8100472f04af9b17f75135c3190221d5920d856 /arch/sparc/kernel/head_32.S | |
| parent | sparc: fix build fail in mm/init_64.c when NEED_MULTIPLE_NODES is off (diff) | |
| download | linux-2c1cfb2db61474040a394962872f4cde613f89fb.tar.xz linux-2c1cfb2db61474040a394962872f4cde613f89fb.zip | |
sparc32: drop sun4c support
Machines with sun4c support are very rare these days, and noone
is using them for any practical purposes.
The sun4c support has been know broken for quite some time too.
So rather than trying to keep it up-to-date, lets get rid of it.
This allows us to do some very welcome cleanup of sparc32 support.
Updated the former sun4c specifc nmi (which was also used
for sun4m UP) to be a generic UP NMI.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
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 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/sparc/kernel/head_32.S b/arch/sparc/kernel/head_32.S index 587785759838..054a49f3044c 100644 --- a/arch/sparc/kernel/head_32.S +++ b/arch/sparc/kernel/head_32.S @@ -111,11 +111,8 @@ 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 -#ifndef CONFIG_SMP -t_nmi: NMI_TRAP /* Level 15 (NMI) */ -#else -t_nmi: TRAP_ENTRY(0x1f, linux_trap_ipi15_sun4m) -#endif +t_nmi: TRAP_ENTRY(0x1f, linux_trap_ipi15) + t_racc: TRAP_ENTRY(0x20, do_reg_access) /* General Register Access Error */ t_iacce:BAD_TRAP(0x21) /* Instr Access Error */ t_bad22:BAD_TRAP(0x22) BAD_TRAP(0x23) |