diff options
| author |   Grant Likely <grant.likely@secretlab.ca> | 2011-01-13 15:36:09 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-01-15 22:01:58 -0700 |
| commit | 672c54466d24994eb9633f993862c89539504a42 (patch) | |
| tree | e08f17e5fa260676912eb9b7d2263d47d667fdec /include/linux/of_fdt.h | |
| parent | Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 (diff) | |
| download | linux-dev-672c54466d24994eb9633f993862c89539504a42.tar.xz linux-dev-672c54466d24994eb9633f993862c89539504a42.zip | |
dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch()
The physical address is never used by the device tree code when
allocating memory for unflattening. Change the architecture's alloc
hook to return the virutal address instead.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'include/linux/of_fdt.h')
| -rw-r--r-- | include/linux/of_fdt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index 0ef22a1f129e..c84d900fbbb3 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -97,7 +97,7 @@ extern void early_init_dt_check_for_initrd(unsigned long node); extern int early_init_dt_scan_memory(unsigned long node, const char *uname, int depth, void *data); extern void early_init_dt_add_memory_arch(u64 base, u64 size); -extern u64 early_init_dt_alloc_memory_arch(u64 size, u64 align); +extern void * early_init_dt_alloc_memory_arch(u64 size, u64 align); extern u64 dt_mem_next_cell(int s, __be32 **cellp); /* |