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

Timestamp:

2012-02-24T18:04:56Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2578199

Parents:

b9bbaad (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:

Mainline changes.

Registering OHCI irq handler panics on ppc32.

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;