Changeset 2b3dd78 in mainline for kernel/generic/src/proc/scheduler.c

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

File:

• kernel/generic/src/proc/scheduler.c (modified) (1 diff)

kernel/generic/src/proc/scheduler.c

@@ -58 +58 @@
 #include <context.h>
 #include <fpu_context.h>
-#include <func.h>
+#include <halt.h>
 #include <arch.h>
 #include <adt/list.h>