[PATCH] mm,kmemleak-test: add the dependency on CONFIG_SAMPLES

[PATCH] mm,kmemleak-test: add the dependency on CONFIG_SAMPLES

[chenxiang]

From: Xiang Chen <chenxiang66@hisilicon.com>

As kmemleak-test.c is moved to samples dir, it is not compiled if just
setting CONFIG_DEBUG_KMEMLEAK_TEST as module and enabling
CONFIG_DEBUG_KMEMLEAK. Because it depends on CONFIG_SAMPLES after it is
moved to samples dir.
So the dependency on CONFIG_SAMPLES is added.

Fixes: 1abbef4f5172 ("mm,kmemleak-test.c: move kmemleak-test.c to samples dir")
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
---
 lib/Kconfig.debug | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 2779c29..9950542 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -716,7 +716,7 @@ config DEBUG_KMEMLEAK_MEM_POOL_SIZE
 
 config DEBUG_KMEMLEAK_TEST
 	tristate "Simple test for the kernel memory leak detector"
-	depends on DEBUG_KMEMLEAK && m
+	depends on DEBUG_KMEMLEAK && SAMPLES && m
 	help
 	  This option enables a module that explicitly leaks memory.
 
-- 
2.8.1

Re: [PATCH] mm,kmemleak-test: add the dependency on CONFIG_SAMPLES

[Catalin Marinas]

On Wed, May 26, 2021 at 10:10:08AM +0800, chenxiang wrote:
> From: Xiang Chen <chenxiang66@hisilicon.com>
> 
> As kmemleak-test.c is moved to samples dir, it is not compiled if just
> setting CONFIG_DEBUG_KMEMLEAK_TEST as module and enabling
> CONFIG_DEBUG_KMEMLEAK. Because it depends on CONFIG_SAMPLES after it is
> moved to samples dir.
> So the dependency on CONFIG_SAMPLES is added.
> 
> Fixes: 1abbef4f5172 ("mm,kmemleak-test.c: move kmemleak-test.c to samples dir")
> Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
> ---
>  lib/Kconfig.debug | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
> index 2779c29..9950542 100644
> --- a/lib/Kconfig.debug
> +++ b/lib/Kconfig.debug
> @@ -716,7 +716,7 @@ config DEBUG_KMEMLEAK_MEM_POOL_SIZE
>  
>  config DEBUG_KMEMLEAK_TEST
>  	tristate "Simple test for the kernel memory leak detector"
> -	depends on DEBUG_KMEMLEAK && m
> +	depends on DEBUG_KMEMLEAK && SAMPLES && m
>  	help
>  	  This option enables a module that explicitly leaks memory.

Would it make more sense to move the DEBUG_KMEMLEAK_TEST option to
samples as well and maybe rename it to SAMPLES_KMEMLEAK?

-- 
Catalin

Re: [PATCH] mm,kmemleak-test: add the dependency on CONFIG_SAMPLES

[chenxiang (M)]

Hi Catalin,


在 2021/5/26 17:30, Catalin Marinas 写道:
> On Wed, May 26, 2021 at 10:10:08AM +0800, chenxiang wrote:
>> From: Xiang Chen <chenxiang66@hisilicon.com>
>>
>> As kmemleak-test.c is moved to samples dir, it is not compiled if just
>> setting CONFIG_DEBUG_KMEMLEAK_TEST as module and enabling
>> CONFIG_DEBUG_KMEMLEAK. Because it depends on CONFIG_SAMPLES after it is
>> moved to samples dir.
>> So the dependency on CONFIG_SAMPLES is added.
>>
>> Fixes: 1abbef4f5172 ("mm,kmemleak-test.c: move kmemleak-test.c to samples dir")
>> Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
>> ---
>>   lib/Kconfig.debug | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
>> index 2779c29..9950542 100644
>> --- a/lib/Kconfig.debug
>> +++ b/lib/Kconfig.debug
>> @@ -716,7 +716,7 @@ config DEBUG_KMEMLEAK_MEM_POOL_SIZE
>>   
>>   config DEBUG_KMEMLEAK_TEST
>>   	tristate "Simple test for the kernel memory leak detector"
>> -	depends on DEBUG_KMEMLEAK && m
>> +	depends on DEBUG_KMEMLEAK && SAMPLES && m
>>   	help
>>   	  This option enables a module that explicitly leaks memory.
> Would it make more sense to move the DEBUG_KMEMLEAK_TEST option to
> samples as well and maybe rename it to SAMPLES_KMEMLEAK?

Right, it seems be better to move the option to samples dir and rename it.
I will change it in next verison.

>