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

Commit bcda016e authored by Mike Travis's avatar Mike Travis
Browse files

x86: cosmetic changes apic-related files. 



This patch simply changes cpumask_t to struct cpumask and similar
trivial modernizations.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
parent d7b381bb

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

+5 −9
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_IPI_H

#define __ASM_MACH_IPI_H



void send_IPI_mask_sequence(const cpumask_t *mask, int vector);

void send_IPI_mask_allbutself(const cpumask_t *mask, int vector);

void send_IPI_mask_sequence(const struct cpumask *mask, int vector);

void send_IPI_mask_allbutself(const struct cpumask *mask, int vector);



static inline void send_IPI_mask(const cpumask_t *mask, int vector)

static inline void send_IPI_mask(const struct cpumask *mask, int vector)

{

	send_IPI_mask_sequence(mask, vector);

}



static inline void send_IPI_allbutself(int vector)

{

	cpumask_t mask = cpu_online_map;

	cpu_clear(smp_processor_id(), mask);



	if (!cpus_empty(mask))

		send_IPI_mask(&mask, vector);

	send_IPI_mask_allbutself(cpu_online_mask, vector);

}



static inline void send_IPI_all(int vector)

{

	send_IPI_mask(&cpu_online_map, vector);

	send_IPI_mask(cpu_online_mask, vector);

}



#endif /* __ASM_MACH_IPI_H */

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

+5 −8
Original line number Diff line number Diff line 
#ifndef __ASM_ES7000_IPI_H

#define __ASM_ES7000_IPI_H



void send_IPI_mask_sequence(const cpumask_t *mask, int vector);

void send_IPI_mask_allbutself(const cpumask_t *mask, int vector);

void send_IPI_mask_sequence(const struct cpumask *mask, int vector);

void send_IPI_mask_allbutself(const struct cpumask *mask, int vector);



static inline void send_IPI_mask(const cpumask_t *mask, int vector)

static inline void send_IPI_mask(const struct cpumask *mask, int vector)

{

	send_IPI_mask_sequence(mask, vector);

}



static inline void send_IPI_allbutself(int vector)

{

	cpumask_t mask = cpu_online_map;

	cpu_clear(smp_processor_id(), mask);

	if (!cpus_empty(mask))

		send_IPI_mask(&mask, vector);

	send_IPI_mask_allbutself(cpu_online_mask, vector);

}



static inline void send_IPI_all(int vector)

{

	send_IPI_mask(&cpu_online_map, vector);

	send_IPI_mask(cpu_online_mask, vector);

}



#endif /* __ASM_ES7000_IPI_H */

arch/x86/include/asm/genapic_32.h

+6 −5
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ struct genapic { 
	int (*probe)(void);



	int (*apic_id_registered)(void);

	const cpumask_t *(*target_cpus)(void);

	const struct cpumask *(*target_cpus)(void);

	int int_delivery_mode;

	int int_dest_mode;

	int ESR_DISABLE;
@@ -57,15 +57,16 @@ struct genapic { 


	unsigned (*get_apic_id)(unsigned long x);

	unsigned long apic_id_mask;

	unsigned int (*cpu_mask_to_apicid)(const cpumask_t *cpumask);

	unsigned int (*cpu_mask_to_apicid)(const struct cpumask *cpumask);

	unsigned int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask,

					       const struct cpumask *andmask);

	void (*vector_allocation_domain)(int cpu, cpumask_t *retmask);

	void (*vector_allocation_domain)(int cpu, struct cpumask *retmask);



#ifdef CONFIG_SMP

	/* ipi */

	void (*send_IPI_mask)(const cpumask_t *mask, int vector);

	void (*send_IPI_mask_allbutself)(const cpumask_t *mask, int vector);

	void (*send_IPI_mask)(const struct cpumask *mask, int vector);

	void (*send_IPI_mask_allbutself)(const struct cpumask *mask,

					 int vector);

	void (*send_IPI_allbutself)(int vector);

	void (*send_IPI_all)(int vector);

#endif

arch/x86/include/asm/genapic_64.h

+6 −5
Original line number Diff line number Diff line
@@ -20,17 +20,18 @@ struct genapic { 
	u32 int_delivery_mode;

	u32 int_dest_mode;

	int (*apic_id_registered)(void);

	const cpumask_t *(*target_cpus)(void);

	void (*vector_allocation_domain)(int cpu, cpumask_t *retmask);

	const struct cpumask *(*target_cpus)(void);

	void (*vector_allocation_domain)(int cpu, struct cpumask *retmask);

	void (*init_apic_ldr)(void);

	/* ipi */

	void (*send_IPI_mask)(const cpumask_t *mask, int vector);

	void (*send_IPI_mask_allbutself)(const cpumask_t *mask, int vector);

	void (*send_IPI_mask)(const struct cpumask *mask, int vector);

	void (*send_IPI_mask_allbutself)(const struct cpumask *mask,

					 int vector);

	void (*send_IPI_allbutself)(int vector);

	void (*send_IPI_all)(int vector);

	void (*send_IPI_self)(int vector);

	/* */

	unsigned int (*cpu_mask_to_apicid)(const cpumask_t *cpumask);

	unsigned int (*cpu_mask_to_apicid)(const struct cpumask *cpumask);

	unsigned int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask,

					       const struct cpumask *andmask);

	unsigned int (*phys_pkg_id)(int index_msb);

arch/x86/include/asm/ipi.h

+6 −4
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ static inline void __send_IPI_dest_field(unsigned int mask, int vector, 
	native_apic_mem_write(APIC_ICR, cfg);

}



static inline void send_IPI_mask_sequence(const cpumask_t *mask, int vector)

static inline void send_IPI_mask_sequence(const struct cpumask *mask,

					  int vector)

{

	unsigned long flags;

	unsigned long query_cpu;
@@ -128,14 +129,15 @@ static inline void send_IPI_mask_sequence(const cpumask_t *mask, int vector) 
	 * - mbligh

	 */

	local_irq_save(flags);

	for_each_cpu_mask_nr(query_cpu, *mask) {

	for_each_cpu(query_cpu, mask) {

		__send_IPI_dest_field(per_cpu(x86_cpu_to_apicid, query_cpu),

				      vector, APIC_DEST_PHYSICAL);

	}

	local_irq_restore(flags);

}



static inline void send_IPI_mask_allbutself(const cpumask_t *mask, int vector)

static inline void send_IPI_mask_allbutself(const struct cpumask *mask,

					    int vector)

{

	unsigned long flags;

	unsigned int query_cpu;
@@ -144,7 +146,7 @@ static inline void send_IPI_mask_allbutself(const cpumask_t *mask, int vector) 
	/* See Hack comment above */



	local_irq_save(flags);

	for_each_cpu_mask_nr(query_cpu, *mask)

	for_each_cpu(query_cpu, mask)

		if (query_cpu != this_cpu)

			__send_IPI_dest_field(

				per_cpu(x86_cpu_to_apicid, query_cpu),