Commit 78438b36 authored Mar 12, 2007 by Scott Wood Committed by Paul Mackerras Mar 13, 2007

[POWERPC] bootwrapper: Preserve the pp pointer in ft_make_space() when calling ft_reorder().



The ft_reorder() function may change the start of the region of interest,
so the pointer provided by the caller into that region must be fixed up
to still point to the same datum.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

parent c8aa7263

arch/powerpc/boot/flatdevtree.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -261,8 +261,14 @@ static int ft_make_space(struct ft_cxt cxt, char *pp, enum ft_rgn_id rgn,
		char str, next;
		enum ft_rgn_id r;

		if (!cxt->isordered && !ft_reorder(cxt, nextra))
		if (!cxt->isordered) {
		unsigned long rgn_off = *pp - cxt->rgn[rgn].start;

		if (!ft_reorder(cxt, nextra))
		return 0;

		*pp = cxt->rgn[rgn].start + rgn_off;
		}
		if (ft_shuffle(cxt, pp, rgn, nextra))
		return 1;