diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-02 12:10:17 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-02 12:10:17 -0500 |
| commit | b3a54bf9ed76dff9dd26e1fc719431fb14604a8a (patch) | |
| tree | 38d2b3f00c71a881f303a06dfe361c9d6d591014 /arch/parisc/mm/fault.c | |
| parent | c99197902da284b4b723451c1471c45b18537cde (diff) | |
| parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) | |
Merge 3.19-rc7 into usb-next
We want the USB fixes in here to make merges easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/parisc/mm/fault.c')
| -rw-r--r-- | arch/parisc/mm/fault.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index 3ca9c1131cfe..e5120e653240 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c | |||
| @@ -256,6 +256,8 @@ good_area: | |||
| 256 | */ | 256 | */ |
| 257 | if (fault & VM_FAULT_OOM) | 257 | if (fault & VM_FAULT_OOM) |
| 258 | goto out_of_memory; | 258 | goto out_of_memory; |
| 259 | else if (fault & VM_FAULT_SIGSEGV) | ||
| 260 | goto bad_area; | ||
| 259 | else if (fault & VM_FAULT_SIGBUS) | 261 | else if (fault & VM_FAULT_SIGBUS) |
| 260 | goto bad_area; | 262 | goto bad_area; |
| 261 | BUG(); | 263 | BUG(); |