diff --git a/[refs] b/[refs] index e368c8b33b3c..a63c0f4edfb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 103926c689650396901002c3a8c38970fff70391 +refs/heads/master: 41f7f60d31e5e1dfc9a92957b3e14e08a2f04964 diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c index 3e296ed81d4d..a1b61f414228 100644 --- a/trunk/kernel/cpuset.c +++ b/trunk/kernel/cpuset.c @@ -322,8 +322,8 @@ static void guarantee_online_mems(const struct cpuset *cs, nodemask_t *pmask) * Call without callback_mutex or task_lock() held. May be * called with or without cgroup_mutex held. Thanks in part to * 'the_top_cpuset_hack', the task's cpuset pointer will never - * be NULL. This routine also might acquire callback_mutex and - * current->mm->mmap_sem during call. + * be NULL. This routine also might acquire callback_mutex during + * call. * * Reading current->cpuset->mems_generation doesn't need task_lock * to guard the current->cpuset derefence, because it is guarded