Commit 2da13211 authored by Arun Sharma's avatar Arun Sharma Committed by David Mosberger

[PATCH] ia64: fix ia32 epoll emulation warnings

parent fc2ece26
...@@ -2779,7 +2779,8 @@ sys32_epoll_wait(int epfd, struct epoll_event32 *events, int maxevents, ...@@ -2779,7 +2779,8 @@ sys32_epoll_wait(int epfd, struct epoll_event32 *events, int maxevents,
size = maxevents * sizeof(struct epoll_event); size = maxevents * sizeof(struct epoll_event);
events64 = kmalloc(size, GFP_KERNEL); events64 = kmalloc(size, GFP_KERNEL);
if (events64 == NULL) { if (events64 == NULL) {
events64 = __get_free_pages(GFP_KERNEL, get_order(size)); events64 = (struct epoll_event *)
__get_free_pages(GFP_KERNEL, get_order(size));
if (events64 == NULL) if (events64 == NULL)
return -ENOMEM; return -ENOMEM;
do_free_pages = 1; do_free_pages = 1;
...@@ -2805,7 +2806,7 @@ sys32_epoll_wait(int epfd, struct epoll_event32 *events, int maxevents, ...@@ -2805,7 +2806,7 @@ sys32_epoll_wait(int epfd, struct epoll_event32 *events, int maxevents,
} }
if (do_free_pages) if (do_free_pages)
free_pages(events64, get_order(size)); free_pages((unsigned long) events64, get_order(size));
else else
kfree(events64); kfree(events64);
return numevents; return numevents;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment