From patchwork Wed Feb 23 16:23:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shriram Rajagopalan X-Patchwork-Id: 585171 Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1NGSNDm019917 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Wed, 23 Feb 2011 16:28:48 GMT Received: from daredevil.linux-foundation.org (localhost [127.0.0.1]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p1NGOwut015437; Wed, 23 Feb 2011 08:25:45 -0800 Received: from athos.nss.cs.ubc.ca ([198.162.52.240]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p1NGO73B015353 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 23 Feb 2011 08:24:08 -0800 Received: from athos.nss.cs.ubc.ca (localhost [127.0.0.1]) by athos.nss.cs.ubc.ca (8.14.3/8.14.3/Debian-9.1ubuntu1) with ESMTP id p1NGO4hP014860; Wed, 23 Feb 2011 08:24:04 -0800 Received: (from root@localhost) by athos.nss.cs.ubc.ca (8.14.3/8.14.3/Submit) id p1NGO32U014857; Wed, 23 Feb 2011 08:24:03 -0800 From: Shriram Rajagopalan To: xen-devel@lists.xensource.com Date: Wed, 23 Feb 2011 08:23:41 -0800 Message-Id: <1298478221-14826-1-git-send-email-rshriram@cs.ubc.ca> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1298446066-11754-1-git-send-email-rshriram@cs.ubc.ca> References: <1298446066-11754-1-git-send-email-rshriram@cs.ubc.ca> Received-SPF: pass (localhost is always allowed.) X-Spam-Status: No, hits=-3.681 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED, RDNS_NONE X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.21 Cc: Shriram Rajagopalan , linux-pm@lists.linux-foundation.org, Ian Campbell Subject: [linux-pm] [PATCH v2] xen: fix XEN_SAVE_RESTORE Kconfig dependencies X-BeenThere: linux-pm@lists.linux-foundation.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux power management List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 23 Feb 2011 16:28:57 +0000 (UTC) diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 2c876ed..0e68597 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -38,7 +38,7 @@ config XEN_MAX_DOMAIN_MEMORY config XEN_SAVE_RESTORE bool - depends on XEN + depends on XEN && HIBERNATION default y config XEN_DEBUG_FS diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 4603f08..74fe864 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -85,7 +85,7 @@ config PM_STD_PARTITION config PM_SLEEP def_bool y - depends on SUSPEND || HIBERNATION || XEN_SAVE_RESTORE + depends on SUSPEND || HIBERNATION config PM_SLEEP_SMP def_bool y