Skip to contentSkip to conversation

PM_SLEEP_SMP: fix kconfig warning

PATCH In review Randy Dunlap 2 participants 7 messages Sep 11, 2010 – Sep 12, 2010

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

PATCH 1/1 PM_SLEEP_SMP: fix kconfig warning

From: Randy Dunlap <[email protected]>

Fix kconfig unmet dependency warning:

warning: (PM_SLEEP_SMP && SMP && (ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE) && PM_SLEEP) selects HOTPLUG_CPU which has unmet direct dependencies (SMP && HOTPLUG)

---
 kernel/power/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/power/Kconfig +1 -1
@@ -83,7 +83,7 @@ config PM_TRACE_RTC
 
 config PM_SLEEP_SMP
 	bool
-	depends on SMP
+	depends on SMP && HOTPLUG
 	depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
 	depends on PM_SLEEP
 	select HOTPLUG_CPU
#1 lore raw
Quoted 14 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix kconfig unmet dependency warning:

warning: (PM_SLEEP_SMP && SMP && (ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE) && PM_SLEEP) selects HOTPLUG_CPU which has unmet direct dependencies (SMP && HOTPLUG)

---
 kernel/power/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

kernel/power/Kconfig config PM_TRACE_RTC · line 89

Quoted 8 lines
kernel/power/Kconfig +1 -1
@@ -83,7 +83,7 @@ config PM_TRACE_RTC
 
 config PM_SLEEP_SMP
 	bool
-	depends on SMP
+	depends on SMP && HOTPLUG
 	depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
 	depends on PM_SLEEP
 	select HOTPLUG_CPU

I'm afraid that may cause some people to find that suspend is not compiled in to their surprise.

Would it be possible to select both HOTPLUG and HOTPLUG_CPU instead (ie. would that work)?

Rafael

#2 lore raw
In reply to Randy Dunlap
Quoted 14 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix kconfig unmet dependency warning:

warning: (PM_SLEEP_SMP && SMP && (ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE) && PM_SLEEP) selects HOTPLUG_CPU which has unmet direct dependencies (SMP && HOTPLUG)

---
 kernel/power/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

kernel/power/Kconfig config PM_TRACE_RTC · line 89

Quoted 8 lines
kernel/power/Kconfig +1 -1
@@ -83,7 +83,7 @@ config PM_TRACE_RTC
 
 config PM_SLEEP_SMP
 	bool
-	depends on SMP
+	depends on SMP && HOTPLUG
 	depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
 	depends on PM_SLEEP
 	select HOTPLUG_CPU

I'm afraid that may cause some people to find that suspend is not compiled in to their surprise.

Would it be possible to select both HOTPLUG and HOTPLUG_CPU instead (ie. would that work)?

Rafael

author Acked-by
#3 lore raw
Quoted 27 lines · Rafael J. Wysocki
Quoted 14 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix kconfig unmet dependency warning:

warning: (PM_SLEEP_SMP && SMP && (ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE) && PM_SLEEP) selects HOTPLUG_CPU which has unmet direct dependencies (SMP && HOTPLUG)

---
 kernel/power/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

kernel/power/Kconfig config PM_TRACE_RTC · line 89

Quoted 8 lines
kernel/power/Kconfig +1 -1
@@ -83,7 +83,7 @@ config PM_TRACE_RTC
 
 config PM_SLEEP_SMP
 	bool
-	depends on SMP
+	depends on SMP && HOTPLUG
 	depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
 	depends on PM_SLEEP
 	select HOTPLUG_CPU

I'm afraid that may cause some people to find that suspend is not compiled in to their surprise.

Quoted 2 lines

Would it be possible to select both HOTPLUG and HOTPLUG_CPU instead (ie. would that work)?

That appears to work in my testing. I'll ack your patch.

Signature · 2 lines
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
author Acked-by
#4 lore raw
In reply to Rafael J. Wysocki
Quoted 27 lines · Rafael J. Wysocki
Quoted 14 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix kconfig unmet dependency warning:

warning: (PM_SLEEP_SMP && SMP && (ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE) && PM_SLEEP) selects HOTPLUG_CPU which has unmet direct dependencies (SMP && HOTPLUG)

---
 kernel/power/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

kernel/power/Kconfig config PM_TRACE_RTC · line 89

Quoted 8 lines
kernel/power/Kconfig +1 -1
@@ -83,7 +83,7 @@ config PM_TRACE_RTC
 
 config PM_SLEEP_SMP
 	bool
-	depends on SMP
+	depends on SMP && HOTPLUG
 	depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
 	depends on PM_SLEEP
 	select HOTPLUG_CPU

I'm afraid that may cause some people to find that suspend is not compiled in to their surprise.

Quoted 2 lines

Would it be possible to select both HOTPLUG and HOTPLUG_CPU instead (ie. would that work)?

That appears to work in my testing. I'll ack your patch.

Signature · 2 lines
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Acked-by Randy Dunlap
#5 lore raw
Quoted 28 lines · Randy Dunlap
Quoted 27 lines · Rafael J. Wysocki
Quoted 14 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix kconfig unmet dependency warning:

warning: (PM_SLEEP_SMP && SMP && (ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE) && PM_SLEEP) selects HOTPLUG_CPU which has unmet direct dependencies (SMP && HOTPLUG)

---
 kernel/power/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

kernel/power/Kconfig config PM_TRACE_RTC · line 89

Quoted 8 lines
kernel/power/Kconfig +1 -1
@@ -83,7 +83,7 @@ config PM_TRACE_RTC
 
 config PM_SLEEP_SMP
 	bool
-	depends on SMP
+	depends on SMP && HOTPLUG
 	depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
 	depends on PM_SLEEP
 	select HOTPLUG_CPU

I'm afraid that may cause some people to find that suspend is not compiled in to their surprise.

Quoted 6 lines
Quoted 2 lines

Would it be possible to select both HOTPLUG and HOTPLUG_CPU instead (ie. would that work)?

That appears to work in my testing. I'll ack your patch.

OK, thanks!

Appended for completness, I'm going to put it into my linux-next branch.

Rafael

---
From: Rafael J. Wysocki <[email protected]>
Subject: PM: Fix unmet dependency warning from kconfig

Fix the following build warning:

warning: (PM_SLEEP_SMP && SMP && (ARCH_SUSPEND_POSSIBLE || \
ARCH_HIBERNATION_POSSIBLE) && PM_SLEEP) selects HOTPLUG_CPU which \
has unmet direct dependencies (SMP && HOTPLUG)

by selecting HOTPLUG along with CPU_HOTPLUG.

---
 kernel/power/Kconfig |    1 +
 1 file changed, 1 insertion(+)
kernel/power/Kconfig +1 -0
Index: linux-2.6/kernel/power/Kconfig
===================================================================
@@ -86,6 +86,7 @@ config PM_SLEEP_SMP
 	depends on SMP
 	depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
 	depends on PM_SLEEP
+	select HOTPLUG
 	select HOTPLUG_CPU
 	default y
 
Acked-by Randy Dunlap
#6 lore raw
In reply to Randy Dunlap
Quoted 28 lines · Randy Dunlap
Quoted 27 lines · Rafael J. Wysocki
Quoted 14 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix kconfig unmet dependency warning:

warning: (PM_SLEEP_SMP && SMP && (ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE) && PM_SLEEP) selects HOTPLUG_CPU which has unmet direct dependencies (SMP && HOTPLUG)

---
 kernel/power/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

kernel/power/Kconfig config PM_TRACE_RTC · line 89

Quoted 8 lines
kernel/power/Kconfig +1 -1
@@ -83,7 +83,7 @@ config PM_TRACE_RTC
 
 config PM_SLEEP_SMP
 	bool
-	depends on SMP
+	depends on SMP && HOTPLUG
 	depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
 	depends on PM_SLEEP
 	select HOTPLUG_CPU

I'm afraid that may cause some people to find that suspend is not compiled in to their surprise.

Quoted 6 lines
Quoted 2 lines

Would it be possible to select both HOTPLUG and HOTPLUG_CPU instead (ie. would that work)?

That appears to work in my testing. I'll ack your patch.

OK, thanks!

Appended for completness, I'm going to put it into my linux-next branch.

Rafael

---
From: Rafael J. Wysocki <[email protected]>
Subject: PM: Fix unmet dependency warning from kconfig

Fix the following build warning:

warning: (PM_SLEEP_SMP && SMP && (ARCH_SUSPEND_POSSIBLE || \
ARCH_HIBERNATION_POSSIBLE) && PM_SLEEP) selects HOTPLUG_CPU which \
has unmet direct dependencies (SMP && HOTPLUG)

by selecting HOTPLUG along with CPU_HOTPLUG.

---
 kernel/power/Kconfig |    1 +
 1 file changed, 1 insertion(+)
kernel/power/Kconfig +1 -0
Index: linux-2.6/kernel/power/Kconfig
===================================================================
@@ -86,6 +86,7 @@ config PM_SLEEP_SMP
 	depends on SMP
 	depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
 	depends on PM_SLEEP
+	select HOTPLUG
 	select HOTPLUG_CPU
 	default y