From: Frederic Weisbecker <fweisbec@gmail.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] power: fix a build breakage on latest -tip
Date: Mon, 9 Feb 2009 00:58:39 +0100 [thread overview]
Message-ID: <20090208235838.GA4729@nowhere> (raw)
A recent conflict resolve (c2eefa20c3ab45ab2108ce7e6561364ea92d7334)
did put twice the function suspend_test() on kernel/power/main.c
The version added for CONFIG_PM_TEST_SUSPEND to solve the conflict overlaps
the one changed recently on (091d71e023557136e96f0e54f301497a3fc95dc3)
since PM_TEST_SUSPEND depends on SUSPEND.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
---
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 2ade836..2265b98 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -135,16 +135,6 @@ static int suspend_test(int level)
#ifdef CONFIG_PM_TEST_SUSPEND
-static int suspend_test(int level)
-{
- if (pm_test_level == level) {
- printk(KERN_INFO "suspend debug: Waiting for 5 seconds.\n");
- mdelay(5000);
- return 1;
- }
- return 0;
-}
-
/*
* We test the system suspend code by setting an RTC wakealarm a short
* time in the future, then suspending. Suspending the devices won't
next reply other threads:[~2009-02-08 23:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-08 23:58 Frederic Weisbecker [this message]
2009-02-09 9:07 ` [PATCH] power: fix a build breakage on latest -tip Ingo Molnar
2009-02-09 13:35 ` Frederic Weisbecker
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=20090208235838.GA4729@nowhere \
--to=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/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