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

Commit d73dee6e authored by Tony Luck's avatar Tony Luck
Browse files

Pull for-each-cpu into release branch

parents 9acd3fa2 ddf6d0a0

arch/ia64/kernel/irq.c

+6 −6
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ int show_interrupts(struct seq_file *p, void *v) 


	if (i == 0) {

		seq_printf(p, "           ");

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

			if (cpu_online(j))

		for_each_online_cpu(j) {

			seq_printf(p, "CPU%d       ",j);

		}

		seq_putc(p, '\n');

	}
@@ -72,9 +72,9 @@ int show_interrupts(struct seq_file *p, void *v) 
#ifndef CONFIG_SMP

		seq_printf(p, "%10u ", kstat_irqs(i));

#else

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

			if (cpu_online(j))

		for_each_online_cpu(j) {

			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);

		}

#endif

		seq_printf(p, " %14s", irq_desc[i].handler->typename);

		seq_printf(p, "  %s", action->name);

arch/ia64/kernel/mca.c

+1 −3
Original line number Diff line number Diff line
@@ -508,9 +508,7 @@ ia64_mca_wakeup_all(void) 
	int cpu;



	/* Clear the Rendez checkin flag for all cpus */

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

		if (!cpu_online(cpu))

			continue;

	for_each_online_cpu(cpu) {

		if (ia64_mc_info.imi_rendez_checkin[cpu] == IA64_MCA_RENDEZ_CHECKIN_DONE)

			ia64_mca_wakeup(cpu);

	}

arch/ia64/kernel/module.c

+3 −3
Original line number Diff line number Diff line
@@ -947,8 +947,8 @@ void 
percpu_modcopy (void *pcpudst, const void *src, unsigned long size)

{

	unsigned int i;

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

		if (cpu_possible(i))

	for_each_cpu(i) {

		memcpy(pcpudst + __per_cpu_offset[i], src, size);

	}

}

#endif /* CONFIG_SMP */

arch/ia64/kernel/smp.c

+5 −5
Original line number Diff line number Diff line
@@ -185,8 +185,8 @@ send_IPI_allbutself (int op) 
{

	unsigned int i;



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

		if (cpu_online(i) && i != smp_processor_id())

	for_each_online_cpu(i) {

		if (i != smp_processor_id())

			send_IPI_single(i, op);

	}

}
@@ -199,10 +199,10 @@ send_IPI_all (int op) 
{

	int i;



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

		if (cpu_online(i))

	for_each_online_cpu(i) {

		send_IPI_single(i, op);

	}

}



/*

 * Called with preeemption disabled.

arch/ia64/kernel/smpboot.c

+3 −3
Original line number Diff line number Diff line
@@ -694,9 +694,9 @@ smp_cpus_done (unsigned int dummy) 
	 * Allow the user to impress friends.

	 */



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

		if (cpu_online(cpu))

	for_each_online_cpu(cpu) {

		bogosum += cpu_data(cpu)->loops_per_jiffy;

	}



	printk(KERN_INFO "Total of %d processors activated (%lu.%02lu BogoMIPS).\n",

	       (int)num_online_cpus(), bogosum/(500000/HZ), (bogosum/(5000/HZ))%100);