From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753666Ab0ILThW (ORCPT ); Sun, 12 Sep 2010 15:37:22 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:47508 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752804Ab0ILThV (ORCPT ); Sun, 12 Sep 2010 15:37:21 -0400 From: "Rafael J. Wysocki" To: Randy Dunlap Subject: Re: [PATCH] PM_SLEEP_SMP: fix kconfig warning Date: Sun, 12 Sep 2010 21:36:11 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.36-rc3-rjw+; KDE/4.4.4; x86_64; ; ) Cc: lkml , linux-pm@lists.linux-foundation.org References: <20100911155720.c4fe6b4b.randy.dunlap@oracle.com> <201009121926.08633.rjw@sisk.pl> <4C8D210D.8080307@oracle.com> In-Reply-To: <4C8D210D.8080307@oracle.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201009122136.11660.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > >> > >> 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 > >> --- > >> 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 OK, thanks! Appended for completness, I'm going to put it into my linux-next branch. Rafael --- From: Rafael J. Wysocki 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 Acked-by: Randy Dunlap --- 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