Changeset 76ca3f7 in mainline for kernel/arch/ia64/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/ia64/src

Files:

• ddi/ddi.c (modified) (1 diff)
• debug/stacktrace.c (modified) (1 diff)
• drivers/ski.c (modified) (1 diff)
• ia64.c (modified) (2 diffs)
• interrupt.c (modified) (1 diff)
• mm/page.c (modified) (1 diff)
• smp/smp.c (modified) (1 diff)

kernel/arch/ia64/src/ddi/ddi.c

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

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

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

kernel/arch/ia64/src/drivers/ski.c

@@ -37 +37 @@
 #include <console/chardev.h>
 #include <sysinfo/sysinfo.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <proc/thread.h>
 #include <synch/spinlock.h>
 #include <arch/asm.h>
 #include <arch/drivers/kbd.h>
-#include <string.h>
+#include <str.h>
 #include <arch.h>
 

kernel/arch/ia64/src/ia64.c

@@ -40 +40 @@
 #include <arch/asm.h>
 #include <arch/register.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/context.h>
 #include <arch/stack.h>
@@ -66 +66 @@
 #include <print.h>
 #include <sysinfo/sysinfo.h>
-#include <string.h>
+#include <str.h>
 
 /* NS16550 as a COM 1 */

kernel/arch/ia64/src/interrupt.c

@@ -41 +41 @@
 #include <debug.h>
 #include <console/console.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/asm.h>
 #include <arch/barrier.h>

kernel/arch/ia64/src/mm/page.c

@@ -39 +39 @@
 #include <arch/mm/asid.h>
 #include <arch/mm/vhpt.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <print.h>
 #include <mm/page.h>

kernel/arch/ia64/src/smp/smp.c

@@ -40 +40 @@
 #include <arch/asm.h>
 #include <arch/register.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/context.h>
 #include <arch/stack.h>