aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/prom.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2009-11-23 21:44:23 -0500
committerGrant Likely <grant.likely@secretlab.ca>2009-11-23 21:44:23 -0500
commit819d2819303654c6829d572e698e2d0021c08599 (patch)
tree8e98224edfc837a630625b9e05c74121c7fa9b3f /arch/powerpc/kernel/prom.c
parentc8cb7a59842c0b512b44f6f818cdb0b5a3ddc89e (diff)
of/flattree: merge of_get_flat_dt_root
Merge common code between PowerPC and MicroBlaze Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Reviewed-by: Wolfram Sang <w.sang@pengutronix.de> Tested-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/powerpc/kernel/prom.c')
-rw-r--r--arch/powerpc/kernel/prom.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 14a07b9e00d1..b5d5f85e9c2c 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -80,18 +80,6 @@ extern rwlock_t devtree_lock; /* temporary while merging */
80/* export that to outside world */ 80/* export that to outside world */
81struct device_node *of_chosen; 81struct device_node *of_chosen;
82 82
83unsigned long __init of_get_flat_dt_root(void)
84{
85 unsigned long p = ((unsigned long)initial_boot_params) +
86 initial_boot_params->off_dt_struct;
87
88 while(*((u32 *)p) == OF_DT_NOP)
89 p += 4;
90 BUG_ON (*((u32 *)p) != OF_DT_BEGIN_NODE);
91 p += 4;
92 return _ALIGN(p + strlen((char *)p) + 1, 4);
93}
94
95/** 83/**
96 * This function can be used within scan_flattened_dt callback to get 84 * This function can be used within scan_flattened_dt callback to get
97 * access to properties 85 * access to properties