Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73e907de authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: remove x86 cpumask_t uses. 



Impact: cleanup

We are removing cpumask_t in favour of struct cpumask: mainly as a
marker of what code is now CONFIG_CPUMASK_OFFSTACK-safe.

The only non-trivial change here is vector_allocation_domain():
explicitly clear the mask and set the first word, rather than using
assignment.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 76ba0ecd

arch/x86/include/asm/topology.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ static inline int early_cpu_to_node(int cpu) 
extern cpumask_var_t node_to_cpumask_map[MAX_NUMNODES];

extern cpumask_var_t node_to_cpumask_map[MAX_NUMNODES];





#ifdef CONFIG_DEBUG_PER_CPU_MAPS

#ifdef CONFIG_DEBUG_PER_CPU_MAPS

extern const cpumask_t *cpumask_of_node(int node);

extern const struct cpumask *cpumask_of_node(int node);

#else

#else

/* Returns a pointer to the cpumask of CPUs on Node 'node'. */

/* Returns a pointer to the cpumask of CPUs on Node 'node'. */

static inline const struct cpumask *cpumask_of_node(int node)

static inline const struct cpumask *cpumask_of_node(int node)
@@ -172,7 +172,7 @@ static inline int early_cpu_to_node(int cpu) 
	return 0;

	return 0;

}

}





static inline const cpumask_t *cpumask_of_node(int node)

static inline const struct cpumask *cpumask_of_node(int node)

{

{

	return cpu_online_mask;

	return cpu_online_mask;

}

}

arch/x86/kernel/apic/es7000_32.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -410,7 +410,7 @@ static void es7000_enable_apic_mode(void) 
		WARN(1, "Command failed, status = %x\n", mip_status);

		WARN(1, "Command failed, status = %x\n", mip_status);

}

}





static void es7000_vector_allocation_domain(int cpu, cpumask_t *retmask)

static void es7000_vector_allocation_domain(int cpu, struct cpumask *retmask)

{

{

	/* Careful. Some cpus do not strictly honor the set of cpus

	/* Careful. Some cpus do not strictly honor the set of cpus

	 * specified in the interrupt destination when using lowest

	 * specified in the interrupt destination when using lowest
@@ -456,7 +456,7 @@ static int es7000_apic_id_registered(void) 
	return 1;

	return 1;

}

}





static const cpumask_t *target_cpus_cluster(void)

static const struct cpumask *target_cpus_cluster(void)

{

{

	return cpu_all_mask;

	return cpu_all_mask;

}

}
@@ -573,7 +573,7 @@ static int es7000_check_phys_apicid_present(int cpu_physical_apicid) 
	return 1;

	return 1;

}

}





static unsigned int es7000_cpu_mask_to_apicid(const cpumask_t *cpumask)

static unsigned int es7000_cpu_mask_to_apicid(const struct cpumask *cpumask)

{

{

	unsigned int round = 0;

	unsigned int round = 0;

	int cpu, uninitialized_var(apicid);

	int cpu, uninitialized_var(apicid);

arch/x86/kernel/apic/numaq_32.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -334,7 +334,7 @@ static inline void numaq_smp_callin_clear_local_apic(void) 
	clear_local_APIC();

	clear_local_APIC();

}

}





static inline const cpumask_t *numaq_target_cpus(void)

static inline const struct cpumask *numaq_target_cpus(void)

{

{

	return cpu_all_mask;

	return cpu_all_mask;

}

}
@@ -427,7 +427,7 @@ static inline int numaq_check_phys_apicid_present(int boot_cpu_physical_apicid) 
 * We use physical apicids here, not logical, so just return the default

 * We use physical apicids here, not logical, so just return the default

 * physical broadcast to stop people from breaking us

 * physical broadcast to stop people from breaking us

 */

 */

static inline unsigned int numaq_cpu_mask_to_apicid(const cpumask_t *cpumask)

static unsigned int numaq_cpu_mask_to_apicid(const struct cpumask *cpumask)

{

{

	return 0x0F;

	return 0x0F;

}

}
@@ -462,7 +462,7 @@ static int probe_numaq(void) 
	return found_numaq;

	return found_numaq;

}

}





static void numaq_vector_allocation_domain(int cpu, cpumask_t *retmask)

static void numaq_vector_allocation_domain(int cpu, struct cpumask *retmask)

{

{

	/* Careful. Some cpus do not strictly honor the set of cpus

	/* Careful. Some cpus do not strictly honor the set of cpus

	 * specified in the interrupt destination when using lowest

	 * specified in the interrupt destination when using lowest

arch/x86/kernel/apic/summit_32.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -182,7 +182,7 @@ static inline int is_WPEG(struct rio_detail *rio){ 




#define SUMMIT_APIC_DFR_VALUE	(APIC_DFR_CLUSTER)

#define SUMMIT_APIC_DFR_VALUE	(APIC_DFR_CLUSTER)





static const cpumask_t *summit_target_cpus(void)

static const struct cpumask *summit_target_cpus(void)

{

{

	/* CPU_MASK_ALL (0xff) has undefined behaviour with

	/* CPU_MASK_ALL (0xff) has undefined behaviour with

	 * dest_LowestPrio mode logical clustered apic interrupt routing

	 * dest_LowestPrio mode logical clustered apic interrupt routing
@@ -285,7 +285,7 @@ static int summit_check_phys_apicid_present(int boot_cpu_physical_apicid) 
	return 1;

	return 1;

}

}





static unsigned int summit_cpu_mask_to_apicid(const cpumask_t *cpumask)

static unsigned int summit_cpu_mask_to_apicid(const struct cpumask *cpumask)

{

{

	unsigned int round = 0;

	unsigned int round = 0;

	int cpu, apicid = 0;

	int cpu, apicid = 0;
@@ -342,7 +342,7 @@ static int probe_summit(void) 
	return 0;

	return 0;

}

}





static void summit_vector_allocation_domain(int cpu, cpumask_t *retmask)

static void summit_vector_allocation_domain(int cpu, struct cpumask *retmask)

{

{

	/* Careful. Some cpus do not strictly honor the set of cpus

	/* Careful. Some cpus do not strictly honor the set of cpus

	 * specified in the interrupt destination when using lowest

	 * specified in the interrupt destination when using lowest

arch/x86/mm/numa.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ void __init setup_node_to_cpumask_map(void) 
/*

/*

 * Returns a pointer to the bitmask of CPUs on Node 'node'.

 * Returns a pointer to the bitmask of CPUs on Node 'node'.

 */

 */

const cpumask_t *cpumask_of_node(int node)

const struct cpumask *cpumask_of_node(int node)

{

{

	if (node >= nr_node_ids) {

	if (node >= nr_node_ids) {

		printk(KERN_WARNING

		printk(KERN_WARNING