summaryrefslogtreecommitdiff
path: root/arch/x86/xen/time.c
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-07-29 14:37:48 +0100
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-07-29 11:11:33 -0700
commitca65f9fc0c447da5b270b05c41c21b19c88617c3 (patch)
tree7a8813233d867635d01cc2c8397099df4468751d /arch/x86/xen/time.c
parentb98a409b80ac510c95b4f1bafdef28edaeabd3e7 (diff)
downloadkernel-common-ca65f9fc0c447da5b270b05c41c21b19c88617c3.tar.gz
kernel-common-ca65f9fc0c447da5b270b05c41c21b19c88617c3.tar.bz2
kernel-common-ca65f9fc0c447da5b270b05c41c21b19c88617c3.zip
Introduce CONFIG_XEN_PVHVM compile option
This patch introduce a CONFIG_XEN_PVHVM compile time option to enable/disable Xen PV on HVM support. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'arch/x86/xen/time.c')
-rw-r--r--arch/x86/xen/time.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index 4780e55886a5..2aab4a2b9100 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -516,6 +516,7 @@ __init void xen_init_time_ops(void)
x86_platform.set_wallclock = xen_set_wallclock;
}
+#ifdef CONFIG_XEN_PVHVM
static void xen_hvm_setup_cpu_clockevents(void)
{
int cpu = smp_processor_id();
@@ -544,4 +545,4 @@ __init void xen_hvm_init_time_ops(void)
x86_platform.get_wallclock = xen_get_wallclock;
x86_platform.set_wallclock = xen_set_wallclock;
}
-
+#endif