Changeset f126c87 in mainline for kernel/arch/amd64/include


Ignore:
Timestamp:
2016-09-01T16:46:27Z (10 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2a2fbc8
Parents:
9befb0d (diff), bdfdc51c (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 from mainline.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/amd64/include/arch/asm.h

    r9befb0d rf126c87  
    235235 *
    236236 * @return Current interrupt priority level.
     237 *
    237238 */
    238239NO_TRACE static inline ipl_t interrupts_read(void)
    … …  
    246247 *
    247248 * @return Old interrupt priority level.
     249 *
    248250 */
    249251NO_TRACE static inline ipl_t interrupts_enable(void)
    … …  
    261263 *
    262264 * @return Old interrupt priority level.
     265 *
    263266 */
    264267NO_TRACE static inline ipl_t interrupts_disable(void)
Note: See TracChangeset for help on using the changeset viewer.