Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b416c9a1 authored by Tiejun Chen's avatar Tiejun Chen Committed by Benjamin Herrenschmidt
Browse files

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: default avatarTiejun Chen <tiejun.chen@windriver.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
CC: stable@vger.kernel.org
parent fd5a4298

arch/powerpc/include/asm/reg.h

+2 −1
Original line number Diff line number Diff line
@@ -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")