diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-05 20:29:33 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-05 20:29:33 (GMT) |
| commit | 08c191de948d6cd9dc613db0683e2467ce44a18c (patch) | |
| tree | 2b37672c43991efc3cc4e0ccd88ffc3051fbd3b7 /arch/m68k | |
| parent | 4161b4505f1690358ac0a9ee59845a7887336b21 (diff) | |
| parent | c503ca52a57cfe24f8937ca145a96ba94f6bb112 (diff) | |
| download | linux-08c191de948d6cd9dc613db0683e2467ce44a18c.tar.xz | |
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/m68k')
| -rw-r--r-- | arch/m68k/mm/fault.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c index 2bd7487..b2f04ae 100644 --- a/arch/m68k/mm/fault.c +++ b/arch/m68k/mm/fault.c @@ -145,6 +145,8 @@ good_area: if (unlikely(fault & VM_FAULT_ERROR)) { if (fault & VM_FAULT_OOM) goto out_of_memory; + else if (fault & VM_FAULT_SIGSEGV) + goto map_err; else if (fault & VM_FAULT_SIGBUS) goto bus_err; BUG(); |