Signed-off-by: Greg Kurz <groug@kaod.org>
---
hw/ppc/spapr.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 9c41098b5781..7771a628f879 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -893,8 +893,6 @@ static int spapr_populate_drconf_memory(sPAPRMachineState *spapr, void *fdt)
/* ibm,associativity-lookup-arrays */
buf_len = (nr_nodes * 4 + 2) * sizeof(uint32_t);
cur_index = int_buf = g_malloc0(buf_len);
-
- cur_index = int_buf;
int_buf[0] = cpu_to_be32(nr_nodes);
int_buf[1] = cpu_to_be32(4); /* Number of entries per associativity list */
cur_index += 2;
On 22/11/2018 15:31, Greg Kurz wrote: > Signed-off-by: Greg Kurz <groug@kaod.org> > --- > hw/ppc/spapr.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 9c41098b5781..7771a628f879 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -893,8 +893,6 @@ static int spapr_populate_drconf_memory(sPAPRMachineState *spapr, void *fdt) > /* ibm,associativity-lookup-arrays */ > buf_len = (nr_nodes * 4 + 2) * sizeof(uint32_t); > cur_index = int_buf = g_malloc0(buf_len); > - > - cur_index = int_buf; > int_buf[0] = cpu_to_be32(nr_nodes); > int_buf[1] = cpu_to_be32(4); /* Number of entries per associativity list */ > cur_index += 2; > > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
On Thu, Nov 22, 2018 at 03:31:36PM +0100, Greg Kurz wrote: > Signed-off-by: Greg Kurz <groug@kaod.org> Applied to ppc-for-3.2. > --- > hw/ppc/spapr.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 9c41098b5781..7771a628f879 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -893,8 +893,6 @@ static int spapr_populate_drconf_memory(sPAPRMachineState *spapr, void *fdt) > /* ibm,associativity-lookup-arrays */ > buf_len = (nr_nodes * 4 + 2) * sizeof(uint32_t); > cur_index = int_buf = g_malloc0(buf_len); > - > - cur_index = int_buf; > int_buf[0] = cpu_to_be32(nr_nodes); > int_buf[1] = cpu_to_be32(4); /* Number of entries per associativity list */ > cur_index += 2; > -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
On Fri, 23 Nov 2018 11:20:37 +1100 David Gibson <david@gibson.dropbear.id.au> wrote: > On Thu, Nov 22, 2018 at 03:31:36PM +0100, Greg Kurz wrote: > > Signed-off-by: Greg Kurz <groug@kaod.org> > > Applied to ppc-for-3.2. > AFAIK, next release will be 4.0. > > --- > > hw/ppc/spapr.c | 2 -- > > 1 file changed, 2 deletions(-) > > > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > > index 9c41098b5781..7771a628f879 100644 > > --- a/hw/ppc/spapr.c > > +++ b/hw/ppc/spapr.c > > @@ -893,8 +893,6 @@ static int spapr_populate_drconf_memory(sPAPRMachineState *spapr, void *fdt) > > /* ibm,associativity-lookup-arrays */ > > buf_len = (nr_nodes * 4 + 2) * sizeof(uint32_t); > > cur_index = int_buf = g_malloc0(buf_len); > > - > > - cur_index = int_buf; > > int_buf[0] = cpu_to_be32(nr_nodes); > > int_buf[1] = cpu_to_be32(4); /* Number of entries per associativity list */ > > cur_index += 2; > > >
On Fri, Nov 23, 2018 at 09:04:19AM +0100, Greg Kurz wrote: > On Fri, 23 Nov 2018 11:20:37 +1100 > David Gibson <david@gibson.dropbear.id.au> wrote: > > > On Thu, Nov 22, 2018 at 03:31:36PM +0100, Greg Kurz wrote: > > > Signed-off-by: Greg Kurz <groug@kaod.org> > > > > Applied to ppc-for-3.2. > > > > AFAIK, next release will be 4.0. Oh, right, I've renamed that. > > > > --- > > > hw/ppc/spapr.c | 2 -- > > > 1 file changed, 2 deletions(-) > > > > > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > > > index 9c41098b5781..7771a628f879 100644 > > > --- a/hw/ppc/spapr.c > > > +++ b/hw/ppc/spapr.c > > > @@ -893,8 +893,6 @@ static int spapr_populate_drconf_memory(sPAPRMachineState *spapr, void *fdt) > > > /* ibm,associativity-lookup-arrays */ > > > buf_len = (nr_nodes * 4 + 2) * sizeof(uint32_t); > > > cur_index = int_buf = g_malloc0(buf_len); > > > - > > > - cur_index = int_buf; > > > int_buf[0] = cpu_to_be32(nr_nodes); > > > int_buf[1] = cpu_to_be32(4); /* Number of entries per associativity list */ > > > cur_index += 2; > > > > > > -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
© 2016 - 2024 Red Hat, Inc.