Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> writes: > 6.1-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Russell Currey <ruscur@xxxxxxxxxx> > > [ Upstream commit 90b74e305d6b5a444b1283dd7ad1caf6acaa0340 ] > > Move plpks.h from platforms/pseries/ to include/asm/. This is necessary > for later patches to make use of the PLPKS from code in other subsystems. > > Signed-off-by: Russell Currey <ruscur@xxxxxxxxxx> > Signed-off-by: Andrew Donnellan <ajd@xxxxxxxxxxxxx> > Reviewed-by: Stefan Berger <stefanb@xxxxxxxxxxxxx> > Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx> > Link: https://lore.kernel.org/r/20230210080401.345462-15-ajd@xxxxxxxxxxxxx > Stable-dep-of: 932bed412170 ("powerpc/kexec_file: fix cpus node update to FDT") I don't see why this is a stable-dep of that commit? 0857beff9c1e and 932bed412170 apply with some fuzz, but otherwise seem fine, and build OK for me here (only tested a few configs). I'm not sure about backporting these plpks commits without some further testing. cheers > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > --- > .../powerpc/{platforms/pseries => include/asm}/plpks.h | 10 +++++++--- > arch/powerpc/platforms/pseries/plpks.c | 3 +-- > 2 files changed, 8 insertions(+), 5 deletions(-) > rename arch/powerpc/{platforms/pseries => include/asm}/plpks.h (94%) > > diff --git a/arch/powerpc/platforms/pseries/plpks.h b/arch/powerpc/include/asm/plpks.h > similarity index 94% > rename from arch/powerpc/platforms/pseries/plpks.h > rename to arch/powerpc/include/asm/plpks.h > index 07278a990c2df..44c3d93fb5e7d 100644 > --- a/arch/powerpc/platforms/pseries/plpks.h > +++ b/arch/powerpc/include/asm/plpks.h > @@ -6,8 +6,10 @@ > * Platform keystore for pseries LPAR(PLPKS). > */ > > -#ifndef _PSERIES_PLPKS_H > -#define _PSERIES_PLPKS_H > +#ifndef _ASM_POWERPC_PLPKS_H > +#define _ASM_POWERPC_PLPKS_H > + > +#ifdef CONFIG_PSERIES_PLPKS > > #include <linux/types.h> > #include <linux/list.h> > @@ -93,4 +95,6 @@ int plpks_read_fw_var(struct plpks_var *var); > */ > int plpks_read_bootloader_var(struct plpks_var *var); > > -#endif > +#endif // CONFIG_PSERIES_PLPKS > + > +#endif // _ASM_POWERPC_PLPKS_H > diff --git a/arch/powerpc/platforms/pseries/plpks.c b/arch/powerpc/platforms/pseries/plpks.c > index d54188a355c9c..1c43c4febd3da 100644 > --- a/arch/powerpc/platforms/pseries/plpks.c > +++ b/arch/powerpc/platforms/pseries/plpks.c > @@ -18,8 +18,7 @@ > #include <linux/types.h> > #include <asm/hvcall.h> > #include <asm/machdep.h> > - > -#include "plpks.h" > +#include <asm/plpks.h> > > static u8 *ospassword; > static u16 ospasswordlength; > -- > 2.43.0
