From: Andrew Morton It crashed HUgh's machine. Cc: Andi Kleen Cc: Hugh Dickins Signed-off-by: Andrew Morton --- arch/i386/kernel/cpu/common.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/i386/kernel/cpu/common.c~revert-x86_64-mm-i386-early-alignment arch/i386/kernel/cpu/common.c --- devel/arch/i386/kernel/cpu/common.c~revert-x86_64-mm-i386-early-alignment 2006-03-07 12:13:24.000000000 -0800 +++ devel-akpm/arch/i386/kernel/cpu/common.c 2006-03-07 12:13:24.000000000 -0800 @@ -216,7 +216,7 @@ static int __devinit have_cpuid_p(void) } /* Do minimum CPU detection early. - Fields really needed: vendor, cpuid_level, family, model, mask. + Fields really needed: vendor, cpuid_level, family, model, mask, cache alignment. The others are not touched to avoid unwanted side effects. WARNING: this function is only called on the BP. Don't add code here @@ -225,6 +225,8 @@ static void __init early_cpu_detect(void { struct cpuinfo_x86 *c = &boot_cpu_data; + c->x86_cache_alignment = 32; + if (!have_cpuid_p()) return; @@ -298,8 +300,6 @@ void __devinit generic_identify(struct c } } - c->x86_cache_alignment = 32; - early_intel_workaround(c); #ifdef CONFIG_X86_HT _