From owner-freebsd-bugs@FreeBSD.ORG  Sun Feb 15 04:20:04 2009
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DB2B21065670
	for <freebsd-bugs@hub.freebsd.org>;
	Sun, 15 Feb 2009 04:20:04 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id C821B8FC13
	for <freebsd-bugs@hub.freebsd.org>;
	Sun, 15 Feb 2009 04:20:04 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n1F4K4e0080798
	for <freebsd-bugs@freefall.freebsd.org>; Sun, 15 Feb 2009 04:20:04 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n1F4K4Yc080797;
	Sun, 15 Feb 2009 04:20:04 GMT (envelope-from gnats)
Date: Sun, 15 Feb 2009 04:20:04 GMT
Message-Id: <200902150420.n1F4K4Yc080797@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: Adam Hopstetter <ahopstetter@gmail.com>
Cc: 
Subject: Re: kern/131683: 2/14/2009 - CVSup'd to RELENG_7-stable - build
 kernel
 with libiconv fails with ../../../libkern/iconv.c: In function
 'iconv_mod_unload'
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Adam Hopstetter <ahopstetter@gmail.com>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Feb 2009 04:20:05 -0000

The following reply was made to PR kern/131683; it has been noted by GNATS.

From: Adam Hopstetter <ahopstetter@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/131683: 2/14/2009 - CVSup'd to RELENG_7-stable - build kernel
 with libiconv fails with ../../../libkern/iconv.c: In function 'iconv_mod_unload'
Date: Sat, 14 Feb 2009 22:43:32 -0500

 This is a multi-part message in MIME format.
 --------------030302040308030504080503
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Sorry ... previous patch posted causes break in buildworld. ... 
 apparrently pf/ftp-proxy.c declares "session" while sys/proc.h does as 
 well .... c++ namespaces anyone?
 
 Attached is the patch that allows for buildkernel and buildworld with 
 kernel libiconv...
 
 Sincerely,
 
 Adam Hopstetter
 
 
 
 
 --------------030302040308030504080503
 Content-Type: text/plain;
  name="new_patch.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="new_patch.txt"
 
 --- sys/sys/sx.h.orig	2009-02-14 15:49:28.000000000 -0500
 +++ sys/sys/sx.h	2009-02-14 21:38:04.000000000 -0500
 @@ -37,6 +37,7 @@
  #include <sys/lock_profile.h>
  
  #ifdef	_KERNEL
 +#include <sys/proc.h>
  #include <machine/atomic.h>
  #endif
  
 
 --------------030302040308030504080503--