From: Stricted <info@stricted.net>
Date: Wed, 21 Mar 2018 21:31:40 +0000 (+0100)
Subject: Merge tag 'v3.10.61' into update
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7887027a47c737526bb3559ecd710c5d789501a1;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge tag 'v3.10.61' into update

This is the 3.10.61 stable release
---

7887027a47c737526bb3559ecd710c5d789501a1
diff --cc arch/arm/mm/fault.c
index ce5f1130a13c,160da6d65546..ca0fa6f291ec
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@@ -277,12 -274,17 +275,17 @@@ do_page_fault(unsigned long addr, unsig
  		local_irq_enable();
  
  	/*
 -	 * If we're in an interrupt or have no user
 +	 * If we're in an interrupt, or have no irqs, or have no user
  	 * context, we must not take the fault..
  	 */
 -	if (in_atomic() || !mm)
 +	if (in_atomic() || irqs_disabled() || !mm)
  		goto no_context;
  
+ 	if (user_mode(regs))
+ 		flags |= FAULT_FLAG_USER;
+ 	if (fsr & FSR_WRITE)
+ 		flags |= FAULT_FLAG_WRITE;
+ 
  	/*
  	 * As per x86, we may deadlock here.  However, since the kernel only
  	 * validly references user space from well defined areas of the code,