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

Commit 9d31c506 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Vegard Nossum
Browse files

x86: make _PAGE_HIDDEN conditional 



Only _PAGE_HIDDEN when CONFIG_KMEMCHECK is defined, otherwise set it
to 0.  Allows later cleanups.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

[rebased for mainline inclusion]
Signed-off-by: default avatarVegard Nossum <vegard.nossum@gmail.com>
parent 0a4af3b0

arch/x86/include/asm/pgtable_types.h

+6 −1
Original line number Diff line number Diff line
@@ -41,13 +41,18 @@ 
#define _PAGE_GLOBAL	(_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)

#define _PAGE_UNUSED1	(_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)

#define _PAGE_IOMAP	(_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)

#define _PAGE_HIDDEN	(_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)

#define _PAGE_PAT	(_AT(pteval_t, 1) << _PAGE_BIT_PAT)

#define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)

#define _PAGE_SPECIAL	(_AT(pteval_t, 1) << _PAGE_BIT_SPECIAL)

#define _PAGE_CPA_TEST	(_AT(pteval_t, 1) << _PAGE_BIT_CPA_TEST)

#define __HAVE_ARCH_PTE_SPECIAL



#ifdef CONFIG_KMEMCHECK

#define _PAGE_HIDDEN	(_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)

#else

#define _PAGE_HIDDEN	(_AT(pteval_t, 0))

#endif



#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)

#define _PAGE_NX	(_AT(pteval_t, 1) << _PAGE_BIT_NX)

#else