From: shaocheng <shaocheng>
Date: Fri, 19 Mar 2004 12:24:48 +0000 (+0000)
Subject: Update from HEAD
X-Git-Tag: v1_7_0_51~2^124~8
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=36f242a1221dc720b0d73c28d5492c548b9f58d6;p=fs%2Flustre-release.git

Update from HEAD
---

diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h
index 17a7e49..bd3c1fb 100644
--- a/lnet/klnds/socklnd/socklnd.h
+++ b/lnet/klnds/socklnd/socklnd.h
@@ -61,6 +61,7 @@
 
 #include <linux/kp30.h>
 #include <linux/portals_compat25.h>
+#include <linux/kpr.h>
 #include <portals/p30.h>
 #include <portals/lib-p30.h>
 #include <portals/socknal.h>
@@ -157,6 +158,7 @@ typedef struct {
 
         nal_cb_t         *ksnd_nal_cb;
         spinlock_t        ksnd_nal_cb_lock;     /* lib cli/sti lock */
+        wait_queue_head_t ksnd_yield_waitq;     /* where yield waits */
 
         atomic_t          ksnd_nthreads;        /* # live threads */
         int               ksnd_shuttingdown;    /* tell threads to exit */
diff --git a/lustre/portals/knals/socknal/socknal.h b/lustre/portals/knals/socknal/socknal.h
index 17a7e49..bd3c1fb 100644
--- a/lustre/portals/knals/socknal/socknal.h
+++ b/lustre/portals/knals/socknal/socknal.h
@@ -61,6 +61,7 @@
 
 #include <linux/kp30.h>
 #include <linux/portals_compat25.h>
+#include <linux/kpr.h>
 #include <portals/p30.h>
 #include <portals/lib-p30.h>
 #include <portals/socknal.h>
@@ -157,6 +158,7 @@ typedef struct {
 
         nal_cb_t         *ksnd_nal_cb;
         spinlock_t        ksnd_nal_cb_lock;     /* lib cli/sti lock */
+        wait_queue_head_t ksnd_yield_waitq;     /* where yield waits */
 
         atomic_t          ksnd_nthreads;        /* # live threads */
         int               ksnd_shuttingdown;    /* tell threads to exit */