From: Chuck Ebbert <76306.1226@compuserve.com> SMP alternatives is re-using the constant_tsc X86 feature bit. Cc: Gerd Hoffmann Signed-off-by: Andrew Morton --- include/asm-i386/cpufeature.h | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) diff -puN include/asm-i386/cpufeature.h~x86-smp-alternatives-fix include/asm-i386/cpufeature.h --- 25/include/asm-i386/cpufeature.h~x86-smp-alternatives-fix Thu Feb 2 14:58:51 2006 +++ 25-akpm/include/asm-i386/cpufeature.h Thu Feb 2 14:58:51 2006 @@ -70,8 +70,7 @@ #define X86_FEATURE_P3 (3*32+ 6) /* P3 */ #define X86_FEATURE_P4 (3*32+ 7) /* P4 */ #define X86_FEATURE_CONSTANT_TSC (3*32+ 8) /* TSC ticks at a constant rate */ - -#define X86_FEATURE_UP (3*32+ 8) /* smp kernel running on up */ +#define X86_FEATURE_UP (3*32+ 9) /* smp kernel running on up */ /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ #define X86_FEATURE_XMM3 (4*32+ 0) /* Streaming SIMD Extensions-3 */ _