X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=arch_x86.h;h=8a5732536c9d3106af919b5467dab1f58c5f9313;hp=cc3ab012c557f38db5df6c7b5c829a13ceaf511a;hb=ba59a0c7b244a0939a2298fc76a9002436ef9674;hpb=0114ba7f23f86623c237baeb28ec8e4b39b9bb84

diff --git a/arch_x86.h b/arch_x86.h
index cc3ab01..8a57325 100644
--- a/arch_x86.h
+++ b/arch_x86.h
@@ -84,10 +84,9 @@
 /* Nop everywhere except on alpha. */
 #define smp_read_barrier_depends()
 
-/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
 static inline void rep_nop(void)
 {
-	asm volatile("rep; nop" ::: "memory");
+	asm volatile("rep; nop" : : : "memory");
 }
 
 static inline void cpu_relax(void)
@@ -95,6 +94,26 @@ static inline void cpu_relax(void)
 	rep_nop();
 }
 
+/*
+ * Serialize core instruction execution. Also acts as a compiler barrier.
+ */
+#ifdef __PIC__
+/*
+ * Cannot use cpuid because it clobbers the ebx register and clashes
+ * with -fPIC :
+ * error: PIC register 'ebx' clobbered in 'asm'
+ */
+static inline void sync_core(void)
+{
+	mb();
+}
+#else
+static inline void sync_core(void)
+{
+	asm volatile("cpuid" : : : "memory", "eax", "ebx", "ecx", "edx");
+}
+#endif
+
 #define rdtscll(val)							  \
 	do {						  		  \
 	     unsigned int __a, __d;					  \