| From 6431517a4ff0aefd8c4b55dc45807d04c921e2bb Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 9 Apr 2021 13:27:47 -0700 |
| Subject: lib: fix kconfig dependency on ARCH_WANT_FRAME_POINTERS |
| |
| From: Julian Braha <julianbraha@gmail.com> |
| |
| [ Upstream commit 7d37cb2c912dc5c25ffac784a4f9b98c06c6bd08 ] |
| |
| When LATENCYTOP, LOCKDEP, or FAULT_INJECTION_STACKTRACE_FILTER is |
| enabled and ARCH_WANT_FRAME_POINTERS is disabled, Kbuild gives a warning |
| such as: |
| |
| WARNING: unmet direct dependencies detected for FRAME_POINTER |
| Depends on [n]: DEBUG_KERNEL [=y] && (M68K || UML || SUPERH) || ARCH_WANT_FRAME_POINTERS [=n] || MCOUNT [=n] |
| Selected by [y]: |
| - LATENCYTOP [=y] && DEBUG_KERNEL [=y] && STACKTRACE_SUPPORT [=y] && PROC_FS [=y] && !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM && !ARC && !X86 |
| |
| Depending on ARCH_WANT_FRAME_POINTERS causes a recursive dependency |
| error. ARCH_WANT_FRAME_POINTERS is to be selected by the architecture, |
| and is not supposed to be overridden by other config options. |
| |
| Link: https://lkml.kernel.org/r/20210329165329.27994-1-julianbraha@gmail.com |
| Signed-off-by: Julian Braha <julianbraha@gmail.com> |
| Cc: Andreas Schwab <schwab@linux-m68k.org> |
| Cc: Geert Uytterhoeven <geert@linux-m68k.org> |
| Cc: Necip Fazil Yildiran <fazilyildiran@gmail.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| lib/Kconfig.debug | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug |
| index c789b39ed527..dcf4a9028e16 100644 |
| --- a/lib/Kconfig.debug |
| +++ b/lib/Kconfig.debug |
| @@ -1302,7 +1302,7 @@ config LOCKDEP |
| bool |
| depends on DEBUG_KERNEL && LOCK_DEBUGGING_SUPPORT |
| select STACKTRACE |
| - select FRAME_POINTER if !MIPS && !PPC && !ARM && !S390 && !MICROBLAZE && !ARC && !X86 |
| + depends on FRAME_POINTER || MIPS || PPC || S390 || MICROBLAZE || ARM || ARC || X86 |
| select KALLSYMS |
| select KALLSYMS_ALL |
| |
| @@ -1596,7 +1596,7 @@ config LATENCYTOP |
| depends on DEBUG_KERNEL |
| depends on STACKTRACE_SUPPORT |
| depends on PROC_FS |
| - select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM && !ARC && !X86 |
| + depends on FRAME_POINTER || MIPS || PPC || S390 || MICROBLAZE || ARM || ARC || X86 |
| select KALLSYMS |
| select KALLSYMS_ALL |
| select STACKTRACE |
| @@ -1849,7 +1849,7 @@ config FAULT_INJECTION_STACKTRACE_FILTER |
| depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT |
| depends on !X86_64 |
| select STACKTRACE |
| - select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM && !ARC && !X86 |
| + depends on FRAME_POINTER || MIPS || PPC || S390 || MICROBLAZE || ARM || ARC || X86 |
| help |
| Provide stacktrace filter for fault-injection capabilities |
| |
| -- |
| 2.30.2 |
| |