Merge branch 'master' of git://1984.lsi.us.es/net

[~andy/linux] / arch / alpha / kernel / core_apecs.c

diff --git a/arch/alpha/kernel/core_apecs.c b/arch/alpha/kernel/core_apecs.c
index a27ba12ba35ec6b935d8974320d1f4c2e7067391..708c831efa76594a1cd2299b7d3214f06f3ccc69 100644 (file)
--- a/arch/alpha/kernel/core_apecs.c
+++ b/arch/alpha/kernel/core_apecs.c
@@ -21,6 +21,7 @@
 
 #include <asm/ptrace.h>
 #include <asm/smp.h>
+#include <asm/mce.h>
 
 #include "proto.h"
 #include "pci_impl.h"
@@ -387,8 +388,7 @@ apecs_pci_clr_err(void)
 }
 
 void
-apecs_machine_check(unsigned long vector, unsigned long la_ptr,
-                   struct pt_regs * regs)
+apecs_machine_check(unsigned long vector, unsigned long la_ptr)
 {
        struct el_common *mchk_header;
        struct el_apecs_procdata *mchk_procdata;
@@ -412,7 +412,7 @@ apecs_machine_check(unsigned long vector, unsigned long la_ptr,
        wrmces(0x7);            /* reset machine check pending flag */
        mb();
 
-       process_mcheck_info(vector, la_ptr, regs, "APECS",
+       process_mcheck_info(vector, la_ptr, "APECS",
                            (mcheck_expected(0)
                             && (mchk_sysdata->epic_dcsr & 0x0c00UL)));
 }