Changeset ea28272 in mainline for kernel/generic/src/time/clock.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/time/clock.c

    rd70d80ed rea28272  
    7070 *
    7171 */
    72 static unative_t secfrag = 0;
     72static sysarg_t secfrag = 0;
    7373
    7474/** Initialize realtime clock counter
     
    100100         *
    101101         */
    102         sysinfo_set_item_val("clock.cacheable", NULL, (unative_t) true);
    103         sysinfo_set_item_val("clock.faddr", NULL, (unative_t) faddr);
     102        sysinfo_set_item_val("clock.cacheable", NULL, (sysarg_t) true);
     103        sysinfo_set_item_val("clock.faddr", NULL, (sysarg_t) faddr);
    104104}
    105105
Note: See TracChangeset for help on using the changeset viewer.