Merge b1_4_smallfix from b1_4 (20040805_0203)

- add /proc/sys/portals/routes for non-root route listing (3994)
- b_multi_interface landing

diff --git a/lnet/libcfs/proc.c b/lnet/libcfs/proc.c
index 5990ad8..aa9cfa8 100644 (file)
--- a/lnet/libcfs/proc.c
+++ b/lnet/libcfs/proc.c
@@ -80,8 +80,6 @@ static struct ctl_table portals_table[] = {
          sizeof(int), 0644, NULL, &proc_dointvec},
         {PSDEV_PRINTK, "printk", &portal_printk, sizeof(int), 0644, NULL,
          &proc_dointvec},
-        {PSDEV_CONSOLE, "console", &portal_cerror, sizeof(int), 0644, NULL,
-         &proc_dointvec},
         {PSDEV_DEBUG_PATH, "debug_path", debug_file_path,
          sizeof(debug_file_path), 0644, NULL, &proc_dostring, &sysctl_string},
         {PSDEV_PORTALS_UPCALL, "upcall", portals_upcall,

diff --git a/lustre/portals/libcfs/proc.c b/lustre/portals/libcfs/proc.c
index 5990ad8..aa9cfa8 100644 (file)
--- a/lustre/portals/libcfs/proc.c
+++ b/lustre/portals/libcfs/proc.c
@@ -80,8 +80,6 @@ static struct ctl_table portals_table[] = {
          sizeof(int), 0644, NULL, &proc_dointvec},
         {PSDEV_PRINTK, "printk", &portal_printk, sizeof(int), 0644, NULL,
          &proc_dointvec},
-        {PSDEV_CONSOLE, "console", &portal_cerror, sizeof(int), 0644, NULL,
-         &proc_dointvec},
         {PSDEV_DEBUG_PATH, "debug_path", debug_file_path,
          sizeof(debug_file_path), 0644, NULL, &proc_dostring, &sysctl_string},
         {PSDEV_PORTALS_UPCALL, "upcall", portals_upcall,