diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-03 11:57:16 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-03 11:57:16 -0500 |
| commit | 3fe9cf390f6dc84f76b112b0a660967a84f9a81b (patch) | |
| tree | 18b8573687ae8131db155aa791f4d2357d91e6c5 /arch/arc/mm/fault.c | |
| parent | 6ccd93bdb989507717edb375d40534f1177822c5 (diff) | |
| parent | 830953c0724b42be30a74febcde6c89c706ed286 (diff) | |
Merge branch 'topic/snd-device' into for-next
Diffstat (limited to 'arch/arc/mm/fault.c')
| -rw-r--r-- | arch/arc/mm/fault.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arc/mm/fault.c b/arch/arc/mm/fault.c index 6f7e3a68803a..563cb27e37f5 100644 --- a/arch/arc/mm/fault.c +++ b/arch/arc/mm/fault.c | |||
| @@ -161,6 +161,8 @@ good_area: | |||
| 161 | 161 | ||
| 162 | if (fault & VM_FAULT_OOM) | 162 | if (fault & VM_FAULT_OOM) |
| 163 | goto out_of_memory; | 163 | goto out_of_memory; |
| 164 | else if (fault & VM_FAULT_SIGSEGV) | ||
| 165 | goto bad_area; | ||
| 164 | else if (fault & VM_FAULT_SIGBUS) | 166 | else if (fault & VM_FAULT_SIGBUS) |
| 165 | goto do_sigbus; | 167 | goto do_sigbus; |
| 166 | 168 | ||