From: Nick Alcock Date: Tue, 17 Mar 2015 18:46:36 +0000 (+0000) Subject: mm: memcontrol: adjust prototype to allow for poll_wait_fixed() changes. X-Git-Tag: v4.1.12-92~313^2~14 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f8e4b68f63ed1df165225a8d5be2e8360474f701;p=users%2Fjedix%2Flinux-maple.git mm: memcontrol: adjust prototype to allow for poll_wait_fixed() changes. The poll_wait_fixed() stuff changed the prototype of the poll_queue_proc. memcg_event_ptable_queue_proc() needs to change correspondingly. (The extra parameter is unused by this function.) Signed-off-by: Nick Alcock Acked-by: Santosh Shilimkar --- diff --git a/mm/memcontrol.c b/mm/memcontrol.c index a04225d372ba..4b893d5a8224 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4070,7 +4070,7 @@ static int memcg_event_wake(wait_queue_t *wait, unsigned mode, } static void memcg_event_ptable_queue_proc(struct file *file, - wait_queue_head_t *wqh, poll_table *pt) + wait_queue_head_t *wqh, poll_table *pt, unsigned long unused) { struct mem_cgroup_event *event = container_of(pt, struct mem_cgroup_event, pt);