Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

[linux-2.6] / include / asm-x86 / cpufeature.h

diff --git a/include/asm-x86/cpufeature.h b/include/asm-x86/cpufeature.h
index 93c143fb8a510210c5fe1f4bdeef893027dd3c03..3fb7dfa7fc915b66f827c722ec31efc70cd63810 100644 (file)
--- a/include/asm-x86/cpufeature.h
+++ b/include/asm-x86/cpufeature.h
@@ -131,6 +131,14 @@
 
 #define set_cpu_cap(c, bit)    set_bit(bit, (unsigned long *)((c)->x86_capability))
 #define clear_cpu_cap(c, bit)  clear_bit(bit, (unsigned long *)((c)->x86_capability))
+#define setup_clear_cpu_cap(bit) do { \
+       clear_cpu_cap(&boot_cpu_data, bit);     \
+       set_bit(bit, cleared_cpu_caps);         \
+} while (0)
+#define setup_force_cpu_cap(bit) do { \
+       set_cpu_cap(&boot_cpu_data, bit);       \
+       clear_bit(bit, cleared_cpu_caps);       \
+} while (0)
 
 #define cpu_has_fpu            boot_cpu_has(X86_FEATURE_FPU)
 #define cpu_has_vme            boot_cpu_has(X86_FEATURE_VME)
@@ -194,21 +202,6 @@
 #undef  cpu_has_centaur_mcr
 #define cpu_has_centaur_mcr    0
 
-#undef  cpu_has_pse
-#define cpu_has_pse            1
-
-#undef  cpu_has_pge
-#define cpu_has_pge            1
-
-#undef  cpu_has_xmm
-#define cpu_has_xmm            1
-
-#undef  cpu_has_xmm2
-#define cpu_has_xmm2           1
-
-#undef  cpu_has_fxsr
-#define cpu_has_fxsr           1
-
 #endif /* CONFIG_X86_64 */
 
 #endif /* _ASM_X86_CPUFEATURE_H */