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

Commit 82bc03fc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: add PWT to NOCACHE flags 



add PWT bit to NOCACHE flags. No real difference to CPUs, but needed
later for PAT.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7375931a

include/asm-x86/pgtable_32.h

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ void paging_init(void); 
extern unsigned long long __PAGE_KERNEL, __PAGE_KERNEL_EXEC;

#define __PAGE_KERNEL_RO		(__PAGE_KERNEL & ~_PAGE_RW)

#define __PAGE_KERNEL_RX		(__PAGE_KERNEL_EXEC & ~_PAGE_RW)

#define __PAGE_KERNEL_NOCACHE		(__PAGE_KERNEL | _PAGE_PCD)

#define __PAGE_KERNEL_NOCACHE		(__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)

#define __PAGE_KERNEL_LARGE		(__PAGE_KERNEL | _PAGE_PSE)

#define __PAGE_KERNEL_LARGE_EXEC	(__PAGE_KERNEL_EXEC | _PAGE_PSE)

include/asm-x86/pgtable_64.h

+2 −2
Original line number Diff line number Diff line
@@ -189,13 +189,13 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long 
#define __PAGE_KERNEL_EXEC \

	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED)

#define __PAGE_KERNEL_NOCACHE \

	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_PCD | _PAGE_ACCESSED | _PAGE_NX)

	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_PCD | _PAGE_PWT | _PAGE_ACCESSED | _PAGE_NX)

#define __PAGE_KERNEL_RO \

	(_PAGE_PRESENT | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_NX)

#define __PAGE_KERNEL_VSYSCALL \

	(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)

#define __PAGE_KERNEL_VSYSCALL_NOCACHE \

	(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED | _PAGE_PCD)

	(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED | _PAGE_PCD | _PAGE_PWT)

#define __PAGE_KERNEL_LARGE \

	(__PAGE_KERNEL | _PAGE_PSE)

#define __PAGE_KERNEL_LARGE_EXEC \