Merge branch 'security-fixes' into fixes
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 1 Aug 2013 19:51:13 +0000 (20:51 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 1 Aug 2013 19:51:13 +0000 (20:51 +0100)
1  2 
arch/arm/Kconfig
arch/arm/include/asm/mmu.h
arch/arm/kernel/process.c
arch/arm/mm/mmu.c

Simple merge
index d1b4998e4f43987d0151d070cada4c1247fb302e,7345e37155d55a91ec9113b72fd1dfed8773a1cf..6f18da09668b5f324ad8c32e6fd6058e5b837e2a
@@@ -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
Simple merge
Simple merge