From owner-cvs-src@FreeBSD.ORG  Fri May 23 13:04:18 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C2CE8106564A;
	Fri, 23 May 2008 13:04:18 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from elvis.mu.org (elvis.mu.org [192.203.228.196])
	by mx1.freebsd.org (Postfix) with ESMTP id AA3048FC0A;
	Fri, 23 May 2008 13:04:18 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from zion.baldwin.cx (server.baldwin.cx [208.65.91.234])
	by elvis.mu.org (Postfix) with ESMTP id 79BD51A4D7C;
	Fri, 23 May 2008 06:04:18 -0700 (PDT)
From: John Baldwin <jhb@freebsd.org>
To: Sam Leffler <sam@freebsd.org>
Date: Fri, 23 May 2008 08:17:29 -0400
User-Agent: KMail/1.9.7
References: <200804292136.m3TLaHI5045311@repoman.freebsd.org>
	<d227e09e0805221350g444f23bapc51ecfd6d521fbfb@mail.gmail.com>
	<4835EB69.5030209@freebsd.org>
In-Reply-To: <4835EB69.5030209@freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200805230817.30326.jhb@freebsd.org>
Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org
Subject: Re: cvs commit: src/sys/amd64/conf NOTES src/sys/conf files
	src/sys/contrib/dev/iwn LICENSE iwlwifi-4965-4.44.17.fw.uu
	src/sys/dev/iwn if_iwn.c if_iwnreg.h if_iwnvar.h
	src/sys/i386/conf NOTES src/sys/modules Makefile
	src/sys/modules/iwn Makefile ...
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 May 2008 13:04:18 -0000

On Thursday 22 May 2008 05:53:45 pm Sam Leffler wrote:
> Pawel Worach wrote:
> > On Tue, Apr 29, 2008 at 11:36 PM, Sam Leffler <sam@freebsd.org> wrote:
> >> sam         2008-04-29 21:36:17 UTC
> >>
> >>  FreeBSD src repository
> >>
> >>
> >>
> >>
> >>  Added files:
> >>    sys/modules/iwn      Makefile
> >>
> >>
> >>
> >>  Log:
> >>  Intel 4965 wireless driver (derived from openbsd driver of the same
> >> name)
> >
> > If using the module on a kernel without WITNESS the module doesn't
> > run-time link with:
> > link_elf_obj: symbol _mtx_assert undefined
> >
> > Other than that, thanks a lot, the driver works fine!
> >
> > Fix?
> >
> > --- /sys/modules/iwn/Makefile   2008-04-29 23:36:17.000000000 +0200
> > +++ Makefile    2008-05-22 22:45:22.000000000 +0200
> > @@ -4,5 +4,5 @@
> >
> >  KMOD    = if_iwn
> >  SRCS    = if_iwn.c opt_bdg.h device_if.h bus_if.h pci_if.h
> > -CFLAGS += -g -DWITNESS -DINVARIANT_SUPPORT -DINVARIANTS
> > -I${.CURDIR}/../../ +CFLAGS += -g -I${.CURDIR}/../../
> >  .include <bsd.kmod.mk>
>
> Thanks, never noticed it was there.

Probably the whole CFLAGS line should be gone.  The include shouldn't be 
needed as the makefiles will find the kernel sources, and -g is better 
handled by doing 'make DEBUG_FLAGS=-g' as using DEBUG_FLAGS causes 
iwn.ko.symbols to be installed, etc.

-- 
John Baldwin