Changeset e7b7be3f in mainline for kernel/arch/amd64/include

Timestamp:

2007-01-22T13:10:08Z (19 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

Location:

kernel/arch/amd64/include

Files:

• asm.h (modified) (1 diff)
• atomic.h (modified) (6 diffs)
• memstr.h (modified) (4 diffs)

kernel/arch/amd64/include/asm.h

@@ -53 +53 @@
         uintptr_t v;
         
-        __asm__ volatile ("andq %%rsp, %0\n" : "=r" (v) : "0" (~((uint64_t)STACK_SIZE-1)));
+        asm volatile ("andq %%rsp, %0\n" : "=r" (v) : "0" (~((uint64_t)STACK_SIZE-1)));
         
         return v;

kernel/arch/amd64/include/atomic.h

@@ -43 +43 @@
 static inline void atomic_inc(atomic_t *val) {
 #ifdef CONFIG_SMP
-        __asm__ volatile ("lock incq %0\n" : "=m" (val->count));
+        asm volatile ("lock incq %0\n" : "=m" (val->count));
 #else
-        __asm__ volatile ("incq %0\n" : "=m" (val->count));
+        asm volatile ("incq %0\n" : "=m" (val->count));
 #endif /* CONFIG_SMP */
 }
@@ -51 +51 @@
 static inline void atomic_dec(atomic_t *val) {
 #ifdef CONFIG_SMP
-        __asm__ volatile ("lock decq %0\n" : "=m" (val->count));
+        asm volatile ("lock decq %0\n" : "=m" (val->count));
 #else
-        __asm__ volatile ("decq %0\n" : "=m" (val->count));
+        asm volatile ("decq %0\n" : "=m" (val->count));
 #endif /* CONFIG_SMP */
 }
@@ -61 +61 @@
         long r = 1;
 
-        __asm__ volatile (
+        asm volatile (
                 "lock xaddq %1, %0\n"
                 : "=m" (val->count), "+r" (r)
@@ -73 +73 @@
         long r = -1;
         
-        __asm__ volatile (
+        asm volatile (
                 "lock xaddq %1, %0\n"
                 : "=m" (val->count), "+r" (r)
@@ -87 +87 @@
         uint64_t v;
         
-        __asm__ volatile (
+        asm volatile (
                 "movq $1, %0\n"
                 "xchgq %0, %1\n"
@@ -103 +103 @@
 
         preemption_disable();
-        __asm__ volatile (
+        asm volatile (
                 "0:;"
 #ifdef CONFIG_HT

kernel/arch/amd64/include/memstr.h

@@ -52 +52 @@
         unative_t d0, d1, d2;
 
-        __asm__ __volatile__(
+        asm volatile(
                 "rep movsq\n\t"
                 "movq %4, %%rcx\n\t"
@@ -83 +83 @@
         unative_t ret;
         
-        __asm__ (
+        asm (
                 "repe cmpsb\n\t"
                 "je 1f\n\t"
@@ -109 +109 @@
         unative_t d0, d1;
         
-        __asm__ __volatile__ (
+        asm volatile (
                 "rep stosw\n\t"
                 : "=&D" (d0), "=&c" (d1), "=a" (x)
@@ -131 +131 @@
         unative_t d0, d1;
         
-        __asm__ __volatile__ (
+        asm volatile (
                 "rep stosb\n\t"
                 : "=&D" (d0), "=&c" (d1), "=a" (x)