Changes in kernel/arch/ia32/include/barrier.h [7a0359b:1ea99cc] in mainline

File:

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

kernel/arch/ia32/include/barrier.h

@@ -36 +36 @@
 #define KERN_ia32_BARRIER_H_
 
-#include <trace.h>
-
 /*
  * NOTE:
@@ -52 +50 @@
 #define CS_LEAVE_BARRIER()  asm volatile ("" ::: "memory")
 
-NO_TRACE static inline void cpuid_serialization(void)
+static inline void cpuid_serialization(void)
 {
+#ifndef __IN_SHARED_LIBC__
         asm volatile (
                 "xorl %%eax, %%eax\n"
@@ -59 +58 @@
                 ::: "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
 }