diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:16:21 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:16:21 -0700 |
| commit | f0b7ed42af0d718fc11d45f6c05948e9a11e08be (patch) | |
| tree | fc1ed011273f1f503570b3595f018eb84b3872a1 /drivers/md/md.c | |
| parent | 4dddf720534a9a14fa9b048e7930dcc55b1b1e40 (diff) | |
| parent | 4d869de174c78ae29ca91b41581367c8092d933d (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-15.09-android
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 631fe3e9c6e5..37ff00d014b4 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -5628,9 +5628,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; |