From owner-p4-projects@FreeBSD.ORG  Mon Apr 28 17:10:31 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7DC2E37B404; Mon, 28 Apr 2003 17:10:30 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 45AD337B401
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 17:10:30 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E341F43FAF
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 17:10:29 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3T0AT0U028067
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 17:10:29 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T0ATm4028061
	for perforce@freebsd.org; Mon, 28 Apr 2003 17:10:29 -0700 (PDT)
Date: Mon, 28 Apr 2003 17:10:29 -0700 (PDT)
Message-Id: <200304290010.h3T0ATm4028061@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 30014 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Apr 2003 00:10:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=30014

Change 30014 by peter@peter_daintree on 2003/04/28 17:10:07

	Skillfully avoid a panic when doing sysctl -a.  For reasons
	I do not yet understand, g_conftxt and friends all explode
	in strlen() via the sbuf_printf call paths.  I suspect a varargs
	bug in gcc.

Affected files ...

.. //depot/projects/hammer/sys/geom/geom_kern.c#10 edit

Differences ...

==== //depot/projects/hammer/sys/geom/geom_kern.c#10 (text+ko) ====

@@ -164,6 +164,7 @@
 		SHUTDOWN_PRI_FIRST);
 }
 
+#ifndef __amd64__	/* provokes compiler bug in geom_dump.c */
 static int
 sysctl_kern_geom_conftxt(SYSCTL_HANDLER_ARGS)
 {
@@ -205,9 +206,11 @@
 	sbuf_delete(sb);
 	return error;
 }
+#endif
 
 SYSCTL_NODE(_kern, OID_AUTO, geom, CTLFLAG_RW, 0, "GEOMetry management");
 
+#ifndef __amd64__	/* provokes compiler bug in geom_dump.c */
 SYSCTL_PROC(_kern_geom, OID_AUTO, confxml, CTLTYPE_STRING|CTLFLAG_RD,
 	0, 0, sysctl_kern_geom_confxml, "",
 	"Dump the GEOM config in XML");
@@ -219,6 +222,7 @@
 SYSCTL_PROC(_kern_geom, OID_AUTO, conftxt, CTLTYPE_STRING|CTLFLAG_RD,
 	0, 0, sysctl_kern_geom_conftxt, "",
 	"Dump the GEOM config in txt");
+#endif
 
 SYSCTL_INT(_kern_geom, OID_AUTO, debugflags, CTLFLAG_RW,
 	&g_debugflags, 0, "");