Skip to content

Commit e33416f

Browse files
committed
powerpc: Don't select ARCH_WANTS_NO_INSTR
Commit 41b7a34 ("powerpc: Book3S 64-bit outline-only KASAN support") added a select of ARCH_WANTS_NO_INSTR, because it also added some uses of noinstr. However noinstr is always defined, regardless of ARCH_WANTS_NO_INSTR, so there's no need to select it just for that. As PeterZ says [1]: Note that by selecting ARCH_WANTS_NO_INSTR you effectively state to abide by its rules. As of now the powerpc code does not abide by those rules, and trips some new warnings added by Peter in linux-next. So until the code can be fixed to avoid those warnings, disable ARCH_WANTS_NO_INSTR. Note that ARCH_WANTS_NO_INSTR is also used to gate building KCOV and parts of KCSAN. However none of the noinstr annotations in powerpc were added for KCOV or KCSAN, instead instrumentation is blocked at the file level using KCOV_INSTRUMENT_foo.o := n. [1]: https://lore.kernel.org/linuxppc-dev/[email protected] Reported-by: Sachin Sant <[email protected]> Suggested-by: Peter Zijlstra <[email protected]> Signed-off-by: Michael Ellerman <[email protected]>
1 parent 1665c02 commit e33416f

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

arch/powerpc/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ config PPC
163163
select ARCH_WANT_IRQS_OFF_ACTIVATE_MM
164164
select ARCH_WANT_LD_ORPHAN_WARN
165165
select ARCH_WANTS_MODULES_DATA_IN_VMALLOC if PPC_BOOK3S_32 || PPC_8xx
166-
select ARCH_WANTS_NO_INSTR
167166
select ARCH_WEAK_RELEASE_ACQUIRE
168167
select BINFMT_ELF
169168
select BUILDTIME_TABLE_SORT

0 commit comments

Comments
 (0)