lkml.org 
[lkml]   [2009]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH 05 of 36] x86: unify pte_hidden
Date
From
Impact: cleanup

Unify and demacro pte_hidden.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---
arch/x86/include/asm/pgtable.h | 5 +++++
arch/x86/include/asm/pgtable_32.h | 6 ------
arch/x86/include/asm/pgtable_64.h | 6 ------
3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -478,6 +478,11 @@
return pte_flags(a) & (_PAGE_PRESENT | _PAGE_PROTNONE);
}

+static inline int pte_hidden(pte_t pte)
+{
+ return pte_flags(pte) & _PAGE_HIDDEN;
+}
+
#endif /* __ASSEMBLY__ */

#ifdef CONFIG_X86_32
diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
--- a/arch/x86/include/asm/pgtable_32.h
+++ b/arch/x86/include/asm/pgtable_32.h
@@ -85,12 +85,6 @@
/* The boot page tables (all created as a single array) */
extern unsigned long pg0[];

-#ifdef CONFIG_KMEMCHECK
-#define pte_hidden(x) ((x).pte_low & (_PAGE_HIDDEN))
-#else
-#define pte_hidden(x) 0
-#endif
-
/* To avoid harmful races, pmd_none(x) should check only the lower when PAE */
#define pmd_none(x) (!(unsigned long)pmd_val((x)))
#define pmd_present(x) (pmd_val((x)) & _PAGE_PRESENT)
diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -168,12 +168,6 @@
return (pmd_val(pmd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE;
}

-#ifdef CONFIG_KMEMCHECK
-#define pte_hidden(x) (pte_val((x)) & (_PAGE_HIDDEN))
-#else
-#define pte_hidden(x) 0
-#endif
-
#define pages_to_mb(x) ((x) >> (20 - PAGE_SHIFT)) /* FIXME: is this right? */

/*



\
 
 \ /
  Last update: 2009-02-05 20:39    [W:0.075 / U:5.136 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site