Page reclaiming, control devices, cleanup.

Track allocated pages and add a proc handler to reclaim free pages and
add control device for allocating colored memory with mmap.

1 files changed, 18 insertions, 6 deletions

diff --git a/litmus/color_proc.c b/litmus/color_proc.c
index 31eec0d728a5..cac336ac1731 100644
--- a/litmus/color_proc.c
+++ b/litmus/color_proc.c
@@ -5,14 +5,23 @@
 #include <litmus/color.h>
 
 extern int color_sysctl_add_pages_data; /* litmus/color.c */
+extern int color_sysctl_reclaim_pages_data; /* litmus/color.c */
 
 static int zero = 0;
 static int one = 1;
 
-#define NR_PAGES_INDEX 1 /* location of nr_pages in the table below */
+#define NR_PAGES_INDEX 0 /* location of nr_pages in the table below */
 static struct ctl_table color_table[] =
 {
         {
+                /* you MUST update NR_PAGES_INDEX if you move this entry */
+                .procname       = "nr_pages",
+                .mode           = 0444,
+                .proc_handler   = color_nr_pages_handler,
+                .data           = NULL,         /* dynamically set later */
+                .maxlen         = 0,            /* also set later */
+        },
+        {
                 .procname       = "add_pages",
                 .data           = &color_sysctl_add_pages_data,
                 .maxlen         = sizeof(int),
@@ -22,11 +31,13 @@ static struct ctl_table color_table[] =
                 .extra2         = &one,
         },
         {
-                .procname       = "nr_pages",
-                .mode           = 0444,
-                .proc_handler   = color_nr_pages_handler,
-                .data           = NULL, /* dynamically later */
-                .maxlen         = 0,    /* also set later */
+                .procname       = "reclaim_pages",
+                .data           = &color_sysctl_reclaim_pages_data,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = color_reclaim_pages_handler,
+                .extra1         = &zero,
+                .extra2         = &one,
         },
         { }
 };
@@ -71,6 +82,7 @@ static struct ctl_table_header *litmus_sysctls;
 static int __init litmus_sysctl_init(void)
 {
         int ret = 0;
+        printk(KERN_INFO "Registering LITMUS^RT proc sysctl.\n");
         litmus_sysctls = register_sysctl_table(litmus_dir_table);
         if (!litmus_sysctls) {
                 printk(KERN_WARNING "Could not register LITMUS^RT sysctl.\n");