Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[pandora-kernel.git] / arch / s390 / hypfs / hypfs_diag.c

diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c
index 6023c6d..74c8f5e 100644 (file)
--- 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) {