Changeset d767cb1 in mainline for kernel/arch/ia32/include

Timestamp:

2011-08-19T11:59:50Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7beb220

Parents:

c2cf033 (diff), ac7f81d (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 i486 support from Martin Sucha.

Location:

kernel/arch/ia32/include

Files:

• asm.h (modified) (2 diffs)
• atomic.h (modified) (1 diff)
• cycle.h (modified) (2 diffs)

kernel/arch/ia32/include/asm.h

@@ -311 +311 @@
 }
 
+#ifndef PROCESSOR_i486
 /** Write to MSR */
 NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value)
@@ -335 +336 @@
         return ((uint64_t) dx << 32) | ax;
 }
+#endif
 
 

kernel/arch/ia32/include/atomic.h

@@ -121 +121 @@
         asm volatile (
                 "0:\n"
+#ifndef PROCESSOR_i486
                 "pause\n"        /* Pentium 4's HT love this instruction */
+#endif
                 "mov %[count], %[tmp]\n"
                 "testl %[tmp], %[tmp]\n"

kernel/arch/ia32/include/cycle.h

@@ -40 +40 @@
 NO_TRACE static inline uint64_t get_cycle(void)
 {
+#ifdef PROCESSOR_i486
+        return 0;
+#else
         uint64_t v;
         
@@ -48 +51 @@
         
         return v;
+#endif
 }