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

Commit f486b3dc authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc32: fix sparcstation 5 boot 



The sparcstation 5 I have available has no MID property for the CPU.
This resulted in a panic when booting a SMP kernel on this box.

The assigned field in cpu_data is never used, so if we fail
to read the MID property then inform user and continue booting.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 505d9147

arch/sparc/kernel/smp_32.c

+7 −3
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ cpumask_t smp_commenced_mask = CPU_MASK_NONE; 
void __cpuinit smp_store_cpu_info(int id)

{

	int cpu_node;

	int mid;



	cpu_data(id).udelay_val = loops_per_jiffy;
@@ -60,10 +61,13 @@ void __cpuinit smp_store_cpu_info(int id) 
	cpu_data(id).clock_tick = prom_getintdefault(cpu_node,

						     "clock-frequency", 0);

	cpu_data(id).prom_node = cpu_node;

	cpu_data(id).mid = cpu_get_hwmid(cpu_node);

	mid = cpu_get_hwmid(cpu_node);



	if (cpu_data(id).mid < 0)

		panic("No MID found for CPU%d at node 0x%08d", id, cpu_node);

	if (mid < 0) {

		printk(KERN_NOTICE "No MID found for CPU%d at node 0x%08d", id, cpu_node);

		mid = 0;

	}

	cpu_data(id).mid = mid;

}



void __init smp_cpus_done(unsigned int max_cpus)