1 files changed, 4 insertions, 1 deletions

diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 1753f6a30d55..80d50b83d419 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -582,6 +582,8 @@ out:
         /* Get the CPE error record and log it */
         ia64_mca_log_sal_error_record(SAL_INFO_TYPE_CPE);
 
+        local_irq_disable();
+
         return IRQ_HANDLED;
 }
 
@@ -1859,7 +1861,8 @@ ia64_mca_cpu_init(void *cpu_data)
                         data = mca_bootmem();
                         first_time = 0;
                 } else
-                        data = __get_free_pages(GFP_KERNEL, get_order(sz));
+                        data = (void *)__get_free_pages(GFP_KERNEL,
+                                                        get_order(sz));
                 if (!data)
                         panic("Could not allocate MCA memory for cpu %d\n",
                                         cpu);