PERFORCE change 30014 for review

[Peter Wemm]

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

Change 30014 by peter at 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, "");