Merge tag 'for-linus-20130509' of git://git.infradead.org/~dwmw2/random-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / media / v4l2-core / videobuf2-vmalloc.c

diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
index a47fd4f589a14bc9a466eee544a582659e25babd..313d9771b2bc9499e0d02e389b4ad480282fcb79 100644 (file)
--- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
+++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
@@ -35,11 +35,11 @@ struct vb2_vmalloc_buf {
 
 static void vb2_vmalloc_put(void *buf_priv);
 
-static void *vb2_vmalloc_alloc(void *alloc_ctx, unsigned long size)
+static void *vb2_vmalloc_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_flags)
 {
        struct vb2_vmalloc_buf *buf;
 
-       buf = kzalloc(sizeof(*buf), GFP_KERNEL);
+       buf = kzalloc(sizeof(*buf), GFP_KERNEL | gfp_flags);
        if (!buf)
                return NULL;