linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tejun Heo <tj@kernel.org>
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: sfr@canb.auug.org.au, linux-pm@vger.kernel.org,
	linux-next@vger.kernel.org
Subject: [PATCH pm/linux-next] cgroup_freezer: drop unnecessary freezing() from try_to_freeze_cgroup()
Date: Mon, 5 Dec 2011 13:32:04 -0800	[thread overview]
Message-ID: <20111205213204.GL627@google.com> (raw)
In-Reply-To: <201112012242.58090.rjw@sisk.pl>

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@kernel.org>
---
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++;

      reply	other threads:[~2011-12-05 21:32 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-28 23:30 merge conflict resolution for pm-freezer Tejun Heo
2011-11-29 22:21 ` Rafael J. Wysocki
2011-11-30 19:51   ` Rafael J. Wysocki
2011-12-01 18:53     ` Tejun Heo
2011-12-01 21:42       ` Rafael J. Wysocki
2011-12-05 21:32         ` Tejun Heo [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111205213204.GL627@google.com \
    --to=tj@kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=rjw@sisk.pl \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).