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

Commit 4f4b6c1a authored by Rusty Russell's avatar Rusty Russell
Browse files

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



Impact: cleanup

In future, all cpumask ops will only be valid (in general) for bit
numbers < nr_cpu_ids.  So use that instead of NR_CPUS in iterators
and other comparisons.

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>
Acked-by: default avatarJames Morris <jmorris@namei.org>
Cc: Eric Biederman <ebiederm@xmission.com>
parent 9e2f913d

kernel/kexec.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1116,7 +1116,7 @@ void crash_save_cpu(struct pt_regs *regs, int cpu) 
	struct elf_prstatus prstatus;

	struct elf_prstatus prstatus;

	u32 *buf;

	u32 *buf;





	if ((cpu < 0) || (cpu >= NR_CPUS))

	if ((cpu < 0) || (cpu >= nr_cpu_ids))

		return;

		return;





	/* Using ELF notes here is opportunistic.

	/* Using ELF notes here is opportunistic.

kernel/smp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -223,7 +223,7 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, 
		local_irq_save(flags);

		local_irq_save(flags);

		func(info);

		func(info);

		local_irq_restore(flags);

		local_irq_restore(flags);

	} else if ((unsigned)cpu < NR_CPUS && cpu_online(cpu)) {

	} else if ((unsigned)cpu < nr_cpu_ids && cpu_online(cpu)) {

		struct call_single_data *data = NULL;

		struct call_single_data *data = NULL;





		if (!wait) {

		if (!wait) {

security/selinux/selinuxfs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1211,7 +1211,7 @@ static struct avc_cache_stats *sel_avc_get_stat_idx(loff_t *idx) 
{

{

	int cpu;

	int cpu;





	for (cpu = *idx; cpu < NR_CPUS; ++cpu) {

	for (cpu = *idx; cpu < nr_cpu_ids; ++cpu) {

		if (!cpu_possible(cpu))

		if (!cpu_possible(cpu))

			continue;

			continue;

		*idx = cpu + 1;

		*idx = cpu + 1;