Merge pull request #4546 from jjhursey/fix/v3.0.x/ppc-asm-eieio

hppritcha · web-flow · commit fdc675906a0b · 2017-12-05T09:07:17.000-07:00
ppc/asm: Fix opal_atomic_wmb definition
diff --git a/opal/include/opal/sys/powerpc/atomic.h b/opal/include/opal/sys/powerpc/atomic.h
@@ -83,7 +83,7 @@ void opal_atomic_rmb(void)
 static inline
 void opal_atomic_wmb(void)
 {
-    RMB();
+    WMB();
 }
 
 static inline
@@ -109,7 +109,7 @@ void opal_atomic_isync(void)
 #pragma mc_func opal_atomic_rmb { "7c2004ac" }         /* lwsync  */
 #pragma reg_killed_by opal_atomic_rmb                  /* none */
 
-#pragma mc_func opal_atomic_wmb { "7c0006ac" }         /* eieio */
+#pragma mc_func opal_atomic_wmb { "7c2004ac" }         /* lwsync */
 #pragma reg_killed_by opal_atomic_wmb                  /* none */
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ void opal_atomic_rmb(void)`
`83`	`83`	`static inline`
`84`	`84`	`void opal_atomic_wmb(void)`
`85`	`85`	`{`
`86`		`- RMB();`
	`86`	`+ WMB();`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`static inline`
`@@ -109,7 +109,7 @@ void opal_atomic_isync(void)`
`109`	`109`	`#pragma mc_func opal_atomic_rmb { "7c2004ac" } /* lwsync */`
`110`	`110`	`#pragma reg_killed_by opal_atomic_rmb /* none */`
`111`	`111`
`112`		`-#pragma mc_func opal_atomic_wmb { "7c0006ac" } /* eieio */`
	`112`	`+#pragma mc_func opal_atomic_wmb { "7c2004ac" } /* lwsync */`
`113`	`113`	`#pragma reg_killed_by opal_atomic_wmb /* none */`
`114`	`114`
`115`	`115`	`#endif`