diff options
Diffstat (limited to 'arch/powerpc/include/asm/reg.h')
| -rw-r--r-- | arch/powerpc/include/asm/reg.h | 9 | 
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index e8018d540e8..1170267736d 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h @@ -492,11 +492,13 @@  #define   MMCR0_FCHV	0x00000001UL /* freeze conditions in hypervisor mode */  #define SPRN_MMCR1	798  #define SPRN_MMCRA	0x312 +#define   MMCRA_SDSYNC	0x80000000UL /* SDAR synced with SIAR */  #define   MMCRA_SIHV	0x10000000UL /* state of MSR HV when SIAR set */  #define   MMCRA_SIPR	0x08000000UL /* state of MSR PR when SIAR set */  #define   MMCRA_SLOT	0x07000000UL /* SLOT bits (37-39) */  #define   MMCRA_SLOT_SHIFT	24  #define   MMCRA_SAMPLE_ENABLE 0x00000001UL /* enable sampling */ +#define   POWER6_MMCRA_SDSYNC 0x0000080000000000ULL	/* SDAR/SIAR synced */  #define   POWER6_MMCRA_SIHV   0x0000040000000000ULL  #define   POWER6_MMCRA_SIPR   0x0000020000000000ULL  #define   POWER6_MMCRA_THRM	0x00000020UL @@ -743,17 +745,18 @@  			asm volatile("mfmsr %0" : "=r" (rval)); rval;})  #ifdef CONFIG_PPC64  #define __mtmsrd(v, l)	asm volatile("mtmsrd %0," __stringify(l) \ -				     : : "r" (v)) +				     : : "r" (v) : "memory")  #define mtmsrd(v)	__mtmsrd((v), 0)  #define mtmsr(v)	mtmsrd(v)  #else -#define mtmsr(v)	asm volatile("mtmsr %0" : : "r" (v)) +#define mtmsr(v)	asm volatile("mtmsr %0" : : "r" (v) : "memory")  #endif  #define mfspr(rn)	({unsigned long rval; \  			asm volatile("mfspr %0," __stringify(rn) \  				: "=r" (rval)); rval;}) -#define mtspr(rn, v)	asm volatile("mtspr " __stringify(rn) ",%0" : : "r" (v)) +#define mtspr(rn, v)	asm volatile("mtspr " __stringify(rn) ",%0" : : "r" (v)\ +				     : "memory")  #ifdef __powerpc64__  #ifdef CONFIG_PPC_CELL  |