Index: kernel/arch/sparc64/src/sun4v/md.c
===================================================================
--- kernel/arch/sparc64/src/sun4v/md.c	(revision e0cb57badd1e270ba0e7fa9bcf85db48d10ee037)
+++ kernel/arch/sparc64/src/sun4v/md.c	(revision e0b0c257732262412575238a5815d8deebc8aa6d)
@@ -104,6 +104,6 @@
 static md_element_t *get_element(element_idx_t idx)
 {
-	return (md_element_t *) (
-		mach_desc + sizeof(md_header_t) + idx * sizeof(md_element_t));
+	return (md_element_t *) (mach_desc +
+	    sizeof(md_header_t) + idx * sizeof(md_element_t));
 }
 
@@ -114,5 +114,5 @@
 	uintptr_t name_offset = get_element(idx)->name_offset;
 	return (char *) mach_desc + sizeof(md_header_t) +
-		md_header->node_blk_sz + name_offset;
+	    md_header->node_blk_sz + name_offset;
 }
 
@@ -137,5 +137,5 @@
 		md_element_t *element = get_element(idx);
 		if (element->tag == PROP_VAL &&
-				str_cmp(key, get_element_name(idx)) == 0) {
+		    str_cmp(key, get_element_name(idx)) == 0) {
 			*result = element->d.val;
 			return true;
@@ -161,8 +161,8 @@
 		md_element_t *element = get_element(idx);
 		if (element->tag == PROP_DATA &&
-				str_cmp(key, get_element_name(idx)) == 0) {
+		    str_cmp(key, get_element_name(idx)) == 0) {
 			*result = (char *) mach_desc + sizeof(md_header_t) +
-				md_header->node_blk_sz + md_header->name_blk_sz +
-				element->d.y.data_offset;
+			    md_header->node_blk_sz + md_header->name_blk_sz +
+			    element->d.y.data_offset;
 			return true;
 		}
@@ -186,5 +186,5 @@
 		md_element_t *element = get_element(*it);
 		if (element->tag == PROP_ARC &&
-				str_cmp("fwd", get_element_name(*it)) == 0) {
+		    str_cmp("fwd", get_element_name(*it)) == 0) {
 			return true;
 		}
@@ -289,5 +289,5 @@
 
 		if (element->tag == NODE &&
-				str_cmp(name, get_element_name(*node)) == 0) {
+		    str_cmp(name, get_element_name(*node)) == 0) {
 			return true;
 		}
@@ -306,10 +306,10 @@
 {
 	uint64_t retval = __hypercall_fast2(MACH_DESC, KA2PA(mach_desc),
-		MD_MAX_SIZE);
+	    MD_MAX_SIZE);
 
 	retval = retval;
-	if (retval != EOK) {
+	if (retval != HV_EOK) {
 		printf("Could not retrieve machine description, error = %d.\n",
-			retval);
+		    retval);
 	}
 }