summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-12-02 17:54:54 +0000
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>2011-02-25 16:43:04 +0000
commitcff520b9c2ee1486ea9ff1dbc774510c62e5ecb9 (patch)
tree5ab6e4b1297553c19fad0f3d63421ad80b26e8cc
parent702d4eb9b3de4398ab99cf0a4e799e552c7ab756 (diff)
downloadtalos-op-linux-cff520b9c2ee1486ea9ff1dbc774510c62e5ecb9.tar.gz
talos-op-linux-cff520b9c2ee1486ea9ff1dbc774510c62e5ecb9.zip
xen: do not use xen_info on HVM, set pv_info name to "Xen HVM"
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Acked-by: Jeremy Fitzhardinge <jeremy@goop.org>
-rw-r--r--arch/x86/xen/enlighten.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 50542efe45fb..2f67e2ea222e 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1284,8 +1284,7 @@ static int init_hvm_pv_info(int *major, int *minor)
xen_setup_features();
- pv_info = xen_info;
- pv_info.kernel_rpl = 0;
+ pv_info.name = "Xen HVM";
xen_domain_type = XEN_HVM_DOMAIN;
OpenPOWER on IntegriCloud