Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm...

[sfrench/cifs-2.6.git] / arch / alpha / kernel / core_marvel.c

diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c
index bdebb8c206f10d99f4ca0d6dd5d6e678c7008398..c1d0c18c71ca4c7d8523094d4ba4568418754336 100644 (file)
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
@@ -18,7 +18,7 @@
 #include <linux/mc146818rtc.h>
 #include <linux/rtc.h>
 #include <linux/module.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 
 #include <asm/ptrace.h>
 #include <asm/smp.h>
@@ -82,7 +82,7 @@ mk_resource_name(int pe, int port, char *str)
        char *name;
        
        sprintf(tmp, "PCI %s PE %d PORT %d", str, pe, port);
-       name = alloc_bootmem(strlen(tmp) + 1);
+       name = memblock_alloc(strlen(tmp) + 1, SMP_CACHE_BYTES);
        strcpy(name, tmp);
 
        return name;
@@ -117,7 +117,7 @@ alloc_io7(unsigned int pe)
                return NULL;
        }
 
-       io7 = alloc_bootmem(sizeof(*io7));
+       io7 = memblock_alloc(sizeof(*io7), SMP_CACHE_BYTES);
        io7->pe = pe;
        raw_spin_lock_init(&io7->irq_lock);