diff --git a/[refs] b/[refs] index 70762c4b1cd7..e7e9ac3a1602 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e72b6347c9459e6cff5634ddc815485bae6985f +refs/heads/master: 6a6135b64fda39d931a79090f4da37f1c6da4a8c diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index 649df435b8e2..a82464b6e3d2 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -1070,7 +1070,7 @@ static int mem_cgroup_count_children_cb(struct mem_cgroup *mem, void *data) } /** - * mem_cgroup_print_mem_info: Called from OOM with tasklist_lock held in read mode. + * mem_cgroup_print_oom_info: Called from OOM with tasklist_lock held in read mode. * @memcg: The memory cgroup that went over limit * @p: Task that is going to be killed *