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

Commit 5382e896 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: adjust types in smpcommon_32.c 



so they can have the same type as x86_64

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent fe676203

arch/x86/kernel/smpboot_32.c

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ int smp_num_siblings = 1; 
EXPORT_SYMBOL(smp_num_siblings);



/* Last level cache ID of each logical CPU */

DEFINE_PER_CPU(u8, cpu_llc_id) = BAD_APICID;

DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID;



/* representing HT siblings of each logical CPU */

DEFINE_PER_CPU(cpumask_t, cpu_sibling_map);
@@ -92,10 +92,10 @@ DEFINE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info); 
EXPORT_PER_CPU_SYMBOL(cpu_info);



/* which logical CPU number maps to which CPU (physical APIC ID) */

u8 x86_cpu_to_apicid_init[NR_CPUS] __initdata =

u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata =

			{ [0 ... NR_CPUS-1] = BAD_APICID };

void *x86_cpu_to_apicid_early_ptr;

DEFINE_PER_CPU(u8, x86_cpu_to_apicid) = BAD_APICID;

DEFINE_PER_CPU(u16, x86_cpu_to_apicid) = BAD_APICID;

EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid);



u8 apicid_2_node[MAX_APICID];

include/asm-x86/smp_32.h

+3 −3
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ extern cpumask_t cpu_callin_map; 
extern void (*mtrr_hook) (void);

extern void zap_low_mappings (void);



extern u8 __initdata x86_cpu_to_apicid_init[];

extern u16 __initdata x86_cpu_to_apicid_init[];

extern void *x86_cpu_to_apicid_early_ptr;



DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);

DECLARE_PER_CPU(cpumask_t, cpu_core_map);

DECLARE_PER_CPU(u8, cpu_llc_id);

DECLARE_PER_CPU(u8, x86_cpu_to_apicid);

DECLARE_PER_CPU(u16, cpu_llc_id);

DECLARE_PER_CPU(u16, x86_cpu_to_apicid);



#ifdef CONFIG_HOTPLUG_CPU

extern void cpu_exit_clear(void);