Changeset b412168 in mainline for kernel/generic/src/sysinfo/stats.c

Timestamp:

2014-11-17T03:25:04Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6069061

Parents:

ef3da5a (diff), 5042706 (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/src/sysinfo/stats.c (modified) (2 diffs)

kernel/generic/src/sysinfo/stats.c

@@ -80 +80 @@
 static mutex_t load_lock;
 
-/** Get system uptime
- *
- * @param item Sysinfo item (unused).
- * @param data Unused.
- *
- * @return System uptime (in secords).
- *
- */
-static sysarg_t get_stats_uptime(struct sysinfo_item *item, void *data)
-{
-        /* This doesn't have to be very accurate */
-        return uptime->seconds1;
-}
-
 /** Get statistics of all CPUs
  *
@@ -818 +804 @@
         mutex_initialize(&load_lock, MUTEX_PASSIVE);
         
-        sysinfo_set_item_gen_val("system.uptime", NULL, get_stats_uptime, NULL);
         sysinfo_set_item_gen_data("system.cpus", NULL, get_stats_cpus, NULL);
         sysinfo_set_item_gen_data("system.physmem", NULL, get_stats_physmem, NULL);