---

yaml --- r: 313687 b: refs/heads/master c: b416c9a h: refs/heads/master i: 313685: 72f87f9 313683: 515937b 313679: 023ef0d v: v3
git-mirror · Jul 11, 2012 · 21d3815 · 21d3815
1 parent d4ba2b8
commit 21d3815
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd5a42980e1cf327b7240adf5e7b51ea41c23437
+refs/heads/master: b416c9a10baae6a177b4f9ee858b8d309542fbef
diff --git a/trunk/arch/powerpc/include/asm/reg.h b/trunk/arch/powerpc/include/asm/reg.h
@@ -1025,7 +1025,8 @@
 /* Macros for setting and retrieving special purpose registers */
 #ifndef __ASSEMBLY__
 #define mfmsr()		({unsigned long rval; \
-			asm volatile("mfmsr %0" : "=r" (rval)); rval;})
+			asm volatile("mfmsr %0" : "=r" (rval) : \
+						: "memory"); rval;})
 #ifdef CONFIG_PPC_BOOK3S_64
 #define __mtmsrd(v, l)	asm volatile("mtmsrd %0," __stringify(l) \
 				     : : "r" (v) : "memory")