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


Ignore:
Timestamp:
2010-12-30T13:43:27Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade
Children:
d770deb
Parents:
d70d80ed (diff), f418e51 (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

    rd70d80ed rea28272  
    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.