1 files changed, 2 insertions, 3 deletions

diff --git a/fs/aio.c b/fs/aio.c
index 55991e4132a7..0b4ee0a5c83e 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -132,7 +132,7 @@ static int aio_setup_ring(struct kioctx *ctx)
         dprintk("attempting mmap of %lu bytes\n", info->mmap_size);
         down_write(&ctx->mm->mmap_sem);
         info->mmap_base = do_mmap(NULL, 0, info->mmap_size, 
-                                  PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE,
+                                  PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE,
                                   0);
         if (IS_ERR((void *)info->mmap_base)) {
                 up_write(&ctx->mm->mmap_sem);
@@ -211,11 +211,10 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
         if ((unsigned long)nr_events > aio_max_nr)
                 return ERR_PTR(-EAGAIN);
 
-        ctx = kmem_cache_alloc(kioctx_cachep, GFP_KERNEL);
+        ctx = kmem_cache_zalloc(kioctx_cachep, GFP_KERNEL);
         if (!ctx)
                 return ERR_PTR(-ENOMEM);
 
-        memset(ctx, 0, sizeof(*ctx));
         ctx->max_reqs = nr_events;
         mm = ctx->mm = current->mm;
         atomic_inc(&mm->mm_count);