Use IS_ENABLED(CONFIG_HWPOISON_INJECT) to check whether or not to
enable HWPoison injector module.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 mm/memory-failure.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index fae9baf3be16..f761704d27d7 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -168,7 +168,7 @@ static bool page_handle_poison(struct page *page, bool hugepage_or_freepage, boo
 	return true;
 }
 
-#if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
+#if IS_ENABLED(CONFIG_HWPOISON_INJECT)
 
 u32 hwpoison_filter_enable = 0;
 u32 hwpoison_filter_dev_major = ~0U;
-- 
2.35.3

On Fri, Mar 10, 2023 at 09:38:43PM +0800, Kefeng Wang wrote:
> Use IS_ENABLED(CONFIG_HWPOISON_INJECT) to check whether or not to
> enable HWPoison injector module.
> 
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>

Hi, Kefeng,

Thanks for the patch, looks good to me, but as Andrew commented,
please add some info about the motivation in the commit log.

With the update,

Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>

On Fri, 10 Mar 2023 21:38:43 +0800 Kefeng Wang <wangkefeng.wang@huawei.com> wrote:

> Use IS_ENABLED(CONFIG_HWPOISON_INJECT) to check whether or not to
> enable HWPoison injector module.

This is quite clear from the patch itself.  What is unclear is "why". 
Does it fix a build error?  If so, please describe and add a Fixes: if
appropriate.  Is it just a cleanup?  etcetera.

Thanks.

> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -168,7 +168,7 @@ static bool page_handle_poison(struct page *page, bool hugepage_or_freepage, boo
>  	return true;
>  }
>  
> -#if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
> +#if IS_ENABLED(CONFIG_HWPOISON_INJECT)
>  
>  u32 hwpoison_filter_enable = 0;
>  u32 hwpoison_filter_dev_major = ~0U;
> -- 
> 2.35.3

On 2023/3/13 4:50, Andrew Morton wrote:
> On Fri, 10 Mar 2023 21:38:43 +0800 Kefeng Wang <wangkefeng.wang@huawei.com> wrote:
> 
>> Use IS_ENABLED(CONFIG_HWPOISON_INJECT) to check whether or not to
>> enable HWPoison injector module.
> 
> This is quite clear from the patch itself.  What is unclear is "why".
> Does it fix a build error?  If so, please describe and add a Fixes: if
> appropriate.  Is it just a cleanup?  etcetera.

oh, it's just a cleanup, I think it is no need to use the word 'correct',
will update the subject and change log.

On 10.03.23 14:38, Kefeng Wang wrote:
> Use IS_ENABLED(CONFIG_HWPOISON_INJECT) to check whether or not to
> enable HWPoison injector module.
> 
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
>   mm/memory-failure.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> index fae9baf3be16..f761704d27d7 100644
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -168,7 +168,7 @@ static bool page_handle_poison(struct page *page, bool hugepage_or_freepage, boo
>   	return true;
>   }
>   
> -#if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
> +#if IS_ENABLED(CONFIG_HWPOISON_INJECT)
>   
>   u32 hwpoison_filter_enable = 0;
>   u32 hwpoison_filter_dev_major = ~0U;

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 
Thanks,

David / dhildenb

It's more clear and simple to just use IS_ENABLED(CONFIG_HWPOISON_INJECT)
to check whether or not to enable HWPoison injector module instead of
CONFIG_HWPOISON_INJECT/CONFIG_HWPOISON_INJECT_MODULE.

Reviewed-by: David Hildenbrand <david@redhat.com> 
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
v2:
- add Ack/Rb, also update the suject/changelog suggested by Andrew
 mm/memory-failure.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index fae9baf3be16..f761704d27d7 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -168,7 +168,7 @@ static bool page_handle_poison(struct page *page, bool hugepage_or_freepage, boo
 	return true;
 }
 
-#if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
+#if IS_ENABLED(CONFIG_HWPOISON_INJECT)
 
 u32 hwpoison_filter_enable = 0;
 u32 hwpoison_filter_dev_major = ~0U;
-- 
2.35.3