Commit 0a9cc20b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, apic: clean up target_cpus methods 



Impact: cleanup

Clean up all the target_cpus() namespace overlap that exists
between bigsmp, es7000, mach-default, numaq and summit - by
separating the different functions into different names.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ static inline int bigsmp_apic_id_registered(void) 
	return 1;

}



static inline const cpumask_t *target_cpus(void)

static inline const cpumask_t *bigsmp_target_cpus(void)

{

#ifdef CONFIG_SMP

	return &cpu_online_map;

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

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ static inline const cpumask_t *target_cpus_cluster(void) 
	return &CPU_MASK_ALL;

}



static inline const cpumask_t *target_cpus(void)

static inline const cpumask_t *es7000_target_cpus(void)

{

	return &cpumask_of_cpu(smp_processor_id());

}
@@ -83,7 +83,7 @@ static inline void setup_apic_routing(void) 
	printk("Enabling APIC mode:  %s. Using %d I/O APICs, target cpus %lx\n",

		(apic_version[apic] == 0x14) ?

			"Physical Cluster" : "Logical Cluster",

			nr_ioapics, cpus_addr(*target_cpus())[0]);

			nr_ioapics, cpus_addr(*es7000_target_cpus())[0]);

}



static inline int multi_timer_check(int apic, int irq)

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

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#define APIC_DFR_VALUE	(APIC_DFR_FLAT)



static inline const struct cpumask *target_cpus(void)

static inline const struct cpumask *default_target_cpus(void)

{ 

#ifdef CONFIG_SMP

	return cpu_online_mask;
@@ -33,7 +33,7 @@ static inline const struct cpumask *target_cpus(void) 
#define wakeup_secondary_cpu (apic->wakeup_cpu)

extern void setup_apic_routing(void);

#else

#define TARGET_CPUS (target_cpus())

#define TARGET_CPUS (default_target_cpus())

#define wakeup_secondary_cpu wakeup_secondary_cpu_via_init

/*

 * Set up the logical destination ID.

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


#define APIC_DFR_VALUE	(APIC_DFR_CLUSTER)



static inline const cpumask_t *target_cpus(void)

static inline const cpumask_t *numaq_target_cpus(void)

{

	return &CPU_MASK_ALL;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#define APIC_DFR_VALUE	(APIC_DFR_CLUSTER)



static inline const cpumask_t *target_cpus(void)

static inline const cpumask_t *summit_target_cpus(void)

{

	/* CPU_MASK_ALL (0xff) has undefined behaviour with

	 * dest_LowestPrio mode logical clustered apic interrupt routing

CRA Git | Maintained and supported by SUSTech CRA and CCSE