b: 1991

[fs/lustre-release.git] / lustre / obdclass / sysctl.c

diff --git a/lustre/obdclass/sysctl.c b/lustre/obdclass/sysctl.c
index d1388d6..610fbc7 100644 (file)
--- a/lustre/obdclass/sysctl.c
+++ b/lustre/obdclass/sysctl.c
@@ -26,7 +26,10 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/sysctl.h>
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 #include <linux/swapctl.h>
+#endif
 #include <linux/proc_fs.h>
 #include <linux/slab.h>
 #include <linux/stat.h>
@@ -72,11 +75,11 @@ static ctl_table obd_table[] = {
         {OBD_RESET, "reset", NULL, 0, 0644, NULL, &obd_sctl_reset},
         {OBD_TIMEOUT, "timeout", &obd_timeout, sizeof(int), 0644, NULL, &proc_dointvec},
         /* XXX need to lock so we avoid update races with the recovery upcall! */
-        {OBD_UPCALL, "recovery_upcall", obd_recovery_upcall, 128, 0644, NULL,
+        {OBD_UPCALL, "upcall", obd_lustre_upcall, 128, 0644, NULL,
          &proc_dostring, &sysctl_string },
         {OBD_SYNCFILTER, "filter_sync_on_commit", &obd_sync_filter, sizeof(int),
                 0644, NULL, &proc_dointvec},
-       { 0 }
+        { 0 }
 };
 
 static ctl_table parent_table[] = {