From: Scott Wood <scottwood@freescale.com>
Date: Mon, 12 Mar 2007 20:41:48 +0000 (-0600)
Subject: [POWERPC] bootwrapper: Modify *pp, not *p, in ft_shuffle().
X-Git-Tag: v2.6.22-rc1~1109^2~181
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dd2c31ab89a12571db89648bcc9992cf71b63d8;p=linux-2.6

[POWERPC] bootwrapper: Modify *pp, not *p, in ft_shuffle().

Move the caller's pointer back to match the change in the region's start,
rather than alter a byte of the device tree's content.

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 0fa4f98fe6..f2a29ca9ef 100644
--- a/arch/powerpc/boot/flatdevtree.c
+++ b/arch/powerpc/boot/flatdevtree.c
@@ -246,7 +246,7 @@ static int ft_shuffle(struct ft_cxt *cxt, char **pp, enum ft_rgn_id rgn,
 			if (rgn == FT_STRUCT)
 				ft_node_update_before(cxt, p, -nextra);
 		}
-		*p -= nextra;
+		*pp -= nextra;
 		cxt->rgn[rgn].start -= nextra;
 		cxt->rgn[rgn].size += nextra;
 		return 1;