Re: [PATCH -tip] x86: cpu/intel.c cleanup

[Ingo Molnar <mingo@elte.hu>]

* Sam Ravnborg <sam@ravnborg.org> wrote:

> >  
> >  #include <asm/processor.h>
> > +#include <asm/topology.h>
> >  #include <asm/pgtable.h>
> > -#include <asm/msr.h>
> > -#include <asm/uaccess.h>
> > -#include <asm/ds.h>
> > +#ifdef CONFIG_X86_LOCAL_APIC
> > +#include <asm/mpspec.h>
> > +#include <asm/apic.h>
> > +#endif
> 
> If these header files are only relevant for 
> CONFIG_X86_LOCAL_APIC then we should move the ifdef down into 
> the header file, so users do not forget it.

apic.h can be included unconditionally - and the mpspec.h 
inclusion can be removed because it's included by apic.h.

> > +			pr_info("CPU: C0 stepping P4 Xeon detected.\n");
> > +			pr_info("CPU: Disabling hardware prefetching (Errata 037)\n");
> >  			lo |= MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE;
> > -			wrmsr (MSR_IA32_MISC_ENABLE, lo, hi);
> > +			wrmsr(MSR_IA32_MISC_ENABLE, lo, hi);
> >  		}
> >  	}
> >  
> > @@ -217,7 +241,7 @@ static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c)
> >  	 * integrated APIC (see 11AP erratum in "Pentium Processor
> >  	 * Specification Update").
> >  	 */
> > -	if (cpu_has_apic && (c->x86<<8 | c->x86_model<<4) == 0x520 &&
> > +	if (cpu_has_apic && (c->x86 << 8 | c->x86_model << 4) == 0x520 &&
> >  	    (c->x86_mask < 0x6 || c->x86_mask == 0xb))
> >  		set_cpu_cap(c, X86_FEATURE_11AP);
> >  
> > @@ -245,28 +269,26 @@ static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c)
> >  #endif
> >  
> >  	intel_smp_check(c);
> > -}
> > -#else
> > -static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c)
> > -{
> > -}
> >  #endif
> > +}
> 
> To me it is more obvious with the old style.
> Having ifdef's inside the block is less obvious.
> 
> But I have not checked what is the common pattern.

agreed, this one was probably cleaner with the #ifdef block 
outside.

	Ingo