Commit 862161e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sysctl-fixes-5.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux 

Pyll sysctl fix from Luis Chamberlain:
 "Only one fix for sysctl"

* tag 'sysctl-fixes-5.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux:
  mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE
parents e5d523f1 43b5240c

kernel/sysctl.c

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

		.extra2		= SYSCTL_TWO_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",
@@ -2110,15 +2121,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",