Merge ../linus

[linux-drm-fsl-dcu.git] / arch / alpha / kernel / core_cia.c

diff --git a/arch/alpha/kernel/core_cia.c b/arch/alpha/kernel/core_cia.c
index fd563064363c43b3c56168efeee595320f438e08..1d6ee6c985f940992db550fdb5595945c6597611 100644 (file)
--- a/arch/alpha/kernel/core_cia.c
+++ b/arch/alpha/kernel/core_cia.c
@@ -1192,8 +1192,7 @@ cia_decode_mchk(unsigned long la_ptr)
 }
 
 void
-cia_machine_check(unsigned long vector, unsigned long la_ptr,
-                 struct pt_regs * regs)
+cia_machine_check(unsigned long vector, unsigned long la_ptr)
 {
        int expected;
 
@@ -1208,5 +1207,5 @@ cia_machine_check(unsigned long vector, unsigned long la_ptr,
        expected = mcheck_expected(0);
        if (!expected && vector == 0x660)
                expected = cia_decode_mchk(la_ptr);
-       process_mcheck_info(vector, la_ptr, regs, "CIA", expected);
+       process_mcheck_info(vector, la_ptr, "CIA", expected);
 }