Commit 5257c511 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, apic: clean up ->cpu_to_logical_apicid() 



- separate the namespace

 - remove macros

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

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

+3 −3
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static inline physid_mask_t apicid_to_cpu_present(int phys_apicid) 


extern u8 cpu_2_logical_apicid[];

/* Mapping from cpu number to logical apicid */

static inline int cpu_to_logical_apicid(int cpu)

static inline int bigsmp_cpu_to_logical_apicid(int cpu)

{

	if (cpu >= nr_cpu_ids)

		return BAD_APICID;
@@ -115,7 +115,7 @@ static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) 
	int apicid;	



	cpu = first_cpu(*cpumask);

	apicid = cpu_to_logical_apicid(cpu);

	apicid = bigsmp_cpu_to_logical_apicid(cpu);

	return apicid;

}
@@ -132,7 +132,7 @@ static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask, 
		if (cpumask_test_cpu(cpu, cpu_online_mask))

			break;

	if (cpu < nr_cpu_ids)

		return cpu_to_logical_apicid(cpu);

		return bigsmp_cpu_to_logical_apicid(cpu);



	return BAD_APICID;

}

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

+8 −8
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static inline physid_mask_t apicid_to_cpu_present(int phys_apicid) 


extern u8 cpu_2_logical_apicid[];

/* Mapping from cpu number to logical apicid */

static inline int cpu_to_logical_apicid(int cpu)

static inline int es7000_cpu_to_logical_apicid(int cpu)

{

#ifdef CONFIG_SMP

	if (cpu >= nr_cpu_ids)
@@ -155,10 +155,10 @@ cpu_mask_to_apicid_cluster(const struct cpumask *cpumask) 
	 * on the same apicid cluster return default value of target_cpus():

	 */

	cpu = cpumask_first(cpumask);

	apicid = cpu_to_logical_apicid(cpu);

	apicid = es7000_cpu_to_logical_apicid(cpu);

	while (cpus_found < num_bits_set) {

		if (cpumask_test_cpu(cpu, cpumask)) {

			int new_apicid = cpu_to_logical_apicid(cpu);

			int new_apicid = es7000_cpu_to_logical_apicid(cpu);

			if (apicid_cluster(apicid) !=

					apicid_cluster(new_apicid)){

				printk ("%s: Not a valid mask!\n", __func__);
@@ -182,20 +182,20 @@ static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) 
	num_bits_set = cpus_weight(*cpumask);

	/* Return id to all */

	if (num_bits_set == nr_cpu_ids)

		return cpu_to_logical_apicid(0);

		return es7000_cpu_to_logical_apicid(0);

	/*

	 * The cpus in the mask must all be on the apic cluster.  If are not

	 * on the same apicid cluster return default value of target_cpus():

	 */

	cpu = first_cpu(*cpumask);

	apicid = cpu_to_logical_apicid(cpu);

	apicid = es7000_cpu_to_logical_apicid(cpu);

	while (cpus_found < num_bits_set) {

		if (cpu_isset(cpu, *cpumask)) {

			int new_apicid = cpu_to_logical_apicid(cpu);

			int new_apicid = es7000_cpu_to_logical_apicid(cpu);

			if (apicid_cluster(apicid) !=

					apicid_cluster(new_apicid)){

				printk ("%s: Not a valid mask!\n", __func__);

				return cpu_to_logical_apicid(0);

				return es7000_cpu_to_logical_apicid(0);

			}

			apicid = new_apicid;

			cpus_found++;
@@ -209,7 +209,7 @@ static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) 
static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *inmask,

						  const struct cpumask *andmask)

{

	int apicid = cpu_to_logical_apicid(0);

	int apicid = es7000_cpu_to_logical_apicid(0);

	cpumask_var_t cpumask;



	if (!alloc_cpumask_var(&cpumask, GFP_ATOMIC))

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

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static inline physid_mask_t default_ioapic_phys_id_map(physid_mask_t phys_map) 
}



/* Mapping from cpu number to logical apicid */

static inline int cpu_to_logical_apicid(int cpu)

static inline int default_cpu_to_logical_apicid(int cpu)

{

	return 1 << cpu;

}

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_to_logical_apicid (apic->cpu_to_logical_apicid) 

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

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

+2 −1
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ static inline physid_mask_t numaq_ioapic_phys_id_map(physid_mask_t phys_map) 


/* Mapping from cpu number to logical apicid */

extern u8 cpu_2_logical_apicid[];

static inline int cpu_to_logical_apicid(int cpu)



static inline int numaq_cpu_to_logical_apicid(int cpu)

{

	if (cpu >= nr_cpu_ids)

		return BAD_APICID;