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


Ignore:
Timestamp:
2011-01-23T20:09:13Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fdb9982c
Parents:
cead2aa (diff), 7e36c8d (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:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/src/sysinfo/stats.c

    rcead2aa r357b5f5  
    8787 *
    8888 */
    89 static unative_t get_stats_uptime(struct sysinfo_item *item)
     89static sysarg_t get_stats_uptime(struct sysinfo_item *item)
    9090{
    9191        /* This doesn't have to be very accurate */
Note: See TracChangeset for help on using the changeset viewer.