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

Commit f8b9e594 authored by Kyle McMartin's avatar Kyle McMartin Committed by Kyle McMartin
Browse files

[PARISC] Unbreak processor_probe when we have more than NR_CPUS 



If we already have NR_CPUS worth of cpus online, we obviously shouldn't
be trying to bring up more... Fixes a particularly vexing issue I had when
running another machines kernel on my rp3440.

Signed-off-by: default avatarKyle McMartin <kyle@mcmartin.ca>
parent 730e844d

arch/parisc/kernel/processor.c

+6 −1
Original line number Diff line number Diff line
@@ -82,7 +82,12 @@ static int __cpuinit processor_probe(struct parisc_device *dev) 
	unsigned long cpuid;

	struct cpuinfo_parisc *p;



#ifndef CONFIG_SMP

#ifdef CONFIG_SMP

	if (num_online_cpus() >= NR_CPUS) {

		printk(KERN_INFO "num_online_cpus() >= NR_CPUS\n");

		return 1;

	}

#else

	if (boot_cpu_data.cpu_count > 0) {

		printk(KERN_INFO "CONFIG_SMP=n  ignoring additional CPUs\n");

		return 1;