Merge branch 'security-fixes' into fixes

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/include/asm/mmu.h
index d1b4998e4f43987d0151d070cada4c1247fb302e,7345e37155d55a91ec9113b72fd1dfed8773a1cf..6f18da09668b5f324ad8c32e6fd6058e5b837e2a
--- 1/arch/arm/include/asm/mmu.h
--- 2/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

diff --cc arch/arm/kernel/process.c
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge