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 81d17f6b1042e2ee391356b795fb9683bfffbc34..dacf30e39e721b164110151120c456596dc43a92 100644 (file)
--- 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 <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- 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 <gregkh@linuxfoundation.org>
 +{
 +      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)