aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen/xenbus
diff options
context:
space:
mode:
authorJulien Grall <julien.grall@citrix.com>2015-08-07 12:34:42 -0400
committerJulien Grall <julien.grall@citrix.com>2015-09-08 13:03:54 -0400
commit5f51042f876b88a3b81a135cc4ca0adb3d246112 (patch)
treed52e810c2713afd02c123dbe80fe08df23ea567a /drivers/xen/xenbus
parenta13d7201d7deedcbb6ac6efa94a1a7d34d3d79ec (diff)
xen/xenbus: Rename the variable xen_store_mfn to xen_store_gfn
The variable xen_store_mfn is effectively storing a GFN and not an MFN. Signed-off-by: Julien Grall <julien.grall@citrix.com> Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Diffstat (limited to 'drivers/xen/xenbus')
-rw-r--r--drivers/xen/xenbus/xenbus_probe.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index b3870f4ca1d0..3cbe0556de26 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -75,7 +75,7 @@ EXPORT_SYMBOL_GPL(xen_store_interface);
75enum xenstore_init xen_store_domain_type; 75enum xenstore_init xen_store_domain_type;
76EXPORT_SYMBOL_GPL(xen_store_domain_type); 76EXPORT_SYMBOL_GPL(xen_store_domain_type);
77 77
78static unsigned long xen_store_mfn; 78static unsigned long xen_store_gfn;
79 79
80static BLOCKING_NOTIFIER_HEAD(xenstore_chain); 80static BLOCKING_NOTIFIER_HEAD(xenstore_chain);
81 81
@@ -711,7 +711,7 @@ static int __init xenstored_local_init(void)
711 if (!page) 711 if (!page)
712 goto out_err; 712 goto out_err;
713 713
714 xen_store_mfn = xen_start_info->store_mfn = virt_to_gfn((void *)page); 714 xen_store_gfn = xen_start_info->store_mfn = virt_to_gfn((void *)page);
715 715
716 /* Next allocate a local port which xenstored can bind to */ 716 /* Next allocate a local port which xenstored can bind to */
717 alloc_unbound.dom = DOMID_SELF; 717 alloc_unbound.dom = DOMID_SELF;
@@ -785,12 +785,12 @@ static int __init xenbus_init(void)
785 err = xenstored_local_init(); 785 err = xenstored_local_init();
786 if (err) 786 if (err)
787 goto out_error; 787 goto out_error;
788 xen_store_interface = gfn_to_virt(xen_store_mfn); 788 xen_store_interface = gfn_to_virt(xen_store_gfn);
789 break; 789 break;
790 case XS_PV: 790 case XS_PV:
791 xen_store_evtchn = xen_start_info->store_evtchn; 791 xen_store_evtchn = xen_start_info->store_evtchn;
792 xen_store_mfn = xen_start_info->store_mfn; 792 xen_store_gfn = xen_start_info->store_mfn;
793 xen_store_interface = gfn_to_virt(xen_store_mfn); 793 xen_store_interface = gfn_to_virt(xen_store_gfn);
794 break; 794 break;
795 case XS_HVM: 795 case XS_HVM:
796 err = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &v); 796 err = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &v);
@@ -800,9 +800,9 @@ static int __init xenbus_init(void)
800 err = hvm_get_parameter(HVM_PARAM_STORE_PFN, &v); 800 err = hvm_get_parameter(HVM_PARAM_STORE_PFN, &v);
801 if (err) 801 if (err)
802 goto out_error; 802 goto out_error;
803 xen_store_mfn = (unsigned long)v; 803 xen_store_gfn = (unsigned long)v;
804 xen_store_interface = 804 xen_store_interface =
805 xen_remap(xen_store_mfn << PAGE_SHIFT, PAGE_SIZE); 805 xen_remap(xen_store_gfn << PAGE_SHIFT, PAGE_SIZE);
806 break; 806 break;
807 default: 807 default:
808 pr_warn("Xenstore state unknown\n"); 808 pr_warn("Xenstore state unknown\n");