diff options
| author |   Scott Wood <scottwood@freescale.com> | 2007-03-12 14:41:47 -0600 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2007-03-13 21:15:52 +1100 |
| commit | 78438b36011d8ef7d28ef63a30b11801be1eea71 (patch) | |
| tree | c9fce48213623cbb3b1d37f9d05c9cad6d44d601 /arch/powerpc/boot/flatdevtree.c | |
| parent | [POWERPC] bootwrapper: Make ft_get_phandle() accept and return NULL. (diff) | |
| download | linux-dev-78438b36011d8ef7d28ef63a30b11801be1eea71.tar.xz linux-dev-78438b36011d8ef7d28ef63a30b11801be1eea71.zip | |
[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>
Diffstat (limited to 'arch/powerpc/boot/flatdevtree.c')
| -rw-r--r-- | arch/powerpc/boot/flatdevtree.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/powerpc/boot/flatdevtree.c b/arch/powerpc/boot/flatdevtree.c index 6c1877358aed..0fa4f98fe647 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; |