Skip to content

Commit 862161e

Browse files
committed
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
2 parents e5d523f + 43b5240 commit 862161e

1 file changed

Lines changed: 11 additions & 9 deletions

File tree

kernel/sysctl.c

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2094,6 +2094,17 @@ static struct ctl_table vm_table[] = {
20942094
.extra1 = SYSCTL_ZERO,
20952095
.extra2 = SYSCTL_TWO_HUNDRED,
20962096
},
2097+
#ifdef CONFIG_NUMA
2098+
{
2099+
.procname = "numa_stat",
2100+
.data = &sysctl_vm_numa_stat,
2101+
.maxlen = sizeof(int),
2102+
.mode = 0644,
2103+
.proc_handler = sysctl_vm_numa_stat_handler,
2104+
.extra1 = SYSCTL_ZERO,
2105+
.extra2 = SYSCTL_ONE,
2106+
},
2107+
#endif
20972108
#ifdef CONFIG_HUGETLB_PAGE
20982109
{
20992110
.procname = "nr_hugepages",
@@ -2110,15 +2121,6 @@ static struct ctl_table vm_table[] = {
21102121
.mode = 0644,
21112122
.proc_handler = &hugetlb_mempolicy_sysctl_handler,
21122123
},
2113-
{
2114-
.procname = "numa_stat",
2115-
.data = &sysctl_vm_numa_stat,
2116-
.maxlen = sizeof(int),
2117-
.mode = 0644,
2118-
.proc_handler = sysctl_vm_numa_stat_handler,
2119-
.extra1 = SYSCTL_ZERO,
2120-
.extra2 = SYSCTL_ONE,
2121-
},
21222124
#endif
21232125
{
21242126
.procname = "hugetlb_shm_group",

0 commit comments

Comments
 (0)