Changeset c621f4aa in mainline for kernel/arch/amd64/include/context.h

Timestamp:

2010-07-25T10:11:13Z (16 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:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

• kernel/arch/amd64/include/context.h (modified) (2 diffs)

kernel/arch/amd64/include/context.h

@@ -38 +38 @@
 #ifdef KERNEL
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /* According to ABI the stack MUST be aligned on 
@@ -59 +59 @@
  */
 typedef struct {
-    uintptr_t sp;
-    uintptr_t pc;
-    
-    uint64_t rbx;
-    uint64_t rbp;
-
-    uint64_t r12;
-    uint64_t r13;
-    uint64_t r14;
-    uint64_t r15;
-
-    ipl_t ipl;
+        uintptr_t sp;
+        uintptr_t pc;
+        
+        uint64_t rbx;
+        uint64_t rbp;
+        
+        uint64_t r12;
+        uint64_t r13;
+        uint64_t r14;
+        uint64_t r15;
+        
+        ipl_t ipl;
 } __attribute__ ((packed)) context_t;