diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-20 11:54:53 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-20 11:54:53 -0800 |
| commit | 4c971aa78314253cce914ed29e3d90df3326d646 (patch) | |
| tree | a9dcf0b1fdc9e1aacff90afb5b3ab79983115dcc /arch/m32r/mm/fault.c | |
| parent | Merge branch 'next' into for-linus (diff) | |
| parent | Input: psmouse - use IS_ENABLED instead of homegrown code (diff) | |
| download | linux-dev-4c971aa78314253cce914ed29e3d90df3326d646.tar.xz linux-dev-4c971aa78314253cce914ed29e3d90df3326d646.zip | |
Merge branch 'next' into for-linus
Second round of updates for 3.20.
Diffstat (limited to 'arch/m32r/mm/fault.c')
| -rw-r--r-- | arch/m32r/mm/fault.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c index e9c6a8014bd6..e3d4d4890104 100644 --- a/arch/m32r/mm/fault.c +++ b/arch/m32r/mm/fault.c @@ -200,6 +200,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 bad_area; else if (fault & VM_FAULT_SIGBUS) goto do_sigbus; BUG(); |