diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-04 07:53:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-04 07:53:17 +0100 |
| commit | 2622e849a1d3d3ef531d1cc33308bb7fd00eee40 (patch) | |
| tree | f2be9d9f08444cb93b3a8f87099fe4ff8ac3cd57 /arch/openrisc/mm/fault.c | |
| parent | 996636ddae5cab8883bd76b996cd4f2ea9a152be (diff) | |
| parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) | |
| download | linux-2622e849a1d3d3ef531d1cc33308bb7fd00eee40.tar.gz linux-2622e849a1d3d3ef531d1cc33308bb7fd00eee40.tar.bz2 linux-2622e849a1d3d3ef531d1cc33308bb7fd00eee40.zip | |
Merge tag 'v3.19-rc7' into locking/core, to refresh the branch before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/openrisc/mm/fault.c')
| -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(); |