[PATCH 1/2] x86-64: Simplify cpu_has_invlpg

[Brian Gerst]

Define CONFIG_X86_INVLPG for 64-bit too, which simplifies the code.

Signed-off-by: Brian Gerst <brgerst@xxxxxxxxx>
---
 arch/x86/Kconfig.cpu              |    2 +-
 arch/x86/include/asm/cpufeature.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 6a7cfdf..d801dfe 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -350,7 +350,7 @@ config X86_WP_WORKS_OK
 
 config X86_INVLPG
 	def_bool y
-	depends on X86_32 && !M386
+	depends on !M386
 
 config X86_BSWAP
 	def_bool y
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 71cc380..102b6f0 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -289,7 +289,7 @@ extern const char * const x86_power_flags[32];
 #define cpu_has_pclmulqdq	boot_cpu_has(X86_FEATURE_PCLMULQDQ)
 #define cpu_has_perfctr_core	boot_cpu_has(X86_FEATURE_PERFCTR_CORE)
 
-#if defined(CONFIG_X86_INVLPG) || defined(CONFIG_X86_64)
+#ifdef CONFIG_X86_INVLPG
 # define cpu_has_invlpg		1
 #else
 # define cpu_has_invlpg		(boot_cpu_data.x86 > 3)
-- 
1.7.4.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/