Changeset 7715994 in mainline for kernel/arch/sparc64/src/sun4v/md.c

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/sparc64/src/sun4v/md.c (modified) (7 diffs)

kernel/arch/sparc64/src/sun4v/md.c

@@ -104 +104 @@
 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 +114 @@
         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 +137 @@
                 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 +161 @@
                 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 +186 @@
                 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 +289 @@
 
                 if (element->tag == NODE &&
-                                str_cmp(name, get_element_name(*node)) == 0) {
+                    str_cmp(name, get_element_name(*node)) == 0) {
                         return true;
                 }
@@ -306 +306 @@
 {
         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);
         }
 }