These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / powerpc / sysdev / msi_bitmap.c

diff --git a/kernel/arch/powerpc/sysdev/msi_bitmap.c b/kernel/arch/powerpc/sysdev/msi_bitmap.c
index 73b64c7..ed5234e 100644 (file)
--- a/kernel/arch/powerpc/sysdev/msi_bitmap.c
+++ b/kernel/arch/powerpc/sysdev/msi_bitmap.c
@@ -11,6 +11,7 @@
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/bitmap.h>
+#include <linux/bootmem.h>
 #include <asm/msi_bitmap.h>
 #include <asm/setup.h>
 
@@ -111,7 +112,7 @@ int msi_bitmap_reserve_dt_hwirqs(struct msi_bitmap *bmp)
        return 0;
 }
 
-int msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned int irq_count,
+int __init_refok msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned int irq_count,
                     struct device_node *of_node)
 {
        int size;
@@ -122,7 +123,15 @@ int msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned int irq_count,
        size = BITS_TO_LONGS(irq_count) * sizeof(long);
        pr_debug("msi_bitmap: allocator bitmap size is 0x%x bytes\n", size);
 
-       bmp->bitmap = zalloc_maybe_bootmem(size, GFP_KERNEL);
+       bmp->bitmap_from_slab = slab_is_available();
+       if (bmp->bitmap_from_slab)
+               bmp->bitmap = kzalloc(size, GFP_KERNEL);
+       else {
+               bmp->bitmap = memblock_virt_alloc(size, 0);
+               /* the bitmap won't be freed from memblock allocator */
+               kmemleak_not_leak(bmp->bitmap);
+       }
+
        if (!bmp->bitmap) {
                pr_debug("msi_bitmap: ENOMEM allocating allocator bitmap!\n");
                return -ENOMEM;
@@ -138,7 +147,8 @@ int msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned int irq_count,
 
 void msi_bitmap_free(struct msi_bitmap *bmp)
 {
-       /* we can't free the bitmap we don't know if it's bootmem etc. */
+       if (bmp->bitmap_from_slab)
+               kfree(bmp->bitmap);
        of_node_put(bmp->of_node);
        bmp->bitmap = NULL;
 }
@@ -203,8 +213,6 @@ static void __init test_basics(void)
 
        /* Clients may WARN_ON bitmap == NULL for "not-allocated" */
        WARN_ON(bmp.bitmap != NULL);
-
-       kfree(bmp.bitmap);
 }
 
 static void __init test_of_node(void)