986b11c3ee "Merge branch 'pm-freezer' of ..." added unnecessary
freezing() test in try_to_freeze_cgroup() while merging. Drop it.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
---
This shouldn't be harmful but still is unnecessary.
Thanks.
kernel/cgroup_freezer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- work/kernel/cgroup_freezer.c 2011-12-05 13:25:34.156948390 -0800
+++ misc/kernel/cgroup_freezer.c 2011-12-05 13:26:58.787447558 -0800
@@ -283,7 +283,7 @@
while ((task = cgroup_iter_next(cgroup, &it))) {
if (!freeze_task(task))
continue;
- if (freezing(task) && is_task_frozen_enough(task))
+ if (is_task_frozen_enough(task))
continue;
if (!freezing(task) && !freezer_should_skip(task))
num_cant_freeze_now++;
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
