scsi: qla4xxx: Adjust indentation in qla4xxx_mem_free

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / kernel / memremap.c

diff --git a/kernel/memremap.c b/kernel/memremap.c
index 7658d32..1be42f9 100644 (file)
--- a/kernel/memremap.c
+++ b/kernel/memremap.c
@@ -111,7 +111,7 @@ EXPORT_SYMBOL(memunmap);
 
 static void devm_memremap_release(struct device *dev, void *res)
 {
-       memunmap(res);
+       memunmap(*(void **)res);
 }
 
 static int devm_memremap_match(struct device *dev, void *res, void *match_data)
@@ -133,8 +133,10 @@ void *devm_memremap(struct device *dev, resource_size_t offset,
        if (addr) {
                *ptr = addr;
                devres_add(dev, ptr);
-       } else
+       } else {
                devres_free(ptr);
+               return ERR_PTR(-ENXIO);
+       }
 
        return addr;
 }
@@ -157,7 +159,9 @@ static void devm_memremap_pages_release(struct device *dev, void *res)
        struct page_map *page_map = res;
 
        /* pages are dead and unused, undo the arch mapping */
+       mem_hotplug_begin();
        arch_remove_memory(page_map->res.start, resource_size(&page_map->res));
+       mem_hotplug_done();
 }
 
 void *devm_memremap_pages(struct device *dev, struct resource *res)
@@ -167,15 +171,12 @@ void *devm_memremap_pages(struct device *dev, struct resource *res)
        struct page_map *page_map;
        int error, nid;
 
-       if (is_ram == REGION_MIXED) {
-               WARN_ONCE(1, "%s attempted on mixed region %pr\n",
-                               __func__, res);
+       if (is_ram != REGION_DISJOINT) {
+               WARN_ONCE(1, "%s attempted on %s region %pr\n", __func__,
+                               is_ram == REGION_MIXED ? "mixed" : "ram", res);
                return ERR_PTR(-ENXIO);
        }
 
-       if (is_ram == REGION_INTERSECTS)
-               return __va(res->start);
-
        page_map = devres_alloc_node(devm_memremap_pages_release,
                        sizeof(*page_map), GFP_KERNEL, dev_to_node(dev));
        if (!page_map)
@@ -187,7 +188,9 @@ void *devm_memremap_pages(struct device *dev, struct resource *res)
        if (nid < 0)
                nid = numa_mem_id();
 
+       mem_hotplug_begin();
        error = arch_add_memory(nid, res->start, resource_size(res), true);
+       mem_hotplug_done();
        if (error) {
                devres_free(page_map);
                return ERR_PTR(error);
@@ -196,5 +199,5 @@ void *devm_memremap_pages(struct device *dev, struct resource *res)
        devres_add(dev, page_map);
        return __va(res->start);
 }
-EXPORT_SYMBOL(devm_memremap_pages);
+EXPORT_SYMBOL_GPL(devm_memremap_pages);
 #endif /* CONFIG_ZONE_DEVICE */