Changeset ac92b85 in mainline for kernel/arch/ia64/include/asm.h

Timestamp:

2012-02-25T08:19:18Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ccac91e

Parents:

f577058 (diff), 087768f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

• kernel/arch/ia64/include/asm.h (modified) (6 diffs)

kernel/arch/ia64/include/asm.h

@@ -61 +61 @@
         asm volatile (
                 "mf\n"
+                "mf.a\n"
                 ::: "memory"
         );
@@ -74 +75 @@
         asm volatile (
                 "mf\n"
+                "mf.a\n"
                 ::: "memory"
         );
@@ -87 +89 @@
         asm volatile (
                 "mf\n"
+                "mf.a\n"
                 ::: "memory"
         );
@@ -104 +107 @@
         else
                 v = *port;
+
+        asm volatile (
+                "mf.a\n"
+                ::: "memory"
+        );
         
         return v;
@@ -121 +129 @@
         else
                 v = *port;
+
+        asm volatile (
+                "mf.a\n"
+                ::: "memory"
+        );
         
         return v;
@@ -138 +151 @@
         else
                 v = *port;
+
+        asm volatile (
+                "mf.a\n"
+                ::: "memory"
+        );
 
         return v;