Skip to contentSkip to conversation

power: fix a build breakage on latest -tip

PATCH In review Frederic Weisbecker 2 participants 3 messages Feb 8, 2009 – Feb 9, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

kernel/power/main.c +0 -10
index 2ade836..2265b98 100644
@@ -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
#1 lore raw
Quoted 8 lines · Frederic Weisbecker

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.

This conflict existed for about 10 minutes until automation caught it :) Latest tip/master is fine, right?

Ingo

#2 lore raw
Quoted 6 lines · Ingo Molnar
Quoted 3 lines · Frederic Weisbecker

A recent conflict resolve (c2eefa20c3ab45ab2108ce7e6561364ea92d7334) did put twice the function suspend_test() on kernel/power/main.c

Quoted 8 lines
Quoted 5 lines

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.

This conflict existed for about 10 minutes until automation caught it :) Latest tip/master is fine, right?

Right!
Nobody's faster than -tip testing ;-)

Quoted 1 line

Ingo