diff --git a/[refs] b/[refs] index 53ba5244e5e5..511187e22a48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e057e15ff66a620eda4c407486cbb8f8fbb7d878 +refs/heads/master: 4f0989dbfa8d18dd17c32120aac1eb3e906a62a2 diff --git a/trunk/fs/eventpoll.c b/trunk/fs/eventpoll.c index 744377c01869..336fdb8ed47b 100644 --- a/trunk/fs/eventpoll.c +++ b/trunk/fs/eventpoll.c @@ -192,7 +192,7 @@ struct eppoll_entry { struct list_head llink; /* The "base" pointer is set to the container "struct epitem" */ - void *base; + struct epitem *base; /* * Wait queue item that will be linked to the target file wait