diff options
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/pgtable.h | 5 | ||||
| -rw-r--r-- | arch/x86/include/asm/pgtable_types.h | 13 |
2 files changed, 0 insertions, 18 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index f735c3016325..09f9e1e00e3b 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h | |||
| @@ -667,11 +667,6 @@ static inline bool pte_accessible(struct mm_struct *mm, pte_t a) | |||
| 667 | return false; | 667 | return false; |
| 668 | } | 668 | } |
| 669 | 669 | ||
| 670 | static inline int pte_hidden(pte_t pte) | ||
| 671 | { | ||
| 672 | return pte_flags(pte) & _PAGE_HIDDEN; | ||
| 673 | } | ||
| 674 | |||
| 675 | static inline int pmd_present(pmd_t pmd) | 670 | static inline int pmd_present(pmd_t pmd) |
| 676 | { | 671 | { |
| 677 | /* | 672 | /* |
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h index 9e9b05fc4860..3696398a9475 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | 32 | ||
| 33 | #define _PAGE_BIT_SPECIAL _PAGE_BIT_SOFTW1 | 33 | #define _PAGE_BIT_SPECIAL _PAGE_BIT_SOFTW1 |
| 34 | #define _PAGE_BIT_CPA_TEST _PAGE_BIT_SOFTW1 | 34 | #define _PAGE_BIT_CPA_TEST _PAGE_BIT_SOFTW1 |
| 35 | #define _PAGE_BIT_HIDDEN _PAGE_BIT_SOFTW3 /* hidden by kmemcheck */ | ||
| 36 | #define _PAGE_BIT_SOFT_DIRTY _PAGE_BIT_SOFTW3 /* software dirty tracking */ | 35 | #define _PAGE_BIT_SOFT_DIRTY _PAGE_BIT_SOFTW3 /* software dirty tracking */ |
| 37 | #define _PAGE_BIT_DEVMAP _PAGE_BIT_SOFTW4 | 36 | #define _PAGE_BIT_DEVMAP _PAGE_BIT_SOFTW4 |
| 38 | 37 | ||
| @@ -79,18 +78,6 @@ | |||
| 79 | #define _PAGE_KNL_ERRATUM_MASK 0 | 78 | #define _PAGE_KNL_ERRATUM_MASK 0 |
| 80 | #endif | 79 | #endif |
| 81 | 80 | ||
| 82 | #ifdef CONFIG_KMEMCHECK | ||
| 83 | #define _PAGE_HIDDEN (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN) | ||
| 84 | #else | ||
| 85 | #define _PAGE_HIDDEN (_AT(pteval_t, 0)) | ||
| 86 | #endif | ||
| 87 | |||
| 88 | /* | ||
| 89 | * The same hidden bit is used by kmemcheck, but since kmemcheck | ||
| 90 | * works on kernel pages while soft-dirty engine on user space, | ||
| 91 | * they do not conflict with each other. | ||
| 92 | */ | ||
| 93 | |||
| 94 | #ifdef CONFIG_MEM_SOFT_DIRTY | 81 | #ifdef CONFIG_MEM_SOFT_DIRTY |
| 95 | #define _PAGE_SOFT_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_SOFT_DIRTY) | 82 | #define _PAGE_SOFT_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_SOFT_DIRTY) |
| 96 | #else | 83 | #else |
