Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

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

diff --git a/arch/alpha/kernel/err_marvel.c b/arch/alpha/kernel/err_marvel.c
index 70b38b1d2af3b3005036cc9b60403bd42c7b7768..413bf37eb094057b0e38e03b965764056cb11c5a 100644 (file)
--- a/arch/alpha/kernel/err_marvel.c
+++ b/arch/alpha/kernel/err_marvel.c
@@ -1042,7 +1042,7 @@ marvel_process_logout_frame(struct ev7_lf_subpackets *lf_subpackets, int print)
 }
 
 void
-marvel_machine_check(u64 vector, u64 la_ptr, struct pt_regs *regs)
+marvel_machine_check(u64 vector, u64 la_ptr)
 {
        struct el_subpacket *el_ptr = (struct el_subpacket *)la_ptr;
        int (*process_frame)(struct ev7_lf_subpackets *, int) = NULL;
@@ -1077,12 +1077,12 @@ marvel_machine_check(u64 vector, u64 la_ptr, struct pt_regs *regs)
 
        default:
                /* Don't know it - pass it up.  */
-               ev7_machine_check(vector, la_ptr, regs);
+               ev7_machine_check(vector, la_ptr);
                return;
        }       
 
        /*
-        * A system event or error has occured, handle it here.
+        * A system event or error has occurred, handle it here.
         *
         * Any errors in the logout frame have already been cleared by the
         * PALcode, so just parse it.
@@ -1152,7 +1152,7 @@ marvel_machine_check(u64 vector, u64 la_ptr, struct pt_regs *regs)
        mb();
 }
 
-void
+void __init
 marvel_register_error_handlers(void)
 {
        ev7_register_error_handlers();