Skip to contentSkip to conversation

mm: move the scan_unevictable_pages sysctl to the vm table

PATCH In review Peter Zijlstra 3 participants 3 messages Apr 9, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm: move the scan_unevictable_pages sysctl to the vm table

Subject: mm: move the scan_unevictable_pages sysctl to the vm table
From: Peter Zijlstra <[email protected]>
Date: Thu Apr 09 11:38:45 CEST 2009

vm knobs should go in the vm table. Probably too late for randomize_va_space though.

---
 kernel/sysctl.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
kernel/sysctl.c +10 -10
Index: linux-2.6/kernel/sysctl.c
===================================================================
@@ -914,16 +914,6 @@ static struct ctl_table kern_table[] = {
 		.proc_handler	= &proc_dointvec,
 	},
 #endif
-#ifdef CONFIG_UNEVICTABLE_LRU
-	{
-		.ctl_name	= CTL_UNNUMBERED,
-		.procname	= "scan_unevictable_pages",
-		.data		= &scan_unevictable_pages,
-		.maxlen		= sizeof(scan_unevictable_pages),
-		.mode		= 0644,
-		.proc_handler	= &scan_unevictable_handler,
-	},
-#endif
 #ifdef CONFIG_SLOW_WORK
 	{
 		.ctl_name	= CTL_UNNUMBERED,
@@ -1324,6 +1314,16 @@ static struct ctl_table vm_table[] = {
 		.extra2		= &one,
 	},
 #endif
+#ifdef CONFIG_UNEVICTABLE_LRU
+	{
+		.ctl_name	= CTL_UNNUMBERED,
+		.procname	= "scan_unevictable_pages",
+		.data		= &scan_unevictable_pages,
+		.maxlen		= sizeof(scan_unevictable_pages),
+		.mode		= 0644,
+		.proc_handler	= &scan_unevictable_handler,
+	},
+#endif
 /*
  * NOTE: do not add new entries to this table unless you have read
  * Documentation/sysctl/ctl_unnumbered.txt

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Peter Zijlstra

Subject: mm: move the scan_unevictable_pages sysctl to the vm table
From: Peter Zijlstra <[email protected]>
Date: Thu Apr 09 11:38:45 CEST 2009

vm knobs should go in the vm table. Probably too late for randomize_va_space though.

I was surprised to see "scan_unevictable_pages" in the kernel table. This must be the result of a merge glitch. I originally put this at the end of the vm table. Just went back and looked at some older patches to be sure. E.g.,

	http://marc.info/?l=linux-mm&m=121321022603288&w=4

It had been moved to the kernel table by the time the unevictable lru was merged upstream:

	http://marc.info/?l=linux-mm-commits&m=122453486931267&w=4

Anyway...

Quoted 2 lines
Quoted 33 lines
---
 kernel/sysctl.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Index: linux-2.6/kernel/sysctl.c
===================================================================

kernel/sysctl.c +3 -10
@@ -914,16 +914,6 @@ static struct ctl_table kern_table[] = {
 		.proc_handler	= &proc_dointvec,
 	},
 #endif
-#ifdef CONFIG_UNEVICTABLE_LRU
-	{
-		.ctl_name	= CTL_UNNUMBERED,
-		.procname	= "scan_unevictable_pages",
-		.data		= &scan_unevictable_pages,
-		.maxlen		= sizeof(scan_unevictable_pages),
-		.mode		= 0644,
-		.proc_handler	= &scan_unevictable_handler,
-	},
-#endif
 #ifdef CONFIG_SLOW_WORK
 	{
 		.ctl_name	= CTL_UNNUMBERED,
@@ -1324,6 +1314,16 @@ static struct ctl_table vm_table[] = {
 		.extra2		= &one,
 	},
 #endif
+#ifdef CONFIG_UNEVICTABLE_LRU
+	{
+		.ctl_name	= CTL_UNNUMBERED,

kernel/sysctl.c static struct ctl_table vm_table[] = { · line 1329

Quoted 10 lines
kernel/sysctl.c +7 -0
+		.procname	= "scan_unevictable_pages",
+		.data		= &scan_unevictable_pages,
+		.maxlen		= sizeof(scan_unevictable_pages),
+		.mode		= 0644,
+		.proc_handler	= &scan_unevictable_handler,
+	},
+#endif
 /*
  * NOTE: do not add new entries to this table unless you have read
  * Documentation/sysctl/ctl_unnumbered.txt

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

Acked-by on v1 1/1
#2 lore raw
In reply to Peter Zijlstra
Quoted 9 lines · Peter Zijlstra

Subject: mm: move the scan_unevictable_pages sysctl to the vm table
From: Peter Zijlstra <[email protected]>
Date: Thu Apr 09 11:38:45 CEST 2009

vm knobs should go in the vm table. Probably too late for randomize_va_space though.

Dunno if the merge error is mine or someone else's or if we should all blame patch, but ...

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>