sun4d cpu-unit prom node

[Raymond Burns <rayburns@xxxxxxxxxxx>]

Hi

The sun4d prom still has the cpu-unit node in the prom tree.

By dragging forward the attached code snippet/patch, applying the
patchs of Bob Breuer and Krzysztof Helt with the essence of Bob
Breuer's patch applied to the sun4d files allows a SMP sun4d boot to
progress past populate_rootfs

Thank you gentlemen

back to the hunt.

Thanx
  Ray

*** linux-2.6.17-rc4.orig/arch/sparc/kernel/devices.c	Thu May 11 23:31:53 2006
--- linux-2.6.17-rc4/arch/sparc/kernel/devices.c	Mon Jun  5 19:15:50 2006
***************
*** 71,81 ****
  		return 0;
  
  	nd = prom_getchild(nd);
! 	while ((nd = prom_getsibling(nd)) != 0) {
! 		err = check_cpu_node(nd, &cur_inst, compare, compare_arg,
! 				     prom_node, mid);
  		if (!err)
  			return 0;
  	}
  
  	return -ENODEV;
--- 71,94 ----
  		return 0;
  
  	nd = prom_getchild(nd);
! 	if (sparc_cpu_model == sun4d) {
! 		for (nd = prom_searchsiblings(nd, "cpu-unit"); nd;
! 			nd = prom_searchsiblings(prom_getsibling(nd),
! 				"cpu-unit"))
! 		{
! 			int node = prom_getchild(nd);
! 			err = check_cpu_node(node, &cur_inst, compare,
! 				compare_arg, prom_node, mid);
! 			if (!err)
! 				return 0;
! 		}
! 	} else {
! 		while ((nd = prom_getsibling(nd)) != 0) {
! 			err = check_cpu_node(nd, &cur_inst, compare,
! 				compare_arg, prom_node, mid);
  		if (!err)
  			return 0;
+ 		}
  	}
  
  	return -ENODEV;