summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/required-features.h
diff options
context:
space:
mode:
authorJan Beulich2008-04-22 17:27:29 +0200
committerIngo Molnar2008-05-12 21:28:09 +0200
commitf8096f92b87d81c55ed63964d27baa9ce5ffe508 (patch)
treefe9686eea010725efc815d42e91154f8cd5c5f13 /include/asm-x86/required-features.h
parentLinux 2.6.26-rc2 (diff)
downloadkernel-qcow2-linux-f8096f92b87d81c55ed63964d27baa9ce5ffe508.tar.gz
kernel-qcow2-linux-f8096f92b87d81c55ed63964d27baa9ce5ffe508.tar.xz
kernel-qcow2-linux-f8096f92b87d81c55ed63964d27baa9ce5ffe508.zip
x86: separate cmpxchg8b checking from PAE checking
.. allowing the former to be use in non-PAE kernels, too. Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/required-features.h')
-rw-r--r--include/asm-x86/required-features.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-x86/required-features.h b/include/asm-x86/required-features.h
index 7400d3ad75c6..8c387198ca88 100644
--- a/include/asm-x86/required-features.h
+++ b/include/asm-x86/required-features.h
@@ -19,9 +19,13 @@
#if defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
# define NEED_PAE (1<<(X86_FEATURE_PAE & 31))
-# define NEED_CX8 (1<<(X86_FEATURE_CX8 & 31))
#else
# define NEED_PAE 0
+#endif
+
+#ifdef CONFIG_X86_CMPXCHG64
+# define NEED_CX8 (1<<(X86_FEATURE_CX8 & 31))
+#else
# define NEED_CX8 0
#endif