Changeset e7b7be3f in mainline for kernel/arch/ia64/include/asm.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/ia64/include/asm.h (modified) (17 diffs)

kernel/arch/ia64/include/asm.h

@@ -50 +50 @@
         uint64_t v;
 
-        __asm__ volatile ("and %0 = %1, r12" : "=r" (v) : "r" (~(STACK_SIZE-1)));
+        asm volatile ("and %0 = %1, r12" : "=r" (v) : "r" (~(STACK_SIZE-1)));
         
         return v;
@@ -63 +63 @@
         uint64_t v;
         
-        __asm__ volatile ("mov %0 = psr\n" : "=r" (v));
+        asm volatile ("mov %0 = psr\n" : "=r" (v));
         
         return v;
@@ -76 +76 @@
         uint64_t v;
         
-        __asm__ volatile ("mov %0 = cr.iva\n" : "=r" (v));
+        asm volatile ("mov %0 = cr.iva\n" : "=r" (v));
         
         return v;
@@ -87 +87 @@
 static inline void iva_write(uint64_t v)
 {
-        __asm__ volatile ("mov cr.iva = %0\n" : : "r" (v));
+        asm volatile ("mov cr.iva = %0\n" : : "r" (v));
 }
 
@@ -99 +99 @@
         uint64_t v;
         
-        __asm__ volatile ("mov %0 = cr.ivr\n" : "=r" (v));
+        asm volatile ("mov %0 = cr.ivr\n" : "=r" (v));
         
         return v;
@@ -110 +110 @@
 static inline void itc_write(uint64_t v)
 {
-        __asm__ volatile ("mov ar.itc = %0\n" : : "r" (v));
+        asm volatile ("mov ar.itc = %0\n" : : "r" (v));
 }
 
@@ -121 +121 @@
         uint64_t v;
         
-        __asm__ volatile ("mov %0 = ar.itc\n" : "=r" (v));
+        asm volatile ("mov %0 = ar.itc\n" : "=r" (v));
         
         return v;
@@ -132 +132 @@
 static inline void itm_write(uint64_t v)
 {
-        __asm__ volatile ("mov cr.itm = %0\n" : : "r" (v));
+        asm volatile ("mov cr.itm = %0\n" : : "r" (v));
 }
 
@@ -143 +143 @@
         uint64_t v;
         
-        __asm__ volatile ("mov %0 = cr.itm\n" : "=r" (v));
+        asm volatile ("mov %0 = cr.itm\n" : "=r" (v));
         
         return v;
@@ -156 +156 @@
         uint64_t v;
         
-        __asm__ volatile ("mov %0 = cr.itv\n" : "=r" (v));
+        asm volatile ("mov %0 = cr.itv\n" : "=r" (v));
         
         return v;
@@ -167 +167 @@
 static inline void itv_write(uint64_t v)
 {
-        __asm__ volatile ("mov cr.itv = %0\n" : : "r" (v));
+        asm volatile ("mov cr.itv = %0\n" : : "r" (v));
 }
 
@@ -176 +176 @@
 static inline void eoi_write(uint64_t v)
 {
-        __asm__ volatile ("mov cr.eoi = %0\n" : : "r" (v));
+        asm volatile ("mov cr.eoi = %0\n" : : "r" (v));
 }
 
@@ -187 +187 @@
         uint64_t v;
 
-        __asm__ volatile ("mov %0 = cr.tpr\n"  : "=r" (v));
+        asm volatile ("mov %0 = cr.tpr\n"  : "=r" (v));
         
         return v;
@@ -198 +198 @@
 static inline void tpr_write(uint64_t v)
 {
-        __asm__ volatile ("mov cr.tpr = %0\n" : : "r" (v));
+        asm volatile ("mov cr.tpr = %0\n" : : "r" (v));
 }
 
@@ -212 +212 @@
         uint64_t v;
         
-        __asm__ volatile (
+        asm volatile (
                 "mov %0 = psr\n"
                 "rsm %1\n"
@@ -233 +233 @@
         uint64_t v;
         
-        __asm__ volatile (
+        asm volatile (
                 "mov %0 = psr\n"
                 "ssm %1\n"
@@ -271 +271 @@
 static inline void pk_disable(void)
 {
-        __asm__ volatile ("rsm %0\n" : : "i" (PSR_PK_MASK));
+        asm volatile ("rsm %0\n" : : "i" (PSR_PK_MASK));
 }