Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit dc8a5c9935d8e63123fab0d0033f15819351d0bf

Authored by Joe Perches
Committed by Jiri Kosina
1 parent 81d66c70b5
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

s390: Convert vmalloc/memset to vzalloc 

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

Showing 2 changed files with 2 additions and 4 deletions Side-by-side Diff

arch/s390/hypfs/hypfs_diag.c
Diff comments   View file @ dc8a5c9
... ... @@ -562,10 +562,9 @@
562 562 void *base;
563 563  
564 564 buf_size = PAGE_SIZE * (diag204_buf_pages + 1) + sizeof(d204->hdr);
565   - base = vmalloc(buf_size);
  565 + base = vzalloc(buf_size);
566 566 if (!base)
567 567 return -ENOMEM;
568   - memset(base, 0, buf_size);
569 568 d204 = page_align_ptr(base + sizeof(d204->hdr)) - sizeof(d204->hdr);
570 569 rc = diag204_do_store(d204->buf, diag204_buf_pages);
571 570 if (rc) {
drivers/s390/cio/blacklist.c
Diff comments   View file @ dc8a5c9
... ... @@ -335,10 +335,9 @@
335 335 return -EINVAL;
336 336 if (user_len > 65536)
337 337 user_len = 65536;
338   - buf = vmalloc (user_len + 1); /* maybe better use the stack? */
  338 + buf = vzalloc(user_len + 1); /* maybe better use the stack? */
339 339 if (buf == NULL)
340 340 return -ENOMEM;
341   - memset(buf, 0, user_len + 1);
342 341  
343 342 if (strncpy_from_user (buf, user_buf, user_len) < 0) {
344 343 rc = -EFAULT;