Changeset 2b3dd78 in mainline for kernel/generic/include/halt.h

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/include/halt.h (moved) (moved from kernel/generic/include/func.h ) (1 diff)

kernel/generic/include/halt.h

@@ -33 +33 @@
  */
 
-#ifndef KERN_FUNC_H_
-#define KERN_FUNC_H_
+#ifndef KERN_HALT_H_
+#define KERN_HALT_H_
 
 #include <atomic.h>