Skip to content

Commit

Permalink
x86: add an smp_apply_quirks to smpboot_32.c
Browse files Browse the repository at this point in the history
The split of smp_store_cpu_info in a quirks-only part
will ease integration with x86_64

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Glauber de Oliveira Costa authored and Ingo Molnar committed Apr 17, 2008
1 parent d0173ae commit 8238987
Showing 1 changed file with 18 additions and 12 deletions.
30 changes: 18 additions & 12 deletions arch/x86/kernel/smpboot_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,8 @@ static void map_cpu_to_logical_apicid(void);
/* State of each CPU. */
DEFINE_PER_CPU(int, cpu_state) = { 0 };

/*
* The bootstrap kernel entry code has set these up. Save them for
* a given CPU
*/

void __cpuinit smp_store_cpu_info(int id)
static void __cpuinit smp_apply_quirks(struct cpuinfo_x86 *c)
{
struct cpuinfo_x86 *c = &cpu_data(id);

*c = boot_cpu_data;
c->cpu_index = id;
if (id!=0)
identify_secondary_cpu(c);
/*
* Mask B, Pentium, but not Pentium MMX
*/
Expand Down Expand Up @@ -138,6 +127,23 @@ void __cpuinit smp_store_cpu_info(int id)

valid_k7:
;

}

/*
* The bootstrap kernel entry code has set these up. Save them for
* a given CPU
*/

void __cpuinit smp_store_cpu_info(int id)
{
struct cpuinfo_x86 *c = &cpu_data(id);

*c = boot_cpu_data;
c->cpu_index = id;
if (id != 0)
identify_secondary_cpu(c);
smp_apply_quirks(c);
}

static atomic_t init_deasserted;
Expand Down

0 comments on commit 8238987

Please sign in to comment.