Changeset cefb126 in mainline for kernel/generic/include/cpu.h


Ignore:
Timestamp:
2010-07-02T14:19:30Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
89c57b6
Parents:
fe7abd0 (diff), e3ee9b9 (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/include/cpu.h

    rfe7abd0 rcefb126  
    7272        size_t missed_clock_ticks;
    7373       
     74        /**
     75         * Processor cycle accounting.
     76         */
    7477        bool idle;
    75         uint64_t idle_ticks;
    76         uint64_t busy_ticks;
     78        uint64_t last_cycle;
     79        uint64_t idle_cycles;
     80        uint64_t busy_cycles;
    7781       
    7882        /**
Note: See TracChangeset for help on using the changeset viewer.