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

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/main

Files:

• kinit.c (modified) (1 diff)
• main.c (modified) (1 diff)
• shutdown.c (modified) (1 diff)

kernel/generic/src/main/kinit.c

@@ -51 +51 @@
 #include <proc/program.h>
 #include <panic.h>
-#include <func.h>
+#include <halt.h>
 #include <cpu.h>
 #include <arch/asm.h>

kernel/generic/src/main/main.c

@@ -67 +67 @@
 #include <align.h>
 #include <interrupt.h>
+#include <str.h>
 #include <mm/frame.h>
 #include <mm/page.h>

kernel/generic/src/main/shutdown.c

@@ -38 +38 @@
 #include <arch.h>
 #include <proc/task.h>
-#include <func.h>
+#include <halt.h>
 #include <print.h>
 #include <log.h>