diff options
| author | Huang, Tao <huangtao@rock-chips.com> | 2015-06-02 11:25:34 +0800 |
|---|---|---|
| committer | Huang, Tao <huangtao@rock-chips.com> | 2015-06-02 11:25:34 +0800 |
| commit | 3ca9efa2f84503d67046ce2583470618b0faba24 (patch) | |
| tree | 7416f07096b0ba962c2f912d7711699efa8c1149 /arch/openrisc | |
| parent | 668e3ed51ff0211bd5fdf8915fde9ccd27eb4e69 (diff) | |
| parent | 488d2f6a829adce190e196358cd619e1b0c414a9 (diff) | |
Merge tag 'lsk-v3.10-15.05-android' into develop-3.10
Diffstat (limited to 'arch/openrisc')
| -rw-r--r-- | arch/openrisc/mm/fault.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c index 0703acf7d327..230ac20ae794 100644 --- a/arch/openrisc/mm/fault.c +++ b/arch/openrisc/mm/fault.c @@ -171,6 +171,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(); |