Changeset 544a2e4 in mainline for kernel/arch/ia64/src/proc/scheduler.c

Timestamp:

2011-05-30T21:37:43Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b712b60

Parents:

18ba2e4f (diff), 0743493a (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/ia64/src/proc/scheduler.c (modified) (2 diffs)

kernel/arch/ia64/src/proc/scheduler.c

@@ -79 +79 @@
          * Record address of kernel stack to bank 0 r23.
          * These values will be found there after switch from userspace.
+         *
+         * Mind the 1:1 split of the entire STACK_SIZE long region between the
+         * memory stack and the RSE stack.
          */
         asm volatile (
@@ -86 +89 @@
                 "bsw.1\n"
                 :
-                : "r" (&THREAD->kstack[THREAD_STACK_SIZE]),
-                  "r" (&THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA])
+                : "r" (&THREAD->kstack[STACK_SIZE / 2]),
+                  "r" (&THREAD->kstack[STACK_SIZE / 2 - SP_DELTA])
                 );
 }