Merge tag 'for-4.5' of git://git.osdn.jp/gitroot/uclinux-h8/linux

[deliverable/linux.git] / drivers / hv / vmbus_drv.c

diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index f123bca77808620fc866e14e48ff0786e7409472..328e4c3808e06d146add9ade074efd2d1728e1dd 100644 (file)
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -1063,12 +1063,28 @@ static acpi_status vmbus_walk_resources(struct acpi_resource *res, void *ctx)
        new_res->start = start;
        new_res->end = end;
 
+       /*
+        * Stick ranges from higher in address space at the front of the list.
+        * If two ranges are adjacent, merge them.
+        */
        do {
                if (!*old_res) {
                        *old_res = new_res;
                        break;
                }
 
+               if (((*old_res)->end + 1) == new_res->start) {
+                       (*old_res)->end = new_res->end;
+                       kfree(new_res);
+                       break;
+               }
+
+               if ((*old_res)->start == new_res->end + 1) {
+                       (*old_res)->start = new_res->start;
+                       kfree(new_res);
+                       break;
+               }
+
                if ((*old_res)->end < new_res->start) {
                        new_res->sibling = *old_res;
                        if (prev_res)