diff mbox series

[2/2] mm: memory-failure: move sysctl register in memory_failure_init()

Message ID 20230508114128.37081-2-wangkefeng.wang@huawei.com
State New
Headers
Series [1/2] mm: memory_failure: move memory_failure_attr_group under MEMORY_FAILURE |

Commit Message

Kefeng Wang May 8, 2023, 11:41 a.m. UTC 
  There is already a memory_failure_init(), don't add a new initcall,
move register_sysctl_init() into it to cleanup a bit.

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

Comments

HORIGUCHI NAOYA(堀口 直也) May 10, 2023, 3:06 a.m. UTC | #1 
On Mon, May 08, 2023 at 07:41:28PM +0800, Kefeng Wang wrote:
> There is already a memory_failure_init(), don't add a new initcall,
> move register_sysctl_init() into it to cleanup a bit.
> 
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>

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

Thank you.
diff mbox series

Patch

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 5b663eca1f29..004a02f44271 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -123,7 +123,6 @@  const struct attribute_group memory_failure_attr_group = {
 	.attrs = memory_failure_attr,
 };
 
-#ifdef CONFIG_SYSCTL
 static struct ctl_table memory_failure_table[] = {
 	{
 		.procname	= "memory_failure_early_kill",
@@ -146,14 +145,6 @@  static struct ctl_table memory_failure_table[] = {
 	{ }
 };
 
-static int __init memory_failure_sysctl_init(void)
-{
-	register_sysctl_init("vm", memory_failure_table);
-	return 0;
-}
-late_initcall(memory_failure_sysctl_init);
-#endif /* CONFIG_SYSCTL */
-
 /*
  * Return values:
  *   1:   the page is dissolved (if needed) and taken off from buddy,
@@ -2441,6 +2432,8 @@  static int __init memory_failure_init(void)
 		INIT_WORK(&mf_cpu->work, memory_failure_work_func);
 	}
 
+	register_sysctl_init("vm", memory_failure_table);
+
 	return 0;
 }
 core_initcall(memory_failure_init);