Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
smash the HEAD with the contents of b_cmd. HEAD_PRE_CMD_SMASH and
[fs/lustre-release.git]
/
lustre
/
portals
/
knals
/
socknal
/
socknal.h
diff --git
a/lustre/portals/knals/socknal/socknal.h
b/lustre/portals/knals/socknal/socknal.h
index
2767c41
..
bd3c1fb
100644
(file)
--- a/
lustre/portals/knals/socknal/socknal.h
+++ b/
lustre/portals/knals/socknal/socknal.h
@@
-44,6
+44,7
@@
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/uaccess.h>
+#include <asm/irq.h>
#include <linux/init.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/fs.h>
@@
-59,6
+60,8
@@
#define DEBUG_SUBSYSTEM S_SOCKNAL
#include <linux/kp30.h>
#define DEBUG_SUBSYSTEM S_SOCKNAL
#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>
#include <portals/p30.h>
#include <portals/lib-p30.h>
#include <portals/socknal.h>
@@
-155,6
+158,7
@@
typedef struct {
nal_cb_t *ksnd_nal_cb;
spinlock_t ksnd_nal_cb_lock; /* lib cli/sti lock */
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 */
atomic_t ksnd_nthreads; /* # live threads */
int ksnd_shuttingdown; /* tell threads to exit */