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

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

diff --git a/arch/alpha/kernel/core_t2.c b/arch/alpha/kernel/core_t2.c
index ecce09e3626a190c8511748b4cf6be7093b699ff..f5ca5255eb060ad822fff8358b4557ced9e11d2e 100644 (file)
--- a/arch/alpha/kernel/core_t2.c
+++ b/arch/alpha/kernel/core_t2.c
@@ -551,8 +551,7 @@ t2_clear_errors(int cpu)
  * Hence all the taken/expected/any_expected/last_taken stuff...
  */
 void
-t2_machine_check(unsigned long vector, unsigned long la_ptr,
-                struct pt_regs * regs)
+t2_machine_check(unsigned long vector, unsigned long la_ptr)
 {
        int cpu = smp_processor_id();
 #ifdef CONFIG_VERBOSE_MCHECK
@@ -618,5 +617,5 @@ t2_machine_check(unsigned long vector, unsigned long la_ptr,
        }
 #endif
 
-       process_mcheck_info(vector, la_ptr, regs, "T2", mcheck_expected(cpu));
+       process_mcheck_info(vector, la_ptr, "T2", mcheck_expected(cpu));
 }