head	1.5;
access;
symbols
	RELENG_9_1_0_RELEASE:1.1.2.1.4.2
	RELENG_9_1:1.1.2.1.0.4
	RELENG_9_1_BP:1.1.2.1
	RELENG_9_0_0_RELEASE:1.1.2.1.2.1
	RELENG_9_0:1.1.2.1.0.2
	RELENG_9_0_BP:1.1.2.1
	RELENG_9:1.1.0.2
	RELENG_9_BP:1.1;
locks; strict;
comment	@# @;


1.5
date	2012.11.17.03.31.11;	author svnexp;	state Exp;
branches;
next	1.4;

1.4
date	2012.11.17.01.52.57;	author svnexp;	state Exp;
branches;
next	1.3;

1.3
date	2012.11.10.00.32.47;	author delphij;	state Exp;
branches;
next	1.2;

1.2
date	2012.04.12.14.01.06;	author jhb;	state Exp;
branches;
next	1.1;

1.1
date	2011.03.21.09.58.24;	author jeff;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.1.2.1.2.1
	1.1.2.1.4.1;
next	1.1.2.2;

1.1.2.2
date	2012.08.27.19.37.02;	author jhb;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2012.11.17.11.37.18;	author svnexp;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2014.01.04.18.04.25;	author svnexp;	state Exp;
branches;
next	1.1.2.5;

1.1.2.5
date	2014.01.05.16.01.46;	author svnexp;	state Exp;
branches;
next	1.1.2.6;

1.1.2.6
date	2014.01.09.23.01.47;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.1.2.1.2.2;

1.1.2.1.2.2
date	2012.11.17.08.37.14;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.1.2.1.4.2;

1.1.2.1.4.2
date	2012.11.17.08.48.05;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.5
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/242933
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242933 | dim | 2012-11-12 22:01:29 +0000 (Mon, 12 Nov 2012) | 15 lines
## SVN ##
## SVN ## Redo r242842, now actually fixing the warnings, as follows:
## SVN ## - In sys/ofed/drivers/infiniband/core/cma.c, an enum struct member is
## SVN ##   interpreted as an int, so cast it to an int.
## SVN ## - In sys/ofed/drivers/infiniband/core/ud_header.c, initialize the
## SVN ##   packet_length variable in ib_ud_header_init(), to prevent undefined
## SVN ##   behaviour.
## SVN ## - In sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c, call rdma_notify()
## SVN ##   with the correct enum type and value.
## SVN ## - In sys/ofed/include/linux/pci.h, change the PCI_DEVICE and PCI_VDEVICE
## SVN ##   macros to use C99 struct initializers, so additional members can be
## SVN ##   overridden.
## SVN ##
## SVN ## Reviewed by:	delphij, Garrett Cooper <yanegomi@@gmail.com>
## SVN ## MFC after:	1 week
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@# $FreeBSD: head/sys/modules/mthca/Makefile 242933 2012-11-12 22:01:29Z dim $

.PATH:  ${.CURDIR}/../../ofed/drivers/infiniband/hw/mthca

.include <bsd.own.mk>

KMOD    = mthca
SRCS    = device_if.h bus_if.h pci_if.h vnode_if.h
SRCS+=	mthca_allocator.c mthca_av.c mthca_catas.c mthca_cmd.c mthca_cq.c
SRCS+=	mthca_eq.c mthca_mad.c mthca_main.c mthca_mcg.c mthca_memfree.c
SRCS+=	mthca_mr.c mthca_pd.c mthca_profile.c mthca_provider.c mthca_qp.c
SRCS+=	mthca_reset.c mthca_srq.c mthca_uar.c
SRCS+=	opt_inet.h opt_inet6.h

CFLAGS+= -I${.CURDIR}/../../ofed/include

.if !defined(KERNBUILDDIR)
.if ${MK_INET_SUPPORT} != "no"
opt_inet.h:
	@@echo "#define INET 1" > ${.TARGET}
.endif

.if ${MK_INET6_SUPPORT} != "no"
opt_inet6.h:
	@@echo "#define INET6 1" > ${.TARGET}
.endif
.endif

.include <bsd.kmod.mk>

CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions
@


1.4
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/sys/modules/mthca/Makefile 242842 2012-11-10 00:32:47Z delphij $
d31 1
a31 1
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions  -Wno-switch -Wno-sometimes-uninitialized -Wno-conversion -Wno-initializer-overrides
@


1.3
log
@SVN rev 242842 on 2012-11-10 00:32:47Z by delphij

Attempt toward a buildable universe by silenting a few warnings for OFED.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.2
log
@SVN rev 234183 on 2012-04-12 14:01:06Z by jhb

Add OFED and the associated options and drivers to x86 LINT builds:
- Mark 'sdp' as requiring 'inet'.
- Always include "opt_inet.h" and "opt_inet6.h" and modify the IB
  driver Makefiles to honor WITH/WITHOUT_INET/INET6/_SUPPORT options
  to determine what should be enabled during a module build.
- Fix the mlxen(4) driver and the core IB code to compile without
  if INET is disabled (including when both INET and INET6 are disabled).

Reviewed by:	bz
MFC after:	2 weeks
@
text
@d31 1
a31 1
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions
@


1.1
log
@SVN rev 219820 on 2011-03-21 09:58:24Z by jeff

 - Merge in OFED 1.5.3 from projects/ofed/head
@
text
@d4 3
d13 9
d23 5
a27 1
CFLAGS+= -I${.CURDIR}/../../ofed/include/ -DINET6
@


1.1.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/mthca/Makefile 219820 2011-03-21 09:58:24Z jeff $
@


1.1.2.2
log
@SVN rev 239748 on 2012-08-27 19:37:02Z by jhb

MFC 233040,233198,233870,234183:
Add OFED and the associated options and drivers to x86 LINT builds:
- Fix build with INET6 disabled.
- Fix build of OFED bits with debugging options enabled.
- Fix build on i386.
- Mark 'sdp' as requiring 'inet'.
- Always include "opt_inet.h" and "opt_inet6.h" and modify the IB
  driver Makefiles to honor WITH/WITHOUT_INET/INET6/_SUPPORT options
  to determine what should be enabled during a module build.
- Fix the mlxen(4) driver and the core IB code to compile without
  if INET is disabled (including when both INET and INET6 are disabled).
@
text
@a3 3

.include <bsd.own.mk>

a9 9
SRCS+=	opt_inet.h opt_inet6.h

CFLAGS+= -I${.CURDIR}/../../ofed/include

.if !defined(KERNBUILDDIR)
.if ${MK_INET_SUPPORT} != "no"
opt_inet.h:
	@@echo "#define INET 1" > ${.TARGET}
.endif
d11 1
a11 5
.if ${MK_INET6_SUPPORT} != "no"
opt_inet6.h:
	@@echo "#define INET6 1" > ${.TARGET}
.endif
.endif
@


1.1.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/mthca/Makefile 239748 2012-08-27 19:37:02Z jhb $
@


1.1.2.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/260269
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/mthca/Makefile 260269 2014-01-04 17:56:19Z dim $
d31 1
a31 1
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
@


1.1.2.5
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/260321
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/mthca/Makefile 260321 2014-01-05 15:39:37Z dim $
d31 1
a31 1
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions
@


1.1.2.6
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/260495
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/mthca/Makefile 260495 2014-01-09 22:40:51Z dim $
d31 1
a31 1
CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
@


1.1.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/mthca/Makefile 219820 2011-03-21 09:58:24Z jeff $
@


