Merge tag 'irqchip-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm...

[linux-2.6-microblaze.git] / mm / percpu.c

diff --git a/mm/percpu.c b/mm/percpu.c
index c5c7507..2e6fc8d 100644 (file)
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1086,6 +1086,7 @@ static struct pcpu_chunk * __init pcpu_alloc_first_chunk(unsigned long tmp_addr,
        struct pcpu_chunk *chunk;
        unsigned long aligned_addr, lcm_align;
        int start_offset, offset_bits, region_size, region_bits;
+       size_t alloc_size;
 
        /* region calculations */
        aligned_addr = tmp_addr & PAGE_MASK;
@@ -1101,9 +1102,12 @@ static struct pcpu_chunk * __init pcpu_alloc_first_chunk(unsigned long tmp_addr,
        region_size = ALIGN(start_offset + map_size, lcm_align);
 
        /* allocate chunk */
-       chunk = memblock_alloc(sizeof(struct pcpu_chunk) +
-                              BITS_TO_LONGS(region_size >> PAGE_SHIFT),
-                              SMP_CACHE_BYTES);
+       alloc_size = sizeof(struct pcpu_chunk) +
+               BITS_TO_LONGS(region_size >> PAGE_SHIFT);
+       chunk = memblock_alloc(alloc_size, SMP_CACHE_BYTES);
+       if (!chunk)
+               panic("%s: Failed to allocate %zu bytes\n", __func__,
+                     alloc_size);
 
        INIT_LIST_HEAD(&chunk->list);
 
@@ -1114,12 +1118,25 @@ static struct pcpu_chunk * __init pcpu_alloc_first_chunk(unsigned long tmp_addr,
        chunk->nr_pages = region_size >> PAGE_SHIFT;
        region_bits = pcpu_chunk_map_bits(chunk);
 
-       chunk->alloc_map = memblock_alloc(BITS_TO_LONGS(region_bits) * sizeof(chunk->alloc_map[0]),
-                                         SMP_CACHE_BYTES);
-       chunk->bound_map = memblock_alloc(BITS_TO_LONGS(region_bits + 1) * sizeof(chunk->bound_map[0]),
-                                         SMP_CACHE_BYTES);
-       chunk->md_blocks = memblock_alloc(pcpu_chunk_nr_blocks(chunk) * sizeof(chunk->md_blocks[0]),
-                                         SMP_CACHE_BYTES);
+       alloc_size = BITS_TO_LONGS(region_bits) * sizeof(chunk->alloc_map[0]);
+       chunk->alloc_map = memblock_alloc(alloc_size, SMP_CACHE_BYTES);
+       if (!chunk->alloc_map)
+               panic("%s: Failed to allocate %zu bytes\n", __func__,
+                     alloc_size);
+
+       alloc_size =
+               BITS_TO_LONGS(region_bits + 1) * sizeof(chunk->bound_map[0]);
+       chunk->bound_map = memblock_alloc(alloc_size, SMP_CACHE_BYTES);
+       if (!chunk->bound_map)
+               panic("%s: Failed to allocate %zu bytes\n", __func__,
+                     alloc_size);
+
+       alloc_size = pcpu_chunk_nr_blocks(chunk) * sizeof(chunk->md_blocks[0]);
+       chunk->md_blocks = memblock_alloc(alloc_size, SMP_CACHE_BYTES);
+       if (!chunk->md_blocks)
+               panic("%s: Failed to allocate %zu bytes\n", __func__,
+                     alloc_size);
+
        pcpu_init_md_blocks(chunk);
 
        /* manage populated page bitmap */
@@ -1888,7 +1905,7 @@ struct pcpu_alloc_info * __init pcpu_alloc_alloc_info(int nr_groups,
                          __alignof__(ai->groups[0].cpu_map[0]));
        ai_size = base_size + nr_units * sizeof(ai->groups[0].cpu_map[0]);
 
-       ptr = memblock_alloc_nopanic(PFN_ALIGN(ai_size), PAGE_SIZE);
+       ptr = memblock_alloc(PFN_ALIGN(ai_size), PAGE_SIZE);
        if (!ptr)
                return NULL;
        ai = ptr;
@@ -2044,6 +2061,7 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
        int group, unit, i;
        int map_size;
        unsigned long tmp_addr;
+       size_t alloc_size;
 
 #define PCPU_SETUP_BUG_ON(cond)        do {                                    \
        if (unlikely(cond)) {                                           \
@@ -2075,14 +2093,29 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
        PCPU_SETUP_BUG_ON(pcpu_verify_alloc_info(ai) < 0);
 
        /* process group information and build config tables accordingly */
-       group_offsets = memblock_alloc(ai->nr_groups * sizeof(group_offsets[0]),
-                                      SMP_CACHE_BYTES);
-       group_sizes = memblock_alloc(ai->nr_groups * sizeof(group_sizes[0]),
-                                    SMP_CACHE_BYTES);
-       unit_map = memblock_alloc(nr_cpu_ids * sizeof(unit_map[0]),
-                                 SMP_CACHE_BYTES);
-       unit_off = memblock_alloc(nr_cpu_ids * sizeof(unit_off[0]),
-                                 SMP_CACHE_BYTES);
+       alloc_size = ai->nr_groups * sizeof(group_offsets[0]);
+       group_offsets = memblock_alloc(alloc_size, SMP_CACHE_BYTES);
+       if (!group_offsets)
+               panic("%s: Failed to allocate %zu bytes\n", __func__,
+                     alloc_size);
+
+       alloc_size = ai->nr_groups * sizeof(group_sizes[0]);
+       group_sizes = memblock_alloc(alloc_size, SMP_CACHE_BYTES);
+       if (!group_sizes)
+               panic("%s: Failed to allocate %zu bytes\n", __func__,
+                     alloc_size);
+
+       alloc_size = nr_cpu_ids * sizeof(unit_map[0]);
+       unit_map = memblock_alloc(alloc_size, SMP_CACHE_BYTES);
+       if (!unit_map)
+               panic("%s: Failed to allocate %zu bytes\n", __func__,
+                     alloc_size);
+
+       alloc_size = nr_cpu_ids * sizeof(unit_off[0]);
+       unit_off = memblock_alloc(alloc_size, SMP_CACHE_BYTES);
+       if (!unit_off)
+               panic("%s: Failed to allocate %zu bytes\n", __func__,
+                     alloc_size);
 
        for (cpu = 0; cpu < nr_cpu_ids; cpu++)
                unit_map[cpu] = UINT_MAX;
@@ -2148,6 +2181,9 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
        pcpu_nr_slots = __pcpu_size_to_slot(pcpu_unit_size) + 2;
        pcpu_slot = memblock_alloc(pcpu_nr_slots * sizeof(pcpu_slot[0]),
                                   SMP_CACHE_BYTES);
+       if (!pcpu_slot)
+               panic("%s: Failed to allocate %zu bytes\n", __func__,
+                     pcpu_nr_slots * sizeof(pcpu_slot[0]));
        for (i = 0; i < pcpu_nr_slots; i++)
                INIT_LIST_HEAD(&pcpu_slot[i]);
 
@@ -2460,7 +2496,7 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
        size_sum = ai->static_size + ai->reserved_size + ai->dyn_size;
        areas_size = PFN_ALIGN(ai->nr_groups * sizeof(void *));
 
-       areas = memblock_alloc_nopanic(areas_size, SMP_CACHE_BYTES);
+       areas = memblock_alloc(areas_size, SMP_CACHE_BYTES);
        if (!areas) {
                rc = -ENOMEM;
                goto out_free;
@@ -2602,6 +2638,9 @@ int __init pcpu_page_first_chunk(size_t reserved_size,
        pages_size = PFN_ALIGN(unit_pages * num_possible_cpus() *
                               sizeof(pages[0]));
        pages = memblock_alloc(pages_size, SMP_CACHE_BYTES);
+       if (!pages)
+               panic("%s: Failed to allocate %zu bytes\n", __func__,
+                     pages_size);
 
        /* allocate pages */
        j = 0;
@@ -2690,8 +2729,7 @@ EXPORT_SYMBOL(__per_cpu_offset);
 static void * __init pcpu_dfl_fc_alloc(unsigned int cpu, size_t size,
                                       size_t align)
 {
-       return  memblock_alloc_from_nopanic(
-                       size, align, __pa(MAX_DMA_ADDRESS));
+       return  memblock_alloc_from(size, align, __pa(MAX_DMA_ADDRESS));
 }
 
 static void __init pcpu_dfl_fc_free(void *ptr, size_t size)
@@ -2739,9 +2777,7 @@ void __init setup_per_cpu_areas(void)
        void *fc;
 
        ai = pcpu_alloc_alloc_info(1, 1);
-       fc = memblock_alloc_from_nopanic(unit_size,
-                                             PAGE_SIZE,
-                                             __pa(MAX_DMA_ADDRESS));
+       fc = memblock_alloc_from(unit_size, PAGE_SIZE, __pa(MAX_DMA_ADDRESS));
        if (!ai || !fc)
                panic("Failed to allocate memory for percpu areas.");
        /* kmemleak tracks the percpu allocations separately */