diff options
| author | Tiejun Chen <tiejun.chen@windriver.com> | 2012-07-11 14:22:46 +1000 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2012-10-07 23:38:00 +0200 |
| commit | 74b9a48f5709e2c0330d14c06977c36cc7f4b4a9 (patch) | |
| tree | f5a544838895d5d76714dfa7f460735b6c72d4b8 /arch | |
| parent | ca9005b38723f9d143e599618bd31d6b8e6083a6 (diff) | |
powerpc: Add "memory" attribute for mfmsr()
commit b416c9a10baae6a177b4f9ee858b8d309542fbef upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'arch')
| -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 32a7c308e47a..6ce44dd83841 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h @@ -870,7 +870,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_PPC64 #define __mtmsrd(v, l) asm volatile("mtmsrd %0," __stringify(l) \ : : "r" (v) : "memory") |