diff options
| author | Jeremy Kerr <jeremy.kerr@canonical.com> | 2010-02-14 07:13:47 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-14 07:13:47 -0700 |
| commit | 4ef7b373df330bc0ff037dc4792d373c9346375f (patch) | |
| tree | 5e0daa974d6de7b96c95d990cbc191085ec80349 /arch/powerpc/kernel/prom.c | |
| parent | 9dfbf207802c7e8cda9d081a8d750b50633c82d2 (diff) | |
| download | blackbird-op-linux-4ef7b373df330bc0ff037dc4792d373c9346375f.tar.gz blackbird-op-linux-4ef7b373df330bc0ff037dc4792d373c9346375f.zip | |
of/flattree: Don't assume HAVE_LMB
We don't always have lmb available, so make arches provide an
early_init_dt_alloc_memory_arch() to handle the allocation of
memory in the fdt code.
When we don't have lmb.h included, we need asm/page.h for __va.
Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/powerpc/kernel/prom.c')
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 43c78d74ddcb..5bbbdb29f603 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -510,6 +510,11 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) memstart_addr = min((u64)memstart_addr, base); } +u64 __init early_init_dt_alloc_memory_arch(u64 size, u64 align) +{ + return lmb_alloc(size, align); +} + #ifdef CONFIG_BLK_DEV_INITRD void __init early_init_dt_setup_initrd_arch(unsigned long start, unsigned long end) |
