diff options
| author | Takashi Iwai <[email protected]> | 2015-02-05 20:29:33 +0000 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2015-02-05 20:29:33 +0000 |
| commit | 08c191de948d6cd9dc613db0683e2467ce44a18c (patch) | |
| tree | 2b37672c43991efc3cc4e0ccd88ffc3051fbd3b7 /arch/x86/mm/fault.c | |
| parent | ALSA: ak411x: Fix stall in work callback (diff) | |
| parent | Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus (diff) | |
| download | kernel-08c191de948d6cd9dc613db0683e2467ce44a18c.tar.gz kernel-08c191de948d6cd9dc613db0683e2467ce44a18c.zip | |
Merge tag 'asoc-fix-v3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.19
A few last minute fixes for v3.19, all driver specific. None of them
stand out particularly - it's all the standard people who are affected
will care stuff.
The Samsung fix is a DT only fix for the audio controller, it's being
merged via the ASoC tree due to process messups (the submitter sent it
at the end of a tangentally related series rather than separately to the
ARM folks) in order to make sure that it gets to people sooner.
Diffstat (limited to 'arch/x86/mm/fault.c')
| -rw-r--r-- | arch/x86/mm/fault.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 38dcec403b46..e3ff27a5b634 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -898,6 +898,8 @@ mm_fault_error(struct pt_regs *regs, unsigned long error_code, if (fault & (VM_FAULT_SIGBUS|VM_FAULT_HWPOISON| VM_FAULT_HWPOISON_LARGE)) do_sigbus(regs, error_code, address, fault); + else if (fault & VM_FAULT_SIGSEGV) + bad_area_nosemaphore(regs, error_code, address); else BUG(); } |