]> err.no Git - linux-2.6/commitdiff
[POWERPC] bootwrapper: Modify *pp, not *p, in ft_shuffle().
authorScott Wood <scottwood@freescale.com>
Mon, 12 Mar 2007 20:41:48 +0000 (14:41 -0600)
committerPaul Mackerras <paulus@samba.org>
Tue, 13 Mar 2007 10:15:55 +0000 (21:15 +1100)
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>
arch/powerpc/boot/flatdevtree.c

index 0fa4f98fe64781625e00ed67f9fc48692d476cb2..f2a29ca9ef858dbeff899ed945ef82bcff9d0eb8 100644 (file)
@@ -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;