This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ia64 / kernel / mca.c

diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 662bf21..aa76ea0 100644 (file)
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -593,7 +593,7 @@ ia64_mca_cmc_vector_disable (void *dummy)
 {
        cmcv_reg_t      cmcv;
 
-       cmcv.cmcv_regval = ia64_getreg(_IA64_REG_CR_CMCV);
+       cmcv = (cmcv_reg_t)ia64_getreg(_IA64_REG_CR_CMCV);
 
        cmcv.cmcv_mask = 1; /* Mask/disable interrupt */
        ia64_setreg(_IA64_REG_CR_CMCV, cmcv.cmcv_regval);
@@ -620,7 +620,7 @@ ia64_mca_cmc_vector_enable (void *dummy)
 {
        cmcv_reg_t      cmcv;
 
-       cmcv.cmcv_regval = ia64_getreg(_IA64_REG_CR_CMCV);
+       cmcv = (cmcv_reg_t)ia64_getreg(_IA64_REG_CR_CMCV);
 
        cmcv.cmcv_mask = 0; /* Unmask/enable interrupt */
        ia64_setreg(_IA64_REG_CR_CMCV, cmcv.cmcv_regval);
@@ -686,7 +686,6 @@ ia64_mca_wakeup_ipi_wait(void)
                        irr = ia64_getreg(_IA64_REG_CR_IRR3);
                        break;
                }
-               cpu_relax();
        } while (!(irr & (1UL << irr_bit))) ;
 }