diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2019-02-23 10:30:50 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-02-23 10:30:50 +0100 |
| commit | f68e7927212fa0dbe44c00c144b643c87ab0cf43 (patch) | |
| tree | 27a5a325fb4da4ad91ae1d5e495b35eef3c3a5fa /arch/powerpc/include | |
| parent | powerpc: Move page table dump files in a dedicated subdirectory (diff) | |
| download | linux-f68e7927212fa0dbe44c00c144b643c87ab0cf43.tar.xz linux-f68e7927212fa0dbe44c00c144b643c87ab0cf43.zip | |
Revert "powerpc/book3s32: Reorder _PAGE_XXX flags to simplify TLB handling"
This reverts commit 78ca1108b10927b3d068c8da91352b0f4cd01fc5.
It is causing boot failures with qemu mac99 in at least some
configurations.
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/book3s/32/hash.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/book3s/32/hash.h b/arch/powerpc/include/asm/book3s/32/hash.h index a5907ea4fb40..2a0a467d2985 100644 --- a/arch/powerpc/include/asm/book3s/32/hash.h +++ b/arch/powerpc/include/asm/book3s/32/hash.h @@ -17,9 +17,9 @@ * updating the accessed and modified bits in the page table tree. */ -#define _PAGE_RW 0x001 /* PP = x1: user write access allowed */ -#define _PAGE_USER 0x002 /* PP = 1x: usermode access allowed */ -#define _PAGE_HASHPTE 0x004 /* software: hash_page has made an HPTE for this pte */ +#define _PAGE_PRESENT 0x001 /* software: pte contains a translation */ +#define _PAGE_HASHPTE 0x002 /* hash_page has made an HPTE for this pte */ +#define _PAGE_USER 0x004 /* usermode access allowed */ #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */ #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ @@ -27,7 +27,7 @@ #define _PAGE_DIRTY 0x080 /* C: page changed */ #define _PAGE_ACCESSED 0x100 /* R: page referenced */ #define _PAGE_EXEC 0x200 /* software: exec allowed */ -#define _PAGE_PRESENT 0x400 /* software: pte contains a translation */ +#define _PAGE_RW 0x400 /* software: user write access allowed */ #define _PAGE_SPECIAL 0x800 /* software: Special page */ #ifdef CONFIG_PTE_64BIT |