Commit 7ed248da authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: clean up apic->apic_id_registered() methods 



Impact: cleanup

x86 subarchitectures each defined a "apic_id_registered()" method,
which could be an inline function depending on which subarch we build
for, and which was also the name of a genapic field.

Untangle this namespace spaghetti by giving each of the instances
a separate name.

Also remove wrapper macro obfuscation.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 
#define xapic_phys_to_log_apicid(cpu) (per_cpu(x86_bios_cpu_apicid, cpu))

#define esr_disable (1)



static inline int apic_id_registered(void)

static inline int bigsmp_apic_id_registered(void)

{

	return (1);

	return 1;

}



static inline const cpumask_t *target_cpus(void)

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

+2 −2
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ 
#define xapic_phys_to_log_apicid(cpu) per_cpu(x86_bios_cpu_apicid, cpu)

#define esr_disable (1)



static inline int apic_id_registered(void)

static inline int es7000_apic_id_registered(void)

{

	        return (1);

	        return 1;

}



static inline const cpumask_t *target_cpus_cluster(void)

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

+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ static inline const struct cpumask *target_cpus(void) 
#define INT_DELIVERY_MODE (apic->int_delivery_mode)

#define INT_DEST_MODE (apic->int_dest_mode)

#define TARGET_CPUS	  (apic->target_cpus())

#define apic_id_registered (apic->apic_id_registered)

#define init_apic_ldr (apic->init_apic_ldr)

#define cpu_mask_to_apicid (apic->cpu_mask_to_apicid)

#define cpu_mask_to_apicid_and (apic->cpu_mask_to_apicid_and)
@@ -57,7 +56,7 @@ static inline void init_apic_ldr(void) 
	apic_write(APIC_LDR, val);

}



static inline int apic_id_registered(void)

static inline int default_apic_id_registered(void)

{

	return physid_isset(read_apic_id(), phys_cpu_present_map);

}

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

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#undef APIC_DEST_LOGICAL

#define APIC_DEST_LOGICAL (apic->apic_destination_logical)

#define TARGET_CPUS	  (apic->target_cpus())

#define apic_id_registered (apic->apic_id_registered)

#define init_apic_ldr (apic->init_apic_ldr)

#define ioapic_phys_id_map (apic->ioapic_phys_id_map)

#define setup_apic_routing (apic->setup_apic_routing)

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

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static inline unsigned long check_apicid_present(int bit) 
}

#define apicid_cluster(apicid) (apicid & 0xF0)



static inline int apic_id_registered(void)

static inline int numaq_apic_id_registered(void)

{

	return 1;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE