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

Commit 81740fc6 authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by Linus Torvalds
Browse files

alpha: replace with new cpumask APIs 



We plan to remove cpu_xx() old APIs.  Thus convert them.  This patch has
no functional change.

Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f67d9b15

arch/alpha/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ common_shutdown_1(void *generic_ptr) 
	/* Wait for the secondaries to halt. */

	set_cpu_present(boot_cpuid, false);

	set_cpu_possible(boot_cpuid, false);

	while (cpus_weight(cpu_present_map))

	while (cpumask_weight(cpu_present_mask))

		barrier();

#endif

arch/alpha/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -1257,7 +1257,7 @@ show_cpuinfo(struct seq_file *f, void *slot) 
#ifdef CONFIG_SMP

	seq_printf(f, "cpus active\t\t: %u\n"

		      "cpu active mask\t\t: %016lx\n",

		       num_online_cpus(), cpus_addr(cpu_possible_map)[0]);

		       num_online_cpus(), cpumask_bits(cpu_possible_mask)[0]);

#endif



	show_cache_size (f, "L1 Icache", alpha_l1i_cacheshape);

arch/alpha/kernel/smp.c

+4 −3
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ setup_smp(void) 
	}



	printk(KERN_INFO "SMP: %d CPUs probed -- cpu_present_map = %lx\n",

	       smp_num_probed, cpu_present_map.bits[0]);

	       smp_num_probed, cpumask_bits(cpu_present_mask)[0]);

}



/*
@@ -629,8 +629,9 @@ smp_send_reschedule(int cpu) 
void

smp_send_stop(void)

{

	cpumask_t to_whom = cpu_possible_map;

	cpu_clear(smp_processor_id(), to_whom);

	cpumask_t to_whom;

	cpumask_copy(&to_whom, cpu_possible_mask);

	cpumask_clear_cpu(smp_processor_id(), &to_whom);

#ifdef DEBUG_IPI_MSG

	if (hard_smp_processor_id() != boot_cpu_id)

		printk(KERN_WARNING "smp_send_stop: Not on boot cpu.\n");

arch/alpha/kernel/sys_dp264.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ cpu_set_irq_affinity(unsigned int irq, cpumask_t affinity) 


	for (cpu = 0; cpu < 4; cpu++) {

		unsigned long aff = cpu_irq_affinity[cpu];

		if (cpu_isset(cpu, affinity))

		if (cpumask_test_cpu(cpu, &affinity))

			aff |= 1UL << irq;

		else

			aff &= ~(1UL << irq);

arch/alpha/kernel/sys_titan.c

+7 −6
Original line number Diff line number Diff line
@@ -65,10 +65,11 @@ titan_update_irq_hw(unsigned long mask) 
	register int bcpu = boot_cpuid;



#ifdef CONFIG_SMP

	cpumask_t cpm = cpu_present_map;

	cpumask_t cpm;

	volatile unsigned long *dim0, *dim1, *dim2, *dim3;

	unsigned long mask0, mask1, mask2, mask3, dummy;



	cpumask_copy(&cpm, cpu_present_mask);

	mask &= ~isa_enable;

	mask0 = mask & titan_cpu_irq_affinity[0];

	mask1 = mask & titan_cpu_irq_affinity[1];
@@ -84,10 +85,10 @@ titan_update_irq_hw(unsigned long mask) 
	dim1 = &cchip->dim1.csr;

	dim2 = &cchip->dim2.csr;

	dim3 = &cchip->dim3.csr;

	if (!cpu_isset(0, cpm)) dim0 = &dummy;

	if (!cpu_isset(1, cpm)) dim1 = &dummy;

	if (!cpu_isset(2, cpm)) dim2 = &dummy;

	if (!cpu_isset(3, cpm)) dim3 = &dummy;

	if (!cpumask_test_cpu(0, &cpm)) dim0 = &dummy;

	if (!cpumask_test_cpu(1, &cpm)) dim1 = &dummy;

	if (!cpumask_test_cpu(2, &cpm)) dim2 = &dummy;

	if (!cpumask_test_cpu(3, &cpm)) dim3 = &dummy;



	*dim0 = mask0;

	*dim1 = mask1;
@@ -137,7 +138,7 @@ titan_cpu_set_irq_affinity(unsigned int irq, cpumask_t affinity) 
	int cpu;



	for (cpu = 0; cpu < 4; cpu++) {

		if (cpu_isset(cpu, affinity))

		if (cpumask_test_cpu(cpu, &affinity))

			titan_cpu_irq_affinity[cpu] |= 1UL << irq;

		else

			titan_cpu_irq_affinity[cpu] &= ~(1UL << irq);