Changeset e6a78b9 in mainline for kernel/arch/ia64/src

Timestamp:

2012-06-29T15:31:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c0 (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.

Location:

kernel/arch/ia64/src

Files:

• drivers/ski.c (modified) (1 diff)
• ia64.c (modified) (1 diff)

kernel/arch/ia64/src/drivers/ski.c

@@ -150 +150 @@
         
         if (instance) {
-                instance->thread = thread_create(kskipoll, instance, TASK, 0,
-                    "kskipoll", true);
+                instance->thread = thread_create(kskipoll, instance, TASK,
+                    THREAD_FLAG_UNCOUNTED, "kskipoll");
                 
                 if (!instance->thread) {

kernel/arch/ia64/src/ia64.c

@@ -232 +232 @@
          *
          * When calculating stack addresses, mind the stack split between the
-         * memory stack and the RSE stack. Each occuppies STACK_SIZE / 2 bytes.
+         * memory stack and the RSE stack. Each occuppies
+         * uspace_stack_size / 2 bytes.
          */
         switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE / 2 -
+            ((uintptr_t) kernel_uarg->uspace_stack) +
+            kernel_uarg->uspace_stack_size / 2 -
             ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
-            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE / 2,
+            ((uintptr_t) kernel_uarg->uspace_stack) +
+            kernel_uarg->uspace_stack_size / 2,
             (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value);
-
-        while (1)
-                ;
+        
+        while (1);
 }