PERFORCE change 30858 for review
Peter Wemm
peter at FreeBSD.org
Fri May 9 11:17:45 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=30858
Change 30858 by peter at peter_daintree on 2003/05/09 11:17:03
IFC @30847
Affected files ...
.. //depot/projects/hammer/bin/echo/echo.1#3 integrate
.. //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h#5 integrate
.. //depot/projects/hammer/etc/devd.conf#4 integrate
.. //depot/projects/hammer/lib/libc/alpha/arith.h#2 integrate
.. //depot/projects/hammer/lib/libc/amd64/arith.h#7 integrate
.. //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#6 integrate
.. //depot/projects/hammer/lib/libc/i386/arith.h#2 integrate
.. //depot/projects/hammer/lib/libc/ia64/arith.h#2 integrate
.. //depot/projects/hammer/lib/libc/powerpc/arith.h#2 integrate
.. //depot/projects/hammer/lib/libc/sparc64/arith.h#2 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#22 integrate
.. //depot/projects/hammer/release/scripts/doFS.sh#8 integrate
.. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#7 integrate
.. //depot/projects/hammer/sbin/ldconfig/ldconfig.8#3 integrate
.. //depot/projects/hammer/share/man/man5/procfs.5#3 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#9 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-raid.c#10 integrate
.. //depot/projects/hammer/sys/kern/kern_mac.c#16 integrate
.. //depot/projects/hammer/sys/sys/_label.h#4 integrate
.. //depot/projects/hammer/sys/sys/mbuf.h#11 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#19 integrate
.. //depot/projects/hammer/usr.bin/sockstat/sockstat.c#3 integrate
Differences ...
==== //depot/projects/hammer/bin/echo/echo.1#3 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)echo.1 8.1 (Berkeley) 7/22/93
-.\" $FreeBSD: src/bin/echo/echo.1,v 1.14 2003/04/12 03:49:28 tjr Exp $
+.\" $FreeBSD: src/bin/echo/echo.1,v 1.15 2003/05/08 17:47:28 schweikh Exp $
.\"
.Dd April 12, 2003
.Dt ECHO 1
@@ -58,11 +58,20 @@
The following option is available:
.Bl -tag -width flag
.It Fl n
-Do not print the trailing newline character. This may also be
-achieved by appending
+Do not print the trailing newline character.
+This may also be achieved by appending
.Ql \ec
to the end of the string, as is done
by iBCS2 compatible systems.
+Note that this option as well as the effect of
+.Ql \ec
+are implementation-defined in
+.St -p1003.1-2001
+as amended by Cor. 1-2002.
+Applications aiming for maximum
+portability are strongly encouraged to use
+.Xr printf 1
+to suppress the newline character.
.El
.Pp
Some shells may provide a builtin
==== //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h#5 (text+ko) ====
@@ -22,7 +22,7 @@
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.61 2003/04/26 19:16:54 obrien Exp $ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.62 2003/05/08 16:02:22 obrien Exp $ */
#undef CC1_SPEC
#define CC1_SPEC "%(cc1_cpu) %{profile:-p}"
@@ -135,7 +135,7 @@
#define FUNCTION_PROFILER(FILE, LABELNO) \
do { \
if (flag_pic) \
- fprintf ((FILE), "\tcall *.mcount%s at GOT(%%ebx)\n"); \
+ fprintf ((FILE), "\tcall *.mcount at GOT(%%ebx)\n"); \
else \
fprintf ((FILE), "\tcall .mcount\n"); \
} while (0)
==== //depot/projects/hammer/etc/devd.conf#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.5 2003/05/09 05:58:22 imp Exp $
#
# Refer to devd.conf(5) and devd(8) man pages for the details on how to
# run and configure devd.
@@ -66,9 +66,9 @@
# Don't even try to second guess what to do about drivers that don't
# match here. Instead, pass it off to syslog. Commented out for the
# moment, as pnpinfo isn't set in devd yet
-nomatch 0 {
- // action "logger Unknown device: $pnpinfo $location $bus";
-};
+#nomatch 0 {
+# action "logger Unknown device: $pnpinfo $location $bus";
+#};
/* EXAMPLES TO END OF FILE
==== //depot/projects/hammer/lib/libc/alpha/arith.h#2 (text+ko) ====
@@ -1,7 +1,14 @@
/*
* MD header for contrib/netlib/gdtoa
*
- * $FreeBSD: src/lib/libc/alpha/arith.h,v 1.1 2003/03/12 20:29:58 das Exp $
+ * $FreeBSD: src/lib/libc/alpha/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $
+ */
+
+/*
+ * NOTE: The definitions in this file must be correct or strtod(3) and
+ * floating point formats in printf(3) will break! The file can be
+ * generated by running contrib/gdtoa/arithchk.c on the target
+ * architecture. See contrib/gdtoa/gdtoaimp.h for details.
*/
#define IEEE_8087
==== //depot/projects/hammer/lib/libc/amd64/arith.h#7 (text+ko) ====
@@ -1,7 +1,14 @@
/*
* MD header for contrib/gdtoa
*
- * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.2 2003/05/07 23:48:05 peter Exp $
+ * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.3 2003/05/08 13:50:43 das Exp $
+ */
+
+/*
+ * NOTE: The definitions in this file must be correct or strtod(3) and
+ * floating point formats in printf(3) will break! The file can be
+ * generated by running contrib/gdtoa/arithchk.c on the target
+ * architecture. See contrib/gdtoa/gdtoaimp.h for details.
*/
#define IEEE_8087
==== //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#6 (text+ko) ====
@@ -38,7 +38,7 @@
.asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.24 2003/05/08 06:25:03 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.25 2003/05/08 07:41:24 peter Exp $");
/*
* C library -- _setjmp, _longjmp
@@ -80,7 +80,7 @@
pushq %rdi
pushq %rsi
movq %rdi,%rdx
- movq $1,%rdi /* SIG_SETMASK */
+ movq $3,%rdi /* SIG_SETMASK */
leaq 72(%rdx),%rsi /* (sigset_t*)set */
movq $0,%rdx /* (sigset_t*)oset */
call PIC_PLT(CNAME(_sigprocmask))
==== //depot/projects/hammer/lib/libc/i386/arith.h#2 (text+ko) ====
@@ -1,7 +1,14 @@
/*
* MD header for contrib/gdtoa
*
- * $FreeBSD: src/lib/libc/i386/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $
+ * $FreeBSD: src/lib/libc/i386/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $
+ */
+
+/*
+ * NOTE: The definitions in this file must be correct or strtod(3) and
+ * floating point formats in printf(3) will break! The file can be
+ * generated by running contrib/gdtoa/arithchk.c on the target
+ * architecture. See contrib/gdtoa/gdtoaimp.h for details.
*/
#define IEEE_8087
==== //depot/projects/hammer/lib/libc/ia64/arith.h#2 (text+ko) ====
@@ -1,7 +1,14 @@
/*
* MD header for contrib/gdtoa
*
- * $FreeBSD: src/lib/libc/ia64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $
+ * $FreeBSD: src/lib/libc/ia64/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $
+ */
+
+/*
+ * NOTE: The definitions in this file must be correct or strtod(3) and
+ * floating point formats in printf(3) will break! The file can be
+ * generated by running contrib/gdtoa/arithchk.c on the target
+ * architecture. See contrib/gdtoa/gdtoaimp.h for details.
*/
#include <machine/endian.h>
==== //depot/projects/hammer/lib/libc/powerpc/arith.h#2 (text+ko) ====
@@ -1,7 +1,14 @@
/*
* MD header for contrib/gdtoa
*
- * $FreeBSD: src/lib/libc/powerpc/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $
+ * $FreeBSD: src/lib/libc/powerpc/arith.h,v 1.2 2003/05/08 13:50:44 das Exp $
+ */
+
+/*
+ * NOTE: The definitions in this file must be correct or strtod(3) and
+ * floating point formats in printf(3) will break! The file can be
+ * generated by running contrib/gdtoa/arithchk.c on the target
+ * architecture. See contrib/gdtoa/gdtoaimp.h for details.
*/
#define IEEE_MC68k
==== //depot/projects/hammer/lib/libc/sparc64/arith.h#2 (text+ko) ====
@@ -1,7 +1,14 @@
/*
* MD header for contrib/gdtoa
*
- * $FreeBSD: src/lib/libc/sparc64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $
+ * $FreeBSD: src/lib/libc/sparc64/arith.h,v 1.2 2003/05/08 13:50:44 das Exp $
+ */
+
+/*
+ * NOTE: The definitions in this file must be correct or strtod(3) and
+ * floating point formats in printf(3) will break! The file can be
+ * generated by running contrib/gdtoa/arithchk.c on the target
+ * architecture. See contrib/gdtoa/gdtoaimp.h for details.
*/
#define IEEE_MC68k
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#22 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The FreeBSD Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.563 2003/05/07 04:15:57 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.566 2003/05/08 22:31:00 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -504,6 +504,14 @@
<para>&man.adduser.8; now supports a <option>-g</option> option to
set a user's default login group.</para>
+ <para>The &man.bsdlabel.8; utility is a replacement for the older
+ disklabel utility. Like its predecessor, it installs, examines,
+ or modifies the BSD label on a disk partition, and can install
+ bootstrap code. Compared to disklabel, a number of obsolete
+ options and parameters have been retired. A new
+ <option>-m</option> option instructs &man.bsdlabel.8; to use the
+ layout suitable for a specific machine.</para>
+
<para arch="alpha,i386">The <filename>compat4x</filename>
distribution now includes the
<filename>libcrypto.so.2</filename>,
@@ -526,16 +534,10 @@
information about a disk device and optionally to run a naive
performance test.</para>
- <para>The <option>-N</option> and <option>-W</option> flags to
- &man.disklabel.8; have been retired.</para>
-
- <para>&man.disklabel.8; is now only built for architectures where
- it is useful (i386, pc98, alpha, and ia64).</para>
+ <para>The disklabel utility has been replaced by &man.bsdlabel.8;.
+ On the alpha, i386, and pc98 platforms, disklabel is a link to
+ &man.bsdlabel.8;.</para>
- <para>The <option>-s</option> option to &man.disklabel.8; has been
- removed because the i386 boot loader now resides in a single
- file.</para>
-
<para>&man.dump.8; now supports caching of disk blocks with the
<option>-C</option> option. This can improve dump performance
at the cost of possibly missing file system updates that occur
@@ -655,12 +657,47 @@
unless UFS1 is specifically requested with the
<option>-O1</option> option.</para>
- <para>&man.newsyslog.8; now supports a <literal>W</literal> flag
- to force previously-started compression jobs for an entry (or
- group of entries specified with the <literal>G</literal> flag)
- to finish before beginning a new one. This feature is designed
- to prevent system overloads caused by starting several
- compression jobs on big files simultaneously. &merged;</para>
+ <para>&man.newsyslog.8; has a number of new features. Among them:
+
+ <itemizedlist>
+ <listitem>
+ <para>A <literal>W</literal> flag forces previously-started
+ compression jobs for an entry (or group of entries
+ specified with the <literal>G</literal> flag) to finish
+ before beginning a new one. This feature is designed to
+ prevent system overloads caused by starting several
+ compression jobs on big files
+ simultaneously. &merged;</para>
+ </listitem>
+
+ <listitem>
+ <para>A <quote>default rotate action</quote>, to be used for
+ files specified for rotation but not specified in the
+ configuration file. &merged;</para>
+ </listitem>
+
+ <listitem>
+ <para>A <option>-s</option> command-line flag to disable
+ sending signals to processes when rotating
+ files. &merged;</para>
+ </listitem>
+
+ <listitem>
+ <para>A <literal>N</literal> configuration file flag to
+ indicate that no process needs to be signaled when
+ rotating a file. &merged;</para>
+ </listitem>
+
+ <listitem>
+ <para>A <literal>U</literal> configuration file flag to
+ specify that a process group (rather than a single
+ process) should be signaled when rotating
+ files. &merged;</para>
+ </listitem>
+
+ </itemizedlist>
+
+ </para>
<para>&man.nsdispatch.3; is now thread-safe and implements support
for Name Service Switch (NSS) modules. NSS modules may be
@@ -719,7 +756,7 @@
strengthened.</para>
<para arch="sparc64">The sunlabel utility, a program analogous to
- &man.disklabel.8; that works on Sun disk labels, has been
+ &man.bsdlabel.8; that works on Sun disk labels, has been
added.</para>
<para arch="i386,alpha,sparc64,ia64">&man.sysinstall.8; will now
==== //depot/projects/hammer/release/scripts/doFS.sh#8 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/release/scripts/doFS.sh,v 1.49 2003/05/03 19:23:10 scottl Exp $
+# $FreeBSD: src/release/scripts/doFS.sh,v 1.50 2003/05/09 09:41:18 scottl Exp $
#
set -ex
==== //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#7 (text+ko) ====
@@ -2,7 +2,7 @@
#
# Author: Jordan Hubbard
# Date: Mon Jul 10 01:18:20 2000
-# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.41 2003/03/03 03:28:30 murray Exp $
+# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.42 2003/05/09 09:41:18 scottl Exp $
#
# MAINTAINER: re
#
@@ -145,7 +145,6 @@
CDROM_SET_1="${CDROM_SET_1} www/netscape-remote"
CDROM_SET_1="${CDROM_SET_1} www/netscape-wrapper"
CDROM_SET_1="${CDROM_SET_1} www/netscape48-communicator"
-CDROM_SET_1="${CDROM_SET_1} www/netscape48-navigator"
CDROM_SET_1="${CDROM_SET_1} www/opera"
CDROM_SET_1="${CDROM_SET_1} x11/rxvt"
==== //depot/projects/hammer/sbin/ldconfig/ldconfig.8#3 (text+ko) ====
@@ -27,7 +27,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.31 2002/08/18 18:11:38 jdp Exp $
+.\" $FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.32 2003/05/08 17:25:41 trhodes Exp $
.\"
.Dd October 3, 1993
.Dt LDCONFIG 8
@@ -61,6 +61,9 @@
line. Blank lines and lines starting with the comment character
.Ql \&#
are ignored.
+Filenames must conform to the
+.Pa lib*.so.[0-9]
+pattern in order to be added to the hints file.
.Pp
For security reasons, directories which are world or group-writable or which
are not owned by root produce warning messages and are skipped, unless
==== //depot/projects/hammer/share/man/man5/procfs.5#3 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/share/man/man5/procfs.5,v 1.26 2002/12/12 17:25:57 ru Exp $
+.\" $FreeBSD: src/share/man/man5/procfs.5,v 1.27 2003/05/09 09:20:26 hmp Exp $
.\" Written by Garrett Wollman
.\" This file is in the public domain.
.\"
@@ -171,6 +171,10 @@
and the list of groups (whose first member
is the effective group id)
all comma separated.
+.It
+the hostname of the jail in which the process runs, or
+.Sq Li -
+to indicate that the process is not running within a jail.
.El
.El
.Pp
==== //depot/projects/hammer/share/man/man9/Makefile#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.187 2003/04/22 03:43:44 imp Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.188 2003/05/09 09:12:10 hmp Exp $
MAN= BUF_LOCK.9 BUF_LOCKFREE.9 BUF_LOCKINIT.9 BUF_REFCNT.9 \
BUF_TIMELOCK.9 BUF_UNLOCK.9 BUS_PRINT_CHILD.9 BUS_READ_IVAR.9 \
@@ -174,6 +174,7 @@
MLINKS+=pfind.9 zpfind.9
MLINKS+=psignal.9 gsignal.9 psignal.9 pgsignal.9
MLINKS+=random.9 srandom.9 random.9 arc4random.9 random.9 read_random.9
+MLINKS+=random.9 arc4rand.9
MLINKS+=rtalloc.9 rtalloc1.9 rtalloc.9 rtalloc_ign.9
MLINKS+=runqueue.9 chooseproc.9 runqueue.9 procrunnable.9
MLINKS+=runqueue.9 remrunqueue.9 runqueue.9 setrunqueue.9
==== //depot/projects/hammer/sys/dev/ata/ata-raid.c#10 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.64 2003/05/04 16:17:54 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.65 2003/05/08 16:38:14 jhb Exp $
*/
#include "opt_ata.h"
@@ -969,6 +969,7 @@
int disk, s, count = 0, error = 0;
caddr_t buffer;
+ mtx_lock(&Giant);
if ((rdp->flags & (AR_F_READY|AR_F_DEGRADED)) != (AR_F_READY|AR_F_DEGRADED))
kthread_exit(EEXIST);
==== //depot/projects/hammer/sys/kern/kern_mac.c#16 (text+ko) ====
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/kern/kern_mac.c,v 1.89 2003/05/07 17:49:24 rwatson Exp $
+ * $FreeBSD: src/sys/kern/kern_mac.c,v 1.90 2003/05/08 19:49:42 rwatson Exp $
*/
/*
* Developed by the TrustedBSD Project.
@@ -98,14 +98,14 @@
SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0,
"TrustedBSD MAC policy controls");
-#if MAC_MAX_POLICIES > 32
-#error "MAC_MAX_POLICIES too large"
+#if MAC_MAX_SLOTS > 32
+#error "MAC_MAX_SLOTS too large"
#endif
-static unsigned int mac_max_policies = MAC_MAX_POLICIES;
-static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1;
-SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD,
- &mac_max_policies, 0, "");
+static unsigned int mac_max_slots = MAC_MAX_SLOTS;
+static unsigned int mac_slot_offsets_free = (1 << MAC_MAX_SLOTS) - 1;
+SYSCTL_UINT(_security_mac, OID_AUTO, max_slots, CTLFLAG_RD,
+ &mac_max_slots, 0, "");
/*
* Has the kernel started generating labeled objects yet? All read/write
@@ -645,13 +645,13 @@
}
}
if (mpc->mpc_field_off != NULL) {
- slot = ffs(mac_policy_offsets_free);
+ slot = ffs(mac_slot_offsets_free);
if (slot == 0) {
error = ENOMEM;
goto out;
}
slot--;
- mac_policy_offsets_free &= ~(1 << slot);
+ mac_slot_offsets_free &= ~(1 << slot);
*mpc->mpc_field_off = slot;
}
mpc->mpc_runtime_flags |= MPC_RUNTIME_FLAG_REGISTERED;
==== //depot/projects/hammer/sys/sys/_label.h#4 (text+ko) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/sys/_label.h,v 1.3 2002/11/04 02:35:46 rwatson Exp $
+ * $FreeBSD: src/sys/sys/_label.h,v 1.4 2003/05/08 19:49:42 rwatson Exp $
*/
#ifndef _SYS__LABEL_H
#define _SYS__LABEL_H
@@ -41,7 +41,7 @@
* and various other messes.
*/
-#define MAC_MAX_POLICIES 4
+#define MAC_MAX_SLOTS 4
#define MAC_FLAG_INITIALIZED 0x0000001 /* Is initialized for use. */
@@ -50,7 +50,7 @@
union {
void *l_ptr;
long l_long;
- } l_perpolicy[MAC_MAX_POLICIES];
+ } l_perpolicy[MAC_MAX_SLOTS];
};
#endif /* !_SYS__LABEL_H */
==== //depot/projects/hammer/sys/sys/mbuf.h#11 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)mbuf.h 8.5 (Berkeley) 2/19/95
- * $FreeBSD: src/sys/sys/mbuf.h,v 1.121 2003/05/02 03:43:40 silby Exp $
+ * $FreeBSD: src/sys/sys/mbuf.h,v 1.122 2003/05/09 02:15:52 silby Exp $
*/
#ifndef _SYS_MBUF_H_
@@ -153,7 +153,7 @@
#define M_PROTO3 0x0040 /* protocol-specific */
#define M_PROTO4 0x0080 /* protocol-specific */
#define M_PROTO5 0x0100 /* protocol-specific */
-#define M_FREELIST 0x4000 /* mbuf is on the free list */
+#define M_FREELIST 0x8000 /* mbuf is on the free list */
/*
* mbuf pkthdr flags (also stored in m_flags).
==== //depot/projects/hammer/sys/vm/vm_object.c#19 (text+ko) ====
@@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $FreeBSD: src/sys/vm/vm_object.c,v 1.286 2003/05/06 02:45:28 alc Exp $
+ * $FreeBSD: src/sys/vm/vm_object.c,v 1.287 2003/05/09 02:13:23 alc Exp $
*/
/*
@@ -238,8 +238,13 @@
_vm_object_allocate(OBJT_DEFAULT, OFF_TO_IDX(VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS),
kernel_object);
+ /*
+ * The kmem object's mutex is given a unique name, instead of
+ * "vm object", to avoid false reports of lock-order reversal
+ * with a system map mutex.
+ */
kmem_object = &kmem_object_store;
- VM_OBJECT_LOCK_INIT(&kmem_object_store);
+ mtx_init(VM_OBJECT_MTX(kmem_object), "kmem object", NULL, MTX_DEF);
_vm_object_allocate(OBJT_DEFAULT, OFF_TO_IDX(VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS),
kmem_object);
==== //depot/projects/hammer/usr.bin/sockstat/sockstat.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/sockstat/sockstat.c,v 1.6 2003/01/13 00:28:56 dillon Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/sockstat/sockstat.c,v 1.7 2003/05/09 09:11:27 robert Exp $");
#include <sys/param.h>
#include <sys/socket.h>
@@ -111,7 +111,7 @@
int port, end;
if (ports == NULL)
- if ((ports = calloc(1, 65536 / INT_BIT)) == NULL)
+ if ((ports = calloc(65536 / INT_BIT, sizeof(int))) == NULL)
err(1, "calloc()");
p = portspec;
while (*p != '\0') {
More information about the p4-projects
mailing list