2 files changed, 14 insertions, 27 deletions

diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c
index fd4858e2dd63..75b8340b254b 100644
--- a/arch/m68k/kernel/traps.c
+++ b/arch/m68k/kernel/traps.c
@@ -468,15 +468,26 @@ static inline void access_error040(struct frame *fp)
                          * (if do_page_fault didn't fix the mapping,
                          * the writeback won't do good)
                          */
+disable_wb:
 #ifdef DEBUG
                         printk(".. disabling wb2\n");
 #endif
                         if (fp->un.fmt7.wb2a == fp->un.fmt7.faddr)
                                 fp->un.fmt7.wb2s &= ~WBV_040;
+                        if (fp->un.fmt7.wb3a == fp->un.fmt7.faddr)
+                                fp->un.fmt7.wb3s &= ~WBV_040;
                 }
-        } else if (send_fault_sig(&fp->ptregs) > 0) {
-                printk("68040 access error, ssw=%x\n", ssw);
-                trap_c(fp);
+        } else {
+                /* In case of a bus error we either kill the process or expect
+                 * the kernel to catch the fault, which then is also responsible
+                 * for cleaning up the mess.
+                 */
+                current->thread.signo = SIGBUS;
+                current->thread.faddr = fp->un.fmt7.faddr;
+                if (send_fault_sig(&fp->ptregs) >= 0)
+                        printk("68040 bus error (ssw=%x, faddr=%lx)\n", ssw,
+                               fp->un.fmt7.faddr);
+                goto disable_wb;
         }
 
         do_040writebacks(fp);
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 735a49b4b936..ad3e3bacae39 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -48,9 +48,6 @@
 struct mac_booter_data mac_bi_data;
 int mac_bisize = sizeof mac_bi_data;
 
-struct mac_hw_present mac_hw_present;
-EXPORT_SYMBOL(mac_hw_present);
-
 /* New m68k bootinfo stuff and videobase */
 
 extern int m68k_num_memory;
@@ -817,27 +814,6 @@ void __init mac_identify(void)
                 m68k_ramdisk.addr, m68k_ramdisk.size);
 #endif
 
-        /*
-         * TODO: set the various fields in macintosh_config->hw_present here!
-         */
-        switch (macintosh_config->scsi_type) {
-        case MAC_SCSI_OLD:
-                MACHW_SET(MAC_SCSI_80);
-                break;
-        case MAC_SCSI_QUADRA:
-        case MAC_SCSI_QUADRA2:
-        case MAC_SCSI_QUADRA3:
-                MACHW_SET(MAC_SCSI_96);
-                if ((macintosh_config->ident == MAC_MODEL_Q900) ||
-                    (macintosh_config->ident == MAC_MODEL_Q950))
-                        MACHW_SET(MAC_SCSI_96_2);
-                break;
-        default:
-                printk(KERN_WARNING "config.c: wtf: unknown scsi, using 53c80\n");
-                MACHW_SET(MAC_SCSI_80);
-                break;
-        }
-
         iop_init();
         via_init();
         oss_init();