From: stefano.stabellini@eu.citrix.com
To: linux-kernel@vger.kernel.org
Cc: xen-devel@lists.xensource.com, Jeremy.Fitzhardinge@citrix.com,
konrad.wilk@oracle.com, Stefano.Stabellini@eu.citrix.com,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [PATCH v2 6/6] xen: fix compile issue if XEN is enabled but XEN_PVHVM is disabled
Date: Fri, 25 Feb 2011 17:12:00 +0000 [thread overview]
Message-ID: <1298653920-20299-6-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1102251651570.19277@kaball-desktop>
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
arch/x86/xen/suspend.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c
index 9bbd63a..4a3d3dd 100644
--- a/arch/x86/xen/suspend.c
+++ b/arch/x86/xen/suspend.c
@@ -28,6 +28,7 @@ void xen_pre_suspend(void)
void xen_hvm_post_suspend(int suspend_cancelled)
{
+#ifdef CONFIG_XEN_PVHVM
int cpu;
xen_hvm_init_shared_info();
xen_callback_vector();
@@ -37,6 +38,7 @@ void xen_hvm_post_suspend(int suspend_cancelled)
xen_setup_runstate_info(cpu);
}
}
+#endif
}
void xen_post_suspend(int suspend_cancelled)
--
1.5.6.5
next prev parent reply other threads:[~2011-02-25 17:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-25 17:11 [PATCH v2 0/6] Xen PV on HVM fixes and improvements Stefano Stabellini
2011-02-25 17:11 ` [PATCH v2 1/6] xen: no need to delay xen_setup_shutdown_event for hvm guests anymore stefano.stabellini
2011-02-25 17:11 ` [PATCH v2 2/6] xen: do not use xen_info on HVM, set pv_info name to "Xen HVM" stefano.stabellini
2011-02-25 17:11 ` [PATCH v2 3/6] xen-blkfront: handle Xen major numbers other than XENVBD stefano.stabellini
2011-02-25 17:11 ` [PATCH v2 4/6] xen: make the ballon driver work for hvm domains stefano.stabellini
2011-02-25 17:11 ` [PATCH v2 5/6] xen: PV on HVM: support PV spinlocks and IPIs stefano.stabellini
2011-02-25 17:12 ` stefano.stabellini [this message]
2011-02-25 19:32 ` [PATCH v2 0/6] Xen PV on HVM fixes and improvements Konrad Rzeszutek Wilk
2011-03-03 2:29 ` topperxin
2011-03-03 7:58 ` [PATCH " Pasi Kärkkäinen
2011-03-03 10:59 ` topperxin
2011-03-03 15:05 ` Stefano Stabellini
2011-03-08 2:15 ` topperxin
2011-03-08 11:17 ` Re:Re:[Xen-devel] [PATCH " Stefano Stabellini
2011-03-08 12:13 ` topperxin
2011-03-08 12:45 ` Re:Re:Re:[Xen-devel] [PATCH " Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1298653920-20299-6-git-send-email-stefano.stabellini@eu.citrix.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=Jeremy.Fitzhardinge@citrix.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).