Merge commit 'v2.6.28-rc8' into x86/cpufeature

[deliverable/linux.git] / arch / sparc / kernel / traps.c

diff --git a/arch/sparc/kernel/traps.c b/arch/sparc/kernel/traps.c
index 5d45d5fd8c99a150d75a6e2f0f1b489181b9c3a2..2b7d50659036e2daa54e47e7deb23c875f7a6726 100644 (file)
--- a/arch/sparc/kernel/traps.c
+++ b/arch/sparc/kernel/traps.c
@@ -43,23 +43,6 @@ void syscall_trace_exit(struct pt_regs *regs)
 {
 }
 
-void sun4m_nmi(struct pt_regs *regs)
-{
-       unsigned long afsr, afar;
-
-       printk("Aieee: sun4m NMI received!\n");
-       /* XXX HyperSparc hack XXX */
-       __asm__ __volatile__("mov 0x500, %%g1\n\t"
-                            "lda [%%g1] 0x4, %0\n\t"
-                            "mov 0x600, %%g1\n\t"
-                            "lda [%%g1] 0x4, %1\n\t" :
-                            "=r" (afsr), "=r" (afar));
-       printk("afsr=%08lx afar=%08lx\n", afsr, afar);
-       printk("you lose buddy boy...\n");
-       show_regs(regs);
-       prom_halt();
-}
-
 void sun4d_nmi(struct pt_regs *regs)
 {
        printk("Aieee: sun4d NMI received!\n");