Changeset 074c9bd in mainline for kernel/arch/amd64/src/proc

Timestamp:

2010-07-15T10:39:23Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5c16ce7

Parents:

41ce4d9 (diff), 4003861 (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/amd64/src/proc

Files:

• scheduler.c (modified) (2 diffs)
• thread.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];
         
         /*

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

@@ -34 +34 @@
 
 #include <proc/thread.h>
+#include <arch/interrupt.h>
 
 /** Perform amd64 specific thread initialization.
@@ -49 +50 @@
          */
         thread->arch.syscall_rsp[SYSCALL_KSTACK_RSP] =
-            (uintptr_t) &thread->kstack[PAGE_SIZE - sizeof(uint64_t)];
+            (uintptr_t) &thread->kstack[PAGE_SIZE - sizeof(istate_t)];
 }