diff options
| author |   Tiejun Chen <tiejun.chen@windriver.com> | 2012-07-11 14:22:46 +1000 |
|---|---|---|
| committer |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-11 15:25:45 +1000 |
| commit | b416c9a10baae6a177b4f9ee858b8d309542fbef (patch) | |
| tree | b7e0ce85a57e83e19fccf8ce686ec4b41b00d2ec | |
| parent | powerpc/ftrace: Fix assembly trampoline register usage (diff) | |
| download | linux-dev-b416c9a10baae6a177b4f9ee858b8d309542fbef.tar.xz linux-dev-b416c9a10baae6a177b4f9ee858b8d309542fbef.zip | |
powerpc: Add "memory" attribute for mfmsr()
Add "memory" attribute in inline assembly language as a compiler
barrier to make sure 4.6.x GCC don't reorder mfmsr().
Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: stable@vger.kernel.org
| -rw-r--r-- | arch/powerpc/include/asm/reg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index 2baeb7c8764f..638608677e2a 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/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") |