Skip to content

Commit 1abbef4

Browse files
liulangrenaaatorvalds
authored andcommitted
mm,kmemleak-test.c: move kmemleak-test.c to samples dir
kmemleak-test.c is just a kmemleak test module, which also can not be used as a built-in kernel module. Thus, i think it may should not be in mm dir, and move the kmemleak-test.c to samples/kmemleak/kmemleak-test.c. Fix the spelling of built-in by the way. Signed-off-by: Hui Su <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: Jonathan Corbet <[email protected]> Cc: Mauro Carvalho Chehab <[email protected]> Cc: David S. Miller <[email protected]> Cc: Rob Herring <[email protected]> Cc: Masahiro Yamada <[email protected]> Cc: Sam Ravnborg <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Steven Rostedt (VMware) <[email protected]> Cc: Miguel Ojeda <[email protected]> Cc: Divya Indi <[email protected]> Cc: Tomas Winkler <[email protected]> Cc: David Howells <[email protected]> Link: https://lkml.kernel.org/r/20200925183729.GA172837@rlk Signed-off-by: Linus Torvalds <[email protected]>
1 parent c4b2896 commit 1abbef4

File tree

6 files changed

+7
-4
lines changed

6 files changed

+7
-4
lines changed

Documentation/dev-tools/kmemleak.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ Testing with kmemleak-test
229229

230230
To check if you have all set up to use kmemleak, you can use the kmemleak-test
231231
module, a module that deliberately leaks memory. Set CONFIG_DEBUG_KMEMLEAK_TEST
232-
as module (it can't be used as bult-in) and boot the kernel with kmemleak
232+
as module (it can't be used as built-in) and boot the kernel with kmemleak
233233
enabled. Load the module and perform a scan with::
234234

235235
# modprobe kmemleak-test

MAINTAINERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -9727,8 +9727,8 @@ M: Catalin Marinas <[email protected]>
97279727
S: Maintained
97289728
F: Documentation/dev-tools/kmemleak.rst
97299729
F: include/linux/kmemleak.h
9730-
F: mm/kmemleak-test.c
97319730
F: mm/kmemleak.c
9731+
F: samples/kmemleak/kmemleak-test.c
97329732

97339733
KMOD KERNEL MODULE LOADER - USERMODE HELPER
97349734
M: Luis Chamberlain <[email protected]>

mm/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ obj-$(CONFIG_GUP_BENCHMARK) += gup_benchmark.o
9494
obj-$(CONFIG_MEMORY_FAILURE) += memory-failure.o
9595
obj-$(CONFIG_HWPOISON_INJECT) += hwpoison-inject.o
9696
obj-$(CONFIG_DEBUG_KMEMLEAK) += kmemleak.o
97-
obj-$(CONFIG_DEBUG_KMEMLEAK_TEST) += kmemleak-test.o
9897
obj-$(CONFIG_DEBUG_RODATA_TEST) += rodata_test.o
9998
obj-$(CONFIG_DEBUG_VM_PGTABLE) += debug_vm_pgtable.o
10099
obj-$(CONFIG_PAGE_OWNER) += page_owner.o

samples/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ subdir-$(CONFIG_SAMPLE_VFS) += vfs
2828
obj-$(CONFIG_SAMPLE_INTEL_MEI) += mei/
2929
subdir-$(CONFIG_SAMPLE_WATCHDOG) += watchdog
3030
subdir-$(CONFIG_SAMPLE_WATCH_QUEUE) += watch_queue
31+
obj-$(CONFIG_DEBUG_KMEMLEAK_TEST) += kmemleak/

samples/kmemleak/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
3+
obj-$(CONFIG_DEBUG_KMEMLEAK_TEST) += kmemleak-test.o

mm/kmemleak-test.c samples/kmemleak/kmemleak-test.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-only
22
/*
3-
* mm/kmemleak-test.c
3+
* samples/kmemleak/kmemleak-test.c
44
*
55
* Copyright (C) 2008 ARM Limited
66
* Written by Catalin Marinas <[email protected]>

0 commit comments

Comments
 (0)