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

Timestamp:

2011-08-19T16:46:22Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ab34cc9

Parents:

633bcc6 (diff), 45059d6b (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) (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