From 8e93e2bdfbb2ebf00a0b4f6d1693d7f5f8a66d4e Mon Sep 17 00:00:00 2001
From: Jan Engelmohr <jan.engelmohr@mailbox.tu-dresden.de>
Date: Tue, 26 Jul 2016 18:30:48 +0200
Subject: 3.10.75 -> 3.10.76

---
 arch/cris/mm/fault.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'arch/cris/mm')

diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 1790f22e7..2686a7aa8 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();
-- 
cgit v1.2.3