]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
mm: memcontrol: adjust prototype to allow for poll_wait_fixed() changes.
authorNick Alcock <nick.alcock@oracle.com>
Tue, 17 Mar 2015 18:46:36 +0000 (18:46 +0000)
committerNick Alcock <nick.alcock@oracle.com>
Tue, 21 Jul 2015 14:30:05 +0000 (15:30 +0100)
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 <nick.alcock@oracle.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
mm/memcontrol.c

index a04225d372ba3ab77516b970c10135b19def3ac4..4b893d5a82243dcbac038ddc30cebf9de7e3c63a 100644 (file)
@@ -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);