Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[karo-tx-linux.git] / mm / frame_vector.c

diff --git a/mm/frame_vector.c b/mm/frame_vector.c
index db77dcb38afda3d3720a228e14236fb2e324f929..72ebec18629c2529fc6d2b6faeb46040adcac611 100644 (file)
--- a/mm/frame_vector.c
+++ b/mm/frame_vector.c
@@ -200,10 +200,7 @@ struct frame_vector *frame_vector_create(unsigned int nr_frames)
         * Avoid higher order allocations, use vmalloc instead. It should
         * be rare anyway.
         */
-       if (size <= PAGE_SIZE)
-               vec = kmalloc(size, GFP_KERNEL);
-       else
-               vec = vmalloc(size);
+       vec = kvmalloc(size, GFP_KERNEL);
        if (!vec)
                return NULL;
        vec->nr_allocated = nr_frames;