Commit 8da077d6 authored by Jack Steiner's avatar Jack Steiner Committed by Ingo Molnar
Browse files

x86, uv: fix ordering of calls to uv_system_init & uv_cpu_init 



Fix problem caused by reordering of the calls to uv_cpu_init() &
uv_system_init. Originally, uv_cpu_init() was called AFTER uv_system_init.
This order was recently broken as a side-effect of other patches.

With this patch, initialization of cpu 0 is now done by the system_init
call.

Signed-off-by: default avatarJack Steiner <steiner@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5ffa4eb2

arch/x86/kernel/genx2apic_uv_x.c

+17 −17
Original line number Diff line number Diff line
@@ -356,7 +356,22 @@ static __init void uv_rtc_init(void) 
		sn_rtc_cycles_per_second = ticks_per_sec;

}



static bool uv_system_inited;

/*

 * Called on each cpu to initialize the per_cpu UV data area.

 * 	ZZZ hotplug not supported yet

 */

void __cpuinit uv_cpu_init(void)

{

	/* CPU 0 initilization will be done via uv_system_init. */

	if (!uv_blade_info)

		return;



	uv_blade_info[uv_numa_blade_id()].nr_online_cpus++;



	if (get_uv_system_type() == UV_NON_UNIQUE_APIC)

		set_x2apic_extra_bits(uv_hub_info->pnode);

}





void __init uv_system_init(void)

{
@@ -448,21 +463,6 @@ void __init uv_system_init(void) 
	map_mmr_high(max_pnode);

	map_config_high(max_pnode);

	map_mmioh_high(max_pnode);

	uv_system_inited = true;

}



/*

 * Called on each cpu to initialize the per_cpu UV data area.

 * 	ZZZ hotplug not supported yet

 */

void __cpuinit uv_cpu_init(void)

{

	BUG_ON(!uv_system_inited);



	uv_blade_info[uv_numa_blade_id()].nr_online_cpus++;



	if (get_uv_system_type() == UV_NON_UNIQUE_APIC)

		set_x2apic_extra_bits(uv_hub_info->pnode);

	uv_cpu_init();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE