X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=include%2Fasm-generic%2Fpgtable.h;h=c2059a3a06216cb936a163255501e20d464c6b21;hb=48e49ead3e92d53196a78c42cf24c0eed6ca98dd;hp=358e4d309ceb179776f2a7036dabce02cdfad1d2;hpb=7669a22592fc6cc7ac03f55a7db8d23ce938f1dc;p=mv-sheeva.git

diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index 358e4d309ce..c2059a3a062 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -159,17 +159,8 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres
 #define lazy_mmu_prot_update(pte)	do { } while (0)
 #endif
 
-#ifndef __HAVE_ARCH_MULTIPLE_ZERO_PAGE
+#ifndef __HAVE_ARCH_MOVE_PTE
 #define move_pte(pte, prot, old_addr, new_addr)	(pte)
-#else
-#define move_pte(pte, prot, old_addr, new_addr)				\
-({									\
- 	pte_t newpte = (pte);						\
-	if (pte_present(pte) && pfn_valid(pte_pfn(pte)) &&		\
-			pte_page(pte) == ZERO_PAGE(old_addr))		\
-		newpte = mk_pte(ZERO_PAGE(new_addr), (prot));		\
-	newpte;								\
-})
 #endif
 
 /*