On Wed, Nov 01, 2006 at 01:17:53PM +0100, Pavel Machek wrote: > > +++ linux-2.6-pv/arch/i386/kernel/cpu/intel.c > > @@ -107,7 +107,7 @@ static void __cpuinit init_intel(struct > > * Note that the workaround only should be initialized once... > > */ > > c->f00f_bug = 0; > > - if ( c->x86 == 5 ) { > > + if (!paravirt_enabled() && c->x86 == 5) { > > I'd do x86==5 check first... pentiums are not common any more. It's not like paravirt_enabled will be common-case either, and is this isn't exactly a performance critical piece of code, it doesn't really matter which way around the checks are done. Dave -- http://www.codemonkey.org.uk