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

Commit 8a177c4f authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC64]: Warn user if cpu is ignored. 



When NR_CPUS is smaller than the cpu probed, let the user
know that the cpu won't be used.

Suggested by Al Viro.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 301feb65

arch/sparc64/kernel/mdesc.c

+5 −1
Original line number Diff line number Diff line
@@ -777,8 +777,12 @@ void __devinit mdesc_fill_in_cpu_data(cpumask_t mask) 
		cpuid = *id;



#ifdef CONFIG_SMP

		if (cpuid >= NR_CPUS)

		if (cpuid >= NR_CPUS) {

			printk(KERN_WARNING "Ignoring CPU %d which is "

			       ">= NR_CPUS (%d)\n",

			       cpuid, NR_CPUS);

			continue;

		}

		if (!cpu_isset(cpuid, mask))

			continue;

#else

arch/sparc64/kernel/prom.c

+5 −1
Original line number Diff line number Diff line
@@ -1583,8 +1583,12 @@ static void __init of_fill_in_cpu_data(void) 
		ncpus_probed++;



#ifdef CONFIG_SMP

		if (cpuid >= NR_CPUS)

		if (cpuid >= NR_CPUS) {

			printk(KERN_WARNING "Ignoring CPU %d which is "

			       ">= NR_CPUS (%d)\n",

			       cpuid, NR_CPUS);

			continue;

		}

#else

		/* On uniprocessor we only want the values for the

		 * real physical cpu the kernel booted onto, however