Commit 3f57a318 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, apic: clean up ->apicid_to_node() 



- separate the namespace

 - remove macros

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 33a201fa

arch/x86/include/asm/bigsmp/apic.h

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static inline void bigsmp_setup_apic_routing(void) 
		"Physflat", nr_ioapics);

}



static inline int apicid_to_node(int logical_apicid)

static inline int bigsmp_apicid_to_node(int logical_apicid)

{

	return apicid_2_node[hard_smp_processor_id()];

}

arch/x86/include/asm/es7000/apic.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static inline void es7000_setup_apic_routing(void) 
			nr_ioapics, cpus_addr(*es7000_target_cpus())[0]);

}



static inline int apicid_to_node(int logical_apicid)

static inline int es7000_apicid_to_node(int logical_apicid)

{

	return 0;

}

arch/x86/include/asm/mach-default/mach_apic.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static inline void default_setup_apic_routing(void) 
#endif

}



static inline int apicid_to_node(int logical_apicid)

static inline int default_apicid_to_node(int logical_apicid)

{

#ifdef CONFIG_SMP

	return apicid_2_node[hard_smp_processor_id()];

arch/x86/include/asm/mach-generic/mach_apic.h

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 


#include <asm/genapic.h>



#define apicid_to_node (apic->apicid_to_node)

#define cpu_to_logical_apicid (apic->cpu_to_logical_apicid) 

#define cpu_present_to_apicid (apic->cpu_present_to_apicid)

#define apicid_to_cpu_present (apic->apicid_to_cpu_present)

arch/x86/include/asm/numaq/apic.h

+2 −2
Original line number Diff line number Diff line
@@ -76,14 +76,14 @@ static inline int cpu_present_to_apicid(int mps_cpu) 
		return BAD_APICID;

}



static inline int apicid_to_node(int logical_apicid) 

static inline int numaq_apicid_to_node(int logical_apicid) 

{

	return logical_apicid >> 4;

}



static inline physid_mask_t apicid_to_cpu_present(int logical_apicid)

{

	int node = apicid_to_node(logical_apicid);

	int node = numaq_apicid_to_node(logical_apicid);

	int cpu = __ffs(logical_apicid & 0xf);



	return physid_mask_of_physid(cpu + 4*node);