From 6f1cd939ce96c201f50d611554cc8c76e3bf3786 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Fri, 6 Feb 2009 13:05:56 -0800
Subject: [PATCH] --- yaml --- r: 151465 b: refs/heads/master c:
 eb63657e1314ae4af5e19a61db8dc1b6e935775a h: refs/heads/master i:   151463:
 50f9bd8f5adc097769fc90047bf032e248627d94 v: v3

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

diff --git a/[refs] b/[refs]
index 9d76a33ced8a..67be577abca5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d31c5068b852deaf02ccfb4a1ed2b54f3b9358a
+refs/heads/master: eb63657e1314ae4af5e19a61db8dc1b6e935775a
diff --git a/trunk/arch/x86/include/asm/pgtable.h b/trunk/arch/x86/include/asm/pgtable.h
index c5a08079ad5e..3cc06e3fceb8 100644
--- a/trunk/arch/x86/include/asm/pgtable.h
+++ b/trunk/arch/x86/include/asm/pgtable.h
@@ -317,13 +317,9 @@ static inline int pte_present(pte_t a)
 	return pte_flags(a) & (_PAGE_PRESENT | _PAGE_PROTNONE);
 }
 
-static inline int pte_hidden(pte_t x)
+static inline int pte_hidden(pte_t pte)
 {
-#ifdef CONFIG_KMEMCHECK
-	return pte_flags(x) & _PAGE_HIDDEN;
-#else
-	return 0;
-#endif
+	return pte_flags(pte) & _PAGE_HIDDEN;
 }
 
 static inline int pmd_present(pmd_t pmd)