Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e664aa2 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] i386: Move phys_proc_id/early intel workaround to correct function. 



early_cpu_detect only runs on the BP, but this code needs to run
on all CPUs.

Looks like a mismerge somewhere.  Also add a warning comment.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 77a75333

arch/i386/kernel/cpu/common.c

+10 −7
Original line number Original line Diff line number Diff line
@@ -204,7 +204,10 @@ static int __devinit have_cpuid_p(void) 




/* Do minimum CPU detection early.

/* Do minimum CPU detection early.

   Fields really needed: vendor, cpuid_level, family, model, mask, cache alignment.

   Fields really needed: vendor, cpuid_level, family, model, mask, cache alignment.

   The others are not touched to avoid unwanted side effects. */

   The others are not touched to avoid unwanted side effects.



   WARNING: this function is only called on the BP.  Don't add code here

   that is supposed to run on all CPUs. */

static void __init early_cpu_detect(void)

static void __init early_cpu_detect(void)

{

{

	struct cpuinfo_x86 *c = &boot_cpu_data;

	struct cpuinfo_x86 *c = &boot_cpu_data;
@@ -236,12 +239,6 @@ static void __init early_cpu_detect(void) 
		if (cap0 & (1<<19))

		if (cap0 & (1<<19))

			c->x86_cache_alignment = ((misc >> 8) & 0xff) * 8;

			c->x86_cache_alignment = ((misc >> 8) & 0xff) * 8;

	}

	}



	early_intel_workaround(c);



#ifdef CONFIG_X86_HT

	phys_proc_id[smp_processor_id()] = (cpuid_ebx(1) >> 24) & 0xff;

#endif

}

}





void __devinit generic_identify(struct cpuinfo_x86 * c)

void __devinit generic_identify(struct cpuinfo_x86 * c)
@@ -289,6 +286,12 @@ void __devinit generic_identify(struct cpuinfo_x86 * c) 
				get_model_name(c); /* Default name */

				get_model_name(c); /* Default name */

		}

		}

	}

	}



	early_intel_workaround(c);



#ifdef CONFIG_X86_HT

	phys_proc_id[smp_processor_id()] = (cpuid_ebx(1) >> 24) & 0xff;

#endif

}

}





static void __devinit squash_the_stupid_serial_number(struct cpuinfo_x86 *c)

static void __devinit squash_the_stupid_serial_number(struct cpuinfo_x86 *c)