diff options
author | Glauber Costa <gcosta@redhat.com> | 2008-03-03 12:12:57 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:40:56 -0400 |
commit | 5382e89670399f9db8a58b3c6f850fa4a94f6cca (patch) | |
tree | 8106996ab3c1d5c2e6880fc87c050ac884914a21 /arch | |
parent | fe6762030ca3728d3e24b556676114a6a64a97be (diff) |
x86: adjust types in smpcommon_32.c
so they can have the same type as x86_64
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/smpboot_32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c index 579b9b740c7c..5a446f079b33 100644 --- a/arch/x86/kernel/smpboot_32.c +++ b/arch/x86/kernel/smpboot_32.c | |||
@@ -67,7 +67,7 @@ int smp_num_siblings = 1; | |||
67 | EXPORT_SYMBOL(smp_num_siblings); | 67 | EXPORT_SYMBOL(smp_num_siblings); |
68 | 68 | ||
69 | /* Last level cache ID of each logical CPU */ | 69 | /* Last level cache ID of each logical CPU */ |
70 | DEFINE_PER_CPU(u8, cpu_llc_id) = BAD_APICID; | 70 | DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID; |
71 | 71 | ||
72 | /* representing HT siblings of each logical CPU */ | 72 | /* representing HT siblings of each logical CPU */ |
73 | DEFINE_PER_CPU(cpumask_t, cpu_sibling_map); | 73 | DEFINE_PER_CPU(cpumask_t, cpu_sibling_map); |
@@ -92,10 +92,10 @@ DEFINE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info); | |||
92 | EXPORT_PER_CPU_SYMBOL(cpu_info); | 92 | EXPORT_PER_CPU_SYMBOL(cpu_info); |
93 | 93 | ||
94 | /* which logical CPU number maps to which CPU (physical APIC ID) */ | 94 | /* which logical CPU number maps to which CPU (physical APIC ID) */ |
95 | u8 x86_cpu_to_apicid_init[NR_CPUS] __initdata = | 95 | u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata = |
96 | { [0 ... NR_CPUS-1] = BAD_APICID }; | 96 | { [0 ... NR_CPUS-1] = BAD_APICID }; |
97 | void *x86_cpu_to_apicid_early_ptr; | 97 | void *x86_cpu_to_apicid_early_ptr; |
98 | DEFINE_PER_CPU(u8, x86_cpu_to_apicid) = BAD_APICID; | 98 | DEFINE_PER_CPU(u16, x86_cpu_to_apicid) = BAD_APICID; |
99 | EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid); | 99 | EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid); |
100 | 100 | ||
101 | u8 apicid_2_node[MAX_APICID]; | 101 | u8 apicid_2_node[MAX_APICID]; |