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

Timestamp:

2007-01-22T13:10:08Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0f3fc9b

Parents:

62c63fc

Message:

asm volatile → asm volatile

File:

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

kernel/arch/ia32/include/barrier.h

@@ -47 +47 @@
  */
 
-#define CS_ENTER_BARRIER()      __asm__ volatile ("" ::: "memory")
-#define CS_LEAVE_BARRIER()      __asm__ volatile ("" ::: "memory")
+#define CS_ENTER_BARRIER()      asm volatile ("" ::: "memory")
+#define CS_LEAVE_BARRIER()      asm volatile ("" ::: "memory")
 
 static inline void cpuid_serialization(void)
 {
-        __asm__ volatile (
+        asm volatile (
                 "xorl %%eax, %%eax\n"
                 "cpuid\n"
@@ -60 +60 @@
 
 #ifdef CONFIG_FENCES_P4
-#       define memory_barrier()         __asm__ volatile ("mfence\n" ::: "memory")
-#       define read_barrier()           __asm__ volatile ("lfence\n" ::: "memory")
+#       define memory_barrier()         asm volatile ("mfence\n" ::: "memory")
+#       define read_barrier()           asm volatile ("lfence\n" ::: "memory")
 #       ifdef CONFIG_WEAK_MEMORY
-#               define write_barrier()  __asm__ volatile ("sfence\n" ::: "memory")
+#               define write_barrier()  asm volatile ("sfence\n" ::: "memory")
 #       else
-#               define write_barrier()  __asm__ volatile( "" ::: "memory");
+#               define write_barrier()  asm volatile( "" ::: "memory");
 #       endif
 #elif CONFIG_FENCES_P3
@@ -71 +71 @@
 #       define read_barrier()           cpuid_serialization()
 #       ifdef CONFIG_WEAK_MEMORY
-#               define write_barrier()  __asm__ volatile ("sfence\n" ::: "memory")
+#               define write_barrier()  asm volatile ("sfence\n" ::: "memory")
 #       else
-#               define write_barrier()  __asm__ volatile( "" ::: "memory");
+#               define write_barrier()  asm volatile( "" ::: "memory");
 #       endif
 #else
@@ -81 +81 @@
 #               define write_barrier()  cpuid_serialization()
 #       else
-#               define write_barrier()  __asm__ volatile( "" ::: "memory");
+#               define write_barrier()  asm volatile( "" ::: "memory");
 #       endif
 #endif