Changeset 2b3dd78 in mainline for kernel/generic/src/console

Timestamp:

2018-01-31T12:02:00Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

Location:

kernel/generic/src/console

Files:

• chardev.c (modified) (1 diff)
• cmd.c (modified) (1 diff)
• kconsole.c (modified) (1 diff)

kernel/generic/src/console/chardev.c

@@ -39 +39 @@
 #include <synch/spinlock.h>
 #include <print.h>
-#include <func.h>
+#include <halt.h>
 #include <cpu.h>
 

kernel/generic/src/console/cmd.c

@@ -52 +52 @@
 #include <arch.h>
 #include <config.h>
-#include <func.h>
+#include <halt.h>
 #include <str.h>
 #include <macros.h>

kernel/generic/src/console/kconsole.c

@@ -52 +52 @@
 #include <macros.h>
 #include <debug.h>
-#include <func.h>
+#include <halt.h>
 #include <str.h>
 #include <sysinfo/sysinfo.h>