From aa1978da532e2905d3a4bec80a2c601e9e0100b0 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Thu, 5 Feb 2009 11:31:10 -0800
Subject: [PATCH] --- yaml --- r: 136807 b: refs/heads/master c:
 a61bb29af47b0e4052566d25f3391894306a23fd h: refs/heads/master i:   136805:
 f18edc27fcb18341206a7181a0380d6655610c0b   136803:
 cb49813fbc0d37e685acc603cb810aebd5163418   136799:
 87405f0a3a8f0f124c3ca42f2606d966a2cd0f8b v: v3

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

diff --git a/[refs] b/[refs]
index e88adcad3594..3e3889292268 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30f103167fcf2b08de64f5f37ece6bfff7392290
+refs/heads/master: a61bb29af47b0e4052566d25f3391894306a23fd
diff --git a/trunk/arch/x86/include/asm/pgtable-3level.h b/trunk/arch/x86/include/asm/pgtable-3level.h
index 7ad9d05710b1..b92524eec202 100644
--- a/trunk/arch/x86/include/asm/pgtable-3level.h
+++ b/trunk/arch/x86/include/asm/pgtable-3level.h
@@ -23,11 +23,6 @@ static inline int pud_none(pud_t pud)
 	return pud_val(pud) == 0;
 }
 
-static inline int pud_bad(pud_t pud)
-{
-	return (pud_val(pud) & ~(PTE_PFN_MASK | _KERNPG_TABLE | _PAGE_USER)) != 0;
-}
-
 /* 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 ebcb60e6a961..38882f6cc827 100644
--- a/trunk/arch/x86/include/asm/pgtable.h
+++ b/trunk/arch/x86/include/asm/pgtable.h
@@ -546,6 +546,11 @@ static inline int pud_large(pud_t pud)
 	return (pud_val(pud) & (_PAGE_PSE | _PAGE_PRESENT)) ==
 		(_PAGE_PSE | _PAGE_PRESENT);
 }
+
+static inline int pud_bad(pud_t pud)
+{
+	return (pud_val(pud) & ~(PTE_PFN_MASK | _KERNPG_TABLE | _PAGE_USER)) != 0;
+}
 #endif	/* PAGETABLE_LEVELS > 2 */
 
 #if PAGETABLE_LEVELS > 3
diff --git a/trunk/arch/x86/include/asm/pgtable_64.h b/trunk/arch/x86/include/asm/pgtable_64.h
index 1dfc44932f65..fe8be33df3da 100644
--- a/trunk/arch/x86/include/asm/pgtable_64.h
+++ b/trunk/arch/x86/include/asm/pgtable_64.h
@@ -154,11 +154,6 @@ static inline void native_pgd_clear(pgd_t *pgd)
 
 #ifndef __ASSEMBLY__
 
-static inline int pud_bad(pud_t pud)
-{
-	return (pud_val(pud) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE;
-}
-
 static inline int pmd_bad(pmd_t pmd)
 {
 	return (pmd_val(pmd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE;