17 files changed, 36 insertions, 103 deletions

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 534a60ae282e..0eca3812527e 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1200,10 +1200,7 @@ error:
         while (i--)
                 if (pages[i])
                         __free_pages(pages[i], 0);
-        if (array_size <= PAGE_SIZE)
-                kfree(pages);
-        else
-                vfree(pages);
+        kvfree(pages);
         return NULL;
 }
 
@@ -1211,7 +1208,6 @@ static int __iommu_free_buffer(struct device *dev, struct page **pages,
                                size_t size, struct dma_attrs *attrs)
 {
         int count = size >> PAGE_SHIFT;
-        int array_size = count * sizeof(struct page *);
         int i;
 
         if (dma_get_attr(DMA_ATTR_FORCE_CONTIGUOUS, attrs)) {
@@ -1222,10 +1218,7 @@ static int __iommu_free_buffer(struct device *dev, struct page **pages,
                                 __free_pages(pages[i], 0);
         }
 
-        if (array_size <= PAGE_SIZE)
-                kfree(pages);
-        else
-                vfree(pages);
+        kvfree(pages);
         return 0;
 }
 
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index 6682c5daf742..6e6bc1059301 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -32,6 +32,7 @@
 #include <linux/hardirq.h>
 #include <linux/pstore.h>
 #include <linux/vmalloc.h>
+#include <linux/mm.h> /* kvfree() */
 #include <acpi/apei.h>
 
 #include "apei-internal.h"
@@ -532,10 +533,7 @@ retry:
                         return -ENOMEM;
                 memcpy(new_entries, entries,
                        erst_record_id_cache.len * sizeof(entries[0]));
-                if (erst_record_id_cache.size < PAGE_SIZE)
-                        kfree(entries);
-                else
-                        vfree(entries);
+                kvfree(entries);
                 erst_record_id_cache.entries = entries = new_entries;
                 erst_record_id_cache.size = new_size;
         }
diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
index 0dabc9b93725..92d6fc020a65 100644
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
@@ -364,12 +364,9 @@ static void bm_free_pages(struct page **pages, unsigned long number)
         }
 }
 
-static void bm_vk_free(void *ptr, int v)
+static inline void bm_vk_free(void *ptr)
 {
-        if (v)
-                vfree(ptr);
-        else
-                kfree(ptr);
+        kvfree(ptr);
 }
 
 /*
@@ -379,7 +376,7 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want)
 {
         struct page **old_pages = b->bm_pages;
         struct page **new_pages, *page;
-        unsigned int i, bytes, vmalloced = 0;
+        unsigned int i, bytes;
         unsigned long have = b->bm_number_of_pages;
 
         BUG_ON(have == 0 && old_pages != NULL);
@@ -401,7 +398,6 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want)
                                 PAGE_KERNEL);
                 if (!new_pages)
                         return NULL;
-                vmalloced = 1;
         }
 
         if (want >= have) {
@@ -411,7 +407,7 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want)
                         page = alloc_page(GFP_NOIO | __GFP_HIGHMEM);
                         if (!page) {
                                 bm_free_pages(new_pages + have, i - have);
-                                bm_vk_free(new_pages, vmalloced);
+                                bm_vk_free(new_pages);
                                 return NULL;
                         }
                         /* we want to know which page it is
@@ -427,11 +423,6 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want)
                 */
         }
 
-        if (vmalloced)
-                b->bm_flags |= BM_P_VMALLOCED;
-        else
-                b->bm_flags &= ~BM_P_VMALLOCED;
-
         return new_pages;
 }
 
@@ -469,7 +460,7 @@ void drbd_bm_cleanup(struct drbd_device *device)
         if (!expect(device->bitmap))
                 return;
         bm_free_pages(device->bitmap->bm_pages, device->bitmap->bm_number_of_pages);
-        bm_vk_free(device->bitmap->bm_pages, (BM_P_VMALLOCED & device->bitmap->bm_flags));
+        bm_vk_free(device->bitmap->bm_pages);
         kfree(device->bitmap);
         device->bitmap = NULL;
 }
@@ -643,7 +634,6 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi
         unsigned long want, have, onpages; /* number of pages */
         struct page **npages, **opages = NULL;
         int err = 0, growing;
-        int opages_vmalloced;
 
         if (!expect(b))
                 return -ENOMEM;
@@ -656,8 +646,6 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi
         if (capacity == b->bm_dev_capacity)
                 goto out;
 
-        opages_vmalloced = (BM_P_VMALLOCED & b->bm_flags);
-
         if (capacity == 0) {
                 spin_lock_irq(&b->bm_lock);
                 opages = b->bm_pages;
@@ -671,7 +659,7 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi
                 b->bm_dev_capacity = 0;
                 spin_unlock_irq(&b->bm_lock);
                 bm_free_pages(opages, onpages);
-                bm_vk_free(opages, opages_vmalloced);
+                bm_vk_free(opages);
                 goto out;
         }
         bits  = BM_SECT_TO_BIT(ALIGN(capacity, BM_SECT_PER_BIT));
@@ -744,7 +732,7 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi
 
         spin_unlock_irq(&b->bm_lock);
         if (opages != npages)
-                bm_vk_free(opages, opages_vmalloced);
+                bm_vk_free(opages);