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

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• kernel/arch/sparc64/src/sun4u/sparc64.c (modified) (3 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.
@@ -153 +156 @@
         (void) interrupts_disable();
         switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE
-            - (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
+            ((uintptr_t) kernel_uarg->uspace_stack) +
+            kernel_uarg->uspace_stack_size -
+            (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
             (uintptr_t) kernel_uarg->uspace_uarg);
-
-        for (;;)
-                ;
-        /* not reached */
+        
+        /* Not reached */
+        while (1);
 }