diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-15 14:57:47 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-15 14:57:47 +1000 |
| commit | b5f1bf48f2644ee7151674819f1c15c86dca87f1 (patch) | |
| tree | 2e3524ab1eb0a937c629062bec0bbc661f060bb2 /arch/powerpc/include/asm/book3s/64/mmu-hash.h | |
| parent | 95ec77c06e8e63fff50c497eca0668bf6da39813 (diff) | |
| parent | bfa37087aa04e45f56c41142dfceecb79b8e6ef9 (diff) | |
Merge tag 'powerpc-4.7-5' into next
Pull in the fixes we sent during 4.7, we have code we want to merge into
next that depends on some of them.
Diffstat (limited to 'arch/powerpc/include/asm/book3s/64/mmu-hash.h')
| -rw-r--r-- | arch/powerpc/include/asm/book3s/64/mmu-hash.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/book3s/64/mmu-hash.h b/arch/powerpc/include/asm/book3s/64/mmu-hash.h index 96430922dabb..2c2d55580ae2 100644 --- a/arch/powerpc/include/asm/book3s/64/mmu-hash.h +++ b/arch/powerpc/include/asm/book3s/64/mmu-hash.h @@ -88,6 +88,7 @@ #define HPTE_R_RPN_SHIFT 12 #define HPTE_R_RPN ASM_CONST(0x0ffffffffffff000) #define HPTE_R_PP ASM_CONST(0x0000000000000003) +#define HPTE_R_PPP ASM_CONST(0x8000000000000003) #define HPTE_R_N ASM_CONST(0x0000000000000004) #define HPTE_R_G ASM_CONST(0x0000000000000008) #define HPTE_R_M ASM_CONST(0x0000000000000010) |