Changeset 04803bf in mainline for kernel/generic/include/func.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 mainline changes (needs fixes).

File:

• kernel/generic/include/func.h (modified) (2 diffs)

kernel/generic/include/func.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -36 +36 @@
 #define KERN_FUNC_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <atomic.h>
 
 extern atomic_t haltstate;
 
-extern void halt(void);
-extern unative_t atoi(const char *text);
-extern void order(const uint64_t val, uint64_t *rv, char *suffix);
+extern void halt(void) __attribute__((noreturn));
 
 #endif