diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2008-05-14 19:10:39 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-25 02:58:34 -0400 |
commit | 23eb271b9186531e1eb704dda9ab37abcfd0ca4a (patch) | |
tree | c424faa7817ba673812c4c4960caa1e3952772cd /include/asm-x86/cpufeature.h | |
parent | 0e192b99d7d09f08b445c31ee7c7f3d0bfb27345 (diff) |
x86: setup_force_cpu_cap(): don't do clear_bit(non-unsigned-long)
Another hack to make proper prototyping of x86 bitops viable.
Cc: Andrea Arcangeli <andrea@qumranet.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/cpufeature.h')
-rw-r--r-- | include/asm-x86/cpufeature.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/cpufeature.h b/include/asm-x86/cpufeature.h index 0d609c837a41..78b47e7404eb 100644 --- a/include/asm-x86/cpufeature.h +++ b/include/asm-x86/cpufeature.h | |||
@@ -142,11 +142,11 @@ extern const char * const x86_power_flags[32]; | |||
142 | #define clear_cpu_cap(c, bit) clear_bit(bit, (unsigned long *)((c)->x86_capability)) | 142 | #define clear_cpu_cap(c, bit) clear_bit(bit, (unsigned long *)((c)->x86_capability)) |
143 | #define setup_clear_cpu_cap(bit) do { \ | 143 | #define setup_clear_cpu_cap(bit) do { \ |
144 | clear_cpu_cap(&boot_cpu_data, bit); \ | 144 | clear_cpu_cap(&boot_cpu_data, bit); \ |
145 | set_bit(bit, cleared_cpu_caps); \ | 145 | set_bit(bit, (unsigned long *)cleared_cpu_caps); \ |
146 | } while (0) | 146 | } while (0) |
147 | #define setup_force_cpu_cap(bit) do { \ | 147 | #define setup_force_cpu_cap(bit) do { \ |
148 | set_cpu_cap(&boot_cpu_data, bit); \ | 148 | set_cpu_cap(&boot_cpu_data, bit); \ |
149 | clear_bit(bit, cleared_cpu_caps); \ | 149 | clear_bit(bit, (unsigned long *)cleared_cpu_caps); \ |
150 | } while (0) | 150 | } while (0) |
151 | 151 | ||
152 | #define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU) | 152 | #define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU) |