1 files changed, 7 insertions, 1 deletions

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 49abccf29a29..a5bbdd3b5d67 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -29,6 +29,7 @@
 #include <linux/atomic.h>
 #include <linux/compiler.h>
 #include <linux/llist.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
 #include <asm/tlbflush.h>
@@ -74,6 +75,8 @@ static void vunmap_pmd_range(pud_t *pud, unsigned long addr, unsigned long end)
         pmd = pmd_offset(pud, addr);
         do {
                 next = pmd_addr_end(addr, end);
+                if (pmd_clear_huge(pmd))
+                        continue;
                 if (pmd_none_or_clear_bad(pmd))
                         continue;
                 vunmap_pte_range(pmd, addr, next);
@@ -88,6 +91,8 @@ static void vunmap_pud_range(pgd_t *pgd, unsigned long addr, unsigned long end)
         pud = pud_offset(pgd, addr);
         do {
                 next = pud_addr_end(addr, end);
+                if (pud_clear_huge(pud))
+                        continue;
                 if (pud_none_or_clear_bad(pud))
                         continue;
                 vunmap_pmd_range(pud, addr, next);
@@ -1314,7 +1319,8 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
 
         BUG_ON(in_interrupt());
         if (flags & VM_IOREMAP)
-                align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
+                align = 1ul << clamp_t(int, fls_long(size),
+                                       PAGE_SHIFT, IOREMAP_MAX_ORDER);
 
         size = PAGE_ALIGN(size);
         if (unlikely(!size))