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


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/arch/ia32/include/asm.h

    rd70d80ed rea28272  
    6464}
    6565
    66 #define GEN_READ_REG(reg) NO_TRACE static inline unative_t read_ ##reg (void) \
     66#define GEN_READ_REG(reg) NO_TRACE static inline sysarg_t read_ ##reg (void) \
    6767        { \
    68                 unative_t res; \
     68                sysarg_t res; \
    6969                asm volatile ( \
    7070                        "movl %%" #reg ", %[res]" \
     
    7474        }
    7575
    76 #define GEN_WRITE_REG(reg) NO_TRACE static inline void write_ ##reg (unative_t regn) \
     76#define GEN_WRITE_REG(reg) NO_TRACE static inline void write_ ##reg (sysarg_t regn) \
    7777        { \
    7878                asm volatile ( \
     
    366366        asm volatile (
    367367                "invlpg %[addr]\n"
    368                 :: [addr] "m" (*(unative_t *) addr)
     368                :: [addr] "m" (*(sysarg_t *) addr)
    369369        );
    370370}
Note: See TracChangeset for help on using the changeset viewer.