diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-03 17:57:16 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-03 17:57:16 +0100 |
| commit | 3fe9cf390f6dc84f76b112b0a660967a84f9a81b (patch) | |
| tree | 18b8573687ae8131db155aa791f4d2357d91e6c5 /arch/frv/mm/fault.c | |
| parent | ALSA: line6: fixup of line6_start_timer argument type (diff) | |
| parent | ALSA: Drop snd_get_device() helper (diff) | |
| download | linux-3fe9cf390f6dc84f76b112b0a660967a84f9a81b.tar.xz linux-3fe9cf390f6dc84f76b112b0a660967a84f9a81b.zip | |
Merge branch 'topic/snd-device' into for-next
Diffstat (limited to 'arch/frv/mm/fault.c')
| -rw-r--r-- | arch/frv/mm/fault.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/frv/mm/fault.c b/arch/frv/mm/fault.c index 9a66372fc7c7..ec4917ddf678 100644 --- a/arch/frv/mm/fault.c +++ b/arch/frv/mm/fault.c @@ -168,6 +168,8 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear if (unlikely(fault & VM_FAULT_ERROR)) { if (fault & VM_FAULT_OOM) goto out_of_memory; + else if (fault & VM_FAULT_SIGSEGV) + goto bad_area; else if (fault & VM_FAULT_SIGBUS) goto do_sigbus; BUG(); |