* [PATCH] mm,kmemleak-test.c: move kmemleak-test.c to samples dir
@ 2020-09-25 18:37 Hui Su
2020-10-05 8:56 ` Catalin Marinas
0 siblings, 1 reply; 2+ messages in thread
From: Hui Su @ 2020-09-25 18:37 UTC (permalink / raw)
To: catalin.marinas, corbet, akpm, mchehab+huawei, davem, robh,
yamada.masahiro, sam, jpoimboe, rostedt, miguel.ojeda.sandonis,
divya.indi, sh_def, tomas.winkler, dhowells, linux-doc,
linux-kernel, linux-mm
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 <sh_def@163.com>
---
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%)
diff --git a/Documentation/dev-tools/kmemleak.rst b/Documentation/dev-tools/kmemleak.rst
index a41a2d238af2..1c935f41cd3a 100644
--- a/Documentation/dev-tools/kmemleak.rst
+++ b/Documentation/dev-tools/kmemleak.rst
@@ -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
diff --git a/MAINTAINERS b/MAINTAINERS
index 190c7fa2ea01..8172787535fc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9712,8 +9712,8 @@ M: Catalin Marinas <catalin.marinas@arm.com>
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 <mcgrof@kernel.org>
diff --git a/mm/Makefile b/mm/Makefile
index d5649f1c12c0..d73aed0fc99c 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -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
diff --git a/samples/Makefile b/samples/Makefile
index 754553597581..c3392a595e4b 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -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/
diff --git a/samples/kmemleak/Makefile b/samples/kmemleak/Makefile
new file mode 100644
index 000000000000..16b6132c540c
--- /dev/null
+++ b/samples/kmemleak/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-$(CONFIG_DEBUG_KMEMLEAK_TEST) += kmemleak-test.o
diff --git a/mm/kmemleak-test.c b/samples/kmemleak/kmemleak-test.c
similarity index 98%
rename from mm/kmemleak-test.c
rename to samples/kmemleak/kmemleak-test.c
index e19279ff6aa3..7b476eb8285f 100644
--- a/mm/kmemleak-test.c
+++ b/samples/kmemleak/kmemleak-test.c
@@ -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 <catalin.marinas@arm.com>
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mm,kmemleak-test.c: move kmemleak-test.c to samples dir
2020-09-25 18:37 [PATCH] mm,kmemleak-test.c: move kmemleak-test.c to samples dir Hui Su
@ 2020-10-05 8:56 ` Catalin Marinas
0 siblings, 0 replies; 2+ messages in thread
From: Catalin Marinas @ 2020-10-05 8:56 UTC (permalink / raw)
To: Hui Su
Cc: corbet, akpm, mchehab+huawei, davem, robh, yamada.masahiro, sam,
jpoimboe, rostedt, miguel.ojeda.sandonis, divya.indi,
tomas.winkler, dhowells, linux-doc, linux-kernel, linux-mm
On Sat, Sep 26, 2020 at 02:37:29AM +0800, Hui Su wrote:
> 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 <sh_def@163.com>
Moving the test is fine by me.
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-05 8:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-25 18:37 [PATCH] mm,kmemleak-test.c: move kmemleak-test.c to samples dir Hui Su
2020-10-05 8:56 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).