git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[pandora-kernel.git]
/
fs
/
aio.c
diff --git
a/fs/aio.c
b/fs/aio.c
index
aec2b19
..
e41e932
100644
(file)
--- a/
fs/aio.c
+++ b/
fs/aio.c
@@
-122,10
+122,9
@@
static int aio_setup_ring(struct kioctx *ctx)
info->nr = 0;
info->ring_pages = info->internal_pages;
if (nr_pages > AIO_RING_PAGES) {
info->nr = 0;
info->ring_pages = info->internal_pages;
if (nr_pages > AIO_RING_PAGES) {
- info->ring_pages = k
malloc(sizeof(struct page *) * nr_pages
, GFP_KERNEL);
+ info->ring_pages = k
calloc(nr_pages, sizeof(struct page *)
, GFP_KERNEL);
if (!info->ring_pages)
return -ENOMEM;
if (!info->ring_pages)
return -ENOMEM;
- memset(info->ring_pages, 0, sizeof(struct page *) * nr_pages);
}
info->mmap_size = nr_pages * PAGE_SIZE;
}
info->mmap_size = nr_pages * PAGE_SIZE;