Commit b09cecd8 authored by Julian Braha's avatar Julian Braha Committed by Zheng Zengkai
Browse files

lib: fix kconfig dependency on ARCH_WANT_FRAME_POINTERS 

stable inclusion
from stable-5.10.32
commit 955da2b5cd9855b186f14b71ddb1703d5144193c
bugzilla: 51796

--------------------------------

[ Upstream commit 7d37cb2c ]

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: default avatarJulian 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Acked-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 7035ca47

lib/Kconfig.debug

+3 −3
Original line number Diff line number Diff line
@@ -1318,7 +1318,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
@@ -1612,7 +1612,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
@@ -1865,7 +1865,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