* [PATCH] PM_SLEEP_SMP: fix kconfig warning
@ 2010-09-11 22:57 Randy Dunlap
2010-09-12 17:26 ` Rafael J. Wysocki
0 siblings, 1 reply; 4+ messages in thread
From: Randy Dunlap @ 2010-09-11 22:57 UTC (permalink / raw)
To: lkml; +Cc: Rafael J. Wysocki, linux-pm
From: Randy Dunlap <randy.dunlap@oracle.com>
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)
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
kernel/power/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20100908.orig/kernel/power/Kconfig
+++ linux-next-20100908/kernel/power/Kconfig
@@ -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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] PM_SLEEP_SMP: fix kconfig warning
2010-09-11 22:57 [PATCH] PM_SLEEP_SMP: fix kconfig warning Randy Dunlap
@ 2010-09-12 17:26 ` Rafael J. Wysocki
2010-09-12 18:50 ` Randy Dunlap
0 siblings, 1 reply; 4+ messages in thread
From: Rafael J. Wysocki @ 2010-09-12 17:26 UTC (permalink / raw)
To: Randy Dunlap; +Cc: lkml, linux-pm
On Sunday, September 12, 2010, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> 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)
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
> kernel/power/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- linux-next-20100908.orig/kernel/power/Kconfig
> +++ linux-next-20100908/kernel/power/Kconfig
> @@ -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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] PM_SLEEP_SMP: fix kconfig warning
2010-09-12 17:26 ` Rafael J. Wysocki
@ 2010-09-12 18:50 ` Randy Dunlap
2010-09-12 19:36 ` Rafael J. Wysocki
0 siblings, 1 reply; 4+ messages in thread
From: Randy Dunlap @ 2010-09-12 18:50 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: lkml, linux-pm
On 09/12/10 10:26, Rafael J. Wysocki wrote:
> On Sunday, September 12, 2010, Randy Dunlap wrote:
>> From: Randy Dunlap <randy.dunlap@oracle.com>
>>
>> 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)
>>
>> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
>> ---
>> kernel/power/Kconfig | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> --- linux-next-20100908.orig/kernel/power/Kconfig
>> +++ linux-next-20100908/kernel/power/Kconfig
>> @@ -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)?
That appears to work in my testing. I'll ack your patch.
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] PM_SLEEP_SMP: fix kconfig warning
2010-09-12 18:50 ` Randy Dunlap
@ 2010-09-12 19:36 ` Rafael J. Wysocki
0 siblings, 0 replies; 4+ messages in thread
From: Rafael J. Wysocki @ 2010-09-12 19:36 UTC (permalink / raw)
To: Randy Dunlap; +Cc: lkml, linux-pm
On Sunday, September 12, 2010, Randy Dunlap wrote:
> On 09/12/10 10:26, Rafael J. Wysocki wrote:
> > On Sunday, September 12, 2010, Randy Dunlap wrote:
> >> From: Randy Dunlap <randy.dunlap@oracle.com>
> >>
> >> 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)
> >>
> >> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> >> ---
> >> kernel/power/Kconfig | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> --- linux-next-20100908.orig/kernel/power/Kconfig
> >> +++ linux-next-20100908/kernel/power/Kconfig
> >> @@ -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)?
>
> That appears to work in my testing. I'll ack your patch.
>
> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
OK, thanks!
Appended for completness, I'm going to put it into my linux-next branch.
Rafael
---
From: Rafael J. Wysocki <rjw@sisk.pl>
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.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
---
kernel/power/Kconfig | 1 +
1 file changed, 1 insertion(+)
Index: linux-2.6/kernel/power/Kconfig
===================================================================
--- linux-2.6.orig/kernel/power/Kconfig
+++ 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-09-12 19:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-11 22:57 [PATCH] PM_SLEEP_SMP: fix kconfig warning Randy Dunlap
2010-09-12 17:26 ` Rafael J. Wysocki
2010-09-12 18:50 ` Randy Dunlap
2010-09-12 19:36 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox