arm, s390, unicore32: remove oneliner wrappers for memblock_alloc()

arm, s390 and unicore32 use oneliner wrappers for memblock_alloc().
Replace their usage with direct call to memblock_alloc().

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Mike Rapoport <[email protected]>
Suggested-by: Christoph Hellwig <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Greentime Hu <[email protected]>
Cc: Guan Xuetao <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: Jonas Bonn <[email protected]>
Cc: Mark Salter <[email protected]>
Cc: Martin Schwidefsky <[email protected]>
Cc: Michael Ellerman <[email protected]>
Cc: Michal Hocko <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Rich Felker <[email protected]>
Cc: Russell King <[email protected]>
Cc: Stafford Horne <[email protected]>
Cc: Stefan Kristiansson <[email protected]>
Cc: Vincent Chen <[email protected]>
Cc: Yoshinori Sato <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 0a04c9a5f04265d2d6173b15f6b1bf78d9fe28d4..57de0dde3ae0811a7290ff42578167ebb7dc208c 100644 (file)
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -719,14 +719,9 @@ EXPORT_SYMBOL(phys_mem_access_prot);
 
 #define vectors_base() (vectors_high() ? 0xffff0000 : 0)
 
-static void __init *early_alloc_aligned(unsigned long sz, unsigned long align)
-{
-       return memblock_alloc(sz, align);
-}
-
 static void __init *early_alloc(unsigned long sz)
 {
-       return early_alloc_aligned(sz, sz);
+       return memblock_alloc(sz, sz);
 }
 
 static void *__init late_alloc(unsigned long sz)
@@ -998,7 +993,7 @@ void __init iotable_init(struct map_desc *io_desc, int nr)
        if (!nr)
                return;
 
-       svm = early_alloc_aligned(sizeof(*svm) * nr, __alignof__(*svm));
+       svm = memblock_alloc(sizeof(*svm) * nr, __alignof__(*svm));
 
        for (md = io_desc; nr; md++, nr--) {
                create_mapping(md);
@@ -1020,7 +1015,7 @@ void __init vm_reserve_area_early(unsigned long addr, unsigned long size,
        struct vm_struct *vm;
        struct static_vm *svm;
 
-       svm = early_alloc_aligned(sizeof(*svm), __alignof__(*svm));
+       svm = memblock_alloc(sizeof(*svm), __alignof__(*svm));
 
        vm = &svm->vm;
        vm->addr = (void *)addr;

diff --git a/arch/s390/numa/numa.c b/arch/s390/numa/numa.c
index 2281a88f261cdd78363085e4638610791c193908..2d1271e2a70db2a73813ce51923bd42ac88d85ef 100644 (file)
--- a/arch/s390/numa/numa.c
+++ b/arch/s390/numa/numa.c
@@ -57,14 +57,6 @@ EXPORT_SYMBOL(__node_distance);
 
 int numa_debug_enabled;
 
-/*
- * alloc_node_data() - Allocate node data
- */
-static __init pg_data_t *alloc_node_data(void)
-{
-       return memblock_alloc(sizeof(pg_data_t), 8);
-}
-
 /*
  * numa_setup_memory() - Assign bootmem to nodes
  *
@@ -101,7 +93,7 @@ static void __init numa_setup_memory(void)
 
        /* Allocate and fill out node_data */
        for (nid = 0; nid < MAX_NUMNODES; nid++)
-               NODE_DATA(nid) = alloc_node_data();
+               NODE_DATA(nid) = memblock_alloc(sizeof(pg_data_t), 8);
 
        for_each_online_node(nid) {
                unsigned long start_pfn, end_pfn;

diff --git a/arch/unicore32/mm/mmu.c b/arch/unicore32/mm/mmu.c
index 50d8c1a39e54b4391a5b587e70a0d8d7c406dc57..a40219291965de0cce772c0c6a2c763358a68b15 100644 (file)
--- a/arch/unicore32/mm/mmu.c
+++ b/arch/unicore32/mm/mmu.c
@@ -141,16 +141,12 @@ static void __init build_mem_type_table(void)
 
 #define vectors_base() (vectors_high() ? 0xffff0000 : 0)
 
-static void __init *early_alloc(unsigned long sz)
-{
-       return memblock_alloc(sz, sz);
-}
-
 static pte_t * __init early_pte_alloc(pmd_t *pmd, unsigned long addr,
                unsigned long prot)
 {
        if (pmd_none(*pmd)) {
-               pte_t *pte = early_alloc(PTRS_PER_PTE * sizeof(pte_t));
+               pte_t *pte = memblock_alloc(PTRS_PER_PTE * sizeof(pte_t),
+                                           PTRS_PER_PTE * sizeof(pte_t));
                __pmd_populate(pmd, __pa(pte) | prot);
        }
        BUG_ON(pmd_bad(*pmd));
@@ -352,7 +348,7 @@ static void __init devicemaps_init(void)
        /*
         * Allocate the vector page early.
         */
-       vectors = early_alloc(PAGE_SIZE);
+       vectors = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
 
        for (addr = VMALLOC_END; addr; addr += PGDIR_SIZE)
                pmd_clear(pmd_off_k(addr));
@@ -429,7 +425,7 @@ void __init paging_init(void)
        top_pmd = pmd_off_k(0xffff0000);
 
        /* allocate the zero page. */
-       zero_page = early_alloc(PAGE_SIZE);
+       zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
 
        bootmem_init();