git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
[sfrench/cifs-2.6.git]
/
arch
/
sparc
/
kernel
/
prom_32.c
diff --git
a/arch/sparc/kernel/prom_32.c
b/arch/sparc/kernel/prom_32.c
index b51cbb9e87dcbe8ae036d692d834ca5ebcaa9fee..d41e2a749c5d94668876b0d92ac4963954696699 100644
(file)
--- a/
arch/sparc/kernel/prom_32.c
+++ b/
arch/sparc/kernel/prom_32.c
@@
-19,7
+19,7
@@
#include <linux/types.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/types.h>
#include <linux/string.h>
#include <linux/mm.h>
-#include <linux/
bootmem
.h>
+#include <linux/
memblock
.h>
#include <asm/prom.h>
#include <asm/oplib.h>
#include <asm/prom.h>
#include <asm/oplib.h>
@@
-32,7
+32,7
@@
void * __init prom_early_alloc(unsigned long size)
{
void *ret;
{
void *ret;
- ret =
__alloc_bootme
m(size, SMP_CACHE_BYTES, 0UL);
+ ret =
memblock_alloc_fro
m(size, SMP_CACHE_BYTES, 0UL);
if (ret != NULL)
memset(ret, 0, size);
if (ret != NULL)
memset(ret, 0, size);