diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
| commit | 701328a7b58d50d8640c21ba5fdf3170b1ddac16 (patch) | |
| tree | 99a3fe44310a97e92ad1cb3a01f2ee3f6ed0d59a /arch/alpha/kernel/err_ev6.c | |
| parent | 53e36ada37cb8b01cfbf674580a79edc0bb764c7 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/alpha/kernel/err_ev6.c')
| -rw-r--r-- | arch/alpha/kernel/err_ev6.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/alpha/kernel/err_ev6.c b/arch/alpha/kernel/err_ev6.c index 64f59f2fcf5..69b5f4ea735 100644 --- a/arch/alpha/kernel/err_ev6.c +++ b/arch/alpha/kernel/err_ev6.c @@ -11,6 +11,7 @@ #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 +230,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 +261,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; } |