fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / alpha / kernel / core_wildfire.c

diff --git a/arch/alpha/kernel/core_wildfire.c b/arch/alpha/kernel/core_wildfire.c
index 97f464b..7e07244 100644 (file)
--- a/arch/alpha/kernel/core_wildfire.c
+++ b/arch/alpha/kernel/core_wildfire.c
@@ -285,8 +285,8 @@ wildfire_hardware_probe(void)
                    fe = WILDFIRE_fe(soft_qbb, i);
 
                    if ((iop->iop_hose[i].init.csr & 1) == 1 &&
-                       ((ne->ne_what_am_i.csr & 0xf00000300) == 0x100000300) &&
-                       ((fe->fe_what_am_i.csr & 0xf00000300) == 0x100000200))
+                       ((ne->ne_what_am_i.csr & 0xf00000300UL) == 0x100000300UL) &&
+                       ((fe->fe_what_am_i.csr & 0xf00000300UL) == 0x100000200UL))
                    {
                        wildfire_pca_mask |= 1 << ((soft_qbb << 2) + i);
                    }
@@ -322,8 +322,7 @@ wildfire_init_arch(void)
 }
 
 void
-wildfire_machine_check(unsigned long vector, unsigned long la_ptr,
-                      struct pt_regs * regs)
+wildfire_machine_check(unsigned long vector, unsigned long la_ptr)
 {
        mb();
        mb();  /* magic */
@@ -332,7 +331,7 @@ wildfire_machine_check(unsigned long vector, unsigned long la_ptr,
        wrmces(0x7);
        mb();
 
-       process_mcheck_info(vector, la_ptr, regs, "WILDFIRE",
+       process_mcheck_info(vector, la_ptr, "WILDFIRE",
                            mcheck_expected(smp_processor_id()));
 }