Changeset db96017 in mainline for kernel/arch/sparc64/src/sun4u/sparc64.c

Timestamp:

2012-04-07T17:41:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b6913b7

Parents:

b69e4c0 (diff), 6bb169b5 (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/sun4u/sparc64.c (modified) (2 diffs)

kernel/arch/sparc64/src/sun4u/sparc64.c

@@ -62 +62 @@
         size_t i;
         for (i = 0; i < init.cnt; i++) {
-                init.tasks[i].addr = (uintptr_t) bootinfo->taskmap.tasks[i].addr;
+                init.tasks[i].paddr = KA2PA(bootinfo->taskmap.tasks[i].addr);
                 init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
                 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
@@ -94 +94 @@
 {
         if (config.cpu_active == 1) {
+                /* Map OFW information into sysinfo */
+                ofw_sysinfo_map();
+                
                 /*
                  * We have 2^11 different interrupt vectors.