From 90eedf0cbe4ba2a316633d6547d331c8b30517e7 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 24 Feb 2014 14:17:09 +0100 Subject: vmbus: use resource for hyperv mmio region Use a resource for the hyperv mmio region instead of start/size variables. Register the region properly so it shows up in /proc/iomem. Signed-off-by: Gerd Hoffmann Signed-off-by: K. Y. Srinivasan Signed-off-by: Greg Kroah-Hartman --- drivers/hv/vmbus_drv.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'drivers/hv') diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 2352ae481e87..a14f60340bfc 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -43,10 +43,12 @@ static struct acpi_device *hv_acpi_dev; static struct tasklet_struct msg_dpc; static struct completion probe_event; static int irq; -u64 hyperv_mmio_start; -EXPORT_SYMBOL_GPL(hyperv_mmio_start); -u64 hyperv_mmio_size; -EXPORT_SYMBOL_GPL(hyperv_mmio_size); + +struct resource hyperv_mmio = { + .name = "hyperv mmio", + .flags = IORESOURCE_MEM, +}; +EXPORT_SYMBOL_GPL(hyperv_mmio); static int vmbus_exists(void) { @@ -902,8 +904,8 @@ static acpi_status vmbus_walk_resources(struct acpi_resource *res, void *ctx) break; case ACPI_RESOURCE_TYPE_ADDRESS64: - hyperv_mmio_start = res->data.address64.minimum; - hyperv_mmio_size = res->data.address64.address_length; + hyperv_mmio.start = res->data.address64.minimum; + hyperv_mmio.end = res->data.address64.maximum; break; } @@ -933,6 +935,8 @@ static int vmbus_acpi_add(struct acpi_device *device) if (ACPI_FAILURE(result)) goto acpi_walk_err; + if (hyperv_mmio.start && hyperv_mmio.end) + request_resource(&iomem_resource, &hyperv_mmio); } ret_val = 0; -- cgit v1.2.3