Changeset 89c57b6 in mainline for kernel/arch/amd64/src/proc/scheduler.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/amd64/src/proc/scheduler.c (modified) (2 diffs)

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

@@ -38 +38 @@
 #include <proc/thread.h>
 #include <arch.h>
-#include <arch/context.h>
 #include <arch/asm.h>
 #include <print.h>
@@ -57 +56 @@
 {
         CPU->arch.tss->rsp0 =
-            (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA];
+            (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE];
         
         /*