arch/i386/kernel/cpuid.c +2 -0
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/arch/i386/kernel/cpuid.c linux-2.5/arch/i386/kernel/cpuid.c
@@ -64,6 +64,7 @@ static inline void do_cpuid(int cpu, u32
{
struct cpuid_command cmd;
+ preempt_disable();
if ( cpu == smp_processor_id() ) {
cpuid(reg, &data[0], &data[1], &data[2], &data[3]);
} else {
@@ -73,6 +74,7 @@ static inline void do_cpuid(int cpu, u32
smp_call_function(cpuid_smp_cpuid, &cmd, 1, 1);
}
+ preempt_enable();
}
#else /* ! CONFIG_SMP */