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-2675 build: assume __linux__ and __KERNEL__
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
ptlrpc_module.c
diff --git
a/lustre/ptlrpc/ptlrpc_module.c
b/lustre/ptlrpc/ptlrpc_module.c
index
8a9250d
..
7931e5d
100644
(file)
--- a/
lustre/ptlrpc/ptlrpc_module.c
+++ b/
lustre/ptlrpc/ptlrpc_module.c
@@
-36,9
+36,6
@@
#define DEBUG_SUBSYSTEM S_RPC
#define DEBUG_SUBSYSTEM S_RPC
-#ifndef __KERNEL__
-# include <liblustre.h>
-#endif
#include <obd_support.h>
#include <obd_class.h>
#include <obd_support.h>
#include <obd_class.h>
@@
-134,7
+131,6
@@
err_layout:
return rc;
}
return rc;
}
-#ifdef __KERNEL__
static void __exit ptlrpc_exit(void)
{
ptlrpc_nrs_fini();
static void __exit ptlrpc_exit(void)
{
ptlrpc_nrs_fini();
@@
-154,4
+150,3
@@
MODULE_DESCRIPTION("Lustre Request Processor and Lock Management");
MODULE_LICENSE("GPL");
cfs_module(ptlrpc, "1.0.0", ptlrpc_init, ptlrpc_exit);
MODULE_LICENSE("GPL");
cfs_module(ptlrpc, "1.0.0", ptlrpc_init, ptlrpc_exit);
-#endif