git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull misc-2.6.39 into release branch
[pandora-kernel.git]
/
arch
/
mips
/
kernel
/
prom.c
diff --git
a/arch/mips/kernel/prom.c
b/arch/mips/kernel/prom.c
index
9dbe583
..
a19811e
100644
(file)
--- a/
arch/mips/kernel/prom.c
+++ b/
arch/mips/kernel/prom.c
@@
-45,11
+45,9
@@
void __init free_mem_mach(unsigned long addr, unsigned long size)
return free_bootmem(addr, size);
}
return free_bootmem(addr, size);
}
-
u64
__init early_init_dt_alloc_memory_arch(u64 size, u64 align)
+
void *
__init early_init_dt_alloc_memory_arch(u64 size, u64 align)
{
{
- return virt_to_phys(
- __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS))
- );
+ return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));
}
#ifdef CONFIG_BLK_DEV_INITRD
}
#ifdef CONFIG_BLK_DEV_INITRD