---

yaml --- r: 173786 b: refs/heads/master c: 84a3098 h: refs/heads/master v: v3
git-mirror · Nov 9, 2009 · 727fc7b · 727fc7b
1 parent 81c9e09
commit 727fc7b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21ae2956ce289f61f11863cc67080f9a28101ae0
+refs/heads/master: 84a3098f1ff8b42f2fdcfda25d1a83ea4a53b021
diff --git a/trunk/arch/cris/arch-v10/mm/fault.c b/trunk/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;