From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753639AbYE2IDO (ORCPT ); Thu, 29 May 2008 04:03:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751646AbYE2ICz (ORCPT ); Thu, 29 May 2008 04:02:55 -0400 Received: from gw.goop.org ([64.81.55.164]:50542 "EHLO mail.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751565AbYE2ICy (ORCPT ); Thu, 29 May 2008 04:02:54 -0400 Message-ID: <483E630B.5090006@goop.org> Date: Thu, 29 May 2008 09:02:19 +0100 From: Jeremy Fitzhardinge User-Agent: Thunderbird 2.0.0.14 (X11/20080501) MIME-Version: 1.0 To: Ingo Molnar CC: LKML , xen-devel , Thomas Gleixner , Randy Dunlap Subject: [PATCH] xen: fix compilation when CONFIG_PM_SLEEP is disabled References: <9e8d06e5ae8024829836.1211550077@localhost> <20080529073150.GA19744@elte.hu> In-Reply-To: <20080529073150.GA19744@elte.hu> X-Enigmail-Version: 0.95.6 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Xen save/restore depends on CONFIG_PM_SLEEP being set for device_power_up/down. Signed-off-by: Jeremy Fitzhardinge Cc: Randy Dunlap --- drivers/xen/manage.c | 2 ++ 1 file changed, 2 insertions(+) =================================================================== --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c @@ -31,6 +31,7 @@ /* Ignore multiple shutdown requests. */ static enum shutdown_state shutting_down = SHUTDOWN_INVALID; +#ifdef CONFIG_PM_SLEEP static int xen_suspend(void *data) { int *cancelled = data; @@ -121,6 +122,7 @@ #endif shutting_down = SHUTDOWN_INVALID; } +#endif /* CONFIG_PM_SLEEP */ static void shutdown_handler(struct xenbus_watch *watch, const char **vec, unsigned int len)