Commit 8058714a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, apic: clean up ->apicid_to_cpu_present() 



- separate the namespace

 - remove macros

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

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

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static inline int bigsmp_cpu_present_to_apicid(int mps_cpu) 
	return BAD_APICID;

}



static inline physid_mask_t apicid_to_cpu_present(int phys_apicid)

static inline physid_mask_t bigsmp_apicid_to_cpu_present(int phys_apicid)

{

	return physid_mask_of_physid(phys_apicid);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static inline int es7000_cpu_present_to_apicid(int mps_cpu) 
		return BAD_APICID;

}



static inline physid_mask_t apicid_to_cpu_present(int phys_apicid)

static inline physid_mask_t es7000_apicid_to_cpu_present(int phys_apicid)

{

	static int id = 0;

	physid_mask_t mask;

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

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static inline int default_cpu_present_to_apicid(int mps_cpu) 
extern int default_cpu_present_to_apicid(int mps_cpu);

#endif



static inline physid_mask_t apicid_to_cpu_present(int phys_apicid)

static inline physid_mask_t default_apicid_to_cpu_present(int phys_apicid)

{

	return physid_mask_of_physid(phys_apicid);

}

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_cpu_present (apic->apicid_to_cpu_present)

#define setup_portio_remap (apic->setup_portio_remap)

#define check_phys_apicid_present (apic->check_phys_apicid_present)

#define cpu_mask_to_apicid (apic->cpu_mask_to_apicid)

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

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 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)

static inline physid_mask_t numaq_apicid_to_cpu_present(int logical_apicid)

{

	int node = numaq_apicid_to_node(logical_apicid);

	int cpu = __ffs(logical_apicid & 0xf);