Changeset 544a2e4 in mainline for kernel/arch/ia32/include/barrier.h

Timestamp:

2011-05-30T21:37:43Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b712b60

Parents:

18ba2e4f (diff), 0743493a (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/barrier.h (modified) (2 diffs)

kernel/arch/ia32/include/barrier.h

@@ -54 +54 @@
 NO_TRACE static inline void cpuid_serialization(void)
 {
+#ifndef __IN_SHARED_LIBC__
         asm volatile (
                 "xorl %%eax, %%eax\n"
@@ -59 +60 @@
                 ::: "eax", "ebx", "ecx", "edx", "memory"
         );
+#else
+        /* Must not clobber PIC register ebx */
+        asm volatile (
+                "movl %%ebx, %%esi\n"
+                "xorl %%eax, %%eax\n"
+                "cpuid\n"
+                "movl %%esi, %%ebx\n"
+                ::: "eax", "ecx", "edx", "esi", "memory"
+        );
+#endif
 }