Skip to contentSkip to conversation

mm,kmemleak-test.c: move kmemleak-test.c to samples dir

PATCH Applied Hui Su 2 participants 2 messages Sep 25, 2020 – Oct 5, 2020

Subsystems (4)
Memory management Documentation Documentation process Kmemleak
lore
Share & tools
lore

Hui Su

author
#0 lore raw

PATCH 1/1 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]>
---
 Documentation/dev-tools/kmemleak.rst     | 2 +-
 MAINTAINERS                              | 2 +-
 mm/Makefile                              | 1 -
 samples/Makefile                         | 1 +
 samples/kmemleak/Makefile                | 3 +++
 {mm => samples/kmemleak}/kmemleak-test.c | 2 +-
 6 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 samples/kmemleak/Makefile
 rename {mm => samples/kmemleak}/kmemleak-test.c (98%)
Documentation/dev-tools/kmemleak.rst +1 -1
index a41a2d238af2..1c935f41cd3a 100644
@@ -229,7 +229,7 @@ Testing with kmemleak-test
 
 To check if you have all set up to use kmemleak, you can use the kmemleak-test
 module, a module that deliberately leaks memory. Set CONFIG_DEBUG_KMEMLEAK_TEST
-as module (it can't be used as bult-in) and boot the kernel with kmemleak
+as module (it can't be used as built-in) and boot the kernel with kmemleak
 enabled. Load the module and perform a scan with::
 
         # modprobe kmemleak-test
MAINTAINERS +1 -1
index 190c7fa2ea01..8172787535fc 100644
@@ -9712,8 +9712,8 @@ M:	Catalin Marinas <[email protected]>
 S:	Maintained
 F:	Documentation/dev-tools/kmemleak.rst
 F:	include/linux/kmemleak.h
-F:	mm/kmemleak-test.c
 F:	mm/kmemleak.c
+F:	samples/kmemleak/kmemleak-test.c
 
 KMOD KERNEL MODULE LOADER - USERMODE HELPER
 M:	Luis Chamberlain <[email protected]>
mm/Makefile +0 -1
index d5649f1c12c0..d73aed0fc99c 100644
@@ -94,7 +94,6 @@ obj-$(CONFIG_GUP_BENCHMARK) += gup_benchmark.o
 obj-$(CONFIG_MEMORY_FAILURE) += memory-failure.o
 obj-$(CONFIG_HWPOISON_INJECT) += hwpoison-inject.o
 obj-$(CONFIG_DEBUG_KMEMLEAK) += kmemleak.o
-obj-$(CONFIG_DEBUG_KMEMLEAK_TEST) += kmemleak-test.o
 obj-$(CONFIG_DEBUG_RODATA_TEST) += rodata_test.o
 obj-$(CONFIG_DEBUG_VM_PGTABLE) += debug_vm_pgtable.o
 obj-$(CONFIG_PAGE_OWNER) += page_owner.o
samples/Makefile +1 -0
index 754553597581..c3392a595e4b 100644
@@ -28,3 +28,4 @@ subdir-$(CONFIG_SAMPLE_VFS)		+= vfs
 obj-$(CONFIG_SAMPLE_INTEL_MEI)		+= mei/
 subdir-$(CONFIG_SAMPLE_WATCHDOG)	+= watchdog
 subdir-$(CONFIG_SAMPLE_WATCH_QUEUE)	+= watch_queue
+obj-$(CONFIG_DEBUG_KMEMLEAK_TEST)	+= kmemleak/
samples/kmemleak/Makefile new file +3 -0
new file mode 100644
index 000000000000..16b6132c540c
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-$(CONFIG_DEBUG_KMEMLEAK_TEST) += kmemleak-test.o
samples/kmemleak/kmemleak-test.c renamed from mm/kmemleak-test.c +1 -1
similarity index 98%
rename from mm/kmemleak-test.c
rename to samples/kmemleak/kmemleak-test.c
index e19279ff6aa3..7b476eb8285f 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * mm/kmemleak-test.c
+ * samples/kmemleak/kmemleak-test.c
  *
  * Copyright (C) 2008 ARM Limited
  * Written by Catalin Marinas <[email protected]>
Signature · 1 line
2.25.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Hui Su

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]>

Moving the test is fine by me.

Acked-by Catalin Marinas <[email protected]>