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

Timestamp:

2010-04-23T21:42:26Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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/test/sysinfo/sysinfo1.c ) (2 diffs)

kernel/generic/include/sysinfo/stats.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Jakub Vana
+ * Copyright (c) 2010 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#include <print.h>
-#include <debug.h>
+/** @addtogroup generic
+ * @{
+ */
+/** @file
+ */
 
-#include <test.h>
-#include <sysinfo/sysinfo.h>
+#ifndef KERN_STATS_H_
+#define KERN_STATS_H_
 
-const char *test_sysinfo1(void)
-{
-        if (!test_quiet)
-                sysinfo_dump(NULL, 0);
-        return NULL;
-}
+extern void kload(void *arg);
+extern void stats_init(void);
+
+#endif
+
+/** @}
+ */