x86: printk kernel version in WARN_ON and other dump_stack users

[linux-2.6] / arch / alpha / kernel / err_titan.c

diff --git a/arch/alpha/kernel/err_titan.c b/arch/alpha/kernel/err_titan.c
index 7e6720d45f027cb5a62e7d0dcb3632197f56e54d..6f3867877d9e451f9e8278094f385d50a0fed660 100644 (file)
--- a/arch/alpha/kernel/err_titan.c
+++ b/arch/alpha/kernel/err_titan.c
@@ -16,6 +16,7 @@
 #include <asm/smp.h>
 #include <asm/err_common.h>
 #include <asm/err_ev6.h>
+#include <asm/irq_regs.h>
 
 #include "err_impl.h"
 #include "proto.h"
@@ -379,7 +380,7 @@ titan_process_logout_frame(struct el_common *mchk_header, int print)
 }
 
 void
-titan_machine_check(u64 vector, u64 la_ptr, struct pt_regs *regs)
+titan_machine_check(u64 vector, u64 la_ptr)
 {
        struct el_common *mchk_header = (struct el_common *)la_ptr;
        struct el_TITAN_sysdata_mcheck *tmchk =
@@ -408,7 +409,7 @@ titan_machine_check(u64 vector, u64 la_ptr, struct pt_regs *regs)
         * Only handle system errors here 
         */
        if ((vector != SCB_Q_SYSMCHK) && (vector != SCB_Q_SYSERR)) {
-               ev6_machine_check(vector, la_ptr, regs);
+               ev6_machine_check(vector, la_ptr);
                return;
        }
 
@@ -442,7 +443,7 @@ titan_machine_check(u64 vector, u64 la_ptr, struct pt_regs *regs)
 #ifdef CONFIG_VERBOSE_MCHECK
                titan_process_logout_frame(mchk_header, alpha_verbose_mcheck);
                if (alpha_verbose_mcheck)
-                       dik_show_regs(regs, NULL);
+                       dik_show_regs(get_irq_regs(), NULL);
 #endif /* CONFIG_VERBOSE_MCHECK */
 
                err_print_prefix = saved_err_prefix;
@@ -452,7 +453,7 @@ titan_machine_check(u64 vector, u64 la_ptr, struct pt_regs *regs)
                 * machine checks to interrupts
                 */
                irqmask = tmchk->c_dirx & TITAN_MCHECK_INTERRUPT_MASK;
-               titan_dispatch_irqs(irqmask, regs);
+               titan_dispatch_irqs(irqmask);
        }       
 
 
@@ -590,7 +591,7 @@ privateer_process_680_frame(struct el_common *mchk_header, int print)
                (struct el_PRIVATEER_envdata_mcheck *)
                ((unsigned long)mchk_header + mchk_header->sys_offset);
 
-       /* TODO - catagorize errors, for now, no error */
+       /* TODO - categorize errors, for now, no error */
 
        if (!print)
                return status;
@@ -701,7 +702,7 @@ privateer_process_logout_frame(struct el_common *mchk_header, int print)
 }
 
 void
-privateer_machine_check(u64 vector, u64 la_ptr, struct pt_regs *regs)
+privateer_machine_check(u64 vector, u64 la_ptr)
 {
        struct el_common *mchk_header = (struct el_common *)la_ptr;
        struct el_TITAN_sysdata_mcheck *tmchk =
@@ -723,7 +724,7 @@ privateer_machine_check(u64 vector, u64 la_ptr, struct pt_regs *regs)
         * Only handle system events here.
         */
        if (vector != SCB_Q_SYSEVENT) 
-               return titan_machine_check(vector, la_ptr, regs);
+               return titan_machine_check(vector, la_ptr);
 
        /*
         * Report the event - System Events should be reported even if no
@@ -746,7 +747,7 @@ privateer_machine_check(u64 vector, u64 la_ptr, struct pt_regs *regs)
        /*
         * Dispatch the interrupt(s).
         */
-       titan_dispatch_irqs(irqmask, regs);
+       titan_dispatch_irqs(irqmask);
 
        /* 
         * Release the logout frame.