From owner-svn-src-projects@freebsd.org  Sat Sep 16 16:17:09 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D566BE1F88A
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sat, 16 Sep 2017 16:17:09 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B1D7E7F06E;
 Sat, 16 Sep 2017 16:17:09 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8GGH82s042936;
 Sat, 16 Sep 2017 16:17:08 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8GGH8kQ042934;
 Sat, 16 Sep 2017 16:17:08 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201709161617.v8GGH8kQ042934@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Sat, 16 Sep 2017 16:17:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r323644 - projects/bsd_rdma_4_9/sys/conf
X-SVN-Group: projects
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: projects/bsd_rdma_4_9/sys/conf
X-SVN-Commit-Revision: 323644
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Sep 2017 16:17:09 -0000

Author: hselasky
Date: Sat Sep 16 16:17:08 2017
New Revision: 323644
URL: https://svnweb.freebsd.org/changeset/base/323644

Log:
  Fix in-kernel build of ibcore module.
  
  Requested by:	Sobczak, Bartosz <bartosz.sobczak@intel.com>
  Sponsored by:	Mellanox Technologies

Modified:
  projects/bsd_rdma_4_9/sys/conf/files
  projects/bsd_rdma_4_9/sys/conf/kern.pre.mk

Modified: projects/bsd_rdma_4_9/sys/conf/files
==============================================================================
--- projects/bsd_rdma_4_9/sys/conf/files	Sat Sep 16 16:16:00 2017	(r323643)
+++ projects/bsd_rdma_4_9/sys/conf/files	Sat Sep 16 16:17:08 2017	(r323644)
@@ -4402,58 +4402,62 @@ compat/linuxkpi/common/src/linux_work.c		optional comp
 	compile-with "${LINUXKPI_C}"
 
 # OpenFabrics Enterprise Distribution (Infiniband)
-ofed/drivers/infiniband/core/addr.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/agent.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/cache.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-# XXX Mad.c must be ordered before cm.c for sysinit sets to occur in
-# the correct order.
-ofed/drivers/infiniband/core/mad.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/cm.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/ -Wno-unused-function"
-ofed/drivers/infiniband/core/cma.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/device.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/fmr_pool.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/iwcm.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/mad_rmpp.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/multicast.c	optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/packer.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/peer_mem.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/sa_query.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/smi.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/sysfs.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/ucm.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/ucma.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/ud_header.c	optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/umem.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/user_mad.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/uverbs_cmd.c	optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/uverbs_main.c	optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/uverbs_marshall.c	optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
-ofed/drivers/infiniband/core/verbs.c		optional ofed		\
-	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/"
+ofed/drivers/infiniband/core/ib_addr.c			optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_agent.c			optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_cache.c			optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_cm.c			optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_cma.c			optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_cq.c			optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_device.c		optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_fmr_pool.c		optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_iwcm.c			optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_iwpm_msg.c		optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_iwpm_util.c		optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_mad.c			optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_mad_rmpp.c		optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_multicast.c		optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_packer.c		optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c		optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_sa_query.c		optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_smi.c			optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_sysfs.c			optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_ucm.c			optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_ucma.c			optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_ud_header.c		optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_umem.c			optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_user_mad.c		optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_uverbs_cmd.c		optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_uverbs_main.c		optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_uverbs_marshall.c	optional ofed	\
+	compile-with "${OFED_C}"
+ofed/drivers/infiniband/core/ib_verbs.c			optional ofed	\
+	compile-with "${OFED_C}"
 
 ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c	optional ipoib		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"

Modified: projects/bsd_rdma_4_9/sys/conf/kern.pre.mk
==============================================================================
--- projects/bsd_rdma_4_9/sys/conf/kern.pre.mk	Sat Sep 16 16:16:00 2017	(r323643)
+++ projects/bsd_rdma_4_9/sys/conf/kern.pre.mk	Sat Sep 16 16:17:08 2017	(r323644)
@@ -177,9 +177,10 @@ LINUXKPI_C=		${NORMAL_C} ${LINUXKPI_INCLUDES}
 
 # Infiniband C flags.  Correct include paths and omit errors that linux
 # does not honor.
-OFEDINCLUDES=	-I$S/ofed/include ${LINUXKPI_INCLUDES}
+OFEDINCLUDES=	-I$S/ofed/include -I$S/ofed/include/uapi ${LINUXKPI_INCLUDES}
 OFEDNOERR=	-Wno-cast-qual -Wno-pointer-arith
-OFEDCFLAGS=	${CFLAGS:N-I*} ${OFEDINCLUDES} ${CFLAGS:M-I*} ${OFEDNOERR}
+OFEDCFLAGS=	${CFLAGS:N-I*} -DCONFIG_INFINIBAND_USER_MEM \
+		${OFEDINCLUDES} ${CFLAGS:M-I*} ${OFEDNOERR}
 OFED_C_NOIMP=	${CC} -c -o ${.TARGET} ${OFEDCFLAGS} ${WERROR} ${PROF}
 OFED_C=		${OFED_C_NOIMP} ${.IMPSRC}