diff options
author | 2009-12-21 11:21:15 +0100 | |
---|---|---|
committer | 2009-12-21 11:21:15 +0100 | |
commit | de8853bc38ceab1fa7e7f723b21430d4aad60fea (patch) | |
tree | 5084ef51866fd1767324f8dc8eb36e97c55350f5 /arch/arm/mm/fault.c | |
parent | ALSA: HDA: add powersaving hook for Realtek (diff) | |
parent | ALSA: hda/realtek: Remove extra .capsrc_nids initialization for ALC889_INTEL (diff) | |
download | wireguard-linux-de8853bc38ceab1fa7e7f723b21430d4aad60fea.tar.xz wireguard-linux-de8853bc38ceab1fa7e7f723b21430d4aad60fea.zip |
Merge remote branch 'alsa/fixes' into fix/hda
Diffstat (limited to 'arch/arm/mm/fault.c')
-rw-r--r-- | arch/arm/mm/fault.c | 5 |
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); |