diff options
| author | Scott Wood <scottwood@freescale.com> | 2007-03-12 21:41:48 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-03-13 11:15:55 +0100 |
| commit | 9dd2c31ab89a12571db89648bcc9992cf71b63d8 (patch) | |
| tree | abb5ef017f11fc22296dc958b5bf119293247427 /arch/powerpc/boot | |
| parent | [POWERPC] bootwrapper: Preserve the pp pointer in ft_make_space() when callin... (diff) | |
| download | linux-9dd2c31ab89a12571db89648bcc9992cf71b63d8.tar.xz linux-9dd2c31ab89a12571db89648bcc9992cf71b63d8.zip | |
[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>
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/flatdevtree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/flatdevtree.c b/arch/powerpc/boot/flatdevtree.c index 0fa4f98fe647..f2a29ca9ef85 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; |