Index: boot/arch/sparc64/loader/ofwarch.c
===================================================================
--- boot/arch/sparc64/loader/ofwarch.c	(revision e0565005544bb7c8f05f32a6e86588527ac23345)
+++ boot/arch/sparc64/loader/ofwarch.c	(revision 52ff7699c7d3d605dddc5455935a7299bc7cf8ad)
@@ -78,8 +78,9 @@
 	for (cpus = 0; (child != 0) && (child != -1);
 	    child = ofw_get_peer_node(child), cpus++) {
-		char type_name[BUF_SIZE];
+		char type_name[OFW_TREE_PROPERTY_MAX_VALUELEN];
 		
 		if (ofw_get_property(child, "device_type", type_name,
-		    sizeof(type_name)) > 0) {
+		    OFW_TREE_PROPERTY_MAX_VALUELEN) > 0) {
+			type_name[OFW_TREE_PROPERTY_MAX_VALUELEN - 1] = 0;
 			if (strcmp(type_name, "cpu") == 0) {
 				uint32_t mid;
@@ -135,8 +136,9 @@
 	int cpus = wake_cpus_in_node(node, current_mid, physmem_start);
 	while ((node != 0) && (node != -1)) {
-		char name[BUF_SIZE];
+		char name[OFW_TREE_PROPERTY_MAX_VALUELEN];
 		
 		if (ofw_get_property(node, "name", name,
-		    sizeof(name)) > 0) {
+		    OFW_TREE_PROPERTY_MAX_VALUELEN) > 0) {
+			name[OFW_TREE_PROPERTY_MAX_VALUELEN - 1] = 0;
 			if (strcmp(name, "cmp") == 0) {
 				phandle subnode = ofw_get_child_node(node);