diff options
| author | Joe Perches <joe@perches.com> | 2011-05-28 10:36:21 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 13:55:02 +0200 |
| commit | dc8a5c9935d8e63123fab0d0033f15819351d0bf (patch) | |
| tree | 55c4f69ea8901602b798c66363ca596bf4f92fbf | |
| parent | 81d66c70b546e7be5d7e1f1ca9676fd17c5973af (diff) | |
| download | linux-3.10-dc8a5c9935d8e63123fab0d0033f15819351d0bf.tar.gz linux-3.10-dc8a5c9935d8e63123fab0d0033f15819351d0bf.tar.bz2 linux-3.10-dc8a5c9935d8e63123fab0d0033f15819351d0bf.zip | |
s390: Convert vmalloc/memset to vzalloc
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | arch/s390/hypfs/hypfs_diag.c | 3 | ||||
| -rw-r--r-- | drivers/s390/cio/blacklist.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c index 6023c6dc1fb..74c8f5e76ce 100644 --- a/arch/s390/hypfs/hypfs_diag.c +++ b/arch/s390/hypfs/hypfs_diag.c @@ -562,10 +562,9 @@ static int dbfs_d204_create(void **data, void **data_free_ptr, size_t *size) void *base; buf_size = PAGE_SIZE * (diag204_buf_pages + 1) + sizeof(d204->hdr); - base = vmalloc(buf_size); + base = vzalloc(buf_size); if (!base) return -ENOMEM; - memset(base, 0, buf_size); d204 = page_align_ptr(base + sizeof(d204->hdr)) - sizeof(d204->hdr); rc = diag204_do_store(d204->buf, diag204_buf_pages); if (rc) { diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c index 76058a5166e..08c66035dd1 100644 --- a/drivers/s390/cio/blacklist.c +++ b/drivers/s390/cio/blacklist.c @@ -335,10 +335,9 @@ cio_ignore_write(struct file *file, const char __user *user_buf, return -EINVAL; if (user_len > 65536) user_len = 65536; - buf = vmalloc (user_len + 1); /* maybe better use the stack? */ + buf = vzalloc(user_len + 1); /* maybe better use the stack? */ if (buf == NULL) return -ENOMEM; - memset(buf, 0, user_len + 1); if (strncpy_from_user (buf, user_buf, user_len) < 0) { rc = -EFAULT; |