Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 88785
b: refs/heads/master
c: 8238987
h: refs/heads/master
i:
  88783: 68cf124
v: v3
  • Loading branch information
Glauber de Oliveira Costa authored and Ingo Molnar committed Apr 17, 2008
1 parent 37bebd2 commit e30d87c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d0173aeac4f7fa90a63319b817bd207bdc0ac87e
refs/heads/master: 82389871b89467b4478e02d13be2f776e0138b5b
30 changes: 18 additions & 12 deletions trunk/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 e30d87c

Please sign in to comment.