PERFORCE change 138866 for review
John Birrell
jb at FreeBSD.org
Fri Mar 28 15:59:16 PDT 2008
http://perforce.freebsd.org/chv.cgi?CH=138866
Change 138866 by jb at jb_freebsd1 on 2008/03/28 22:59:04
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#14 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#62 integrate
.. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#29 integrate
.. //depot/projects/dtrace/ports/UPDATING#61 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/alloca.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/fcntl.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/fsshare.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/stdio.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/stdlib.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/strings.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/unistd.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/deviceid.c#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/fsshare.c#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/mnttab.c#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/zmount.c#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/zone.c#2 integrate
.. //depot/projects/dtrace/src/etc/network.subr#12 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ppp#10 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/mincore.2#5 integrate
.. //depot/projects/dtrace/src/share/man/man4/ubsa.4#6 integrate
.. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#26 integrate
.. //depot/projects/dtrace/src/share/man/man9/Makefile#29 integrate
.. //depot/projects/dtrace/src/share/man/man9/lock.9#13 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#37 integrate
.. //depot/projects/dtrace/src/sys/boot/forth/loader.conf#13 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/machine/endian.h#3 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cred.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cyclic.h#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/debug.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/dirent.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/elf.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kobj.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kstat.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/lock.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mman.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mnttab.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/modctl.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mount.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mutex.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/param.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/pcpu.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/random.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/rwlock.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sdt.h#3 branch
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/stat.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/string.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/systm.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/time.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/uio.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/varargs.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/zone.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#44 integrate
.. //depot/projects/dtrace/src/sys/conf/files#80 integrate
.. //depot/projects/dtrace/src/sys/conf/options#45 integrate
.. //depot/projects/dtrace/src/sys/dev/aac/aac.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ubsa.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#28 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_subr.c#8 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_pc98.c#1 branch
.. //depot/projects/dtrace/src/sys/i386/i386/busdma_machdep.c#10 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#32 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#24 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#35 integrate
.. //depot/projects/dtrace/src/sys/modules/cyclic/Makefile#11 edit
.. //depot/projects/dtrace/src/sys/modules/geom/geom_part/Makefile#3 integrate
.. //depot/projects/dtrace/src/sys/modules/geom/geom_part/geom_part_pc98/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/opensolaris/Makefile#3 edit
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_clnt.c#2 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_impl.c#3 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_server.c#2 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_svc.c#2 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_xdr.c#2 integrate
.. //depot/projects/dtrace/src/sys/nlm/sm_inter_xdr.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/auth_unix.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/authunix_prot.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/clnt_dg.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/clnt_rc.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/clnt_vc.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/inet_ntop.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/inet_pton.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/rpc_generic.c#3 integrate
.. //depot/projects/dtrace/src/sys/rpc/rpcb_clnt.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc_auth_unix.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc_dg.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc_generic.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc_vc.c#2 integrate
.. //depot/projects/dtrace/src/sys/sys/aac_ioctl.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/buf.h#14 integrate
.. //depot/projects/dtrace/src/sys/sys/lockmgr.h#18 integrate
.. //depot/projects/dtrace/src/sys/sys/mman.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#46 integrate
.. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#17 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#14 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.102 2007/11/28 21:26:59 remko Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.103 2008/03/28 06:03:53 murray Exp $
-->
<chapter id="network-servers">
@@ -4054,18 +4054,101 @@
</sect3>
<sect3>
- <title>Dynamic Websites with Perl & PHP</title>
- <para>In the past few years, more businesses have turned to the
+ <title>Language Bindings</title>
+
+ <para>There are Apache modules for most major scripting
+ languages. These modules typically make it possible to
+ write <application>Apache</application> modules entirely in
+ a scripting language. They are also often used as a
+ persistent interpreter embedded into the server that avoids
+ the overhead of starting an external interpreter and the
+ startup-time penalty for dynamic websites, as described in
+ the next section.</para>
+ </sect3>
+ </sect2>
+
+ <sect2>
+ <title>Dynamic Websites</title>
+
+ <indexterm><primary>web servers</primary>
+ <secondary>dynamic</secondary></indexterm>
+
+ <para>In the last decade, more businesses have turned to the
Internet in order to enhance their revenue and increase
exposure. This has also increased the need for interactive
- web content. While some companies, such as µsoft;, have
- introduced solutions into their proprietary products, the
- open source community answered the call. Two options for
- dynamic web content include
- <application>mod_perl</application> &
+ web content. While some companies, such as µsoft;,
+ have introduced solutions into their proprietary products,
+ the open source community answered the call. Modern options
+ for dynamic web content include Django, Ruby on Rails,
+ <application>mod_perl</application>, and
<application>mod_php</application>.</para>
- <sect4>
+ <sect3>
+ <title>Django</title>
+
+ <indexterm><primary>Python</primary></indexterm>
+ <indexterm><primary>Django</primary></indexterm>
+
+ <para>Django is a BSD licensed framework designed to allow
+ developers to write high performance, elegant web
+ applications quickly. It provides an object-relational
+ mapper so that data types are developed as Python objects,
+ and a rich dynamic database-access API is provided for those
+ objects without the developer ever having to write SQL. It
+ also provides an extensible template system so that the
+ logic of the application is separated from the HTML
+ presentation.</para>
+
+ <para>Django depends on <application>mod_python</application>,
+ <application>Apache</application>, and an SQL database
+ engine of your choice. The FreeBSD Port will install all of
+ these pre-requisites for you with the appropriate flags.</para>
+
+ <example id="network-www-django-install">
+ <title>Installing Django with Apache2, mod_python3, and PostgreSQL</title>
+
+ <screen>&prompt.root; <userinput>cd /usr/ports/www/py-django; make all install clean -DWITH_MOD_PYTHON3 -DWITH_POSTGRESQL</userinput></screen>
+ </example>
+
+ <para>Once Django and these pre-requisites are installed, you
+ will need to create a Django project directory and then
+ configure Apache to use the embedded Python interpreter to
+ call your application for specific URLs on your site.</para>
+
+ <example id="network-www-django-apache-config">
+ <title>Apache Configuration for Django/mod_python</title>
+
+ <para>You will need to add a line to the apache
+ <filename>httpd.conf</filename> file to configure Apache
+ to pass requests for certain URLs to your web
+ application:</para>
+
+ <screen><Location "/">
+ SetHandler python-program
+ PythonPath "['/dir/to/your/django/packages/'] + sys.path"
+ PythonHandler django.core.handlers.modpython
+ SetEnv DJANGO_SETTINGS_MODULE mysite.settings
+ PythonAutoReload On
+ PythonDebug On
+</Location></screen>
+ </example>
+ </sect3>
+
+ <sect3>
+ <title>Ruby on Rails</title>
+
+ <indexterm><primary>Ruby on Rails</primary></indexterm>
+
+ <para>Ruby on Rails is another open source web framework that
+ provides a full development stack and is optimized to make
+ web developers more productive and capable of writing
+ powerful applications quickly. It can be installed easily
+ from the ports system.</para>
+
+ <screen>&prompt.root; <userinput>cd /usr/ports/www/rubygem-rails; make all install clean</userinput></screen>
+ </sect3>
+
+ <sect3>
<title>mod_perl</title>
<indexterm>
@@ -4093,10 +4176,10 @@
<filename role="package">www/apache13-modperl</filename>.
<application>mod_perl</application> 2.0 is avaliable in
<filename role="package">www/mod_perl2</filename>.</para>
- </sect4>
+ </sect3>
- <sect4>
- <sect4info>
+ <sect3>
+ <sect3info>
<authorgroup>
<author>
<firstname>Tom</firstname>
@@ -4104,7 +4187,7 @@
<contrib>Written by </contrib>
</author>
</authorgroup>
- </sect4info>
+ </sect3info>
<title>mod_php</title>
<indexterm>
@@ -4203,7 +4286,6 @@
pick up the new configuration changes:</para>
<screen>&prompt.root; <userinput>apachectl graceful</userinput></screen>
- </sect4>
</sect3>
</sect2>
</sect1>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#62 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.907 2008/03/24 14:34:53 csjp Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.911 2008/03/28 21:33:18 brueffer Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -5372,12 +5372,12 @@
<example id="using-x11-vars">
<title>Using X11 related variables in port</title>
- <programlisting># Use X11 libraries and depend on
+ <programlisting># Use some X11 libraries and depend on
# font server as well as cyrillic fonts.
-RUN_DEPENDS= ${X11BASE}/bin/xfs:${X_FONTSERVER_PORT} \
- ${X11BASE}/lib/X11/fonts/cyrillic/crox1c.pcf.gz:${X_FONTS_CYRILLIC_PORT}
+RUN_DEPENDS= ${LOCALBASE}/bin/xfs:${X_FONTSERVER_PORT} \
+ ${LOCALBASE}/lib/X11/fonts/cyrillic/crox1c.pcf.gz:${X_FONTS_CYRILLIC_PORT}
-USE_XLIB= yes</programlisting>
+USE_XORG= x11 xpm</programlisting>
</example>
</sect2>
@@ -5430,7 +5430,7 @@
<title>X11 fonts</title>
<para>If your port installs fonts for the X Window System, put them in
- <filename><makevar>X11BASE</makevar>/lib/X11/fonts/local</filename>.<para>
+ <filename><makevar>LOCALBASE</makevar>/lib/X11/fonts/local</filename>.<para>
</sect2>
@@ -5853,8 +5853,8 @@
add directories to the include and library searchpaths
via the commandline, for example:</para>
- <programlisting>${QMAKE} -unix PREFIX=${PREFIX} INCLUDEPATH+=${X11BASE}/include \
- LIBS+=-L${X11BASE}/lib sillyapp.pro</programlisting>
+ <programlisting>${QMAKE} -unix PREFIX=${PREFIX} INCLUDEPATH+=${LOCALBASE}/include \
+ LIBS+=-L${LOCALBASE}/lib sillyapp.pro</programlisting>
</listitem>
<listitem>
@@ -7553,7 +7553,7 @@
<row>
<entry><literal>relative</literal></entry>
- <entry><literal>--with-wx=${X11BASE}
+ <entry><literal>--with-wx=${LOCALBASE}
--with-wx-config=${WX_CONFIG:T}</literal></entry>
</row>
</tbody>
@@ -8227,9 +8227,8 @@
<literal>. %%RC_SUBR%%</literal>, because older versions of &os;
do not have an <filename>/etc/rc.subr</filename> file. Standard
<makevar>SUB_LIST</makevar> expansions are used too.
- Use of the <literal>%%PREFIX%%</literal>,
- <literal>%%LOCALBASE%%</literal>, and
- <literal>%%X11BASE%%</literal> expansions is strongly encouraged as well.
+ Use of the <literal>%%PREFIX%%</literal> and
+ <literal>%%LOCALBASE%%</literal> expansions is strongly encouraged as well.
More on
<makevar>SUB_LIST</makevar> in <link
linkend="using-sub-files">the relevant section</link>.</para>
@@ -8794,7 +8793,7 @@
with <literal>VALUE</literal> in each file listed in
<makevar>SUB_FILES</makevar>. Several common pairs are
automatically defined: <makevar>PREFIX</makevar>,
- <makevar>LOCALBASE</makevar>, <makevar>X11BASE</makevar>,
+ <makevar>LOCALBASE</makevar>,
<makevar>DATADIR</makevar>, <makevar>DOCSDIR</makevar>,
<makevar>EXAMPLESDIR</makevar>. Any line beginning with
<literal>@comment</literal> will be deleted from resulting files
@@ -8915,10 +8914,6 @@
<para>The value of <makevar>PREFIX</makevar> will be set
to <makevar>LOCALBASE</makevar> (default
<filename>/usr/local</filename>). If
- <makevar>USE_X_PREFIX</makevar> or <makevar>USE_IMAKE</makevar> is
- set, <makevar>PREFIX</makevar> will be <makevar>X11BASE</makevar>
- (default <makevar>LOCALBASE</makevar> for compatibility reasons,
- but it is going to be completely removed later). If
<makevar>USE_LINUX_PREFIX</makevar> is set, <makevar>PREFIX</makevar>
will be <makevar>LINUXBASE</makevar> (default
<filename>/compat/linux</filename>).</para>
@@ -8951,10 +8946,6 @@
<filename>/var/tmp/$(make -V PORTNAME)</filename>
to do that while you have it installed would do that.</para>
- <para>Do not set <makevar>USE_X_PREFIX</makevar> unless your port
- truly requires it (i.e., it needs to
- reference files in <makevar>X11BASE</makevar>).</para>
-
<para>The variable <makevar>PREFIX</makevar> can be reassigned in your
<filename>Makefile</filename> or in the user's environment.
However, it is strongly discouraged for individual ports to set this
@@ -12001,17 +11992,43 @@
<entry>800019</entry>
</row>
<row>
+ <entry>8.0-CURRENT after introduction of
+ &man.lockmgr.assert.9; and
+ <function>BUF_ASSERT</function> functions.</entry>
+ <entry>800020</entry>
+ </row>
+ <row>
+ <entry>8.0-CURRENT after introduction of
+ &man.lockmgr.args.9; and LK_INTERNAL flag
+ removal.</entry>
+ <entry>800021</entry>
+ </row>
+ <row>
<entry>8.0-CURRENT after changing the default system ar
- to BSD ar(1).</entry>
+ to BSD &man.ar.1;.</entry>
<entry>800022</entry>
</row>
-
+ <row>
+ <entry>8.0-CURRENT after changing the prototypes of
+ &man.lockstatus.9; and &man.VOP.ISLOCKED.9;, more
+ specifically retiring the
+ <literal>struct thread</literal> argument.</entry>
+ <entry>800023</entry>
+ </row>
+ <row>
+ <entry>8.0-CURRENT after axing out the
+ <function>lockwaiters</function> and
+ <function>BUF_LOCKWAITERS</function> functions,
+ changing the return value fo <function>brelvp</function>
+ from void to int and introducing new flags for
+ &man.lockinit.9;.</entry>
+ <entry>800024</entry>
+ </row>
<row>
<entry>8.0-CURRENT after adding F_DUP2FD command
to &man.fcntl.2;.</entry>
<entry>800025</entry>
</row>
-
<row>
<entry>8.0-CURRENT after changing the priority parameter
to cv_broadcastpri such that 0 means no priority.
@@ -12024,6 +12041,17 @@
</entry>
<entry>800027</entry>
</row>
+ <row>
+ <entry>8.0-CURRENT after adding l_sysid to struct flock.
+ </entry>
+ <entry>800028</entry>
+ </row>
+ <row>
+ <entry>8.0-CURRENT after reintegration of the
+ <function>BUF_LOCKWAITERS</function> function and the
+ addition of &man.lockmgr.waiters.9;.</entry>
+ <entry>800029</entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -12119,12 +12147,6 @@
</row>
<row>
- <entry><makevar>X11BASE</makevar></entry>
- <entry>The base of the <quote>X11</quote> tree (e.g.,
- <literal>/usr/X11R6</literal>)</entry>
- </row>
-
- <row>
<entry><makevar>PREFIX</makevar></entry>
<entry>Where the port installs itself (see <link
linkend="porting-prefix">more on
@@ -12416,8 +12438,7 @@
<listitem>
<para>installs files outside of
- <filename>${LOCALBASE}</filename> and
- <filename>${X11BASE}</filename></para>
+ <filename>${LOCALBASE}</filename></para>
</listitem>
<listitem>
==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#29 (text+ko) ====
@@ -20,7 +20,7 @@
lexicographical order by the entity (i.e., the dots used in place of
special characters should not be expanded when comparing).
- $FreeBSD: doc/share/sgml/man-refs.ent,v 1.454 2008/03/24 18:56:12 remko Exp $
+ $FreeBSD: doc/share/sgml/man-refs.ent,v 1.456 2008/03/28 21:33:18 brueffer Exp $
-->
<!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
@@ -4905,9 +4905,14 @@
<!ENTITY man.le16toh.9 "<citerefentry/<refentrytitle/le16toh/<manvolnum/9//">
<!ENTITY man.le32toh.9 "<citerefentry/<refentrytitle/le32toh/<manvolnum/9//">
<!ENTITY man.le64toh.9 "<citerefentry/<refentrytitle/le64toh/<manvolnum/9//">
+<!ENTITY man.lockinit.9 "<citerefentry/<refentrytitle/lockinit/<manvolnum/9//">
<!ENTITY man.lockmgr.9 "<citerefentry/<refentrytitle/lockmgr/<manvolnum/9//">
+<!ENTITY man.lockmgr.args.9 "<citerefentry/<refentrytitle/lockmgr_args/<manvolnum/9//">
+<!ENTITY man.lockmgr.assert.9 "<citerefentry/<refentrytitle/lockmgr_assert/<manvolnum/9//">
<!ENTITY man.lockmgr.disown.9 "<citerefentry/<refentrytitle/lockmgr_disown/<manvolnum/9//">
<!ENTITY man.lockmgr.recursed.9 "<citerefentry/<refentrytitle/lockmgr_recursed/<manvolnum/9//">
+<!ENTITY man.lockmgr.waiters.9 "<citerefentry/<refentrytitle/lockmgr_waiters/<manvolnum/9//">
+<!ENTITY man.lockstatus.9 "<citerefentry/<refentrytitle/lockstatus/<manvolnum/9//">
<!ENTITY man.mac.9 "<citerefentry/<refentrytitle/mac/<manvolnum/9//">
<!ENTITY man.mac.biba.9 "<citerefentry/<refentrytitle/mac_biba/<manvolnum/9//">
<!ENTITY man.mac.bsdextended.9 "<citerefentry/<refentrytitle/mac_bsdextended/<manvolnum/9//">
==== //depot/projects/dtrace/ports/UPDATING#61 (text+ko) ====
@@ -68,11 +68,14 @@
1. Make sure there are no running linux applications.
2. Unmount linprocfs (umount /compat/linux/proc)
3. Uninstall your current linux_base port
- 4. Unload linux kernel module (kldunload linux.ko)
- 5. Set appropriate sysctl (sysctl compat.linux.osrelease=2.6.16)
- 6. Install emulators/linux_base-fc6
- 4 Remount linprocfs (mount /compat/linux/proc)
- 5. Add compat.linux.osrelease=2.6.16 to etc/sysctl.conf
+ 4. Set appropriate sysctl (sysctl compat.linux.osrelease=2.6.16)
+ 5. Install emulators/linux_base-fc6
+ 6 Remount linprocfs (mount /compat/linux/proc)
+ 7. Add compat.linux.osrelease=2.6.16 to etc/sysctl.conf
+ 8. Add OVERRIDE_LINUX_BASE_PORT=f6 to /etc/make.conf
+
+ Note: These instructions also apply to linux_base-f8, please use the same
+ osrelease.
For FreeBSD versions 5.x and 6.x:
Please use the legacy version net/skype12
@@ -6250,4 +6253,4 @@
2) Update all p5-* modules.
portupgrade -f p5-\*
-$FreeBSD: ports/UPDATING,v 1.606 2008/03/26 13:47:49 bsam Exp $
+$FreeBSD: ports/UPDATING,v 1.607 2008/03/28 05:38:32 beech Exp $
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/alloca.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/alloca.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/alloca.h,v 1.2 2008/03/28 22:16:04 jb Exp $
*
*/
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/fcntl.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/fcntl.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/fcntl.h,v 1.2 2008/03/28 22:16:04 jb Exp $
*
*/
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/fsshare.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/fsshare.h,v 1.1 2007/04/06 01:08:58 pjd Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/fsshare.h,v 1.2 2008/03/28 22:16:04 jb Exp $
*/
#ifndef _OPENSOLARIS_FSSHARE_H_
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/stdio.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/stdio.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/stdio.h,v 1.2 2008/03/28 22:16:04 jb Exp $
*
*/
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/stdlib.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/stdlib.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/stdlib.h,v 1.2 2008/03/28 22:16:04 jb Exp $
*
*/
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/strings.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/strings.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/strings.h,v 1.2 2008/03/28 22:16:04 jb Exp $
*
*/
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/unistd.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/unistd.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/unistd.h,v 1.2 2008/03/28 22:16:04 jb Exp $
*
*/
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/deviceid.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/deviceid.c,v 1.1 2007/05/06 01:39:38 pjd Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/deviceid.c,v 1.2 2008/03/28 22:16:05 jb Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/fsshare.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/fsshare.c,v 1.2 2007/04/21 13:17:23 pjd Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/fsshare.c,v 1.3 2008/03/28 22:16:05 jb Exp $");
#include <sys/param.h>
#include <stdio.h>
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/mnttab.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/mnttab.c,v 1.1 2007/04/06 01:08:59 pjd Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/mnttab.c,v 1.2 2008/03/28 22:16:05 jb Exp $");
#include <sys/param.h>
#include <sys/mount.h>
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/zmount.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/zmount.c,v 1.1 2007/04/06 01:08:59 pjd Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/zmount.c,v 1.2 2008/03/28 22:16:05 jb Exp $");
#include <sys/param.h>
#include <sys/mount.h>
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/zone.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/misc/zone.c,v 1.1 2007/04/06 01:08:59 pjd Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/misc/zone.c,v 1.2 2008/03/28 22:16:05 jb Exp $
*/
#include <stdlib.h>
==== //depot/projects/dtrace/src/etc/network.subr#12 (text+ko) ====
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/network.subr,v 1.181 2007/11/05 06:13:06 thompsa Exp $
+# $FreeBSD: src/etc/network.subr,v 1.182 2008/03/28 06:50:06 brooks Exp $
#
#
@@ -472,14 +472,6 @@
}
gif_up() {
- # The following must be removed once RELENG_7 is branched.
- case ${gif_interfaces} in
- [Nn][Oo])
- warn "gif_interfaces=\"NO\" is deprecated, use gif_interfaces=\"\" instead."
- gif_interfaces=""
- ;;
- esac
-
for i in ${gif_interfaces}; do
peers=`get_if_var $i gifconfig_IF`
case ${peers} in
@@ -487,7 +479,12 @@
continue
;;
*)
- ifconfig $i create >/dev/null 2>&1
+ if expr $i : 'gif[0-9][0-9]*$' >/dev/null 2>&1; then
+ ifconfig $i create >/dev/null 2>&1
+ else
+ gif=`ifconfig gif create`
+ ifconfig $gif name $i
+ fi
ifconfig $i tunnel ${peers}
ifconfig $i up
;;
==== //depot/projects/dtrace/src/etc/rc.d/ppp#10 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ppp,v 1.17 2008/03/26 21:54:48 brooks Exp $
+# $FreeBSD: src/etc/rc.d/ppp,v 1.18 2008/03/28 07:57:51 brooks Exp $
#
# PROVIDE: ppp
@@ -18,7 +18,7 @@
ppp_start_profile()
{
- local _ppp_profile _ppp_mode _ppp_nat
+ local _ppp_profile _ppp_mode _ppp_nat _ppp_unit
_ppp_profile=$1
_ppp_profile_cleaned=$1
@@ -59,6 +59,13 @@
;;
esac
+ # Check for hard wired unit
+ eval _ppp_unit=\$ppp_${_ppp_profile_cleaned}_unit
+ if [ -n "_ppp_unit" ]; then
+ _ppp_unit="-unit${_ppp_unit}"
+ fi
+ rc_flags="$rc_flags $_ppp_unit"
+
# Run!
#
su -m $ppp_user -c "$command ${rc_flags} ${_ppp_profile}"
==== //depot/projects/dtrace/src/lib/libc/sys/mincore.2#5 (text+ko) ====
@@ -26,7 +26,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mincore.2 8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: src/lib/libc/sys/mincore.2,v 1.26 2007/01/09 00:28:15 imp Exp $
+.\" $FreeBSD: src/lib/libc/sys/mincore.2,v 1.27 2008/03/28 04:29:27 ps Exp $
.\"
.Dd January 17, 2003
.Dt MINCORE 2
@@ -72,6 +72,8 @@
Page has been referenced.
.It Dv MINCORE_MODIFIED_OTHER
Page has been modified.
+.It Dv MINCORE_SUPER
+Page is part of a "super" page. (only i386 & amd64)
.El
.Pp
The information returned by
==== //depot/projects/dtrace/src/share/man/man4/ubsa.4#6 (text+ko) ====
@@ -33,9 +33,9 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/ubsa.4,v 1.10 2007/05/08 18:51:40 maxim Exp $
+.\" $FreeBSD: src/share/man/man4/ubsa.4,v 1.11 2008/03/28 15:28:59 rpaulo Exp $
.\"
-.Dd May 8, 2007
+.Dd March 28, 2008
.Dt UBSA 4
.Os
.Sh NAME
@@ -96,6 +96,8 @@
Option Globetrotter 3G Fusion Quad (no WLAN support)
.It
Peracom single port serial adapter
+.It
+Qualcomm, Inc. ZTE CDMA Technologies MSM
.El
.Pp
The supported 3G cards provide the necessary modem port for ppp,
==== //depot/projects/dtrace/src/share/man/man5/rc.conf.5#26 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.336 2008/03/26 21:54:48 brooks Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.337 2008/03/28 07:57:52 brooks Exp $
.\"
.Dd January 27, 2008
.Dt RC.CONF 5
@@ -1322,7 +1322,9 @@
Also used for per-profile overrides of
.Va ppp_mode
and
-.Va ppp_nat .
+.Va ppp_nat ,
+and
+.Va ppp_ Ns Ao Ar profile Ac Ns _unit .
When the profile name contains any of the characters
.Dq Li .-/+
they are translated to
@@ -1361,6 +1363,12 @@
.Va ppp_nat
for
.Ar profile .
+.It Va ppp_ Ns Ao Ar profile Ac Ns _unit
+.Pq Vt int
+Set the unit number to be used for this profile.
+See the manual description of
+.Fl unit Ns Ar N
+for details.
.It Va ppp_user
.Pq Vt str
The name of the user under which
==== //depot/projects/dtrace/src/share/man/man9/Makefile#29 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.332 2008/03/14 13:13:37 rwatson Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.333 2008/03/28 21:30:37 brueffer Exp $
MAN= accept_filter.9 \
accf_data.9 \
@@ -723,6 +723,7 @@
lock.9 lockmgr_disown.9 \
lock.9 lockmgr_printinfo.9 \
lock.9 lockmgr_recursed.9 \
+ lock.9 lockmgr_waiters.9 \
lock.9 lockstatus.9
MLINKS+=LOCK_PROFILING.9 MUTEX_PROFILING.9
MLINKS+=make_dev.9 destroy_dev.9 \
==== //depot/projects/dtrace/src/share/man/man9/lock.9#13 (text+ko) ====
@@ -24,9 +24,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
.\" DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/lock.9,v 1.30 2008/03/02 20:07:48 brueffer Exp $
+.\" $FreeBSD: src/share/man/man9/lock.9,v 1.31 2008/03/28 21:30:37 brueffer Exp $
.\"
-.Dd March 1, 2008
+.Dd March 28, 2008
.Dt LOCK 9
.Os
.Sh NAME
@@ -37,6 +37,7 @@
.Nm lockmgr_disown ,
.Nm lockmgr_printinfo ,
.Nm lockmgr_recursed ,
+.Nm lockmgr_waiters ,
.Nm lockstatus ,
.Nm lockmgr_assert
.Nd "lockmgr family of functions"
@@ -59,6 +60,8 @@
.Ft int
.Fn lockmgr_recursed "struct lock *lkp"
.Ft int
+.Fn lockmgr_waiters "struct lock *lkp"
+.Ft int
.Fn lockstatus "struct lock *lkp"
.Pp
.Cd "options INVARIANTS"
@@ -220,6 +223,10 @@
otherwise.
.Pp
The
+.Fn lockmgr_waiters
+function returns true if the lock has waiters, 0 otherwise.
+.Pp
+The
.Fn lockstatus
function returns the status of the lock in relation to the current thread.
.Pp
==== //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#37 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.609 2008/03/23 23:04:09 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.610 2008/03/28 04:29:27 ps Exp $");
/*
* Manages physical address maps.
@@ -4371,6 +4371,7 @@
if (pdep != NULL && (*pdep & PG_V)) {
if (*pdep & PG_PS) {
pte = *pdep;
+ val = MINCORE_SUPER;
/* Compute the physical address of the 4KB page. */
pa = ((*pdep & PG_PS_FRAME) | (addr & PDRMASK)) &
PG_FRAME;
@@ -4385,7 +4386,7 @@
PMAP_UNLOCK(pmap);
if (pte != 0) {
- val = MINCORE_INCORE;
+ val |= MINCORE_INCORE;
if ((pte & PG_MANAGED) == 0)
return val;
==== //depot/projects/dtrace/src/sys/boot/forth/loader.conf#13 (text+ko) ====
@@ -6,7 +6,7 @@
#
# All arguments must be in double quotes.
#
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.122 2007/09/26 08:38:25 ru Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.123 2008/03/28 18:13:09 brueffer Exp $
##############################################################
### Basic configuration options ############################
@@ -234,10 +234,12 @@
if_gem_load="NO" # Sun GEM/Sun ERI/Apple GMAC
if_hme_load="NO" # Sun Microelectronics STP2002-STQ Ethernet
if_ie_load="NO" # Intel 82586
+if_igb_load="NO" # Intel(R) PRO/1000 Gigabit Ethernet
if_ipw_load="NO" # Intel PRO/Wireless 2100 wireless
if_iwi_load="NO" # Intel PRO/Wireless 2200BG/2225BG/2915ABG
# wireless
if_ixgb_load="NO" # Intel PRO/10Gb Ethernet
+if_ixgbe_load="NO" # Intel PRO/10Gb Ethernet PCI Express
if_le_load="NO" # AMD Am7900 LANCE and Am79C9xx PCnet
if_lge_load="NO" # Level 1 LXT1001 NetCellerator PCI Gigabit
# Ethernet
@@ -247,8 +249,10 @@
if_nfe_load="NO" # NVIDIA nForce MCP Networking Adapter
if_nge_load="NO" # National Semiconductor PCI Gigabit Ethernet
if_nve_load="NO" # NVIDIA nForce MCP Networking Adapter
+if_nxge_load="NO" # Neterion Xframe 10Gb Ethernet
if_oltr_load="NO" # Olicom
if_pcn_load="NO" # AMD PCnet PCI
+if_ral_load="NO" # Ralink Technology wireless
if_ray_load="NO" # Raytheon Raylink/Webgear Aviator PCCard
if_re_load="NO" # RealTek 8139C+/8169/8169S/8110S
if_rl_load="NO" # RealTek 8129/8139
@@ -267,10 +271,12 @@
if_txp_load="NO" # 3Com 3XP Typhoon/Sidewinder (3CR990)
if_vge_load="NO" # VIA VT6122 PCI Gigabit Ethernet
if_udav_load="NO" # Davicom DM9601 USB Ethernet
+if_ural_load="NO" # Ralink Technology USB wireless
if_vr_load="NO" # VIA Rhine I and Rhine II
if_vx_load="NO" # 3Com 3C590 family
if_wb_load="NO" # Winbond W89C840F
if_wi_load="NO" # WaveLAN/IEEE 802.11 wireless NICs
+if_wpi_load="NO" # Intel 3945ABG Wireless LAN IEEE 802.11
if_xe_load="NO" # Xircom CreditCard PCMCIA
if_xl_load="NO" # 3Com Etherlink XL (3c900, 3c905, 3c905B)
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c,v 1.1 2007/06/08 12:35:45 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c,v 1.2 2008/03/28 22:16:05 jb Exp $");
#include <sys/param.h>
#include <sys/lock.h>
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c,v 1.3 2008/01/24 11:21:54 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c,v 1.4 2008/03/28 22:16:05 jb Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -40,6 +40,8 @@
#include <vm/vm_kern.h>
#include <vm/vm_map.h>
+#define KMEM_DEBUG
+
#ifdef KMEM_DEBUG
#include <sys/queue.h>
#include <sys/stack.h>
@@ -93,6 +95,10 @@
zfs_kmem_free(void *buf, size_t size __unused)
{
#ifdef KMEM_DEBUG
+ if (buf == NULL) {
+ printf("%s: attempt to free NULL\n",__func__);
+ return;
+ }
struct kmem_item *i;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list