From: Scott Wood <scottwood@freescale.com>
Date: Mon, 12 Mar 2007 20:41:47 +0000 (-0600)
Subject: [POWERPC] bootwrapper: Preserve the pp pointer in ft_make_space() when calling ft_reo... 
X-Git-Tag: v2.6.22-rc1~1109^2~182
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78438b36011d8ef7d28ef63a30b11801be1eea71;p=linux-2.6

[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>
---

diff --git a/arch/powerpc/boot/flatdevtree.c b/arch/powerpc/boot/flatdevtree.c
index 6c1877358a..0fa4f98fe6 100644
--- a/arch/powerpc/boot/flatdevtree.c
+++ b/arch/powerpc/boot/flatdevtree.c
@@ -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))
-		return 0;
+	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;