Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

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

diff --git a/arch/alpha/kernel/err_ev6.c b/arch/alpha/kernel/err_ev6.c
index 64f59f2fcf5cc8aa8f5659158e77f9efb6281c64..11aee012a8aed0986b7e744c7a43a0f7ac275814 100644 (file)
--- a/arch/alpha/kernel/err_ev6.c
+++ b/arch/alpha/kernel/err_ev6.c
@@ -7,10 +7,10 @@
  */
 
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/sched.h>
 
 #include <asm/io.h>
+#include <asm/irq_regs.h>
 #include <asm/hwrpb.h>
 #include <asm/smp.h>
 #include <asm/err_common.h>
@@ -229,7 +229,7 @@ ev6_process_logout_frame(struct el_common *mchk_header, int print)
 }
 
 void
-ev6_machine_check(u64 vector, u64 la_ptr, struct pt_regs *regs)
+ev6_machine_check(u64 vector, u64 la_ptr)
 {
        struct el_common *mchk_header = (struct el_common *)la_ptr;
 
@@ -260,7 +260,7 @@ ev6_machine_check(u64 vector, u64 la_ptr, struct pt_regs *regs)
                       (unsigned int)vector, (int)smp_processor_id());
                
                ev6_process_logout_frame(mchk_header, 1);
-               dik_show_regs(regs, NULL);
+               dik_show_regs(get_irq_regs(), NULL);
 
                err_print_prefix = saved_err_prefix;
        }