summaryrefslogtreecommitdiff
path: root/drivers/of
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-01-13 15:36:09 -0700
committerGrant Likely <grant.likely@secretlab.ca>2011-01-15 22:01:58 -0700
commit672c54466d24994eb9633f993862c89539504a42 (patch)
treee08f17e5fa260676912eb9b7d2263d47d667fdec /drivers/of
parent1b59be2a6cdcb5a12e18d8315c07c94a624de48f (diff)
downloadlinux-3.10-672c54466d24994eb9633f993862c89539504a42.tar.gz
linux-3.10-672c54466d24994eb9633f993862c89539504a42.tar.bz2
linux-3.10-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 'drivers/of')
-rw-r--r--drivers/of/fdt.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index c787c3d95c6..af824e7e036 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -692,12 +692,6 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
return 1;
}
-static void *__init early_device_tree_alloc(u64 size, u64 align)
-{
- unsigned long mem = early_init_dt_alloc_memory_arch(size, align);
- return __va(mem);
-}
-
/**
* unflatten_device_tree - create tree of device_nodes from flat blob
*
@@ -709,7 +703,7 @@ static void *__init early_device_tree_alloc(u64 size, u64 align)
void __init unflatten_device_tree(void)
{
__unflatten_device_tree(initial_boot_params, &allnodes,
- early_device_tree_alloc);
+ early_init_dt_alloc_memory_arch);
/* Get pointer to OF "/chosen" node for use everywhere */
of_chosen = of_find_node_by_path("/chosen");