From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 1 Aug 2013 19:51:13 +0000 (+0100)
Subject: Merge branch 'security-fixes' into fixes
X-Git-Tag: firefly_0821_release~176^2~5508^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=24195cad3e00557da166d629c8b0fd2f984f2170;p=firefly-linux-kernel-4.4.55.git

Merge branch 'security-fixes' into fixes
---

24195cad3e00557da166d629c8b0fd2f984f2170
diff --cc arch/arm/include/asm/mmu.h
index d1b4998e4f43,7345e37155d5..6f18da09668b
--- a/arch/arm/include/asm/mmu.h
+++ b/arch/arm/include/asm/mmu.h
@@@ -6,10 -6,9 +6,11 @@@
  typedef struct {
  #ifdef CONFIG_CPU_HAS_ASID
  	atomic64_t	id;
 +#else
 +	int		switch_pending;
  #endif
  	unsigned int	vmalloc_seq;
+ 	unsigned long	sigpage;
  } mm_context_t;
  
  #ifdef CONFIG_CPU_HAS_ASID