Like Lustre external infiniband stacks create a compatibility layer to handle various distributions and kernel versions. Due to this besides the linux kernel sk_sleep can also be defined by the external infiniband stack. We need to examine the infiniband stack's headers to see if sk_sleep is available there as well. Signed-off-by: James Simmons <jsimmons@xxxxxxxxxxxxx> Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6763 Reviewed-on: http://review.whamcloud.com/15386 Reviewed-by: Chris Horn <hornc@xxxxxxxx> Reviewed-by: Amir Shehata <amir.shehata@xxxxxxxxx> Reviewed-by: Oleg Drokin <oleg.drokin@xxxxxxxxx> --- .../staging/lustre/include/linux/lnet/lib-types.h | 1 - drivers/staging/lustre/lnet/lnet/acceptor.c | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/staging/lustre/include/linux/lnet/lib-types.h b/drivers/staging/lustre/include/linux/lnet/lib-types.h index dbfb069..695b5be 100644 --- a/drivers/staging/lustre/include/linux/lnet/lib-types.h +++ b/drivers/staging/lustre/include/linux/lnet/lib-types.h @@ -38,7 +38,6 @@ #include <linux/kthread.h> #include <linux/uio.h> #include <linux/types.h> -#include <net/sock.h> #include "types.h" diff --git a/drivers/staging/lustre/lnet/lnet/acceptor.c b/drivers/staging/lustre/lnet/lnet/acceptor.c index 61806ce..05eb5b2 100644 --- a/drivers/staging/lustre/lnet/lnet/acceptor.c +++ b/drivers/staging/lustre/lnet/lnet/acceptor.c @@ -36,6 +36,7 @@ #define DEBUG_SUBSYSTEM S_LNET #include <linux/completion.h> +#include <net/sock.h> #include "../../include/linux/lnet/lib-lnet.h" static int accept_port = 988; -- 1.7.1 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
