Message ID | 1487214078-3893-1-git-send-email-mpe@ellerman.id.au (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On 02/15/2017 09:01 PM, Michael Ellerman wrote: > We broke the build when CONFIG_MEMORY_HOTREMOVE=n: > > arch/powerpc/platforms/pseries/hotplug-memory.c:821:8: error: implicit > declaration of function 'dlpar_memory_readd_by_index' > > Add a dummy to fix it. > > Fixes: e70d59700fc3 ("powerpc/pseries: Introduce memory hotplug READD operation") > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Looks like we both saw the same thing today, this was patch 1/4 in the 'Implement indexed-count memory hotplug' patchset I sent out earlier today. Perhaps I should have sent that as a separate patch. Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com> > --- > arch/powerpc/platforms/pseries/hotplug-memory.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c > index 3381c20edbc0..b3b92814ce87 100644 > --- a/arch/powerpc/platforms/pseries/hotplug-memory.c > +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c > @@ -628,7 +628,10 @@ static int dlpar_memory_remove_by_index(u32 drc_index, struct property *prop) > { > return -EOPNOTSUPP; > } > - > +static int dlpar_memory_readd_by_index(u32 drc_index, struct property *prop) > +{ > + return -EOPNOTSUPP; > +} > #endif /* CONFIG_MEMORY_HOTREMOVE */ > > static int dlpar_add_lmb(struct of_drconf_cell *lmb) >
Nathan Fontenot <nfont@linux.vnet.ibm.com> writes: > On 02/15/2017 09:01 PM, Michael Ellerman wrote: >> We broke the build when CONFIG_MEMORY_HOTREMOVE=n: >> >> arch/powerpc/platforms/pseries/hotplug-memory.c:821:8: error: implicit >> declaration of function 'dlpar_memory_readd_by_index' >> >> Add a dummy to fix it. >> >> Fixes: e70d59700fc3 ("powerpc/pseries: Introduce memory hotplug READD operation") >> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> > > Looks like we both saw the same thing today, this was patch 1/4 in the > 'Implement indexed-count memory hotplug' patchset I sent out earlier today. Ah right, sorry. My auto builds hit it overnight, and then I sent it before checking mail today. > Perhaps I should have sent that as a separate patch. No biggy. cheers
On Thu, 2017-02-16 at 03:01:18 UTC, Michael Ellerman wrote: > We broke the build when CONFIG_MEMORY_HOTREMOVE=n: > > arch/powerpc/platforms/pseries/hotplug-memory.c:821:8: error: implicit > declaration of function 'dlpar_memory_readd_by_index' > > Add a dummy to fix it. > > Fixes: e70d59700fc3 ("powerpc/pseries: Introduce memory hotplug READD operation") > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> > Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com> Applied to powerpc next. https://git.kernel.org/powerpc/c/f84775c2d5d92581f2df60d53b574b cheers
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c index 3381c20edbc0..b3b92814ce87 100644 --- a/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c @@ -628,7 +628,10 @@ static int dlpar_memory_remove_by_index(u32 drc_index, struct property *prop) { return -EOPNOTSUPP; } - +static int dlpar_memory_readd_by_index(u32 drc_index, struct property *prop) +{ + return -EOPNOTSUPP; +} #endif /* CONFIG_MEMORY_HOTREMOVE */ static int dlpar_add_lmb(struct of_drconf_cell *lmb)
We broke the build when CONFIG_MEMORY_HOTREMOVE=n: arch/powerpc/platforms/pseries/hotplug-memory.c:821:8: error: implicit declaration of function 'dlpar_memory_readd_by_index' Add a dummy to fix it. Fixes: e70d59700fc3 ("powerpc/pseries: Introduce memory hotplug READD operation") Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- arch/powerpc/platforms/pseries/hotplug-memory.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)