Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70433d9e authored by Muchun Song's avatar Muchun Song Committed by Greg Kroah-Hartman
Browse files

mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE 



[ Upstream commit 43b5240ca6b33108998810593248186b1e3ae34a ]

"numa_stat" should not be included in the scope of CONFIG_HUGETLB_PAGE, if
CONFIG_HUGETLB_PAGE is not configured even if CONFIG_NUMA is configured,
"numa_stat" is missed form /proc. Move it out of CONFIG_HUGETLB_PAGE to
fix it.

Fixes: 4518085e ("mm, sysctl: make NUMA stats configurable")
Signed-off-by: default avatarMuchun Song <songmuchun@bytedance.com>
Cc: <stable@vger.kernel.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarMel Gorman <mgorman@techsingularity.net>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent da346adc

kernel/sysctl.c

+11 −9
Original line number Diff line number Diff line
@@ -1443,6 +1443,17 @@ static struct ctl_table vm_table[] = { 
		.extra1		= SYSCTL_ZERO,

		.extra2		= &one_hundred,

	},

#ifdef CONFIG_NUMA

	{

		.procname	= "numa_stat",

		.data		= &sysctl_vm_numa_stat,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= sysctl_vm_numa_stat_handler,

		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_ONE,

	},

#endif

#ifdef CONFIG_HUGETLB_PAGE

	{

		.procname	= "nr_hugepages",
@@ -1459,15 +1470,6 @@ static struct ctl_table vm_table[] = { 
		.mode           = 0644,

		.proc_handler   = &hugetlb_mempolicy_sysctl_handler,

	},

	{

		.procname		= "numa_stat",

		.data			= &sysctl_vm_numa_stat,

		.maxlen			= sizeof(int),

		.mode			= 0644,

		.proc_handler	= sysctl_vm_numa_stat_handler,

		.extra1			= SYSCTL_ZERO,

		.extra2			= SYSCTL_ONE,

	},

#endif

	 {

		.procname	= "hugetlb_shm_group",