From: Greg Kroah-Hartman Date: Wed, 28 Mar 2018 09:55:03 +0000 (+0200) Subject: fix up queue-4.4/mm-vmalloc-add-interfaces-to-free-unmapped-page-table.patch X-Git-Tag: v4.15.14~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9b4c85edde03901c37215eaddd826c75de97423;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-4.4/mm-vmalloc-add-interfaces-to-free-unmapped-page-table.patch --- diff --git a/queue-4.4/mm-vmalloc-add-interfaces-to-free-unmapped-page-table.patch b/queue-4.4/mm-vmalloc-add-interfaces-to-free-unmapped-page-table.patch index 81d17f6b104..dacf30e39e7 100644 --- a/queue-4.4/mm-vmalloc-add-interfaces-to-free-unmapped-page-table.patch +++ b/queue-4.4/mm-vmalloc-add-interfaces-to-free-unmapped-page-table.patch @@ -67,19 +67,20 @@ Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- - arch/arm64/mm/mmu.c | 10 ++++++++++ + arch/arm64/mm/mmu.c | 12 ++++++++++++ arch/x86/mm/pgtable.c | 24 ++++++++++++++++++++++++ include/asm-generic/pgtable.h | 10 ++++++++++ lib/ioremap.c | 6 ++++-- - 4 files changed, 48 insertions(+), 2 deletions(-) + 4 files changed, 50 insertions(+), 2 deletions(-) --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c -@@ -697,3 +697,13 @@ void *__init fixmap_remap_fdt(phys_addr_ +@@ -697,3 +697,15 @@ void *__init fixmap_remap_fdt(phys_addr_ return dt_virt; } + ++#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP +int pud_free_pmd_page(pud_t *pud) +{ + return pud_none(*pud); @@ -89,6 +90,7 @@ Signed-off-by: Greg Kroah-Hartman +{ + return pmd_none(*pmd); +} ++#endif --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -666,4 +666,28 @@ int pmd_clear_huge(pmd_t *pmd)