From: Jiri Kosina Date: Wed, 8 Feb 2012 14:32:13 +0000 (+0100) Subject: [IA64] disable interrupts when exiting from ia64_mca_cmc_int_handler() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0f261ede311bfd718d84bdf50dd7fcee585e82c7;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git [IA64] disable interrupts when exiting from ia64_mca_cmc_int_handler() SAL specification mandates that ia64_mca_log_sal_error_record() gets called with interrupts enabled, and that's why ia64_mca_cmc_int_handler() is enabling them. It however forgets to re-disable them when exiting, which triggers WARN_ON() in generic IRQ handler. Disable the interrupts again before exiting. This is analogous to a3967685745 ("[IA64] disable interrupts at end of ia64_mca_cpe_int_handler()"). Signed-off-by: Jiri Kosina Signed-off-by: Tony Luck --- diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index 84fb405eee87..8192009cb924 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c @@ -1447,6 +1447,8 @@ out: /* Get the CMC error record and log it */ ia64_mca_log_sal_error_record(SAL_INFO_TYPE_CMC); + local_irq_disable(); + return IRQ_HANDLED; }