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

Commit 5dd3c994 authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: ia64 



Impact: cleanup, futureproof

In fact, all cpumask ops will only be valid (in general) for bit
numbers < nr_cpu_ids.  So use that instead of NR_CPUS in various
places.

This is always safe: no cpu number can be >= nr_cpu_ids, and
nr_cpu_ids is initialized to NR_CPUS at boot.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
parent 40fe697a

arch/ia64/kernel/acpi.c

+3 −3
Original line number Diff line number Diff line
@@ -924,9 +924,9 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) 
	buffer.length = ACPI_ALLOCATE_BUFFER;

	buffer.pointer = NULL;



	cpus_complement(tmp_map, cpu_present_map);

	cpu = first_cpu(tmp_map);

	if (cpu >= NR_CPUS)

	cpumask_complement(&tmp_map, cpu_present_mask);

	cpu = cpumask_first(&tmp_map);

	if (cpu >= nr_cpu_ids)

		return -EINVAL;



	acpi_map_cpu2node(handle, cpu, physid);

arch/ia64/kernel/mca.c

+3 −3
Original line number Diff line number Diff line
@@ -1456,9 +1456,9 @@ ia64_mca_cmc_int_caller(int cmc_irq, void *arg) 


	ia64_mca_cmc_int_handler(cmc_irq, arg);



	for (++cpuid ; cpuid < NR_CPUS && !cpu_online(cpuid) ; cpuid++);

	cpuid = cpumask_next(cpuid+1, cpu_online_mask);



	if (cpuid < NR_CPUS) {

	if (cpuid < nr_cpu_ids) {

		platform_send_ipi(cpuid, IA64_CMCP_VECTOR, IA64_IPI_DM_INT, 0);

	} else {

		/* If no log record, switch out of polling mode */
@@ -1525,7 +1525,7 @@ ia64_mca_cpe_int_caller(int cpe_irq, void *arg) 


	ia64_mca_cpe_int_handler(cpe_irq, arg);



	for (++cpuid ; cpuid < NR_CPUS && !cpu_online(cpuid) ; cpuid++);

	cpuid = cpumask_next(cpuid+1, cpu_online_mask);



	if (cpuid < NR_CPUS) {

		platform_send_ipi(cpuid, IA64_CPEP_VECTOR, IA64_IPI_DM_INT, 0);

arch/ia64/kernel/perfmon.c

+2 −2
Original line number Diff line number Diff line
@@ -5603,7 +5603,7 @@ pfm_interrupt_handler(int irq, void *arg) 
 * /proc/perfmon interface, for debug only

 */



#define PFM_PROC_SHOW_HEADER	((void *)NR_CPUS+1)

#define PFM_PROC_SHOW_HEADER	((void *)nr_cpu_ids+1)



static void *

pfm_proc_start(struct seq_file *m, loff_t *pos)
@@ -5612,7 +5612,7 @@ pfm_proc_start(struct seq_file *m, loff_t *pos) 
		return PFM_PROC_SHOW_HEADER;

	}



	while (*pos <= NR_CPUS) {

	while (*pos <= nr_cpu_ids) {

		if (cpu_online(*pos - 1)) {

			return (void *)*pos;

		}

arch/ia64/kernel/salinfo.c

+3 −3
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ salinfo_event_read(struct file *file, char __user *buffer, size_t count, loff_t 
	}



	n = data->cpu_check;

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

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

		if (cpu_isset(n, data->cpu_event)) {

			if (!cpu_online(n)) {

				cpu_clear(n, data->cpu_event);
@@ -326,7 +326,7 @@ salinfo_event_read(struct file *file, char __user *buffer, size_t count, loff_t 
			cpu = n;

			break;

		}

		if (++n == NR_CPUS)

		if (++n == nr_cpu_ids)

			n = 0;

	}
@@ -337,7 +337,7 @@ salinfo_event_read(struct file *file, char __user *buffer, size_t count, loff_t 


	/* for next read, start checking at next CPU */

	data->cpu_check = cpu;

	if (++data->cpu_check == NR_CPUS)

	if (++data->cpu_check == nr_cpu_ids)

		data->cpu_check = 0;



	snprintf(cmd, sizeof(cmd), "read %d\n", cpu);

arch/ia64/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -730,10 +730,10 @@ static void * 
c_start (struct seq_file *m, loff_t *pos)

{

#ifdef CONFIG_SMP

	while (*pos < NR_CPUS && !cpu_isset(*pos, cpu_online_map))

	while (*pos < nr_cpu_ids && !cpu_online(*pos))

		++*pos;

#endif

	return *pos < NR_CPUS ? cpu_data(*pos) : NULL;

	return *pos < nr_cpu_ids ? cpu_data(*pos) : NULL;

}



static void *