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

Commit 0b5f9c00 authored by Rusty Russell's avatar Rusty Russell
Browse files

remove references to cpu_*_map in arch/ 



This has been obsolescent for a while; time for the final push.

In adjacent context, replaced old cpus_* with cpumask_*.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Acked-by: David S. Miller <davem@davemloft.net> (arch/sparc)
Acked-by: Chris Metcalf <cmetcalf@tilera.com> (arch/tile)
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: linux-hexagon@vger.kernel.org
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Helge Deller <deller@gmx.de>
Cc: sparclinux@vger.kernel.org
parent b5174fa3

arch/arm/kernel/kprobes.c

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ void __kprobes arch_arm_kprobe(struct kprobe *p) 
		flush_insns(addr, sizeof(u16));

	} else if (addr & 2) {

		/* A 32-bit instruction spanning two words needs special care */

		stop_machine(set_t32_breakpoint, (void *)addr, &cpu_online_map);

		stop_machine(set_t32_breakpoint, (void *)addr, cpu_online_mask);

	} else {

		/* Word aligned 32-bit instruction can be written atomically */

		u32 bkp = KPROBE_THUMB32_BREAKPOINT_INSTRUCTION;
@@ -190,7 +190,7 @@ int __kprobes __arch_disarm_kprobe(void *p) 


void __kprobes arch_disarm_kprobe(struct kprobe *p)

{

	stop_machine(__arch_disarm_kprobe, p, &cpu_online_map);

	stop_machine(__arch_disarm_kprobe, p, cpu_online_mask);

}



void __kprobes arch_remove_kprobe(struct kprobe *p)

arch/arm/kernel/smp.c

+4 −3
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
		 * re-initialize the map in platform_smp_prepare_cpus() if

		 * present != possible (e.g. physical hotplug).

		 */

		init_cpu_present(&cpu_possible_map);

		init_cpu_present(cpu_possible_mask);



		/*

		 * Initialise the SCU if there are more than one CPU
@@ -586,8 +586,9 @@ void smp_send_stop(void) 
	unsigned long timeout;



	if (num_online_cpus() > 1) {

		cpumask_t mask = cpu_online_map;

		cpu_clear(smp_processor_id(), mask);

		struct cpumask mask;

		cpumask_copy(&mask, cpu_online_mask);

		cpumask_clear_cpu(smp_processor_id(), &mask);



		smp_cross_call(&mask, IPI_CPU_STOP);

	}

arch/hexagon/kernel/smp.c

+4 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#define BASE_IPI_IRQ 26



/*

 * cpu_possible_map needs to be filled out prior to setup_per_cpu_areas

 * cpu_possible_mask needs to be filled out prior to setup_per_cpu_areas

 * (which is prior to any of our smp_prepare_cpu crap), in order to set

 * up the...  per_cpu areas.

 */
@@ -208,7 +208,7 @@ int __cpuinit __cpu_up(unsigned int cpu) 
	stack_start =  ((void *) thread) + THREAD_SIZE;

	__vmstart(start_secondary, stack_start);



	while (!cpu_isset(cpu, cpu_online_map))

	while (!cpu_online(cpu))

		barrier();



	return 0;
@@ -229,7 +229,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 


	/*  Right now, let's just fake it. */

	for (i = 0; i < max_cpus; i++)

		cpu_set(i, cpu_present_map);

		set_cpu_present(i, true);



	/*  Also need to register the interrupts for IPI  */

	if (max_cpus > 1)
@@ -269,5 +269,5 @@ void smp_start_cpus(void) 
	int i;



	for (i = 0; i < NR_CPUS; i++)

		cpu_set(i, cpu_possible_map);

		set_cpu_possible(i, true);

}

arch/mips/cavium-octeon/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static int octeon_cpu_disable(void) 


	spin_lock(&smp_reserve_lock);



	cpu_clear(cpu, cpu_online_map);

	set_cpu_online(cpu, false);

	cpu_clear(cpu, cpu_callin_map);

	local_irq_disable();

	fixup_irqs();

arch/mips/kernel/mips-mt-fpaff.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len, 
	if (retval)

		goto out_unlock;



	cpus_and(mask, p->thread.user_cpus_allowed, cpu_possible_map);

	cpumask_and(&mask, &p->thread.user_cpus_allowed, cpu_possible_mask);



out_unlock:

	read_unlock(&tasklist_lock);