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>

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:
 
         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;