* Fixes needed to build for XT3/catamount

diff --git a/lnet/klnds/ptllnd/ptllnd.c b/lnet/klnds/ptllnd/ptllnd.c
index fe82a16..7aae6d6 100755 (executable)
--- a/lnet/klnds/ptllnd/ptllnd.c
+++ b/lnet/klnds/ptllnd/ptllnd.c
@@ -491,8 +491,9 @@ kptllnd_startup (lnet_ni_t *ni)
         kptllnd_data->kptl_rx_cache = cfs_mem_cache_create (
                 "ptllnd_rx",
                 sizeof(kptl_rx_t) + *kptllnd_tunables.kptl_max_msg_size,
-                0, /* offset */
-                0); /* flags */
+                0,    /* offset */
+                0,    /* flags */
+                NULL, NULL); /* ctor/dtor (not used) */
         if (kptllnd_data->kptl_rx_cache == NULL) {
                 CERROR("Can't create slab for RX descriptrs\n");
                 goto failed;

diff --git a/lnet/klnds/ptllnd/ptllnd_cb.c b/lnet/klnds/ptllnd/ptllnd_cb.c
index 1ba8940..fcef7b7 100644 (file)
--- a/lnet/klnds/ptllnd/ptllnd_cb.c
+++ b/lnet/klnds/ptllnd/ptllnd_cb.c
@@ -861,7 +861,7 @@ kptllnd_watchdog(void *arg)
 
                 set_current_state (TASK_INTERRUPTIBLE);
                 cfs_waitq_add(&kptllnd_data->kptl_sched_waitq, &waitlink);
-                cfs_waitq_timedwait(&waitlink,CFS_TASK_INTERRUPTIBLE,
+                cfs_waitq_timedwait(&waitlink,
                                     cfs_time_seconds(PTLLND_TIMEOUT_SEC));
                 set_current_state (TASK_RUNNING);
                 cfs_waitq_del (&kptllnd_data->kptl_sched_waitq, &waitlink);
@@ -940,7 +940,7 @@ kptllnd_scheduler(void *arg)
 
                 set_current_state (TASK_INTERRUPTIBLE);
                 cfs_waitq_add_exclusive(&kptllnd_data->kptl_sched_waitq, &waitlink);
-                cfs_waitq_timedwait(&waitlink, CFS_TASK_INTERRUPTIBLE,
+                cfs_waitq_timedwait(&waitlink,
                                     cfs_time_seconds(PTLLND_TIMEOUT_SEC));
                 set_current_state (TASK_RUNNING);
                 cfs_waitq_del (&kptllnd_data->kptl_sched_waitq, &waitlink);

diff --git a/lnet/ulnds/ptllnd/ptllnd.c b/lnet/ulnds/ptllnd/ptllnd.c
index 3e07242..44193e5 100644 (file)
--- a/lnet/ulnds/ptllnd/ptllnd.c
+++ b/lnet/ulnds/ptllnd/ptllnd.c
@@ -427,7 +427,6 @@ ptllnd_startup (lnet_ni_t *ni)
                 rc = -ENODEV;
                 goto failed2;
         }
-        CDEBUG(D_NET, "plni->plni_nih=%x\n",plni->plni_nih);
 
         rc = PtlEQAlloc(plni->plni_nih, plni->plni_eq_size,
                         PTL_EQ_HANDLER_NONE, &plni->plni_eqh);
@@ -436,7 +435,6 @@ ptllnd_startup (lnet_ni_t *ni)
                 rc = -ENODEV;
                 goto failed3;
         }
-        CDEBUG(D_NET, "plni->plni_eqh=%x\n",plni->plni_eqh);
 
         /*
          * Fetch the Portals NID