summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2018-12-28 03:37:45 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2018-12-28 15:11:50 -0500
commit48e178ab0d630b8b60deca64b22b22e68818777e (patch)
tree11569de76f69ed17e53f8a2a73e20ff5c8b45fad
parent9c006972c3fedbea43fde9667686e5949eba9981 (diff)
x86/pgtable: drop pXd_none() checks from pXd_free_pYd_table()
The core code already has a check for pXd_none(), so remove it from the architecture implementation. Link: http://lkml.kernel.org/r/1544120495-17438-4-git-send-email-will.deacon@arm.com Signed-off-by: Will Deacon <will.deacon@arm.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Toshi Kani <toshi.kani@hpe.com> Cc: Chintan Pandya <cpandya@codeaurora.org> Cc: Toshi Kani <toshi.kani@hpe.com> Cc: Michal Hocko <mhocko@suse.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86/mm/pgtable.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
index 59274e2c1ac4..e95a7d6ac8f8 100644
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
@@ -811,9 +811,6 @@ int pud_free_pmd_page(pud_t *pud, unsigned long addr)
811 pte_t *pte; 811 pte_t *pte;
812 int i; 812 int i;
813 813
814 if (pud_none(*pud))
815 return 1;
816
817 pmd = (pmd_t *)pud_page_vaddr(*pud); 814 pmd = (pmd_t *)pud_page_vaddr(*pud);
818 pmd_sv = (pmd_t *)__get_free_page(GFP_KERNEL); 815 pmd_sv = (pmd_t *)__get_free_page(GFP_KERNEL);
819 if (!pmd_sv) 816 if (!pmd_sv)
@@ -855,9 +852,6 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr)
855{ 852{
856 pte_t *pte; 853 pte_t *pte;
857 854
858 if (pmd_none(*pmd))
859 return 1;
860
861 pte = (pte_t *)pmd_page_vaddr(*pmd); 855 pte = (pte_t *)pmd_page_vaddr(*pmd);
862 pmd_clear(pmd); 856 pmd_clear(pmd);
863 857