perf evsel: Fix attr.exclude_kernel setting for default cycles:p

[mirror_ubuntu-artful-kernel.git] / mm / memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 94172089f52fce369c57ce8d3e783a9480d522f2..d75b38b66ef6f1bfb2567c780833dad2ee6e1fc4 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -170,7 +170,7 @@ struct mem_cgroup_event {
         */
        poll_table pt;
        wait_queue_head_t *wqh;
-       wait_queue_t wait;
+       wait_queue_entry_t wait;
        struct work_struct remove;
 };
 
@@ -1479,10 +1479,10 @@ static DECLARE_WAIT_QUEUE_HEAD(memcg_oom_waitq);
 
 struct oom_wait_info {
        struct mem_cgroup *memcg;
-       wait_queue_t    wait;
+       wait_queue_entry_t      wait;
 };
 
-static int memcg_oom_wake_function(wait_queue_t *wait,
+static int memcg_oom_wake_function(wait_queue_entry_t *wait,
        unsigned mode, int sync, void *arg)
 {
        struct mem_cgroup *wake_memcg = (struct mem_cgroup *)arg;
@@ -1570,7 +1570,7 @@ bool mem_cgroup_oom_synchronize(bool handle)
        owait.wait.flags = 0;
        owait.wait.func = memcg_oom_wake_function;
        owait.wait.private = current;
-       INIT_LIST_HEAD(&owait.wait.task_list);
+       INIT_LIST_HEAD(&owait.wait.entry);
 
        prepare_to_wait(&memcg_oom_waitq, &owait.wait, TASK_KILLABLE);
        mem_cgroup_mark_under_oom(memcg);
@@ -3725,7 +3725,7 @@ static void memcg_event_remove(struct work_struct *work)
  *
  * Called with wqh->lock held and interrupts disabled.
  */
-static int memcg_event_wake(wait_queue_t *wait, unsigned mode,
+static int memcg_event_wake(wait_queue_entry_t *wait, unsigned mode,
                            int sync, void *key)
 {
        struct mem_cgroup_event *event =