linux-kernel - [PATCH] power: fix a build breakage on latest -tip

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20090208235838.GA4729@nowhere>
Date:	Mon, 9 Feb 2009 00:58:39 +0100
From:	Frederic Weisbecker <fweisbec@...il.com>
To:	Ingo Molnar <mingo@...e.hu>
Cc:	linux-kernel@...r.kernel.org
Subject: [PATCH] power: fix a build breakage on latest -tip

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@...il.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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/