From 3b64e5692bdf4a84c397e43d992cfd8903185c52 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Thu, 5 Feb 2009 11:30:48 -0800
Subject: [PATCH] --- yaml --- r: 136785 b: refs/heads/master c:
 5ba7c91341be61e0942f792c237ac067d9f32f51 h: refs/heads/master i:   136783:
 61901a9a7b7ad0b75b7bd000ce4b05a26012c8f4 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/x86/include/asm/pgtable-3level.h | 5 -----
 trunk/arch/x86/include/asm/pgtable.h        | 7 +++++++
 trunk/arch/x86/include/asm/pgtable_64.h     | 1 -
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8ff1bc4fe747..fe72ab468fe8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c683851d96c8313586c0695b25ca41bde9f0f73
+refs/heads/master: 5ba7c91341be61e0942f792c237ac067d9f32f51
diff --git a/trunk/arch/x86/include/asm/pgtable-3level.h b/trunk/arch/x86/include/asm/pgtable-3level.h
index 51832fa04743..524bd91b9952 100644
--- a/trunk/arch/x86/include/asm/pgtable-3level.h
+++ b/trunk/arch/x86/include/asm/pgtable-3level.h
@@ -28,11 +28,6 @@ static inline int pud_bad(pud_t pud)
 	return (pud_val(pud) & ~(PTE_PFN_MASK | _KERNPG_TABLE | _PAGE_USER)) != 0;
 }
 
-static inline int pud_present(pud_t pud)
-{
-	return pud_val(pud) & _PAGE_PRESENT;
-}
-
 /* Rules for using set_pte: the pte being assigned *must* be
  * either not present or in a state where the hardware will
  * not attempt to update the pte.  In places where this is
diff --git a/trunk/arch/x86/include/asm/pgtable.h b/trunk/arch/x86/include/asm/pgtable.h
index 17fcc17d6b4f..c117b28df151 100644
--- a/trunk/arch/x86/include/asm/pgtable.h
+++ b/trunk/arch/x86/include/asm/pgtable.h
@@ -445,6 +445,13 @@ static inline int pte_present(pte_t a)
 	return pte_flags(a) & (_PAGE_PRESENT | _PAGE_PROTNONE);
 }
 
+#if PAGETABLE_LEVELS > 2
+static inline int pud_present(pud_t pud)
+{
+	return pud_val(pud) & _PAGE_PRESENT;
+}
+#endif	/* PAGETABLE_LEVELS > 2 */
+
 #endif	/* __ASSEMBLY__ */
 
 #ifdef CONFIG_X86_32
diff --git a/trunk/arch/x86/include/asm/pgtable_64.h b/trunk/arch/x86/include/asm/pgtable_64.h
index 35b8dbc068e0..acdc27b202c8 100644
--- a/trunk/arch/x86/include/asm/pgtable_64.h
+++ b/trunk/arch/x86/include/asm/pgtable_64.h
@@ -194,7 +194,6 @@ static inline int pgd_large(pgd_t pgd) { return 0; }
 #define pud_index(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))
 #define pud_offset(pgd, address)					\
 	((pud_t *)pgd_page_vaddr(*(pgd)) + pud_index((address)))
-#define pud_present(pud) (pud_val((pud)) & _PAGE_PRESENT)
 
 static inline int pud_large(pud_t pte)
 {