Changeset 5fb32c5 in mainline for kernel/arch/ia32/include/asm.h


Ignore:
Timestamp:
2011-08-20T09:05:14Z (13 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c916dfc
Parents:
921b84f (diff), a0fc4be (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/arch/ia32/include/asm.h

    r921b84f r5fb32c5  
    312312
    313313#ifndef PROCESSOR_i486
     314
    314315/** Write to MSR */
    315316NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value)
    … …  
    336337        return ((uint64_t) dx << 32) | ax;
    337338}
    338 #endif
     339
     340#endif /* PROCESSOR_i486 */
    339341
    340342
Note: See TracChangeset for help on using the changeset viewer.