From 21d381502aed60589794754eb389cc11c20c35f8 Mon Sep 17 00:00:00 2001 From: Tiejun Chen Date: Wed, 11 Jul 2012 14:22:46 +1000 Subject: [PATCH] --- yaml --- r: 313687 b: refs/heads/master c: b416c9a10baae6a177b4f9ee858b8d309542fbef h: refs/heads/master i: 313685: 72f87f9e8059a75174e8f55bb7e836596aacf0a5 313683: 515937b0f016c936ce7405c8c2eeefdeb1761e7d 313679: 023ef0dd58baeede2188d3658eb4ea9d921aa09f v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/reg.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 38860f1c705f..d17477de1069 100644 --- 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 index 2baeb7c8764f..638608677e2a 100644 --- 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")