diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2007-10-26 12:17:19 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-27 20:57:43 +0200 |
| commit | 0cca1ca647d87c2c0b0d76d2f32683ce34d54989 (patch) | |
| tree | 214689682eb77f983e0859b32692b7335e58e8f7 /arch/x86/mach-voyager | |
| parent | 027447c4913c8fd6f91092b92dfa07eec91f009d (diff) | |
| download | linux-0cca1ca647d87c2c0b0d76d2f32683ce34d54989.tar.gz linux-0cca1ca647d87c2c0b0d76d2f32683ce34d54989.tar.bz2 linux-0cca1ca647d87c2c0b0d76d2f32683ce34d54989.zip | |
x86: voyager: fix bogus conversion to per_cpu for boot_cpu_info
There were two problems. Firstly, someone forgot the struct keyword in
front of cpuinfo_x86, so I take it this wasn't even compile checked.
Secondly, the actual definition has this as a SHARED_ALIGNED, so the
definitions mismatch.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/mach-voyager')
| -rw-r--r-- | arch/x86/mach-voyager/voyager_smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c index 361ac5107b33..69371434b0cf 100644 --- a/arch/x86/mach-voyager/voyager_smp.c +++ b/arch/x86/mach-voyager/voyager_smp.c @@ -29,14 +29,14 @@ #include <asm/arch_hooks.h> /* TLB state -- visible externally, indexed physically */ -DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate) ____cacheline_aligned = { &init_mm, 0 }; +DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate) = { &init_mm, 0 }; /* CPU IRQ affinity -- set to all ones initially */ static unsigned long cpu_irq_affinity[NR_CPUS] __cacheline_aligned = { [0 ... NR_CPUS-1] = ~0UL }; /* per CPU data structure (for /proc/cpuinfo et al), visible externally * indexed physically */ -DEFINE_PER_CPU(cpuinfo_x86, cpu_info) __cacheline_aligned; +DEFINE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info); EXPORT_PER_CPU_SYMBOL(cpu_info); /* physical ID of the CPU used to boot the system */ |