diff options
-rw-r--r-- | arch/powerpc/boot/flatdevtree.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/powerpc/boot/flatdevtree.c b/arch/powerpc/boot/flatdevtree.c index b732644788db..13761bf160c4 100644 --- a/arch/powerpc/boot/flatdevtree.c +++ b/arch/powerpc/boot/flatdevtree.c | |||
@@ -134,20 +134,6 @@ static char *ft_next(struct ft_cxt *cxt, char *p, struct ft_atom *ret) | |||
134 | #define HDR_SIZE _ALIGN(sizeof(struct boot_param_header), 8) | 134 | #define HDR_SIZE _ALIGN(sizeof(struct boot_param_header), 8) |
135 | #define EXPAND_INCR 1024 /* alloc this much extra when expanding */ | 135 | #define EXPAND_INCR 1024 /* alloc this much extra when expanding */ |
136 | 136 | ||
137 | /* See if the regions are in the standard order and non-overlapping */ | ||
138 | static int ft_ordered(struct ft_cxt *cxt) | ||
139 | { | ||
140 | char *p = (char *)cxt->bph + HDR_SIZE; | ||
141 | enum ft_rgn_id r; | ||
142 | |||
143 | for (r = FT_RSVMAP; r <= FT_STRINGS; ++r) { | ||
144 | if (p > cxt->rgn[r].start) | ||
145 | return 0; | ||
146 | p = cxt->rgn[r].start + cxt->rgn[r].size; | ||
147 | } | ||
148 | return p <= (char *)cxt->bph + cxt->max_size; | ||
149 | } | ||
150 | |||
151 | /* Copy the tree to a newly-allocated region and put things in order */ | 137 | /* Copy the tree to a newly-allocated region and put things in order */ |
152 | static int ft_reorder(struct ft_cxt *cxt, int nextra) | 138 | static int ft_reorder(struct ft_cxt *cxt, int nextra) |
153 | { | 139 | { |
@@ -573,10 +559,6 @@ int ft_open(struct ft_cxt *cxt, void *blob, unsigned int max_size, | |||
573 | cxt->rgn[FT_STRUCT].size = struct_size(cxt); | 559 | cxt->rgn[FT_STRUCT].size = struct_size(cxt); |
574 | cxt->rgn[FT_STRINGS].start = blob + be32_to_cpu(bph->off_dt_strings); | 560 | cxt->rgn[FT_STRINGS].start = blob + be32_to_cpu(bph->off_dt_strings); |
575 | cxt->rgn[FT_STRINGS].size = be32_to_cpu(bph->dt_strings_size); | 561 | cxt->rgn[FT_STRINGS].size = be32_to_cpu(bph->dt_strings_size); |
576 | /* Leave as '0' to force first ft_make_space call to do a ft_reorder | ||
577 | * and move dt to an area allocated by realloc. | ||
578 | cxt->isordered = ft_ordered(cxt); | ||
579 | */ | ||
580 | 562 | ||
581 | cxt->p = cxt->rgn[FT_STRUCT].start; | 563 | cxt->p = cxt->rgn[FT_STRUCT].start; |
582 | cxt->str_anchor = cxt->rgn[FT_STRINGS].start; | 564 | cxt->str_anchor = cxt->rgn[FT_STRINGS].start; |