Changeset 357b5f5 in mainline for kernel/arch/amd64/include

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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.

Location:

kernel/arch/amd64/include

Files:

• asm.h (modified) (4 diffs)
• interrupt.h (modified) (2 diffs)
• proc/thread.h (modified) (1 diff)
• types.h (modified) (2 diffs)

kernel/arch/amd64/include/asm.h

@@ -304 +304 @@
 }
 
-NO_TRACE static inline unative_t read_msr(uint32_t msr)
+NO_TRACE static inline sysarg_t read_msr(uint32_t msr)
 {
         uint32_t ax, dx;
@@ -343 +343 @@
         asm volatile (
                 "invlpg %[addr]\n"
-                :: [addr] "m" (*((unative_t *) addr))
+                :: [addr] "m" (*((sysarg_t *) addr))
         );
 }
@@ -398 +398 @@
 }
 
-#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 ( \
                         "movq %%" #reg ", %[res]" \
@@ -408 +408 @@
         }
 
-#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 ( \

kernel/arch/amd64/include/interrupt.h

@@ -55 +55 @@
 #define IRQ_PIC_SPUR  7
 #define IRQ_MOUSE     12
-#define IRQ_DP8390    9
+#define IRQ_NE2000    9
 
 /* This one must have four least significant bits set to ones */
@@ -74 +74 @@
 extern void (* enable_irqs_function)(uint16_t);
 extern void (* eoi_function)(void);
+extern const char *irqs_info;
 
 extern void interrupt_init(void);

kernel/arch/amd64/include/proc/thread.h

@@ -41 +41 @@
 
 typedef struct {
-        unative_t tls;
+        sysarg_t tls;
         /** User and kernel RSP for syscalls. */
         uint64_t syscall_rsp[2];

kernel/arch/amd64/include/types.h

@@ -43 +43 @@
 typedef uint64_t ipl_t;
 
-typedef uint64_t unative_t;
+typedef uint64_t sysarg_t;
 typedef int64_t native_t;
 typedef uint64_t atomic_count_t;
@@ -54 +54 @@
 
 #define PRIdn  PRId64  /**< Format for native_t. */
-#define PRIun  PRIu64  /**< Format for unative_t. */
-#define PRIxn  PRIx64  /**< Format for hexadecimal unative_t. */
+#define PRIun  PRIu64  /**< Format for sysarg_t. */
+#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t. */
 #define PRIua  PRIu64  /**< Format for atomic_count_t. */