lib: devres: use numa aware allocation

[sfrench/cifs-2.6.git] / lib / devres.c

diff --git a/lib/devres.c b/lib/devres.c
index 14664bbb48757dc68e54777850d1ac5fb8c1e07d..55eb07e80cbb3b31e98c55209012dd2768859b3f 100644 (file)
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -29,7 +29,8 @@ static void __iomem *__devm_ioremap(struct device *dev, resource_size_t offset,
 {
        void __iomem **ptr, *addr = NULL;
 
-       ptr = devres_alloc(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL);
+       ptr = devres_alloc_node(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL,
+                               dev_to_node(dev));
        if (!ptr)
                return NULL;
 
@@ -292,7 +293,8 @@ void __iomem *devm_ioport_map(struct device *dev, unsigned long port,
 {
        void __iomem **ptr, *addr;
 
-       ptr = devres_alloc(devm_ioport_map_release, sizeof(*ptr), GFP_KERNEL);
+       ptr = devres_alloc_node(devm_ioport_map_release, sizeof(*ptr), GFP_KERNEL,
+                               dev_to_node(dev));
        if (!ptr)
                return NULL;
 
@@ -366,7 +368,8 @@ void __iomem * const *pcim_iomap_table(struct pci_dev *pdev)
        if (dr)
                return dr->table;
 
-       new_dr = devres_alloc(pcim_iomap_release, sizeof(*new_dr), GFP_KERNEL);
+       new_dr = devres_alloc_node(pcim_iomap_release, sizeof(*new_dr), GFP_KERNEL,
+                                  dev_to_node(&pdev->dev));
        if (!new_dr)
                return NULL;
        dr = devres_get(&pdev->dev, new_dr, NULL, NULL);
@@ -548,7 +551,8 @@ int devm_arch_phys_wc_add(struct device *dev, unsigned long base, unsigned long
        int *mtrr;
        int ret;
 
-       mtrr = devres_alloc(devm_arch_phys_ac_add_release, sizeof(*mtrr), GFP_KERNEL);
+       mtrr = devres_alloc_node(devm_arch_phys_ac_add_release, sizeof(*mtrr), GFP_KERNEL,
+                                dev_to_node(dev));
        if (!mtrr)
                return -ENOMEM;
 
@@ -593,7 +597,8 @@ int devm_arch_io_reserve_memtype_wc(struct device *dev, resource_size_t start,
        struct arch_io_reserve_memtype_wc_devres *dr;
        int ret;
 
-       dr = devres_alloc(devm_arch_io_free_memtype_wc_release, sizeof(*dr), GFP_KERNEL);
+       dr = devres_alloc_node(devm_arch_io_free_memtype_wc_release, sizeof(*dr), GFP_KERNEL,
+                              dev_to_node(dev));
        if (!dr)
                return -ENOMEM;