Changeset 76ca3f7 in mainline for kernel/arch/amd64/src

Timestamp:

2010-03-23T20:49:54Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

e417b96

Parents:

b48ebd19 (diff), 63f8966 (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 mailnline changes, revision 329

Location:

kernel/arch/amd64/src

Files:

• amd64.c (modified) (1 diff)
• cpu/cpu.c (modified) (1 diff)
• ddi/ddi.c (modified) (1 diff)
• debug/stacktrace.c (modified) (1 diff)
• proc/task.c (modified) (1 diff)
• userspace.c (modified) (1 diff)

kernel/arch/amd64/src/amd64.c

@@ -35 +35 @@
 #include <arch.h>
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #include <config.h>

kernel/arch/amd64/src/cpu/cpu.c

@@ -39 +39 @@
 
 #include <arch.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <print.h>
 #include <fpu_context.h>

kernel/arch/amd64/src/ddi/ddi.c

@@ -36 +36 @@
 #include <arch/ddi/ddi.h>
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/bitmap.h>
 #include <mm/slab.h>

kernel/arch/amd64/src/debug/stacktrace.c

@@ -35 +35 @@
 #include <stacktrace.h>
 #include <syscall/copy.h>
-#include <arch/types.h>
 #include <typedefs.h>
 

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

@@ -35 +35 @@
 #include <proc/task.h>
 #include <mm/slab.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Perform amd64 specific task initialization.

kernel/arch/amd64/src/userspace.c

@@ -36 +36 @@
 #include <arch/cpu.h>
 #include <arch/pm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch.h>
 #include <proc/uarg.h>