diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-02-04 07:58:29 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-02-04 07:58:29 +0100 |
commit | 8f4bf4bcc4d6f70a47baec5d73bd411e572842e0 (patch) | |
tree | 8ed86ebd19c32a629bfcfb43378bf32acd14c7d6 /arch/cris/mm/fault.c | |
parent | 1ed39bac21c3c2934b18de34df9478ad7b8edf1f (diff) | |
parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) |
Merge tag 'v3.19-rc7' into perf/core, to merge fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/cris/mm/fault.c')
-rw-r--r-- | arch/cris/mm/fault.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c index 1790f22e71a2..2686a7aa8ec8 100644 --- a/arch/cris/mm/fault.c +++ b/arch/cris/mm/fault.c @@ -176,6 +176,8 @@ retry: 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(); |