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

x86, apic: clean up ->ioapic_phys_id_map() 



- separate the namespace

 - remove macros

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

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

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static inline int cpu_to_logical_apicid(int cpu) 
	return cpu_physical_id(cpu);

}



static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map)

static inline physid_mask_t bigsmp_ioapic_phys_id_map(physid_mask_t phys_map)

{

	/* For clustered we don't have a good way to do this yet - hack */

	return physids_promote(0xFFL);

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

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static inline int cpu_to_logical_apicid(int cpu) 
#endif

}



static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map)

static inline physid_mask_t es7000_ioapic_phys_id_map(physid_mask_t phys_map)

{

	/* For clustered we don't have a good way to do this yet - hack */

	return physids_promote(0xff);

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

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static inline unsigned long default_check_apicid_present(int bit) 
	return physid_isset(bit, phys_cpu_present_map);

}



static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map)

static inline physid_mask_t default_ioapic_phys_id_map(physid_mask_t phys_map)

{

	return phys_map;

}

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 ioapic_phys_id_map (apic->ioapic_phys_id_map)

#define setup_apic_routing (apic->setup_apic_routing)

#define multi_timer_check (apic->multi_timer_check)

#define apicid_to_node (apic->apicid_to_node)

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

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static inline int multi_timer_check(int apic, int irq) 
	return apic != 0 && irq == 0;

}



static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map)

static inline physid_mask_t numaq_ioapic_phys_id_map(physid_mask_t phys_map)

{

	/* We don't have a good way to do this yet - hack */

	return physids_promote(0xFUL);