aboutsummaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-10-09 11:26:14 +0200
committerJiri Kosina <jkosina@suse.cz>2009-11-09 09:40:57 +0100
commit84a3098f1ff8b42f2fdcfda25d1a83ea4a53b021 (patch)
tree79fd7299586d2c91353170420e3572edc626ade3 /arch/cris
parent21ae2956ce289f61f11863cc67080f9a28101ae0 (diff)
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 <jkosina@suse.cz> Acked-by: Jesper Nilsson <Jesper.Nilsson@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v10/mm/fault.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/mm/fault.c b/arch/cris/arch-v10/mm/fault.c
index 087a2096f22..ed60588f846 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;