diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-05-12 15:18:24 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-05-12 15:18:24 +0800 |
| commit | 54db03197e2d0aca252bc377938777b30d3e7f10 (patch) | |
| tree | 8f078dfe75c88e09ae8557f8b6aa288bbdaddc97 /arch/mn10300/mm/fault.c | |
| parent | 2075186d012c815911494f34fc16aef7c8f3492b (diff) | |
| parent | 1f8fdf83fe376cc83e96e942689a6cfac01e9634 (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android
Diffstat (limited to 'arch/mn10300/mm/fault.c')
| -rw-r--r-- | arch/mn10300/mm/fault.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mn10300/mm/fault.c b/arch/mn10300/mm/fault.c index 3516cbdf1ee..0c2cc5d39c8 100644 --- a/arch/mn10300/mm/fault.c +++ b/arch/mn10300/mm/fault.c @@ -262,6 +262,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(); |