Commit ccf82085 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: initialize map pointers in setup_32.c 



this will serve as a reference as to whether or not to
use the per_cpu variables in mpparse. Done the same way
as x86_64

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

arch/x86/kernel/setup_32.c

+24 −0
Original line number Original line Diff line number Diff line
@@ -722,6 +722,18 @@ char * __init __attribute__((weak)) memory_setup(void) 
	return machine_specific_memory_setup();

	return machine_specific_memory_setup();

}

}





#ifdef CONFIG_NUMA

/*

 * In the golden day, when everything among i386 and x86_64 will be

 * integrated, this will not live here

 */

void *x86_cpu_to_node_map_early_ptr;

int x86_cpu_to_node_map_init[NR_CPUS] = {

	[0 ... NR_CPUS-1] = NUMA_NO_NODE

};

DEFINE_PER_CPU(int, x86_cpu_to_node_map) = NUMA_NO_NODE;

#endif



/*

/*

 * Determine if we were loaded by an EFI loader.  If so, then we have also been

 * Determine if we were loaded by an EFI loader.  If so, then we have also been

 * passed the efi memmap, systab, etc., so we should use these data structures

 * passed the efi memmap, systab, etc., so we should use these data structures
@@ -855,6 +867,18 @@ void __init setup_arch(char **cmdline_p) 




	io_delay_init();

	io_delay_init();





#ifdef CONFIG_X86_SMP

	/*

	 * setup to use the early static init tables during kernel startup

	 * X86_SMP will exclude sub-arches that don't deal well with it.

	 */

	x86_cpu_to_apicid_early_ptr = (void *)x86_cpu_to_apicid_init;

	x86_bios_cpu_apicid_early_ptr = (void *)x86_bios_cpu_apicid_init;

#ifdef CONFIG_NUMA

	x86_cpu_to_node_map_early_ptr = (void *)x86_cpu_to_node_map_init;

#endif

#endif



#ifdef CONFIG_X86_GENERICARCH

#ifdef CONFIG_X86_GENERICARCH

	generic_apic_probe();

	generic_apic_probe();

#endif

#endif