From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 19 Feb 2013 07:45:42 +0000 (+0100)
Subject: manual merge of x86/asm
X-Git-Tag: next-20130220~38^2~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fa7bb12411566a1379052cc0b0243cdd5ed8b385;p=karo-tx-linux.git

manual merge of x86/asm

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

fa7bb12411566a1379052cc0b0243cdd5ed8b385
diff --cc arch/x86/include/asm/pgtable.h
index 1c5551980964,512ec6bc7978..7c844666baf9
--- a/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,