瀏覽代碼

Fix missing numa_zonelist_order sysctl

Misplaced #endif is hiding the numa_zonelist_order sysctl when !SECURITY.

Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Lee Schermerhorn 17 年之前
父節點
當前提交
8daec965e7
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      kernel/sysctl.c

+ 1 - 1
kernel/sysctl.c

@@ -1023,6 +1023,7 @@ static ctl_table vm_table[] = {
 		.mode		= 0644,
 		.mode		= 0644,
 		.proc_handler	= &proc_doulongvec_minmax,
 		.proc_handler	= &proc_doulongvec_minmax,
 	},
 	},
+#endif
 #ifdef CONFIG_NUMA
 #ifdef CONFIG_NUMA
 	{
 	{
 		.ctl_name	= CTL_UNNUMBERED,
 		.ctl_name	= CTL_UNNUMBERED,
@@ -1034,7 +1035,6 @@ static ctl_table vm_table[] = {
 		.strategy	= &sysctl_string,
 		.strategy	= &sysctl_string,
 	},
 	},
 #endif
 #endif
-#endif
 #if defined(CONFIG_X86_32) || \
 #if defined(CONFIG_X86_32) || \
    (defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL))
    (defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL))
 	{
 	{