diff options
| author | David S. Miller | 2008-02-14 04:21:51 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-04-24 08:32:11 +0200 |
| commit | ad072004ca35a9918964ca7aee2bf00d79c8657f (patch) | |
| tree | dffd2075d875d0e53b638c07cff030beb8dea1dc /arch/sparc64/kernel/prom.c | |
| parent | [SPARC64]: Call real_setup_per_cpu_areas() earlier and use lmb_alloc(). (diff) | |
| download | kernel-qcow2-linux-ad072004ca35a9918964ca7aee2bf00d79c8657f.tar.gz kernel-qcow2-linux-ad072004ca35a9918964ca7aee2bf00d79c8657f.tar.xz kernel-qcow2-linux-ad072004ca35a9918964ca7aee2bf00d79c8657f.zip | |
[SPARC64]: Use lmb_alloc() for PROM device tree.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/prom.c')
| -rw-r--r-- | arch/sparc64/kernel/prom.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c index 68964ddcde1e..ed03a18d3b36 100644 --- a/arch/sparc64/kernel/prom.c +++ b/arch/sparc64/kernel/prom.c @@ -19,8 +19,8 @@ #include <linux/types.h> #include <linux/string.h> #include <linux/mm.h> -#include <linux/bootmem.h> #include <linux/module.h> +#include <linux/lmb.h> #include <asm/prom.h> #include <asm/of_device.h> @@ -122,16 +122,20 @@ int of_find_in_proplist(const char *list, const char *match, int len) } EXPORT_SYMBOL(of_find_in_proplist); -static unsigned int prom_early_allocated; +static unsigned int prom_early_allocated __initdata; static void * __init prom_early_alloc(unsigned long size) { + unsigned long paddr = lmb_alloc(size, SMP_CACHE_BYTES); void *ret; - ret = __alloc_bootmem(size, SMP_CACHE_BYTES, 0UL); - if (ret != NULL) - memset(ret, 0, size); + if (!paddr) { + prom_printf("prom_early_alloc(%lu) failed\n"); + prom_halt(); + } + ret = __va(paddr); + memset(ret, 0, size); prom_early_allocated += size; return ret; |