Changeset 46c20c8 in mainline for kernel/generic/include/sysinfo/stats.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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.

File:

• kernel/generic/include/sysinfo/stats.h (moved) (moved from kernel/arch/abs32le/include/debug.h ) (2 diffs)

kernel/generic/include/sysinfo/stats.h

@@ -27 +27 @@
  */
 
-/** @addtogroup abs32ledebug
+/** @addtogroup generic
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef KERN_abs32le_DEBUG_H_
-#define KERN_abs32le_DEBUG_H_
+#ifndef KERN_STATS_H_
+#define KERN_STATS_H_
 
-#include <arch/asm.h>
-
-#define HERE  get_ip()
+extern void kload(void *arg);
+extern void stats_init(void);
 
 #endif