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

Commit c4bd1fda authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Ingo Molnar
Browse files

x86: fix section mismatch warning - uv_cpu_init 



WARNING: vmlinux.o(.cpuinit.text+0x3cc4): Section mismatch in reference from the function uv_cpu_init() to the function .init.text:uv_system_init()
The function __cpuinit uv_cpu_init() references
a function __init uv_system_init().
If uv_system_init is only used by uv_cpu_init then
annotate uv_system_init with a matching annotation.

uv_system_init was ment to be called only once, so do it from codepath
(native_smp_prepare_cpus) which is called once, right before activation
of other cpus (smp_init).

Note: old code relied on uv_node_to_blade being initialized to 0,
but it'a not initialized from anywhere.

Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Acked-by: default avatarJack Steiner <steiner@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3a6ddd5f

arch/x86/kernel/genx2apic_uv_x.c

+5 −3
Original line number Diff line number Diff line
@@ -293,7 +293,9 @@ static __init void uv_rtc_init(void) 
		sn_rtc_cycles_per_second = ticks_per_sec;

}



static __init void uv_system_init(void)

static bool uv_system_inited;



void __init uv_system_init(void)

{

	union uvh_si_addr_map_config_u m_n_config;

	union uvh_node_id_u node_id;
@@ -383,6 +385,7 @@ static __init void uv_system_init(void) 
	map_mmr_high(max_pnode);

	map_config_high(max_pnode);

	map_mmioh_high(max_pnode);

	uv_system_inited = true;

}



/*
@@ -391,8 +394,7 @@ static __init void uv_system_init(void) 
 */

void __cpuinit uv_cpu_init(void)

{

	if (!uv_node_to_blade)

		uv_system_init();

	BUG_ON(!uv_system_inited);



	uv_blade_info[uv_numa_blade_id()].nr_online_cpus++;

arch/x86/kernel/smpboot.c

+3 −0
Original line number Diff line number Diff line
@@ -1221,6 +1221,9 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) 
	printk(KERN_INFO "CPU%d: ", 0);

	print_cpu_info(&cpu_data(0));

	setup_boot_clock();



	if (is_uv_system())

		uv_system_init();

out:

	preempt_enable();

}

include/asm-x86/genapic_32.h

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC}; 
#define get_uv_system_type()		UV_NONE

#define is_uv_system()			0

#define uv_wakeup_secondary(a, b)	1

#define uv_system_init()		do {} while (0)





#endif

include/asm-x86/genapic_64.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ extern int is_uv_system(void); 
extern struct genapic apic_x2apic_uv_x;

DECLARE_PER_CPU(int, x2apic_extra_bits);

extern void uv_cpu_init(void);

extern void uv_system_init(void);

extern int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip);



extern void setup_apic_routing(void);