Commit a21769a4 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, apic: clean up ->cpu_present_to_apicid() 



- separate the namespace

 - remove macros

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

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

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static inline int bigsmp_apicid_to_node(int logical_apicid) 
	return apicid_2_node[hard_smp_processor_id()];

}



static inline int cpu_present_to_apicid(int mps_cpu)

static inline int bigsmp_cpu_present_to_apicid(int mps_cpu)

{

	if (mps_cpu < nr_cpu_ids)

		return (int) per_cpu(x86_bios_cpu_apicid, mps_cpu);

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

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static inline int es7000_apicid_to_node(int logical_apicid) 
}





static inline int cpu_present_to_apicid(int mps_cpu)

static inline int es7000_cpu_present_to_apicid(int mps_cpu)

{

	if (!mps_cpu)

		return boot_cpu_physical_apicid;

arch/x86/include/asm/genapic.h

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ extern struct genapic apic_x2apic_uv_x; 
DECLARE_PER_CPU(int, x2apic_extra_bits);



extern void default_setup_apic_routing(void);



extern int default_cpu_present_to_apicid(int mps_cpu);

#endif



#endif /* _ASM_X86_GENAPIC_64_H */

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

+10 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static inline int default_cpu_to_logical_apicid(int cpu) 
	return 1 << cpu;

}



static inline int cpu_present_to_apicid(int mps_cpu)

static inline int __default_cpu_present_to_apicid(int mps_cpu)

{

	if (mps_cpu < nr_cpu_ids && cpu_present(mps_cpu))

		return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu);
@@ -118,6 +118,15 @@ static inline int cpu_present_to_apicid(int mps_cpu) 
		return BAD_APICID;

}



#ifdef CONFIG_X86_32

static inline int default_cpu_present_to_apicid(int mps_cpu)

{

	return __default_cpu_present_to_apicid(mps_cpu);

}

#else

extern int default_cpu_present_to_apicid(int mps_cpu);

#endif



static inline physid_mask_t 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 cpu_present_to_apicid (apic->cpu_present_to_apicid)

#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)