From: Mark Brown <broonie@linaro.org>
Date: Wed, 7 May 2014 08:50:01 +0000 (+0100)
Subject: Merge tag 'v3.10.39' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~137^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=03b120027537c2ed889393e4c4e4e2f87c868027;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v3.10.39' into linux-linaro-lsk

This is the 3.10.39 stable release
---

03b120027537c2ed889393e4c4e4e2f87c868027
diff --cc arch/arm64/include/asm/pgtable.h
index b4d6eae1aef4,3a710d7b14ce..b8940733ee30
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@@ -193,12 -161,10 +193,12 @@@ static inline void set_pte_at(struct mm
  			      pte_t *ptep, pte_t pte)
  {
  	if (pte_valid_user(pte)) {
- 		if (pte_exec(pte))
+ 		if (!pte_special(pte) && pte_exec(pte))
  			__sync_icache_dcache(pte, addr);
 -		if (!pte_dirty(pte))
 -			pte = pte_wrprotect(pte);
 +		if (pte_dirty(pte) && pte_write(pte))
 +			pte_val(pte) &= ~PTE_RDONLY;
 +		else
 +			pte_val(pte) |= PTE_RDONLY;
  	}
  
  	set_pte(ptep, pte);