The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 31a9122058bc5f042cb04bcdb8cd9e6c77fdae8d Gitweb: https://git.kernel.org/tip/31a9122058bc5f042cb04bcdb8cd9e6c77fdae8d Author: Anshuman Khandual <anshuman.khandual@xxxxxxx> AuthorDate: Mon, 23 Mar 2020 06:35:42 +05:30 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Mon, 23 Mar 2020 09:11:48 +01:00 x86/mm: Drop pud_mknotpresent() There is an inconsistency between PMD and PUD-based THP page table helpers like the following, as pud_present() does not test for _PAGE_PSE. pmd_present(pmd_mknotpresent(pmd)) : True pud_present(pud_mknotpresent(pud)) : False Drop pud_mknotpresent() as there are no current users. If/when needed back later, pud_present() will also have to be fixed to accommodate _PAGE_PSE. Signed-off-by: Anshuman Khandual <anshuman.khandual@xxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Reviewed-by: Baoquan He <bhe@xxxxxxxxxx> Acked-by: Balbir Singh <bsingharora@xxxxxxxxx> Acked-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/1584925542-13034-1-git-send-email-anshuman.khandual@xxxxxxx --- arch/x86/include/asm/pgtable.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 7e11866..d74dc56 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -595,12 +595,6 @@ static inline pmd_t pmd_mknotpresent(pmd_t pmd) __pgprot(pmd_flags(pmd) & ~(_PAGE_PRESENT|_PAGE_PROTNONE))); } -static inline pud_t pud_mknotpresent(pud_t pud) -{ - return pfn_pud(pud_pfn(pud), - __pgprot(pud_flags(pud) & ~(_PAGE_PRESENT|_PAGE_PROTNONE))); -} - static inline u64 flip_protnone_guard(u64 oldval, u64 val, u64 mask); static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
![]() |