Merge branch 'fix/misc' into for-linus

[pandora-kernel.git] / drivers / lguest / lguest_user.c

diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c
index 32e2971..9f9a295 100644 (file)
--- a/drivers/lguest/lguest_user.c
+++ b/drivers/lguest/lguest_user.c
@@ -50,7 +50,7 @@ static int add_eventfd(struct lguest *lg, unsigned long addr, int fd)
 
        /* Now append new entry. */
        new->map[new->num].addr = addr;
-       new->map[new->num].event = eventfd_fget(fd);
+       new->map[new->num].event = eventfd_ctx_fdget(fd);
        if (IS_ERR(new->map[new->num].event)) {
                kfree(new);
                return PTR_ERR(new->map[new->num].event);
@@ -357,7 +357,7 @@ static int close(struct inode *inode, struct file *file)
 
        /* Release any eventfds they registered. */
        for (i = 0; i < lg->eventfds->num; i++)
-               fput(lg->eventfds->map[i].event);
+               eventfd_ctx_put(lg->eventfds->map[i].event);
        kfree(lg->eventfds);
 
        /* If lg->dead doesn't contain an error code it will be NULL or a