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

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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:

• kernel/arch/ia32/include/asm.h (modified) (3 diffs)

kernel/arch/ia32/include/asm.h

@@ -64 +64 @@
 }
 
-#define GEN_READ_REG(reg) NO_TRACE static inline unative_t read_ ##reg (void) \
+#define GEN_READ_REG(reg) NO_TRACE static inline sysarg_t read_ ##reg (void) \
         { \
-                unative_t res; \
+                sysarg_t res; \
                 asm volatile ( \
                         "movl %%" #reg ", %[res]" \
@@ -74 +74 @@
         }
 
-#define GEN_WRITE_REG(reg) NO_TRACE static inline void write_ ##reg (unative_t regn) \
+#define GEN_WRITE_REG(reg) NO_TRACE static inline void write_ ##reg (sysarg_t regn) \
         { \
                 asm volatile ( \
@@ -366 +366 @@
         asm volatile (
                 "invlpg %[addr]\n"
-                :: [addr] "m" (*(unative_t *) addr)
+                :: [addr] "m" (*(sysarg_t *) addr)
         );
 }