From: Jiri Kosina Date: Fri, 9 Oct 2009 09:26:14 +0000 (+0200) Subject: CIRS: turn local_save_flags() + local_irq_disable()into local_irq_save() X-Git-Tag: MMI-PSA29.97-13-9~25708^2^2~31 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=84a3098f1ff8b42f2fdcfda25d1a83ea4a53b021;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git CIRS: turn local_save_flags() + local_irq_disable()into local_irq_save() This is a followup to my patches that fixed this all over the tree quite some time ago. This one went unnoticed for some reason. TLB handling for CRIS contains local_irq_disable() after local_save_flags(). Turn this into local_irq_save(). Signed-off-by: Jiri Kosina Acked-by: Jesper Nilsson --- diff --git a/arch/cris/arch-v10/mm/fault.c b/arch/cris/arch-v10/mm/fault.c index 087a2096f221..ed60588f8467 100644 --- a/arch/cris/arch-v10/mm/fault.c +++ b/arch/cris/arch-v10/mm/fault.c @@ -80,8 +80,7 @@ handle_mmu_bus_fault(struct pt_regs *regs) * do_page_fault may have flushed the TLB so we have to restore * the MMU registers. */ - local_save_flags(flags); - local_irq_disable(); + local_irq_save(flags); pmd = (pmd_t *)(pgd + pgd_index(address)); if (pmd_none(*pmd)) goto exit;