diff options
Diffstat (limited to 'arch/alpha/kernel/core_marvel.c')
-rw-r--r-- | arch/alpha/kernel/core_marvel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c index bdebb8c206f1..1f00c9433b10 100644 --- a/arch/alpha/kernel/core_marvel.c +++ b/arch/alpha/kernel/core_marvel.c | |||
@@ -82,7 +82,7 @@ mk_resource_name(int pe, int port, char *str) | |||
82 | char *name; | 82 | char *name; |
83 | 83 | ||
84 | sprintf(tmp, "PCI %s PE %d PORT %d", str, pe, port); | 84 | sprintf(tmp, "PCI %s PE %d PORT %d", str, pe, port); |
85 | name = alloc_bootmem(strlen(tmp) + 1); | 85 | name = memblock_alloc(strlen(tmp) + 1, 0); |
86 | strcpy(name, tmp); | 86 | strcpy(name, tmp); |
87 | 87 | ||
88 | return name; | 88 | return name; |
@@ -117,7 +117,7 @@ alloc_io7(unsigned int pe) | |||
117 | return NULL; | 117 | return NULL; |
118 | } | 118 | } |
119 | 119 | ||
120 | io7 = alloc_bootmem(sizeof(*io7)); | 120 | io7 = memblock_alloc(sizeof(*io7), 0); |
121 | io7->pe = pe; | 121 | io7->pe = pe; |
122 | raw_spin_lock_init(&io7->irq_lock); | 122 | raw_spin_lock_init(&io7->irq_lock); |
123 | 123 | ||