Skip to content

Commit b69ec42

Browse files
ctmarinastorvalds
authored andcommitted
Kconfig: clean up the long arch list for the DEBUG_KMEMLEAK config option
Introduce HAVE_DEBUG_KMEMLEAK config option and select it in corresponding architecture Kconfig files. DEBUG_KMEMLEAK now only depends on HAVE_DEBUG_KMEMLEAK. Signed-off-by: Catalin Marinas <[email protected]> Cc: Russell King <[email protected]> Cc: Michal Simek <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: Paul Mundt <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Chris Metcalf <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent af1839e commit b69ec42

File tree

11 files changed

+14
-4
lines changed

11 files changed

+14
-4
lines changed

arch/arm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ config ARM
2525
select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)
2626
select ARCH_BINFMT_ELF_RANDOMIZE_PIE
2727
select HAVE_GENERIC_DMA_COHERENT
28+
select HAVE_DEBUG_KMEMLEAK
2829
select HAVE_KERNEL_GZIP
2930
select HAVE_KERNEL_LZO
3031
select HAVE_KERNEL_LZMA

arch/arm64/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ config ARM64
1010
select GENERIC_TIME_VSYSCALL
1111
select HARDIRQS_SW_RESEND
1212
select HAVE_ARCH_TRACEHOOK
13+
select HAVE_DEBUG_KMEMLEAK
1314
select HAVE_DMA_API_DEBUG
1415
select HAVE_DMA_ATTRS
1516
select HAVE_GENERIC_DMA_COHERENT

arch/microblaze/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ config MICROBLAZE
1616
select OF
1717
select OF_EARLY_FLATTREE
1818
select ARCH_WANT_IPC_PARSE_VERSION
19+
select HAVE_DEBUG_KMEMLEAK
1920
select IRQ_DOMAIN
2021
select HAVE_GENERIC_HARDIRQS
2122
select GENERIC_IRQ_PROBE

arch/mips/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ config MIPS
1717
select HAVE_FUNCTION_GRAPH_TRACER
1818
select HAVE_KPROBES
1919
select HAVE_KRETPROBES
20+
select HAVE_DEBUG_KMEMLEAK
2021
select ARCH_BINFMT_ELF_RANDOMIZE_PIE
2122
select RTC_LIB if !MACH_LOONGSON
2223
select GENERIC_ATOMIC64 if !64BIT

arch/powerpc/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ config PPC
113113
select HAVE_DMA_API_DEBUG
114114
select USE_GENERIC_SMP_HELPERS if SMP
115115
select HAVE_OPROFILE
116+
select HAVE_DEBUG_KMEMLEAK
116117
select HAVE_SYSCALL_WRAPPERS if PPC64
117118
select GENERIC_ATOMIC64 if PPC32
118119
select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

arch/s390/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ config S390
8080
select HAVE_IRQ_WORK
8181
select HAVE_PERF_EVENTS
8282
select ARCH_HAVE_NMI_SAFE_CMPXCHG
83+
select HAVE_DEBUG_KMEMLEAK
8384
select HAVE_KERNEL_GZIP
8485
select HAVE_KERNEL_BZIP2
8586
select HAVE_KERNEL_LZMA

arch/sh/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ config SUPERH
1616
select ARCH_HAVE_CUSTOM_GPIO_H
1717
select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A)
1818
select PERF_USE_VMALLOC
19+
select HAVE_DEBUG_KMEMLEAK
1920
select HAVE_KERNEL_GZIP
2021
select HAVE_KERNEL_BZIP2
2122
select HAVE_KERNEL_LZMA

arch/sparc/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ config SPARC64
6060
select HAVE_DYNAMIC_FTRACE
6161
select HAVE_FTRACE_MCOUNT_RECORD
6262
select HAVE_SYSCALL_TRACEPOINTS
63+
select HAVE_DEBUG_KMEMLEAK
6364
select RTC_DRV_CMOS
6465
select RTC_DRV_BQ4802
6566
select RTC_DRV_SUN4V

arch/tile/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ config TILE
99
select GENERIC_FIND_FIRST_BIT
1010
select USE_GENERIC_SMP_HELPERS
1111
select CC_OPTIMIZE_FOR_SIZE
12+
select HAVE_DEBUG_KMEMLEAK
1213
select HAVE_GENERIC_HARDIRQS
1314
select GENERIC_IRQ_PROBE
1415
select GENERIC_PENDING_IRQ if SMP

arch/x86/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ config X86
6666
select HAVE_PERF_EVENTS_NMI
6767
select HAVE_PERF_REGS
6868
select HAVE_PERF_USER_STACK_DUMP
69+
select HAVE_DEBUG_KMEMLEAK
6970
select ANON_INODES
7071
select HAVE_ALIGNED_STRUCT_PAGE if SLUB && !M386
7172
select HAVE_CMPXCHG_LOCAL if !M386

lib/Kconfig.debug

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -450,12 +450,12 @@ config SLUB_STATS
450450
out which slabs are relevant to a particular load.
451451
Try running: slabinfo -DA
452452

453+
config HAVE_DEBUG_KMEMLEAK
454+
bool
455+
453456
config DEBUG_KMEMLEAK
454457
bool "Kernel memory leak detector"
455-
depends on DEBUG_KERNEL && EXPERIMENTAL && \
456-
(X86 || ARM || PPC || MIPS || S390 || SPARC64 || SUPERH || \
457-
MICROBLAZE || TILE || ARM64)
458-
458+
depends on DEBUG_KERNEL && EXPERIMENTAL && HAVE_DEBUG_KMEMLEAK
459459
select DEBUG_FS
460460
select STACKTRACE if STACKTRACE_SUPPORT
461461
select KALLSYMS

0 commit comments

Comments
 (0)