manual merge of x86/asm

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/pgtable.h
index 1c555198096465439d983d9a9b295c488c0d5b64,512ec6bc79782f398a583b13a2c7e11372f160d6..7c844666baf925cc648d00b996756dc2305e1c2c
--- 1/arch/x86/include/asm/pgtable.h
--- 2/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@@ -746,6 -738,6 +746,18 @@@ extern int pmdp_test_and_clear_young(st
  extern int pmdp_clear_flush_young(struct vm_area_struct *vma,
                                  unsigned long address, pmd_t *pmdp);
  
++/*
++ * The x86 doesn't have any external MMU info: the kernel page
++ * tables contain all the necessary information.
++ */
++static inline void update_mmu_cache(struct vm_area_struct *vma,
++              unsigned long addr, pte_t *ptep)
++{
++}
++static inline void update_mmu_cache_pmd(struct vm_area_struct *vma,
++              unsigned long addr, pmd_t *pmd)
++{
++}
  
  #define __HAVE_ARCH_PMDP_SPLITTING_FLUSH
  extern void pmdp_splitting_flush(struct vm_area_struct *vma,

diff --cc arch/x86/include/asm/pgtable_64.h
Simple merge

diff --cc arch/x86/mm/init_64.c
Simple merge