| Message ID | 5ce7982c72424eb3e7abf78063d454c38c42b343.1590778219.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | powerpc/32s: Fix another build failure with CONFIG_PPC_KUAP_DEBUG | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (00ec79b0b767994422c43792d73ff1327714a73f) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch is tagged for stable |
Le 29/05/2020 à 20:50, Christophe Leroy a écrit : > From: Christophe Leroy <christophe.leroy@c-s.fr> > > 'thread' doesn't exist in kuap_check() macro. > > Use 'current' instead. > > Fixes: a68c31fc01ef ("powerpc/32s: Implement Kernel Userspace Access Protection") > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Argh, can you drop this line ? > Cc: stable@vger.kernel.org > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Reported-by: kbuild test robot <lkp@intel.com> > --- > arch/powerpc/include/asm/book3s/32/kup.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/powerpc/include/asm/book3s/32/kup.h b/arch/powerpc/include/asm/book3s/32/kup.h > index db0a1c281587..668508c8a1b5 100644 > --- a/arch/powerpc/include/asm/book3s/32/kup.h > +++ b/arch/powerpc/include/asm/book3s/32/kup.h > @@ -75,7 +75,7 @@ > > .macro kuap_check current, gpr > #ifdef CONFIG_PPC_KUAP_DEBUG > - lwz \gpr, KUAP(thread) > + lwz \gpr, THREAD + KUAP(\current) > 999: twnei \gpr, 0 > EMIT_BUG_ENTRY 999b, __FILE__, __LINE__, (BUGFLAG_WARNING | BUGFLAG_ONCE) > #endif >
diff --git a/arch/powerpc/include/asm/book3s/32/kup.h b/arch/powerpc/include/asm/book3s/32/kup.h index db0a1c281587..668508c8a1b5 100644 --- a/arch/powerpc/include/asm/book3s/32/kup.h +++ b/arch/powerpc/include/asm/book3s/32/kup.h @@ -75,7 +75,7 @@ .macro kuap_check current, gpr #ifdef CONFIG_PPC_KUAP_DEBUG - lwz \gpr, KUAP(thread) + lwz \gpr, THREAD + KUAP(\current) 999: twnei \gpr, 0 EMIT_BUG_ENTRY 999b, __FILE__, __LINE__, (BUGFLAG_WARNING | BUGFLAG_ONCE) #endif