summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2009-02-05 20:31:13 +0100
committerJeremy Fitzhardinge <jeremy@goop.org>2009-02-06 21:31:51 +0100
commitdeb79cfb365c96ff960570d1bcf2c205424b6195 (patch)
treed18b2806eba47ae6d1bc6f5d3054210d7a4e5743
parentx86: unify pages_to_mb (diff)
downloadlinux-deb79cfb365c96ff960570d1bcf2c205424b6195.tar.xz
linux-deb79cfb365c96ff960570d1bcf2c205424b6195.zip
x86: unify pud_none
Impact: cleanup Unify and demacro pud_none. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
-rw-r--r--arch/x86/include/asm/pgtable-3level.h5
-rw-r--r--arch/x86/include/asm/pgtable.h5
-rw-r--r--arch/x86/include/asm/pgtable_64.h1
3 files changed, 5 insertions, 6 deletions
diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
index b92524eec202..3f13cdf61156 100644
--- a/arch/x86/include/asm/pgtable-3level.h
+++ b/arch/x86/include/asm/pgtable-3level.h
@@ -18,11 +18,6 @@
printk("%s:%d: bad pgd %p(%016Lx).\n", \
__FILE__, __LINE__, &(e), pgd_val(e))
-static inline int pud_none(pud_t pud)
-{
- return pud_val(pud) == 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/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index d4cbc8188c8a..0ef49f3ebc88 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -525,6 +525,11 @@ static inline unsigned long pages_to_mb(unsigned long npg)
}
#if PAGETABLE_LEVELS > 2
+static inline int pud_none(pud_t pud)
+{
+ return pud_val(pud) == 0;
+}
+
static inline int pud_present(pud_t pud)
{
return pud_val(pud) & _PAGE_PRESENT;
diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
index 6c6c3c34bc5b..d58c2ee15c3c 100644
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -68,7 +68,6 @@ extern void paging_init(void);
__FILE__, __LINE__, &(e), pgd_val(e))
#define pgd_none(x) (!pgd_val(x))
-#define pud_none(x) (!pud_val(x))
struct mm_struct;