Changeset 76ca3f7 in mainline for kernel/generic/src

Timestamp:

2010-03-23T20:49:54Z (15 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/generic/src

Files:

• adt/bitmap.c (modified) (1 diff)
• adt/hash_table.c (modified) (1 diff)
• console/cmd.c (modified) (1 diff)
• console/console.c (modified) (2 diffs)
• console/kconsole.c (modified) (3 diffs)
• cpu/cpu.c (modified) (1 diff)
• ddi/device.c (modified) (1 diff)
• ddi/irq.c (modified) (1 diff)
• debug/stacktrace.c (modified) (1 diff)
• debug/symtab.c (modified) (1 diff)
• ipc/event.c (modified) (1 diff)
• lib/elf.c (modified) (1 diff)
• lib/memstr.c (modified) (1 diff)
• lib/str.c (moved) (moved from kernel/generic/src/lib/string.c ) (1 diff)
• main/kinit.c (modified) (1 diff)
• main/uinit.c (modified) (1 diff)
• mm/as.c (modified) (1 diff)
• mm/backend_anon.c (modified) (1 diff)
• mm/backend_elf.c (modified) (1 diff)
• mm/backend_phys.c (modified) (1 diff)
• mm/buddy.c (modified) (1 diff)
• mm/frame.c (modified) (1 diff)
• mm/page.c (modified) (1 diff)
• printf/printf_core.c (modified) (1 diff)
• printf/vprintf.c (modified) (1 diff)
• printf/vsnprintf.c (modified) (1 diff)
• proc/task.c (modified) (1 diff)
• synch/waitq.c (modified) (1 diff)
• time/delay.c (modified) (1 diff)
• time/timeout.c (modified) (1 diff)
• udebug/udebug_ops.c (modified) (1 diff)

kernel/generic/src/adt/bitmap.c

@@ -39 +39 @@
 
 #include <adt/bitmap.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 #include <debug.h>

kernel/generic/src/adt/hash_table.c

@@ -40 +40 @@
 #include <adt/hash_table.h>
 #include <adt/list.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <mm/slab.h>

kernel/generic/src/console/cmd.c

@@ -46 +46 @@
 #include <print.h>
 #include <panic.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 #include <arch.h>
 #include <config.h>
 #include <func.h>
-#include <string.h>
+#include <str.h>
 #include <macros.h>
 #include <debug.h>

kernel/generic/src/console/console.c

@@ -39 +39 @@
 #include <synch/waitq.h>
 #include <synch/spinlock.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <ddi/irq.h>
 #include <ddi/ddi.h>
@@ -51 +51 @@
 #include <syscall/copy.h>
 #include <errno.h>
-#include <string.h>
+#include <str.h>
 
 #define KLOG_PAGES    4

kernel/generic/src/console/kconsole.c

@@ -45 +45 @@
 #include <print.h>
 #include <panic.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 #include <arch.h>
@@ -51 +51 @@
 #include <debug.h>
 #include <func.h>
-#include <string.h>
+#include <str.h>
 #include <macros.h>
 #include <sysinfo/sysinfo.h>
@@ -58 +58 @@
 #include <errno.h>
 #include <putchar.h>
-#include <string.h>
+#include <str.h>
 
 /** Simple kernel console.

kernel/generic/src/cpu/cpu.c

@@ -42 +42 @@
 #include <mm/page.h>
 #include <mm/frame.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <panic.h>

kernel/generic/src/ddi/device.c

@@ -35 +35 @@
  */
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <ddi/device.h>
 #include <atomic.h>

kernel/generic/src/ddi/irq.c

@@ -71 +71 @@
 #include <adt/hash_table.h>
 #include <mm/slab.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <console/console.h>

kernel/generic/src/debug/stacktrace.c

@@ -35 +35 @@
 #include <stacktrace.h>
 #include <interrupt.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <symtab.h>
 

kernel/generic/src/debug/symtab.c

@@ -38 +38 @@
 #include <symtab.h>
 #include <byteorder.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <typedefs.h>
 #include <errno.h>

kernel/generic/src/ipc/event.c

@@ -38 +38 @@
 #include <ipc/event_types.h>
 #include <mm/slab.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <console/console.h>

kernel/generic/src/lib/elf.c

@@ -39 +39 @@
 #include <lib/elf.h>
 #include <debug.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/as.h>
 #include <mm/frame.h>

kernel/generic/src/lib/memstr.c

@@ -43 +43 @@
 
 #include <memstr.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 

kernel/generic/src/lib/str.c

@@ -102 +102 @@
  */
 
-#include <string.h>
+#include <str.h>
 #include <print.h>
 #include <cpu.h>

kernel/generic/src/main/kinit.c

@@ -66 +66 @@
 #include <ipc/ipc.h>
 #include <debug.h>
-#include <string.h>
+#include <str.h>
 
 #ifdef CONFIG_SMP

kernel/generic/src/main/uinit.c

@@ -42 +42 @@
  
 #include <main/uinit.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <proc/thread.h>
 #include <userspace.h>

kernel/generic/src/mm/as.c

@@ -75 +75 @@
 #include <config.h>
 #include <align.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <syscall/copy.h>
 #include <arch/interrupt.h>

kernel/generic/src/mm/backend_anon.c

@@ -47 +47 @@
 #include <adt/btree.h>
 #include <errno.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 #include <arch.h>

kernel/generic/src/mm/backend_elf.c

@@ -38 +38 @@
 #include <lib/elf.h>
 #include <debug.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/as.h>
 #include <mm/frame.h>

kernel/generic/src/mm/backend_phys.c

@@ -38 +38 @@
 
 #include <debug.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/as.h>
 #include <mm/page.h>

kernel/generic/src/mm/buddy.c

@@ -41 +41 @@
 #include <mm/buddy.h>
 #include <mm/frame.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <print.h>

kernel/generic/src/mm/frame.c

@@ -43 +43 @@
  */
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/frame.h>
 #include <mm/as.h>

kernel/generic/src/mm/page.c

@@ -63 +63 @@
 #include <mm/frame.h>
 #include <arch/barrier.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/asm.h>
 #include <memstr.h>

kernel/generic/src/printf/printf_core.c

@@ -41 +41 @@
 #include <stdarg.h>
 #include <macros.h>
-#include <string.h>
+#include <str.h>
 #include <arch.h>
 

kernel/generic/src/printf/vprintf.c

@@ -38 +38 @@
 #include <synch/spinlock.h>
 #include <arch/asm.h>
-#include <arch/types.h>
 #include <typedefs.h>
-#include <string.h>
+#include <typedefs.h>
+#include <str.h>
 
 SPINLOCK_STATIC_INITIALIZE_NAME(printf_lock, "*printf_lock");

kernel/generic/src/printf/vsnprintf.c

@@ -35 +35 @@
 #include <print.h>
 #include <printf/printf_core.h>
-#include <string.h>
+#include <str.h>
 #include <memstr.h>
 #include <errno.h>

kernel/generic/src/proc/task.c

@@ -53 +53 @@
 #include <errno.h>
 #include <func.h>
-#include <string.h>
+#include <str.h>
 #include <memstr.h>
 #include <syscall/copy.h>

kernel/generic/src/synch/waitq.c

@@ -49 +49 @@
 #include <proc/scheduler.h>
 #include <arch/asm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <time/timeout.h>
 #include <arch.h>

kernel/generic/src/time/delay.c

@@ -37 +37 @@
  
 #include <time/delay.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <cpu.h>
 #include <arch/asm.h>

kernel/generic/src/time/timeout.c

@@ -37 +37 @@
 
 #include <time/timeout.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <panic.h>

kernel/generic/src/udebug/udebug_ops.c

@@ -46 +46 @@
 #include <errno.h>
 #include <print.h>
-#include <string.h>
+#include <str.h>
 #include <syscall/copy.h>
 #include <ipc/ipc.h>