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

Timestamp:

2011-04-13T14:45:41Z (13 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/thread.c (modified) (2 diffs)

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)];
 }