summaryrefslogtreecommitdiff
path: root/arch/arm/mm/fault.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-10-13 11:27:08 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-10-13 11:27:08 +0900
commit95019b48addc014c7de6653517663527a1747fb7 (patch)
tree5488066e45e8e9de1fef431f39a93cd2d5967b61 /arch/arm/mm/fault.c
parent7a0064d67215c53dce56839c82db504d0a066b79 (diff)
parent964f7e5a56814b32c727821de77d22bd7ef782bc (diff)
downloadlinux-95019b48addc014c7de6653517663527a1747fb7.tar.gz
linux-95019b48addc014c7de6653517663527a1747fb7.tar.bz2
linux-95019b48addc014c7de6653517663527a1747fb7.zip
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/arm/mm/fault.c')
-rw-r--r--arch/arm/mm/fault.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index ae0e25f5a70e..10e06801afb3 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -292,6 +292,11 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
* down_read()
*/
might_sleep();
+#ifdef CONFIG_DEBUG_VM
+ if (!user_mode(regs) &&
+ !search_exception_tables(regs->ARM_pc))
+ goto no_context;
+#endif
}
fault = __do_page_fault(mm, addr, fsr, tsk);