Merge tag 'v3.10.87' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / md / md.c

diff --git a/drivers/md/md.c b/drivers/md/md.c
index a07668b2e68bb5b11620d115bbc693b83c4ed6a4..ed0c6a6b79818fef2fe0d818e16c810270e73020 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5629,9 +5629,9 @@ static int get_bitmap_file(struct mddev * mddev, void __user * arg)
        int err = -ENOMEM;
 
        if (md_allow_write(mddev))
-               file = kmalloc(sizeof(*file), GFP_NOIO);
+               file = kzalloc(sizeof(*file), GFP_NOIO);
        else
-               file = kmalloc(sizeof(*file), GFP_KERNEL);
+               file = kzalloc(sizeof(*file), GFP_KERNEL);
 
        if (!file)
                goto out;