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
LU-3637 lnet: build Lustre with Intel OFED for Xeon Phi
[fs/lustre-release.git]
/
lnet
/
klnds
/
o2iblnd
/
o2iblnd.h
diff --git
a/lnet/klnds/o2iblnd/o2iblnd.h
b/lnet/klnds/o2iblnd/o2iblnd.h
index
87c7cc0
..
77eac81
100644
(file)
--- a/
lnet/klnds/o2iblnd/o2iblnd.h
+++ b/
lnet/klnds/o2iblnd/o2iblnd.h
@@
-27,7
+27,7
@@
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 201
2
, Intel Corporation.
+ * Copyright (c) 2011, 201
3
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-38,6
+38,7
@@
* Author: Eric Barton <eric@bartonsoftware.com>
*/
* Author: Eric Barton <eric@bartonsoftware.com>
*/
+#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/mm.h>
@@
-58,6
+59,9
@@
#include <linux/kmod.h>
#include <linux/sysctl.h>
#include <linux/pci.h>
#include <linux/kmod.h>
#include <linux/sysctl.h>
#include <linux/pci.h>
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32)
+#include <linux/pci-dma.h>
+#endif
#include <net/sock.h>
#include <linux/in.h>
#include <net/sock.h>
#include <linux/in.h>
@@
-1067,7
+1071,7
@@
void kiblnd_tunables_fini(void);
int kiblnd_connd (void *arg);
int kiblnd_scheduler(void *arg);
int kiblnd_connd (void *arg);
int kiblnd_scheduler(void *arg);
-int kiblnd_thread_start
(int (*fn)(void *arg), void *arg
);
+int kiblnd_thread_start
(int (*fn)(void *arg), void *arg, char *name
);
int kiblnd_failover_thread (void *arg);
int kiblnd_alloc_pages(kib_pages_t **pp, int cpt, int npages);
int kiblnd_failover_thread (void *arg);
int kiblnd_alloc_pages(kib_pages_t **pp, int cpt, int npages);