From owner-p4-projects@FreeBSD.ORG Sun May 2 08:19:30 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 5F82116A4D0; Sun, 2 May 2004 08:19: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 2A7AD16A4CE
for <perforce@freebsd.org>; Sun, 2 May 2004 08:19:30 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 1D42643D3F
for <perforce@freebsd.org>; Sun, 2 May 2004 08:19:29 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i42FJTGe083901
for <perforce@freebsd.org>; Sun, 2 May 2004 08:19:29 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i42FIppn083894
for perforce@freebsd.org; Sun, 2 May 2004 08:18:51 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 2 May 2004 08:18:51 -0700 (PDT)
Message-Id: <200405021518.i42FIppn083894@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52077 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: Sun, 02 May 2004 15:19:31 -0000
http://perforce.freebsd.org/chv.cgi?CH=52077
Change 52077 by rwatson@rwatson_paprika on 2004/05/02 08:18:14
Integrate TrustedBSD MAC branch from TrustedBSD base branch:
Addition of twa driver for new 3Ware controllers; interfaces with
CAM unlike twe driver.
RAIDFrame GC'd.
Additional of a kernel-toolchain target in system makefiles.
"versrcreach" added to ipfw, which permits BGP routing tables to
be used for ingress filtering.
Trimming of many clause three's on Berkeley licenses.
df(1) grows -c to show cumulative stats.
ACL optimization in ls(1) print output.
ps(1) moves a lot closer to Single-Unix-Spec.
bsnmpd(1) update.
com_err(3) update.
cvs(1) update and security fixes.
groff OS version number updates, library updates.
less(1) update.
libpcap(3) update.
tcpdump(1) update.
heimdal kerberos5 update.
openssh(1) update.
openssl(3) update.
The usual assortment of pccard.conf entries.
nologin moved to usr/sbin.
locales come, locales go. Mostly come.
diskless scrips redone.
Continued evolution of libarchive, including ACL support.
getvfsent() and friends go away.
More and more wide/multi-byte character support.
Thread-safe getaddrinfo().
PPC support for libdisk.
The usual plethora of 0/NULL cleanups, type cleanups, cast
cleanups, and other detrious of the C language.
libradius grows crypto support.
libthr and libpthread both become more mature in ways I don't
entirely follow. Using internal wakeups instead of signals
in libthr, constant changes in libpthread, etc, etc.
dump can now pipe to another command with a popen(); restore
does similar things.
dump learns that snapshotting a read-only file system is a bad
idea.
Per-interface polling settings, rather than global
configuration.
802.11 power management ioctls, protection management ioctls.
Cleanups to the kernel and userspace routing code.
The usual contless bug fixes, style fixes, spelling fixes, etc,
etc.
rc.conf support for pf, ntpdate_hosts, watchdig driver, md backed
file systems.
In VM, pmap_init() no longer takes physical start and stop
addresses. We now have pmap_kenter_temporary(). On systems
supporting it, direct virtual-to-physical addressing is used to
support sf_bufs. Optimized pagecopy() available on various
platforms.
Linux emulation supports madvise().
Various parts of 32-bit freebsd emulation for 64-bit platforms
finished (statfs and variations, signal context handling, etc).
Information leak in handling of ps_args, ps_argsopen, and
p_cansee fixed.
More NDIS evil than you can shake a stick at.
ACPI(4) update. PCI power state support.
aac gets timeouts.
if_arl uses 802.11 framework.
Drastic asr cleanup.
ciss(4) enhancements.
Gratuitous and arguably incorrect use if ifp->if_addrhead to see
if the link layer has initialized yet in various drivers
removed.
Various /dev/random enhancements to support hardware entropy
sources.
Most sound drivers become un-INTR_MPSAFE for now.
syscons pieces fixed on Alpha, et al, such that system console
output can be used before syscons has done a formal attach
and/or make_dev(9) is usable, avoid NULL pointer dereferences,
etc.
twe(4) overhaul.
Do not drop Giant via cdevsw entry points from VFS even if driver
can run without Giant, due to risks of re-acquiring Giant at
that point.
callout(9) now supports callout_drain() to drain concurrent
callouts before unregistering.
Earlier interrupt re-enable encouraging coallescing; interrupt
storm detection and mitigation.
Raw sockets can be used in jail subject to a sysctl.
Giant no longer needed in various process debugging activities.
Giant now grabbed conditional to debug.mpsafenet for the entire
network stack, not just the forwarding plane.
Lots more fine-grained locking of pseudo-interfaces.
if_gif loop detection is now real.
AARP locked down in netatalk.
Cred references now passed into inpcb calls, but not threads.
"Size-changed" big fux in NFS client.
NFS code now conditionally launches a high rate timeout based on
whether or not there are pending RPCs/events, rather than
always.
Addition of lgetfh() system call.
Various bogus vop locking functions, such as vop_nolock(), removed
since they were a bad idea.
Substantial performance optimizations in du's hard link handling.
find(1) can search for files with extended ACLs.
Affected files ...
.. //depot/projects/trustedbsd/mac/MAINTAINERS#22 integrate
.. //depot/projects/trustedbsd/mac/Makefile#29 integrate
.. //depot/projects/trustedbsd/mac/Makefile.inc1#47 integrate
.. //depot/projects/trustedbsd/mac/UPDATING#38 integrate
.. //depot/projects/trustedbsd/mac/bin/cat/cat.1#4 integrate
.. //depot/projects/trustedbsd/mac/bin/cat/cat.c#11 integrate
.. //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#4 integrate
.. //depot/projects/trustedbsd/mac/bin/chflags/chflags.c#4 integrate
.. //depot/projects/trustedbsd/mac/bin/chmod/chmod.1#11 integrate
.. //depot/projects/trustedbsd/mac/bin/chmod/chmod.c#11 integrate
.. //depot/projects/trustedbsd/mac/bin/cp/cp.1#8 integrate
.. //depot/projects/trustedbsd/mac/bin/cp/cp.c#14 integrate
.. //depot/projects/trustedbsd/mac/bin/cp/extern.h#8 integrate
.. //depot/projects/trustedbsd/mac/bin/cp/utils.c#12 integrate
.. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/csh.1#4 integrate
.. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/csh.2#3 integrate
.. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/csh.3#3 integrate
.. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/csh.4#3 integrate
.. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/csh.a#3 integrate
.. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/csh.g#5 integrate
.. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/tabs#3 integrate
.. //depot/projects/trustedbsd/mac/bin/csh/host.defs#3 integrate
.. //depot/projects/trustedbsd/mac/bin/date/date.1#9 integrate
.. //depot/projects/trustedbsd/mac/bin/date/date.c#10 integrate
.. //depot/projects/trustedbsd/mac/bin/date/extern.h#4 integrate
.. //depot/projects/trustedbsd/mac/bin/date/netdate.c#8 integrate
.. //depot/projects/trustedbsd/mac/bin/dd/Makefile#8 integrate
.. //depot/projects/trustedbsd/mac/bin/dd/args.c#12 integrate
.. //depot/projects/trustedbsd/mac/bin/dd/conv.c#6 integrate
.. //depot/projects/trustedbsd/mac/bin/dd/conv_tab.c#4 integrate
.. //depot/projects/trustedbsd/mac/bin/dd/dd.1#7 integrate
.. //depot/projects/trustedbsd/mac/bin/dd/dd.c#12 integrate
.. //depot/projects/trustedbsd/mac/bin/dd/dd.h#6 integrate
.. //depot/projects/trustedbsd/mac/bin/dd/extern.h#6 integrate
.. //depot/projects/trustedbsd/mac/bin/dd/misc.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/dd/position.c#6 integrate
.. //depot/projects/trustedbsd/mac/bin/df/Makefile#6 integrate
.. //depot/projects/trustedbsd/mac/bin/df/df.1#7 integrate
.. //depot/projects/trustedbsd/mac/bin/df/df.c#19 integrate
.. //depot/projects/trustedbsd/mac/bin/domainname/domainname.1#4 integrate
.. //depot/projects/trustedbsd/mac/bin/domainname/domainname.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/echo/echo.1#5 integrate
.. //depot/projects/trustedbsd/mac/bin/echo/echo.c#9 integrate
.. //depot/projects/trustedbsd/mac/bin/ed/cbc.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/hostname/hostname.1#4 integrate
.. //depot/projects/trustedbsd/mac/bin/hostname/hostname.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/kenv/kenv.c#4 integrate
.. //depot/projects/trustedbsd/mac/bin/kill/kill.1#4 integrate
.. //depot/projects/trustedbsd/mac/bin/kill/kill.c#8 integrate
.. //depot/projects/trustedbsd/mac/bin/ln/ln.1#7 integrate
.. //depot/projects/trustedbsd/mac/bin/ln/ln.c#10 integrate
.. //depot/projects/trustedbsd/mac/bin/ln/symlink.7#5 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/cmp.c#6 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/extern.h#9 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/ls.1#23 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/ls.c#29 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/ls.h#10 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/print.c#22 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/util.c#12 integrate
.. //depot/projects/trustedbsd/mac/bin/mkdir/mkdir.1#5 integrate
.. //depot/projects/trustedbsd/mac/bin/mkdir/mkdir.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/mv/mv.1#8 integrate
.. //depot/projects/trustedbsd/mac/bin/mv/mv.c#12 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/ar_io.c#8 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/ar_subs.c#8 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/buf_subs.c#8 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/cache.c#8 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/cache.h#5 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/cpio.c#8 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/cpio.h#3 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/extern.h#5 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/file_subs.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/ftree.c#8 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/ftree.h#3 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/gen_subs.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/options.c#11 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/options.h#3 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/pat_rep.c#9 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/pat_rep.h#3 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/pax.1#8 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/pax.c#8 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/pax.h#7 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/sel_subs.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/sel_subs.h#3 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/tables.c#6 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/tables.h#5 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/tar.c#8 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/tar.h#3 integrate
.. //depot/projects/trustedbsd/mac/bin/pax/tty_subs.c#6 integrate
.. //depot/projects/trustedbsd/mac/bin/ps/extern.h#16 integrate
.. //depot/projects/trustedbsd/mac/bin/ps/fmt.c#10 integrate
.. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#20 integrate
.. //depot/projects/trustedbsd/mac/bin/ps/nlist.c#8 integrate
.. //depot/projects/trustedbsd/mac/bin/ps/print.c#23 integrate
.. //depot/projects/trustedbsd/mac/bin/ps/ps.1#20 integrate
.. //depot/projects/trustedbsd/mac/bin/ps/ps.c#20 integrate
.. //depot/projects/trustedbsd/mac/bin/ps/ps.h#8 integrate
.. //depot/projects/trustedbsd/mac/bin/pwd/pwd.1#9 integrate
.. //depot/projects/trustedbsd/mac/bin/pwd/pwd.c#10 integrate
.. //depot/projects/trustedbsd/mac/bin/rcp/extern.h#5 integrate
.. //depot/projects/trustedbsd/mac/bin/rcp/rcp.1#5 integrate
.. //depot/projects/trustedbsd/mac/bin/rcp/util.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/realpath/realpath.1#4 integrate
.. //depot/projects/trustedbsd/mac/bin/realpath/realpath.c#5 integrate
.. //depot/projects/trustedbsd/mac/bin/rm/rm.1#7 integrate
.. //depot/projects/trustedbsd/mac/bin/rm/rm.c#12 integrate
.. //depot/projects/trustedbsd/mac/bin/rmdir/rmdir.1#4 integrate
.. //depot/projects/trustedbsd/mac/bin/rmdir/rmdir.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/alias.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/alias.h#4 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/arith.h#5 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/arith.y#6 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/arith_lex.l#6 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/bltin/bltin.h#4 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/bltin/echo.1#5 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/bltin/echo.c#6 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/builtins.def#6 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/cd.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/cd.h#4 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/error.c#8 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/error.h#6 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/eval.c#10 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/eval.h#5 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/exec.c#10 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/exec.h#5 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/expand.c#13 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/expand.h#5 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/funcs/cmv#3 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/funcs/dirs#3 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/funcs/kill#3 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/funcs/login#3 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/funcs/newgrp#3 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/funcs/popd#3 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/funcs/pushd#3 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/funcs/suspend#3 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/histedit.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/init.h#4 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/input.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/input.h#4 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/jobs.c#16 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/jobs.h#6 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/mail.c#5 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/mail.h#4 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/main.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/main.h#4 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/memalloc.c#8 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/memalloc.h#4 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/miscbltin.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/mkbuiltins#6 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/mkinit.c#5 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/mknodes.c#6 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/mksyntax.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/mktokens#4 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/myhistedit.h#5 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/mystring.c#5 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/mystring.h#4 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/nodes.c.pat#7 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/nodetypes#4 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/options.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/options.h#5 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/output.c#8 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/output.h#6 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/parser.c#13 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/parser.h#4 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/redir.c#11 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/redir.h#5 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/sh.1#15 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/shell.h#6 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/show.c#8 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/show.h#4 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/trap.c#6 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/trap.h#5 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/var.c#9 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/var.h#6 integrate
.. //depot/projects/trustedbsd/mac/bin/sleep/sleep.1#4 integrate
.. //depot/projects/trustedbsd/mac/bin/sleep/sleep.c#7 integrate
.. //depot/projects/trustedbsd/mac/bin/stty/cchar.c#5 integrate
.. //depot/projects/trustedbsd/mac/bin/stty/extern.h#4 integrate
.. //depot/projects/trustedbsd/mac/bin/stty/gfmt.c#6 integrate
.. //depot/projects/trustedbsd/mac/bin/stty/key.c#5 integrate
.. //depot/projects/trustedbsd/mac/bin/stty/modes.c#5 integrate
.. //depot/projects/trustedbsd/mac/bin/stty/print.c#5 integrate
.. //depot/projects/trustedbsd/mac/bin/stty/stty.1#4 integrate
.. //depot/projects/trustedbsd/mac/bin/stty/stty.c#6 integrate
.. //depot/projects/trustedbsd/mac/bin/stty/stty.h#3 integrate
.. //depot/projects/trustedbsd/mac/bin/stty/util.c#5 integrate
.. //depot/projects/trustedbsd/mac/bin/sync/sync.8#5 integrate
.. //depot/projects/trustedbsd/mac/bin/sync/sync.c#6 integrate
.. //depot/projects/trustedbsd/mac/bin/test/test.1#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/NEWS#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/VERSION#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmpdef/gensnmpdef.1#1 branch
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmpdef/gensnmpdef.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.3#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/bsnmpagent.3#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/bsnmpclient.3#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/bsnmplib.3#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmpagent.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmpagent.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/snmp_mibII.3#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/action.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/bsnmpd.1#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/config.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/main.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpd.config#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpmod.3#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/trans_lsock.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/trap.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/com_err/ChangeLog#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/com_err/Makefile.am#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/com_err/Makefile.in#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/com_err/com_err.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/com_err/com_err.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/com_err/com_right.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/com_err/compile_et.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/com_err/compile_et.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/com_err/error.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/com_err/lex.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/com_err/lex.l#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/com_err/parse.y#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/com_err/roken_rename.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/AUTHORS#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/BUGS#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/ChangeLog#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/FAQ#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/INSTALL#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/Makefile.am#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/Makefile.in#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/NEWS#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/README#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/TESTS#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/TODO#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/acinclude.m4#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/aclocal.m4#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/config.h.in#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/configure#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/configure.in#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/ChangeLog#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/Makefile.am#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/check_cvs.in#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/commit_prep.in#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/cvs2vendor.sh#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/log_accum.in#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/rcs2log.sh#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/rcs2sccs.sh#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/sccs2rcs.in#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/depcomp#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/diff/ChangeLog#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/diff/Makefile.in#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/diff/diff.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/diff/diff3.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/diff/diffrun.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/diff/io.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/diff/system.h#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/diff/util.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/doc/ChangeLog#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/doc/Makefile.am#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/doc/Makefile.in#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/doc/cvs.texinfo#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/doc/cvsclient.texi#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/doc/stamp-1#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/doc/stamp-vti#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/doc/version-client.texi#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/doc/version.texi#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/lib/ChangeLog#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/lib/Makefile.am#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/lib/Makefile.in#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/lib/fncase.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/lib/getdate.y#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/lib/getpass.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/cvs/lib/mkdir.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/lib/regex.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/lib/system.h#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/lib/wait.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/man/ChangeLog#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/man/Makefile.am#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/man/Makefile.in#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/man/cvs.1#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/man/cvs.5#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/mktemp.sh#1 branch
.. //depot/projects/trustedbsd/mac/contrib/cvs/noautomake.sh#4 delete
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/ChangeLog#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/Makefile.am#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/add.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/admin.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/annotate.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/buffer.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/buffer.h#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/checkin.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/checkout.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/classify.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/client.c#7 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/client.h#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/commit.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/create_adm.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/cvs.h#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/cvsbug.in#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/cvsrc.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/diff.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/edit.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/edit.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/entries.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/error.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/expand_path.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/fileattr.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/fileattr.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/filesubr.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/find_names.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/hardlink.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/hash.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/hash.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/history.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/history.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/ignore.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/import.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/lock.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/log.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/login.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/logmsg.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/main.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/mkmodules.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/modules.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/myndbm.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/no_diff.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/parseinfo.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/patch.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/rcs.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/rcs.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/rcscmds.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/recurse.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/release.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/remove.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/repos.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/root.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/root.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/run.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/sanity.sh#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/server.c#7 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/server.h#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/stack.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/stack.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/status.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/subr.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/tag.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/update.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/update.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/vers_ts.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/watch.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/watch.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/wrapper.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/src/zlib.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/tools/ChangeLog#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/tools/Makefile.am#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/cvs/tools/Makefile.in#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-common#13 integrate
.. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-syms#7 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/LICENSE#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/Makefile.aut#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/Makefile.dsg#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/Makefile.in#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/NEWS#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/README#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/acconfig.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/less/brac.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/ch.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/charset.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/cmd.h#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/cmdbuf.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/command.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/configure#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/configure.ac#1 branch
.. //depot/projects/trustedbsd/mac/contrib/less/configure.in#4 delete
.. //depot/projects/trustedbsd/mac/contrib/less/decode.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/defines.ds#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/defines.h.in#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/defines.h.top#4 delete
.. //depot/projects/trustedbsd/mac/contrib/less/defines.o2#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/defines.wn#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/edit.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/filename.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/forwback.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/funcs.h#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/help.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/ifile.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/input.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/jump.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/less.h#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/less.hlp#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/less.man#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/less.nro#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/lessecho.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/lesskey.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/lesskey.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/lesskey.man#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/lesskey.nro#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/lglob.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/line.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/linenum.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/lsystem.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/main.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/mark.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/mkhelp.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/optfunc.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/option.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/option.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/opttbl.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/os.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/output.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/pckeys.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/position.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/position.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/prompt.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/screen.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/scrsize.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/search.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/signal.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/tags.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/ttyin.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/less/version.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/.cvsignore#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/CHANGES#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/CREDITS#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/FILES#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/INSTALL.txt#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/Makefile.in#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/README#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/README.Win32#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/README.aix#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/README.dag#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/README.hpux#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/VERSION#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/atmuni31.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/bpf/net/bpf.h#4 delete
.. //depot/projects/trustedbsd/mac/contrib/libpcap/bpf/net/bpf_filter.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/bpf_dump.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/bpf_image.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/config.guess#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/config.h.in#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/config.sub#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/configure#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/configure.in#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/etherent.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/fad-getad.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/fad-gifc.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/fad-glifc.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/fad-null.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/fad-win32.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/gencode.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/gencode.h#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/grammar.y#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/inet.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/lbl/os-aix4.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/lbl/os-hpux11.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/lbl/os-osf5.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/nametoaddr.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/nlpid.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/optimize.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-bpf.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-bpf.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-dag.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-dag.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-dlpi.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-enet.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-int.h#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-linux.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-nit.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-null.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-pf.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-snit.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-snoop.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-stdinc.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-win32.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap.3#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap.h#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/pf.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/rawss7.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/savefile.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/scanner.l#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/sll.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/libpcap/snprintf.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/libpcap/sunatmpos.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/fetch.c#7 integrate
.. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp.1#8 integrate
.. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp.c#7 integrate
.. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/progressbar.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/progressbar.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/util.c#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/version.h#6 integrate
.. //depot/projects/trustedbsd/mac/contrib/patch/COPYING#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/ChangeLog#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/FREEBSD-upgrade#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/INSTALL#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/Makefile.in#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/NEWS#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/README#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/acconfig.h#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/addext.c#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/argmatch.c#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/argmatch.h#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/backupfile.c#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/backupfile.h#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/basename.c#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/common.h#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/config.hin#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/configure#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/configure.in#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/getopt.c#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/getopt.h#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/getopt1.c#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/inp.c#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/inp.h#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/install-sh#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/maketime.c#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/maketime.h#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/partime.c#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/partime.h#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/patch.1#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/patch.c#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/pch.c#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/pch.h#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/quotearg.c#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/quotearg.h#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/util.c#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/util.h#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/version.c#2 delete
.. //depot/projects/trustedbsd/mac/contrib/patch/version.h#2 delete
.. //depot/projects/trustedbsd/mac/contrib/pf/man/pf.4#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/pf/man/pflog.4#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/pf/man/pfsync.4#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/sendmail/FREEBSD-upgrade#14 integrate
.. //depot/projects/trustedbsd/mac/contrib/smbfs/mount_smbfs/mount_smbfs.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/CHANGES#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/CREDITS#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/FILES#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/INSTALL#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/Makefile.in#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/README#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/Readme.Win32#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/VERSION#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/acconfig.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/addrtoname.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/aodv.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/appletalk.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/arcnet.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/atm.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/atmuni31.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/bootp.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/bpf_dump.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/config.guess#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/config.h.in#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/config.sub#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/configure#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/configure.in#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/decnet.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/enc.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/ether.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/ethertype.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/extract.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/fddi.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/gmpls.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/gmpls.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/gmt2local.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/icmp6.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/ieee802_11.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/igrp.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/interface.h#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/ip.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/ip6.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/ipfc.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/ipproto.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/ipsec_doi.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/ipx.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/isakmp.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/lane.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/lbl/os-osf4.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/llc.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/machdep.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/addrinfo.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/addrsize.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/bittypes.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/datalinks.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/dlnames.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/getaddrinfo.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/getnameinfo.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/inet_aton.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/inet_ntop.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/inet_pton.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/resolv6.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/resolv_ext.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/snprintf.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/sockstorage.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/strlcat.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/strlcpy.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/strsep.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/nameser.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/netbios.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/nfs.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/nfsfh.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/ntp.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/oakley.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/ospf.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/ospf6.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/oui.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/oui.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/parsenfsfh.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/pcap-missing.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/pf.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/ppp.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-802_11.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ah.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-aodv.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ap1394.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-arcnet.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-arp.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ascii.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-atalk.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-atm.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-beep.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-bfd.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-bgp.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-bootp.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-cdp.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-chdlc.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-cip.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-cnfp.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-decnet.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-dhcp6.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-domain.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-dvmrp.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-egp.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-enc.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-esp.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ether.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-fddi.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-fr.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-frag6.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-gre.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-hsrp.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-icmp.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-icmp6.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-igmp.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-igrp.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ip.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ip6.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ip6opts.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ipcomp.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ipfc.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ipx.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-isakmp.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-isoclns.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-krb.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-l2tp.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-lane.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-lcp.c#2 delete
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ldp.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-llc.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-lwres.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-mobile.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-mobility.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-mpls.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-msdp.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-netbios.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-nfs.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ntp.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-null.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ospf.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ospf6.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-pflog.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-pim.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ppp.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-pppoe.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-pptp.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-radius.c#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-raw.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-rip.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ripng.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-rsvp.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-rt6.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-rx.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sctp.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sl.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sll.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-smb.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-snmp.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-stp.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sunatm.c#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sunrpc.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-tcp.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-telnet.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-tftp.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-timed.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-token.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-udp.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-vjc.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-vrrp.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-wb.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-zephyr.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/route6d.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/rx.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/sctpConstants.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/sctpHeader.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/setsignal.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/sll.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/smb.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/smbutil.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/strcasecmp.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/tcp.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/tcpdump-stdinc.h#1 branch
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/tcpdump.1#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/tcpdump.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/telnet.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/timed.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/token.h#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/udp.h#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/util.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/vfprintf.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/traceroute/traceroute.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/ChangeLog#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/NEWS#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/TODO#3 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/acinclude.m4#2 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/aclocal.m4#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/admin/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/admin/ktutil.cat8#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/afsutil/ChangeLog#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/afsutil/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/afsutil/afslog.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ChangeLog#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/common/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftp/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftp/ftp.1#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftp/ftp.cat1#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftp/gssapi.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftp/main.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftp/security.h#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/ftpd.8#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/ftpd.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kf/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kf/kf.cat1#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kf/kfd.cat8#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/login/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/push/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/push/pfrom.cat1#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/push/push.cat8#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/rcp/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/rsh/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/rsh/rshd.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/su/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/ChangeLog#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnet/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnet/main.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnet/telnet.cat1#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnetd/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnetd/telnetd.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/test/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/ChangeLog#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/Makefile.am.common#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/aix.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/auth-modules.m4#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/broken-getaddrinfo.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/broken-getnameinfo.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/broken-glob.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/broken-realloc.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/broken-snprintf.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/c-attribute.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/c-function.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/capabilities.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/check-compile-et.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/check-declaration.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/check-getpwnam_r-posix.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/check-man.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/check-type-extra.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/check-x.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/check-xau.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/find-func-no-libs.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/find-func-no-libs2.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/find-func.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/find-if-not-broken.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/have-pragma-weak.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/have-struct-field.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/have-type.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/have-types.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-bigendian.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-func-getcwd-broken.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-func-getlogin.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-ipv6.m4#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-prog-ln-s.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-prog-ranlib.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-prog-yacc.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-readline.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-struct-spwd.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-struct-winsize.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-sys-aix.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-sys-nextstep.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-version.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/mips-abi.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/need-proto.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/osfc2.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/proto-compat.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/retsigtype.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/roken-frag.m4#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/roken.m4#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/test-package.m4#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/wflags.m4#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/config.guess#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/config.sub#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/configure#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/configure.in#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/doc/Makefile.am#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/doc/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/doc/ack.texi#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/doc/setup.texi#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/include/Makefile.in#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/include/config.h.in#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/include/kadm5/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/install-sh#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/kadmin.cat8#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/kadmind.cat8#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/config.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/connect.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/hprop.cat8#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/hpropd.cat8#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kaserver.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kdc.8#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kdc.cat8#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kdc_locl.h#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kerberos4.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kerberos5.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kstash.cat8#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/string2key.cat8#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kpasswd/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kpasswd/kpasswd.cat1#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kpasswd/kpasswdd.cat8#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/kdestroy.cat1#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/kgetcred.cat1#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/kinit.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/kinit.cat1#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/klist.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/klist.cat1#4 delete
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/45/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/Makefile.am#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/der_free.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/der_length.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/der_locl.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/gen_free.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/gen_length.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/pam/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/sia/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/com_err/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/8003.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/ChangeLog#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/Makefile.am#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/Makefile.in#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/accept_sec_context.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/acquire_cred.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/add_cred.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/arcfour.c#1 branch
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/arcfour.h#1 branch
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/context_time.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/decapsulate.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/encapsulate.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/get_mic.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/gssapi_locl.h#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/init_sec_context.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/release_cred.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/unwrap.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/verify_mic.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/wrap.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/hdb/Makefile.am#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/hdb/Makefile.in#6 integrate
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sun May 2 09:54:26 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0DD0D16A4D0; Sun, 2 May 2004 09:54:26 -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 D3DEF16A4CE
for <perforce@freebsd.org>; Sun, 2 May 2004 09:54:25 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id C758143D3F
for <perforce@freebsd.org>; Sun, 2 May 2004 09:54:25 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i42GsPGe011067
for <perforce@freebsd.org>; Sun, 2 May 2004 09:54:25 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i42GsPvK011064
for perforce@freebsd.org; Sun, 2 May 2004 09:54:25 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 2 May 2004 09:54:25 -0700 (PDT)
Message-Id: <200405021654.i42GsPvK011064@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52080 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: Sun, 02 May 2004 16:54:26 -0000
http://perforce.freebsd.org/chv.cgi?CH=52080
Change 52080 by rwatson@rwatson_paprika on 2004/05/02 09:53:26
Merged deletextattr and listextattr MAC entry points.
Merged ICMP and TCP reflect entry points.
Affected files ...
.. //depot/projects/trustedbsd/mac/MERGE#4 edit
Differences ...
==== //depot/projects/trustedbsd/mac/MERGE#4 (text+ko) ====
@@ -3,14 +3,6 @@
devfs changes to pass complete paths of objects into MAC Framework
for label initialization.
- mac_check_vnode_deletextattr()
-
- mac_check_vnode_listextattr()
-
- mac_reflect_mbuf_icmp()
-
- mac_reflect_mbuf_tcp()
-
LOMAC fixes
mac_test assertion updates
From owner-p4-projects@FreeBSD.ORG Sun May 2 10:39:21 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 1456F16A4D1; Sun, 2 May 2004 10:39:21 -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 E380F16A4CE
for <perforce@freebsd.org>; Sun, 2 May 2004 10:39:20 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id C7F8B43D58
for <perforce@freebsd.org>; Sun, 2 May 2004 10:39:20 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i42HdKGe020643
for <perforce@freebsd.org>; Sun, 2 May 2004 10:39:20 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i42HdKXm020639
for perforce@freebsd.org; Sun, 2 May 2004 10:39:20 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 2 May 2004 10:39:20 -0700 (PDT)
Message-Id: <200405021739.i42HdKXm020639@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52082 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: Sun, 02 May 2004 17:39:21 -0000
http://perforce.freebsd.org/chv.cgi?CH=52082
Change 52082 by rwatson@rwatson_tislabs on 2004/05/02 10:38:31
Submerge changes to LOMAC context lists -- entirely changes
in comments when merged.
Affected files ...
.. //depot/projects/trustedbsd/mac/share/security/lomac-policy.contexts#3 edit
Differences ...
==== //depot/projects/trustedbsd/mac/share/security/lomac-policy.contexts#3 (text+ko) ====
@@ -1,6 +1,7 @@
-# $FreeBSD$
-# This is a sample LOMAC policy based upon the PLM found in
-# src/sys/security/lomac/policy_plm.h. It may be configured on a
+# $FreeBSD: src/share/security/lomac-policy.contexts,v 1.1 2002/12/03 15:16:10 rwatson Exp $
+#
+# This is a sample LOMAC policy based upon the PLM defined in the
+# original FreeBSD LOMAC port. It may be configured on a
# system via setfsmac(8).
.* lomac/high
From owner-p4-projects@FreeBSD.ORG Sun May 2 10:48:33 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CE1F716A4D1; Sun, 2 May 2004 10:48:32 -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 A8ECB16A4CF
for <perforce@freebsd.org>; Sun, 2 May 2004 10:48:32 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 6C7DB43D39
for <perforce@freebsd.org>; Sun, 2 May 2004 10:48:32 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i42HmWGe022676
for <perforce@freebsd.org>; Sun, 2 May 2004 10:48:32 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i42HmWAv022673
for perforce@freebsd.org; Sun, 2 May 2004 10:48:32 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 2 May 2004 10:48:32 -0700 (PDT)
Message-Id: <200405021748.i42HmWAv022673@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52083 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: Sun, 02 May 2004 17:48:33 -0000
http://perforce.freebsd.org/chv.cgi?CH=52083
Change 52083 by rwatson@rwatson_paprika on 2004/05/02 10:47:40
Various updates: add new items, upgrade/downgrade items in
priority list, remove completed or OBE items.
Affected files ...
.. //depot/projects/trustedbsd/mac/MERGE#5 edit
Differences ...
==== //depot/projects/trustedbsd/mac/MERGE#5 (text+ko) ====
@@ -3,9 +3,28 @@
devfs changes to pass complete paths of objects into MAC Framework
for label initialization.
- LOMAC fixes
+ System V IPC, POSIX Semaphore ABI changes to avoid sharing user
+ and kernel structures. Probably need to remove module unload
+ changes for now.
+
+ System V IPC, POSIX Sempahore MAC changes to permit labeling
+ and access control by MAC policies.
+
+ ipcs(1) label support.
+
+ MAC_STATIC to optimize performance by removing locking that
+ supports dynamic policy changes, limiting the system to
+ statically loaded policies.
+
+ Removal of redundant suser check in kern_xxx.c
+
+ NFS client credential fixes.
+
+ Use inpcb in preference to socket as label source where possible
+ in netinet. This helps to avoid the need for socket label
+ locking in a number of important cases.
- mac_test assertion updates
+ id(1) label support.
Consider to merge TODO:
@@ -13,18 +32,12 @@
pseudofs uses MNT_MULTILABEL always.
- SAVESTART flag in kern_exec.c
-
mac_update_mbuf_from_cipso()
- Removal of redundant suser check in kern_xxx.c
-
sppp MAC support
ppp MAC support
- NFS client credential fixes.
-
Biba/MLS sequential compartment set support.
FFS resilience improvements for EA support
@@ -33,17 +46,41 @@
bsd_add_rule in libugidfw
- tty labeling
-
setfsmac in /sbin
fsck_ffs ea support
direct exec of rc
- security as a directory in /etc
+ acl.9 expansions
+
+ ls(1) labels without long form
+
+ mac_support.4 man page showing what is (and isn't) supported
+ with MAC.
+
+ sysinstall(8) support for multi-label file systems.
+
+Probably not to merge, at least not in current form:
+
+ security as a directory in /etc (note: mergemaster handles this
+ poorly).
+
+ Use multilabel md file systems in the diskless environment.
+
+ rc executable so that there's the possibility of a domain
+ transition from init.
+
+ tty labeling in login(1)/login.conf(5), init(8).
+
+ Build a MAC kernel by default, include in installs/releases.
+
+ setfsmac(8) reference in sbin rather than usr/sbin.
- acl.9 expansions
+ SAVESTART flag in kern_exec.c -- is this needed?
+ missingops?
+ truss(1) hexdump support?
+ inetd(8) resource limits and labels improvements.
From owner-p4-projects@FreeBSD.ORG Sun May 2 12:28:42 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0CF0D16A4D0; Sun, 2 May 2004 12:28:42 -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 C492916A4CE
for <perforce@freebsd.org>; Sun, 2 May 2004 12:28:41 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 9696A43D3F
for <perforce@freebsd.org>; Sun, 2 May 2004 12:28:41 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i42JSfGe046627
for <perforce@freebsd.org>; Sun, 2 May 2004 12:28:41 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i42JSf6L046624
for perforce@freebsd.org; Sun, 2 May 2004 12:28:41 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 2 May 2004 12:28:41 -0700 (PDT)
Message-Id: <200405021928.i42JSf6L046624@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52091 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: Sun, 02 May 2004 19:28:42 -0000
http://perforce.freebsd.org/chv.cgi?CH=52091
Change 52091 by rwatson@rwatson_tislabs on 2004/05/02 12:28:04
Set up a real integration between GENERIC and MAC. Attempt
to comment out rather than delete unsupported features.
Affected files ...
.. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#53 integrate
Differences ...
==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#53 (text+ko) ====
@@ -16,17 +16,16 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.398 2004/03/15 00:49:40 obrien Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.402 2004/04/26 22:52:09 sobomax Exp $
machine i386
cpu I486_CPU
cpu I586_CPU
cpu I686_CPU
ident MAC
-maxusers 0
-#To statically compile in device wiring instead of /boot/device.hints
-#hints "MAC.hints" # Default places to look for devices.
+# To statically compile in device wiring instead of /boot/device.hints
+#hints "GENERIC.hints" # Default places to look for devices.
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
@@ -48,6 +47,7 @@
options UFS_DIRHASH # Improve performance on big directories
options MD_ROOT # MD is a potential root device
options NFSCLIENT # Network Filesystem Client
+#options NFSSERVER # Network Filesystem Server
options NFS_ROOT # NFS usable as /, requires NFSCLIENT
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
@@ -79,8 +79,9 @@
# To make an SMP kernel, the next two are needed
options SMP # Symmetric MultiProcessor Kernel
-device apic # I/O APIC
+device apic # I/O APIC
+# Bus support. Do not remove isa, even if you have no isa slots
device isa
device eisa
device pci
@@ -135,6 +136,7 @@
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
+device twa # 3ware 9000 series PATA/SATA RAID
# RAID controllers
device aac # Adaptec FSA RAID
@@ -192,7 +194,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
# line to enable it (connects to the sio and/or ppc drivers):
-#device puc
+#device puc
# PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (``Tulip'')
@@ -208,10 +210,11 @@
device dc # DEC/Intel 21143 and various workalikes
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc')
+device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
device sf # Adaptec AIC-6915 (``Starfire'')
device sis # Silicon Integrated Systems SiS 900/SiS 7016
-device sk # SysKonnect SK-984x and SK-982x gigabit ethernet
+device sk # SysKonnect SK-984x & SK-982x gigabit ethernet
device ste # Sundance ST201 (D-Link DFE-550TX)
device ti # Alteon Networks Tigon I/II gigabit ethernet
device tl # Texas Instruments ThunderLAN
@@ -221,7 +224,7 @@
device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
device bge # Broadcom BCM570xx Gigabit Ethernet
-# ISA Ethernet NICs. pccard nics included.
+# ISA Ethernet NICs. pccard NICs included.
device cs # Crystal Semiconductor CS89x0 NIC
# 'device ed' requires 'device miibus'
device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards
@@ -238,7 +241,7 @@
# Wireless NIC cards
device wlan # 802.11 support
-device an # Aironet 4500/4800 802.11 wireless NICs.
+device an # Aironet 4500/4800 802.11 wireless NICs.
device awi # BayStack 660 and others
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
#device wl # Older non 802.11 Wavelan wireless NIC.
@@ -247,6 +250,8 @@
device random # Entropy device
device loop # Network loopback
device ether # Ethernet support
+#device sl # Kernel SLIP
+#device ppp # Kernel PPP
device tun # Packet tunnel.
device pty # Pseudo-ttys (telnet etc)
device md # Memory "disks"
@@ -273,6 +278,7 @@
device axe # ASIX Electronics USB ethernet
device cue # CATC USB ethernet
device kue # Kawasaki LSI USB ethernet
+device rue # RealTek RTL8150 USB ethernet
# FireWire support
device firewire # FireWire bus code
From owner-p4-projects@FreeBSD.ORG Sun May 2 13:13:38 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id E7F0F16A4D1; Sun, 2 May 2004 13:13:37 -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 AA43216A4CF
for <perforce@freebsd.org>; Sun, 2 May 2004 13:13:37 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 8812443D39
for <perforce@freebsd.org>; Sun, 2 May 2004 13:13:37 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i42KDbGe064199
for <perforce@freebsd.org>; Sun, 2 May 2004 13:13:37 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i42KDb2h064196
for perforce@freebsd.org; Sun, 2 May 2004 13:13:37 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 2 May 2004 13:13:37 -0700 (PDT)
Message-Id: <200405022013.i42KDb2h064196@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52094 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: Sun, 02 May 2004 20:13:38 -0000
http://perforce.freebsd.org/chv.cgi?CH=52094
Change 52094 by rwatson@rwatson_paprika on 2004/05/02 13:13:22
Add a central TODO list.
Affected files ...
.. //depot/projects/trustedbsd/mac/TODO#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Sun May 2 13:17:43 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6B16A16A4D0; Sun, 2 May 2004 13:17:43 -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 4698F16A4CE
for <perforce@freebsd.org>; Sun, 2 May 2004 13:17:43 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 30D0243D1F
for <perforce@freebsd.org>; Sun, 2 May 2004 13:17:43 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i42KHgGe064316
for <perforce@freebsd.org>; Sun, 2 May 2004 13:17:42 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i42KHgde064313
for perforce@freebsd.org; Sun, 2 May 2004 13:17:42 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 2 May 2004 13:17:42 -0700 (PDT)
Message-Id: <200405022017.i42KHgde064313@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52095 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: Sun, 02 May 2004 20:17:43 -0000
http://perforce.freebsd.org/chv.cgi?CH=52095
Change 52095 by rwatson@rwatson_paprika on 2004/05/02 13:17:19
Add some tasks.
Affected files ...
.. //depot/projects/trustedbsd/mac/TODO#2 edit
Differences ...
==== //depot/projects/trustedbsd/mac/TODO#2 (text+ko) ====
@@ -1,3 +1,27 @@
-Date Added Task Description
----------- ---- -----------
+Date Task Description
+-------- ---- -----------
+20040502 P_SUGID.optional Currently, policies can cause the
+ setting of P_SUGID on processes when
+ they manipulate the credential.
+ However, this may be inappropriate
+ for policies that track information
+ flow control in an advisory form.
+ The MAC Framework should make the
+ decision to set P_SUGID explicit
+ rather than implicit.
+
+20040502 netinet6.support Currently, TCP/IP with IPv4 is
+ fully supported; however, IPv6 is
+ not as a number of components do
+ not properly propagate labels across
+ mbuf alloc/copy operations, proper
+ checks may not occur in socket
+ delivery, etc.
+
+20040502 netatalk.support Currently, netatalk is poorly
+ supported under MAC, as most I/O
+ operations are performed using
+ socket labels rather than DDP
+ PCBs as found in IPv4.
+
From owner-p4-projects@FreeBSD.ORG Sun May 2 14:56:47 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 3405716A4D0; Sun, 2 May 2004 14:56:47 -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 E388216A4CE
for <perforce@freebsd.org>; Sun, 2 May 2004 14:56:46 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 7D7BA43D49
for <perforce@freebsd.org>; Sun, 2 May 2004 14:56:46 -0700 (PDT)
(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i42LukGe086948
for <perforce@freebsd.org>; Sun, 2 May 2004 14:56:46 -0700 (PDT)
(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i42Lukij086945
for perforce@freebsd.org; Sun, 2 May 2004 14:56:46 -0700 (PDT)
(envelope-from julian@freebsd.org)
Date: Sun, 2 May 2004 14:56:46 -0700 (PDT)
Message-Id: <200405022156.i42Lukij086945@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52101 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: Sun, 02 May 2004 21:56:48 -0000
http://perforce.freebsd.org/chv.cgi?CH=52101
Change 52101 by julian@julian_desk on 2004/05/02 14:56:01
split kern_thread.c into 2 files
kern_thread.c contains only code that is not specific to any
particular threading implemntation..
kern_kse.c contains code specific to the KSE threading
implimentation.
The split is not quite perfect and it almost certainly doesn't
compile yet.
Affected files ...
.. //depot/projects/nsched/sys/conf/files#6 edit
.. //depot/projects/nsched/sys/kern/kern_kse.c#1 add
.. //depot/projects/nsched/sys/kern/kern_thread.c#8 edit
Differences ...
==== //depot/projects/nsched/sys/conf/files#6 (text+ko) ====
@@ -1044,7 +1044,7 @@
kern/kern_idle.c standard
kern/kern_intr.c standard
kern/kern_jail.c standard
-kern/kern_thr.c standard
+kern/kern_kse.c standard
kern/kern_kthread.c standard
kern/kern_ktr.c optional ktr
kern/kern_ktrace.c standard
@@ -1071,6 +1071,7 @@
kern/kern_syscalls.c standard
kern/kern_sysctl.c standard
kern/kern_tc.c standard
+kern/kern_thr.c standard
kern/kern_thread.c standard
kern/kern_time.c standard
kern/kern_timeout.c standard
==== //depot/projects/nsched/sys/kern/kern_thread.c#8 (text+ko) ====
@@ -91,8 +91,6 @@
TAILQ_HEAD(, thread) zombie_threads = TAILQ_HEAD_INITIALIZER(zombie_threads);
TAILQ_HEAD(, ksegrp) zombie_ksegrps = TAILQ_HEAD_INITIALIZER(zombie_ksegrps);
-TAILQ_HEAD(, kse_upcall) zombie_upcalls =
- TAILQ_HEAD_INITIALIZER(zombie_upcalls);
struct mtx kse_zombie_lock;
MTX_SYSINIT(kse_zombie_lock, &kse_zombie_lock, "kse zombie lock", MTX_SPIN);
@@ -332,56 +330,6 @@
ksegrp_stash(kg);
}
-struct kse_upcall *
-upcall_alloc(void)
-{
- struct kse_upcall *ku;
-
- ku = uma_zalloc(upcall_zone, M_WAITOK);
- bzero(ku, sizeof(*ku));
- return (ku);
-}
-
-void
-upcall_free(struct kse_upcall *ku)
-{
-
- uma_zfree(upcall_zone, ku);
-}
-
-void
-upcall_link(struct kse_upcall *ku, struct ksegrp *kg)
-{
-
- mtx_assert(&sched_lock, MA_OWNED);
- TAILQ_INSERT_TAIL(&kg->kg_upcalls, ku, ku_link);
- ku->ku_ksegrp = kg;
- kg->kg_numupcalls++;
-}
-
-void
-upcall_unlink(struct kse_upcall *ku)
-{
- struct ksegrp *kg = ku->ku_ksegrp;
-
- mtx_assert(&sched_lock, MA_OWNED);
- KASSERT(ku->ku_owner == NULL, ("%s: have owner", __func__));
- TAILQ_REMOVE(&kg->kg_upcalls, ku, ku_link);
- kg->kg_numupcalls--;
- upcall_stash(ku);
-}
-
-void
-upcall_remove(struct thread *td)
-{
-
- if (td->td_upcall) {
- td->td_upcall->ku_owner = NULL;
- upcall_unlink(td->td_upcall);
- td->td_upcall = 0;
- }
-}
-
/*
* For a newly created process,
* link up all the structures and its initial threads etc.
@@ -411,441 +359,6 @@
};
#endif
-int
-kse_switchin(struct thread *td, struct kse_switchin_args *uap)
-{
- mcontext_t mc;
- int error;
-
- error = (uap->mcp == NULL) ? EINVAL : 0;
- if (!error)
- error = copyin(uap->mcp, &mc, sizeof(mc));
- if (!error && uap->loc != NULL)
- error = (suword(uap->loc, uap->val) != 0) ? EINVAL : 0;
- if (!error)
- error = set_mcontext(td, &mc);
- return ((error == 0) ? EJUSTRETURN : error);
-}
-
-/*
-struct kse_thr_interrupt_args {
- struct kse_thr_mailbox * tmbx;
- int cmd;
- long data;
-};
-*/
-int
-kse_thr_interrupt(struct thread *td, struct kse_thr_interrupt_args *uap)
-{
- struct proc *p;
- struct thread *td2;
-
- p = td->td_proc;
-
- if (!(p->p_flag & P_SA))
- return (EINVAL);
-
- switch (uap->cmd) {
- case KSE_INTR_SENDSIG:
- if (uap->data < 0 || uap->data > _SIG_MAXSIG)
- return (EINVAL);
- case KSE_INTR_INTERRUPT:
- case KSE_INTR_RESTART:
- PROC_LOCK(p);
- mtx_lock_spin(&sched_lock);
- FOREACH_THREAD_IN_PROC(p, td2) {
- if (td2->td_mailbox == uap->tmbx)
- break;
- }
- if (td2 == NULL) {
- mtx_unlock_spin(&sched_lock);
- PROC_UNLOCK(p);
- return (ESRCH);
- }
- if (uap->cmd == KSE_INTR_SENDSIG) {
- if (uap->data > 0) {
- td2->td_flags &= ~TDF_INTERRUPT;
- mtx_unlock_spin(&sched_lock);
- tdsignal(td2, (int)uap->data, SIGTARGET_TD);
- } else {
- mtx_unlock_spin(&sched_lock);
- }
- } else {
- td2->td_flags |= TDF_INTERRUPT | TDF_ASTPENDING;
- if (TD_CAN_UNBIND(td2))
- td2->td_upcall->ku_flags |= KUF_DOUPCALL;
- if (uap->cmd == KSE_INTR_INTERRUPT)
- td2->td_intrval = EINTR;
- else
- td2->td_intrval = ERESTART;
- if (TD_ON_SLEEPQ(td2) && (td2->td_flags & TDF_SINTR))
- sleepq_abort(td2);
- mtx_unlock_spin(&sched_lock);
- }
- PROC_UNLOCK(p);
- break;
- case KSE_INTR_SIGEXIT:
- if (uap->data < 1 || uap->data > _SIG_MAXSIG)
- return (EINVAL);
- PROC_LOCK(p);
- sigexit(td, (int)uap->data);
- break;
- default:
- return (EINVAL);
- }
- return (0);
-}
-
-/*
-struct kse_exit_args {
- register_t dummy;
-};
-*/
-int
-kse_exit(struct thread *td, struct kse_exit_args *uap)
-{
- struct proc *p;
- struct ksegrp *kg;
- struct kse_upcall *ku, *ku2;
- int error, count;
-
- p = td->td_proc;
- if ((ku = td->td_upcall) == NULL || TD_CAN_UNBIND(td))
- return (EINVAL);
- kg = td->td_ksegrp;
- count = 0;
- PROC_LOCK(p);
- mtx_lock_spin(&sched_lock);
- FOREACH_UPCALL_IN_GROUP(kg, ku2) {
- if (ku2->ku_flags & KUF_EXITING)
- count++;
- }
- if ((kg->kg_numupcalls - count) == 1 &&
- (kg->kg_numthreads > 1)) {
- mtx_unlock_spin(&sched_lock);
- PROC_UNLOCK(p);
- return (EDEADLK);
- }
- ku->ku_flags |= KUF_EXITING;
- mtx_unlock_spin(&sched_lock);
- PROC_UNLOCK(p);
- error = suword(&ku->ku_mailbox->km_flags, ku->ku_mflags|KMF_DONE);
- PROC_LOCK(p);
- if (error)
- psignal(p, SIGSEGV);
- mtx_lock_spin(&sched_lock);
- upcall_remove(td);
- if (p->p_numthreads == 1) {
- kse_purge(p, td);
- p->p_flag &= ~P_SA;
- mtx_unlock_spin(&sched_lock);
- PROC_UNLOCK(p);
- } else {
- if (kg->kg_numthreads == 1) { /* Shutdown a group */
- kse_purge_group(td);
- sched_exit_ksegrp(p->p_pptr, td);
- }
- thread_stopped(p);
- thread_exit();
- /* NOTREACHED */
- }
- return (0);
-}
-
-/*
- * Either becomes an upcall or waits for an awakening event and
- * then becomes an upcall. Only error cases return.
- */
-/*
-struct kse_release_args {
- struct timespec *timeout;
-};
-*/
-int
-kse_release(struct thread *td, struct kse_release_args *uap)
-{
- struct proc *p;
- struct ksegrp *kg;
- struct kse_upcall *ku;
- struct timespec timeout;
- struct timeval tv;
- sigset_t sigset;
- int error;
-
- p = td->td_proc;
- kg = td->td_ksegrp;
- if ((ku = td->td_upcall) == NULL || TD_CAN_UNBIND(td))
- return (EINVAL);
- if (uap->timeout != NULL) {
- if ((error = copyin(uap->timeout, &timeout, sizeof(timeout))))
- return (error);
- TIMESPEC_TO_TIMEVAL(&tv, &timeout);
- }
- if (td->td_flags & TDF_SA)
- td->td_pflags |= TDP_UPCALLING;
- else {
- ku->ku_mflags = fuword(&ku->ku_mailbox->km_flags);
- if (ku->ku_mflags == -1) {
- PROC_LOCK(p);
- sigexit(td, SIGSEGV);
- }
- }
- PROC_LOCK(p);
- if (ku->ku_mflags & KMF_WAITSIGEVENT) {
- /* UTS wants to wait for signal event */
- if (!(p->p_flag & P_SIGEVENT) && !(ku->ku_flags & KUF_DOUPCALL))
- error = msleep(&p->p_siglist, &p->p_mtx, PPAUSE|PCATCH,
- "ksesigwait", (uap->timeout ? tvtohz(&tv) : 0));
- p->p_flag &= ~P_SIGEVENT;
- sigset = p->p_siglist;
- PROC_UNLOCK(p);
- error = copyout(&sigset, &ku->ku_mailbox->km_sigscaught,
- sizeof(sigset));
- } else {
- if (! kg->kg_completed && !(ku->ku_flags & KUF_DOUPCALL)) {
- kg->kg_upsleeps++;
- error = msleep(&kg->kg_completed, &p->p_mtx,
- PPAUSE|PCATCH, "kserel",
- (uap->timeout ? tvtohz(&tv) : 0));
- kg->kg_upsleeps--;
- }
- PROC_UNLOCK(p);
- }
- if (ku->ku_flags & KUF_DOUPCALL) {
- mtx_lock_spin(&sched_lock);
- ku->ku_flags &= ~KUF_DOUPCALL;
- mtx_unlock_spin(&sched_lock);
- }
- return (0);
-}
-
-/* struct kse_wakeup_args {
- struct kse_mailbox *mbx;
-}; */
-int
-kse_wakeup(struct thread *td, struct kse_wakeup_args *uap)
-{
- struct proc *p;
- struct ksegrp *kg;
- struct kse_upcall *ku;
- struct thread *td2;
-
- p = td->td_proc;
- td2 = NULL;
- ku = NULL;
- /* kSE-enabled processes only, please. */
- if (!(p->p_flag & P_SA))
- return (EINVAL);
- PROC_LOCK(p);
- mtx_lock_spin(&sched_lock);
- if (uap->mbx) {
- FOREACH_KSEGRP_IN_PROC(p, kg) {
- FOREACH_UPCALL_IN_GROUP(kg, ku) {
- if (ku->ku_mailbox == uap->mbx)
- break;
- }
- if (ku)
- break;
- }
- } else {
- kg = td->td_ksegrp;
- if (kg->kg_upsleeps) {
- wakeup_one(&kg->kg_completed);
- mtx_unlock_spin(&sched_lock);
- PROC_UNLOCK(p);
- return (0);
- }
- ku = TAILQ_FIRST(&kg->kg_upcalls);
- }
- if (ku) {
- if ((td2 = ku->ku_owner) == NULL) {
- panic("%s: no owner", __func__);
- } else if (TD_ON_SLEEPQ(td2) && (td2->td_flags & TDF_SINTR) &&
- ((td2->td_wchan == &kg->kg_completed) ||
- (td2->td_wchan == &p->p_siglist &&
- (ku->ku_mflags & KMF_WAITSIGEVENT)))) {
- sleepq_abort(td2);
- } else {
- ku->ku_flags |= KUF_DOUPCALL;
- }
- mtx_unlock_spin(&sched_lock);
- PROC_UNLOCK(p);
- return (0);
- }
- mtx_unlock_spin(&sched_lock);
- PROC_UNLOCK(p);
- return (ESRCH);
-}
-
-/*
- * No new KSEG: first call: use current KSE, don't schedule an upcall
- * All other situations, do allocate max new KSEs and schedule an upcall.
- */
-/* struct kse_create_args {
- struct kse_mailbox *mbx;
- int newgroup;
-}; */
-int
-kse_create(struct thread *td, struct kse_create_args *uap)
-{
- struct ksegrp *newkg;
- struct ksegrp *kg;
- struct proc *p;
- struct kse_mailbox mbx;
- struct kse_upcall *newku;
- int err, ncpus, sa = 0, first = 0;
- struct thread *newtd;
-
- p = td->td_proc;
- if ((err = copyin(uap->mbx, &mbx, sizeof(mbx))))
- return (err);
-
- ncpus = mp_ncpus;
- if (virtual_cpu != 0)
- ncpus = virtual_cpu;
- if (!(mbx.km_flags & KMF_BOUND))
- sa = TDF_SA;
- else
- ncpus = 1;
- PROC_LOCK(p);
- if (!(p->p_flag & P_SA)) {
- first = 1;
- p->p_flag |= P_SA;
- }
- PROC_UNLOCK(p);
- if (!sa && !uap->newgroup && !first)
- return (EINVAL);
- kg = td->td_ksegrp;
- if (uap->newgroup) {
- /* Have race condition but it is cheap */
- if (p->p_numksegrps >= max_groups_per_proc)
- return (EPROCLIM);
- /*
- * If we want a new KSEGRP it doesn't matter whether
- * we have already fired up KSE mode before or not.
- * We put the process in KSE mode and create a new KSEGRP.
- */
- newkg = ksegrp_alloc();
- bzero(&newkg->kg_startzero, RANGEOF(struct ksegrp,
- kg_startzero, kg_endzero));
- bcopy(&kg->kg_startcopy, &newkg->kg_startcopy,
- RANGEOF(struct ksegrp, kg_startcopy, kg_endcopy));
- PROC_LOCK(p);
- mtx_lock_spin(&sched_lock);
- if (p->p_numksegrps >= max_groups_per_proc) {
- mtx_unlock_spin(&sched_lock);
- PROC_UNLOCK(p);
- ksegrp_free(newkg);
- return (EPROCLIM);
- }
- ksegrp_link(newkg, p);
- sched_fork_ksegrp(td, newkg);
- mtx_unlock_spin(&sched_lock);
- PROC_UNLOCK(p);
- } else {
- if (!first && ((td->td_flags & TDF_SA) ^ sa) != 0)
- return (EINVAL);
- newkg = kg;
- }
-
- /*
- * Creating upcalls more than number of physical cpu does
- * not help performance.
- */
- if (newkg->kg_numupcalls >= ncpus)
- return (EPROCLIM);
-
- if (newkg->kg_numupcalls == 0) {
- /*
- * Initialize KSE group
- *
- * For multiplxed group, set concurrancy equal to physical
- * cpus. This increases concurrent even if userland
- * is not MP safe and can only run on single CPU.
- * In ideal world, every physical cpu should execute a thread.
- * If there is enough KSEs, threads in kernel can be
- * executed parallel on different cpus with full speed,
- * Concurrent in kernel shouldn't be restricted by number of
- * upcalls userland provides. Adding more upcall structures
- * only increases concurrent in userland.
- *
- * For bound thread group, because there is only thread in the
- * group, we only create one KSE for the group. Thread in this
- * kind of group will never schedule an upcall when blocked,
- * this intends to simulate pthread system scope thread.
- */
- sched_set_concurrancy(newkg, ncpus);
- }
- newku = upcall_alloc();
- newku->ku_mailbox = uap->mbx;
- newku->ku_func = mbx.km_func;
- bcopy(&mbx.km_stack, &newku->ku_stack, sizeof(stack_t));
-
- /* For the first call this may not have been set */
- if (td->td_standin == NULL)
- thread_alloc_spare(td, NULL);
-
- PROC_LOCK(p);
- if (newkg->kg_numupcalls >= ncpus) {
- PROC_UNLOCK(p);
- upcall_free(newku);
- return (EPROCLIM);
- }
- if (first && sa) {
- SIGSETOR(p->p_siglist, td->td_siglist);
- SIGEMPTYSET(td->td_siglist);
- SIGFILLSET(td->td_sigmask);
- SIG_CANTMASK(td->td_sigmask);
- }
- mtx_lock_spin(&sched_lock);
- PROC_UNLOCK(p);
- upcall_link(newku, newkg);
- if (mbx.km_quantum)
- newkg->kg_upquantum = max(1, mbx.km_quantum/tick);
-
- /*
- * Each upcall structure has an owner thread, find which
- * one owns it.
- */
- if (uap->newgroup) {
- /*
- * Because new ksegrp hasn't thread,
- * create an initial upcall thread to own it.
- */
- newtd = thread_schedule_upcall(td, newku);
- } else {
- /*
- * If current thread hasn't an upcall structure,
- * just assign the upcall to it.
- */
- if (td->td_upcall == NULL) {
- newku->ku_owner = td;
- td->td_upcall = newku;
- newtd = td;
- } else {
- /*
- * Create a new upcall thread to own it.
- */
- newtd = thread_schedule_upcall(td, newku);
- }
- }
- if (!sa) {
- newtd->td_mailbox = mbx.km_curthread;
- newtd->td_flags &= ~TDF_SA;
- if (newtd != td) {
- mtx_unlock_spin(&sched_lock);
- cpu_set_upcall_kse(newtd, newku);
- mtx_lock_spin(&sched_lock);
- }
- } else {
- newtd->td_flags |= TDF_SA;
- }
- if (newtd != td)
- setrunqueue(newtd);
- mtx_unlock_spin(&sched_lock);
- return (0);
-}
-
/*
* Initialize global thread allocation resources.
*/
@@ -861,8 +374,6 @@
ksegrp_zone = uma_zcreate("KSEGRP", sched_sizeof_ksegrp(),
ksegrp_ctor, ksegrp_dtor, ksegrp_init, NULL,
UMA_ALIGN_CACHE, 0);
- upcall_zone = uma_zcreate("UPCALL", sizeof(struct kse_upcall),
- NULL, NULL, NULL, NULL, UMA_ALIGN_CACHE, 0);
}
/*
@@ -876,19 +387,6 @@
mtx_unlock_spin(&kse_zombie_lock);
}
-
-/*
- * Stash an embarasingly extra upcall into the zombie upcall queue.
- */
-
-void
-upcall_stash(struct kse_upcall *ku)
-{
- mtx_lock_spin(&kse_zombie_lock);
- TAILQ_INSERT_HEAD(&zombie_upcalls, ku, ku_link);
- mtx_unlock_spin(&kse_zombie_lock);
-}
-
/*
* Stash an embarasingly extra ksegrp into the zombie ksegrp queue.
*/
@@ -908,25 +406,20 @@
{
struct thread *td_first, *td_next;
struct ksegrp *kg_first, * kg_next;
- struct kse_upcall *ku_first, *ku_next;
/*
* Don't even bother to lock if none at this instant,
* we really don't care about the next instant..
*/
if ((!TAILQ_EMPTY(&zombie_threads))
- || (!TAILQ_EMPTY(&zombie_ksegrps))
- || (!TAILQ_EMPTY(&zombie_upcalls))) {
+ || (!TAILQ_EMPTY(&zombie_ksegrps))) {
mtx_lock_spin(&kse_zombie_lock);
td_first = TAILQ_FIRST(&zombie_threads);
kg_first = TAILQ_FIRST(&zombie_ksegrps);
- ku_first = TAILQ_FIRST(&zombie_upcalls);
if (td_first)
TAILQ_INIT(&zombie_threads);
if (kg_first)
TAILQ_INIT(&zombie_ksegrps);
- if (ku_first)
- TAILQ_INIT(&zombie_upcalls);
mtx_unlock_spin(&kse_zombie_lock);
while (td_first) {
td_next = TAILQ_NEXT(td_first, td_runq);
@@ -940,13 +433,9 @@
ksegrp_free(kg_first);
kg_first = kg_next;
}
- while (ku_first) {
- ku_next = TAILQ_NEXT(ku_first, ku_link);
- upcall_free(ku_first);
- ku_first = ku_next;
- }
+ sched_GC();
+ kse_GC();
}
- sched_GC();
}
/*
@@ -1036,202 +525,6 @@
}
/*
- * Store the thread context in the UTS's mailbox.
- * then add the mailbox at the head of a list we are building in user space.
- * The list is anchored in the ksegrp structure.
- */
-int
-thread_export_context(struct thread *td, int willexit)
-{
- struct proc *p;
- struct ksegrp *kg;
- uintptr_t mbx;
- void *addr;
- int error = 0, temp, sig;
- mcontext_t mc;
-
- p = td->td_proc;
- kg = td->td_ksegrp;
-
- /* Export the user/machine context. */
- get_mcontext(td, &mc, 0);
- addr = (void *)(&td->td_mailbox->tm_context.uc_mcontext);
- error = copyout(&mc, addr, sizeof(mcontext_t));
- if (error)
- goto bad;
-
- /* Exports clock ticks in kernel mode */
- addr = (caddr_t)(&td->td_mailbox->tm_sticks);
- temp = fuword32(addr) + td->td_usticks;
- if (suword32(addr, temp)) {
- error = EFAULT;
- goto bad;
- }
-
- /*
- * Post sync signal, or process SIGKILL and SIGSTOP.
- * For sync signal, it is only possible when the signal is not
- * caught by userland or process is being debugged.
- */
- PROC_LOCK(p);
- if (td->td_flags & TDF_NEEDSIGCHK) {
- mtx_lock_spin(&sched_lock);
- td->td_flags &= ~TDF_NEEDSIGCHK;
- mtx_unlock_spin(&sched_lock);
- mtx_lock(&p->p_sigacts->ps_mtx);
- while ((sig = cursig(td)) != 0)
- postsig(sig);
- mtx_unlock(&p->p_sigacts->ps_mtx);
- }
- if (willexit)
- SIGFILLSET(td->td_sigmask);
- PROC_UNLOCK(p);
-
- /* Get address in latest mbox of list pointer */
- addr = (void *)(&td->td_mailbox->tm_next);
- /*
- * Put the saved address of the previous first
- * entry into this one
- */
- for (;;) {
- mbx = (uintptr_t)kg->kg_completed;
- if (suword(addr, mbx)) {
- error = EFAULT;
- goto bad;
- }
- PROC_LOCK(p);
- if (mbx == (uintptr_t)kg->kg_completed) {
- kg->kg_completed = td->td_mailbox;
- /*
- * The thread context may be taken away by
- * other upcall threads when we unlock
- * process lock. it's no longer valid to
- * use it again in any other places.
- */
- td->td_mailbox = NULL;
- PROC_UNLOCK(p);
- break;
- }
- PROC_UNLOCK(p);
- }
- td->td_usticks = 0;
- return (0);
-
-bad:
- PROC_LOCK(p);
- sigexit(td, SIGILL);
- return (error);
-}
-
-/*
- * Take the list of completed mailboxes for this KSEGRP and put them on this
- * upcall's mailbox as it's the next one going up.
- */
-static int
-thread_link_mboxes(struct ksegrp *kg, struct kse_upcall *ku)
-{
- struct proc *p = kg->kg_proc;
- void *addr;
- uintptr_t mbx;
-
- addr = (void *)(&ku->ku_mailbox->km_completed);
- for (;;) {
- mbx = (uintptr_t)kg->kg_completed;
- if (suword(addr, mbx)) {
- PROC_LOCK(p);
- psignal(p, SIGSEGV);
- PROC_UNLOCK(p);
- return (EFAULT);
- }
- PROC_LOCK(p);
- if (mbx == (uintptr_t)kg->kg_completed) {
- kg->kg_completed = NULL;
- PROC_UNLOCK(p);
- break;
- }
- PROC_UNLOCK(p);
- }
- return (0);
-}
-
-/*
- * This function should be called at statclock interrupt time
- */
-int
-thread_statclock(int user)
-{
- struct thread *td = curthread;
- struct ksegrp *kg = td->td_ksegrp;
-
- if (kg->kg_numupcalls == 0 || !(td->td_flags & TDF_SA))
- return (0);
- if (user) {
- /* Current always do via ast() */
- mtx_lock_spin(&sched_lock);
- td->td_flags |= (TDF_USTATCLOCK|TDF_ASTPENDING);
- mtx_unlock_spin(&sched_lock);
- td->td_uuticks++;
- } else {
- if (td->td_mailbox != NULL)
- td->td_usticks++;
- else {
- /* XXXKSE
- * We will call thread_user_enter() for every
- * kernel entry in future, so if the thread mailbox
- * is NULL, it must be a UTS kernel, don't account
- * clock ticks for it.
- */
- }
- }
- return (0);
-}
-
-/*
- * Export state clock ticks for userland
- */
-static int
-thread_update_usr_ticks(struct thread *td, int user)
-{
- struct proc *p = td->td_proc;
- struct kse_thr_mailbox *tmbx;
- struct kse_upcall *ku;
- struct ksegrp *kg;
- caddr_t addr;
- u_int uticks;
-
- if ((ku = td->td_upcall) == NULL)
- return (-1);
-
- tmbx = (void *)fuword((void *)&ku->ku_mailbox->km_curthread);
- if ((tmbx == NULL) || (tmbx == (void *)-1))
- return (-1);
- if (user) {
- uticks = td->td_uuticks;
- td->td_uuticks = 0;
- addr = (caddr_t)&tmbx->tm_uticks;
- } else {
- uticks = td->td_usticks;
- td->td_usticks = 0;
- addr = (caddr_t)&tmbx->tm_sticks;
- }
- if (uticks) {
- if (suword32(addr, uticks+fuword32(addr))) {
- PROC_LOCK(p);
- psignal(p, SIGSEGV);
- PROC_UNLOCK(p);
- return (-2);
- }
- }
- kg = td->td_ksegrp;
- if (kg->kg_upquantum && ticks >= kg->kg_nextupcall) {
- mtx_lock_spin(&sched_lock);
- td->td_upcall->ku_flags |= KUF_DOUPCALL;
- mtx_unlock_spin(&sched_lock);
- }
- return (0);
-}
-
-/*
* Discard the current thread and exit from its context.
*
* Because we can't free a thread while we're operating under its context,
@@ -1428,404 +721,6 @@
}
/*
- * This function is intended to be used to initialize a spare thread
- * for upcall. Initialize thread's large data area outside sched_lock
- * for thread_schedule_upcall().
- */
-void
-thread_alloc_spare(struct thread *td, struct thread *spare)
-{
-
- if (td->td_standin)
- return;
- if (spare == NULL) {
- spare = thread_alloc();
- spare->td_tid = thread_new_tid();
- } else {
- sched_init_thread(spare);
- }
- td->td_standin = spare;
- bzero(&spare->td_startzero,
- (unsigned)RANGEOF(struct thread, td_startzero, td_endzero));
- spare->td_proc = td->td_proc;
- spare->td_ucred = crhold(td->td_ucred);
-}
-
-/*
- * Create a thread and schedule it for upcall on the KSE given.
- * Use our thread's standin so that we don't have to allocate one.
- */
-struct thread *
-thread_schedule_upcall(struct thread *td, struct kse_upcall *ku)
-{
- struct thread *td2;
-
- mtx_assert(&sched_lock, MA_OWNED);
-
- /*
- * Schedule an upcall thread on specified kse_upcall,
- * the kse_upcall must be free.
- * td must have a spare thread.
- */
- KASSERT(ku->ku_owner == NULL, ("%s: upcall has owner", __func__));
- if ((td2 = td->td_standin) != NULL) {
- td->td_standin = NULL;
- } else {
- panic("no reserve thread when scheduling an upcall");
- return (NULL);
- }
- CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)",
- td2, td->td_proc->p_pid, td->td_proc->p_comm);
- bcopy(&td->td_startcopy, &td2->td_startcopy,
- (unsigned) RANGEOF(struct thread, td_startcopy, td_endcopy));
- thread_link(td2, ku->ku_ksegrp);
- /* inherit parts of blocked thread's context as a good template */
- cpu_set_upcall(td2, td);
- /* Let the new thread become owner of the upcall */
- ku->ku_owner = td2;
- td2->td_upcall = ku;
- td2->td_flags = TDF_SA;
- td2->td_pflags = TDP_UPCALLING;
- td2->td_state = TDS_CAN_RUN;
- td2->td_inhibitors = 0;
- SIGFILLSET(td2->td_sigmask);
- SIG_CANTMASK(td2->td_sigmask);
- sched_fork_thread(td, td2);
- return (td2); /* bogus.. should be a void function */
-}
-
-/*
- * It is only used when thread generated a trap and process is being
- * debugged.
- */
-void
-thread_signal_add(struct thread *td, int sig)
-{
- struct proc *p;
- siginfo_t siginfo;
- struct sigacts *ps;
- int error;
-
- p = td->td_proc;
- PROC_LOCK_ASSERT(p, MA_OWNED);
- ps = p->p_sigacts;
- mtx_assert(&ps->ps_mtx, MA_OWNED);
-
- cpu_thread_siginfo(sig, 0, &siginfo);
- mtx_unlock(&ps->ps_mtx);
- PROC_UNLOCK(p);
- error = copyout(&siginfo, &td->td_mailbox->tm_syncsig, sizeof(siginfo));
- if (error) {
- PROC_LOCK(p);
- sigexit(td, SIGILL);
- }
- PROC_LOCK(p);
- SIGADDSET(td->td_sigmask, sig);
- mtx_lock(&ps->ps_mtx);
-}
-
-void
-thread_switchout(struct thread *td)
-{
- struct kse_upcall *ku;
- struct thread *td2;
-
- mtx_assert(&sched_lock, MA_OWNED);
-
- /*
- * If the outgoing thread is in threaded group and has never
- * scheduled an upcall, decide whether this is a short
- * or long term event and thus whether or not to schedule
- * an upcall.
- * If it is a short term event, just suspend it in
- * a way that takes its KSE with it.
- * Select the events for which we want to schedule upcalls.
- * For now it's just sleep.
- * XXXKSE eventually almost any inhibition could do.
- */
- if (TD_CAN_UNBIND(td) && (td->td_standin) && TD_ON_SLEEPQ(td)) {
- /*
- * Release ownership of upcall, and schedule an upcall
- * thread, this new upcall thread becomes the owner of
- * the upcall structure.
- */
- ku = td->td_upcall;
- ku->ku_owner = NULL;
- td->td_upcall = NULL;
- td->td_flags &= ~TDF_CAN_UNBIND;
- td2 = thread_schedule_upcall(td, ku);
- setrunqueue(td2);
- }
-}
-
-/*
- * Setup done on the thread when it enters the kernel.
- * XXXKSE Presently only for syscalls but eventually all kernel entries.
- */
-void
-thread_user_enter(struct proc *p, struct thread *td)
-{
- struct ksegrp *kg;
- struct kse_upcall *ku;
- struct kse_thr_mailbox *tmbx;
- uint32_t tflags;
-
- kg = td->td_ksegrp;
-
- /*
- * First check that we shouldn't just abort.
- * But check if we are the single thread first!
- */
- if (p->p_flag & P_SINGLE_EXIT) {
- PROC_LOCK(p);
- mtx_lock_spin(&sched_lock);
- thread_stopped(p);
- thread_exit();
- /* NOTREACHED */
- }
-
- /*
- * If we are doing a syscall in a KSE environment,
- * note where our mailbox is. There is always the
- * possibility that we could do this lazily (in kse_reassign()),
- * but for now do it every time.
- */
- kg = td->td_ksegrp;
- if (td->td_flags & TDF_SA) {
- ku = td->td_upcall;
- KASSERT(ku, ("%s: no upcall owned", __func__));
- KASSERT((ku->ku_owner == td), ("%s: wrong owner", __func__));
- KASSERT(!TD_CAN_UNBIND(td), ("%s: can unbind", __func__));
- ku->ku_mflags = fuword32((void *)&ku->ku_mailbox->km_flags);
- tmbx = (void *)fuword((void *)&ku->ku_mailbox->km_curthread);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sun May 2 16:04:10 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 3D55716A4D0; Sun, 2 May 2004 16:04:10 -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 100CB16A4CE
for <perforce@freebsd.org>; Sun, 2 May 2004 16:04:10 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id E959443D2F
for <perforce@freebsd.org>; Sun, 2 May 2004 16:04:09 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i42N49Ge003199
for <perforce@freebsd.org>; Sun, 2 May 2004 16:04:09 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i42N49n6003196
for perforce@freebsd.org; Sun, 2 May 2004 16:04:09 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Date: Sun, 2 May 2004 16:04:09 -0700 (PDT)
Message-Id: <200405022304.i42N49n6003196@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52104 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: Sun, 02 May 2004 23:04:10 -0000
http://perforce.freebsd.org/chv.cgi?CH=52104
Change 52104 by marcel@marcel_nfs on 2004/05/02 16:03:21
Fix continuation after kdb_enter. Breakpoints are broken,
but they are also broken on HEAD (i.e. we break into the
debugger, but can't continue after it). Single stepping
does not work yet. But again, this is no different than
HEAD.
Affected files ...
.. //depot/projects/gdb/sys/sparc64/include/kdb.h#2 edit
.. //depot/projects/gdb/sys/sparc64/sparc64/trap.c#5 edit
Differences ...
==== //depot/projects/gdb/sys/sparc64/include/kdb.h#2 (text+ko) ====
@@ -45,7 +45,6 @@
kdb_cpu_trap(int vector, int _)
{
flushw();
- TF_DONE(kdb_frame);
}
#endif /* _MACHINE_KDB_H_ */
==== //depot/projects/gdb/sys/sparc64/sparc64/trap.c#5 (text+ko) ====
@@ -242,7 +242,6 @@
(TRAPF_USERMODE(tf) ? "user" : "kernel"), rdpr(pil));
atomic_add_int(&cnt.v_trap, 1);
- td->td_last_frame = tf;
if ((tf->tf_tstate & TSTATE_PRIV) == 0) {
KASSERT(td != NULL, ("trap: curthread NULL"));
@@ -251,6 +250,7 @@
p = td->td_proc;
sticks = td->td_sticks;
td->td_frame = tf;
+ td->td_last_frame = tf;
if (td->td_ucred != p->p_ucred)
cred_update_thread(td);
@@ -298,11 +298,20 @@
KASSERT((tf->tf_type & T_KERNEL) != 0,
("trap: kernel trap isn't"));
+ if (kdb_active) {
+ kdb_trap(tf->tf_type, 0, tf);
+ TF_DONE(tf);
+ return;
+ }
+
+ td->td_last_frame = tf;
+
switch (tf->tf_type & ~T_KERNEL) {
#ifdef KDB
case T_BREAKPOINT:
case T_KSTACK_FAULT:
error = (kdb_trap(tf->tf_type, 0, tf) == 0);
+ TF_DONE(tf);
break;
#ifdef notyet
case T_PA_WATCHPOINT:
From owner-p4-projects@FreeBSD.ORG Sun May 2 16:48:05 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6018A16A4D0; Sun, 2 May 2004 16:48:05 -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 F329916A4CE
for <perforce@freebsd.org>; Sun, 2 May 2004 16:48:04 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id A3CCC43D5C
for <perforce@freebsd.org>; Sun, 2 May 2004 16:48:04 -0700 (PDT)
(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i42Nm4Ge018060
for <perforce@freebsd.org>; Sun, 2 May 2004 16:48:04 -0700 (PDT)
(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i42Nm3H0018057
for perforce@freebsd.org; Sun, 2 May 2004 16:48:03 -0700 (PDT)
(envelope-from julian@freebsd.org)
Date: Sun, 2 May 2004 16:48:03 -0700 (PDT)
Message-Id: <200405022348.i42Nm3H0018057@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52106 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: Sun, 02 May 2004 23:48:05 -0000
http://perforce.freebsd.org/chv.cgi?CH=52106
Change 52106 by julian@julian_desk on 2004/05/02 16:47:51
shuffle stuff between files to move towards compiling
without (say) kse code
Affected files ...
.. //depot/projects/nsched/sys/kern/kern_kse.c#2 edit
.. //depot/projects/nsched/sys/kern/kern_thread.c#9 edit
.. //depot/projects/nsched/sys/sys/proc.h#5 edit
Differences ...
==== //depot/projects/nsched/sys/kern/kern_kse.c#2 (text+ko) ====
@@ -68,7 +68,12 @@
static uma_zone_t upcall_zone;
/* DEBUG ONLY */
-static int virtual_cpu;
+extern int virtual_cpu;
+extern int thread_debug = 0;
+extern int max_threads_per_proc = 1500;
+extern int max_groups_per_proc = 500;
+extern int max_threads_hits;
+
#define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start))
@@ -263,13 +268,13 @@
mtx_lock_spin(&sched_lock);
upcall_remove(td);
if (p->p_numthreads == 1) {
- kse_purge(p, td);
+ thread_purge(p, td);
p->p_flag &= ~P_SA;
mtx_unlock_spin(&sched_lock);
PROC_UNLOCK(p);
} else {
if (kg->kg_numthreads == 1) { /* Shutdown a group */
- kse_purge_group(td);
+ thread_purge_group(td);
sched_exit_ksegrp(p->p_pptr, td);
}
thread_stopped(p);
==== //depot/projects/nsched/sys/kern/kern_thread.c#9 (text+ko) ====
@@ -69,23 +69,23 @@
/* DEBUG ONLY */
SYSCTL_NODE(_kern, OID_AUTO, threads, CTLFLAG_RW, 0, "thread allocation");
-static int thread_debug = 0;
+int thread_debug = 0;
SYSCTL_INT(_kern_threads, OID_AUTO, debug, CTLFLAG_RW,
&thread_debug, 0, "thread debug");
-static int max_threads_per_proc = 1500;
+int max_threads_per_proc = 1500;
SYSCTL_INT(_kern_threads, OID_AUTO, max_threads_per_proc, CTLFLAG_RW,
&max_threads_per_proc, 0, "Limit on threads per proc");
-static int max_groups_per_proc = 500;
+int max_groups_per_proc = 500;
SYSCTL_INT(_kern_threads, OID_AUTO, max_groups_per_proc, CTLFLAG_RW,
&max_groups_per_proc, 0, "Limit on thread groups per proc");
-static int max_threads_hits;
+int max_threads_hits;
SYSCTL_INT(_kern_threads, OID_AUTO, max_threads_hits, CTLFLAG_RD,
&max_threads_hits, 0, "");
-static int virtual_cpu;
+int virtual_cpu;
#define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start))
@@ -94,8 +94,6 @@
struct mtx kse_zombie_lock;
MTX_SYSINIT(kse_zombie_lock, &kse_zombie_lock, "kse zombie lock", MTX_SPIN);
-static void kse_purge(struct proc *p, struct thread *td);
-static void kse_purge_group(struct thread *td);
static int thread_update_usr_ticks(struct thread *td, int user);
static void thread_alloc_spare(struct thread *td, struct thread *spare);
@@ -677,7 +675,7 @@
* exit, it calls this function.
*/
static void
-kse_purge_group(struct thread *td)
+thread_purge_group(struct thread *td)
{
struct ksegrp *kg;
@@ -691,11 +689,11 @@
/*
* Purge a process's KSE resource. When a process is preparing to
- * exit, it calls kse_purge to release any extra KSE resources in
+ * exit, it calls thread_purge to release any extra KSE resources in
* the process.
*/
-static void
-kse_purge(struct proc *p, struct thread *td)
+void
+thread_purge(struct proc *p, struct thread *td)
{
struct ksegrp *kg;
@@ -808,7 +806,7 @@
if (force_exit == SINGLE_EXIT) {
if (td->td_upcall)
upcall_remove(td);
- kse_purge(p, td);
+ thread_purge(p, td);
}
mtx_unlock_spin(&sched_lock);
return (0);
==== //depot/projects/nsched/sys/sys/proc.h#5 (text+ko) ====
@@ -809,6 +809,8 @@
void thread_free(struct thread *td);
void thread_link(struct thread *td, struct ksegrp *kg);
int thread_new_tid(void);
+void thread_purge(struct proc *p, struct thread *td);
+void thread_purge_group(struct thread *td);
void thread_reap(void);
struct thread *thread_schedule_upcall(struct thread *td, struct kse_upcall *ku);
int thread_single(int how);
From owner-p4-projects@FreeBSD.ORG Sun May 2 17:15:39 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id A1E6516A4D0; Sun, 2 May 2004 17:15:38 -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 440BC16A4CE
for <perforce@freebsd.org>; Sun, 2 May 2004 17:15:38 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 1418943D4C
for <perforce@freebsd.org>; Sun, 2 May 2004 17:15:38 -0700 (PDT)
(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i430FbGe025059
for <perforce@freebsd.org>; Sun, 2 May 2004 17:15:37 -0700 (PDT)
(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i430Fbk9025056
for perforce@freebsd.org; Sun, 2 May 2004 17:15:37 -0700 (PDT)
(envelope-from julian@freebsd.org)
Date: Sun, 2 May 2004 17:15:37 -0700 (PDT)
Message-Id: <200405030015.i430Fbk9025056@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52107 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: Mon, 03 May 2004 00:15:39 -0000
http://perforce.freebsd.org/chv.cgi?CH=52107
Change 52107 by julian@julian_ref on 2004/05/02 17:14:47
shuffle shuffle
Affected files ...
.. //depot/projects/nsched/sys/kern/kern_kse.c#3 edit
.. //depot/projects/nsched/sys/kern/kern_thread.c#10 edit
Differences ...
==== //depot/projects/nsched/sys/kern/kern_kse.c#3 (text+ko) ====
@@ -63,18 +63,18 @@
/*
* KSEGRP related storage.
*/
-static uma_zone_t ksegrp_zone;
-static uma_zone_t thread_zone;
static uma_zone_t upcall_zone;
/* DEBUG ONLY */
extern int virtual_cpu;
-extern int thread_debug = 0;
-extern int max_threads_per_proc = 1500;
-extern int max_groups_per_proc = 500;
+extern int thread_debug;
+extern int max_threads_per_proc;
+extern int max_groups_per_proc;
extern int max_threads_hits;
+extern struct mtx kse_zombie_lock;
+
#define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start))
TAILQ_HEAD(, kse_upcall) zombie_upcalls =
@@ -82,6 +82,8 @@
static int thread_update_usr_ticks(struct thread *td, int user);
static void thread_alloc_spare(struct thread *td, struct thread *spare);
+void kse_initialise(void);
+void kse_GC(void);
struct kse_upcall *
==== //depot/projects/nsched/sys/kern/kern_thread.c#10 (text+ko) ====
@@ -60,12 +60,13 @@
#include <machine/frame.h>
+/* extern void kse_initialise(void);*/
+extern void kse_GC(void);
/*
* KSEGRP related storage.
*/
static uma_zone_t ksegrp_zone;
static uma_zone_t thread_zone;
-static uma_zone_t upcall_zone;
/* DEBUG ONLY */
SYSCTL_NODE(_kern, OID_AUTO, threads, CTLFLAG_RW, 0, "thread allocation");
@@ -94,9 +95,6 @@
struct mtx kse_zombie_lock;
MTX_SYSINIT(kse_zombie_lock, &kse_zombie_lock, "kse zombie lock", MTX_SPIN);
-static int thread_update_usr_ticks(struct thread *td, int user);
-static void thread_alloc_spare(struct thread *td, struct thread *spare);
-
static int
sysctl_kse_virtual_cpu(SYSCTL_HANDLER_ARGS)
{
@@ -674,7 +672,7 @@
* Purge a ksegrp resource. When a ksegrp is preparing to
* exit, it calls this function.
*/
-static void
+void
thread_purge_group(struct thread *td)
{
struct ksegrp *kg;
From owner-p4-projects@FreeBSD.ORG Sun May 2 19:29:25 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 934D216A4D1; Sun, 2 May 2004 19:29:24 -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 625ED16A4CE
for <perforce@freebsd.org>; Sun, 2 May 2004 19:29:24 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 7457243D46
for <perforce@freebsd.org>; Sun, 2 May 2004 19:29:23 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i432TNGe053326
for <perforce@freebsd.org>; Sun, 2 May 2004 19:29:23 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i432TMxV053323
for perforce@freebsd.org; Sun, 2 May 2004 19:29:22 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Date: Sun, 2 May 2004 19:29:22 -0700 (PDT)
Message-Id: <200405030229.i432TMxV053323@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52113 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: Mon, 03 May 2004 02:29:25 -0000
http://perforce.freebsd.org/chv.cgi?CH=52113
Change 52113 by marcel@marcel_nfs on 2004/05/02 19:28:39
IFC @52112
Affected files ...
.. //depot/projects/gdb/bin/ls/extern.h#3 integrate
.. //depot/projects/gdb/bin/ls/ls.1#4 integrate
.. //depot/projects/gdb/bin/ls/print.c#6 integrate
.. //depot/projects/gdb/bin/ls/util.c#3 integrate
.. //depot/projects/gdb/gnu/usr.bin/gzip/gzip.h#2 integrate
.. //depot/projects/gdb/gnu/usr.bin/gzip/unzip.c#2 integrate
.. //depot/projects/gdb/lib/libarchive/archive_entry.c#11 integrate
.. //depot/projects/gdb/lib/libc/Makefile#3 integrate
.. //depot/projects/gdb/lib/libc/gen/fmtcheck.c#2 integrate
.. //depot/projects/gdb/lib/libc/stdio/vfprintf.c#5 integrate
.. //depot/projects/gdb/lib/libc/stdio/vfscanf.c#4 integrate
.. //depot/projects/gdb/lib/libc/stdio/vfwprintf.c#5 integrate
.. //depot/projects/gdb/lib/libc/stdio/vfwscanf.c#4 integrate
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#15 integrate
.. //depot/projects/gdb/release/scripts/print-cdrom-packages.sh#5 integrate
.. //depot/projects/gdb/sbin/Makefile#6 integrate
.. //depot/projects/gdb/sbin/ggate/ggatec/ggatec.c#2 integrate
.. //depot/projects/gdb/sbin/ggate/ggated/ggated.c#2 integrate
.. //depot/projects/gdb/sbin/ggate/ggatel/ggatel.c#2 integrate
.. //depot/projects/gdb/sbin/ggate/shared/ggate.c#2 integrate
.. //depot/projects/gdb/secure/Makefile#3 integrate
.. //depot/projects/gdb/share/man/man4/asr.4#2 integrate
.. //depot/projects/gdb/share/man/man4/hme.4#2 integrate
.. //depot/projects/gdb/sys/alpha/conf/GENERIC#3 integrate
.. //depot/projects/gdb/sys/amd64/conf/GENERIC#5 integrate
.. //depot/projects/gdb/sys/cam/scsi/scsi_da.c#5 integrate
.. //depot/projects/gdb/sys/conf/files#22 integrate
.. //depot/projects/gdb/sys/conf/files.i386#12 integrate
.. //depot/projects/gdb/sys/conf/majors#5 integrate
.. //depot/projects/gdb/sys/contrib/pf/net/pf.c#5 integrate
.. //depot/projects/gdb/sys/contrib/pf/net/pf_ioctl.c#5 integrate
.. //depot/projects/gdb/sys/contrib/pf/net/pf_norm.c#3 integrate
.. //depot/projects/gdb/sys/dev/asr/asr.c#6 integrate
.. //depot/projects/gdb/sys/dev/cy/cy.c#2 integrate
.. //depot/projects/gdb/sys/dev/cy/cy_isa.c#2 integrate
.. //depot/projects/gdb/sys/dev/cy/cy_pci.c#2 integrate
.. //depot/projects/gdb/sys/dev/cy/cyvar.h#1 branch
.. //depot/projects/gdb/sys/dev/usb/usbdevs#7 integrate
.. //depot/projects/gdb/sys/dev/usb/usbdevs.h#7 integrate
.. //depot/projects/gdb/sys/dev/usb/usbdevs_data.h#7 integrate
.. //depot/projects/gdb/sys/dev/usb/uvscom.c#2 integrate
.. //depot/projects/gdb/sys/geom/gate/g_gate.c#2 integrate
.. //depot/projects/gdb/sys/geom/gate/g_gate.h#2 integrate
.. //depot/projects/gdb/sys/i386/conf/GENERIC#8 integrate
.. //depot/projects/gdb/sys/i386/conf/NOTES#11 integrate
.. //depot/projects/gdb/sys/i386/isa/cy.c#4 delete
.. //depot/projects/gdb/sys/i386/isa/cyreg.h#2 delete
.. //depot/projects/gdb/sys/i386/isa/ic/cd1400.h#2 delete
.. //depot/projects/gdb/sys/ia64/acpica/madt.c#2 integrate
.. //depot/projects/gdb/sys/ia64/conf/GENERIC#3 integrate
.. //depot/projects/gdb/sys/ia64/conf/SKI#2 integrate
.. //depot/projects/gdb/sys/kern/kern_clock.c#6 integrate
.. //depot/projects/gdb/sys/netinet/ip_input.c#6 integrate
.. //depot/projects/gdb/sys/netinet/ip_output.c#7 integrate
.. //depot/projects/gdb/sys/netinet/ip_var.h#5 integrate
.. //depot/projects/gdb/sys/netinet/tcp_input.c#7 integrate
.. //depot/projects/gdb/sys/pc98/conf/GENERIC#7 integrate
.. //depot/projects/gdb/sys/pc98/pc98/sio.c#6 integrate
.. //depot/projects/gdb/sys/pci/cy_pci.c#3 delete
.. //depot/projects/gdb/sys/powerpc/conf/GENERIC#3 integrate
.. //depot/projects/gdb/sys/sparc64/conf/GENERIC#4 integrate
.. //depot/projects/gdb/sys/sys/mbuf.h#6 integrate
.. //depot/projects/gdb/tools/tools/nanobsd/i386.diskimage#5 integrate
.. //depot/projects/gdb/usr.bin/du/du.c#3 integrate
.. //depot/projects/gdb/usr.bin/m4/TEST/math.m4#1 branch
.. //depot/projects/gdb/usr.bin/m4/expr.c#2 integrate
.. //depot/projects/gdb/usr.bin/rpcgen/rpc_main.c#2 integrate
.. //depot/projects/gdb/usr.bin/sed/TEST/math.sed#2 integrate
.. //depot/projects/gdb/usr.bin/tar/bsdtar.c#6 integrate
.. //depot/projects/gdb/usr.bin/tar/bsdtar.h#4 integrate
.. //depot/projects/gdb/usr.bin/tar/bsdtar_platform.h#2 integrate
.. //depot/projects/gdb/usr.bin/tar/read.c#4 integrate
.. //depot/projects/gdb/usr.bin/tar/write.c#8 integrate
Differences ...
==== //depot/projects/gdb/bin/ls/extern.h#3 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* from: @(#)extern.h 8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/ls/extern.h,v 1.22 2004/04/06 20:06:47 markm Exp $
+ * $FreeBSD: src/bin/ls/extern.h,v 1.23 2004/05/02 11:25:37 tjr Exp $
*/
int acccmp(const FTSENT *, const FTSENT *);
@@ -45,6 +45,7 @@
void printscol(const DISPLAY *);
void printstream(const DISPLAY *);
void usage(void);
+int prn_normal(const char *);
size_t len_octal(const char *, int);
int prn_octal(const char *);
int prn_printable(const char *);
==== //depot/projects/gdb/bin/ls/ls.1#4 (text+ko) ====
@@ -29,9 +29,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.79 2004/04/06 20:06:47 markm Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.80 2004/05/02 11:25:37 tjr Exp $
.\"
-.Dd March 21, 2004
+.Dd May 2, 2004
.Dt LS 1
.Os
.Sh NAME
@@ -673,7 +673,3 @@
.Sh BUGS
To maintain backward compatibility, the relationships between the many
options are quite complex.
-.Pp
-The
-.Nm
-utility does not recognize multibyte characters in filenames.
==== //depot/projects/gdb/bin/ls/print.c#6 (text+ko) ====
@@ -36,7 +36,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.70 2004/04/06 20:06:47 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.71 2004/05/02 11:25:37 tjr Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -147,7 +147,7 @@
else if (f_nonprint)
return prn_printable(name);
else
- return printf("%s", name);
+ return prn_normal(name);
}
void
@@ -239,6 +239,7 @@
for (p = dp->list, chcnt = 0; p; p = p->fts_link) {
if (p->fts_number == NO_PRINT)
continue;
+ /* XXX strlen does not take octal escapes into account. */
if (strlen(p->fts_name) + chcnt +
(p->fts_link ? 2 : 0) >= (unsigned)termwidth) {
putchar('\n');
==== //depot/projects/gdb/bin/ls/util.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.33 2004/04/06 20:06:47 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.34 2004/05/02 11:25:37 tjr Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -44,25 +44,81 @@
#include <ctype.h>
#include <err.h>
#include <fts.h>
+#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <wchar.h>
+#include <wctype.h>
#include "ls.h"
#include "extern.h"
int
+prn_normal(const char *s)
+{
+ mbstate_t mbs;
+ wchar_t wc;
+ int i, n;
+ size_t clen;
+
+ memset(&mbs, 0, sizeof(mbs));
+ n = 0;
+ while ((clen = mbrtowc(&wc, s, MB_LEN_MAX, &mbs)) != 0) {
+ if (clen == (size_t)-2) {
+ n += printf("%s", s);
+ break;
+ }
+ if (clen == (size_t)-1) {
+ memset(&mbs, 0, sizeof(mbs));
+ putchar((unsigned char)*s);
+ s++;
+ n++;
+ continue;
+ }
+ for (i = 0; i < (int)clen; i++)
+ putchar((unsigned char)s[i]);
+ s += clen;
+ n += wcwidth(wc);
+ }
+ return (n);
+}
+
+int
prn_printable(const char *s)
{
- char c;
- int n;
+ mbstate_t mbs;
+ wchar_t wc;
+ int i, n;
+ size_t clen;
- for (n = 0; (c = *s) != '\0'; ++s, ++n)
- if (isprint((unsigned char)c))
- putchar(c);
- else
+ memset(&mbs, 0, sizeof(mbs));
+ n = 0;
+ while ((clen = mbrtowc(&wc, s, MB_LEN_MAX, &mbs)) != 0) {
+ if (clen == (size_t)-1) {
+ putchar('?');
+ s++;
+ n++;
+ memset(&mbs, 0, sizeof(mbs));
+ continue;
+ }
+ if (clen == (size_t)-2) {
+ putchar('?');
+ n++;
+ break;
+ }
+ if (!iswprint(wc)) {
putchar('?');
- return n;
+ s += clen;
+ n++;
+ continue;
+ }
+ for (i = 0; i < (int)clen; i++)
+ putchar((unsigned char)s[i]);
+ s += clen;
+ n += wcwidth(wc);
+ }
+ return (n);
}
/*
@@ -81,70 +137,83 @@
size_t
len_octal(const char *s, int len)
{
- size_t r = 0;
+ mbstate_t mbs;
+ wchar_t wc;
+ size_t clen, r;
- while (len--)
- if (isprint((unsigned const char)*s++)) r++; else r += 4;
- return r;
+ memset(&mbs, 0, sizeof(mbs));
+ r = 0;
+ while (len != 0 && (clen = mbrtowc(&wc, s, len, &mbs)) != 0) {
+ if (clen == (size_t)-1) {
+ r += 4;
+ s++;
+ len--;
+ memset(&mbs, 0, sizeof(mbs));
+ continue;
+ }
+ if (clen == (size_t)-2) {
+ r += 4 * len;
+ break;
+ }
+ if (iswprint(wc))
+ r++;
+ else
+ r += 4 * clen;
+ s += clen;
+ }
+ return (r);
}
int
prn_octal(const char *s)
{
- unsigned char ch;
- int len = 0;
+ static const char esc[] = "\\\\\"\"\aa\bb\ff\nn\rr\tt\vv";
+ const char *p;
+ mbstate_t mbs;
+ wchar_t wc;
+ size_t clen;
+ unsigned char ch;
+ int goodchar, i, len, prtlen;
- while ((ch = (unsigned char)*s++)) {
- if (isprint(ch) && (ch != '\"') && (ch != '\\'))
- putchar(ch), len++;
- else if (f_octal_escape) {
- putchar('\\');
- switch (ch) {
- case '\\':
- putchar('\\');
- break;
- case '\"':
- putchar('"');
- break;
- case '\a':
- putchar('a');
- break;
- case '\b':
- putchar('b');
- break;
- case '\f':
- putchar('f');
- break;
- case '\n':
- putchar('n');
- break;
- case '\r':
- putchar('r');
- break;
- case '\t':
- putchar('t');
- break;
- case '\v':
- putchar('v');
- break;
- default:
+ memset(&mbs, 0, sizeof(mbs));
+ len = 0;
+ while ((clen = mbrtowc(&wc, s, MB_LEN_MAX, &mbs)) != 0) {
+ goodchar = clen != (size_t)-1 && clen != (size_t)-2;
+ if (goodchar && iswprint(wc) && wc != L'\"' && wc != L'\\') {
+ for (i = 0; i < (int)clen; i++)
+ putchar((unsigned char)s[i]);
+ len += wcwidth(wc);
+ } else if (goodchar && f_octal_escape && wc >= 0 &&
+ wc <= (wchar_t)UCHAR_MAX &&
+ (p = strchr(esc, (char)wc)) != NULL) {
+ putchar('\\');
+ putchar(p[1]);
+ len += 2;
+ } else {
+ if (goodchar)
+ prtlen = clen;
+ else if (clen == (size_t)-1)
+ prtlen = 1;
+ else
+ prtlen = strlen(s);
+ for (i = 0; i < prtlen; i++) {
+ ch = (unsigned char)s[i];
+ putchar('\\');
putchar('0' + (ch >> 6));
putchar('0' + ((ch >> 3) & 7));
putchar('0' + (ch & 7));
- len += 2;
- break;
- }
- len += 2;
- }
- else {
- putchar('\\');
- putchar('0' + (ch >> 6));
- putchar('0' + ((ch >> 3) & 7));
- putchar('0' + (ch & 7));
- len += 4;
+ len += 4;
+ }
}
+ if (clen == (size_t)-2)
+ break;
+ if (clen == (size_t)-1) {
+ memset(&mbs, 0, sizeof(mbs));
+ s++;
+ } else
+ s += clen;
}
- return len;
+ return (len);
}
void
==== //depot/projects/gdb/gnu/usr.bin/gzip/gzip.h#2 (text+ko) ====
@@ -2,6 +2,8 @@
* Copyright (C) 1992-1993 Jean-loup Gailly.
* This is free software; you can redistribute it and/or modify it under the
* terms of the GNU General Public License, see the file COPYING.
+ *
+ * $FreeBSD: src/gnu/usr.bin/gzip/gzip.h,v 1.4 2004/05/02 23:07:49 obrien Exp $
*/
#if defined(__STDC__) || defined(PROTO)
@@ -41,9 +43,10 @@
#define local static
-typedef unsigned char uch;
-typedef unsigned short ush;
-typedef unsigned long ulg;
+#include <stdint.h>
+typedef uint8_t uch;
+typedef uint16_t ush;
+typedef uint32_t ulg;
/* Return codes from gzip */
#define OK 0
==== //depot/projects/gdb/gnu/usr.bin/gzip/unzip.c#2 (text+ko) ====
@@ -14,7 +14,7 @@
*/
#ifdef RCSID
-static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unzip.c,v 1.6 1999/08/27 23:35:54 peter Exp $";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unzip.c,v 1.7 2004/05/02 02:54:37 tjr Exp $";
#endif
#include "tailor.h"
@@ -35,6 +35,7 @@
#define LOCEXT 28 /* offset of extra field length */
#define LOCHDR 30 /* size of local header, including sig */
#define EXTHDR 16 /* size of extended local header, inc sig */
+#define RAND_HEAD_LEN 12 /* length of encryption random header */
/* Globals */
@@ -103,6 +104,7 @@
ulg orig_len = 0; /* original uncompressed length */
int n;
uch buf[EXTHDR]; /* extended local header */
+ int err = OK;
ifd = in;
ofd = out;
@@ -136,9 +138,6 @@
}
while (n--) {
uch c = (uch)get_byte();
-#ifdef CRYPT
- if (decrypt) zdecode(c);
-#endif
put_ubyte(c);
}
flush_window();
@@ -172,10 +171,14 @@
/* Validate decompression */
if (orig_crc != updcrc(outbuf, 0)) {
- error("invalid compressed data--crc error");
+ fprintf(stderr, "\n%s: %s: invalid compressed data--crc error\n",
+ progname, ifname);
+ err = ERROR;
}
- if (orig_len != (ulg)bytes_out) {
- error("invalid compressed data--length error");
+ if (((orig_len - (ulg)bytes_out) & 0x0ffffffffL) != 0) {
+ fprintf(stderr, "\n%s: %s: invalid compressed data--length error\n",
+ progname, ifname);
+ err = ERROR;
}
/* Check if there are more entries in a pkzip file */
@@ -189,11 +192,12 @@
fprintf(stderr,
"%s: %s has more than one entry -- unchanged\n",
progname, ifname);
- exit_code = ERROR;
- ext_header = pkzip = 0;
- return ERROR;
+ err = ERROR;
}
}
ext_header = pkzip = 0; /* for next file */
- return OK;
+ if (err == OK) return OK;
+ exit_code = ERROR;
+ if (!test) abort_gzip();
+ return err;
}
==== //depot/projects/gdb/lib/libarchive/archive_entry.c#11 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.10 2004/04/26 23:37:54 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.11 2004/05/02 00:38:38 kientzle Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -35,6 +35,10 @@
#include <string.h>
#include <wchar.h>
+#ifdef LINUX
+#include <ext2fs/ext2_fs.h> /* for Linux file flags */
+#endif
+
#include "archive.h"
#include "archive_entry.h"
==== //depot/projects/gdb/lib/libc/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.50 2004/01/19 16:16:53 nectar Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.51 2004/05/02 10:55:07 das Exp $
#
# All library objects contain FreeBSD revision strings by default; they may be
# excluded as a space-saving measure. To produce a library that does
@@ -64,6 +64,9 @@
.if !defined(NO_HESIOD_LIBC)
CFLAGS+= -DHESIOD
.endif
+.if defined(NO_FP_LIBC)
+CFLAGS+= -DNO_FLOATING_POINT
+.endif
# If there are no machine dependent sources, append all the
# machine-independent sources:
==== //depot/projects/gdb/lib/libc/gen/fmtcheck.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
/* $NetBSD: fmtcheck.c,v 1.2 2000/11/01 01:17:20 briggs Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fmtcheck.c,v 1.6 2003/06/29 01:11:31 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fmtcheck.c,v 1.7 2004/05/02 10:55:05 das Exp $");
#include <stdio.h>
#include <string.h>
@@ -57,8 +57,10 @@
FMTCHECK_QUADPOINTER,
FMTCHECK_PTRDIFFTPOINTER,
FMTCHECK_SIZETPOINTER,
+#ifndef NO_FLOATING_POINT
FMTCHECK_DOUBLE,
FMTCHECK_LONGDOUBLE,
+#endif
FMTCHECK_STRING,
FMTCHECK_WIDTH,
FMTCHECK_PRECISION,
@@ -149,6 +151,7 @@
RETURN(pf,f,FMTCHECK_UNKNOWN);
RETURN(pf,f,FMTCHECK_LONG);
}
+#ifndef NO_FLOATING_POINT
if (strchr("aAeEfFgG", *f)) {
if (longdouble)
RETURN(pf,f,FMTCHECK_LONGDOUBLE);
@@ -156,6 +159,7 @@
RETURN(pf,f,FMTCHECK_UNKNOWN);
RETURN(pf,f,FMTCHECK_DOUBLE);
}
+#endif
if (*f == 'c') {
if (sh + lg + quad + longdouble + ptrdifft + sizet)
RETURN(pf,f,FMTCHECK_UNKNOWN);
==== //depot/projects/gdb/lib/libc/stdio/vfprintf.c#5 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.64 2004/04/22 11:35:12 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.65 2004/05/02 10:55:05 das Exp $");
/*
* Actual printf innards.
@@ -66,10 +66,6 @@
#include "local.h"
#include "fvwrite.h"
-/* Define FLOATING_POINT to get floating point, HEXFLOAT to get %a. */
-#define FLOATING_POINT
-#define HEXFLOAT
-
union arg {
int intarg;
u_int uintarg;
@@ -91,7 +87,7 @@
ptrdiff_t *pptrdiffarg;
size_t *psizearg;
intmax_t *pintmaxarg;
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
double doublearg;
long double longdoublearg;
#endif
@@ -411,7 +407,7 @@
return (ret);
}
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
#define dtoa __dtoa
#define freedtoa __freedtoa
@@ -425,7 +421,7 @@
static int exponent(char *, int, int);
-#endif /* FLOATING_POINT */
+#endif /* !NO_FLOATING_POINT */
/*
* The size of the buffer we use as scratch space for integer
@@ -474,7 +470,7 @@
char sign; /* sign prefix (' ', '+', '-', or \0) */
char thousands_sep; /* locale specific thousands separator */
const char *grouping; /* locale specific numeric grouping rules */
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
/*
* We can decompose the printed representation of floating
* point numbers into several parts, some of which may be empty:
@@ -641,7 +637,7 @@
thousands_sep = '\0';
grouping = NULL;
convbuf = NULL;
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
dtoaresult = NULL;
decimal_point = localeconv()->decimal_point;
#endif
@@ -762,7 +758,7 @@
}
width = n;
goto reswitch;
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
case 'L':
flags |= LONGDBL;
goto rflag;
@@ -836,8 +832,7 @@
}
base = 10;
goto number;
-#ifdef FLOATING_POINT
-#ifdef HEXFLOAT
+#ifndef NO_FLOATING_POINT
case 'a':
case 'A':
if (ch == 'a') {
@@ -869,7 +864,6 @@
if (expt == INT_MAX)
ox[1] = '\0';
goto fp_common;
-#endif /* HEXFLOAT */
case 'e':
case 'E':
expchar = ch;
@@ -971,7 +965,7 @@
lead = expt;
}
break;
-#endif /* FLOATING_POINT */
+#endif /* !NO_FLOATING_POINT */
case 'n':
/*
* Assignment-like behavior is specified if the
@@ -1176,7 +1170,7 @@
PAD(dprec - size, zeroes);
/* the string or number proper */
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
if ((flags & FPT) == 0) {
PRINT(cp, size);
} else { /* glue together f_p fragments */
@@ -1239,7 +1233,7 @@
done:
FLUSH();
error:
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
if (dtoaresult != NULL)
freedtoa(dtoaresult);
#endif
@@ -1373,7 +1367,7 @@
}
width = n;
goto reswitch;
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
case 'L':
flags |= LONGDBL;
goto rflag;
@@ -1420,11 +1414,9 @@
case 'i':
ADDSARG();
break;
-#ifdef FLOATING_POINT
-#ifdef HEXFLOAT
+#ifndef NO_FLOATING_POINT
case 'a':
case 'A':
-#endif
case 'e':
case 'E':
case 'f':
@@ -1435,7 +1427,7 @@
else
ADDTYPE(T_DOUBLE);
break;
-#endif /* FLOATING_POINT */
+#endif /* !NO_FLOATING_POINT */
case 'n':
if (flags & INTMAXT)
ADDTYPE(TP_INTMAXT);
@@ -1555,7 +1547,7 @@
case TP_INTMAXT:
(*argtable) [n].pintmaxarg = va_arg (ap, intmax_t *);
break;
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
case T_DOUBLE:
(*argtable) [n].doublearg = va_arg (ap, double);
break;
@@ -1612,7 +1604,7 @@
}
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
static int
exponent(char *p0, int exp, int fmtch)
@@ -1649,4 +1641,4 @@
}
return (p - p0);
}
-#endif /* FLOATING_POINT */
+#endif /* !NO_FLOATING_POINT */
==== //depot/projects/gdb/lib/libc/stdio/vfscanf.c#4 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.36 2004/04/07 09:55:05 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.37 2004/05/02 10:55:05 das Exp $");
#include "namespace.h"
#include <ctype.h>
@@ -56,9 +56,7 @@
#include "libc_private.h"
#include "local.h"
-#define FLOATING_POINT
-
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
#include <locale.h>
#endif
@@ -254,7 +252,7 @@
base = 16;
break;
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
case 'A': case 'E': case 'F': case 'G':
case 'a': case 'e': case 'f': case 'g':
c = CT_FLOAT;
@@ -768,7 +766,7 @@
nconversions++;
break;
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
case CT_FLOAT:
/* scan a floating point number as if by strtod */
if (width == 0 || width > sizeof(buf) - 1)
@@ -793,7 +791,7 @@
nread += width;
nconversions++;
break;
-#endif /* FLOATING_POINT */
+#endif /* !NO_FLOATING_POINT */
}
}
input_failure:
@@ -915,7 +913,7 @@
/* NOTREACHED */
}
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
static int
parsefloat(FILE *fp, char *buf, char *end)
{
==== //depot/projects/gdb/lib/libc/stdio/vfwprintf.c#5 (text+ko) ====
@@ -34,14 +34,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#if 0
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
-__FBSDID("FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.62 2004/01/18 10:32:49 das Exp");
#endif
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.18 2004/04/22 11:35:12 tjr Exp $");
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.20 2004/05/02 20:09:14 obrien Exp $");
/*
* Actual wprintf innards.
@@ -70,10 +69,6 @@
#include "local.h"
#include "fvwrite.h"
-/* Define FLOATING_POINT to get floating point, HEXFLOAT to get %a. */
-#define FLOATING_POINT
-#define HEXFLOAT
-
union arg {
int intarg;
u_int uintarg;
@@ -95,7 +90,7 @@
ptrdiff_t *pptrdiffarg;
size_t *psizearg;
intmax_t *pintmaxarg;
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
double doublearg;
long double longdoublearg;
#endif
@@ -435,7 +430,7 @@
return (ret);
}
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
#define dtoa __dtoa
#define freedtoa __freedtoa
@@ -449,7 +444,7 @@
static int exponent(wchar_t *, int, wchar_t);
-#endif /* FLOATING_POINT */
+#endif /* !NO_FLOATING_POINT */
/*
* The size of the buffer we use as scratch space for integer
@@ -497,7 +492,7 @@
wchar_t sign; /* sign prefix (' ', '+', '-', or \0) */
char thousands_sep; /* locale specific thousands separator */
const char *grouping; /* locale specific numeric grouping rules */
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
/*
* We can decompose the printed representation of floating
* point numbers into several parts, some of which may be empty:
@@ -648,7 +643,7 @@
thousands_sep = '\0';
grouping = NULL;
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
decimal_point = localeconv()->decimal_point;
#endif
convbuf = NULL;
@@ -766,7 +761,7 @@
}
width = n;
goto reswitch;
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
case 'L':
flags |= LONGDBL;
goto rflag;
@@ -828,8 +823,7 @@
}
base = 10;
goto number;
-#ifdef FLOATING_POINT
-#ifdef HEXFLOAT
+#ifndef NO_FLOATING_POINT
case 'a':
case 'A':
if (ch == 'a') {
@@ -864,7 +858,6 @@
cp = convbuf = __mbsconv(dtoaresult, -1);
freedtoa(dtoaresult);
goto fp_common;
-#endif /* HEXFLOAT */
case 'e':
case 'E':
expchar = ch;
@@ -968,7 +961,7 @@
lead = expt;
}
break;
-#endif /* FLOATING_POINT */
+#endif /* !NO_FLOATING_POINT */
case 'n':
/*
* Assignment-like behavior is specified if the
@@ -1176,7 +1169,7 @@
PAD(dprec - size, zeroes);
/* the string or number proper */
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
if ((flags & FPT) == 0) {
PRINT(cp, size);
} else { /* glue together f_p fragments */
@@ -1369,7 +1362,7 @@
}
width = n;
goto reswitch;
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
case 'L':
flags |= LONGDBL;
goto rflag;
@@ -1416,11 +1409,9 @@
case 'i':
ADDSARG();
break;
-#ifdef FLOATING_POINT
-#ifdef HEXFLOAT
+#ifndef NO_FLOATING_POINT
case 'a':
case 'A':
-#endif
case 'e':
case 'E':
case 'f':
@@ -1431,7 +1422,7 @@
else
ADDTYPE(T_DOUBLE);
break;
-#endif /* FLOATING_POINT */
+#endif /* !NO_FLOATING_POINT */
case 'n':
if (flags & INTMAXT)
ADDTYPE(TP_INTMAXT);
@@ -1551,7 +1542,7 @@
case TP_INTMAXT:
(*argtable) [n].pintmaxarg = va_arg (ap, intmax_t *);
break;
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
case T_DOUBLE:
(*argtable) [n].doublearg = va_arg (ap, double);
break;
@@ -1608,7 +1599,7 @@
}
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
static int
exponent(wchar_t *p0, int exp, wchar_t fmtch)
@@ -1645,4 +1636,4 @@
}
return (p - p0);
}
-#endif /* FLOATING_POINT */
+#endif /* !NO_FLOATING_POINT */
==== //depot/projects/gdb/lib/libc/stdio/vfwscanf.c#4 (text+ko) ====
@@ -34,14 +34,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#if 0
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
-__FBSDID("FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.35 2004/01/31 23:16:09 das Exp ");
#endif
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwscanf.c,v 1.10 2004/04/07 09:55:05 tjr Exp $");
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwscanf.c,v 1.12 2004/05/02 20:13:29 obrien Exp $");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon May 3 05:35:44 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 1D60D16A4D0; Mon, 3 May 2004 05:35:44 -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 EAD4D16A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 05:35:43 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id C82F843D2D
for <perforce@freebsd.org>; Mon, 3 May 2004 05:35:43 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43CZhGe005041
for <perforce@freebsd.org>; Mon, 3 May 2004 05:35:43 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43CZhOB005038
for perforce@freebsd.org; Mon, 3 May 2004 05:35:43 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Mon, 3 May 2004 05:35:43 -0700 (PDT)
Message-Id: <200405031235.i43CZhOB005038@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52131 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: Mon, 03 May 2004 12:35:44 -0000
http://perforce.freebsd.org/chv.cgi?CH=52131
Change 52131 by cvance@cvance_g5 on 2004/05/03 05:35:02
Integrate installation instructions from jaguar version of SEDarwin
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/bootstrap_instructions.txt#1 branch
Differences ...
From owner-p4-projects@FreeBSD.ORG Mon May 3 05:56:10 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 152C916A4D0; Mon, 3 May 2004 05:56:10 -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 CC32616A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 05:56:09 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 8C4ED43D5C
for <perforce@freebsd.org>; Mon, 3 May 2004 05:56:09 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43Cu9Ge009101
for <perforce@freebsd.org>; Mon, 3 May 2004 05:56:09 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43Cu9Am009098
for perforce@freebsd.org; Mon, 3 May 2004 05:56:09 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Mon, 3 May 2004 05:56:09 -0700 (PDT)
Message-Id: <200405031256.i43Cu9Am009098@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52133 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: Mon, 03 May 2004 12:56:10 -0000
http://perforce.freebsd.org/chv.cgi?CH=52133
Change 52133 by cvance@cvance_g5 on 2004/05/03 05:55:27
Begin to update the installation instructions. I'll probably be
reworking the build system, so there will be more changes coming.
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/bootstrap_instructions.txt#2 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/bootstrap_instructions.txt#2 (text+ko) ====
@@ -1,12 +1,12 @@
-XXX: These are still draft install instructions, and known to be
+These are still draft install instructions, and known to be
potentially flakey. Caution advised, especially near the end.
-Step 1: Mac OS X Jaguar 10.2.8
+Step 1: Mac OS X Jaguar 10.3.3
- Install Jaguar from your installation medium. In our environment,
- we typically install 10.2.7, then use Software Update to slide
- forward to 10.2.8. Currently, Panther and older Jaguar releases
- are not supported.
+ Install Panther from your installation medium. In our environment,
+ we typically install 10.3.0, then use Software Update to slide
+ forward to 10.3.3. Currently, older releases are not supported.
+ The 10.3.3 combined updated is included on the SEDarwin source CD.
The instructions assume that / is the root of the system that
will have SEdarwin installed. Boot into that partition before
@@ -21,7 +21,7 @@
In our environment, this requires installing and configuring the
Perforce client, then checking out:
- //projects/trustedbsd/sedarwin/...
+ //projects/trustedbsd/sedarwin73/...
The remaining steps will assume that the current working directory
at the start of each step is your local checkout of the sedarwin
@@ -33,57 +33,17 @@
build tools available from the Apple Open Source web page. These
tools are:
- bootstrap_cmds-35
+ bootstrap_cmds-44
Libstreams-23
- cctools-435.4
+ cctools-495.2
- These may also be checked out and installed from the TrustedBSD
- Perforce repository using the following paths:
+ These packages are included on the SEDarwin source CD, as well as a
+ tarfile containing binaries.
- //depot/vendor/apple/darwin/apsl/...
+ Extract the tarfile into /usr/local on the build system.
- Build, install bootstrap_cmds using:
-
- cd bootstrap_cmds
- make ; sudo make install
- cd ..
-
- Copy a header that was left out of the Jaguar header installation:
-
- sudo cp /usr/include/sys/unistd.h \
- /System/Library/Frameworks/Kernel.framework/Headers/sys/
-
- Build, install Libstreams:
-
- cd Libstreams
- make ; sudo make install
- cd ..
-
- In the next step, selected parts of cctools must be built and installed
- to allow a Darwin kernel to be built on Mac OS X. First, you must
- manually edit cctools/Makefile to replace the COMMON_SUBDIRS
- definition with:
-
- COMMON_SUBDIRS=libstuff libmacho misc
-
- Next, build these components:
-
- cd cctools
- make RC_OS=macos
-
- Next, install seg_hack:
-
- sudo cp misc/seg_hack.NEW /usr/local/bin/seg_hack
-
- Next, build and install libkld:
-
- cd ld
- make RC_OS=macos kld_build
- sudo cp static_kld/libkld.a /usr/local/lib
- sudo ranlib /usr/local/lib/libkld.a
- cd ../..
-
- You now have the missing bits of the Darwin kernel build installed.
+ cd /usr/local
+ sudo tar xvzf buildtools_usrlocal.tgz
Step 3: Configure TrustedBSD/SEBSD makefiles
From owner-p4-projects@FreeBSD.ORG Mon May 3 07:53:43 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 564C816A4D0; Mon, 3 May 2004 07:53:43 -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 2A40B16A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 07:53:43 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id A624743D1D
for <perforce@freebsd.org>; Mon, 3 May 2004 07:53:41 -0700 (PDT)
(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43ErfGe036223
for <perforce@freebsd.org>; Mon, 3 May 2004 07:53:41 -0700 (PDT)
(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43ErcwF036219
for perforce@freebsd.org; Mon, 3 May 2004 07:53:38 -0700 (PDT)
(envelope-from imp@freebsd.org)
Date: Mon, 3 May 2004 07:53:38 -0700 (PDT)
Message-Id: <200405031453.i43ErcwF036219@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52139 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: Mon, 03 May 2004 14:53:44 -0000
http://perforce.freebsd.org/chv.cgi?CH=52139
Change 52139 by imp@imp_pacopaco on 2004/05/03 07:53:26
IFC @52136
Affected files ...
.. //depot/projects/power/sys/alpha/conf/GENERIC#6 integrate
.. //depot/projects/power/sys/amd64/conf/GENERIC#6 integrate
.. //depot/projects/power/sys/boot/i386/boot0/Makefile#6 integrate
.. //depot/projects/power/sys/boot/i386/boot0/boot0.S#1 branch
.. //depot/projects/power/sys/boot/i386/boot0/boot0.s#5 delete
.. //depot/projects/power/sys/boot/i386/boot0/boot0ext.S#1 branch
.. //depot/projects/power/sys/boot/i386/boot0/boot0ext.s#3 delete
.. //depot/projects/power/sys/boot/i386/boot0/boot0sio.s#4 delete
.. //depot/projects/power/sys/boot/i386/boot0ext/Makefile#2 integrate
.. //depot/projects/power/sys/boot/i386/boot0sio/Makefile#3 integrate
.. //depot/projects/power/sys/boot/i386/boot2/boot1.S#2 integrate
.. //depot/projects/power/sys/boot/i386/boot2/sio.S#2 integrate
.. //depot/projects/power/sys/boot/i386/btx/btx/Makefile#4 integrate
.. //depot/projects/power/sys/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/projects/power/sys/boot/i386/btx/btxldr/Makefile#4 integrate
.. //depot/projects/power/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate
.. //depot/projects/power/sys/boot/i386/cdboot/Makefile#4 integrate
.. //depot/projects/power/sys/boot/i386/libi386/amd64_tramp.S#2 integrate
.. //depot/projects/power/sys/boot/i386/mbr/Makefile#4 integrate
.. //depot/projects/power/sys/boot/i386/pxeldr/Makefile#4 integrate
.. //depot/projects/power/sys/boot/i386/pxeldr/pxeldr.S#2 integrate
.. //depot/projects/power/sys/boot/pc98/boot2/serial_16550.S#2 integrate
.. //depot/projects/power/sys/boot/pc98/boot2/serial_8251.S#2 integrate
.. //depot/projects/power/sys/boot/pc98/btx/btx/Makefile#3 integrate
.. //depot/projects/power/sys/boot/pc98/btx/btx/btx.S#2 integrate
.. //depot/projects/power/sys/boot/pc98/btx/btxldr/Makefile#3 integrate
.. //depot/projects/power/sys/boot/pc98/btx/btxldr/btxldr.S#2 integrate
.. //depot/projects/power/sys/cam/scsi/scsi_da.c#7 integrate
.. //depot/projects/power/sys/compat/ndis/subr_ntoskrnl.c#7 integrate
.. //depot/projects/power/sys/conf/NOTES#16 integrate
.. //depot/projects/power/sys/conf/files#13 integrate
.. //depot/projects/power/sys/conf/files.i386#10 integrate
.. //depot/projects/power/sys/conf/files.sparc64#4 integrate
.. //depot/projects/power/sys/conf/majors#9 integrate
.. //depot/projects/power/sys/conf/options#16 integrate
.. //depot/projects/power/sys/conf/options.sparc64#2 integrate
.. //depot/projects/power/sys/contrib/pf/net/pf.c#4 integrate
.. //depot/projects/power/sys/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/power/sys/contrib/pf/net/pf_norm.c#2 integrate
.. //depot/projects/power/sys/dev/asr/asr.c#5 integrate
.. //depot/projects/power/sys/dev/ata/ata-all.c#8 integrate
.. //depot/projects/power/sys/dev/ata/ata-all.h#8 integrate
.. //depot/projects/power/sys/dev/ata/ata-commands.h#2 integrate
.. //depot/projects/power/sys/dev/ata/ata-disk.h#3 integrate
.. //depot/projects/power/sys/dev/ata/ata-isa.c#6 integrate
.. //depot/projects/power/sys/dev/ata/ata-lowlevel.c#10 integrate
.. //depot/projects/power/sys/dev/ata/ata-pci.c#11 integrate
.. //depot/projects/power/sys/dev/ata/ata-pci.h#8 integrate
.. //depot/projects/power/sys/dev/ata/ata-queue.c#7 integrate
.. //depot/projects/power/sys/dev/ata/atapi-cd.h#4 integrate
.. //depot/projects/power/sys/dev/ata/atapi-fd.h#3 integrate
.. //depot/projects/power/sys/dev/ata/atapi-tape.h#2 integrate
.. //depot/projects/power/sys/dev/cy/cy.c#2 integrate
.. //depot/projects/power/sys/dev/cy/cy_isa.c#2 integrate
.. //depot/projects/power/sys/dev/cy/cy_pci.c#2 integrate
.. //depot/projects/power/sys/dev/cy/cyvar.h#1 branch
.. //depot/projects/power/sys/dev/if_ndis/if_ndis.c#10 integrate
.. //depot/projects/power/sys/dev/led/led.c#6 integrate
.. //depot/projects/power/sys/dev/mii/brgphy.c#4 integrate
.. //depot/projects/power/sys/dev/mii/dcphy.c#2 integrate
.. //depot/projects/power/sys/dev/mii/e1000phy.c#3 integrate
.. //depot/projects/power/sys/dev/mii/mii.c#2 integrate
.. //depot/projects/power/sys/dev/mii/mii_physubr.c#2 integrate
.. //depot/projects/power/sys/dev/mii/mlphy.c#2 integrate
.. //depot/projects/power/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/power/sys/dev/mii/ruephy.c#2 integrate
.. //depot/projects/power/sys/dev/mii/tlphy.c#2 integrate
.. //depot/projects/power/sys/dev/mii/xmphy.c#2 integrate
.. //depot/projects/power/sys/dev/pci/pci.c#16 integrate
.. //depot/projects/power/sys/dev/sio/sio.c#9 integrate
.. //depot/projects/power/sys/dev/sio/sio_ebus.c#3 delete
.. //depot/projects/power/sys/dev/sound/pcm/buffer.c#4 integrate
.. //depot/projects/power/sys/dev/usb/usbdevs#11 integrate
.. //depot/projects/power/sys/dev/usb/usbdevs.h#11 integrate
.. //depot/projects/power/sys/dev/usb/usbdevs_data.h#11 integrate
.. //depot/projects/power/sys/dev/usb/uvscom.c#4 integrate
.. //depot/projects/power/sys/geom/gate/g_gate.c#1 branch
.. //depot/projects/power/sys/geom/gate/g_gate.h#1 branch
.. //depot/projects/power/sys/geom/geom_gpt.c#3 integrate
.. //depot/projects/power/sys/i386/conf/GENERIC#10 integrate
.. //depot/projects/power/sys/i386/conf/NOTES#13 integrate
.. //depot/projects/power/sys/i386/include/mpapic.h#2 delete
.. //depot/projects/power/sys/i386/isa/clock.c#5 integrate
.. //depot/projects/power/sys/i386/isa/cy.c#7 delete
.. //depot/projects/power/sys/i386/isa/cyreg.h#2 delete
.. //depot/projects/power/sys/i386/isa/ic/cd1400.h#2 delete
.. //depot/projects/power/sys/ia64/acpica/madt.c#3 integrate
.. //depot/projects/power/sys/ia64/conf/GENERIC#4 integrate
.. //depot/projects/power/sys/ia64/conf/SKI#2 integrate
.. //depot/projects/power/sys/ia64/ia64/trap.c#7 integrate
.. //depot/projects/power/sys/kern/kern_clock.c#6 integrate
.. //depot/projects/power/sys/kern/kern_environment.c#2 integrate
.. //depot/projects/power/sys/kern/kern_thread.c#7 integrate
.. //depot/projects/power/sys/kern/link_elf_obj.c#1 branch
.. //depot/projects/power/sys/kern/subr_sleepqueue.c#2 integrate
.. //depot/projects/power/sys/modules/geom/geom_gate/Makefile#1 branch
.. //depot/projects/power/sys/modules/sio/Makefile#2 integrate
.. //depot/projects/power/sys/net/if.h#6 integrate
.. //depot/projects/power/sys/net/if_var.h#11 integrate
.. //depot/projects/power/sys/net/if_vlan.c#6 integrate
.. //depot/projects/power/sys/netgraph/ng_parse.c#4 integrate
.. //depot/projects/power/sys/netinet/ip_fastfwd.c#4 integrate
.. //depot/projects/power/sys/netinet/ip_input.c#8 integrate
.. //depot/projects/power/sys/netinet/ip_output.c#8 integrate
.. //depot/projects/power/sys/netinet/ip_var.h#6 integrate
.. //depot/projects/power/sys/netinet/tcp_input.c#12 integrate
.. //depot/projects/power/sys/netipsec/key.c#5 integrate
.. //depot/projects/power/sys/pc98/conf/GENERIC#5 integrate
.. //depot/projects/power/sys/pc98/pc98/sio.c#7 integrate
.. //depot/projects/power/sys/pci/cy_pci.c#5 delete
.. //depot/projects/power/sys/powerpc/conf/GENERIC#3 integrate
.. //depot/projects/power/sys/sparc64/conf/GENERIC#4 integrate
.. //depot/projects/power/sys/sparc64/conf/NOTES#2 integrate
.. //depot/projects/power/sys/sparc64/ebus/ebus.c#3 integrate
.. //depot/projects/power/sys/sparc64/include/nexusvar.h#2 integrate
.. //depot/projects/power/sys/sparc64/isa/ofw_isa.c#2 integrate
.. //depot/projects/power/sys/sparc64/isa/ofw_isa.h#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/identcpu.c#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/nexus.c#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/ofw_machdep.c#5 integrate
.. //depot/projects/power/sys/sys/mbuf.h#11 integrate
.. //depot/projects/power/sys/sys/proc.h#11 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_vfsops.c#8 integrate
Differences ...
==== //depot/projects/power/sys/alpha/conf/GENERIC#6 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.168 2004/01/24 21:45:25 jeff Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.170 2004/05/02 20:40:17 marcel Exp $
machine alpha
cpu EV4
@@ -60,6 +60,7 @@
options CD9660 #ISO 9660 Filesystem
options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework
+options GEOM_GPT #GUID Partition Tables.
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options COMPAT_FREEBSD4 #Compatible with FreeBSD4
options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI
@@ -194,10 +195,10 @@
device umass # Disks/Mass storage - Requires scbus and da0
device ums # Mouse
# USB Ethernet
-device aue # ADMtek USB ethernet
-device axe # ASIX Electronics USB ethernet
-device cue # CATC USB ethernet
-device kue # Kawasaki LSI USB ethernet
+device aue # ADMtek USB Ethernet
+device axe # ASIX Electronics USB Ethernet
+device cue # CATC USB Ethernet
+device kue # Kawasaki LSI USB Ethernet
# FireWire support
device firewire # FireWire bus code
==== //depot/projects/power/sys/amd64/conf/GENERIC#6 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.405 2004/03/25 03:19:28 obrien Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.407 2004/05/02 20:40:18 marcel Exp $
machine amd64
cpu HAMMER
@@ -44,6 +44,7 @@
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
options PSEUDOFS # Pseudo-filesystem framework
+options GEOM_GPT # GUID Partition Tables.
options IA32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI
@@ -180,7 +181,7 @@
# PCI Ethernet NICs that use the common MII bus controller code.
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
device miibus # MII bus support
-device bfe # Broadcom BCM440x 10/100 ethernet
+device bfe # Broadcom BCM440x 10/100 Ethernet
device bge # Broadcom BCM570xx Gigabit Ethernet
device dc # DEC/Intel 21143 and various workalikes
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
@@ -189,9 +190,9 @@
device rl # RealTek 8129/8139
device sf # Adaptec AIC-6915 (``Starfire'')
device sis # Silicon Integrated Systems SiS 900/SiS 7016
-device sk # SysKonnect SK-984x & SK-982x gigabit ethernet
+device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
device ste # Sundance ST201 (D-Link DFE-550TX)
-device ti # Alteon Networks Tigon I/II gigabit ethernet
+device ti # Alteon Networks Tigon I/II gigabit Ethernet
device tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 ``EPIC'')
device vr # VIA Rhine, Rhine II
@@ -210,8 +211,8 @@
#device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc.
# XXX kvtop brokenness, pointer/int warnings
#device lnc # NE2100, NE32-VL Lance Ethernet cards
-device sn # SMC's 9000 series of ethernet chips
-device xe # Xircom pccard ethernet
+device sn # SMC's 9000 series of Ethernet chips
+device xe # Xircom pccard Ethernet
# ISA devices that use the old ISA shims
#device le
@@ -253,10 +254,10 @@
device urio # Diamond Rio 500 MP3 player
device uscanner # Scanners
# USB Ethernet, requires mii
-device aue # ADMtek USB ethernet
-device axe # ASIX Electronics USB ethernet
-device cue # CATC USB ethernet
-device kue # Kawasaki LSI USB ethernet
+device aue # ADMtek USB Ethernet
+device axe # ASIX Electronics USB Ethernet
+device cue # CATC USB Ethernet
+device kue # Kawasaki LSI USB Ethernet
# FireWire support
device firewire # FireWire bus code
==== //depot/projects/power/sys/boot/i386/boot0/Makefile#6 (text+ko) ====
@@ -1,12 +1,10 @@
-# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.25 2004/04/25 20:36:43 obrien Exp $
+# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.29 2004/04/28 21:31:19 ru Exp $
-PROG= ${BOOT}
-INTERNALPROG=
-FILES= ${BOOT}
+PROG?= boot0
+STRIP=
+BINMODE=${NOBINMODE}
NOMAN=
-SRCS= ${BOOT}.s
-
-BOOT?= boot0
+SRCS= ${PROG}.S
# The default set of flags compiled into boot0. This enables update (writing
# the modified boot0 back to disk after running so that the selection made is
@@ -29,9 +27,9 @@
# command line
BOOT_BOOT0_COMCONSOLE_SPEED?= 0xE3
-AFLAGS+=--defsym FLAGS=${BOOT_BOOT0_FLAGS} \
- --defsym TICKS=${BOOT_BOOT0_TICKS} \
- --defsym COMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED}
+CFLAGS+=-DFLAGS=${BOOT_BOOT0_FLAGS} \
+ -DTICKS=${BOOT_BOOT0_TICKS} \
+ -DCOMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED}
LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-S,--oformat,binary
==== //depot/projects/power/sys/boot/i386/boot0ext/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/sys/boot/i386/boot0ext/Makefile,v 1.1 2004/03/26 18:46:31 obrien Exp $
+# $FreeBSD: src/sys/boot/i386/boot0ext/Makefile,v 1.2 2004/04/28 21:31:20 ru Exp $
.PATH: ${.CURDIR}/../boot0
-BOOT= boot0ext
+PROG= boot0ext
.include "${.CURDIR}/../boot0/Makefile"
==== //depot/projects/power/sys/boot/i386/boot0sio/Makefile#3 (text+ko) ====
@@ -1,7 +1,8 @@
-# $FreeBSD: src/sys/boot/i386/boot0sio/Makefile,v 1.2 2004/02/06 21:58:31 ru Exp $
+# $FreeBSD: src/sys/boot/i386/boot0sio/Makefile,v 1.4 2004/04/28 21:31:20 ru Exp $
.PATH: ${.CURDIR}/../boot0
-BOOT= boot0sio
+PROGNAME= boot0sio
+CFLAGS+= -DSIO
.include "${.CURDIR}/../boot0/Makefile"
==== //depot/projects/power/sys/boot/i386/boot2/boot1.S#2 (text+ko) ====
@@ -1,21 +1,21 @@
-//
-// Copyright (c) 1998 Robert Nordier
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms are freely
-// permitted provided that the above copyright notice and this
-// paragraph and the following disclaimer are duplicated in all
-// such forms.
-//
-// This software is provided "AS IS" and without any express or
-// implied warranties, including, without limitation, the implied
-// warranties of merchantability and fitness for a particular
-// purpose.
-//
+/*
+ * Copyright (c) 1998 Robert Nordier
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are freely
+ * permitted provided that the above copyright notice and this
+ * paragraph and the following disclaimer are duplicated in all
+ * such forms.
+ *
+ * This software is provided "AS IS" and without any express or
+ * implied warranties, including, without limitation, the implied
+ * warranties of merchantability and fitness for a particular
+ * purpose.
+ *
+ * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.26 2004/04/28 14:31:43 ru Exp $
+ */
-// $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.24 2004/02/17 07:13:04 ru Exp $
-
-// Memory Locations
+/* Memory Locations */
.set MEM_REL,0x700 // Relocation address
.set MEM_ARG,0x900 // Arguments
.set MEM_ORG,0x7c00 // Origin
@@ -25,15 +25,15 @@
.set MEM_USR,0xa000 // Client start
.set BDA_BOOT,0x472 // Boot howto flag
-// Partition Constants
+/* Partition Constants */
.set PRT_OFF,0x1be // Partition offset
.set PRT_NUM,0x4 // Partitions
.set PRT_BSD,0xa5 // Partition type
-// Flag Bits
+/* Flag Bits */
.set FL_PACKET,0x80 // Packet mode
-// Misc. Constants
+/* Misc. Constants */
.set SIZ_PAG,0x1000 // Page size
.set SIZ_SEC,0x200 // Sector size
@@ -44,19 +44,20 @@
start: jmp main // Start recognizably
-// This is the start of a standard BIOS Parameter Block (BPB). Most bootable
-// FAT disks have this at the start of their MBR. While normal BIOS's will
-// work fine without this section, IBM's El Torito emulation "fixes" up the
-// BPB by writing into the memory copy of the MBR. Rather than have data
-// written into our xread routine, we'll define a BPB to work around it.
-// The data marked with (T) indicates a field required for a ThinkPad to
-// recognize the disk and (W) indicates fields written from IBM BIOS code.
-// The use of the BPB is based on what OpenBSD and NetBSD implemented in
-// their boot code but the required fields were determined by trial and error.
-//
-// Note: If additional space is needed in boot1, one solution would be to
-// move the "prompt" message data (below) to replace the OEM ID.
-
+/*
+ * This is the start of a standard BIOS Parameter Block (BPB). Most bootable
+ * FAT disks have this at the start of their MBR. While normal BIOS's will
+ * work fine without this section, IBM's El Torito emulation "fixes" up the
+ * BPB by writing into the memory copy of the MBR. Rather than have data
+ * written into our xread routine, we'll define a BPB to work around it.
+ * The data marked with (T) indicates a field required for a ThinkPad to
+ * recognize the disk and (W) indicates fields written from IBM BIOS code.
+ * The use of the BPB is based on what OpenBSD and NetBSD implemented in
+ * their boot code but the required fields were determined by trial and error.
+ *
+ * Note: If additional space is needed in boot1, one solution would be to
+ * move the "prompt" message data (below) to replace the OEM ID.
+ */
.org 0x03, 0x00
oemid: .space 0x08, 0x00 // OEM ID
@@ -78,21 +79,21 @@
ebpb: .byte 0 // BIOS physical drive number (W)
.org 0x25,0x90
-//
-// Trampoline used by boot2 to call read to read data from the disk via
-// the BIOS. Call with:
-//
-// %cx:%ax - long - LBA to read in
-// %es:(%bx) - caddr_t - buffer to read data into
-// %dl - byte - drive to read from
-// %dh - byte - num sectors to read
-//
+/*
+ * Trampoline used by boot2 to call read to read data from the disk via
+ * the BIOS. Call with:
+ *
+ * %cx:%ax - long - LBA to read in
+ * %es:(%bx) - caddr_t - buffer to read data into
+ * %dl - byte - drive to read from
+ * %dh - byte - num sectors to read
+ */
xread: push %ss // Address
pop %ds // data
-//
-// Setup an EDD disk packet and pass it to read
-//
+/*
+ * Setup an EDD disk packet and pass it to read
+ */
xread.1: // Starting
pushl $0x0 // absolute
push %cx // block
@@ -107,37 +108,37 @@
callw read // Read from disk
lea 0x10(%bp),%sp // Clear stack
lret // To far caller
-//
-// Load the rest of boot2 and BTX up, copy the parts to the right locations,
-// and start it all up.
-//
+/*
+ * Load the rest of boot2 and BTX up, copy the parts to the right locations,
+ * and start it all up.
+ */
-//
-// Setup the segment registers to flat addressing (segment 0) and setup the
-// stack to end just below the start of our code.
-//
+/*
+ * Setup the segment registers to flat addressing (segment 0) and setup the
+ * stack to end just below the start of our code.
+ */
main: cld // String ops inc
xor %cx,%cx // Zero
mov %cx,%es // Address
mov %cx,%ds // data
mov %cx,%ss // Set up
mov $start,%sp // stack
-//
-// Relocate ourself to MEM_REL. Since %cx == 0, the inc %ch sets
-// %cx == 0x100.
-//
+/*
+ * Relocate ourself to MEM_REL. Since %cx == 0, the inc %ch sets
+ * %cx == 0x100.
+ */
mov %sp,%si // Source
mov $MEM_REL,%di // Destination
incb %ch // Word count
rep // Copy
movsw // code
-//
-// If we are on a hard drive, then load the MBR and look for the first
-// FreeBSD slice. We use the fake partition entry below that points to
-// the MBR when we call nread. The first pass looks for the first active
-// FreeBSD slice. The second pass looks for the first non-active FreeBSD
-// slice if the first one fails.
-//
+/*
+ * If we are on a hard drive, then load the MBR and look for the first
+ * FreeBSD slice. We use the fake partition entry below that points to
+ * the MBR when we call nread. The first pass looks for the first active
+ * FreeBSD slice. The second pass looks for the first non-active FreeBSD
+ * slice if the first one fails.
+ */
mov $part4,%si // Partition
cmpb $0x80,%dl // Hard drive?
jb main.4 // No
@@ -157,30 +158,30 @@
jb main.2 // Yes
dec %cx // Do two
jcxz main.1 // passes
-//
-// If we get here, we didn't find any FreeBSD slices at all, so print an
-// error message and die.
-//
+/*
+ * If we get here, we didn't find any FreeBSD slices at all, so print an
+ * error message and die.
+ */
mov $msg_part,%si // Message
jmp error // Error
-//
-// Floppies use partition 0 of drive 0.
-//
+/*
+ * Floppies use partition 0 of drive 0.
+ */
main.4: xor %dx,%dx // Partition:drive
-//
-// Ok, we have a slice and drive in %dx now, so use that to locate and load
-// boot2. %si references the start of the slice we are looking for, so go
-// ahead and load up the first 16 sectors (boot1 + boot2) from that. When
-// we read it in, we conveniently use 0x8cec as our transfer buffer. Thus,
-// boot1 ends up at 0x8cec, and boot2 starts at 0x8cec + 0x200 = 0x8eec.
-// The first part of boot2 is the disklabel, which is 0x114 bytes long.
-// The second part is BTX, which is thus loaded into 0x9000, which is where
-// it also runs from. The boot2.bin binary starts right after the end of
-// BTX, so we have to figure out where the start of it is and then move the
-// binary to 0xc000. Normally, BTX clients start at MEM_USR, or 0xa000, but
-// when we use btxld to create boot2, we use an entry point of 0x2000. That
-// entry point is relative to MEM_USR; thus boot2.bin starts at 0xc000.
-//
+/*
+ * Ok, we have a slice and drive in %dx now, so use that to locate and load
+ * boot2. %si references the start of the slice we are looking for, so go
+ * ahead and load up the first 16 sectors (boot1 + boot2) from that. When
+ * we read it in, we conveniently use 0x8cec as our transfer buffer. Thus,
+ * boot1 ends up at 0x8cec, and boot2 starts at 0x8cec + 0x200 = 0x8eec.
+ * The first part of boot2 is the disklabel, which is 0x114 bytes long.
+ * The second part is BTX, which is thus loaded into 0x9000, which is where
+ * it also runs from. The boot2.bin binary starts right after the end of
+ * BTX, so we have to figure out where the start of it is and then move the
+ * binary to 0xc000. Normally, BTX clients start at MEM_USR, or 0xa000, but
+ * when we use btxld to create boot2, we use an entry point of 0x2000. That
+ * entry point is relative to MEM_USR; thus boot2.bin starts at 0xc000.
+ */
main.5: mov %dx,MEM_ARG // Save args
movb $NSECT,%dh // Sector count
callw nread // Read disk
@@ -198,9 +199,9 @@
stosb // up to 0x10000
callw seta20 // Enable A20
jmp start+MEM_JMP-MEM_ORG // Start BTX
-//
-// Enable A20 so we can access memory above 1 meg.
-//
+/*
+ * Enable A20 so we can access memory above 1 meg.
+ */
seta20: cli // Disable interrupts
seta20.1: inb $0x64,%al // Get status
testb $0x2,%al // Busy?
@@ -214,9 +215,9 @@
outb %al,$0x60 // A20
sti // Enable interrupts
retw // To caller
-//
-// Trampoline used to call read from within boot1.
-//
+/*
+ * Trampoline used to call read from within boot1.
+ */
nread: mov $MEM_BUF,%bx // Transfer buffer
mov 0x8(%si),%ax // Get
mov 0xa(%si),%cx // LBA
@@ -226,10 +227,10 @@
mov $msg_read,%si // Otherwise, set the error
// message and fall through to
// the error routine
-//
-// Print out the error message pointed to by %ds:(%si) followed
-// by a prompt, wait for a keypress, and then reboot the machine.
-//
+/*
+ * Print out the error message pointed to by %ds:(%si) followed
+ * by a prompt, wait for a keypress, and then reboot the machine.
+ */
error: callw putstr // Display message
mov $prompt,%si // Display
callw putstr // prompt
@@ -237,9 +238,9 @@
int $0x16 // keypress
movw $0x1234, BDA_BOOT // Do a warm boot
ljmp $0xffff,$0x0 // reboot the machine
-//
-// Display a null-terminated string using the BIOS output.
-//
+/*
+ * Display a null-terminated string using the BIOS output.
+ */
putstr.0: mov $0x7,%bx // Page:attribute
movb $0xe,%ah // BIOS: Display
int $0x10 // character
@@ -247,24 +248,24 @@
testb %al,%al // End of string?
jne putstr.0 // No
-//
-// Overused return code. ereturn is used to return an error from the
-// read function. Since we assume putstr succeeds, we (ab)use the
-// same code when we return from putstr.
-//
+/*
+ * Overused return code. ereturn is used to return an error from the
+ * read function. Since we assume putstr succeeds, we (ab)use the
+ * same code when we return from putstr.
+ */
ereturn: movb $0x1,%ah // Invalid
stc // argument
return: retw // To caller
-//
-// Reads sectors from the disk. If EDD is enabled, then check if it is
-// installed and use it if it is. If it is not installed or not enabled, then
-// fall back to using CHS. Since we use a LBA, if we are using CHS, we have to
-// fetch the drive parameters from the BIOS and divide it out ourselves.
-// Call with:
-//
-// %dl - byte - drive number
-// stack - 10 bytes - EDD Packet
-//
+/*
+ * Reads sectors from the disk. If EDD is enabled, then check if it is
+ * installed and use it if it is. If it is not installed or not enabled, then
+ * fall back to using CHS. Since we use a LBA, if we are using CHS, we have to
+ * fetch the drive parameters from the BIOS and divide it out ourselves.
+ * Call with:
+ *
+ * %dl - byte - drive number
+ * stack - 10 bytes - EDD Packet
+ */
read: push %dx // Save
movb $0x8,%ah // BIOS: Get drive
int $0x13 // parameters
@@ -343,7 +344,7 @@
int $0x13 // read
retw // To caller
-// Messages
+/* Messages */
msg_read: .asciz "Read"
msg_part: .asciz "Boot"
@@ -354,7 +355,7 @@
.org PRT_OFF,0x90
-// Partition table
+/* Partition table */
.fill 0x30,0x1,0x0
part4: .byte 0x80, 0x00, 0x01, 0x00
==== //depot/projects/power/sys/boot/i386/boot2/sio.S#2 (text+ko) ====
@@ -1,23 +1,23 @@
-#
-# Copyright (c) 1998 Robert Nordier
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are freely
-# permitted provided that the above copyright notice and this
-# paragraph and the following disclaimer are duplicated in all
-# such forms.
-#
-# This software is provided "AS IS" and without any express or
-# implied warranties, including, without limitation, the implied
-# warranties of merchantability and fitness for a particular
-# purpose.
-#
+/*
+ * Copyright (c) 1998 Robert Nordier
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are freely
+ * permitted provided that the above copyright notice and this
+ * paragraph and the following disclaimer are duplicated in all
+ * such forms.
+ *
+ * This software is provided "AS IS" and without any express or
+ * implied warranties, including, without limitation, the implied
+ * warranties of merchantability and fitness for a particular
+ * purpose.
+ *
+ * $FreeBSD: src/sys/boot/i386/boot2/sio.S,v 1.8 2004/04/28 14:31:43 ru Exp $
+ */
-# $FreeBSD: src/sys/boot/i386/boot2/sio.S,v 1.6 2004/02/17 07:13:04 ru Exp $
-
- .set SIO_PRT,SIOPRT # Base port
- .set SIO_FMT,SIOFMT # 8N1
- .set SIO_DIV,(115200/SIOSPD) # 115200 / SPD
+ .set SIO_PRT,SIOPRT // Base port
+ .set SIO_FMT,SIOFMT // 8N1
+ .set SIO_DIV,(115200/SIOSPD) // 115200 / SPD
.globl sio_init
.globl sio_flush
@@ -25,56 +25,56 @@
.globl sio_getc
.globl sio_ischar
-# void sio_init(void)
+/* void sio_init(void) */
-sio_init: movw $SIO_PRT+0x3,%dx # Data format reg
- movb $SIO_FMT|0x80,%al # Set format
- outb %al,(%dx) # and DLAB
- pushl %edx # Save
- subb $0x3,%dl # Divisor latch reg
- movw $SIO_DIV,%ax # Set
- outw %ax,(%dx) # BPS
- popl %edx # Restore
- movb $SIO_FMT,%al # Clear
- outb %al,(%dx) # DLAB
- incl %edx # Modem control reg
- movb $0x3,%al # Set RTS,
- outb %al,(%dx) # DTR
- incl %edx # Line status reg
+sio_init: movw $SIO_PRT+0x3,%dx // Data format reg
+ movb $SIO_FMT|0x80,%al // Set format
+ outb %al,(%dx) // and DLAB
+ pushl %edx // Save
+ subb $0x3,%dl // Divisor latch reg
+ movw $SIO_DIV,%ax // Set
+ outw %ax,(%dx) // BPS
+ popl %edx // Restore
+ movb $SIO_FMT,%al // Clear
+ outb %al,(%dx) // DLAB
+ incl %edx // Modem control reg
+ movb $0x3,%al // Set RTS,
+ outb %al,(%dx) // DTR
+ incl %edx // Line status reg
-# void sio_flush(void)
+/* void sio_flush(void) */
-sio_flush.0: call sio_getc.1 # Get character
-sio_flush: call sio_ischar # Check for character
- jnz sio_flush.0 # Till none
- ret # To caller
+sio_flush.0: call sio_getc.1 // Get character
+sio_flush: call sio_ischar // Check for character
+ jnz sio_flush.0 // Till none
+ ret // To caller
-# void sio_putc(int c)
+/* void sio_putc(int c) */
-sio_putc: movw $SIO_PRT+0x5,%dx # Line status reg
- xor %ecx,%ecx # Timeout
- movb $0x40,%ch # counter
-sio_putc.1: inb (%dx),%al # Transmitter
- testb $0x20,%al # buffer empty?
- loopz sio_putc.1 # No
- jz sio_putc.2 # If timeout
- movb 0x4(%esp,1),%al # Get character
- subb $0x5,%dl # Transmitter hold reg
- outb %al,(%dx) # Write character
-sio_putc.2: ret $0x4 # To caller
+sio_putc: movw $SIO_PRT+0x5,%dx // Line status reg
+ xor %ecx,%ecx // Timeout
+ movb $0x40,%ch // counter
+sio_putc.1: inb (%dx),%al // Transmitter
+ testb $0x20,%al // buffer empty?
+ loopz sio_putc.1 // No
+ jz sio_putc.2 // If timeout
+ movb 0x4(%esp,1),%al // Get character
+ subb $0x5,%dl // Transmitter hold reg
+ outb %al,(%dx) // Write character
+sio_putc.2: ret $0x4 // To caller
-# int sio_getc(void)
+/* int sio_getc(void) */
-sio_getc: call sio_ischar # Character available?
- jz sio_getc # No
-sio_getc.1: subb $0x5,%dl # Receiver buffer reg
- inb (%dx),%al # Read character
- ret # To caller
+sio_getc: call sio_ischar // Character available?
+ jz sio_getc // No
+sio_getc.1: subb $0x5,%dl // Receiver buffer reg
+ inb (%dx),%al // Read character
+ ret // To caller
-# int sio_ischar(void)
+/* int sio_ischar(void) */
-sio_ischar: movw $SIO_PRT+0x5,%dx # Line status register
- xorl %eax,%eax # Zero
- inb (%dx),%al # Received data
- andb $0x1,%al # ready?
- ret # To caller
+sio_ischar: movw $SIO_PRT+0x5,%dx // Line status register
+ xorl %eax,%eax // Zero
+ inb (%dx),%al // Received data
+ andb $0x1,%al // ready?
+ ret // To caller
==== //depot/projects/power/sys/boot/i386/btx/btx/Makefile#4 (text+ko) ====
@@ -1,10 +1,9 @@
-# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.17 2004/04/25 20:36:43 obrien Exp $
+# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.18 2004/04/27 19:45:15 ru Exp $
PROG= btx
INTERNALPROG=
NOMAN=
SRCS= btx.S
-CLEANFILES= btx
.if defined(PAGING)
CFLAGS+=-DPAGING
==== //depot/projects/power/sys/boot/i386/btx/btx/btx.S#2 (text+ko) ====
@@ -1,1173 +1,1174 @@
-#
-# Copyright (c) 1998 Robert Nordier
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are freely
-# permitted provided that the above copyright notice and this
-# paragraph and the following disclaimer are duplicated in all
-# such forms.
-#
-# This software is provided "AS IS" and without any express or
-# implied warranties, including, without limitation, the implied
-# warranties of merchantability and fitness for a particular
-# purpose.
-#
+/*
+ * Copyright (c) 1998 Robert Nordier
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are freely
+ * permitted provided that the above copyright notice and this
+ * paragraph and the following disclaimer are duplicated in all
+ * such forms.
+ *
+ * This software is provided "AS IS" and without any express or
+ * implied warranties, including, without limitation, the implied
+ * warranties of merchantability and fitness for a particular
+ * purpose.
+ *
+ * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.36 2004/04/28 14:31:43 ru Exp $
+ */
-# $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.34 2004/02/11 08:42:37 ru Exp $
-
-#
-# Memory layout.
-#
- .set MEM_BTX,0x1000 # Start of BTX memory
- .set MEM_ESP0,0x1800 # Supervisor stack
- .set MEM_BUF,0x1800 # Scratch buffer
- .set MEM_ESP1,0x1e00 # Link stack
- .set MEM_IDT,0x1e00 # IDT
- .set MEM_TSS,0x1f98 # TSS
- .set MEM_MAP,0x2000 # I/O bit map
- .set MEM_DIR,0x4000 # Page directory
- .set MEM_TBL,0x5000 # Page tables
- .set MEM_ORG,0x9000 # BTX code
- .set MEM_USR,0xa000 # Start of user memory
-#
-# Paging control.
-#
- .set PAG_SIZ,0x1000 # Page size
- .set PAG_CNT,0x1000 # Pages to map
-#
-# Segment selectors.
-#
- .set SEL_SCODE,0x8 # Supervisor code
- .set SEL_SDATA,0x10 # Supervisor data
- .set SEL_RCODE,0x18 # Real mode code
- .set SEL_RDATA,0x20 # Real mode data
- .set SEL_UCODE,0x28|3 # User code
- .set SEL_UDATA,0x30|3 # User data
- .set SEL_TSS,0x38 # TSS
-#
-# Task state segment fields.
-#
- .set TSS_ESP0,0x4 # PL 0 ESP
- .set TSS_SS0,0x8 # PL 0 SS
- .set TSS_ESP1,0xc # PL 1 ESP
- .set TSS_MAP,0x66 # I/O bit map base
-#
-# System calls.
-#
- .set SYS_EXIT,0x0 # Exit
- .set SYS_EXEC,0x1 # Exec
-#
-# V86 constants.
-#
- .set V86_FLG,0x208eff # V86 flag mask
- .set V86_STK,0x400 # V86 stack allowance
-#
-# Dump format control bytes.
-#
- .set DMP_X16,0x1 # Word
- .set DMP_X32,0x2 # Long
- .set DMP_MEM,0x4 # Memory
- .set DMP_EOL,0x8 # End of line
-#
-# Screen defaults and assumptions.
-#
- .set SCR_MAT,0x7 # Mode/attribute
- .set SCR_COL,0x50 # Columns per row
- .set SCR_ROW,0x19 # Rows per screen
-#
-# BIOS Data Area locations.
-#
- .set BDA_MEM,0x413 # Free memory
- .set BDA_KEYFLAGS,0x417 # Keyboard shift-state flags
- .set BDA_SCR,0x449 # Video mode
- .set BDA_POS,0x450 # Cursor position
- .set BDA_BOOT,0x472 # Boot howto flag
-#
-# Derivations, for brevity.
-#
- .set _ESP0H,MEM_ESP0>>0x8 # Byte 1 of ESP0
- .set _ESP1H,MEM_ESP1>>0x8 # Byte 1 of ESP1
- .set _TSSIO,MEM_MAP-MEM_TSS # TSS I/O base
- .set _TSSLM,MEM_DIR-MEM_TSS-1 # TSS limit
- .set _IDTLM,MEM_TSS-MEM_IDT-1 # IDT limit
-#
-# Code segment.
-#
+/*
+ * Memory layout.
+ */
+ .set MEM_BTX,0x1000 // Start of BTX memory
+ .set MEM_ESP0,0x1800 // Supervisor stack
+ .set MEM_BUF,0x1800 // Scratch buffer
+ .set MEM_ESP1,0x1e00 // Link stack
+ .set MEM_IDT,0x1e00 // IDT
+ .set MEM_TSS,0x1f98 // TSS
+ .set MEM_MAP,0x2000 // I/O bit map
+ .set MEM_DIR,0x4000 // Page directory
+ .set MEM_TBL,0x5000 // Page tables
+ .set MEM_ORG,0x9000 // BTX code
+ .set MEM_USR,0xa000 // Start of user memory
+/*
+ * Paging control.
+ */
+ .set PAG_SIZ,0x1000 // Page size
+ .set PAG_CNT,0x1000 // Pages to map
+/*
+ * Segment selectors.
+ */
+ .set SEL_SCODE,0x8 // Supervisor code
+ .set SEL_SDATA,0x10 // Supervisor data
+ .set SEL_RCODE,0x18 // Real mode code
+ .set SEL_RDATA,0x20 // Real mode data
+ .set SEL_UCODE,0x28|3 // User code
+ .set SEL_UDATA,0x30|3 // User data
+ .set SEL_TSS,0x38 // TSS
+/*
+ * Task state segment fields.
+ */
+ .set TSS_ESP0,0x4 // PL 0 ESP
+ .set TSS_SS0,0x8 // PL 0 SS
+ .set TSS_ESP1,0xc // PL 1 ESP
+ .set TSS_MAP,0x66 // I/O bit map base
+/*
+ * System calls.
+ */
+ .set SYS_EXIT,0x0 // Exit
+ .set SYS_EXEC,0x1 // Exec
+/*
+ * V86 constants.
+ */
+ .set V86_FLG,0x208eff // V86 flag mask
+ .set V86_STK,0x400 // V86 stack allowance
+/*
+ * Dump format control bytes.
+ */
+ .set DMP_X16,0x1 // Word
+ .set DMP_X32,0x2 // Long
+ .set DMP_MEM,0x4 // Memory
+ .set DMP_EOL,0x8 // End of line
+/*
+ * Screen defaults and assumptions.
+ */
+ .set SCR_MAT,0x7 // Mode/attribute
+ .set SCR_COL,0x50 // Columns per row
+ .set SCR_ROW,0x19 // Rows per screen
+/*
+ * BIOS Data Area locations.
+ */
+ .set BDA_MEM,0x413 // Free memory
+ .set BDA_KEYFLAGS,0x417 // Keyboard shift-state flags
+ .set BDA_SCR,0x449 // Video mode
+ .set BDA_POS,0x450 // Cursor position
+ .set BDA_BOOT,0x472 // Boot howto flag
+/*
+ * Derivations, for brevity.
+ */
+ .set _ESP0H,MEM_ESP0>>0x8 // Byte 1 of ESP0
+ .set _ESP1H,MEM_ESP1>>0x8 // Byte 1 of ESP1
+ .set _TSSIO,MEM_MAP-MEM_TSS // TSS I/O base
+ .set _TSSLM,MEM_DIR-MEM_TSS-1 // TSS limit
+ .set _IDTLM,MEM_TSS-MEM_IDT-1 // IDT limit
+/*
+ * Code segment.
+ */
.globl start
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon May 3 08:37:58 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6015516A4E8; Mon, 3 May 2004 08:37:58 -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 3380D16A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 08:37:58 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id F3E9843D4C
for <perforce@freebsd.org>; Mon, 3 May 2004 08:37:57 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43FbvGe045482
for <perforce@freebsd.org>; Mon, 3 May 2004 08:37:57 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43FbvKB045479
for perforce@freebsd.org; Mon, 3 May 2004 08:37:57 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Date: Mon, 3 May 2004 08:37:57 -0700 (PDT)
Message-Id: <200405031537.i43FbvKB045479@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52142 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: Mon, 03 May 2004 15:37:59 -0000
http://perforce.freebsd.org/chv.cgi?CH=52142
Change 52142 by areisse@areisse_ibook on 2004/05/03 08:37:37
use some different malloc functions
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/sebsd/ss/global.h#2 edit
.. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/sebsd/ss/queue.c#2 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/sebsd/ss/global.h#2 (text+ko) ====
@@ -31,7 +31,9 @@
#include <errno.h>
#define sebsd_malloc(a,b,c) (c&M_ZERO)?calloc(1,a):malloc(a)
#define sebsd_free(a,b) free(a)
-#define kmalloc(l, f) malloc(l)
+#define sebsd_ss_malloc(a,b) (b&M_ZERO)?calloc(1,a):malloc(a)
+#define sebsd_ss_free(a) free(a)
+#define kmalloc(l,f) sebsd_ss_malloc(l,f)
#define mtx_lock(a)
#define mtx_unlock(a)
#endif /* _KERNEL */
==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/sebsd/ss/queue.c#2 (text+ko) ====
@@ -11,9 +11,6 @@
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/kernel.h>
-#else /* FreeBSD _KERNEL */
-#define malloc(a,b,c) (c&M_ZERO)?calloc(1,a):malloc(a)
-#define free(a,b) free(a)
#endif
#include <security/sebsd/linux-compat.h>
@@ -25,8 +22,8 @@
{
queue_t q;
- q = (queue_t) malloc(sizeof(struct queue_info),
- M_SEBSD, M_WAITOK);
+ q = (queue_t) sebsd_ss_malloc(sizeof(struct queue_info),
+ M_WAITOK);
if (q == NULL)
return NULL;
@@ -43,8 +40,8 @@
if (!q)
return -1;
- newnode = (queue_node_ptr_t) malloc(sizeof(struct queue_node),
- M_SEBSD, M_WAITOK);
+ newnode = (queue_node_ptr_t) sebsd_ss_malloc(sizeof(struct queue_node),
+ M_WAITOK);
if (newnode == NULL)
return -1;
@@ -69,8 +66,8 @@
if (!q)
return -1;
- newnode = (queue_node_ptr_t) malloc(sizeof(struct queue_node),
- M_SEBSD, M_WAITOK);
+ newnode = (queue_node_ptr_t) sebsd_ss_malloc(sizeof(struct queue_node),
+ M_WAITOK);
if (newnode == NULL)
return -1;
@@ -106,7 +103,7 @@
q->tail = NULL;
e = node->element;
- free(node, M_SEBSD);
+ sebsd_ss_free(node);
return e;
}
@@ -135,10 +132,10 @@
while (p != NULL) {
temp = p;
p = p->next;
- free(temp, M_SEBSD);
+ sebsd_ss_free(temp);
}
- free(q, M_SEBSD);
+ sebsd_ss_free(q);
}
int queue_map(queue_t q, int (*f) (queue_element_t, void *), void *vp)
@@ -191,7 +188,7 @@
temp = p;
p = p->next;
g(temp->element, vp);
- free(temp, M_SEBSD);
+ sebsd_ss_free(temp);
} else {
last = p;
p = p->next;
From owner-p4-projects@FreeBSD.ORG Mon May 3 10:00:41 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 80FFD16A543; Mon, 3 May 2004 10:00:41 -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 3A4D316A541
for <perforce@freebsd.org>; Mon, 3 May 2004 10:00:41 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 3699C43D45
for <perforce@freebsd.org>; Mon, 3 May 2004 10:00:40 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43H0eGe069319
for <perforce@freebsd.org>; Mon, 3 May 2004 10:00:40 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43H0dlY069311
for perforce@freebsd.org; Mon, 3 May 2004 10:00:39 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Mon, 3 May 2004 10:00:39 -0700 (PDT)
Message-Id: <200405031700.i43H0dlY069311@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52146 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: Mon, 03 May 2004 17:00:41 -0000
http://perforce.freebsd.org/chv.cgi?CH=52146
Change 52146 by cvance@cvance_g5 on 2004/05/03 10:00:36
Rework the build environment quite a bit. Most newly added Makefiles
now require bsdmake instead of the default make (which is gnumake).
Hopefully the build is much more self-contained at this point, and
it's possible to specify an alternate installation directory.
This system still needs quite a bit of testing, and not at pieces are
hooked in yet (mach_init, wslogin, etc).
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/Makeconfig#2 edit
.. //depot/projects/trustedbsd/sedarwin73/Makefile#1 add
.. //depot/projects/trustedbsd/sedarwin73/apsl/Makefile#1 add
.. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile#4 edit
.. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile.postamble#4 edit
.. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile.preamble#4 edit
.. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/Makefile.postamble#3 edit
.. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/Makefile.preamble#3 edit
.. //depot/projects/trustedbsd/sedarwin73/etc/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/export/Makefile#1 add
.. //depot/projects/trustedbsd/sedarwin73/extattr_cmds/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/extattr_cmds/extattr/rmextattr.c#1 branch
.. //depot/projects/trustedbsd/sedarwin73/extattr_cmds/extattrcmds.c#2 delete
.. //depot/projects/trustedbsd/sedarwin73/extattr_cmds/extattrctl.8#2 delete
.. //depot/projects/trustedbsd/sedarwin73/extattr_cmds/extattrctl.c#2 delete
.. //depot/projects/trustedbsd/sedarwin73/extattr_cmds/extattrctl/extattrctl.8#1 branch
.. //depot/projects/trustedbsd/sedarwin73/extattr_cmds/extattrctl/extattrctl.c#1 branch
.. //depot/projects/trustedbsd/sedarwin73/libextattr/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/libmac/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin73/libsebsd/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/mac_cmds/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/mac_cmds/getfmac/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/mac_cmds/getpmac/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/mac_cmds/mexec/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/mac_cmds/setfsmac/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/mac_cmds/setpmac/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/other/Makefile#1 add
.. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/Makefile#4 delete
.. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/Makefile#4 edit
.. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/Makefile.postamble#4 edit
.. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/Makefile.preamble#4 edit
.. //depot/projects/trustedbsd/sedarwin73/policy/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/checkpolicy/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/loadpolicy/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/newrole/Makefile#2 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/Makeconfig#2 (text+ko) ====
@@ -1,7 +1,35 @@
+# Set this to the root of the darwin kernel source.
+SEDARWIN_ROOT = /Volumes/Space/cvance/trustedbsd/sedarwin73
-# Set this to the root of the darwin kernel source.
-DARWIN = /Users/andrew/p4/sedarwin73/apsl/xnu
+# Set the following variable to the installation directory
+# or leave blank for "/"
+#DESTDIR =
+DESTDIR = $(SEDARWIN_ROOT)/export/root
+
+# if you aren't going to install as root, you need to set the
+# user for
+#EXPORT_OWNER=
+EXPORT_OWNER= cvance
+
+#
+# You shouldn't have to edit anything else
+#
+DARWIN = $(SEDARWIN_ROOT)/apsl/xnu
EXPORT_HDRS = $(DARWIN)/BUILD/obj/EXPORT_HDRS
+CFLAGS += -I$(EXPORT_HDRS)/bsd -I$(EXPORT_HDRS)/osfmk -I$(EXPORT_HDRS)
+LDADD+= -L$(SEDARWIN_ROOT)/libsebsd -L$(SEDARWIN_ROOT)/libmac
+POLICYDIR= $(DESTDIR)/
+BINDIR= /usr/bin
-CFLAGS += -I$(EXPORT_HDRS)/bsd -I$(EXPORT_HDRS)
+# DSTROOT is used by projectbuilder Makefiles
+DSTROOT= $(DESTDIR)
+
+BINOWN= $(EXPORT_OWNER)
+BINGRP= $(EXPORT_OWNER)
+LIBOWN= $(EXPORT_OWNER)
+LIBGRP= $(EXPORT_OWNER)
+INCOWN= $(EXPORT_OWNER)
+INCGRP= $(EXPORT_OWNER)
+MANOWN= $(EXPORT_OWNER)
+MANGRP= $(EXPORT_OWNER)
==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/Makefile#3 (text+ko) ====
@@ -1,48 +1,7 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
+include ../../Makeconfig
-NAME = bootstrap_cmds
+SUBDIR= migcom.tproj
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Aggregate
+MAKE=gnumake
-TOOLS = migcom.tproj config.tproj relpath.tproj decomment.tproj
-
-OTHERSRCS = Makefile.preamble Makefile Makefile.postamble\
- vers_string.sh vers_string.1
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = aggregate.make
-LIBS =
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-NEXTSTEP_PB_CFLAGS = -DNeXT
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/bootstrap_cmds
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(JDKBINDIR)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
-
--include Makefile.dependencies
+.include <bsd.subdir.mk>
==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile#4 (text+ko) ====
@@ -6,7 +6,7 @@
# Put all of your customizations in files called Makefile.preamble
# and Makefile.postamble (both optional), and Makefile will include them.
#
-
+include ../../../Makeconfig
NAME = migcom
PROJECTVERSION = 2.8
==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile.postamble#4 (text+ko) ====
==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile.preamble#4 (text+ko) ====
==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/Makefile#3 (text+ko) ====
@@ -1,49 +1,7 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
+include ../../Makeconfig
-NAME = file_cmds
+SUBDIR= ls
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Aggregate
+MAKE=gnumake
-TOOLS = chflags chmod chown compress cp dd df du install ln ls\
- mkdir mkfifo mknod mtree mv pax rm rmdir rmt shar tcopy\
- touch file
-
-OTHERSRCS = PROJECT Makefile.preamble Makefile Makefile.postamble
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = aggregate.make
-LIBS =
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-NEXTSTEP_PB_CFLAGS = -no-cpp-precomp
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
-
--include Makefile.dependencies
+.include <bsd.subdir.mk>
==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/Makefile#3 (text+ko) ====
@@ -7,6 +7,8 @@
# and Makefile.postamble (both optional), and Makefile will include them.
#
+include ../../../Makeconfig
+
NAME = ls
PROJECTVERSION = 2.8
@@ -22,7 +24,8 @@
CODE_GEN_STYLE = DYNAMIC
MAKEFILE = tool.make
NEXTSTEP_INSTALLDIR = /bin
-LIBS = ../../../libmac/libmac.a
+OTHER_CFLAGS= -I$(EXPORT_HDRS)/bsd -I$(EXPORT_HDRS)/osfmk -I$(EXPORT_HDRS)
+LIBS = -L$(SEDARWIN_ROOT)/libmac -lmac
DEBUG_LIBS = $(LIBS)
PROF_LIBS = $(LIBS)
@@ -45,5 +48,6 @@
include $(MAKEFILEDIR)/$(MAKEFILE)
-include Makefile.postamble
-
+CHOWN = /usr/bin/true
+CHGRP = /usr/bin/true
-include Makefile.dependencies
==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/Makefile.postamble#3 (text+ko) ====
==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/Makefile.preamble#3 (text+ko) ====
==== //depot/projects/trustedbsd/sedarwin73/etc/Makefile#2 (text+ko) ====
@@ -1,2 +1,11 @@
+include ../Makeconfig
+
+ETCFILES= mac.conf
+
install:
- sudo install -m 644 -o root -g wheel mac.conf /etc
+ cd ${.CURDIR}; \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ $(ETCFILES) ${DESTDIR}/etc;
+
+
+.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sedarwin73/extattr_cmds/Makefile#2 (text+ko) ====
@@ -1,26 +1,6 @@
-
include ../Makeconfig
-PROGS=rmextattr getextattr lsextattr setextattr extattrctl
-all: $(PROGS)
+SUBDIR= extattr \
+ extattrctl
-rmextattr: extattrcmds.o
- gcc -o rmextattr extattrcmds.o ../libextattr/libextattr.a
-
-lsextattr: rmextattr
- ln $< $@
-
-getextattr: rmextattr
- ln $< $@
-
-setextattr: rmextattr
- ln $< $@
-
-extattrctl: extattrctl.o
- gcc -o extattrctl extattrctl.o ../libextattr/libextattr.a
-
-install: all
- install -m 755 -o root -g wheel $(PROGS) /usr/sbin
-
-clean:
- rm -f *.o rmextattr getextattr lsextattr setextattr extattrctl
+.include <bsd.subdir.mk>
==== //depot/projects/trustedbsd/sedarwin73/libextattr/Makefile#2 (text+ko) ====
@@ -1,15 +1,6 @@
-
include ../Makeconfig
-OBJS = extattr.o
+LIB= extattr
+SRCS = extattr.c
-libextattr.a: $(OBJS)
- ar cr $@ $(OBJS)
- ranlib $@
-
-install:
- install -m 444 -o root -g wheel libextattr.a /usr/lib
-
-clean:
- rm -f $(OBJS) libextattr.a
-
+.include <bsd.lib.mk>
==== //depot/projects/trustedbsd/sedarwin73/libmac/Makefile#3 (text+ko) ====
@@ -1,22 +1,8 @@
-
include ../Makeconfig
-OBJS = mac.o mac_get.o mac_set.o mac_exec.o security.o
+LIB= mac
+SHLIBDIR?= $(DESTDIR)/lib
-VPATH = $(EXPORT_HDRS)/osfmk/mach /usr/include/mach
+SRCS = mac.c mac_exec.c mac_get.c mac_set.c security.c
-%.c: %.defs
- mig $(CFLAGS) -user $@ -header security.h -server /dev/null -sheader /dev/null $<
-
-libmac.a: $(OBJS)
- ar cr $@ $(OBJS)
- ranlib $@
-
-install:
- install -m 444 -o root -g wheel libmac.a /usr/lib
-
-clean:
- rm -f $(OBJS) libmac.a
-
-security.o: security.c
- gcc -c -o $@ $<
+.include <bsd.lib.mk>
==== //depot/projects/trustedbsd/sedarwin73/libsebsd/Makefile#2 (text+ko) ====
@@ -1,35 +1,15 @@
-
include ../Makeconfig
-all: libsebsd.a
+LIB= sebsd
-OBJS= system.o security_get_user_contexts.o get_ordered_context_list.o \
- getseccontext.o query_user_context.o security_change_context.o \
- string_to_security_class.o security_compute_av.o context.o \
- get_default_type.o
+SRCS= system.c security_get_user_contexts.c get_ordered_context_list.c \
+ getseccontext.c query_user_context.c security_change_context.c \
+ string_to_security_class.c security_compute_av.c context.c \
+ get_default_type.c
-CFLAGS+= -g -I$(EXPORT_HDRS)/security/sebsd
-libsebsd.a: $(OBJS)
- ar cr $@ $(OBJS)
- ranlib $@
+CFLAGS+= -I$(EXPORT_HDRS)/security/sebsd
+INCS= sebsd.h sebsd_context.h sebsd_fs.h sebsd_proc.h sebsd_ss.h
+INCDIR= $(INCLUDEDIR)/sebsd
-HDIR = /usr/include/security/sebsd
-HEADERS = $(HDIR)/sebsd.h $(HDIR)/sebsd_ss.h $(HDIR)/flask_types.h $(HDIR)/linux-compat.h $(HDIR)/sebsd_context.h $(HDIR)/sebsd_proc.h $(HDIR)/sebsd_fs.h $(HDIR)/flask.h $(HDIR)/sebsd_syscalls.h
-
-install-headers: $(HDIR) $(HEADERS)
-
-install:
- install -m 444 -o root -g wheel libsebsd.a /usr/lib
-
-$(HDIR):
- mkdir -p $(HDIR)
-
-$(HDIR)/%.h: %.h
- cp $< $@
-
-$(HDIR)/%.h: $(EXPORT_HDRS)/security/sebsd/%.h
- cp $< $@
-
-clean:
- rm -f $(OBJS)
+.include <bsd.lib.mk>
==== //depot/projects/trustedbsd/sedarwin73/mac_cmds/Makefile#2 (text+ko) ====
@@ -1,18 +1,9 @@
+include ../Makeconfig
-all:
- (cd getfmac ; make)
- (cd getpmac ; make)
- (cd mexec ; make)
- (cd setfsmac ; make)
+SUBDIR= getfmac \
+ getpmac \
+ mexec \
+ setfsmac \
+ setpmac
-clean:
- (cd getfmac ; make clean)
- (cd getpmac ; make clean)
- (cd mexec ; make clean)
- (cd setfsmac ; make clean)
-
-install:
- (cd getfmac ; make install)
- (cd getpmac ; make install)
- (cd mexec ; make install)
- (cd setfsmac ; make install)
+.include <bsd.subdir.mk>
==== //depot/projects/trustedbsd/sedarwin73/mac_cmds/getfmac/Makefile#2 (text+ko) ====
@@ -1,9 +1,8 @@
+include ../../Makeconfig
+
+PROG= getfmac
+MAN8= getfmac.8
-include ../../Makeconfig
+LDADD+= -lmac
-getfmac: getfmac.o
- gcc -o getfmac getfmac.o ../../libmac/libmac.a
-install:
- install -m 755 -o root -g wheel getfmac /usr/sbin
-clean:
- rm -f getmac.o getfmac
+.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sedarwin73/mac_cmds/getpmac/Makefile#2 (text+ko) ====
@@ -1,9 +1,8 @@
+include ../../Makeconfig
+
+PROG= getpmac
+MAN8= getpmac.8
-include ../../Makeconfig
+LDADD+= -lmac
-getpmac: getpmac.o
- gcc -o getpmac getpmac.o ../../libmac/libmac.a
-install:
- install -m 755 -o root -g wheel getpmac /usr/sbin
-clean:
- rm -f getpmac.o getpmac
+.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sedarwin73/mac_cmds/mexec/Makefile#2 (text+ko) ====
@@ -1,9 +1,8 @@
+include ../../Makeconfig
+
+PROG= mexec
+NOMAN=
-include ../../Makeconfig
+LDADD+= -lmac
-mexec: mexec.o
- gcc -o mexec mexec.o ../../libmac/libmac.a
-install:
- install -m 755 -o root -g wheel mexec /usr/sbin
-clean:
- rm -f mexec.o mexec
+.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sedarwin73/mac_cmds/setfsmac/Makefile#2 (text+ko) ====
@@ -1,10 +1,9 @@
+include ../../Makeconfig
+
+PROG= setfsmac
+MAN8= setfsmac.8 setfmac.8
-include ../../Makeconfig
+LDADD+= -lmac
+LINKS+= $(BINDIR)/setfsmac $(BINDIR)/setfmac
-setfsmac: setfsmac.o
- gcc -o setfsmac setfsmac.o ../../libmac/libmac.a
-install:
- install -m 755 -o root -g wheel setfsmac /usr/sbin
- ln -f /usr/sbin/setfsmac /usr/sbin/setfmac
-clean:
- rm -f setfsmac setfsmac.o
+.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sedarwin73/mac_cmds/setpmac/Makefile#2 (text+ko) ====
@@ -1,9 +1,8 @@
+include ../../Makeconfig
+
+PROG= setpmac
+MAN8= setpmac.8
-include ../../Makeconfig
+LDADD+= -lmac
-setpmac: setpmac.o
- gcc -o setpmac setpmac.o ../../libmac/libmac.a
-install:
- install -m 755 -o root -g wheel setpmac /usr/sbin
-clean:
- rm -f setpmac.o setpmac
+.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/Makefile#4 (text+ko) ====
@@ -6,7 +6,7 @@
# Put all of your customizations in files called Makefile.preamble
# and Makefile.postamble (both optional), and Makefile will include them.
#
-
+include ../../../Makeconfig
NAME = ps
PROJECTVERSION = 2.8
@@ -26,7 +26,8 @@
NEXTSTEP_INSTALLDIR = /bin
WINDOWS_INSTALLDIR = /Library/Executables
PDO_UNIX_INSTALLDIR = /bin
-LIBS = ../../../libmac/libmac.a
+OTHER_CFLAGS= -I$(EXPORT_HDRS)/bsd -I$(EXPORT_HDRS)/osfmk -I$(EXPORT_HDRS)
+LIBS = -L$(SEDARWIN_ROOT)/libmac -lmac
DEBUG_LIBS = $(LIBS)
PROF_LIBS = $(LIBS)
==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/Makefile.postamble#4 (text+ko) ====
@@ -1,6 +1,7 @@
include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
INSTALL_PERMISSIONS = 4755
+DSTROOT= $(DESTDIR)
after_install:
/usr/bin/install -m 755 -d "$(DSTROOT)/usr/share/man/man1"
install -c -m 644 ps.1 "$(DSTROOT)/usr/share/man/man1/ps.1"
==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/Makefile.preamble#4 (text+ko) ====
@@ -1,1 +1,2 @@
include $(MAKEFILEPATH)/CoreOS/ProjectBuilder/Makefile.Preamble.Common
+DSTROOT=$(DESTDIR)
==== //depot/projects/trustedbsd/sedarwin73/policy/Makefile#2 (text+ko) ====
@@ -1,6 +1,8 @@
include ../Makeconfig
-default: policy.16
+POLICY= policy.16
+
+all: $(POLICY)
INPUTS = flask/security_classes initial_sids \
flask/access_vectors rules.m4 users initial_sid_contexts fs_use \
@@ -9,21 +11,26 @@
policy.conf: $(INPUTS)
cat $(INPUTS) > policy.conf
-policy.16: policy.conf
- checkpolicy -o $@ $<
+$(POLICY): policy.conf
+ $(DESTDIR)/$(BINDIR)/checkpolicy -o $(POLICY) policy.conf
rules.m4: rules
- m4 -Imacros -s $< > $@
+ m4 -Imacros -s rules > rules.m4
fc.out: fc
sudo /Users/andrew/setfsmac -x -t -s fc /bin > fc.out
genfs: fc.out
- cat $< | sed -ne 's/^\/[a-zA-Z0-9\/\.]* *[^ ]*$$/genfscon hfs &/p' > $@
+ cat fc.out | sed -ne 's/^\/[a-zA-Z0-9\/\.]* *[^ ]*$$/genfscon hfs &/p' > genfs
clean:
- rm -f bininclude policy.16 policy.conf policy.h rules.m4 fc.out \
+ rm -f bininclude $(POLICY) policy.conf policy.h rules.m4 fc.out \
genfs
relabel: fc
- setfsmac -s $^ /
+ $(DESTDIR)/$(BINDIR)/setfsmac -s fc /
+
+install:
+ $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${POLICYDIR}
+
+.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/Makefile#2 (text+ko) ====
@@ -1,16 +1,7 @@
+include ../Makeconfig
-all:
- (cd checkpolicy ; make)
- (cd loadpolicy ; make)
- (cd newrole ; make)
+SUBDIR= checkpolicy \
+ loadpolicy \
+ newrole
-clean:
- (cd checkpolicy ; make clean)
- (cd loadpolicy ; make clean)
- (cd newrole ; make clean)
-
-install:
- (cd checkpolicy ; make install)
- (cd loadpolicy ; make install)
- (cd newrole ; make install)
-
+.include <bsd.subdir.mk>
==== //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/checkpolicy/Makefile#2 (text+ko) ====
@@ -1,23 +1,15 @@
-
include ../../Makeconfig
-VPATH = . $(DARWIN)/security/sebsd/ss
+.PATH: $(CURDIR) ../../apsl/xnu/security/sebsd/ss
-OBJS = checkpolicy.o write.o policy_parse.o policy_scan.o services.o \
- hashtab.o avtab.o ebitmap.o queue.o sidtab.o symtab.o policydb.o
+PROG= checkpolicy
+NOMAN=
-checkpolicy: $(OBJS)
- gcc -o checkpolicy $(OBJS) -lfl ../../libsebsd/libsebsd.a
+SRCS = checkpolicy.c write.c policy_parse.y policy_scan.l services.c \
+ hashtab.c avtab.c ebitmap.c queue.c sidtab.c symtab.c policydb.c
-policy_scan.o: policy_parse.h
-policy_parse.h: policy_parse.y
- mv -f y.tab.h policy_parse.h
-
-CFLAGS += -I$(DARWIN)/security/sebsd/ss
+CFLAGS+= -I../../apsl/xnu/security/sebsd/ss
+LDADD+= -lsebsd -lfl
YFLAGS += -d
-install:
- install -m 0755 -o root -g wheel checkpolicy /sbin
-
-clean:
- rm -f $(OBJS) policy_parse.h checkpolicy
+.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/loadpolicy/Makefile#2 (text+ko) ====
@@ -1,15 +1,9 @@
-
include ../../Makeconfig
-OBJS = sebsd_loadpolicy.o
+PROG= sebsd_loadpolicy
+MAN8= sebsd_loadpolicy.8
-sebsd_loadpolicy: $(OBJS)
- gcc -o sebsd_loadpolicy $(OBJS) ../../libsebsd/libsebsd.a ../../libmac/libmac.a
+CFLAGS+= -I../../apsl/xnu/security/sebsd/
+LDADD+= -lsebsd -lmac
-install:
- install -m 755 -o root -g wheel sebsd_loadpolicy /usr/sbin
-
-clean:
- rm -f $(OBJS) sebsd_loadpolicy
-
-CFLAGS += -I../../apsl/xnu/security/sebsd
+.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/newrole/Makefile#2 (text+ko) ====
@@ -1,15 +1,8 @@
-
include ../../Makeconfig
-OBJS = sebsd_newrole.o
+PROG= sebsd_newrole
-sebsd_newrole: $(OBJS)
- gcc -o sebsd_newrole $(OBJS) ../../libsebsd/libsebsd.a ../../libmac/libmac.a -lpam
+CFLAGS+= -I../../apsl/xnu/security/sebsd/
+LDADD+= -lsebsd -lmac -lpam
-install:
- install -m 755 -o root -g wheel sebsd_newrole /usr/sbin
-
-clean:
- rm -f $(OBJS) sebsd_newrole
-
-CFLAGS += -I../../apsl/xnu/security/sebsd
+.include <bsd.prog.mk>
From owner-p4-projects@FreeBSD.ORG Mon May 3 10:13:57 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id F039B16A4D0; Mon, 3 May 2004 10:13:56 -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 CC51916A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 10:13:56 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id B8E7143D3F
for <perforce@freebsd.org>; Mon, 3 May 2004 10:13:56 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43HDuGe074090
for <perforce@freebsd.org>; Mon, 3 May 2004 10:13:56 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43HDulN074087
for perforce@freebsd.org; Mon, 3 May 2004 10:13:56 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Mon, 3 May 2004 10:13:56 -0700 (PDT)
Message-Id: <200405031713.i43HDulN074087@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52147 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: Mon, 03 May 2004 17:13:57 -0000
http://perforce.freebsd.org/chv.cgi?CH=52147
Change 52147 by cvance@cvance_g5 on 2004/05/03 10:13:40
Add the policy subdirectory to the list of things to install
Use /private/etc instead of /etc
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/etc/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin73/export/Makefile#2 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/Makefile#2 (text+ko) ====
@@ -10,6 +10,7 @@
extattr_cmds \
mac_cmds \
sebsd_cmds \
+ policy \
apsl/file_cmds \
apsl/bootstrap_cmds
==== //depot/projects/trustedbsd/sedarwin73/etc/Makefile#3 (text+ko) ====
@@ -5,7 +5,7 @@
install:
cd ${.CURDIR}; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- $(ETCFILES) ${DESTDIR}/etc;
+ $(ETCFILES) ${DESTDIR}/private/etc;
-.include <bsd.prog.mk>+.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sedarwin73/export/Makefile#2 (text+ko) ====
@@ -1,6 +1,6 @@
include ../Makeconfig
-DIRS= $(DESTDIR)/etc \
+DIRS= $(DESTDIR)/private/etc \
$(DESTDIR)/bin \
$(DESTDIR)/usr/bin \
$(DESTDIR)/usr/lib \
From owner-p4-projects@FreeBSD.ORG Mon May 3 10:40:31 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id AAB8616A4D0; Mon, 3 May 2004 10:40:31 -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 82D4B16A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 10:40:31 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 4AB8A43D49
for <perforce@freebsd.org>; Mon, 3 May 2004 10:40:31 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43HeUGe078337
for <perforce@freebsd.org>; Mon, 3 May 2004 10:40:30 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43HeU2n078333
for perforce@freebsd.org; Mon, 3 May 2004 10:40:30 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Mon, 3 May 2004 10:40:30 -0700 (PDT)
Message-Id: <200405031740.i43HeU2n078333@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52150 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: Mon, 03 May 2004 17:40:32 -0000
http://perforce.freebsd.org/chv.cgi?CH=52150
Change 52150 by cvance@cvance_g5 on 2004/05/03 10:39:59
Refine build just a bit more.
Rename export to "release"
Really hook the policy build back into the makefiles.
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/Makeconfig#3 edit
.. //depot/projects/trustedbsd/sedarwin73/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin73/export/Makefile#3 delete
.. //depot/projects/trustedbsd/sedarwin73/policy/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin73/release/Makefile#1 add
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/Makeconfig#3 (text+ko) ====
@@ -4,7 +4,7 @@
# Set the following variable to the installation directory
# or leave blank for "/"
#DESTDIR =
-DESTDIR = $(SEDARWIN_ROOT)/export/root
+DESTDIR = $(SEDARWIN_ROOT)/export
# if you aren't going to install as root, you need to set the
# user for
==== //depot/projects/trustedbsd/sedarwin73/Makefile#3 (text+ko) ====
@@ -1,7 +1,7 @@
include Makeconfig
-SUBDIR= apsl \
- export \
+SUBDIR= release \
+ apsl \
libextattr \
libmac \
libsebsd \
@@ -17,6 +17,6 @@
# sebsd_system
distclean:
- cd export && $(MAKE) distclean
+ cd release && $(MAKE) distclean
.include <bsd.subdir.mk>
==== //depot/projects/trustedbsd/sedarwin73/policy/Makefile#3 (text+ko) ====
@@ -12,7 +12,7 @@
cat $(INPUTS) > policy.conf
$(POLICY): policy.conf
- $(DESTDIR)/$(BINDIR)/checkpolicy -o $(POLICY) policy.conf
+ ../sebsd_cmds/checkpolicy/checkpolicy -o $(POLICY) policy.conf
rules.m4: rules
m4 -Imacros -s rules > rules.m4
@@ -28,7 +28,7 @@
genfs
relabel: fc
- $(DESTDIR)/$(BINDIR)/setfsmac -s fc /
+ @echo This is broken
install:
$(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${POLICYDIR}
From owner-p4-projects@FreeBSD.ORG Mon May 3 11:11:26 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0FB1516A4D0; Mon, 3 May 2004 11:11:26 -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 D9A2516A4CE
for <perforce@FreeBSD.org>; Mon, 3 May 2004 11:11:25 -0700 (PDT)
Received: from mail4.speakeasy.net (mail4.speakeasy.net [216.254.0.204])
by mx1.FreeBSD.org (Postfix) with ESMTP id AF62943D54
for <perforce@FreeBSD.org>; Mon, 3 May 2004 11:11:25 -0700 (PDT)
(envelope-from jhb@FreeBSD.org)
Received: (qmail 7080 invoked from network); 3 May 2004 18:11:25 -0000
Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx)
([216.27.160.63]) (envelope-sender <jhb@FreeBSD.org>)
encrypted SMTP
for <perforce@FreeBSD.org>; 3 May 2004 18:11:25 -0000
Received: from 10.50.40.205 (gw1.twc.weather.com [216.133.140.1])
by server.baldwin.cx (8.12.11/8.12.11) with ESMTP id i43IBM7D057053;
Mon, 3 May 2004 14:11:22 -0400 (EDT)
(envelope-from jhb@FreeBSD.org)
From: John Baldwin <jhb@FreeBSD.org>
To: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 3 May 2004 13:58:09 -0400
User-Agent: KMail/1.6
References: <200405020130.i421U4QZ083887@repoman.freebsd.org>
In-Reply-To: <200405020130.i421U4QZ083887@repoman.freebsd.org>
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <200405031358.09996.jhb@FreeBSD.org>
X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx
cc: Perforce Change Reviews <perforce@FreeBSD.org>
Subject: Re: PERFORCE change 52052 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: Mon, 03 May 2004 18:11:26 -0000
On Saturday 01 May 2004 09:30 pm, Marcel Moolenaar wrote:
> http://perforce.freebsd.org/chv.cgi?CH=52052
>
> Change 52052 by marcel@marcel_nfs on 2004/05/01 18:29:05
>
> Add commands to set and show threads. Needs fleshing out.
> While here, cleanup a lot of unused code.
I really wish we could get this back into close to 80 cols again. Was
thinking of having the thread inhibitors listed with one-char flags that were
- if the flag as clear and a letter (S - sleeping, L - lock, W - swapped,
etc.) and still have a single wchan/wmesg field that lists lock name for if
TDI_LOCK is set, otherwise wmesg if on a sleep queue, etc.
--
John Baldwin <jhb@FreeBSD.org> <>< http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve" = http://www.FreeBSD.org
From owner-p4-projects@FreeBSD.ORG Mon May 3 11:12:11 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 4C56616A4D0; Mon, 3 May 2004 11:12:11 -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 264C816A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 11:12:11 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 79C0F43D2D
for <perforce@freebsd.org>; Mon, 3 May 2004 11:12:10 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43ICAGe087015
for <perforce@freebsd.org>; Mon, 3 May 2004 11:12:10 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43IC9X0087006
for perforce@freebsd.org; Mon, 3 May 2004 11:12:09 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Mon, 3 May 2004 11:12:09 -0700 (PDT)
Message-Id: <200405031812.i43IC9X0087006@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52152 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: Mon, 03 May 2004 18:12:12 -0000
http://perforce.freebsd.org/chv.cgi?CH=52152
Change 52152 by cvance@cvance_g5 on 2004/05/03 11:11:52
Update installation instructions, significantly reducing the length
and complexity. There are still a couple ugly steps at the end.
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/bootstrap_instructions.txt#3 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/bootstrap_instructions.txt#3 (text+ko) ====
@@ -23,6 +23,9 @@
//projects/trustedbsd/sedarwin73/...
+ The SEDarwin source CD will include a tarfile (sedarwin73.tgz)
+ containing these sources.
+
The remaining steps will assume that the current working directory
at the start of each step is your local checkout of the sedarwin
directory.
@@ -38,9 +41,9 @@
cctools-495.2
These packages are included on the SEDarwin source CD, as well as a
- tarfile containing binaries.
-
- Extract the tarfile into /usr/local on the build system.
+ tarfile containing binaries. Instead of building the individual
+ binaries, simply extract the tarfile into /usr/local on the build
+ system.
cd /usr/local
sudo tar xvzf buildtools_usrlocal.tgz
@@ -50,120 +53,48 @@
You will need to customize a file named Makeconfig in the sedarwin
directory so that the build can locate files that it needs. Several
variables must be defined to follow the remainder of this build
- and installation procedure. First, configure the DARWIN variable
- to point at the sedarwin/apsl/xnu directory in your checkout:
+ and installation procedure. First, configure the SEDARWIN_ROOT
+ variable to point at the sedarwin73 directory:
- DARWIN=/Users/andrew/p4/sedarwin/apsl/xnu
+ SEDARWIN_ROOT=/Users/andrew/p4/sedarwin/apsl/xnu
- Next, define EXPORT_HDRS as the header file target relative to
- your Darwin kernel build. Chances are, this default will work fine
- for you if you're building XNU straight in the xnu tree:
+ Next, set the DESTDIR variable to point to a local destination
+ directory; this directory will be created to store the modified
+ kernel, system libraries, header files, and programs. The default
+ is to place them in the 'export' directory at the top of the build
+ tree.
- EXPORT_HDRS=$(DARWIN)/BUILD/obj/EXPORT_HDRS
+ DESTDIR = $(SEDARWIN_ROOT)/export
+
+ Finally, in order to override the owner and groups that are set by
+ system installation tools, set the EXPORT_OWNER variable to the user
+ and group of the person building the system. By default, the install
+ program will try to chown/chgrp the files to the root:wheel, resulting
+ in permission errors (unless you are building as root).
- Finally, set the CFLAGS variable so that relative includes for
- libraries and commands are right. The default here will likely also
- work fine for you:
+ EXPORT_OWNER = cvance
+
- CFLAGS+=-I$(EXPORT_HDRS)/bsd -I$(EXPORT_HDRS)
+Step 4: Build
-Step 4: Create XNU export headers directory for use in building and
- installing SEBSD headers
+ A top-level makefile automates the build process. To build the
+ kernel, libraries, and program binaries, run the following command
+ from the top of the extracted source tree:
- In this step, the system headers included with the TrustedBSD/SEDarwin
- version of the XNU source tree must be exported so that they can be
- used for building and installing.
-
- cd apsl/xnu
- make exporthdrs
- cd ../..
+ bsdmake
NOTE: This step will fail if you have not installed bootstrap_cmds
due to a dependence on the relpath tool.
-Step 5: Install TrustedBSD/SEDarwin system headers
+Step 5: Install TrustedBSD/SEDarwin into the export directory
- In order to build many of the libraries and utilities required to
- run TrustedBSD/SEDarwin, you will need to first install the system
- headers for new system calls and services:
+ To install the kernel, libraries, and program binaries into the
+ temporary distribution directory, run the following command from the
+ top level of the source tree:
+
+ bsdmake install
- sudo make install-headers
-
- In particular, this will populate /usr/include with the extended
- attribute, MAC, and SEBSD header files.
-
-Step 6: Build TrustedBSD and SEBSD support libraries
-
- Build the extended attribute support library:
-
- cd libextattr
- make ; sudo make install
- cd ..
-
- Build the MAC Framework support library:
-
- cd libmac
- make ; sudo make install
- cd ..
-
- Build the SEBSD support library:
-
- cd libsebsd
- make ; sudo make install
- cd ..
-
-Step 7: Build, Install Extended Attribute Tools
-
- cd extattr_cmds
- make ; sudo make install
- cd ..
-
-Step 8: Build, Install MAC Label Tools
-
- cd mac_cmds
- make ; sudo make install
- cd ..
-
-Step 9: Build, Install SEBSD Tools
-
- cd sebsd_cmds
- make ; sudo make install
- cd ..
-
-Step 9.1: Build and install modified MiG program
- cd apsl/bootstrap_cmds/migcom.tproj
- make ; sudo make install
- cd ../../..
-
- This mig program is compatible with old kernels as well, as long as the
- new features are not used.
-
-Step 9.15: Install some modified Mach headers. You may want to save the old
- headers also.
- cp /usr/include/mach/message.h /usr/include/mach/mach_types.defs /tmp
- cd apsl/xnu/BUILD/obj/EXPORT_HDRS/osfmk/mach
- sudo cp message.h mach_types.defs /usr/include/mach
- cd ../../../../../../..
-
-Step 9.2: Build modified mach_init
- BEFORE installing the new init program, save the original because this
- one will only work with sedarwin kernels.
- cd apsl/system_cmds/mach_init.tproj
- make ; sudo make install
- cd ../../..
-
-Step 9.3: Build modified bootloader
- The modified bootloader is necessary to read the security policy before
- the root filesystem is available. It might work with other kernels as
- well.
- BEFORE installing this bootloader, make sure you have a working backup
- partition (that boots) on the same machine.
- cd apsl/BootX
- chmod u+w bootx.tproj/bootinfo.hdr
- make
- sudo cp bootx.bootinfo /System/Library/CoreServices/BootX
- cd ../..
-
+XXX Danger below XXX
Step 10: Build, Install wslogin and WindowServer wrapper
In order to allow users to select roles during GUI login, you must
@@ -190,115 +121,7 @@
sudo make install-window-server-wrapper
cd ../..
-Step 11: Build SEDarwin Sample Policy
-
- Our sample policy file ships with three users: root, andrew, and rwatson.
- Chances are, you'll want to add a line for your own user based on one of
- those lines.
- cd policy
- make
- sudo cp policy.16 /
- sudo nvram load_sebsd_policy=policy.16
- cd ..
-
-Step 12: Build XNU
-
- NOTE: If you skipped the long and tedious elements of Step 2 above,
- the chances are good this step will fail with a variety of hard to
- interpret failures.
-
- cd apsl/xnu
- make
-
-
- Install the kernel. There are two choices for how to do this, which
- depend on how you want to recover. If you have another working partition
- on the same system (or a firewire disk), you can overwrite the default
- kernel and not have to change OF settings. Then, to recover, hold down
- "option" while rebooting, allowing a choice of boot partitions. The other
- method is to change the kernel to boot in OF, while retaining the original
- in the default location.
-
- If you have another working partition:
- sudo cp /mach_kernel /mach_kernel.10.2.8
- sudo cp BUILD/obj/RELEASE_PPC/mach_kernel /mach_kernel
- sudo chown root:wheel /mach_kernel
- sudo chmod 644 /mach_kernel
- cd ../..
-
- Go to step 13.
-
- If you want to use OF to select the kernel:
- sudo cp BUILD/obj/RELEASE_PPC/mach_kernel /mach_kernel.sedarwin
- sudo chown root:wheel /mach_kernel.sedarwin
- sudo chmod 644 /mach_kernel.sedarwin
- cd ../..
-
- Once you have a new kernel in place, you'll need to use the nvram
- command to set that kernel as the active kernel by modifying the
- bootfile variable:
-
- % nvram -p | grep boot
- boot-script
- boot-file
- boot-command mac-boot
- boot-args
- boot-device mac-io/ata-4@1f000/@0:5,\\:tbxi
- auto-boot? true
- boot-screen
- % sudo nvram "boot-file=mac-io/ata-4@1f000/@0:5,\mach_kernel.sedarwin"
-
- Note that the boot-file variable consists if {bootdevice},{filename},
- and that the bootdevice is extracted from the more confusing
- boot-device OF variable as found above.
-
- As a quick note here: next time you boot, Open Firmware will boot
- /mach_kernel.sedarwin. You can reset it using the nvram command, or
- on boot you can press Command-Option-O-F to interactively set OF
- variables, or press Command-Option-P-R to clear the PRAM in the event
- of serious problems. Finally, you may want to set the boot-args flag
- to "-v" to get a text-based boot with console messages, rather than the
- pretty but less informative Apple logo, etc. If the system hangs during
- verbose mode startup (whether running sedarwin or not), try using normal
- boot options, as we have experienced unpredictable hangs with verbose
- boots.
-
- We've found that boot-time failure modes with Darwin are a bit hard
- to diagnose, and problems booting a new kernel frequent result in a
- hang with the Apple logo showing. This can be a result of
- incorrect permissions for the kernel file, among other things. We
- recommend keeping a safe backup of your original mach_kernel in case
- of accidental overwrite:
-
- sudo cp /mach_kernel /mach_kernel.safe
-
-Step 13: Build, Install "Libkvm"
-
- This will make sure that ps and related commands can read the new layout
- of kernel memory due to changes in the size of kernel structures such
- as processes and credentials.
-
- cd apsl/Libkvm
- make ; sudo make install
- cd ../..
-
-Step 14: Build, Install "file_cmds"
-
- This will build commands like 'ls' with MAC label support.
-
- cd apsl/file_cmds
- make ; sudo make install
- cd ../..
-
-Step 15: Build, Install "adv_cmds"
-
- This will build commands like 'ps' with MAC label support.
-
- cd other/adv_cmds
- make ; sudo make install
- cd ../..
-
Step 16: Create extended attribute backing files
This will allocate storage space for MAC labels on the root file system.
@@ -310,18 +133,6 @@
sudo mkdir -p /.attribute/system
sudo extattrctl initattr -p / 256 /.attribute/system/sebsd
-Step 17: Install mac.conf
-
- cd etc
- sudo make install
- cd ..
-
-Step 17.9: Force kernel extension cache to be rebuilt
-
- sudo rm /System/Library/Extensions.kextcache /System/Library/Extensions.mkext
-
- You may need to do this before every reboot.
-
Step 18: Reboot
At this point, you should now have a new Darwin kernel, support libraries,
From owner-p4-projects@FreeBSD.ORG Mon May 3 11:13:12 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id BB26016A4D0; Mon, 3 May 2004 11:13:12 -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 71CA216A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 11:13:12 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 5CD6643D2D
for <perforce@freebsd.org>; Mon, 3 May 2004 11:13:12 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43IDCGe087401
for <perforce@freebsd.org>; Mon, 3 May 2004 11:13:12 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43IDBYH087397
for perforce@freebsd.org; Mon, 3 May 2004 11:13:11 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Mon, 3 May 2004 11:13:11 -0700 (PDT)
Message-Id: <200405031813.i43IDBYH087397@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52153 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: Mon, 03 May 2004 18:13:13 -0000
http://perforce.freebsd.org/chv.cgi?CH=52153
Change 52153 by cvance@cvance_g5 on 2004/05/03 11:12:35
Minor bug fix for extattr programs, add a target to build a
release tarball
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/Makeconfig#4 edit
.. //depot/projects/trustedbsd/sedarwin73/Makefile#4 edit
.. //depot/projects/trustedbsd/sedarwin73/release/Makefile#2 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/Makeconfig#4 (text+ko) ====
@@ -2,13 +2,10 @@
SEDARWIN_ROOT = /Volumes/Space/cvance/trustedbsd/sedarwin73
# Set the following variable to the installation directory
-# or leave blank for "/"
-#DESTDIR =
DESTDIR = $(SEDARWIN_ROOT)/export
# if you aren't going to install as root, you need to set the
-# user for
-#EXPORT_OWNER=
+# user and group for /usr/bin/install to use.
EXPORT_OWNER= cvance
#
@@ -18,7 +15,8 @@
DARWIN = $(SEDARWIN_ROOT)/apsl/xnu
EXPORT_HDRS = $(DARWIN)/BUILD/obj/EXPORT_HDRS
CFLAGS += -I$(EXPORT_HDRS)/bsd -I$(EXPORT_HDRS)/osfmk -I$(EXPORT_HDRS)
-LDADD+= -L$(SEDARWIN_ROOT)/libsebsd -L$(SEDARWIN_ROOT)/libmac
+LDADD+= -L$(SEDARWIN_ROOT)/libsebsd -L$(SEDARWIN_ROOT)/libmac
+LDADD+= -L$(SEDARWIN_ROOT)/libextattr
POLICYDIR= $(DESTDIR)/
BINDIR= /usr/bin
==== //depot/projects/trustedbsd/sedarwin73/Makefile#4 (text+ko) ====
@@ -11,11 +11,14 @@
mac_cmds \
sebsd_cmds \
policy \
- apsl/file_cmds \
- apsl/bootstrap_cmds
+ apsl/file_cmds
+# apsl/bootstrap_cmds
# sebsd_system
+dist:
+ cd release && $(MAKE) dist
+
distclean:
cd release && $(MAKE) distclean
==== //depot/projects/trustedbsd/sedarwin73/release/Makefile#2 (text+ko) ====
@@ -13,6 +13,10 @@
install: all
+dist:
+ cd $(DESTDIR) && gnutar --owner root --group wheel -czf \
+ $(SEDARWIN_ROOT)/sedarwin.tgz .
+
distclean:
rm -rf $(DESTDIR)
From owner-p4-projects@FreeBSD.ORG Mon May 3 11:53:00 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6FB2B16A4D3; Mon, 3 May 2004 11:53:00 -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 3A3D316A4CE; Mon, 3 May 2004 11:53:00 -0700 (PDT)
Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226])
by mx1.FreeBSD.org (Postfix) with ESMTP
id B0D9243D2F; Mon, 3 May 2004 11:52:59 -0700 (PDT)
(envelope-from marcel@xcllnt.net)
Received: from ns1.xcllnt.net (localhost [127.0.0.1])
by ns1.xcllnt.net (8.12.11/8.12.11) with ESMTP id i43IqxKo055755;
Mon, 3 May 2004 11:52:59 -0700 (PDT)
(envelope-from marcel@ns1.xcllnt.net)
Received: (from marcel@localhost)
by ns1.xcllnt.net (8.12.11/8.12.11/Submit) id i43Iqxdk055754;
Mon, 3 May 2004 11:52:59 -0700 (PDT)
(envelope-from marcel)
Date: Mon, 3 May 2004 11:52:59 -0700
From: Marcel Moolenaar <marcel@xcllnt.net>
To: John Baldwin <jhb@freebsd.org>
Message-ID: <20040503185259.GC55675@ns1.xcllnt.net>
References: <200405020130.i421U4QZ083887@repoman.freebsd.org>
<200405031358.09996.jhb@FreeBSD.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200405031358.09996.jhb@FreeBSD.org>
User-Agent: Mutt/1.5.5.1i
cc: Perforce Change Reviews <perforce@freebsd.org>
Subject: Re: PERFORCE change 52052 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: Mon, 03 May 2004 18:53:00 -0000
On Mon, May 03, 2004 at 01:58:09PM -0400, John Baldwin wrote:
> On Saturday 01 May 2004 09:30 pm, Marcel Moolenaar wrote:
> > http://perforce.freebsd.org/chv.cgi?CH=52052
> >
> > Change 52052 by marcel@marcel_nfs on 2004/05/01 18:29:05
> >
> > Add commands to set and show threads. Needs fleshing out.
> > While here, cleanup a lot of unused code.
>
> I really wish we could get this back into close to 80 cols again.
Me too. Especially on 64-bit machines, the output of ps is just plain
unreadable. Let me know what you really like to see in a thread list
and I'll see if I can make it fit. We can also put certain info under
the "thread [tid]" command.
For example: the address of struct thread does not have to be printed
with "show threads", but it's probably a good idea to print it with
"thread [tid]" so that it can be dumped easily.
> Was
> thinking of having the thread inhibitors listed with one-char flags that were
> - if the flag as clear and a letter (S - sleeping, L - lock, W - swapped,
> etc.) and still have a single wchan/wmesg field that lists lock name for if
> TDI_LOCK is set, otherwise wmesg if on a sleep queue, etc.
I'm open to suggestions. We can even use modifiers to control the
output. No modifier gives the same behaviour as in gdb(1); the
"l" modifier prints lock information. The "p" modifier shows the
process specifics and so on.
Send brain dumps this way...
--
Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net
From owner-p4-projects@FreeBSD.ORG Mon May 3 12:07:23 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id D8ED716A4D0; Mon, 3 May 2004 12:07:22 -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 AA28B16A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 12:07:22 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id BDF6C43D45
for <perforce@freebsd.org>; Mon, 3 May 2004 12:07:20 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43J7KGe099126
for <perforce@freebsd.org>; Mon, 3 May 2004 12:07:20 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43J7IBQ099123
for perforce@freebsd.org; Mon, 3 May 2004 12:07:18 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Date: Mon, 3 May 2004 12:07:18 -0700 (PDT)
Message-Id: <200405031907.i43J7IBQ099123@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52155 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: Mon, 03 May 2004 19:07:23 -0000
http://perforce.freebsd.org/chv.cgi?CH=52155
Change 52155 by jhb@jhb_slimer on 2004/05/03 12:06:32
IFC @52154.
Affected files ...
.. //depot/projects/power/sys/dev/acpica/acpi_video.c#3 edit
.. //depot/projects/power/sys/isa/vga_isa.c#4 edit
.. //depot/user/jhb/acpipci/alpha/alpha/pmap.c#19 integrate
.. //depot/user/jhb/acpipci/alpha/conf/GENERIC#13 integrate
.. //depot/user/jhb/acpipci/alpha/include/float.h#4 integrate
.. //depot/user/jhb/acpipci/amd64/acpica/acpi_machdep.c#7 integrate
.. //depot/user/jhb/acpipci/amd64/conf/GENERIC#15 integrate
.. //depot/user/jhb/acpipci/amd64/include/float.h#3 integrate
.. //depot/user/jhb/acpipci/boot/i386/boot0/Makefile#6 integrate
.. //depot/user/jhb/acpipci/boot/i386/boot0/boot0.S#1 branch
.. //depot/user/jhb/acpipci/boot/i386/boot0/boot0.s#6 delete
.. //depot/user/jhb/acpipci/boot/i386/boot0/boot0ext.S#1 branch
.. //depot/user/jhb/acpipci/boot/i386/boot0/boot0ext.s#3 delete
.. //depot/user/jhb/acpipci/boot/i386/boot0/boot0sio.s#3 delete
.. //depot/user/jhb/acpipci/boot/i386/boot0ext/Makefile#2 integrate
.. //depot/user/jhb/acpipci/boot/i386/boot0sio/Makefile#3 integrate
.. //depot/user/jhb/acpipci/boot/i386/boot2/boot1.S#2 integrate
.. //depot/user/jhb/acpipci/boot/i386/boot2/sio.S#2 integrate
.. //depot/user/jhb/acpipci/boot/i386/btx/btx/Makefile#4 integrate
.. //depot/user/jhb/acpipci/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/user/jhb/acpipci/boot/i386/btx/btxldr/Makefile#5 integrate
.. //depot/user/jhb/acpipci/boot/i386/btx/btxldr/btxldr.S#2 integrate
.. //depot/user/jhb/acpipci/boot/i386/cdboot/Makefile#4 integrate
.. //depot/user/jhb/acpipci/boot/i386/libi386/amd64_tramp.S#3 integrate
.. //depot/user/jhb/acpipci/boot/i386/mbr/Makefile#4 integrate
.. //depot/user/jhb/acpipci/boot/i386/pxeldr/Makefile#6 integrate
.. //depot/user/jhb/acpipci/boot/i386/pxeldr/pxeldr.S#2 integrate
.. //depot/user/jhb/acpipci/boot/pc98/boot2/serial_16550.S#2 integrate
.. //depot/user/jhb/acpipci/boot/pc98/boot2/serial_8251.S#2 integrate
.. //depot/user/jhb/acpipci/boot/pc98/btx/btx/Makefile#4 integrate
.. //depot/user/jhb/acpipci/boot/pc98/btx/btx/btx.S#2 integrate
.. //depot/user/jhb/acpipci/boot/pc98/btx/btxldr/Makefile#4 integrate
.. //depot/user/jhb/acpipci/boot/pc98/btx/btxldr/btxldr.S#2 integrate
.. //depot/user/jhb/acpipci/cam/scsi/scsi_da.c#21 integrate
.. //depot/user/jhb/acpipci/compat/freebsd32/freebsd32_misc.c#9 integrate
.. //depot/user/jhb/acpipci/compat/ndis/kern_ndis.c#12 integrate
.. //depot/user/jhb/acpipci/compat/ndis/ntoskrnl_var.h#9 integrate
.. //depot/user/jhb/acpipci/compat/ndis/subr_hal.c#7 integrate
.. //depot/user/jhb/acpipci/compat/ndis/subr_ntoskrnl.c#12 integrate
.. //depot/user/jhb/acpipci/conf/NOTES#40 integrate
.. //depot/user/jhb/acpipci/conf/files#47 integrate
.. //depot/user/jhb/acpipci/conf/files.amd64#14 integrate
.. //depot/user/jhb/acpipci/conf/files.i386#48 integrate
.. //depot/user/jhb/acpipci/conf/files.pc98#22 integrate
.. //depot/user/jhb/acpipci/conf/files.sparc64#15 integrate
.. //depot/user/jhb/acpipci/conf/kern.pre.mk#19 integrate
.. //depot/user/jhb/acpipci/conf/majors#24 integrate
.. //depot/user/jhb/acpipci/conf/options#35 integrate
.. //depot/user/jhb/acpipci/conf/options.sparc64#6 integrate
.. //depot/user/jhb/acpipci/contrib/pf/net/pf.c#5 integrate
.. //depot/user/jhb/acpipci/contrib/pf/net/pf_ioctl.c#4 integrate
.. //depot/user/jhb/acpipci/contrib/pf/net/pf_norm.c#3 integrate
.. //depot/user/jhb/acpipci/dev/acpica/Osd/OsdTable.c#6 integrate
.. //depot/user/jhb/acpipci/dev/acpica/acpi.c#42 integrate
.. //depot/user/jhb/acpipci/dev/acpica/acpi_acad.c#10 integrate
.. //depot/user/jhb/acpipci/dev/acpica/acpi_cpu.c#23 integrate
.. //depot/user/jhb/acpipci/dev/acpica/acpi_pci.c#21 integrate
.. //depot/user/jhb/acpipci/dev/acpica/acpi_timer.c#8 integrate
.. //depot/user/jhb/acpipci/dev/acpica/acpivar.h#30 integrate
.. //depot/user/jhb/acpipci/dev/asr/asr.c#12 integrate
.. //depot/user/jhb/acpipci/dev/ata/ata-all.c#22 integrate
.. //depot/user/jhb/acpipci/dev/ata/ata-all.h#18 integrate
.. //depot/user/jhb/acpipci/dev/ata/ata-chipset.c#25 integrate
.. //depot/user/jhb/acpipci/dev/ata/ata-commands.h#2 integrate
.. //depot/user/jhb/acpipci/dev/ata/ata-disk.h#7 integrate
.. //depot/user/jhb/acpipci/dev/ata/ata-isa.c#12 integrate
.. //depot/user/jhb/acpipci/dev/ata/ata-lowlevel.c#15 integrate
.. //depot/user/jhb/acpipci/dev/ata/ata-pci.c#19 integrate
.. //depot/user/jhb/acpipci/dev/ata/ata-pci.h#16 integrate
.. //depot/user/jhb/acpipci/dev/ata/ata-queue.c#13 integrate
.. //depot/user/jhb/acpipci/dev/ata/atapi-cd.h#9 integrate
.. //depot/user/jhb/acpipci/dev/ata/atapi-fd.h#7 integrate
.. //depot/user/jhb/acpipci/dev/ata/atapi-tape.h#5 integrate
.. //depot/user/jhb/acpipci/dev/ciss/ciss.c#23 integrate
.. //depot/user/jhb/acpipci/dev/ciss/cissreg.h#6 integrate
.. //depot/user/jhb/acpipci/dev/cy/cy.c#1 branch
.. //depot/user/jhb/acpipci/dev/cy/cy_isa.c#1 branch
.. //depot/user/jhb/acpipci/dev/cy/cy_pci.c#1 branch
.. //depot/user/jhb/acpipci/dev/cy/cyreg.h#1 branch
.. //depot/user/jhb/acpipci/dev/cy/cyvar.h#1 branch
.. //depot/user/jhb/acpipci/dev/gem/if_gem.c#10 integrate
.. //depot/user/jhb/acpipci/dev/hfa/fore_load.c#5 delete
.. //depot/user/jhb/acpipci/dev/ic/cd1400.h#1 branch
.. //depot/user/jhb/acpipci/dev/if_ndis/if_ndis.c#12 integrate
.. //depot/user/jhb/acpipci/dev/led/led.c#7 integrate
.. //depot/user/jhb/acpipci/dev/mii/brgphy.c#10 integrate
.. //depot/user/jhb/acpipci/dev/mii/dcphy.c#7 integrate
.. //depot/user/jhb/acpipci/dev/mii/e1000phy.c#6 integrate
.. //depot/user/jhb/acpipci/dev/mii/mii.c#6 integrate
.. //depot/user/jhb/acpipci/dev/mii/mii_physubr.c#5 integrate
.. //depot/user/jhb/acpipci/dev/mii/mlphy.c#5 integrate
.. //depot/user/jhb/acpipci/dev/mii/rgephy.c#2 integrate
.. //depot/user/jhb/acpipci/dev/mii/ruephy.c#3 integrate
.. //depot/user/jhb/acpipci/dev/mii/tlphy.c#6 integrate
.. //depot/user/jhb/acpipci/dev/mii/xmphy.c#6 integrate
.. //depot/user/jhb/acpipci/dev/pccbb/pccbb.c#23 integrate
.. //depot/user/jhb/acpipci/dev/pci/pci.c#40 integrate
.. //depot/user/jhb/acpipci/dev/puc/pucdata.c#16 integrate
.. //depot/user/jhb/acpipci/dev/sio/sio.c#23 integrate
.. //depot/user/jhb/acpipci/dev/sio/sio_ebus.c#4 delete
.. //depot/user/jhb/acpipci/dev/sound/pci/cmi.c#12 integrate
.. //depot/user/jhb/acpipci/dev/sound/pcm/buffer.c#8 integrate
.. //depot/user/jhb/acpipci/dev/uart/uart_dev_sab82532.c#4 integrate
.. //depot/user/jhb/acpipci/dev/usb/if_axe.c#10 integrate
.. //depot/user/jhb/acpipci/dev/usb/usbdevs#25 integrate
.. //depot/user/jhb/acpipci/dev/usb/usbdevs.h#24 integrate
.. //depot/user/jhb/acpipci/dev/usb/usbdevs_data.h#24 integrate
.. //depot/user/jhb/acpipci/dev/usb/uvscom.c#10 integrate
.. //depot/user/jhb/acpipci/dev/vinum/vinumio.c#13 integrate
.. //depot/user/jhb/acpipci/geom/concat/g_concat.c#3 integrate
.. //depot/user/jhb/acpipci/geom/gate/g_gate.c#1 branch
.. //depot/user/jhb/acpipci/geom/gate/g_gate.h#1 branch
.. //depot/user/jhb/acpipci/geom/geom_gpt.c#11 integrate
.. //depot/user/jhb/acpipci/i386/acpica/acpi_asus.c#1 branch
.. //depot/user/jhb/acpipci/i386/acpica/acpi_machdep.c#21 integrate
.. //depot/user/jhb/acpipci/i386/conf/GENERIC#27 integrate
.. //depot/user/jhb/acpipci/i386/conf/NOTES#33 integrate
.. //depot/user/jhb/acpipci/i386/i386/elan-mmcr.c#17 integrate
.. //depot/user/jhb/acpipci/i386/i386/mptable_pci.c#9 integrate
.. //depot/user/jhb/acpipci/i386/include/float.h#5 integrate
.. //depot/user/jhb/acpipci/i386/include/legacyvar.h#11 integrate
.. //depot/user/jhb/acpipci/i386/isa/atpic.c#69 integrate
.. //depot/user/jhb/acpipci/i386/isa/clock.c#30 integrate
.. //depot/user/jhb/acpipci/i386/isa/cy.c#10 delete
.. //depot/user/jhb/acpipci/i386/isa/cyreg.h#2 delete
.. //depot/user/jhb/acpipci/i386/isa/ic/cd1400.h#2 delete
.. //depot/user/jhb/acpipci/i386/pci/pci_bus.c#41 integrate
.. //depot/user/jhb/acpipci/ia64/acpica/acpi_machdep.c#6 integrate
.. //depot/user/jhb/acpipci/ia64/acpica/madt.c#7 integrate
.. //depot/user/jhb/acpipci/ia64/conf/GENERIC#14 integrate
.. //depot/user/jhb/acpipci/ia64/conf/SKI#10 integrate
.. //depot/user/jhb/acpipci/ia64/ia64/trap.c#20 integrate
.. //depot/user/jhb/acpipci/ia64/include/float.h#5 integrate
.. //depot/user/jhb/acpipci/isa/fd.c#19 integrate
.. //depot/user/jhb/acpipci/kern/imgact_elf.c#18 integrate
.. //depot/user/jhb/acpipci/kern/kern_clock.c#12 integrate
.. //depot/user/jhb/acpipci/kern/kern_environment.c#6 integrate
.. //depot/user/jhb/acpipci/kern/kern_exec.c#30 integrate
.. //depot/user/jhb/acpipci/kern/kern_jail.c#12 integrate
.. //depot/user/jhb/acpipci/kern/kern_thread.c#39 integrate
.. //depot/user/jhb/acpipci/kern/kern_timeout.c#12 integrate
.. //depot/user/jhb/acpipci/kern/link_elf_obj.c#1 branch
.. //depot/user/jhb/acpipci/kern/sched_ule.c#28 integrate
.. //depot/user/jhb/acpipci/kern/subr_sleepqueue.c#3 integrate
.. //depot/user/jhb/acpipci/kern/vfs_export.c#7 integrate
.. //depot/user/jhb/acpipci/kern/vfs_syscalls.c#26 integrate
.. //depot/user/jhb/acpipci/modules/Makefile#37 integrate
.. //depot/user/jhb/acpipci/modules/acpi/Makefile#17 integrate
.. //depot/user/jhb/acpipci/modules/acpi/acpi/Makefile#4 integrate
.. //depot/user/jhb/acpipci/modules/acpi/acpi_asus/Makefile#1 branch
.. //depot/user/jhb/acpipci/modules/asr/Makefile#2 integrate
.. //depot/user/jhb/acpipci/modules/geom/geom_gate/Makefile#1 branch
.. //depot/user/jhb/acpipci/modules/ipfilter/Makefile#3 integrate
.. //depot/user/jhb/acpipci/modules/netgraph/Makefile#10 integrate
.. //depot/user/jhb/acpipci/modules/sio/Makefile#2 integrate
.. //depot/user/jhb/acpipci/net/bridge.c#12 integrate
.. //depot/user/jhb/acpipci/net/if.c#22 integrate
.. //depot/user/jhb/acpipci/net/if.h#8 integrate
.. //depot/user/jhb/acpipci/net/if_arcsubr.c#9 integrate
.. //depot/user/jhb/acpipci/net/if_atmsubr.c#13 integrate
.. //depot/user/jhb/acpipci/net/if_ethersubr.c#22 integrate
.. //depot/user/jhb/acpipci/net/if_fddisubr.c#12 integrate
.. //depot/user/jhb/acpipci/net/if_gre.c#14 integrate
.. //depot/user/jhb/acpipci/net/if_iso88025subr.c#13 integrate
.. //depot/user/jhb/acpipci/net/if_var.h#14 integrate
.. //depot/user/jhb/acpipci/net/if_vlan.c#14 integrate
.. //depot/user/jhb/acpipci/net/radix.c#8 integrate
.. //depot/user/jhb/acpipci/net/route.c#17 integrate
.. //depot/user/jhb/acpipci/net/route.h#10 integrate
.. //depot/user/jhb/acpipci/net/rtsock.c#16 integrate
.. //depot/user/jhb/acpipci/netatalk/aarp.c#11 integrate
.. //depot/user/jhb/acpipci/netatalk/at_extern.h#3 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/common/ng_bluetooth.c#3 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#5 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/drivers/h4/ng_h4.c#5 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/drivers/ubt/ng_ubt.c#9 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/hci/ng_hci_cmds.c#5 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/hci/ng_hci_evnt.c#6 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/hci/ng_hci_misc.c#6 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/hci/ng_hci_ulpi.c#6 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#4 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#6 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#6 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/l2cap/ng_l2cap_main.c#3 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#6 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#4 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/socket/ng_btsocket.c#6 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#10 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#9 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#8 integrate
.. //depot/user/jhb/acpipci/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#5 integrate
.. //depot/user/jhb/acpipci/netgraph/ng_parse.c#5 integrate
.. //depot/user/jhb/acpipci/netgraph/ng_pptpgre.c#7 integrate
.. //depot/user/jhb/acpipci/netgraph/ng_pptpgre.h#3 integrate
.. //depot/user/jhb/acpipci/netinet/if_ether.c#11 integrate
.. //depot/user/jhb/acpipci/netinet/in_pcb.c#22 integrate
.. //depot/user/jhb/acpipci/netinet/ip_fastfwd.c#6 integrate
.. //depot/user/jhb/acpipci/netinet/ip_fw.h#11 integrate
.. //depot/user/jhb/acpipci/netinet/ip_fw2.c#27 integrate
.. //depot/user/jhb/acpipci/netinet/ip_input.c#27 integrate
.. //depot/user/jhb/acpipci/netinet/ip_output.c#24 integrate
.. //depot/user/jhb/acpipci/netinet/ip_var.h#15 integrate
.. //depot/user/jhb/acpipci/netinet/raw_ip.c#17 integrate
.. //depot/user/jhb/acpipci/netinet/tcp_hostcache.c#4 integrate
.. //depot/user/jhb/acpipci/netinet/tcp_input.c#26 integrate
.. //depot/user/jhb/acpipci/netinet/tcp_subr.c#24 integrate
.. //depot/user/jhb/acpipci/netinet/tcp_var.h#13 integrate
.. //depot/user/jhb/acpipci/netinet6/nd6.c#13 integrate
.. //depot/user/jhb/acpipci/netipsec/key.c#9 integrate
.. //depot/user/jhb/acpipci/netipsec/xform_tcp.c#2 integrate
.. //depot/user/jhb/acpipci/pc98/conf/GENERIC#21 integrate
.. //depot/user/jhb/acpipci/pc98/conf/NOTES#25 integrate
.. //depot/user/jhb/acpipci/pc98/pc98/fd.c#16 integrate
.. //depot/user/jhb/acpipci/pc98/pc98/sio.c#20 integrate
.. //depot/user/jhb/acpipci/pci/agp.c#17 integrate
.. //depot/user/jhb/acpipci/pci/agp_i810.c#14 integrate
.. //depot/user/jhb/acpipci/pci/amdpm.c#7 integrate
.. //depot/user/jhb/acpipci/pci/cy_pci.c#6 delete
.. //depot/user/jhb/acpipci/powerpc/conf/GENERIC#11 integrate
.. //depot/user/jhb/acpipci/powerpc/include/float.h#5 integrate
.. //depot/user/jhb/acpipci/powerpc/include/param.h#8 integrate
.. //depot/user/jhb/acpipci/powerpc/include/pmap.h#7 integrate
.. //depot/user/jhb/acpipci/powerpc/powermac/ata_kauai.c#4 integrate
.. //depot/user/jhb/acpipci/powerpc/powermac/ata_macio.c#9 integrate
.. //depot/user/jhb/acpipci/sparc64/conf/GENERIC#16 integrate
.. //depot/user/jhb/acpipci/sparc64/conf/NOTES#5 integrate
.. //depot/user/jhb/acpipci/sparc64/ebus/ebus.c#8 integrate
.. //depot/user/jhb/acpipci/sparc64/include/float.h#4 integrate
.. //depot/user/jhb/acpipci/sparc64/include/nexusvar.h#2 integrate
.. //depot/user/jhb/acpipci/sparc64/isa/ofw_isa.c#4 integrate
.. //depot/user/jhb/acpipci/sparc64/isa/ofw_isa.h#3 integrate
.. //depot/user/jhb/acpipci/sparc64/pci/psycho.c#13 integrate
.. //depot/user/jhb/acpipci/sparc64/pci/psychoreg.h#5 integrate
.. //depot/user/jhb/acpipci/sparc64/pci/psychovar.h#7 integrate
.. //depot/user/jhb/acpipci/sparc64/sparc64/identcpu.c#5 integrate
.. //depot/user/jhb/acpipci/sparc64/sparc64/iommu.c#14 integrate
.. //depot/user/jhb/acpipci/sparc64/sparc64/nexus.c#5 integrate
.. //depot/user/jhb/acpipci/sparc64/sparc64/ofw_machdep.c#6 integrate
.. //depot/user/jhb/acpipci/sys/callout.h#3 integrate
.. //depot/user/jhb/acpipci/sys/imgact.h#7 integrate
.. //depot/user/jhb/acpipci/sys/jail.h#5 integrate
.. //depot/user/jhb/acpipci/sys/mbuf.h#20 integrate
.. //depot/user/jhb/acpipci/sys/mman.h#7 integrate
.. //depot/user/jhb/acpipci/sys/proc.h#47 integrate
.. //depot/user/jhb/acpipci/sys/types.h#14 integrate
.. //depot/user/jhb/acpipci/ufs/ffs/ffs_vfsops.c#22 integrate
.. //depot/user/jhb/acpipci/vm/device_pager.c#9 integrate
.. //depot/user/jhb/acpipci/vm/phys_pager.c#7 integrate
.. //depot/user/jhb/acpipci/vm/vm_kern.c#19 integrate
.. //depot/user/jhb/acpipci/vm/vm_map.c#32 integrate
.. //depot/user/jhb/acpipci/vm/vm_map.h#14 integrate
.. //depot/user/jhb/acpipci/vm/vm_page.c#25 integrate
.. //depot/user/jhb/acpipci/vm/vnode_pager.c#19 integrate
.. //depot/user/jhb/libdisk/lib/libdisk/contents_map.hpp#2 edit
.. //depot/user/jhb/libdisk/lib/libdisk/geom_tree.cpp#2 edit
Differences ...
==== //depot/projects/power/sys/dev/acpica/acpi_video.c#3 (text+ko) ====
@@ -1,5 +1,6 @@
/*-
* Copyright (c) 2002-2003 Taku YAMAMOTO <taku@cent.saitama-u.ac.jp>
+ * Copyright (c) 2004 Benjamin Close <Benjamin.Close@clearchain.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -34,10 +35,33 @@
#include <sys/power.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
+#ifdef __i386__
+#include <machine/vm86.h>
+#endif
#include "acpi.h"
#include <dev/acpica/acpivar.h>
+#ifdef __i386__
+#define USE_DPMS
+
+/*
+ * VESA DPMS States
+ */
+#define DPMS_ON 0x00
+#define DPMS_STANDBY 0x01
+#define DPMS_SUSPEND 0x02
+#define DPMS_OFF 0x04
+#define DPMS_REDUCEDON 0x08
+
+#define VBE_DPMS_FUNCTION 0x4F10
+#define VBE_DPMS_GET_SUPPORTED_STATES 0x00
+#define VBE_DPMS_GET_STATE 0x02
+#define VBE_DPMS_SET_STATE 0x01
+#define VBE_MAJORVERSION_MASK 0x0F
+#define VBE_MINORVERSION_MASK 0xF0
+#endif
+
/* ACPI video extension driver. */
struct acpi_video_output {
ACPI_HANDLE handle;
@@ -63,6 +87,10 @@
ACPI_HANDLE handle;
STAILQ_HEAD(, acpi_video_output) vid_outputs;
eventhandler_tag vid_pwr_evh;
+#ifdef USE_DPMS
+ int vid_dpms_supported_states;
+ int vid_dpms_initial_state;
+#endif
};
/* interfaces */
@@ -71,6 +99,8 @@
static int acpi_video_attach(device_t);
static int acpi_video_detach(device_t);
static int acpi_video_shutdown(device_t);
+static int acpi_video_suspend(device_t);
+static int acpi_video_resume(device_t);
static void acpi_video_notify_handler(ACPI_HANDLE, UINT32, void *);
static void acpi_video_power_profile(void *);
static void acpi_video_bind_outputs(struct acpi_video_softc *);
@@ -94,6 +124,11 @@
static UINT32 vo_get_device_status(ACPI_HANDLE);
static UINT32 vo_query_graphics_state(ACPI_HANDLE);
static void vo_set_device_state(ACPI_HANDLE, UINT32);
+#ifdef USE_DPMS
+static int dpms_get_supported_states(int *);
+static int dpms_get_current_state(int *);
+static int dpms_set_state(int);
+#endif
/* events */
#define VID_NOTIFY_SWITCHED 0x80
@@ -141,6 +176,8 @@
DEVMETHOD(device_attach, acpi_video_attach),
DEVMETHOD(device_detach, acpi_video_detach),
DEVMETHOD(device_shutdown, acpi_video_shutdown),
+ DEVMETHOD(device_resume, acpi_video_resume),
+ DEVMETHOD(device_suspend, acpi_video_suspend),
{ 0, 0 }
};
@@ -242,6 +279,13 @@
ACPI_UNLOCK;
acpi_video_power_profile(sc);
+#ifdef USE_DPMS
+ if (dpms_get_supported_states(&sc->vid_dpms_supported_states) == 0)
+ dpms_get_current_state(&sc->vid_dpms_initial_state);
+ else
+ sc->vid_dpms_supported_states = -1;
+#endif
+
return (0);
}
@@ -283,6 +327,32 @@
return (0);
}
+static int
+acpi_video_suspend(device_t dev)
+{
+ struct acpi_video_softc *sc;
+
+ sc = device_get_softc(dev);
+#ifdef USE_DPMS
+ if (sc->vid_dpms_supported_states != -1)
+ dpms_set_state(DPMS_OFF);
+#endif
+ return (0);
+}
+
+static int
+acpi_video_resume(device_t dev)
+{
+ struct acpi_video_softc *sc;
+
+ sc = device_get_softc(dev);
+#ifdef USE_DPMS
+ if (sc->vid_dpms_supported_states != -1)
+ dpms_set_state(sc->vid_dpms_initial_state);
+#endif
+ return (0);
+}
+
static void
acpi_video_notify_handler(ACPI_HANDLE handle __unused, UINT32 notify, void *context)
{
@@ -929,3 +999,49 @@
printf("can't evaluate %s._DSS - %s\n",
acpi_name(handle), AcpiFormatException(status));
}
+
+#ifdef USE_DPMS
+/* XXX: Requires VM86 support in the kernel. */
+static int
+dpms_call_bios(int subfunction, int *bh)
+{
+ struct vm86frame vmf;
+ int error;
+
+ bzero(&vmf, sizeof(vmf));
+ vmf.vmf_ax = VBE_DPMS_FUNCTION;
+ vmf.vmf_bl = subfunction;
+ vmf.vmf_bh = *bh;
+ vmf.vmf_es = 0;
+ vmf.vmf_di = 0;
+ error = vm86_intcall(0x10, &vmf);
+ if (error == 0 && (vmf.vmf_eax & 0xffff) != 0x004f)
+ error = ENXIO;
+ if (error == 0)
+ *bh = vmf.vmf_bh;
+ return (error);
+}
+
+static int
+dpms_get_supported_states(int *states)
+{
+
+ *states = 0;
+ return (dpms_call_bios(VBE_DPMS_GET_SUPPORTED_STATES, states));
+}
+
+static int
+dpms_get_current_state(int *state)
+{
+
+ *state = 0;
+ return (dpms_call_bios(VBE_DPMS_GET_STATE, state));
+}
+
+static int
+dpms_set_state(int state)
+{
+
+ return (dpms_call_bios(VBE_DPMS_SET_STATE, &state));
+}
+#endif
==== //depot/projects/power/sys/isa/vga_isa.c#4 (text+ko) ====
@@ -159,6 +159,26 @@
return 0;
}
+static int
+isavga_suspend(device_t dev)
+{
+ vga_softc_t *sc;
+
+ sc = device_get_softc(dev);
+ (*vidsw[sc->adp->va_index]->blank_display)(sc->adp, V_DISPLAY_SUSPEND);
+ return (0);
+}
+
+static int
+isavga_resume(device_t dev)
+{
+ vga_softc_t *sc;
+
+ sc = device_get_softc(dev);
+ (*vidsw[sc->adp->va_index]->blank_display)(sc->adp, V_DISPLAY_ON);
+ return (0);
+}
+
#ifdef FB_INSTALL_CDEV
static int
@@ -203,6 +223,8 @@
DEVMETHOD(device_identify, isavga_identify),
DEVMETHOD(device_probe, isavga_probe),
DEVMETHOD(device_attach, isavga_attach),
+ DEVMETHOD(device_suspend, isavga_suspend),
+ DEVMETHOD(device_resume, isavga_resume),
DEVMETHOD(bus_print_child, bus_generic_print_child),
{ 0, 0 }
==== //depot/user/jhb/acpipci/alpha/alpha/pmap.c#19 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.143 2004/04/11 05:08:26 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.146 2004/04/26 17:49:05 gallatin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1074,7 +1074,7 @@
*/
VM_OBJECT_LOCK(pmap->pm_pteobj);
lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS,
- VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED);
+ VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO);
vm_page_lock_queues();
vm_page_flag_clear(lev1pg, PG_BUSY);
@@ -1083,10 +1083,7 @@
VM_OBJECT_UNLOCK(pmap->pm_pteobj);
pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg));
- if ((lev1pg->flags & PG_ZERO) == 0)
- bzero(pmap->pm_lev1, PAGE_SIZE);
-
/* install self-referential address mapping entry (not PG_ASM) */
pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg))
| PG_V | PG_KRE | PG_KWE;
@@ -1194,8 +1191,6 @@
VM_OBJECT_LOCK(pmap->pm_pteobj);
m = vm_page_grab(pmap->pm_pteobj, ptepindex,
VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY);
- if ((m->flags & PG_ZERO) == 0)
- pmap_zero_page(m);
KASSERT(m->queue == PQ_NONE,
("_pmap_allocpte: %p->queue != PQ_NONE", m));
@@ -1242,7 +1237,6 @@
vm_page_lock_queues();
m->valid = VM_PAGE_BITS_ALL;
- vm_page_flag_clear(m, PG_ZERO);
vm_page_wakeup(m);
vm_page_unlock_queues();
if (!is_object_locked)
@@ -1906,7 +1900,8 @@
* raise IPL while manipulating pv_table since pmap_enter can be
* called at interrupt time.
*/
- if (pmap_initialized && (m->flags & PG_FICTITIOUS) == 0) {
+ if (pmap_initialized &&
+ (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) {
pmap_insert_entry(pmap, va, mpte, m);
managed |= PG_MANAGED;
}
@@ -1966,7 +1961,7 @@
pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte)
{
register pt_entry_t *pte;
-
+ int managed;
/*
* In the case that a page table page is not
@@ -2031,7 +2026,11 @@
* raise IPL while manipulating pv_table since pmap_enter can be
* called at interrupt time.
*/
- pmap_insert_entry(pmap, va, mpte, m);
+ managed = 0;
+ if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) {
+ pmap_insert_entry(pmap, va, mpte, m);
+ managed = PG_MANAGED | PG_FOR | PG_FOW | PG_FOE;
+ }
/*
* Increment counters
@@ -2041,7 +2040,7 @@
/*
* Now validate mapping with RO protection
*/
- *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | PG_MANAGED | PG_FOR | PG_FOE | PG_FOW;
+ *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | managed;
alpha_pal_imb(); /* XXX overkill? */
return mpte;
==== //depot/user/jhb/acpipci/alpha/conf/GENERIC#13 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.168 2004/01/24 21:45:25 jeff Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.170 2004/05/02 20:40:17 marcel Exp $
machine alpha
cpu EV4
@@ -60,6 +60,7 @@
options CD9660 #ISO 9660 Filesystem
options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework
+options GEOM_GPT #GUID Partition Tables.
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options COMPAT_FREEBSD4 #Compatible with FreeBSD4
options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI
@@ -194,10 +195,10 @@
device umass # Disks/Mass storage - Requires scbus and da0
device ums # Mouse
# USB Ethernet
-device aue # ADMtek USB ethernet
-device axe # ASIX Electronics USB ethernet
-device cue # CATC USB ethernet
-device kue # Kawasaki LSI USB ethernet
+device aue # ADMtek USB Ethernet
+device axe # ASIX Electronics USB Ethernet
+device cue # CATC USB Ethernet
+device kue # Kawasaki LSI USB Ethernet
# FireWire support
device firewire # FireWire bus code
==== //depot/user/jhb/acpipci/alpha/include/float.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/float.h,v 1.5 2004/04/05 21:00:50 imp Exp $ */
+/* $FreeBSD: src/sys/alpha/include/float.h,v 1.6 2004/04/25 02:36:28 das Exp $ */
/* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */
/*
@@ -41,8 +41,10 @@
#define FLT_RADIX 2 /* b */
#define FLT_ROUNDS __flt_rounds()
+#if __ISO_C_VISIBLE >= 1999
#define FLT_EVAL_METHOD 0 /* no promotions */
#define DECIMAL_DIG 17 /* max precision in decimal digits */
+#endif
#define FLT_MANT_DIG 24 /* p */
#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
==== //depot/user/jhb/acpipci/amd64/acpica/acpi_machdep.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.12 2003/09/22 22:12:46 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.13 2004/04/21 02:10:58 njl Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -40,8 +40,7 @@
{
struct acpi_softc *sc;
- if ((sc = device_get_softc(dev)) == NULL)
- return (ENXIO);
+ sc = device_get_softc(dev);
acpi_install_wakeup_handler(sc);
==== //depot/user/jhb/acpipci/amd64/conf/GENERIC#15 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.405 2004/03/25 03:19:28 obrien Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.407 2004/05/02 20:40:18 marcel Exp $
machine amd64
cpu HAMMER
@@ -44,6 +44,7 @@
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
options PSEUDOFS # Pseudo-filesystem framework
+options GEOM_GPT # GUID Partition Tables.
options IA32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI
@@ -180,7 +181,7 @@
# PCI Ethernet NICs that use the common MII bus controller code.
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
device miibus # MII bus support
-device bfe # Broadcom BCM440x 10/100 ethernet
+device bfe # Broadcom BCM440x 10/100 Ethernet
device bge # Broadcom BCM570xx Gigabit Ethernet
device dc # DEC/Intel 21143 and various workalikes
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
@@ -189,9 +190,9 @@
device rl # RealTek 8129/8139
device sf # Adaptec AIC-6915 (``Starfire'')
device sis # Silicon Integrated Systems SiS 900/SiS 7016
-device sk # SysKonnect SK-984x & SK-982x gigabit ethernet
+device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
device ste # Sundance ST201 (D-Link DFE-550TX)
-device ti # Alteon Networks Tigon I/II gigabit ethernet
+device ti # Alteon Networks Tigon I/II gigabit Ethernet
device tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 ``EPIC'')
device vr # VIA Rhine, Rhine II
@@ -210,8 +211,8 @@
#device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc.
# XXX kvtop brokenness, pointer/int warnings
#device lnc # NE2100, NE32-VL Lance Ethernet cards
-device sn # SMC's 9000 series of ethernet chips
-device xe # Xircom pccard ethernet
+device sn # SMC's 9000 series of Ethernet chips
+device xe # Xircom pccard Ethernet
# ISA devices that use the old ISA shims
#device le
@@ -253,10 +254,10 @@
device urio # Diamond Rio 500 MP3 player
device uscanner # Scanners
# USB Ethernet, requires mii
-device aue # ADMtek USB ethernet
-device axe # ASIX Electronics USB ethernet
-device cue # CATC USB ethernet
-device kue # Kawasaki LSI USB ethernet
+device aue # ADMtek USB Ethernet
+device axe # ASIX Electronics USB Ethernet
+device cue # CATC USB Ethernet
+device kue # Kawasaki LSI USB Ethernet
# FireWire support
device firewire # FireWire bus code
==== //depot/user/jhb/acpipci/amd64/include/float.h#3 (text+ko) ====
@@ -27,16 +27,20 @@
* SUCH DAMAGE.
*
* from: @(#)float.h 7.1 (Berkeley) 5/8/90
- * $FreeBSD: src/sys/amd64/include/float.h,v 1.11 2004/04/05 21:25:51 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/float.h,v 1.12 2004/04/25 02:36:28 das Exp $
*/
#ifndef _MACHINE_FLOAT_H_
#define _MACHINE_FLOAT_H_ 1
+#include <sys/cdefs.h>
+
#define FLT_RADIX 2 /* b */
#define FLT_ROUNDS 1 /* FP addition rounds to nearest */
+#if __ISO_C_VISIBLE >= 1999
#define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */
#define DECIMAL_DIG 21 /* max precision in decimal digits */
+#endif
#define FLT_MANT_DIG 24 /* p */
#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
==== //depot/user/jhb/acpipci/boot/i386/boot0/Makefile#6 (text+ko) ====
@@ -1,13 +1,10 @@
-# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.23 2004/02/09 14:11:56 ru Exp $
+# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.29 2004/04/28 21:31:19 ru Exp $
-PROG= ${BOOT}.out
-INTERNALPROG=
-FILES= ${BOOT}
+PROG?= boot0
+STRIP=
+BINMODE=${NOBINMODE}
NOMAN=
-SRCS= ${BOOT}.s
-CLEANFILES= ${BOOT}
-
-BOOT?= boot0
+SRCS= ${PROG}.S
# The default set of flags compiled into boot0. This enables update (writing
# the modified boot0 back to disk after running so that the selection made is
@@ -30,13 +27,10 @@
# command line
BOOT_BOOT0_COMCONSOLE_SPEED?= 0xE3
-AFLAGS+=--defsym FLAGS=${BOOT_BOOT0_FLAGS} \
- --defsym TICKS=${BOOT_BOOT0_TICKS} \
- --defsym COMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED}
+CFLAGS+=-DFLAGS=${BOOT_BOOT0_FLAGS} \
+ -DTICKS=${BOOT_BOOT0_TICKS} \
+ -DCOMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED}
-LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG}
-
-${BOOT}: ${BOOT}.out
- objcopy -S -O binary ${BOOT}.out ${.TARGET}
+LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-S,--oformat,binary
.include <bsd.prog.mk>
==== //depot/user/jhb/acpipci/boot/i386/boot0ext/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/sys/boot/i386/boot0ext/Makefile,v 1.1 2004/03/26 18:46:31 obrien Exp $
+# $FreeBSD: src/sys/boot/i386/boot0ext/Makefile,v 1.2 2004/04/28 21:31:20 ru Exp $
.PATH: ${.CURDIR}/../boot0
-BOOT= boot0ext
+PROG= boot0ext
.include "${.CURDIR}/../boot0/Makefile"
==== //depot/user/jhb/acpipci/boot/i386/boot0sio/Makefile#3 (text+ko) ====
@@ -1,7 +1,8 @@
-# $FreeBSD: src/sys/boot/i386/boot0sio/Makefile,v 1.2 2004/02/06 21:58:31 ru Exp $
+# $FreeBSD: src/sys/boot/i386/boot0sio/Makefile,v 1.4 2004/04/28 21:31:20 ru Exp $
.PATH: ${.CURDIR}/../boot0
-BOOT= boot0sio
+PROGNAME= boot0sio
+CFLAGS+= -DSIO
.include "${.CURDIR}/../boot0/Makefile"
==== //depot/user/jhb/acpipci/boot/i386/boot2/boot1.S#2 (text+ko) ====
@@ -1,21 +1,21 @@
-//
-// Copyright (c) 1998 Robert Nordier
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms are freely
-// permitted provided that the above copyright notice and this
-// paragraph and the following disclaimer are duplicated in all
-// such forms.
-//
-// This software is provided "AS IS" and without any express or
-// implied warranties, including, without limitation, the implied
-// warranties of merchantability and fitness for a particular
-// purpose.
-//
+/*
+ * Copyright (c) 1998 Robert Nordier
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are freely
+ * permitted provided that the above copyright notice and this
+ * paragraph and the following disclaimer are duplicated in all
+ * such forms.
+ *
+ * This software is provided "AS IS" and without any express or
+ * implied warranties, including, without limitation, the implied
+ * warranties of merchantability and fitness for a particular
+ * purpose.
+ *
+ * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.26 2004/04/28 14:31:43 ru Exp $
+ */
-// $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.24 2004/02/17 07:13:04 ru Exp $
-
-// Memory Locations
+/* Memory Locations */
.set MEM_REL,0x700 // Relocation address
.set MEM_ARG,0x900 // Arguments
.set MEM_ORG,0x7c00 // Origin
@@ -25,15 +25,15 @@
.set MEM_USR,0xa000 // Client start
.set BDA_BOOT,0x472 // Boot howto flag
-// Partition Constants
+/* Partition Constants */
.set PRT_OFF,0x1be // Partition offset
.set PRT_NUM,0x4 // Partitions
.set PRT_BSD,0xa5 // Partition type
-// Flag Bits
+/* Flag Bits */
.set FL_PACKET,0x80 // Packet mode
-// Misc. Constants
+/* Misc. Constants */
.set SIZ_PAG,0x1000 // Page size
.set SIZ_SEC,0x200 // Sector size
@@ -44,19 +44,20 @@
start: jmp main // Start recognizably
-// This is the start of a standard BIOS Parameter Block (BPB). Most bootable
-// FAT disks have this at the start of their MBR. While normal BIOS's will
-// work fine without this section, IBM's El Torito emulation "fixes" up the
-// BPB by writing into the memory copy of the MBR. Rather than have data
-// written into our xread routine, we'll define a BPB to work around it.
-// The data marked with (T) indicates a field required for a ThinkPad to
-// recognize the disk and (W) indicates fields written from IBM BIOS code.
-// The use of the BPB is based on what OpenBSD and NetBSD implemented in
-// their boot code but the required fields were determined by trial and error.
-//
-// Note: If additional space is needed in boot1, one solution would be to
-// move the "prompt" message data (below) to replace the OEM ID.
-
+/*
+ * This is the start of a standard BIOS Parameter Block (BPB). Most bootable
+ * FAT disks have this at the start of their MBR. While normal BIOS's will
+ * work fine without this section, IBM's El Torito emulation "fixes" up the
+ * BPB by writing into the memory copy of the MBR. Rather than have data
+ * written into our xread routine, we'll define a BPB to work around it.
+ * The data marked with (T) indicates a field required for a ThinkPad to
+ * recognize the disk and (W) indicates fields written from IBM BIOS code.
+ * The use of the BPB is based on what OpenBSD and NetBSD implemented in
+ * their boot code but the required fields were determined by trial and error.
+ *
+ * Note: If additional space is needed in boot1, one solution would be to
+ * move the "prompt" message data (below) to replace the OEM ID.
+ */
.org 0x03, 0x00
oemid: .space 0x08, 0x00 // OEM ID
@@ -78,21 +79,21 @@
ebpb: .byte 0 // BIOS physical drive number (W)
.org 0x25,0x90
-//
-// Trampoline used by boot2 to call read to read data from the disk via
-// the BIOS. Call with:
-//
-// %cx:%ax - long - LBA to read in
-// %es:(%bx) - caddr_t - buffer to read data into
-// %dl - byte - drive to read from
-// %dh - byte - num sectors to read
-//
+/*
+ * Trampoline used by boot2 to call read to read data from the disk via
+ * the BIOS. Call with:
+ *
+ * %cx:%ax - long - LBA to read in
+ * %es:(%bx) - caddr_t - buffer to read data into
+ * %dl - byte - drive to read from
+ * %dh - byte - num sectors to read
+ */
xread: push %ss // Address
pop %ds // data
-//
-// Setup an EDD disk packet and pass it to read
-//
+/*
+ * Setup an EDD disk packet and pass it to read
+ */
xread.1: // Starting
pushl $0x0 // absolute
push %cx // block
@@ -107,37 +108,37 @@
callw read // Read from disk
lea 0x10(%bp),%sp // Clear stack
lret // To far caller
-//
-// Load the rest of boot2 and BTX up, copy the parts to the right locations,
-// and start it all up.
-//
+/*
+ * Load the rest of boot2 and BTX up, copy the parts to the right locations,
+ * and start it all up.
+ */
-//
-// Setup the segment registers to flat addressing (segment 0) and setup the
-// stack to end just below the start of our code.
-//
+/*
+ * Setup the segment registers to flat addressing (segment 0) and setup the
+ * stack to end just below the start of our code.
+ */
main: cld // String ops inc
xor %cx,%cx // Zero
mov %cx,%es // Address
mov %cx,%ds // data
mov %cx,%ss // Set up
mov $start,%sp // stack
-//
-// Relocate ourself to MEM_REL. Since %cx == 0, the inc %ch sets
-// %cx == 0x100.
-//
+/*
+ * Relocate ourself to MEM_REL. Since %cx == 0, the inc %ch sets
+ * %cx == 0x100.
+ */
mov %sp,%si // Source
mov $MEM_REL,%di // Destination
incb %ch // Word count
rep // Copy
movsw // code
-//
-// If we are on a hard drive, then load the MBR and look for the first
-// FreeBSD slice. We use the fake partition entry below that points to
-// the MBR when we call nread. The first pass looks for the first active
-// FreeBSD slice. The second pass looks for the first non-active FreeBSD
-// slice if the first one fails.
-//
+/*
+ * If we are on a hard drive, then load the MBR and look for the first
+ * FreeBSD slice. We use the fake partition entry below that points to
+ * the MBR when we call nread. The first pass looks for the first active
+ * FreeBSD slice. The second pass looks for the first non-active FreeBSD
+ * slice if the first one fails.
+ */
mov $part4,%si // Partition
cmpb $0x80,%dl // Hard drive?
jb main.4 // No
@@ -157,30 +158,30 @@
jb main.2 // Yes
dec %cx // Do two
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon May 3 12:11:27 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id C267F16A4D0; Mon, 3 May 2004 12:11:26 -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 9DBCB16A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 12:11:26 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 5BB9243D4C
for <perforce@freebsd.org>; Mon, 3 May 2004 12:11:26 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43JBQGe000322
for <perforce@freebsd.org>; Mon, 3 May 2004 12:11:26 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43JBPk7000313
for perforce@freebsd.org; Mon, 3 May 2004 12:11:25 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Date: Mon, 3 May 2004 12:11:25 -0700 (PDT)
Message-Id: <200405031911.i43JBPk7000313@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52156 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: Mon, 03 May 2004 19:11:27 -0000
http://perforce.freebsd.org/chv.cgi?CH=52156
Change 52156 by jhb@jhb_slimer on 2004/05/03 12:10:39
Bah, revert accidental submits. Neither of these worked on my
laptop, though the acpi_video one does work for some people and
might should be committed.
Affected files ...
.. //depot/projects/power/sys/dev/acpica/acpi_video.c#4 edit
.. //depot/projects/power/sys/isa/vga_isa.c#5 edit
Differences ...
==== //depot/projects/power/sys/dev/acpica/acpi_video.c#4 (text+ko) ====
@@ -1,6 +1,5 @@
/*-
* Copyright (c) 2002-2003 Taku YAMAMOTO <taku@cent.saitama-u.ac.jp>
- * Copyright (c) 2004 Benjamin Close <Benjamin.Close@clearchain.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,33 +34,10 @@
#include <sys/power.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
-#ifdef __i386__
-#include <machine/vm86.h>
-#endif
#include "acpi.h"
#include <dev/acpica/acpivar.h>
-#ifdef __i386__
-#define USE_DPMS
-
-/*
- * VESA DPMS States
- */
-#define DPMS_ON 0x00
-#define DPMS_STANDBY 0x01
-#define DPMS_SUSPEND 0x02
-#define DPMS_OFF 0x04
-#define DPMS_REDUCEDON 0x08
-
-#define VBE_DPMS_FUNCTION 0x4F10
-#define VBE_DPMS_GET_SUPPORTED_STATES 0x00
-#define VBE_DPMS_GET_STATE 0x02
-#define VBE_DPMS_SET_STATE 0x01
-#define VBE_MAJORVERSION_MASK 0x0F
-#define VBE_MINORVERSION_MASK 0xF0
-#endif
-
/* ACPI video extension driver. */
struct acpi_video_output {
ACPI_HANDLE handle;
@@ -87,10 +63,6 @@
ACPI_HANDLE handle;
STAILQ_HEAD(, acpi_video_output) vid_outputs;
eventhandler_tag vid_pwr_evh;
-#ifdef USE_DPMS
- int vid_dpms_supported_states;
- int vid_dpms_initial_state;
-#endif
};
/* interfaces */
@@ -99,8 +71,6 @@
static int acpi_video_attach(device_t);
static int acpi_video_detach(device_t);
static int acpi_video_shutdown(device_t);
-static int acpi_video_suspend(device_t);
-static int acpi_video_resume(device_t);
static void acpi_video_notify_handler(ACPI_HANDLE, UINT32, void *);
static void acpi_video_power_profile(void *);
static void acpi_video_bind_outputs(struct acpi_video_softc *);
@@ -124,11 +94,6 @@
static UINT32 vo_get_device_status(ACPI_HANDLE);
static UINT32 vo_query_graphics_state(ACPI_HANDLE);
static void vo_set_device_state(ACPI_HANDLE, UINT32);
-#ifdef USE_DPMS
-static int dpms_get_supported_states(int *);
-static int dpms_get_current_state(int *);
-static int dpms_set_state(int);
-#endif
/* events */
#define VID_NOTIFY_SWITCHED 0x80
@@ -176,8 +141,6 @@
DEVMETHOD(device_attach, acpi_video_attach),
DEVMETHOD(device_detach, acpi_video_detach),
DEVMETHOD(device_shutdown, acpi_video_shutdown),
- DEVMETHOD(device_resume, acpi_video_resume),
- DEVMETHOD(device_suspend, acpi_video_suspend),
{ 0, 0 }
};
@@ -279,13 +242,6 @@
ACPI_UNLOCK;
acpi_video_power_profile(sc);
-#ifdef USE_DPMS
- if (dpms_get_supported_states(&sc->vid_dpms_supported_states) == 0)
- dpms_get_current_state(&sc->vid_dpms_initial_state);
- else
- sc->vid_dpms_supported_states = -1;
-#endif
-
return (0);
}
@@ -327,32 +283,6 @@
return (0);
}
-static int
-acpi_video_suspend(device_t dev)
-{
- struct acpi_video_softc *sc;
-
- sc = device_get_softc(dev);
-#ifdef USE_DPMS
- if (sc->vid_dpms_supported_states != -1)
- dpms_set_state(DPMS_OFF);
-#endif
- return (0);
-}
-
-static int
-acpi_video_resume(device_t dev)
-{
- struct acpi_video_softc *sc;
-
- sc = device_get_softc(dev);
-#ifdef USE_DPMS
- if (sc->vid_dpms_supported_states != -1)
- dpms_set_state(sc->vid_dpms_initial_state);
-#endif
- return (0);
-}
-
static void
acpi_video_notify_handler(ACPI_HANDLE handle __unused, UINT32 notify, void *context)
{
@@ -999,49 +929,3 @@
printf("can't evaluate %s._DSS - %s\n",
acpi_name(handle), AcpiFormatException(status));
}
-
-#ifdef USE_DPMS
-/* XXX: Requires VM86 support in the kernel. */
-static int
-dpms_call_bios(int subfunction, int *bh)
-{
- struct vm86frame vmf;
- int error;
-
- bzero(&vmf, sizeof(vmf));
- vmf.vmf_ax = VBE_DPMS_FUNCTION;
- vmf.vmf_bl = subfunction;
- vmf.vmf_bh = *bh;
- vmf.vmf_es = 0;
- vmf.vmf_di = 0;
- error = vm86_intcall(0x10, &vmf);
- if (error == 0 && (vmf.vmf_eax & 0xffff) != 0x004f)
- error = ENXIO;
- if (error == 0)
- *bh = vmf.vmf_bh;
- return (error);
-}
-
-static int
-dpms_get_supported_states(int *states)
-{
-
- *states = 0;
- return (dpms_call_bios(VBE_DPMS_GET_SUPPORTED_STATES, states));
-}
-
-static int
-dpms_get_current_state(int *state)
-{
-
- *state = 0;
- return (dpms_call_bios(VBE_DPMS_GET_STATE, state));
-}
-
-static int
-dpms_set_state(int state)
-{
-
- return (dpms_call_bios(VBE_DPMS_SET_STATE, &state));
-}
-#endif
==== //depot/projects/power/sys/isa/vga_isa.c#5 (text+ko) ====
@@ -159,26 +159,6 @@
return 0;
}
-static int
-isavga_suspend(device_t dev)
-{
- vga_softc_t *sc;
-
- sc = device_get_softc(dev);
- (*vidsw[sc->adp->va_index]->blank_display)(sc->adp, V_DISPLAY_SUSPEND);
- return (0);
-}
-
-static int
-isavga_resume(device_t dev)
-{
- vga_softc_t *sc;
-
- sc = device_get_softc(dev);
- (*vidsw[sc->adp->va_index]->blank_display)(sc->adp, V_DISPLAY_ON);
- return (0);
-}
-
#ifdef FB_INSTALL_CDEV
static int
@@ -223,8 +203,6 @@
DEVMETHOD(device_identify, isavga_identify),
DEVMETHOD(device_probe, isavga_probe),
DEVMETHOD(device_attach, isavga_attach),
- DEVMETHOD(device_suspend, isavga_suspend),
- DEVMETHOD(device_resume, isavga_resume),
DEVMETHOD(bus_print_child, bus_generic_print_child),
{ 0, 0 }
From owner-p4-projects@FreeBSD.ORG Mon May 3 14:05:50 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id A5D3A16A4D0; Mon, 3 May 2004 14:05:50 -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 7EBCA16A4CF
for <perforce@freebsd.org>; Mon, 3 May 2004 14:05:50 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 699F243D49
for <perforce@freebsd.org>; Mon, 3 May 2004 14:05:50 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43L5oGe032933
for <perforce@freebsd.org>; Mon, 3 May 2004 14:05:50 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43L5nUR032930
for perforce@freebsd.org; Mon, 3 May 2004 14:05:49 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 3 May 2004 14:05:49 -0700 (PDT)
Message-Id: <200405032105.i43L5nUR032930@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52163 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: Mon, 03 May 2004 21:05:51 -0000
http://perforce.freebsd.org/chv.cgi?CH=52163
Change 52163 by rwatson@rwatson_tislabs on 2004/05/03 14:05:19
In mac_mbuf_to_label(), don't attempt to extract labels from
a NULL mbuf pointer. Don't attempt to convert a NULL tag to
a label. Return NULL in both of these cases.
Affected files ...
.. //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#25 edit
Differences ...
==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#25 (text+ko) ====
@@ -89,9 +89,12 @@
struct m_tag *tag;
struct label *label;
+ if (mbuf == NULL)
+ return (NULL);
tag = m_tag_find(mbuf, PACKET_TAG_MACLABEL, NULL);
+ if (tag == NULL)
+ return (NULL);
label = (struct label *)(tag+1);
-
return (label);
}
From owner-p4-projects@FreeBSD.ORG Mon May 3 14:07:54 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 67A9B16A4D0; Mon, 3 May 2004 14:07:54 -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 3D4B216A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 14:07:54 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 2A58043D41
for <perforce@freebsd.org>; Mon, 3 May 2004 14:07:54 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43L7rGe033041
for <perforce@freebsd.org>; Mon, 3 May 2004 14:07:54 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43L7rKo033038
for perforce@freebsd.org; Mon, 3 May 2004 14:07:53 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 3 May 2004 14:07:53 -0700 (PDT)
Message-Id: <200405032107.i43L7rKo033038@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52165 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: Mon, 03 May 2004 21:07:55 -0000
http://perforce.freebsd.org/chv.cgi?CH=52165
Change 52165 by rwatson@rwatson_tislabs on 2004/05/03 14:07:20
When asserting an mbuf label pointer, don't perform the test if
the label pointer is NULL, which can happen if mac_test is
loaded after system boot, so mbufs are in flight that don't
have label state allocated.
Affected files ...
.. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#131 edit
Differences ...
==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#131 (text+ko) ====
@@ -115,8 +115,9 @@
SLOT(x) == 0, ("%s: Bad INPCB label", __func__ ))
#define ASSERT_IPQ_LABEL(x) KASSERT(SLOT(x) == IPQMAGIC || \
SLOT(x) == 0, ("%s: Bad IPQ label", __func__ ))
-#define ASSERT_MBUF_LABEL(x) KASSERT(SLOT(x) == MBUFMAGIC || \
- SLOT(x) == 0, ("%s: Bad MBUF label", __func__ ))
+#define ASSERT_MBUF_LABEL(x) KASSERT(x == NULL || \
+ SLOT(x) == MBUFMAGIC || SLOT(x) == 0, ("%s: Bad MBUF label", \
+ __func__ ))
#define ASSERT_MOUNT_LABEL(x) KASSERT(SLOT(x) == MOUNTMAGIC || \
SLOT(x) == 0, ("%s: Bad MOUNT label", __func__ ))
#define ASSERT_SOCKET_LABEL(x) KASSERT(SLOT(x) == SOCKETMAGIC || \
From owner-p4-projects@FreeBSD.ORG Mon May 3 15:39:59 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id BF50C16A4D0; Mon, 3 May 2004 15:39:58 -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 9786F16A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 15:39:58 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id D55CC43D4C
for <perforce@freebsd.org>; Mon, 3 May 2004 15:39:56 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43MduGe052878
for <perforce@freebsd.org>; Mon, 3 May 2004 15:39:56 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43Mdttn052875
for perforce@freebsd.org; Mon, 3 May 2004 15:39:55 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 3 May 2004 15:39:55 -0700 (PDT)
Message-Id: <200405032239.i43Mdttn052875@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52173 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: Mon, 03 May 2004 22:39:59 -0000
http://perforce.freebsd.org/chv.cgi?CH=52173
Change 52173 by rwatson@rwatson_tislabs on 2004/05/03 15:38:51
Integrate TrustedBSD base branch from FreeBSD vendor branch:
ls(1) now does multi-byte characters.
libarchive(3) now compiles and is usable on Linux.
libc(3) can now be built without floating point support.
geom gate(4) allows export and import of storage devices over
TCP/IP.
route(4) routing sockets and miibus updated to allow routing
messages to track link state changes on ethernet devices.
GPT(4) support on non-ia64 systems.
Various pf(4) updates from OpenBSD.
asr(4) cleaned up.
MAC_STATIC kernel option avoids cost of MAC Framework
synchronization for statically configured systems, looped back
from trustedbsd_mac branch.
ip_fastfwd cleaned up.
ip_claim_next_hop() -> m_claim_next()
saorder_state_valid for FAST_IPSEC.
mac_test(4) now handles NULL mbuf pointer, looped back from
trustedbsd_mac branch.
du(1) hard link tracking efficiency improvements.
Affected files ...
.. //depot/projects/trustedbsd/base/bin/ls/extern.h#10 integrate
.. //depot/projects/trustedbsd/base/bin/ls/ls.1#24 integrate
.. //depot/projects/trustedbsd/base/bin/ls/print.c#21 integrate
.. //depot/projects/trustedbsd/base/bin/ls/util.c#12 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/gzip.c#2 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/gzip.h#2 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/unzip.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive.h#4 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.h#4 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_platform.h#4 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_private.h#4 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_string.h#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/Makefile#13 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/fmtcheck.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdio/vfprintf.c#20 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdio/vfscanf.c#18 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdio/vfwprintf.c#12 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdio/vfwscanf.c#11 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#82 integrate
.. //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#26 integrate
.. //depot/projects/trustedbsd/base/sbin/Makefile#23 integrate
.. //depot/projects/trustedbsd/base/sbin/gconcat/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/sbin/ggate/ggatec/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sbin/ggate/ggatec/ggatec.8#3 integrate
.. //depot/projects/trustedbsd/base/sbin/ggate/ggatec/ggatec.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/ggate/ggated/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sbin/ggate/ggated/ggated.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/ggate/ggatel/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sbin/ggate/ggatel/ggatel.8#3 integrate
.. //depot/projects/trustedbsd/base/sbin/ggate/ggatel/ggatel.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/ggate/shared/ggate.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/route/route.c#11 integrate
.. //depot/projects/trustedbsd/base/secure/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/asr.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/atapicam.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/hme.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/rl.4#8 integrate
.. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#16 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#29 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#10 integrate
.. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#44 integrate
.. //depot/projects/trustedbsd/base/sys/conf/NOTES#50 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files#74 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.i386#42 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.pc98#39 integrate
.. //depot/projects/trustedbsd/base/sys/conf/majors#33 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options#50 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_ioctl.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_norm.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/asr/asr.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cy/cy_isa.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cy/cy_pci.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/led/led.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mii/brgphy.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mii/dcphy.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mii/e1000phy.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mii/mii.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mii/mii_physubr.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mii/mlphy.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mii/ruephy.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mii/tlphy.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mii/xmphy.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#35 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs.h#35 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs_data.h#35 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uvscom.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/geom/gate/g_gate.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/geom/gate/g_gate.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#42 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#47 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/mptable_pci.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/legacyvar.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/atpic.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/cy.c#16 delete
.. //depot/projects/trustedbsd/base/sys/i386/isa/cyreg.h#2 delete
.. //depot/projects/trustedbsd/base/sys/i386/isa/ic/cd1400.h#2 delete
.. //depot/projects/trustedbsd/base/sys/i386/pci/pci_bus.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC#29 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/conf/SKI#14 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_clock.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/modules/geom/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/sys/net/if.h#17 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_var.h#22 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/net/rtsock.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_fastfwd.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_var.h#22 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#48 integrate
.. //depot/projects/trustedbsd/base/sys/netipsec/key.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#33 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#15 integrate
.. //depot/projects/trustedbsd/base/sys/pci/cy_pci.c#9 delete
.. //depot/projects/trustedbsd/base/sys/powerpc/conf/GENERIC#20 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#37 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#33 integrate
.. //depot/projects/trustedbsd/base/tools/regression/geom_gate/Makefile#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/geom_gate/runtests.sh#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/geom_gate/test-1.sh#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/geom_gate/test-2.sh#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/geom_gate/test-3.sh#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/nanobsd/i386.diskimage#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/du/du.c#12 integrate
.. //depot/projects/trustedbsd/base/usr.bin/rpcgen/rpc_main.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar.h#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar_platform.h#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/read.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/util.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/write.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/jail/jail.8#17 integrate
Differences ...
==== //depot/projects/trustedbsd/base/bin/ls/extern.h#10 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* from: @(#)extern.h 8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/ls/extern.h,v 1.22 2004/04/06 20:06:47 markm Exp $
+ * $FreeBSD: src/bin/ls/extern.h,v 1.23 2004/05/02 11:25:37 tjr Exp $
*/
int acccmp(const FTSENT *, const FTSENT *);
@@ -45,6 +45,7 @@
void printscol(const DISPLAY *);
void printstream(const DISPLAY *);
void usage(void);
+int prn_normal(const char *);
size_t len_octal(const char *, int);
int prn_octal(const char *);
int prn_printable(const char *);
==== //depot/projects/trustedbsd/base/bin/ls/ls.1#24 (text+ko) ====
@@ -29,9 +29,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.79 2004/04/06 20:06:47 markm Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.80 2004/05/02 11:25:37 tjr Exp $
.\"
-.Dd March 21, 2004
+.Dd May 2, 2004
.Dt LS 1
.Os
.Sh NAME
@@ -673,7 +673,3 @@
.Sh BUGS
To maintain backward compatibility, the relationships between the many
options are quite complex.
-.Pp
-The
-.Nm
-utility does not recognize multibyte characters in filenames.
==== //depot/projects/trustedbsd/base/bin/ls/print.c#21 (text+ko) ====
@@ -36,7 +36,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.70 2004/04/06 20:06:47 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.71 2004/05/02 11:25:37 tjr Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -147,7 +147,7 @@
else if (f_nonprint)
return prn_printable(name);
else
- return printf("%s", name);
+ return prn_normal(name);
}
void
@@ -239,6 +239,7 @@
for (p = dp->list, chcnt = 0; p; p = p->fts_link) {
if (p->fts_number == NO_PRINT)
continue;
+ /* XXX strlen does not take octal escapes into account. */
if (strlen(p->fts_name) + chcnt +
(p->fts_link ? 2 : 0) >= (unsigned)termwidth) {
putchar('\n');
==== //depot/projects/trustedbsd/base/bin/ls/util.c#12 (text+ko) ====
@@ -36,7 +36,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.33 2004/04/06 20:06:47 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.35 2004/05/03 11:48:55 tjr Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -44,25 +44,82 @@
#include <ctype.h>
#include <err.h>
#include <fts.h>
+#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <wchar.h>
+#include <wctype.h>
#include "ls.h"
#include "extern.h"
int
+prn_normal(const char *s)
+{
+ mbstate_t mbs;
+ wchar_t wc;
+ int i, n;
+ size_t clen;
+
+ memset(&mbs, 0, sizeof(mbs));
+ n = 0;
+ while ((clen = mbrtowc(&wc, s, MB_LEN_MAX, &mbs)) != 0) {
+ if (clen == (size_t)-2) {
+ n += printf("%s", s);
+ break;
+ }
+ if (clen == (size_t)-1) {
+ memset(&mbs, 0, sizeof(mbs));
+ putchar((unsigned char)*s);
+ s++;
+ n++;
+ continue;
+ }
+ for (i = 0; i < (int)clen; i++)
+ putchar((unsigned char)s[i]);
+ s += clen;
+ if (iswprint(wc))
+ n += wcwidth(wc);
+ }
+ return (n);
+}
+
+int
prn_printable(const char *s)
{
- char c;
- int n;
+ mbstate_t mbs;
+ wchar_t wc;
+ int i, n;
+ size_t clen;
- for (n = 0; (c = *s) != '\0'; ++s, ++n)
- if (isprint((unsigned char)c))
- putchar(c);
- else
+ memset(&mbs, 0, sizeof(mbs));
+ n = 0;
+ while ((clen = mbrtowc(&wc, s, MB_LEN_MAX, &mbs)) != 0) {
+ if (clen == (size_t)-1) {
+ putchar('?');
+ s++;
+ n++;
+ memset(&mbs, 0, sizeof(mbs));
+ continue;
+ }
+ if (clen == (size_t)-2) {
+ putchar('?');
+ n++;
+ break;
+ }
+ if (!iswprint(wc)) {
putchar('?');
- return n;
+ s += clen;
+ n++;
+ continue;
+ }
+ for (i = 0; i < (int)clen; i++)
+ putchar((unsigned char)s[i]);
+ s += clen;
+ n += wcwidth(wc);
+ }
+ return (n);
}
/*
@@ -81,70 +138,83 @@
size_t
len_octal(const char *s, int len)
{
- size_t r = 0;
+ mbstate_t mbs;
+ wchar_t wc;
+ size_t clen, r;
- while (len--)
- if (isprint((unsigned const char)*s++)) r++; else r += 4;
- return r;
+ memset(&mbs, 0, sizeof(mbs));
+ r = 0;
+ while (len != 0 && (clen = mbrtowc(&wc, s, len, &mbs)) != 0) {
+ if (clen == (size_t)-1) {
+ r += 4;
+ s++;
+ len--;
+ memset(&mbs, 0, sizeof(mbs));
+ continue;
+ }
+ if (clen == (size_t)-2) {
+ r += 4 * len;
+ break;
+ }
+ if (iswprint(wc))
+ r++;
+ else
+ r += 4 * clen;
+ s += clen;
+ }
+ return (r);
}
int
prn_octal(const char *s)
{
- unsigned char ch;
- int len = 0;
+ static const char esc[] = "\\\\\"\"\aa\bb\ff\nn\rr\tt\vv";
+ const char *p;
+ mbstate_t mbs;
+ wchar_t wc;
+ size_t clen;
+ unsigned char ch;
+ int goodchar, i, len, prtlen;
- while ((ch = (unsigned char)*s++)) {
- if (isprint(ch) && (ch != '\"') && (ch != '\\'))
- putchar(ch), len++;
- else if (f_octal_escape) {
- putchar('\\');
- switch (ch) {
- case '\\':
- putchar('\\');
- break;
- case '\"':
- putchar('"');
- break;
- case '\a':
- putchar('a');
- break;
- case '\b':
- putchar('b');
- break;
- case '\f':
- putchar('f');
- break;
- case '\n':
- putchar('n');
- break;
- case '\r':
- putchar('r');
- break;
- case '\t':
- putchar('t');
- break;
- case '\v':
- putchar('v');
- break;
- default:
+ memset(&mbs, 0, sizeof(mbs));
+ len = 0;
+ while ((clen = mbrtowc(&wc, s, MB_LEN_MAX, &mbs)) != 0) {
+ goodchar = clen != (size_t)-1 && clen != (size_t)-2;
+ if (goodchar && iswprint(wc) && wc != L'\"' && wc != L'\\') {
+ for (i = 0; i < (int)clen; i++)
+ putchar((unsigned char)s[i]);
+ len += wcwidth(wc);
+ } else if (goodchar && f_octal_escape && wc >= 0 &&
+ wc <= (wchar_t)UCHAR_MAX &&
+ (p = strchr(esc, (char)wc)) != NULL) {
+ putchar('\\');
+ putchar(p[1]);
+ len += 2;
+ } else {
+ if (goodchar)
+ prtlen = clen;
+ else if (clen == (size_t)-1)
+ prtlen = 1;
+ else
+ prtlen = strlen(s);
+ for (i = 0; i < prtlen; i++) {
+ ch = (unsigned char)s[i];
+ putchar('\\');
putchar('0' + (ch >> 6));
putchar('0' + ((ch >> 3) & 7));
putchar('0' + (ch & 7));
- len += 2;
- break;
- }
- len += 2;
- }
- else {
- putchar('\\');
- putchar('0' + (ch >> 6));
- putchar('0' + ((ch >> 3) & 7));
- putchar('0' + (ch & 7));
- len += 4;
+ len += 4;
+ }
}
+ if (clen == (size_t)-2)
+ break;
+ if (clen == (size_t)-1) {
+ memset(&mbs, 0, sizeof(mbs));
+ s++;
+ } else
+ s += clen;
}
- return len;
+ return (len);
}
void
==== //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/gzip.c#2 (text+ko) ====
@@ -45,7 +45,7 @@
*/
#ifdef RCSID
-static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/gzip.c,v 1.10 1999/08/27 23:35:50 peter Exp $";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/gzip.c,v 1.11 2004/05/03 10:29:23 obrien Exp $";
#endif
#include <ctype.h>
@@ -1011,14 +1011,15 @@
#ifdef NO_MULTIPLE_DOTS
char *dot; /* pointer to ifname extension, or NULL */
#endif
+ int max_suffix_len = (z_len > 3 ? z_len : 3);
- if (strlen(iname) >= sizeof(ifname) - 3) {
+ /* Leave enough room in ifname or ofname for suffix: */
+ if (strlen(iname) >= sizeof(ifname) - max_suffix_len) {
errno = ENAMETOOLONG;
perror(iname);
exit_code = ERROR;
return ERROR;
}
-
strcpy(ifname, iname);
/* If input file exists, return OK. */
==== //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/gzip.h#2 (text+ko) ====
@@ -2,6 +2,8 @@
* Copyright (C) 1992-1993 Jean-loup Gailly.
* This is free software; you can redistribute it and/or modify it under the
* terms of the GNU General Public License, see the file COPYING.
+ *
+ * $FreeBSD: src/gnu/usr.bin/gzip/gzip.h,v 1.4 2004/05/02 23:07:49 obrien Exp $
*/
#if defined(__STDC__) || defined(PROTO)
@@ -41,9 +43,10 @@
#define local static
-typedef unsigned char uch;
-typedef unsigned short ush;
-typedef unsigned long ulg;
+#include <stdint.h>
+typedef uint8_t uch;
+typedef uint16_t ush;
+typedef uint32_t ulg;
/* Return codes from gzip */
#define OK 0
==== //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/unzip.c#2 (text+ko) ====
@@ -14,8 +14,10 @@
*/
#ifdef RCSID
-static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unzip.c,v 1.6 1999/08/27 23:35:54 peter Exp $";
+static char rcsid[] = "$Id: unzip.c,v 0.13 1993/06/10 13:29:00 jloup Exp $";
#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gzip/unzip.c,v 1.8 2004/05/03 10:33:27 obrien Exp $");
#include "tailor.h"
#include "gzip.h"
@@ -35,6 +37,7 @@
#define LOCEXT 28 /* offset of extra field length */
#define LOCHDR 30 /* size of local header, including sig */
#define EXTHDR 16 /* size of extended local header, inc sig */
+#define RAND_HEAD_LEN 12 /* length of encryption random header */
/* Globals */
@@ -103,6 +106,7 @@
ulg orig_len = 0; /* original uncompressed length */
int n;
uch buf[EXTHDR]; /* extended local header */
+ int err = OK;
ifd = in;
ofd = out;
@@ -136,9 +140,6 @@
}
while (n--) {
uch c = (uch)get_byte();
-#ifdef CRYPT
- if (decrypt) zdecode(c);
-#endif
put_ubyte(c);
}
flush_window();
@@ -172,10 +173,14 @@
/* Validate decompression */
if (orig_crc != updcrc(outbuf, 0)) {
- error("invalid compressed data--crc error");
+ fprintf(stderr, "\n%s: %s: invalid compressed data--crc error\n",
+ progname, ifname);
+ err = ERROR;
}
- if (orig_len != (ulg)bytes_out) {
- error("invalid compressed data--length error");
+ if (((orig_len - (ulg)bytes_out) & 0x0ffffffffL) != 0) {
+ fprintf(stderr, "\n%s: %s: invalid compressed data--length error\n",
+ progname, ifname);
+ err = ERROR;
}
/* Check if there are more entries in a pkzip file */
@@ -189,11 +194,12 @@
fprintf(stderr,
"%s: %s has more than one entry -- unchanged\n",
progname, ifname);
- exit_code = ERROR;
- ext_header = pkzip = 0;
- return ERROR;
+ err = ERROR;
}
}
ext_header = pkzip = 0; /* for next file */
- return OK;
+ if (err == OK) return OK;
+ exit_code = ERROR;
+ if (!test) abort_gzip();
+ return err;
}
==== //depot/projects/trustedbsd/base/lib/libarchive/archive.h#4 (text+ko) ====
@@ -23,7 +23,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/lib/libarchive/archive.h,v 1.7 2004/04/28 04:41:26 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $
*/
#ifndef ARCHIVE_H_INCLUDED
@@ -58,11 +58,11 @@
* platform-dependent error code.
*/
/* Unrecognized or invalid file format. */
-/* #define ARCHIVE_ERRNO_FILE_FORMAT */
+/* #define ARCHIVE_ERRNO_FILE_FORMAT */
/* Illegal usage of the library. */
-/* #define ARCHIVE_ERRNO_PROGRAMMER_ERROR */
+/* #define ARCHIVE_ERRNO_PROGRAMMER_ERROR */
/* Unknown or unclassified error. */
-/* #define ARCHIVE_ERRNO_MISC */
+/* #define ARCHIVE_ERRNO_MISC */
/*
* Callbacks are invoked to automatically read/write/open/close the archive.
@@ -96,9 +96,9 @@
#define ARCHIVE_FORMAT_BASE_MASK 0xff0000U
#define ARCHIVE_FORMAT_CPIO 0x10000
#define ARCHIVE_FORMAT_CPIO_POSIX (ARCHIVE_FORMAT_CPIO | 1)
-#define ARCHIVE_FORMAT_SHAR 0x20000
-#define ARCHIVE_FORMAT_SHAR_BASE (ARCHIVE_FORMAT_SHAR | 1)
-#define ARCHIVE_FORMAT_SHAR_DUMP (ARCHIVE_FORMAT_SHAR | 2)
+#define ARCHIVE_FORMAT_SHAR 0x20000
+#define ARCHIVE_FORMAT_SHAR_BASE (ARCHIVE_FORMAT_SHAR | 1)
+#define ARCHIVE_FORMAT_SHAR_DUMP (ARCHIVE_FORMAT_SHAR | 2)
#define ARCHIVE_FORMAT_TAR 0x30000
#define ARCHIVE_FORMAT_TAR_USTAR (ARCHIVE_FORMAT_TAR | 1)
#define ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE (ARCHIVE_FORMAT_TAR | 2)
==== //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.10 2004/04/26 23:37:54 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.12 2004/05/03 01:40:34 kientzle Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -35,6 +35,10 @@
#include <string.h>
#include <wchar.h>
+#ifdef LINUX
+#include <ext2fs/ext2_fs.h> /* for Linux file flags */
+#endif
+
#include "archive.h"
#include "archive_entry.h"
@@ -1337,8 +1341,8 @@
#endif
{ NULL, NULL, 0, 0 }
};
-#define longestflaglen 12
-#define nmappings (sizeof(mapping) / sizeof(mapping[0]))
+#define longestflaglen 12
+#define nmappings (sizeof(mapping) / sizeof(mapping[0]))
/*
* fflagstostr --
==== //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.h#4 (text+ko) ====
@@ -23,7 +23,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/lib/libarchive/archive_entry.h,v 1.7 2004/04/26 23:37:54 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $
*/
#ifndef ARCHIVE_ENTRY_H_INCLUDED
@@ -130,9 +130,9 @@
* "permset"/"perm" abstract type nonsense. A permset is just a simple
* bitmap, following long-standing Unix tradition.
*/
-#define ARCHIVE_ENTRY_ACL_EXECUTE 1
-#define ARCHIVE_ENTRY_ACL_WRITE 2
-#define ARCHIVE_ENTRY_ACL_READ 4
+#define ARCHIVE_ENTRY_ACL_EXECUTE 1
+#define ARCHIVE_ENTRY_ACL_WRITE 2
+#define ARCHIVE_ENTRY_ACL_READ 4
/* We need to be able to specify either or both of these. */
#define ARCHIVE_ENTRY_ACL_TYPE_ACCESS 256
==== //depot/projects/trustedbsd/base/lib/libarchive/archive_platform.h#4 (text+ko) ====
@@ -23,7 +23,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/lib/libarchive/archive_platform.h,v 1.7 2004/04/21 05:13:42 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $
*/
/*
@@ -48,24 +48,24 @@
#include <inttypes.h> /* For int64_t, etc. */
#if __FreeBSD__ > 4
-#define HAVE_POSIX_ACL 1
+#define HAVE_POSIX_ACL 1
#endif
-#define HAVE_CHFLAGS 1
-#define HAVE_LUTIMES 1
-#define HAVE_LCHMOD 1
-#define HAVE_STRERROR_R 1
-#define ARCHIVE_ERRNO_FILE_FORMAT EFTYPE
-#define ARCHIVE_ERRNO_PROGRAMMER EINVAL
-#define ARCHIVE_ERRNO_MISC (-1)
+#define HAVE_CHFLAGS 1
+#define HAVE_LUTIMES 1
+#define HAVE_LCHMOD 1
+#define HAVE_STRERROR_R 1
+#define ARCHIVE_ERRNO_FILE_FORMAT EFTYPE
+#define ARCHIVE_ERRNO_PROGRAMMER EINVAL
+#define ARCHIVE_ERRNO_MISC (-1)
/* Fetch/set high-resolution time data through a struct stat pointer. */
-#define ARCHIVE_STAT_ATIME_NANOS(st) (st)->st_atimespec.tv_nsec
-#define ARCHIVE_STAT_CTIME_NANOS(st) (st)->st_ctimespec.tv_nsec
-#define ARCHIVE_STAT_MTIME_NANOS(st) (st)->st_mtimespec.tv_nsec
-#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atimespec.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctimespec.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtimespec.tv_nsec = (n)
+#define ARCHIVE_STAT_ATIME_NANOS(st) (st)->st_atimespec.tv_nsec
+#define ARCHIVE_STAT_CTIME_NANOS(st) (st)->st_ctimespec.tv_nsec
+#define ARCHIVE_STAT_MTIME_NANOS(st) (st)->st_mtimespec.tv_nsec
+#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atimespec.tv_nsec = (n)
+#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctimespec.tv_nsec = (n)
+#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtimespec.tv_nsec = (n)
/*
* Older versions of inttypes.h don't have INT64_MAX, etc. Since
@@ -76,11 +76,11 @@
#ifndef INT64_MAX
/* XXX Is this really necessary? XXX */
#ifdef __i386__
-#define INT64_MAX 0x7fffffffffffffffLL
-#define UINT64_MAX 0xffffffffffffffffULL
+#define INT64_MAX 0x7fffffffffffffffLL
+#define UINT64_MAX 0xffffffffffffffffULL
#else /* __alpha__ */
-#define INT64_MAX 0x7fffffffffffffffL
-#define UINT64_MAX 0xffffffffffffffffUL
+#define INT64_MAX 0x7fffffffffffffffL
+#define UINT64_MAX 0xffffffffffffffffUL
#endif
#endif /* ! INT64_MAX */
@@ -88,35 +88,35 @@
/* No non-FreeBSD platform will have __FBSDID, so just define it here. */
#ifndef __FreeBSD__
-#define __FBSDID(a) /* null */
+#define __FBSDID(a) /* null */
#endif
/* Linux */
#ifdef LINUX
-#define _FILE_OFFSET_BITS 64 /* Needed for 64-bit file size handling. */
+#define _FILE_OFFSET_BITS 64 /* Needed for 64-bit file size handling. */
#include <inttypes.h>
-#define ARCHIVE_ERRNO_FILE_FORMAT EILSEQ
-#define ARCHIVE_ERRNO_PROGRAMMER EINVAL
-#define ARCHIVE_ERRNO_MISC (-1)
-#define HAVE_STRERROR_R 1
-#define STRERROR_R_CHAR_P 1
+#define ARCHIVE_ERRNO_FILE_FORMAT EILSEQ
+#define ARCHIVE_ERRNO_PROGRAMMER EINVAL
+#define ARCHIVE_ERRNO_MISC (-1)
+#define HAVE_STRERROR_R 1
+#define STRERROR_R_CHAR_P 1
#ifdef HAVE_STRUCT_STAT_TIMESPEC
/* Fetch the nanosecond portion of the timestamp from a struct stat pointer. */
-#define ARCHIVE_STAT_ATIME_NANOS(pstat) (pstat)->st_atim.tv_nsec
-#define ARCHIVE_STAT_CTIME_NANOS(pstat) (pstat)->st_ctim.tv_nsec
-#define ARCHIVE_STAT_MTIME_NANOS(pstat) (pstat)->st_mtim.tv_nsec
-#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atim.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctim.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtim.tv_nsec = (n)
+#define ARCHIVE_STAT_ATIME_NANOS(pstat) (pstat)->st_atim.tv_nsec
+#define ARCHIVE_STAT_CTIME_NANOS(pstat) (pstat)->st_ctim.tv_nsec
+#define ARCHIVE_STAT_MTIME_NANOS(pstat) (pstat)->st_mtim.tv_nsec
+#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atim.tv_nsec = (n)
+#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctim.tv_nsec = (n)
+#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtim.tv_nsec = (n)
#else
/* High-res timestamps aren't available, so just use stubs here. */
-#define ARCHIVE_STAT_ATIME_NANOS(pstat) 0
-#define ARCHIVE_STAT_CTIME_NANOS(pstat) 0
-#define ARCHIVE_STAT_MTIME_NANOS(pstat) 0
-#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n)
-#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n)
-#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n)
+#define ARCHIVE_STAT_ATIME_NANOS(pstat) 0
+#define ARCHIVE_STAT_CTIME_NANOS(pstat) 0
+#define ARCHIVE_STAT_MTIME_NANOS(pstat) 0
+#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n)
+#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n)
+#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n)
#endif
#endif
==== //depot/projects/trustedbsd/base/lib/libarchive/archive_private.h#4 (text+ko) ====
@@ -23,7 +23,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/lib/libarchive/archive_private.h,v 1.7 2004/04/28 04:41:26 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $
*/
#ifndef ARCHIVE_PRIVATE_H_INCLUDED
@@ -209,7 +209,7 @@
#define ARCHIVE_STATE_NEW 1U
#define ARCHIVE_STATE_HEADER 2U
#define ARCHIVE_STATE_DATA 4U
-#define ARCHIVE_STATE_EOF 8U
+#define ARCHIVE_STATE_EOF 8U
#define ARCHIVE_STATE_CLOSED 0x10U
#define ARCHIVE_STATE_FATAL 0x8000U
@@ -231,6 +231,6 @@
int (*bid)(const void *, size_t),
int (*init)(struct archive *, const void *, size_t));
-#define err_combine(a,b) ((a) < (b) ? (a) : (b))
+#define err_combine(a,b) ((a) < (b) ? (a) : (b))
#endif
==== //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.8 2004/04/28 03:44:08 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.9 2004/05/03 01:40:34 kientzle Exp $");
#include <sys/stat.h>
@@ -94,7 +94,7 @@
char *name;
};
-#define CPIO_MAGIC 0x13141516
+#define CPIO_MAGIC 0x13141516
struct cpio {
int magic;
int (*read_header)(struct archive *, struct stat *,
==== //depot/projects/trustedbsd/base/lib/libarchive/archive_string.h#2 (text+ko) ====
@@ -23,7 +23,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/lib/libarchive/archive_string.h,v 1.2 2004/03/19 22:37:06 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_string.h,v 1.3 2004/05/03 01:40:34 kientzle Exp $
*
*/
@@ -51,7 +51,7 @@
};
/* Initialize an archive_string object on the stack or elsewhere. */
-#define archive_string_init(a) \
+#define archive_string_init(a) \
do { (a)->s = NULL; (a)->length = 0; (a)->buffer_length = 0; } while(0)
/* Append a C char to an archive_string, resizing as necessary. */
@@ -102,11 +102,11 @@
/* Like 'vsprintf', but resizes the underlying string as necessary. */
void __archive_string_vsprintf(struct archive_string *, const char *,
va_list);
-#define archive_string_vsprintf __archive_string_vsprintf
+#define archive_string_vsprintf __archive_string_vsprintf
/* Like 'sprintf', but resizes the underlying string as necessary. */
void __archive_string_sprintf(struct archive_string *, const char *, ...);
-#define archive_string_sprintf __archive_string_sprintf
+#define archive_string_sprintf __archive_string_sprintf
#endif
==== //depot/projects/trustedbsd/base/lib/libc/Makefile#13 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.50 2004/01/19 16:16:53 nectar Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.51 2004/05/02 10:55:07 das Exp $
#
# All library objects contain FreeBSD revision strings by default; they may be
# excluded as a space-saving measure. To produce a library that does
@@ -64,6 +64,9 @@
.if !defined(NO_HESIOD_LIBC)
CFLAGS+= -DHESIOD
.endif
+.if defined(NO_FP_LIBC)
+CFLAGS+= -DNO_FLOATING_POINT
+.endif
# If there are no machine dependent sources, append all the
# machine-independent sources:
==== //depot/projects/trustedbsd/base/lib/libc/gen/fmtcheck.c#5 (text+ko) ====
@@ -35,7 +35,7 @@
/* $NetBSD: fmtcheck.c,v 1.2 2000/11/01 01:17:20 briggs Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fmtcheck.c,v 1.6 2003/06/29 01:11:31 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fmtcheck.c,v 1.7 2004/05/02 10:55:05 das Exp $");
#include <stdio.h>
#include <string.h>
@@ -57,8 +57,10 @@
FMTCHECK_QUADPOINTER,
FMTCHECK_PTRDIFFTPOINTER,
FMTCHECK_SIZETPOINTER,
+#ifndef NO_FLOATING_POINT
FMTCHECK_DOUBLE,
FMTCHECK_LONGDOUBLE,
+#endif
FMTCHECK_STRING,
FMTCHECK_WIDTH,
FMTCHECK_PRECISION,
@@ -149,6 +151,7 @@
RETURN(pf,f,FMTCHECK_UNKNOWN);
RETURN(pf,f,FMTCHECK_LONG);
}
+#ifndef NO_FLOATING_POINT
if (strchr("aAeEfFgG", *f)) {
if (longdouble)
RETURN(pf,f,FMTCHECK_LONGDOUBLE);
@@ -156,6 +159,7 @@
RETURN(pf,f,FMTCHECK_UNKNOWN);
RETURN(pf,f,FMTCHECK_DOUBLE);
}
+#endif
if (*f == 'c') {
if (sh + lg + quad + longdouble + ptrdifft + sizet)
RETURN(pf,f,FMTCHECK_UNKNOWN);
==== //depot/projects/trustedbsd/base/lib/libc/stdio/vfprintf.c#20 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.64 2004/04/22 11:35:12 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.65 2004/05/02 10:55:05 das Exp $");
/*
* Actual printf innards.
@@ -66,10 +66,6 @@
#include "local.h"
#include "fvwrite.h"
-/* Define FLOATING_POINT to get floating point, HEXFLOAT to get %a. */
-#define FLOATING_POINT
-#define HEXFLOAT
-
union arg {
int intarg;
u_int uintarg;
@@ -91,7 +87,7 @@
ptrdiff_t *pptrdiffarg;
size_t *psizearg;
intmax_t *pintmaxarg;
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
double doublearg;
long double longdoublearg;
#endif
@@ -411,7 +407,7 @@
return (ret);
}
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
#define dtoa __dtoa
#define freedtoa __freedtoa
@@ -425,7 +421,7 @@
static int exponent(char *, int, int);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon May 3 15:48:10 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0EF0F16A4D0; Mon, 3 May 2004 15:48:10 -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 C481316A4CF
for <perforce@freebsd.org>; Mon, 3 May 2004 15:48:09 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id DF02C43D31
for <perforce@freebsd.org>; Mon, 3 May 2004 15:48:07 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43Mm7Ge054921
for <perforce@freebsd.org>; Mon, 3 May 2004 15:48:07 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43Mm635054918
for perforce@freebsd.org; Mon, 3 May 2004 15:48:06 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 3 May 2004 15:48:06 -0700 (PDT)
Message-Id: <200405032248.i43Mm635054918@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52174 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: Mon, 03 May 2004 22:48:10 -0000
http://perforce.freebsd.org/chv.cgi?CH=52174
Change 52174 by rwatson@rwatson_tislabs on 2004/05/03 15:47:15
Integrate TrustedBSD base branch from FreeBSD vendor branch:
ls(1) now does multi-byte characters.
libarchive(3) now compiles and is usable on Linux.
libc(3) can now be built without floating point support.
geom gate(4) allows export and import of storage devices over
TCP/IP.
route(4) routing sockets and miibus updated to allow routing
messages to track link state changes on ethernet devices.
GPT(4) support on non-ia64 systems.
Various pf(4) updates from OpenBSD.
asr(4) cleaned up.
MAC_STATIC kernel option avoids cost of MAC Framework
synchronization for statically configured systems, looped back
from trustedbsd_mac branch.
ip_fastfwd cleaned up.
ip_claim_next_hop() -> m_claim_next()
saorder_state_valid for FAST_IPSEC.
mac_test(4) now handles NULL mbuf pointer, looped back from
trustedbsd_mac branch.
du(1) hard link tracking efficiency improvements.
Affected files ...
.. //depot/projects/trustedbsd/mac/bin/ls/extern.h#10 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/ls.1#24 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/print.c#23 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/util.c#13 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/gzip/gzip.c#2 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/gzip/gzip.h#2 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/gzip/unzip.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libarchive/archive.h#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.h#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libarchive/archive_platform.h#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libarchive/archive_private.h#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_cpio.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libarchive/archive_string.h#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/Makefile#13 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/gen/fmtcheck.c#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfprintf.c#18 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfscanf.c#17 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfwprintf.c#10 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfwscanf.c#9 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#70 integrate
.. //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#24 integrate
.. //depot/projects/trustedbsd/mac/sbin/Makefile#25 integrate
.. //depot/projects/trustedbsd/mac/sbin/gconcat/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/ggate/ggatec/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/ggate/ggatec/ggatec.8#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/ggate/ggatec/ggatec.c#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/ggate/ggated/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/ggate/ggated/ggated.c#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/ggate/ggatel/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/ggate/ggatel/ggatel.8#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/ggate/ggatel/ggatel.c#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/ggate/shared/ggate.c#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/route/route.c#10 integrate
.. //depot/projects/trustedbsd/mac/secure/Makefile#6 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/asr.4#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/atapicam.4#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/hme.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/rl.4#8 integrate
.. //depot/projects/trustedbsd/mac/share/misc/bsd-family-tree#15 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#29 integrate
.. //depot/projects/trustedbsd/mac/sys/amd64/conf/GENERIC#10 integrate
.. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.c#36 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/NOTES#53 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/files#105 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/files.i386#37 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#33 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/majors#30 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/options#64 integrate
.. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf_ioctl.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf_norm.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/asr/asr.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/cy/cy_isa.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/cy/cy_pci.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/led/led.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/mii/brgphy.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/mii/dcphy.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/mii/e1000phy.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/mii/mii.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/mii/mii_physubr.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/mii/mlphy.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/mii/ruephy.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/mii/tlphy.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/mii/xmphy.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#32 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs.h#32 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs_data.h#32 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/usb/uvscom.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/gate/g_gate.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/gate/g_gate.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#36 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#46 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/mptable_pci.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/include/legacyvar.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/atpic.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/cy.c#15 delete
.. //depot/projects/trustedbsd/mac/sys/i386/isa/cyreg.h#2 delete
.. //depot/projects/trustedbsd/mac/sys/i386/isa/ic/cd1400.h#2 delete
.. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_bus.c#21 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/conf/GENERIC#29 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/conf/SKI#14 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/trap.c#25 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_clock.c#23 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#438 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/geom/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if.h#22 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_var.h#24 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#22 integrate
.. //depot/projects/trustedbsd/mac/sys/net/rtsock.c#25 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_fastfwd.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#44 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#39 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/ip_var.h#23 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#33 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#52 integrate
.. //depot/projects/trustedbsd/mac/sys/netipsec/key.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC#32 integrate
.. //depot/projects/trustedbsd/mac/sys/pc98/conf/NOTES#13 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/cy_pci.c#8 delete
.. //depot/projects/trustedbsd/mac/sys/powerpc/conf/GENERIC#20 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#132 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#34 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#38 integrate
.. //depot/projects/trustedbsd/mac/tools/regression/geom_gate/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/tools/regression/geom_gate/runtests.sh#1 branch
.. //depot/projects/trustedbsd/mac/tools/regression/geom_gate/test-1.sh#1 branch
.. //depot/projects/trustedbsd/mac/tools/regression/geom_gate/test-2.sh#1 branch
.. //depot/projects/trustedbsd/mac/tools/regression/geom_gate/test-3.sh#1 branch
.. //depot/projects/trustedbsd/mac/tools/tools/nanobsd/i386.diskimage#3 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/du/du.c#10 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/rpcgen/rpc_main.c#6 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/tar/bsdtar.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/tar/bsdtar.h#2 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/tar/bsdtar_platform.h#2 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/tar/read.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/tar/util.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/tar/write.c#2 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/jail/jail.8#16 integrate
Differences ...
==== //depot/projects/trustedbsd/mac/bin/ls/extern.h#10 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* from: @(#)extern.h 8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/ls/extern.h,v 1.22 2004/04/06 20:06:47 markm Exp $
+ * $FreeBSD: src/bin/ls/extern.h,v 1.23 2004/05/02 11:25:37 tjr Exp $
*/
int acccmp(const FTSENT *, const FTSENT *);
@@ -45,6 +45,7 @@
void printscol(const DISPLAY *);
void printstream(const DISPLAY *);
void usage(void);
+int prn_normal(const char *);
size_t len_octal(const char *, int);
int prn_octal(const char *);
int prn_printable(const char *);
==== //depot/projects/trustedbsd/mac/bin/ls/ls.1#24 (text+ko) ====
@@ -29,9 +29,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.79 2004/04/06 20:06:47 markm Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.80 2004/05/02 11:25:37 tjr Exp $
.\"
-.Dd March 21, 2004
+.Dd May 2, 2004
.Dt LS 1
.Os
.Sh NAME
@@ -673,7 +673,3 @@
.Sh BUGS
To maintain backward compatibility, the relationships between the many
options are quite complex.
-.Pp
-The
-.Nm
-utility does not recognize multibyte characters in filenames.
==== //depot/projects/trustedbsd/mac/bin/ls/print.c#23 (text+ko) ====
@@ -36,7 +36,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.70 2004/04/06 20:06:47 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.71 2004/05/02 11:25:37 tjr Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -147,7 +147,7 @@
else if (f_nonprint)
return prn_printable(name);
else
- return printf("%s", name);
+ return prn_normal(name);
}
void
@@ -239,6 +239,7 @@
for (p = dp->list, chcnt = 0; p; p = p->fts_link) {
if (p->fts_number == NO_PRINT)
continue;
+ /* XXX strlen does not take octal escapes into account. */
if (strlen(p->fts_name) + chcnt +
(p->fts_link ? 2 : 0) >= (unsigned)termwidth) {
putchar('\n');
==== //depot/projects/trustedbsd/mac/bin/ls/util.c#13 (text+ko) ====
@@ -36,7 +36,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.33 2004/04/06 20:06:47 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.35 2004/05/03 11:48:55 tjr Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -44,25 +44,82 @@
#include <ctype.h>
#include <err.h>
#include <fts.h>
+#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <wchar.h>
+#include <wctype.h>
#include "ls.h"
#include "extern.h"
int
+prn_normal(const char *s)
+{
+ mbstate_t mbs;
+ wchar_t wc;
+ int i, n;
+ size_t clen;
+
+ memset(&mbs, 0, sizeof(mbs));
+ n = 0;
+ while ((clen = mbrtowc(&wc, s, MB_LEN_MAX, &mbs)) != 0) {
+ if (clen == (size_t)-2) {
+ n += printf("%s", s);
+ break;
+ }
+ if (clen == (size_t)-1) {
+ memset(&mbs, 0, sizeof(mbs));
+ putchar((unsigned char)*s);
+ s++;
+ n++;
+ continue;
+ }
+ for (i = 0; i < (int)clen; i++)
+ putchar((unsigned char)s[i]);
+ s += clen;
+ if (iswprint(wc))
+ n += wcwidth(wc);
+ }
+ return (n);
+}
+
+int
prn_printable(const char *s)
{
- char c;
- int n;
+ mbstate_t mbs;
+ wchar_t wc;
+ int i, n;
+ size_t clen;
- for (n = 0; (c = *s) != '\0'; ++s, ++n)
- if (isprint((unsigned char)c))
- putchar(c);
- else
+ memset(&mbs, 0, sizeof(mbs));
+ n = 0;
+ while ((clen = mbrtowc(&wc, s, MB_LEN_MAX, &mbs)) != 0) {
+ if (clen == (size_t)-1) {
+ putchar('?');
+ s++;
+ n++;
+ memset(&mbs, 0, sizeof(mbs));
+ continue;
+ }
+ if (clen == (size_t)-2) {
+ putchar('?');
+ n++;
+ break;
+ }
+ if (!iswprint(wc)) {
putchar('?');
- return n;
+ s += clen;
+ n++;
+ continue;
+ }
+ for (i = 0; i < (int)clen; i++)
+ putchar((unsigned char)s[i]);
+ s += clen;
+ n += wcwidth(wc);
+ }
+ return (n);
}
/*
@@ -81,70 +138,83 @@
size_t
len_octal(const char *s, int len)
{
- size_t r = 0;
+ mbstate_t mbs;
+ wchar_t wc;
+ size_t clen, r;
- while (len--)
- if (isprint((unsigned const char)*s++)) r++; else r += 4;
- return r;
+ memset(&mbs, 0, sizeof(mbs));
+ r = 0;
+ while (len != 0 && (clen = mbrtowc(&wc, s, len, &mbs)) != 0) {
+ if (clen == (size_t)-1) {
+ r += 4;
+ s++;
+ len--;
+ memset(&mbs, 0, sizeof(mbs));
+ continue;
+ }
+ if (clen == (size_t)-2) {
+ r += 4 * len;
+ break;
+ }
+ if (iswprint(wc))
+ r++;
+ else
+ r += 4 * clen;
+ s += clen;
+ }
+ return (r);
}
int
prn_octal(const char *s)
{
- unsigned char ch;
- int len = 0;
+ static const char esc[] = "\\\\\"\"\aa\bb\ff\nn\rr\tt\vv";
+ const char *p;
+ mbstate_t mbs;
+ wchar_t wc;
+ size_t clen;
+ unsigned char ch;
+ int goodchar, i, len, prtlen;
- while ((ch = (unsigned char)*s++)) {
- if (isprint(ch) && (ch != '\"') && (ch != '\\'))
- putchar(ch), len++;
- else if (f_octal_escape) {
- putchar('\\');
- switch (ch) {
- case '\\':
- putchar('\\');
- break;
- case '\"':
- putchar('"');
- break;
- case '\a':
- putchar('a');
- break;
- case '\b':
- putchar('b');
- break;
- case '\f':
- putchar('f');
- break;
- case '\n':
- putchar('n');
- break;
- case '\r':
- putchar('r');
- break;
- case '\t':
- putchar('t');
- break;
- case '\v':
- putchar('v');
- break;
- default:
+ memset(&mbs, 0, sizeof(mbs));
+ len = 0;
+ while ((clen = mbrtowc(&wc, s, MB_LEN_MAX, &mbs)) != 0) {
+ goodchar = clen != (size_t)-1 && clen != (size_t)-2;
+ if (goodchar && iswprint(wc) && wc != L'\"' && wc != L'\\') {
+ for (i = 0; i < (int)clen; i++)
+ putchar((unsigned char)s[i]);
+ len += wcwidth(wc);
+ } else if (goodchar && f_octal_escape && wc >= 0 &&
+ wc <= (wchar_t)UCHAR_MAX &&
+ (p = strchr(esc, (char)wc)) != NULL) {
+ putchar('\\');
+ putchar(p[1]);
+ len += 2;
+ } else {
+ if (goodchar)
+ prtlen = clen;
+ else if (clen == (size_t)-1)
+ prtlen = 1;
+ else
+ prtlen = strlen(s);
+ for (i = 0; i < prtlen; i++) {
+ ch = (unsigned char)s[i];
+ putchar('\\');
putchar('0' + (ch >> 6));
putchar('0' + ((ch >> 3) & 7));
putchar('0' + (ch & 7));
- len += 2;
- break;
- }
- len += 2;
- }
- else {
- putchar('\\');
- putchar('0' + (ch >> 6));
- putchar('0' + ((ch >> 3) & 7));
- putchar('0' + (ch & 7));
- len += 4;
+ len += 4;
+ }
}
+ if (clen == (size_t)-2)
+ break;
+ if (clen == (size_t)-1) {
+ memset(&mbs, 0, sizeof(mbs));
+ s++;
+ } else
+ s += clen;
}
- return len;
+ return (len);
}
void
==== //depot/projects/trustedbsd/mac/gnu/usr.bin/gzip/gzip.c#2 (text+ko) ====
@@ -45,7 +45,7 @@
*/
#ifdef RCSID
-static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/gzip.c,v 1.10 1999/08/27 23:35:50 peter Exp $";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/gzip.c,v 1.11 2004/05/03 10:29:23 obrien Exp $";
#endif
#include <ctype.h>
@@ -1011,14 +1011,15 @@
#ifdef NO_MULTIPLE_DOTS
char *dot; /* pointer to ifname extension, or NULL */
#endif
+ int max_suffix_len = (z_len > 3 ? z_len : 3);
- if (strlen(iname) >= sizeof(ifname) - 3) {
+ /* Leave enough room in ifname or ofname for suffix: */
+ if (strlen(iname) >= sizeof(ifname) - max_suffix_len) {
errno = ENAMETOOLONG;
perror(iname);
exit_code = ERROR;
return ERROR;
}
-
strcpy(ifname, iname);
/* If input file exists, return OK. */
==== //depot/projects/trustedbsd/mac/gnu/usr.bin/gzip/gzip.h#2 (text+ko) ====
@@ -2,6 +2,8 @@
* Copyright (C) 1992-1993 Jean-loup Gailly.
* This is free software; you can redistribute it and/or modify it under the
* terms of the GNU General Public License, see the file COPYING.
+ *
+ * $FreeBSD: src/gnu/usr.bin/gzip/gzip.h,v 1.4 2004/05/02 23:07:49 obrien Exp $
*/
#if defined(__STDC__) || defined(PROTO)
@@ -41,9 +43,10 @@
#define local static
-typedef unsigned char uch;
-typedef unsigned short ush;
-typedef unsigned long ulg;
+#include <stdint.h>
+typedef uint8_t uch;
+typedef uint16_t ush;
+typedef uint32_t ulg;
/* Return codes from gzip */
#define OK 0
==== //depot/projects/trustedbsd/mac/gnu/usr.bin/gzip/unzip.c#2 (text+ko) ====
@@ -14,8 +14,10 @@
*/
#ifdef RCSID
-static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unzip.c,v 1.6 1999/08/27 23:35:54 peter Exp $";
+static char rcsid[] = "$Id: unzip.c,v 0.13 1993/06/10 13:29:00 jloup Exp $";
#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gzip/unzip.c,v 1.8 2004/05/03 10:33:27 obrien Exp $");
#include "tailor.h"
#include "gzip.h"
@@ -35,6 +37,7 @@
#define LOCEXT 28 /* offset of extra field length */
#define LOCHDR 30 /* size of local header, including sig */
#define EXTHDR 16 /* size of extended local header, inc sig */
+#define RAND_HEAD_LEN 12 /* length of encryption random header */
/* Globals */
@@ -103,6 +106,7 @@
ulg orig_len = 0; /* original uncompressed length */
int n;
uch buf[EXTHDR]; /* extended local header */
+ int err = OK;
ifd = in;
ofd = out;
@@ -136,9 +140,6 @@
}
while (n--) {
uch c = (uch)get_byte();
-#ifdef CRYPT
- if (decrypt) zdecode(c);
-#endif
put_ubyte(c);
}
flush_window();
@@ -172,10 +173,14 @@
/* Validate decompression */
if (orig_crc != updcrc(outbuf, 0)) {
- error("invalid compressed data--crc error");
+ fprintf(stderr, "\n%s: %s: invalid compressed data--crc error\n",
+ progname, ifname);
+ err = ERROR;
}
- if (orig_len != (ulg)bytes_out) {
- error("invalid compressed data--length error");
+ if (((orig_len - (ulg)bytes_out) & 0x0ffffffffL) != 0) {
+ fprintf(stderr, "\n%s: %s: invalid compressed data--length error\n",
+ progname, ifname);
+ err = ERROR;
}
/* Check if there are more entries in a pkzip file */
@@ -189,11 +194,12 @@
fprintf(stderr,
"%s: %s has more than one entry -- unchanged\n",
progname, ifname);
- exit_code = ERROR;
- ext_header = pkzip = 0;
- return ERROR;
+ err = ERROR;
}
}
ext_header = pkzip = 0; /* for next file */
- return OK;
+ if (err == OK) return OK;
+ exit_code = ERROR;
+ if (!test) abort_gzip();
+ return err;
}
==== //depot/projects/trustedbsd/mac/lib/libarchive/archive.h#3 (text+ko) ====
@@ -23,7 +23,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/lib/libarchive/archive.h,v 1.7 2004/04/28 04:41:26 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $
*/
#ifndef ARCHIVE_H_INCLUDED
@@ -58,11 +58,11 @@
* platform-dependent error code.
*/
/* Unrecognized or invalid file format. */
-/* #define ARCHIVE_ERRNO_FILE_FORMAT */
+/* #define ARCHIVE_ERRNO_FILE_FORMAT */
/* Illegal usage of the library. */
-/* #define ARCHIVE_ERRNO_PROGRAMMER_ERROR */
+/* #define ARCHIVE_ERRNO_PROGRAMMER_ERROR */
/* Unknown or unclassified error. */
-/* #define ARCHIVE_ERRNO_MISC */
+/* #define ARCHIVE_ERRNO_MISC */
/*
* Callbacks are invoked to automatically read/write/open/close the archive.
@@ -96,9 +96,9 @@
#define ARCHIVE_FORMAT_BASE_MASK 0xff0000U
#define ARCHIVE_FORMAT_CPIO 0x10000
#define ARCHIVE_FORMAT_CPIO_POSIX (ARCHIVE_FORMAT_CPIO | 1)
-#define ARCHIVE_FORMAT_SHAR 0x20000
-#define ARCHIVE_FORMAT_SHAR_BASE (ARCHIVE_FORMAT_SHAR | 1)
-#define ARCHIVE_FORMAT_SHAR_DUMP (ARCHIVE_FORMAT_SHAR | 2)
+#define ARCHIVE_FORMAT_SHAR 0x20000
+#define ARCHIVE_FORMAT_SHAR_BASE (ARCHIVE_FORMAT_SHAR | 1)
+#define ARCHIVE_FORMAT_SHAR_DUMP (ARCHIVE_FORMAT_SHAR | 2)
#define ARCHIVE_FORMAT_TAR 0x30000
#define ARCHIVE_FORMAT_TAR_USTAR (ARCHIVE_FORMAT_TAR | 1)
#define ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE (ARCHIVE_FORMAT_TAR | 2)
==== //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.10 2004/04/26 23:37:54 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.12 2004/05/03 01:40:34 kientzle Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -35,6 +35,10 @@
#include <string.h>
#include <wchar.h>
+#ifdef LINUX
+#include <ext2fs/ext2_fs.h> /* for Linux file flags */
+#endif
+
#include "archive.h"
#include "archive_entry.h"
@@ -1337,8 +1341,8 @@
#endif
{ NULL, NULL, 0, 0 }
};
-#define longestflaglen 12
-#define nmappings (sizeof(mapping) / sizeof(mapping[0]))
+#define longestflaglen 12
+#define nmappings (sizeof(mapping) / sizeof(mapping[0]))
/*
* fflagstostr --
==== //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.h#3 (text+ko) ====
@@ -23,7 +23,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/lib/libarchive/archive_entry.h,v 1.7 2004/04/26 23:37:54 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $
*/
#ifndef ARCHIVE_ENTRY_H_INCLUDED
@@ -130,9 +130,9 @@
* "permset"/"perm" abstract type nonsense. A permset is just a simple
* bitmap, following long-standing Unix tradition.
*/
-#define ARCHIVE_ENTRY_ACL_EXECUTE 1
-#define ARCHIVE_ENTRY_ACL_WRITE 2
-#define ARCHIVE_ENTRY_ACL_READ 4
+#define ARCHIVE_ENTRY_ACL_EXECUTE 1
+#define ARCHIVE_ENTRY_ACL_WRITE 2
+#define ARCHIVE_ENTRY_ACL_READ 4
/* We need to be able to specify either or both of these. */
#define ARCHIVE_ENTRY_ACL_TYPE_ACCESS 256
==== //depot/projects/trustedbsd/mac/lib/libarchive/archive_platform.h#3 (text+ko) ====
@@ -23,7 +23,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/lib/libarchive/archive_platform.h,v 1.7 2004/04/21 05:13:42 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $
*/
/*
@@ -48,24 +48,24 @@
#include <inttypes.h> /* For int64_t, etc. */
#if __FreeBSD__ > 4
-#define HAVE_POSIX_ACL 1
+#define HAVE_POSIX_ACL 1
#endif
-#define HAVE_CHFLAGS 1
-#define HAVE_LUTIMES 1
-#define HAVE_LCHMOD 1
-#define HAVE_STRERROR_R 1
-#define ARCHIVE_ERRNO_FILE_FORMAT EFTYPE
-#define ARCHIVE_ERRNO_PROGRAMMER EINVAL
-#define ARCHIVE_ERRNO_MISC (-1)
+#define HAVE_CHFLAGS 1
+#define HAVE_LUTIMES 1
+#define HAVE_LCHMOD 1
+#define HAVE_STRERROR_R 1
+#define ARCHIVE_ERRNO_FILE_FORMAT EFTYPE
+#define ARCHIVE_ERRNO_PROGRAMMER EINVAL
+#define ARCHIVE_ERRNO_MISC (-1)
/* Fetch/set high-resolution time data through a struct stat pointer. */
-#define ARCHIVE_STAT_ATIME_NANOS(st) (st)->st_atimespec.tv_nsec
-#define ARCHIVE_STAT_CTIME_NANOS(st) (st)->st_ctimespec.tv_nsec
-#define ARCHIVE_STAT_MTIME_NANOS(st) (st)->st_mtimespec.tv_nsec
-#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atimespec.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctimespec.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtimespec.tv_nsec = (n)
+#define ARCHIVE_STAT_ATIME_NANOS(st) (st)->st_atimespec.tv_nsec
+#define ARCHIVE_STAT_CTIME_NANOS(st) (st)->st_ctimespec.tv_nsec
+#define ARCHIVE_STAT_MTIME_NANOS(st) (st)->st_mtimespec.tv_nsec
+#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atimespec.tv_nsec = (n)
+#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctimespec.tv_nsec = (n)
+#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtimespec.tv_nsec = (n)
/*
* Older versions of inttypes.h don't have INT64_MAX, etc. Since
@@ -76,11 +76,11 @@
#ifndef INT64_MAX
/* XXX Is this really necessary? XXX */
#ifdef __i386__
-#define INT64_MAX 0x7fffffffffffffffLL
-#define UINT64_MAX 0xffffffffffffffffULL
+#define INT64_MAX 0x7fffffffffffffffLL
+#define UINT64_MAX 0xffffffffffffffffULL
#else /* __alpha__ */
-#define INT64_MAX 0x7fffffffffffffffL
-#define UINT64_MAX 0xffffffffffffffffUL
+#define INT64_MAX 0x7fffffffffffffffL
+#define UINT64_MAX 0xffffffffffffffffUL
#endif
#endif /* ! INT64_MAX */
@@ -88,35 +88,35 @@
/* No non-FreeBSD platform will have __FBSDID, so just define it here. */
#ifndef __FreeBSD__
-#define __FBSDID(a) /* null */
+#define __FBSDID(a) /* null */
#endif
/* Linux */
#ifdef LINUX
-#define _FILE_OFFSET_BITS 64 /* Needed for 64-bit file size handling. */
+#define _FILE_OFFSET_BITS 64 /* Needed for 64-bit file size handling. */
#include <inttypes.h>
-#define ARCHIVE_ERRNO_FILE_FORMAT EILSEQ
-#define ARCHIVE_ERRNO_PROGRAMMER EINVAL
-#define ARCHIVE_ERRNO_MISC (-1)
-#define HAVE_STRERROR_R 1
-#define STRERROR_R_CHAR_P 1
+#define ARCHIVE_ERRNO_FILE_FORMAT EILSEQ
+#define ARCHIVE_ERRNO_PROGRAMMER EINVAL
+#define ARCHIVE_ERRNO_MISC (-1)
+#define HAVE_STRERROR_R 1
+#define STRERROR_R_CHAR_P 1
#ifdef HAVE_STRUCT_STAT_TIMESPEC
/* Fetch the nanosecond portion of the timestamp from a struct stat pointer. */
-#define ARCHIVE_STAT_ATIME_NANOS(pstat) (pstat)->st_atim.tv_nsec
-#define ARCHIVE_STAT_CTIME_NANOS(pstat) (pstat)->st_ctim.tv_nsec
-#define ARCHIVE_STAT_MTIME_NANOS(pstat) (pstat)->st_mtim.tv_nsec
-#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atim.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctim.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtim.tv_nsec = (n)
+#define ARCHIVE_STAT_ATIME_NANOS(pstat) (pstat)->st_atim.tv_nsec
+#define ARCHIVE_STAT_CTIME_NANOS(pstat) (pstat)->st_ctim.tv_nsec
+#define ARCHIVE_STAT_MTIME_NANOS(pstat) (pstat)->st_mtim.tv_nsec
+#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atim.tv_nsec = (n)
+#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctim.tv_nsec = (n)
+#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtim.tv_nsec = (n)
#else
/* High-res timestamps aren't available, so just use stubs here. */
-#define ARCHIVE_STAT_ATIME_NANOS(pstat) 0
-#define ARCHIVE_STAT_CTIME_NANOS(pstat) 0
-#define ARCHIVE_STAT_MTIME_NANOS(pstat) 0
-#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n)
-#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n)
-#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n)
+#define ARCHIVE_STAT_ATIME_NANOS(pstat) 0
+#define ARCHIVE_STAT_CTIME_NANOS(pstat) 0
+#define ARCHIVE_STAT_MTIME_NANOS(pstat) 0
+#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n)
+#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n)
+#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n)
#endif
#endif
==== //depot/projects/trustedbsd/mac/lib/libarchive/archive_private.h#3 (text+ko) ====
@@ -23,7 +23,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/lib/libarchive/archive_private.h,v 1.7 2004/04/28 04:41:26 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $
*/
#ifndef ARCHIVE_PRIVATE_H_INCLUDED
@@ -209,7 +209,7 @@
#define ARCHIVE_STATE_NEW 1U
#define ARCHIVE_STATE_HEADER 2U
#define ARCHIVE_STATE_DATA 4U
-#define ARCHIVE_STATE_EOF 8U
+#define ARCHIVE_STATE_EOF 8U
#define ARCHIVE_STATE_CLOSED 0x10U
#define ARCHIVE_STATE_FATAL 0x8000U
@@ -231,6 +231,6 @@
int (*bid)(const void *, size_t),
int (*init)(struct archive *, const void *, size_t));
-#define err_combine(a,b) ((a) < (b) ? (a) : (b))
+#define err_combine(a,b) ((a) < (b) ? (a) : (b))
#endif
==== //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_cpio.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.8 2004/04/28 03:44:08 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.9 2004/05/03 01:40:34 kientzle Exp $");
#include <sys/stat.h>
@@ -94,7 +94,7 @@
char *name;
};
-#define CPIO_MAGIC 0x13141516
+#define CPIO_MAGIC 0x13141516
struct cpio {
int magic;
int (*read_header)(struct archive *, struct stat *,
==== //depot/projects/trustedbsd/mac/lib/libarchive/archive_string.h#2 (text+ko) ====
@@ -23,7 +23,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/lib/libarchive/archive_string.h,v 1.2 2004/03/19 22:37:06 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_string.h,v 1.3 2004/05/03 01:40:34 kientzle Exp $
*
*/
@@ -51,7 +51,7 @@
};
/* Initialize an archive_string object on the stack or elsewhere. */
-#define archive_string_init(a) \
+#define archive_string_init(a) \
do { (a)->s = NULL; (a)->length = 0; (a)->buffer_length = 0; } while(0)
/* Append a C char to an archive_string, resizing as necessary. */
@@ -102,11 +102,11 @@
/* Like 'vsprintf', but resizes the underlying string as necessary. */
void __archive_string_vsprintf(struct archive_string *, const char *,
va_list);
-#define archive_string_vsprintf __archive_string_vsprintf
+#define archive_string_vsprintf __archive_string_vsprintf
/* Like 'sprintf', but resizes the underlying string as necessary. */
void __archive_string_sprintf(struct archive_string *, const char *, ...);
-#define archive_string_sprintf __archive_string_sprintf
+#define archive_string_sprintf __archive_string_sprintf
#endif
==== //depot/projects/trustedbsd/mac/lib/libc/Makefile#13 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.50 2004/01/19 16:16:53 nectar Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.51 2004/05/02 10:55:07 das Exp $
#
# All library objects contain FreeBSD revision strings by default; they may be
# excluded as a space-saving measure. To produce a library that does
@@ -64,6 +64,9 @@
.if !defined(NO_HESIOD_LIBC)
CFLAGS+= -DHESIOD
.endif
+.if defined(NO_FP_LIBC)
+CFLAGS+= -DNO_FLOATING_POINT
+.endif
# If there are no machine dependent sources, append all the
# machine-independent sources:
==== //depot/projects/trustedbsd/mac/lib/libc/gen/fmtcheck.c#5 (text+ko) ====
@@ -35,7 +35,7 @@
/* $NetBSD: fmtcheck.c,v 1.2 2000/11/01 01:17:20 briggs Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fmtcheck.c,v 1.6 2003/06/29 01:11:31 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fmtcheck.c,v 1.7 2004/05/02 10:55:05 das Exp $");
#include <stdio.h>
#include <string.h>
@@ -57,8 +57,10 @@
FMTCHECK_QUADPOINTER,
FMTCHECK_PTRDIFFTPOINTER,
FMTCHECK_SIZETPOINTER,
+#ifndef NO_FLOATING_POINT
FMTCHECK_DOUBLE,
FMTCHECK_LONGDOUBLE,
+#endif
FMTCHECK_STRING,
FMTCHECK_WIDTH,
FMTCHECK_PRECISION,
@@ -149,6 +151,7 @@
RETURN(pf,f,FMTCHECK_UNKNOWN);
RETURN(pf,f,FMTCHECK_LONG);
}
+#ifndef NO_FLOATING_POINT
if (strchr("aAeEfFgG", *f)) {
if (longdouble)
RETURN(pf,f,FMTCHECK_LONGDOUBLE);
@@ -156,6 +159,7 @@
RETURN(pf,f,FMTCHECK_UNKNOWN);
RETURN(pf,f,FMTCHECK_DOUBLE);
}
+#endif
if (*f == 'c') {
if (sh + lg + quad + longdouble + ptrdifft + sizet)
RETURN(pf,f,FMTCHECK_UNKNOWN);
==== //depot/projects/trustedbsd/mac/lib/libc/stdio/vfprintf.c#18 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.64 2004/04/22 11:35:12 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.65 2004/05/02 10:55:05 das Exp $");
/*
* Actual printf innards.
@@ -66,10 +66,6 @@
#include "local.h"
#include "fvwrite.h"
-/* Define FLOATING_POINT to get floating point, HEXFLOAT to get %a. */
-#define FLOATING_POINT
-#define HEXFLOAT
-
union arg {
int intarg;
u_int uintarg;
@@ -91,7 +87,7 @@
ptrdiff_t *pptrdiffarg;
size_t *psizearg;
intmax_t *pintmaxarg;
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
double doublearg;
long double longdoublearg;
#endif
@@ -411,7 +407,7 @@
return (ret);
}
-#ifdef FLOATING_POINT
+#ifndef NO_FLOATING_POINT
#define dtoa __dtoa
#define freedtoa __freedtoa
@@ -425,7 +421,7 @@
static int exponent(char *, int, int);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon May 3 15:51:13 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id BB33F16A4DA; Mon, 3 May 2004 15:51:12 -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 7454E16A4D5
for <perforce@freebsd.org>; Mon, 3 May 2004 15:51:12 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 5B98343D45
for <perforce@freebsd.org>; Mon, 3 May 2004 15:51:12 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43MpCGe055104
for <perforce@freebsd.org>; Mon, 3 May 2004 15:51:12 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43MpBdf055101
for perforce@freebsd.org; Mon, 3 May 2004 15:51:11 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 3 May 2004 15:51:11 -0700 (PDT)
Message-Id: <200405032251.i43MpBdf055101@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52175 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: Mon, 03 May 2004 22:51:14 -0000
http://perforce.freebsd.org/chv.cgi?CH=52175
Change 52175 by rwatson@rwatson_tislabs on 2004/05/03 15:51:00
MAC_STATIC and id(1) -M merged.
Affected files ...
.. //depot/projects/trustedbsd/mac/MERGE#6 edit
Differences ...
==== //depot/projects/trustedbsd/mac/MERGE#6 (text+ko) ====
@@ -12,10 +12,6 @@
ipcs(1) label support.
- MAC_STATIC to optimize performance by removing locking that
- supports dynamic policy changes, limiting the system to
- statically loaded policies.
-
Removal of redundant suser check in kern_xxx.c
NFS client credential fixes.
@@ -24,8 +20,6 @@
in netinet. This helps to avoid the need for socket label
locking in a number of important cases.
- id(1) label support.
-
Consider to merge TODO:
p_canwait().
From owner-p4-projects@FreeBSD.ORG Mon May 3 16:40:17 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CA2B516A4DD; Mon, 3 May 2004 16:40:17 -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 A4B4216A4D5
for <perforce@freebsd.org>; Mon, 3 May 2004 16:40:17 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 60E4F43D41
for <perforce@freebsd.org>; Mon, 3 May 2004 16:40:17 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i43NeHGe066391
for <perforce@freebsd.org>; Mon, 3 May 2004 16:40:17 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43NeGpQ066388
for perforce@freebsd.org; Mon, 3 May 2004 16:40:16 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 3 May 2004 16:40:16 -0700 (PDT)
Message-Id: <200405032340.i43NeGpQ066388@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52179 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: Mon, 03 May 2004 23:40:18 -0000
http://perforce.freebsd.org/chv.cgi?CH=52179
Change 52179 by rwatson@rwatson_tislabs on 2004/05/03 16:40:14
Simplify earlier modifications to use inpcbs instead of sockets
in more places when labeling new mbufs. Remove comments
justifying change and #if 0'd older code.
Affected files ...
.. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#34 edit
.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#24 edit
.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#45 edit
.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#28 edit
Differences ...
==== //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#34 (text+ko) ====
@@ -247,21 +247,10 @@
struct inpcb *inp = sotoinpcb(so);
int flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST;
- /*
- * XXXRW: Due to use of inp fields later in this function, the
- * inp lock almost certainly needs to be held for the duration
- * of the function, not just the MAC entry point.
- */
#ifdef MAC
INP_LOCK(inp);
mac_create_mbuf_from_inpcb(inp, m);
INP_UNLOCK(inp);
-#if 0
- /*
- * XXXRW: Use inpcb instead.
- */
- mac_create_mbuf_from_socket(so, m);
-#endif
#endif
/*
==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#24 (text+ko) ====
@@ -692,13 +692,7 @@
}
m->m_pkthdr.rcvif = (struct ifnet *)0;
#ifdef MAC
- /*
- * XXX: use mac_create_mbuf_from_inpcb(inp, m) instead of socket.
- */
mac_create_mbuf_from_inpcb(tp->t_inpcb, m);
-#if 0
- mac_create_mbuf_from_socket(so, m);
-#endif
#endif
#ifdef INET6
if (isipv6) {
==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#45 (text+ko) ====
@@ -515,12 +515,6 @@
*/
INP_LOCK_ASSERT(inp);
mac_create_mbuf_from_inpcb(inp, m);
-#if 0
- /*
- * XXXRW: Use inpcb instead of socket here.
- */
- mac_create_mbuf_from_socket(inp->inp_socket, m);
-#endif
} else {
/*
* Packet is not associated with a socket, so possibly
==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#28 (text+ko) ====
@@ -1131,14 +1131,7 @@
inp = sc->sc_tp->t_inpcb;
INP_LOCK(inp);
#ifdef MAC
- /*
- * XXXRW: Should be mac_create_mbuf_from_inpcb(inp, m) rather than
- * from socket for locking reasons.
- */
mac_create_mbuf_from_inpcb(inp, m);
-#if 0
- mac_create_mbuf_from_socket(inp->inp_socket, m);
-#endif
#endif
#ifdef INET6
From owner-p4-projects@FreeBSD.ORG Mon May 3 18:06:07 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6653216A4D1; Mon, 3 May 2004 18:06:07 -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 394E716A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 18:06:07 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 25F8443D46
for <perforce@freebsd.org>; Mon, 3 May 2004 18:06:07 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i44166Ge092202
for <perforce@freebsd.org>; Mon, 3 May 2004 18:06:06 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i441668r092199
for perforce@freebsd.org; Mon, 3 May 2004 18:06:06 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 3 May 2004 18:06:06 -0700 (PDT)
Message-Id: <200405040106.i441668r092199@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52184 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, 04 May 2004 01:06:08 -0000
http://perforce.freebsd.org/chv.cgi?CH=52184
Change 52184 by rwatson@rwatson_tislabs on 2004/05/03 18:05:06
Assert inpcb lock on (last) not (inp). Tripped up by inpcb
assertions being off by default.
Affected files ...
.. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#32 edit
Differences ...
==== //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#32 (text+ko) ====
@@ -453,7 +453,7 @@
struct sockaddr *append_sa;
struct mbuf *opts = 0;
- INP_LOCK_ASSERT(inp);
+ INP_LOCK_ASSERT(last);
#if defined(IPSEC) || defined(FAST_IPSEC)
/* check AH/ESP integrity. */
From owner-p4-projects@FreeBSD.ORG Mon May 3 18:22:29 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 457BD16A4D1; Mon, 3 May 2004 18:22:29 -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 19D8D16A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 18:22:29 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 5B7B843D31
for <perforce@freebsd.org>; Mon, 3 May 2004 18:22:28 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i441MSGe096059
for <perforce@freebsd.org>; Mon, 3 May 2004 18:22:28 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i441MRfN096047
for perforce@freebsd.org; Mon, 3 May 2004 18:22:27 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 3 May 2004 18:22:27 -0700 (PDT)
Message-Id: <200405040122.i441MRfN096047@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52186 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, 04 May 2004 01:22:30 -0000
http://perforce.freebsd.org/chv.cgi?CH=52186
Change 52186 by rwatson@rwatson_tislabs on 2004/05/03 18:21:57
Integrate TrustedBSD base branch from FreeBSD CVS HEAD:
Backout of FORCECONSPEED.
Loop back inpcb lock assertions in raw_append() and udp_append()
from trustedbsd_mac.
Loop back mac_mbuf_to_label() fix for NULL tags from trustedbsd_mac.
Loop back id(1) -M MAC label support from trustedbsd_mac.
Affected files ...
.. //depot/projects/trustedbsd/base/share/man/man4/sio.4#10 integrate
.. //depot/projects/trustedbsd/base/sys/conf/NOTES#51 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options#51 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#55 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_net.c#8 integrate
.. //depot/projects/trustedbsd/base/usr.bin/id/id.1#2 integrate
.. //depot/projects/trustedbsd/base/usr.bin/id/id.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/watchdogd/watchdogd.c#5 integrate
Differences ...
==== //depot/projects/trustedbsd/base/share/man/man4/sio.4#10 (text+ko) ====
@@ -34,7 +34,7 @@
.\"
.\" from: @(#)dca.4 5.2 (Berkeley) 3/27/91
.\" from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
-.\" $FreeBSD: src/share/man/man4/sio.4,v 1.51 2004/04/30 21:16:52 ambrisko Exp $
+.\" $FreeBSD: src/share/man/man4/sio.4,v 1.52 2004/05/03 22:35:27 ambrisko Exp $
.\"
.Dd July 10, 2002
.Dt SIO 4
@@ -178,8 +178,6 @@
PPS timestamping on CTS instead of DCD
.It 0x20000
device is assumed to use a 16650A-type (extended FIFO) chip
-.It 0x400000
-If no comconsole found then mark as a comconsole
.El
.Pp
Minor numbering:
==== //depot/projects/trustedbsd/base/sys/conf/NOTES#51 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1224 2004/05/03 21:18:55 pjd Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1225 2004/05/03 22:35:27 ambrisko Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1468,8 +1468,6 @@
options COM_MULTIPORT # Code for some cards with shared IRQs.
options CONSPEED=115200 # Speed for serial console
# (default 9600).
-options FORCECONSPEED # no matter what use CONSPEED for
- # console.
# `flags' specific to sio(4). See below for flags used by both sio(4) and
# uart(4).
==== //depot/projects/trustedbsd/base/sys/conf/options#51 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.448 2004/05/03 21:18:56 pjd Exp $
+# $FreeBSD: src/sys/conf/options,v 1.449 2004/05/03 22:35:27 ambrisko Exp $
#
# On the handling of kernel options
#
@@ -522,7 +522,6 @@
# options for serial support
COM_ESP opt_sio.h
COM_MULTIPORT opt_sio.h
-FORCECONSPEED opt_sio.h
BREAK_TO_DEBUGGER opt_comconsole.h
ALT_BREAK_TO_DEBUGGER opt_comconsole.h
==== //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#33 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.428 2004/04/30 21:16:52 ambrisko Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.429 2004/05/03 22:35:28 ambrisko Exp $");
#include "opt_comconsole.h"
#include "opt_compat.h"
@@ -123,7 +123,6 @@
#define COM_PPSCTS(flags) ((flags) & 0x10000)
#define COM_ST16650A(flags) ((flags) & 0x20000)
#define COM_TI16754(flags) ((flags) & 0x200000)
-#define COM_ALTCONSOLE(flags) ((flags) & 0x400000)
#define sio_getreg(com, off) \
(bus_space_read_1((com)->bst, (com)->bsh, (off)))
@@ -750,7 +749,7 @@
sio_setreg(com, com_cfcr, CFCR_8BITS);
mtx_unlock_spin(&sio_lock);
bus_release_resource(dev, SYS_RES_IOPORT, rid, port);
- if (comconsole != -1 && iobase == siocniobase)
+ if (iobase == siocniobase)
result = 0;
if (result != 0) {
device_set_softc(dev, NULL);
@@ -796,7 +795,6 @@
mtx_unlock_spin(&sio_lock);
- result = 0;
irqs = irqmap[1] & ~irqmap[0];
if (bus_get_resource(idev, SYS_RES_IRQ, 0, &xirq, NULL) == 0 &&
((1 << xirq) & irqs) == 0) {
@@ -806,14 +804,14 @@
printf(
"sio%d: port may not be enabled\n",
device_get_unit(dev));
- result = ENXIO;
}
if (bootverbose)
printf("sio%d: irq maps: %#x %#x %#x %#x\n",
device_get_unit(dev),
irqmap[0], irqmap[1], irqmap[2], irqmap[3]);
- for (fn = 0; result == 0 && fn < sizeof failures; ++fn)
+ result = 0;
+ for (fn = 0; fn < sizeof failures; ++fn)
if (failures[fn]) {
sio_setreg(com, com_mcr, 0);
result = ENXIO;
@@ -828,7 +826,7 @@
break;
}
bus_release_resource(dev, SYS_RES_IOPORT, rid, port);
- if (comconsole != -1 && iobase == siocniobase)
+ if (iobase == siocniobase)
result = 0;
if (result != 0) {
device_set_softc(dev, NULL);
@@ -2816,9 +2814,6 @@
u_char cfcr;
cfcr = inb(iobase + com_cfcr);
- outb(iobase + com_cfcr, 0x0e);
- if (inb(iobase + com_cfcr) != 0x0e)
- return (0);
outb(iobase + com_cfcr, CFCR_DLAB | cfcr);
dlbl = inb(iobase + com_dlbl);
@@ -2831,12 +2826,7 @@
/* XXX there should be more sanity checking. */
if (divisor == 0)
return (CONSPEED);
-
-#ifdef FORCECONSPEED
- return (CONSPEED);
-#else
return (rclk / (16UL * divisor));
-#endif
}
#endif
@@ -2917,7 +2907,7 @@
speed_t boot_speed;
u_char cfcr;
u_int divisor;
- int s, unit, check_flags;
+ int s, unit;
struct siocnstate sp;
/*
@@ -2936,42 +2926,28 @@
*/
cp->cn_pri = CN_DEAD;
- siocniobase = 0;
- for(check_flags = 1; check_flags >= 0 && !siocniobase; check_flags--) {
- for (unit = 0; unit < 16; unit++) { /* XXX need to know how
- many */
- int flags;
+ for (unit = 0; unit < 16; unit++) { /* XXX need to know how many */
+ int flags;
+
+ if (resource_disabled("sio", unit))
+ continue;
+ if (resource_int_value("sio", unit, "flags", &flags))
+ continue;
+ if (COM_CONSOLE(flags) || COM_DEBUGGER(flags)) {
+ int port;
+ Port_t iobase;
- if (resource_disabled("sio", unit))
+ if (resource_int_value("sio", unit, "port", &port))
continue;
- if (resource_int_value("sio", unit, "flags", &flags))
- continue;
-
- if (!check_flags && COM_ALTCONSOLE(flags)
- && !siocniobase){
- flags |= 0x10;
+ iobase = port;
+ s = spltty();
+ if (boothowto & RB_SERIAL) {
+ boot_speed =
+ siocngetspeed(iobase, comdefaultrclk);
+ if (boot_speed)
+ comdefaultrate = boot_speed;
}
- if (COM_CONSOLE(flags) || COM_DEBUGGER(flags)) {
- int port;
- Port_t iobase;
-
- if (resource_int_value("sio", unit, "port",
- &port))
- continue;
- iobase = port;
- s = spltty();
- if (boothowto & RB_SERIAL) {
- boot_speed = siocngetspeed(iobase,
- comdefaultrclk);
- if (boot_speed)
- comdefaultrate = boot_speed;
- else {
- splx(s);
- continue;
- }
- }
-
/*
* Initialize the divisor latch. We can't rely on
* siocnopen() to do this the first time, since it
@@ -2981,37 +2957,34 @@
* need to set the speed in hardware so that
* switching it later is null.
*/
- cfcr = inb(iobase + com_cfcr);
- outb(iobase + com_cfcr, CFCR_DLAB | cfcr);
- divisor = siodivisor(comdefaultrclk, comdefaultrate);
- outb(iobase + com_dlbl, divisor & 0xff);
- outb(iobase + com_dlbh, divisor >> 8);
- outb(iobase + com_cfcr, cfcr);
+ cfcr = inb(iobase + com_cfcr);
+ outb(iobase + com_cfcr, CFCR_DLAB | cfcr);
+ divisor = siodivisor(comdefaultrclk, comdefaultrate);
+ outb(iobase + com_dlbl, divisor & 0xff);
+ outb(iobase + com_dlbh, divisor >> 8);
+ outb(iobase + com_cfcr, cfcr);
- siocnopen(&sp, iobase, comdefaultrate);
+ siocnopen(&sp, iobase, comdefaultrate);
- splx(s);
- if (!siocniobase && COM_CONSOLE(flags)
- && !COM_LLCONSOLE(flags)) {
- siocnset(cp, unit);
- cp->cn_pri = COM_FORCECONSOLE(flags)
- || boothowto & RB_SERIAL
- ? CN_REMOTE : CN_NORMAL;
- siocniobase = iobase;
- siocnunit = unit;
- }
- if (COM_DEBUGGER(flags)) {
- printf("sio%d: gdb debugging port\n",
- unit);
- siogdbiobase = iobase;
- siogdbunit = unit;
+ splx(s);
+ if (COM_CONSOLE(flags) && !COM_LLCONSOLE(flags)) {
+ siocnset(cp, unit);
+ cp->cn_pri = COM_FORCECONSOLE(flags)
+ || boothowto & RB_SERIAL
+ ? CN_REMOTE : CN_NORMAL;
+ siocniobase = iobase;
+ siocnunit = unit;
+ }
+ if (COM_DEBUGGER(flags)) {
+ printf("sio%d: gdb debugging port\n", unit);
+ siogdbiobase = iobase;
+ siogdbunit = unit;
#if DDB > 0
- siocnset(&gdbconsdev, unit);
- gdb_arg = &gdbconsdev;
- gdb_getc = siocngetc;
- gdb_putc = siocnputc;
+ siocnset(&gdbconsdev, unit);
+ gdb_arg = &gdbconsdev;
+ gdb_getc = siocngetc;
+ gdb_putc = siocnputc;
#endif
- }
}
}
}
==== //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#55 (text+ko) ====
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.111 2004/05/03 20:53:27 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.112 2004/05/03 22:54:46 rwatson Exp $");
#include "opt_mac.h"
#include "opt_devfs.h"
@@ -1231,4 +1231,4 @@
return (ENOSYS);
}
-#endif
+#endif /* !MAC */
==== //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#26 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)raw_ip.c 8.7 (Berkeley) 5/15/95
- * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.130 2004/05/03 17:15:34 maxim Exp $
+ * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.131 2004/05/04 00:10:16 rwatson Exp $
*/
#include "opt_inet6.h"
@@ -142,6 +142,8 @@
{
int policyfail = 0;
+ INP_LOCK_ASSERT(last);
+
#if defined(IPSEC) || defined(FAST_IPSEC)
/* check AH/ESP integrity. */
if (ipsec4_in_reject(n, last)) {
==== //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#27 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95
- * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.151 2004/04/07 20:46:14 imp Exp $
+ * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.152 2004/05/04 01:08:15 rwatson Exp $
*/
#include "opt_ipsec.h"
@@ -449,6 +449,8 @@
struct sockaddr *append_sa;
struct mbuf *opts = 0;
+ INP_LOCK_ASSERT(last);
+
#if defined(IPSEC) || defined(FAST_IPSEC)
/* check AH/ESP integrity. */
if (ipsec4_in_reject(n, last)) {
==== //depot/projects/trustedbsd/base/sys/security/mac/mac_net.c#8 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.114 2004/02/29 15:33:56 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.115 2004/05/03 23:37:48 rwatson Exp $");
#include "opt_mac.h"
@@ -89,9 +89,12 @@
struct m_tag *tag;
struct label *label;
+ if (mbuf == NULL)
+ return (NULL);
tag = m_tag_find(mbuf, PACKET_TAG_MACLABEL, NULL);
+ if (tag == NULL)
+ return (NULL);
label = (struct label *)(tag+1);
-
return (label);
}
==== //depot/projects/trustedbsd/base/usr.bin/id/id.1#2 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)id.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/id/id.1,v 1.11 2001/08/15 09:09:41 ru Exp $
+.\" $FreeBSD: src/usr.bin/id/id.1,v 1.12 2004/05/03 22:50:23 rwatson Exp $
.\"
.Dd June 6, 1993
.Dt ID 1
@@ -48,6 +48,8 @@
.Fl G Op Fl n
.Op Ar user
.Nm
+.Fl M
+.Nm
.Fl P
.Op Ar user
.Nm
@@ -78,6 +80,8 @@
.It Fl G
Display the different group IDs (effective, real and supplementary)
as white-space separated numbers, in no particular order.
+.It Fl M
+Display the MAC label of the current prorcess.
.It Fl P
Display the id as a password file entry.
.It Fl g
==== //depot/projects/trustedbsd/base/usr.bin/id/id.c#6 (text+ko) ====
@@ -43,11 +43,13 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/id/id.c,v 1.19 2002/09/04 23:29:02 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/id/id.c,v 1.20 2004/05/03 22:50:23 rwatson Exp $");
#include <sys/param.h>
+#include <sys/mac.h>
#include <err.h>
+#include <errno.h>
#include <grp.h>
#include <pwd.h>
#include <stdio.h>
@@ -59,6 +61,7 @@
void pline(struct passwd *);
void pretty(struct passwd *);
void group(struct passwd *, int);
+void maclabel(void);
void usage(void);
void user(struct passwd *);
struct passwd *
@@ -71,10 +74,10 @@
{
struct group *gr;
struct passwd *pw;
- int Gflag, Pflag, ch, gflag, id, nflag, pflag, rflag, uflag;
+ int Gflag, Mflag, Pflag, ch, gflag, id, nflag, pflag, rflag, uflag;
const char *myname;
- Gflag = Pflag = gflag = nflag = pflag = rflag = uflag = 0;
+ Gflag = Mflag = Pflag = gflag = nflag = pflag = rflag = uflag = 0;
myname = strrchr(argv[0], '/');
myname = (myname != NULL) ? myname + 1 : argv[0];
@@ -88,11 +91,14 @@
}
while ((ch = getopt(argc, argv,
- (isgroups || iswhoami) ? "" : "PGgnpru")) != -1)
+ (isgroups || iswhoami) ? "" : "PGMgnpru")) != -1)
switch(ch) {
case 'G':
Gflag = 1;
break;
+ case 'M':
+ Mflag = 1;
+ break;
case 'P':
Pflag = 1;
break;
@@ -134,6 +140,9 @@
pw = *argv ? who(*argv) : NULL;
+ if (Mflag && pw != NULL)
+ usage();
+
if (gflag) {
id = pw ? pw->pw_gid : rflag ? getgid() : getegid();
if (nflag && (gr = getgrgid(id)))
@@ -157,6 +166,11 @@
exit(0);
}
+ if (Mflag) {
+ maclabel();
+ exit(0);
+ }
+
if (Pflag) {
pline(pw);
exit(0);
@@ -317,6 +331,30 @@
(void)printf("\n");
}
+void
+maclabel(void)
+{
+ char *string;
+ mac_t label;
+ int error;
+
+ error = mac_prepare_process_label(&label);
+ if (error == -1)
+ errx(1, "mac_prepare_type: %s", strerror(errno));
+
+ error = mac_get_proc(label);
+ if (error == -1)
+ errx(1, "mac_get_proc: %s", strerror(errno));
+
+ error = mac_to_text(label, &string);
+ if (error == -1)
+ errx(1, "mac_to_text: %s", strerror(errno));
+
+ (void)printf("%s\n", string);
+ mac_free(label);
+ free(string);
+}
+
struct passwd *
who(char *u)
{
@@ -366,6 +404,7 @@
(void)fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n",
"usage: id [user]",
" id -G [-n] [user]",
+ " id -M",
" id -P [user]",
" id -g [-nr] [user]",
" id -p [user]",
==== //depot/projects/trustedbsd/base/usr.sbin/watchdogd/watchdogd.c#5 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 Sean M. Kelly <smkelly@FreeBSD.org>
+ * Copyright (c) 2003-2004 Sean M. Kelly <smkelly@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
*/
#include <sys/types.h>
-__FBSDID("$FreeBSD: src/usr.sbin/watchdogd/watchdogd.c,v 1.6 2004/04/28 07:35:03 smkelly Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/watchdogd/watchdogd.c,v 1.7 2004/05/03 21:41:02 smkelly Exp $");
#include <sys/rtprio.h>
#include <sys/stat.h>
From owner-p4-projects@FreeBSD.ORG Mon May 3 18:26:35 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 9D5C716A4D0; Mon, 3 May 2004 18:26:35 -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 61A8C16A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 18:26:35 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 3769743D54
for <perforce@freebsd.org>; Mon, 3 May 2004 18:26:34 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i441QYGe096314
for <perforce@freebsd.org>; Mon, 3 May 2004 18:26:34 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i441QX8b096311
for perforce@freebsd.org; Mon, 3 May 2004 18:26:33 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 3 May 2004 18:26:33 -0700 (PDT)
Message-Id: <200405040126.i441QX8b096311@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52187 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, 04 May 2004 01:26:36 -0000
http://perforce.freebsd.org/chv.cgi?CH=52187
Change 52187 by rwatson@rwatson_tislabs on 2004/05/03 18:25:39
Integrate TrustedBSD MAC branch from TrustedBSD base branch:
Backout of FORCECONSPEED.
Loop back inpcb lock assertions in raw_append() and udp_append()
from trustedbsd_mac.
Loop back mac_mbuf_to_label() fix for NULL tags from trustedbsd_mac.
Loop back id(1) -M MAC label support from trustedbsd_mac.
Affected files ...
.. //depot/projects/trustedbsd/mac/share/man/man4/sio.4#9 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/NOTES#54 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/options#65 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/sio/sio.c#29 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#439 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#35 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#33 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#26 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/id/id.1#3 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/id/id.c#7 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/watchdogd/watchdogd.c#4 integrate
Differences ...
==== //depot/projects/trustedbsd/mac/share/man/man4/sio.4#9 (text+ko) ====
@@ -34,7 +34,7 @@
.\"
.\" from: @(#)dca.4 5.2 (Berkeley) 3/27/91
.\" from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
-.\" $FreeBSD: src/share/man/man4/sio.4,v 1.51 2004/04/30 21:16:52 ambrisko Exp $
+.\" $FreeBSD: src/share/man/man4/sio.4,v 1.52 2004/05/03 22:35:27 ambrisko Exp $
.\"
.Dd July 10, 2002
.Dt SIO 4
@@ -178,8 +178,6 @@
PPS timestamping on CTS instead of DCD
.It 0x20000
device is assumed to use a 16650A-type (extended FIFO) chip
-.It 0x400000
-If no comconsole found then mark as a comconsole
.El
.Pp
Minor numbering:
==== //depot/projects/trustedbsd/mac/sys/conf/NOTES#54 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1224 2004/05/03 21:18:55 pjd Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1225 2004/05/03 22:35:27 ambrisko Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1468,8 +1468,6 @@
options COM_MULTIPORT # Code for some cards with shared IRQs.
options CONSPEED=115200 # Speed for serial console
# (default 9600).
-options FORCECONSPEED # no matter what use CONSPEED for
- # console.
# `flags' specific to sio(4). See below for flags used by both sio(4) and
# uart(4).
==== //depot/projects/trustedbsd/mac/sys/conf/options#65 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.448 2004/05/03 21:18:56 pjd Exp $
+# $FreeBSD: src/sys/conf/options,v 1.449 2004/05/03 22:35:27 ambrisko Exp $
#
# On the handling of kernel options
#
@@ -522,7 +522,6 @@
# options for serial support
COM_ESP opt_sio.h
COM_MULTIPORT opt_sio.h
-FORCECONSPEED opt_sio.h
BREAK_TO_DEBUGGER opt_comconsole.h
ALT_BREAK_TO_DEBUGGER opt_comconsole.h
==== //depot/projects/trustedbsd/mac/sys/dev/sio/sio.c#29 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.428 2004/04/30 21:16:52 ambrisko Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.429 2004/05/03 22:35:28 ambrisko Exp $");
#include "opt_comconsole.h"
#include "opt_compat.h"
@@ -123,7 +123,6 @@
#define COM_PPSCTS(flags) ((flags) & 0x10000)
#define COM_ST16650A(flags) ((flags) & 0x20000)
#define COM_TI16754(flags) ((flags) & 0x200000)
-#define COM_ALTCONSOLE(flags) ((flags) & 0x400000)
#define sio_getreg(com, off) \
(bus_space_read_1((com)->bst, (com)->bsh, (off)))
@@ -750,7 +749,7 @@
sio_setreg(com, com_cfcr, CFCR_8BITS);
mtx_unlock_spin(&sio_lock);
bus_release_resource(dev, SYS_RES_IOPORT, rid, port);
- if (comconsole != -1 && iobase == siocniobase)
+ if (iobase == siocniobase)
result = 0;
if (result != 0) {
device_set_softc(dev, NULL);
@@ -796,7 +795,6 @@
mtx_unlock_spin(&sio_lock);
- result = 0;
irqs = irqmap[1] & ~irqmap[0];
if (bus_get_resource(idev, SYS_RES_IRQ, 0, &xirq, NULL) == 0 &&
((1 << xirq) & irqs) == 0) {
@@ -806,14 +804,14 @@
printf(
"sio%d: port may not be enabled\n",
device_get_unit(dev));
- result = ENXIO;
}
if (bootverbose)
printf("sio%d: irq maps: %#x %#x %#x %#x\n",
device_get_unit(dev),
irqmap[0], irqmap[1], irqmap[2], irqmap[3]);
- for (fn = 0; result == 0 && fn < sizeof failures; ++fn)
+ result = 0;
+ for (fn = 0; fn < sizeof failures; ++fn)
if (failures[fn]) {
sio_setreg(com, com_mcr, 0);
result = ENXIO;
@@ -828,7 +826,7 @@
break;
}
bus_release_resource(dev, SYS_RES_IOPORT, rid, port);
- if (comconsole != -1 && iobase == siocniobase)
+ if (iobase == siocniobase)
result = 0;
if (result != 0) {
device_set_softc(dev, NULL);
@@ -2816,9 +2814,6 @@
u_char cfcr;
cfcr = inb(iobase + com_cfcr);
- outb(iobase + com_cfcr, 0x0e);
- if (inb(iobase + com_cfcr) != 0x0e)
- return (0);
outb(iobase + com_cfcr, CFCR_DLAB | cfcr);
dlbl = inb(iobase + com_dlbl);
@@ -2831,12 +2826,7 @@
/* XXX there should be more sanity checking. */
if (divisor == 0)
return (CONSPEED);
-
-#ifdef FORCECONSPEED
- return (CONSPEED);
-#else
return (rclk / (16UL * divisor));
-#endif
}
#endif
@@ -2917,7 +2907,7 @@
speed_t boot_speed;
u_char cfcr;
u_int divisor;
- int s, unit, check_flags;
+ int s, unit;
struct siocnstate sp;
/*
@@ -2936,42 +2926,28 @@
*/
cp->cn_pri = CN_DEAD;
- siocniobase = 0;
- for(check_flags = 1; check_flags >= 0 && !siocniobase; check_flags--) {
- for (unit = 0; unit < 16; unit++) { /* XXX need to know how
- many */
- int flags;
+ for (unit = 0; unit < 16; unit++) { /* XXX need to know how many */
+ int flags;
+
+ if (resource_disabled("sio", unit))
+ continue;
+ if (resource_int_value("sio", unit, "flags", &flags))
+ continue;
+ if (COM_CONSOLE(flags) || COM_DEBUGGER(flags)) {
+ int port;
+ Port_t iobase;
- if (resource_disabled("sio", unit))
+ if (resource_int_value("sio", unit, "port", &port))
continue;
- if (resource_int_value("sio", unit, "flags", &flags))
- continue;
-
- if (!check_flags && COM_ALTCONSOLE(flags)
- && !siocniobase){
- flags |= 0x10;
+ iobase = port;
+ s = spltty();
+ if (boothowto & RB_SERIAL) {
+ boot_speed =
+ siocngetspeed(iobase, comdefaultrclk);
+ if (boot_speed)
+ comdefaultrate = boot_speed;
}
- if (COM_CONSOLE(flags) || COM_DEBUGGER(flags)) {
- int port;
- Port_t iobase;
-
- if (resource_int_value("sio", unit, "port",
- &port))
- continue;
- iobase = port;
- s = spltty();
- if (boothowto & RB_SERIAL) {
- boot_speed = siocngetspeed(iobase,
- comdefaultrclk);
- if (boot_speed)
- comdefaultrate = boot_speed;
- else {
- splx(s);
- continue;
- }
- }
-
/*
* Initialize the divisor latch. We can't rely on
* siocnopen() to do this the first time, since it
@@ -2981,37 +2957,34 @@
* need to set the speed in hardware so that
* switching it later is null.
*/
- cfcr = inb(iobase + com_cfcr);
- outb(iobase + com_cfcr, CFCR_DLAB | cfcr);
- divisor = siodivisor(comdefaultrclk, comdefaultrate);
- outb(iobase + com_dlbl, divisor & 0xff);
- outb(iobase + com_dlbh, divisor >> 8);
- outb(iobase + com_cfcr, cfcr);
+ cfcr = inb(iobase + com_cfcr);
+ outb(iobase + com_cfcr, CFCR_DLAB | cfcr);
+ divisor = siodivisor(comdefaultrclk, comdefaultrate);
+ outb(iobase + com_dlbl, divisor & 0xff);
+ outb(iobase + com_dlbh, divisor >> 8);
+ outb(iobase + com_cfcr, cfcr);
- siocnopen(&sp, iobase, comdefaultrate);
+ siocnopen(&sp, iobase, comdefaultrate);
- splx(s);
- if (!siocniobase && COM_CONSOLE(flags)
- && !COM_LLCONSOLE(flags)) {
- siocnset(cp, unit);
- cp->cn_pri = COM_FORCECONSOLE(flags)
- || boothowto & RB_SERIAL
- ? CN_REMOTE : CN_NORMAL;
- siocniobase = iobase;
- siocnunit = unit;
- }
- if (COM_DEBUGGER(flags)) {
- printf("sio%d: gdb debugging port\n",
- unit);
- siogdbiobase = iobase;
- siogdbunit = unit;
+ splx(s);
+ if (COM_CONSOLE(flags) && !COM_LLCONSOLE(flags)) {
+ siocnset(cp, unit);
+ cp->cn_pri = COM_FORCECONSOLE(flags)
+ || boothowto & RB_SERIAL
+ ? CN_REMOTE : CN_NORMAL;
+ siocniobase = iobase;
+ siocnunit = unit;
+ }
+ if (COM_DEBUGGER(flags)) {
+ printf("sio%d: gdb debugging port\n", unit);
+ siogdbiobase = iobase;
+ siogdbunit = unit;
#if DDB > 0
- siocnset(&gdbconsdev, unit);
- gdb_arg = &gdbconsdev;
- gdb_getc = siocngetc;
- gdb_putc = siocnputc;
+ siocnset(&gdbconsdev, unit);
+ gdb_arg = &gdbconsdev;
+ gdb_getc = siocngetc;
+ gdb_putc = siocnputc;
#endif
- }
}
}
}
==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#439 (text+ko) ====
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.111 2004/05/03 20:53:27 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.112 2004/05/03 22:54:46 rwatson Exp $");
#include "opt_mac.h"
#include "opt_devfs.h"
==== //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#35 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)raw_ip.c 8.7 (Berkeley) 5/15/95
- * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.130 2004/05/03 17:15:34 maxim Exp $
+ * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.131 2004/05/04 00:10:16 rwatson Exp $
*/
#include "opt_inet6.h"
==== //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#33 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95
- * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.151 2004/04/07 20:46:14 imp Exp $
+ * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.152 2004/05/04 01:08:15 rwatson Exp $
*/
#include "opt_ipsec.h"
==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#26 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.114 2004/02/29 15:33:56 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.115 2004/05/03 23:37:48 rwatson Exp $");
#include "opt_mac.h"
==== //depot/projects/trustedbsd/mac/usr.bin/id/id.1#3 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)id.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/id/id.1,v 1.11 2001/08/15 09:09:41 ru Exp $
+.\" $FreeBSD: src/usr.bin/id/id.1,v 1.12 2004/05/03 22:50:23 rwatson Exp $
.\"
.Dd June 6, 1993
.Dt ID 1
==== //depot/projects/trustedbsd/mac/usr.bin/id/id.c#7 (text+ko) ====
@@ -43,7 +43,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/id/id.c,v 1.19 2002/09/04 23:29:02 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/id/id.c,v 1.20 2004/05/03 22:50:23 rwatson Exp $");
#include <sys/param.h>
#include <sys/mac.h>
==== //depot/projects/trustedbsd/mac/usr.sbin/watchdogd/watchdogd.c#4 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 Sean M. Kelly <smkelly@FreeBSD.org>
+ * Copyright (c) 2003-2004 Sean M. Kelly <smkelly@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
*/
#include <sys/types.h>
-__FBSDID("$FreeBSD: src/usr.sbin/watchdogd/watchdogd.c,v 1.6 2004/04/28 07:35:03 smkelly Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/watchdogd/watchdogd.c,v 1.7 2004/05/03 21:41:02 smkelly Exp $");
#include <sys/rtprio.h>
#include <sys/stat.h>
From owner-p4-projects@FreeBSD.ORG Mon May 3 18:33:43 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 9E32716A4D1; Mon, 3 May 2004 18:33:43 -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 7855316A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 18:33:43 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 6620E43D45
for <perforce@freebsd.org>; Mon, 3 May 2004 18:33:43 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i441XhGe098248
for <perforce@freebsd.org>; Mon, 3 May 2004 18:33:43 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i441Xh1h098245
for perforce@freebsd.org; Mon, 3 May 2004 18:33:43 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 3 May 2004 18:33:43 -0700 (PDT)
Message-Id: <200405040133.i441Xh1h098245@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52188 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, 04 May 2004 01:33:44 -0000
http://perforce.freebsd.org/chv.cgi?CH=52188
Change 52188 by rwatson@rwatson_tislabs on 2004/05/03 18:32:58
Remove commentary in udp_output() about why we use the inpcb
instead of the socket.
Affected files ...
.. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#34 edit
Differences ...
==== //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#34 (text+ko) ====
@@ -732,13 +732,7 @@
INP_LOCK_ASSERT(inp);
#ifdef MAC
- /*
- * XXXRW: Use inpcb instead of socket.
- */
mac_create_mbuf_from_inpcb(inp, m);
-#if 0
- mac_create_mbuf_from_socket(inp->inp_socket, m);
-#endif
#endif
if (len + sizeof(struct udpiphdr) > IP_MAXPACKET) {
From owner-p4-projects@FreeBSD.ORG Mon May 3 19:26:54 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 9B03A16A4D0; Mon, 3 May 2004 19:26:54 -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 59CDF16A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 19:26:54 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 5E02643D39
for <perforce@freebsd.org>; Mon, 3 May 2004 19:26:52 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i442QqGe009550
for <perforce@freebsd.org>; Mon, 3 May 2004 19:26:52 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i442QnCO009547
for perforce@freebsd.org; Mon, 3 May 2004 19:26:49 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 3 May 2004 19:26:49 -0700 (PDT)
Message-Id: <200405040226.i442QnCO009547@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52192 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, 04 May 2004 02:26:55 -0000
http://perforce.freebsd.org/chv.cgi?CH=52192
Change 52192 by rwatson@rwatson_tislabs on 2004/05/03 19:25:57
Integrate netperf_socket forward to FreeBSD CVS HEAD.
Affected files ...
.. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#6 integrate
.. //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#3 integrate
.. //depot/projects/netperf_socket/sys/alpha/include/float.h#3 integrate
.. //depot/projects/netperf_socket/sys/amd64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#5 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/float.h#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/boot0/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.S#1 branch
.. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.s#3 delete
.. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0ext.S#1 branch
.. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0ext.s#3 delete
.. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0sio.s#3 delete
.. //depot/projects/netperf_socket/sys/boot/i386/boot0ext/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/boot0sio/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/boot2/boot1.S#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/boot2/sio.S#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/btx/btxldr/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/cdboot/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/libi386/amd64_tramp.S#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/mbr/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/pxeldr/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/pxeldr/pxeldr.S#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/boot2/serial_16550.S#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/boot2/serial_8251.S#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/btx.S#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/btxldr.S#2 integrate
.. //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.c#4 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#5 integrate
.. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#13 integrate
.. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#12 integrate
.. //depot/projects/netperf_socket/sys/conf/NOTES#15 integrate
.. //depot/projects/netperf_socket/sys/conf/files#19 integrate
.. //depot/projects/netperf_socket/sys/conf/files.amd64#5 integrate
.. //depot/projects/netperf_socket/sys/conf/files.i386#14 integrate
.. //depot/projects/netperf_socket/sys/conf/files.pc98#8 integrate
.. //depot/projects/netperf_socket/sys/conf/files.sparc64#3 integrate
.. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#10 integrate
.. //depot/projects/netperf_socket/sys/conf/majors#4 integrate
.. //depot/projects/netperf_socket/sys/conf/options#11 integrate
.. //depot/projects/netperf_socket/sys/conf/options.sparc64#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#7 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#5 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_norm.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#17 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_timer.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#10 integrate
.. //depot/projects/netperf_socket/sys/dev/asr/asr.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-all.h#8 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-commands.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-isa.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.h#6 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/atapi-fd.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/ciss/cissreg.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/cy/cy.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/cy/cy_isa.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/cy/cy_pci.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/cy/cyreg.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/cy/cyvar.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/gem/if_gem.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/ic/cd1400.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#10 integrate
.. //depot/projects/netperf_socket/sys/dev/led/led.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mii/dcphy.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mii/mii.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mii/mii_physubr.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mii/mlphy.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mii/ruephy.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mii/tlphy.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mii/xmphy.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/pci/pci.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/puc/pucdata.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/sio/sio.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/sio/sio_ebus.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/sound/pci/cmi.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/buffer.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/uart/uart_dev_sab82532.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#10 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#10 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#10 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uvscom.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/vinum/vinumio.c#4 integrate
.. //depot/projects/netperf_socket/sys/geom/gate/g_gate.c#1 branch
.. //depot/projects/netperf_socket/sys/geom/gate/g_gate.h#1 branch
.. //depot/projects/netperf_socket/sys/geom/geom_gpt.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/acpica/acpi_asus.c#1 branch
.. //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#6 integrate
.. //depot/projects/netperf_socket/sys/i386/conf/NOTES#17 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/elan-mmcr.c#7 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/mptable_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/include/float.h#3 integrate
.. //depot/projects/netperf_socket/sys/i386/include/legacyvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/i386/include/mpapic.h#2 delete
.. //depot/projects/netperf_socket/sys/i386/isa/atpic.c#4 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/clock.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/cy.c#4 delete
.. //depot/projects/netperf_socket/sys/i386/isa/cyreg.h#2 delete
.. //depot/projects/netperf_socket/sys/i386/isa/ic/cd1400.h#2 delete
.. //depot/projects/netperf_socket/sys/i386/pci/pci_bus.c#3 integrate
.. //depot/projects/netperf_socket/sys/ia64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/acpica/madt.c#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/conf/GENERIC#3 integrate
.. //depot/projects/netperf_socket/sys/ia64/conf/SKI#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/trap.c#3 integrate
.. //depot/projects/netperf_socket/sys/ia64/include/float.h#3 integrate
.. //depot/projects/netperf_socket/sys/isa/fd.c#6 integrate
.. //depot/projects/netperf_socket/sys/kern/imgact_elf.c#6 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_clock.c#4 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_environment.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_exec.c#8 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_jail.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_mac.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_thread.c#7 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_timeout.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/link_elf_obj.c#1 branch
.. //depot/projects/netperf_socket/sys/kern/sched_ule.c#7 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_export.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#6 integrate
.. //depot/projects/netperf_socket/sys/modules/Makefile#8 integrate
.. //depot/projects/netperf_socket/sys/modules/acpi/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/acpi/acpi/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/acpi/acpi_asus/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/asr/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/geom/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/geom/geom_gate/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/netgraph/Makefile#5 integrate
.. //depot/projects/netperf_socket/sys/modules/sio/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/net/bridge.c#5 integrate
.. //depot/projects/netperf_socket/sys/net/if.c#8 integrate
.. //depot/projects/netperf_socket/sys/net/if.h#4 integrate
.. //depot/projects/netperf_socket/sys/net/if_arcsubr.c#6 integrate
.. //depot/projects/netperf_socket/sys/net/if_atmsubr.c#2 integrate
.. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#12 integrate
.. //depot/projects/netperf_socket/sys/net/if_fddisubr.c#6 integrate
.. //depot/projects/netperf_socket/sys/net/if_gre.c#4 integrate
.. //depot/projects/netperf_socket/sys/net/if_iso88025subr.c#6 integrate
.. //depot/projects/netperf_socket/sys/net/if_var.h#10 integrate
.. //depot/projects/netperf_socket/sys/net/if_vlan.c#2 integrate
.. //depot/projects/netperf_socket/sys/net/radix.c#5 integrate
.. //depot/projects/netperf_socket/sys/net/route.c#9 integrate
.. //depot/projects/netperf_socket/sys/net/route.h#9 integrate
.. //depot/projects/netperf_socket/sys/net/rtsock.c#7 integrate
.. //depot/projects/netperf_socket/sys/netatalk/aarp.c#8 integrate
.. //depot/projects/netperf_socket/sys/netatalk/at_extern.h#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_misc.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#4 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_parse.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_pptpgre.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_pptpgre.h#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/if_ether.c#8 integrate
.. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#8 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#5 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_fw.h#4 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#4 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_input.c#10 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_output.c#9 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_var.h#5 integrate
.. //depot/projects/netperf_socket/sys/netinet/raw_ip.c#5 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_hostcache.c#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#6 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_output.c#4 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#7 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#6 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#6 integrate
.. //depot/projects/netperf_socket/sys/netinet/udp_usrreq.c#6 integrate
.. //depot/projects/netperf_socket/sys/netinet6/nd6.c#5 integrate
.. //depot/projects/netperf_socket/sys/netipsec/key.c#4 integrate
.. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#6 integrate
.. //depot/projects/netperf_socket/sys/pc98/conf/NOTES#10 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#6 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#5 integrate
.. //depot/projects/netperf_socket/sys/pci/agp.c#4 integrate
.. //depot/projects/netperf_socket/sys/pci/agp_i810.c#4 integrate
.. //depot/projects/netperf_socket/sys/pci/cy_pci.c#3 delete
.. //depot/projects/netperf_socket/sys/powerpc/conf/GENERIC#3 integrate
.. //depot/projects/netperf_socket/sys/powerpc/include/float.h#4 integrate
.. //depot/projects/netperf_socket/sys/powerpc/include/param.h#3 integrate
.. //depot/projects/netperf_socket/sys/powerpc/include/pmap.h#5 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powermac/ata_kauai.c#4 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powermac/ata_macio.c#2 integrate
.. //depot/projects/netperf_socket/sys/security/mac/mac_net.c#4 integrate
.. //depot/projects/netperf_socket/sys/security/mac_test/mac_test.c#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/conf/NOTES#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/ebus/ebus.c#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/include/float.h#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/include/nexusvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/isa/ofw_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/isa/ofw_isa.h#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/pci/psycho.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/pci/psychoreg.h#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/pci/psychovar.h#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/identcpu.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/iommu.c#4 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/nexus.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/ofw_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/sys/imgact.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/jail.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/mbuf.h#7 integrate
.. //depot/projects/netperf_socket/sys/sys/mman.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/proc.h#7 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#4 integrate
.. //depot/projects/netperf_socket/sys/vm/device_pager.c#3 integrate
.. //depot/projects/netperf_socket/sys/vm/phys_pager.c#2 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_kern.c#4 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_map.c#6 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_map.h#4 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_page.c#6 integrate
.. //depot/projects/netperf_socket/sys/vm/vnode_pager.c#3 integrate
Differences ...
==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#6 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.143 2004/04/11 05:08:26 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.146 2004/04/26 17:49:05 gallatin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1074,7 +1074,7 @@
*/
VM_OBJECT_LOCK(pmap->pm_pteobj);
lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS,
- VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED);
+ VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO);
vm_page_lock_queues();
vm_page_flag_clear(lev1pg, PG_BUSY);
@@ -1083,10 +1083,7 @@
VM_OBJECT_UNLOCK(pmap->pm_pteobj);
pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg));
- if ((lev1pg->flags & PG_ZERO) == 0)
- bzero(pmap->pm_lev1, PAGE_SIZE);
-
/* install self-referential address mapping entry (not PG_ASM) */
pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg))
| PG_V | PG_KRE | PG_KWE;
@@ -1194,8 +1191,6 @@
VM_OBJECT_LOCK(pmap->pm_pteobj);
m = vm_page_grab(pmap->pm_pteobj, ptepindex,
VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY);
- if ((m->flags & PG_ZERO) == 0)
- pmap_zero_page(m);
KASSERT(m->queue == PQ_NONE,
("_pmap_allocpte: %p->queue != PQ_NONE", m));
@@ -1242,7 +1237,6 @@
vm_page_lock_queues();
m->valid = VM_PAGE_BITS_ALL;
- vm_page_flag_clear(m, PG_ZERO);
vm_page_wakeup(m);
vm_page_unlock_queues();
if (!is_object_locked)
@@ -1906,7 +1900,8 @@
* raise IPL while manipulating pv_table since pmap_enter can be
* called at interrupt time.
*/
- if (pmap_initialized && (m->flags & PG_FICTITIOUS) == 0) {
+ if (pmap_initialized &&
+ (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) {
pmap_insert_entry(pmap, va, mpte, m);
managed |= PG_MANAGED;
}
@@ -1966,7 +1961,7 @@
pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte)
{
register pt_entry_t *pte;
-
+ int managed;
/*
* In the case that a page table page is not
@@ -2031,7 +2026,11 @@
* raise IPL while manipulating pv_table since pmap_enter can be
* called at interrupt time.
*/
- pmap_insert_entry(pmap, va, mpte, m);
+ managed = 0;
+ if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) {
+ pmap_insert_entry(pmap, va, mpte, m);
+ managed = PG_MANAGED | PG_FOR | PG_FOW | PG_FOE;
+ }
/*
* Increment counters
@@ -2041,7 +2040,7 @@
/*
* Now validate mapping with RO protection
*/
- *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | PG_MANAGED | PG_FOR | PG_FOE | PG_FOW;
+ *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | managed;
alpha_pal_imb(); /* XXX overkill? */
return mpte;
==== //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#3 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.168 2004/01/24 21:45:25 jeff Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.170 2004/05/02 20:40:17 marcel Exp $
machine alpha
cpu EV4
@@ -60,6 +60,7 @@
options CD9660 #ISO 9660 Filesystem
options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework
+options GEOM_GPT #GUID Partition Tables.
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options COMPAT_FREEBSD4 #Compatible with FreeBSD4
options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI
@@ -194,10 +195,10 @@
device umass # Disks/Mass storage - Requires scbus and da0
device ums # Mouse
# USB Ethernet
-device aue # ADMtek USB ethernet
-device axe # ASIX Electronics USB ethernet
-device cue # CATC USB ethernet
-device kue # Kawasaki LSI USB ethernet
+device aue # ADMtek USB Ethernet
+device axe # ASIX Electronics USB Ethernet
+device cue # CATC USB Ethernet
+device kue # Kawasaki LSI USB Ethernet
# FireWire support
device firewire # FireWire bus code
==== //depot/projects/netperf_socket/sys/alpha/include/float.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/float.h,v 1.5 2004/04/05 21:00:50 imp Exp $ */
+/* $FreeBSD: src/sys/alpha/include/float.h,v 1.6 2004/04/25 02:36:28 das Exp $ */
/* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */
/*
@@ -41,8 +41,10 @@
#define FLT_RADIX 2 /* b */
#define FLT_ROUNDS __flt_rounds()
+#if __ISO_C_VISIBLE >= 1999
#define FLT_EVAL_METHOD 0 /* no promotions */
#define DECIMAL_DIG 17 /* max precision in decimal digits */
+#endif
#define FLT_MANT_DIG 24 /* p */
#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
==== //depot/projects/netperf_socket/sys/amd64/acpica/acpi_machdep.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.12 2003/09/22 22:12:46 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.13 2004/04/21 02:10:58 njl Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -40,8 +40,7 @@
{
struct acpi_softc *sc;
- if ((sc = device_get_softc(dev)) == NULL)
- return (ENXIO);
+ sc = device_get_softc(dev);
acpi_install_wakeup_handler(sc);
==== //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#5 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.405 2004/03/25 03:19:28 obrien Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.407 2004/05/02 20:40:18 marcel Exp $
machine amd64
cpu HAMMER
@@ -44,6 +44,7 @@
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
options PSEUDOFS # Pseudo-filesystem framework
+options GEOM_GPT # GUID Partition Tables.
options IA32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI
@@ -180,7 +181,7 @@
# PCI Ethernet NICs that use the common MII bus controller code.
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
device miibus # MII bus support
-device bfe # Broadcom BCM440x 10/100 ethernet
+device bfe # Broadcom BCM440x 10/100 Ethernet
device bge # Broadcom BCM570xx Gigabit Ethernet
device dc # DEC/Intel 21143 and various workalikes
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
@@ -189,9 +190,9 @@
device rl # RealTek 8129/8139
device sf # Adaptec AIC-6915 (``Starfire'')
device sis # Silicon Integrated Systems SiS 900/SiS 7016
-device sk # SysKonnect SK-984x & SK-982x gigabit ethernet
+device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
device ste # Sundance ST201 (D-Link DFE-550TX)
-device ti # Alteon Networks Tigon I/II gigabit ethernet
+device ti # Alteon Networks Tigon I/II gigabit Ethernet
device tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 ``EPIC'')
device vr # VIA Rhine, Rhine II
@@ -210,8 +211,8 @@
#device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc.
# XXX kvtop brokenness, pointer/int warnings
#device lnc # NE2100, NE32-VL Lance Ethernet cards
-device sn # SMC's 9000 series of ethernet chips
-device xe # Xircom pccard ethernet
+device sn # SMC's 9000 series of Ethernet chips
+device xe # Xircom pccard Ethernet
# ISA devices that use the old ISA shims
#device le
@@ -253,10 +254,10 @@
device urio # Diamond Rio 500 MP3 player
device uscanner # Scanners
# USB Ethernet, requires mii
-device aue # ADMtek USB ethernet
-device axe # ASIX Electronics USB ethernet
-device cue # CATC USB ethernet
-device kue # Kawasaki LSI USB ethernet
+device aue # ADMtek USB Ethernet
+device axe # ASIX Electronics USB Ethernet
+device cue # CATC USB Ethernet
+device kue # Kawasaki LSI USB Ethernet
# FireWire support
device firewire # FireWire bus code
==== //depot/projects/netperf_socket/sys/amd64/include/float.h#3 (text+ko) ====
@@ -27,16 +27,20 @@
* SUCH DAMAGE.
*
* from: @(#)float.h 7.1 (Berkeley) 5/8/90
- * $FreeBSD: src/sys/amd64/include/float.h,v 1.11 2004/04/05 21:25:51 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/float.h,v 1.12 2004/04/25 02:36:28 das Exp $
*/
#ifndef _MACHINE_FLOAT_H_
#define _MACHINE_FLOAT_H_ 1
+#include <sys/cdefs.h>
+
#define FLT_RADIX 2 /* b */
#define FLT_ROUNDS 1 /* FP addition rounds to nearest */
+#if __ISO_C_VISIBLE >= 1999
#define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */
#define DECIMAL_DIG 21 /* max precision in decimal digits */
+#endif
#define FLT_MANT_DIG 24 /* p */
#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
==== //depot/projects/netperf_socket/sys/boot/i386/boot0/Makefile#3 (text+ko) ====
@@ -1,13 +1,10 @@
-# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.23 2004/02/09 14:11:56 ru Exp $
+# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.29 2004/04/28 21:31:19 ru Exp $
-PROG= ${BOOT}.out
-INTERNALPROG=
-FILES= ${BOOT}
+PROG?= boot0
+STRIP=
+BINMODE=${NOBINMODE}
NOMAN=
-SRCS= ${BOOT}.s
-CLEANFILES= ${BOOT}
-
-BOOT?= boot0
+SRCS= ${PROG}.S
# The default set of flags compiled into boot0. This enables update (writing
# the modified boot0 back to disk after running so that the selection made is
@@ -30,13 +27,10 @@
# command line
BOOT_BOOT0_COMCONSOLE_SPEED?= 0xE3
-AFLAGS+=--defsym FLAGS=${BOOT_BOOT0_FLAGS} \
- --defsym TICKS=${BOOT_BOOT0_TICKS} \
- --defsym COMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED}
+CFLAGS+=-DFLAGS=${BOOT_BOOT0_FLAGS} \
+ -DTICKS=${BOOT_BOOT0_TICKS} \
+ -DCOMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED}
-LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG}
-
-${BOOT}: ${BOOT}.out
- objcopy -S -O binary ${BOOT}.out ${.TARGET}
+LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-S,--oformat,binary
.include <bsd.prog.mk>
==== //depot/projects/netperf_socket/sys/boot/i386/boot0ext/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/sys/boot/i386/boot0ext/Makefile,v 1.1 2004/03/26 18:46:31 obrien Exp $
+# $FreeBSD: src/sys/boot/i386/boot0ext/Makefile,v 1.2 2004/04/28 21:31:20 ru Exp $
.PATH: ${.CURDIR}/../boot0
-BOOT= boot0ext
+PROG= boot0ext
.include "${.CURDIR}/../boot0/Makefile"
==== //depot/projects/netperf_socket/sys/boot/i386/boot0sio/Makefile#3 (text+ko) ====
@@ -1,7 +1,8 @@
-# $FreeBSD: src/sys/boot/i386/boot0sio/Makefile,v 1.2 2004/02/06 21:58:31 ru Exp $
+# $FreeBSD: src/sys/boot/i386/boot0sio/Makefile,v 1.4 2004/04/28 21:31:20 ru Exp $
.PATH: ${.CURDIR}/../boot0
-BOOT= boot0sio
+PROGNAME= boot0sio
+CFLAGS+= -DSIO
.include "${.CURDIR}/../boot0/Makefile"
==== //depot/projects/netperf_socket/sys/boot/i386/boot2/boot1.S#2 (text+ko) ====
@@ -1,21 +1,21 @@
-//
-// Copyright (c) 1998 Robert Nordier
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms are freely
-// permitted provided that the above copyright notice and this
-// paragraph and the following disclaimer are duplicated in all
-// such forms.
-//
-// This software is provided "AS IS" and without any express or
-// implied warranties, including, without limitation, the implied
-// warranties of merchantability and fitness for a particular
-// purpose.
-//
+/*
+ * Copyright (c) 1998 Robert Nordier
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are freely
+ * permitted provided that the above copyright notice and this
+ * paragraph and the following disclaimer are duplicated in all
+ * such forms.
+ *
+ * This software is provided "AS IS" and without any express or
+ * implied warranties, including, without limitation, the implied
+ * warranties of merchantability and fitness for a particular
+ * purpose.
+ *
+ * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.26 2004/04/28 14:31:43 ru Exp $
+ */
-// $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.24 2004/02/17 07:13:04 ru Exp $
-
-// Memory Locations
+/* Memory Locations */
.set MEM_REL,0x700 // Relocation address
.set MEM_ARG,0x900 // Arguments
.set MEM_ORG,0x7c00 // Origin
@@ -25,15 +25,15 @@
.set MEM_USR,0xa000 // Client start
.set BDA_BOOT,0x472 // Boot howto flag
-// Partition Constants
+/* Partition Constants */
.set PRT_OFF,0x1be // Partition offset
.set PRT_NUM,0x4 // Partitions
.set PRT_BSD,0xa5 // Partition type
-// Flag Bits
+/* Flag Bits */
.set FL_PACKET,0x80 // Packet mode
-// Misc. Constants
+/* Misc. Constants */
.set SIZ_PAG,0x1000 // Page size
.set SIZ_SEC,0x200 // Sector size
@@ -44,19 +44,20 @@
start: jmp main // Start recognizably
-// This is the start of a standard BIOS Parameter Block (BPB). Most bootable
-// FAT disks have this at the start of their MBR. While normal BIOS's will
-// work fine without this section, IBM's El Torito emulation "fixes" up the
-// BPB by writing into the memory copy of the MBR. Rather than have data
-// written into our xread routine, we'll define a BPB to work around it.
-// The data marked with (T) indicates a field required for a ThinkPad to
-// recognize the disk and (W) indicates fields written from IBM BIOS code.
-// The use of the BPB is based on what OpenBSD and NetBSD implemented in
-// their boot code but the required fields were determined by trial and error.
-//
-// Note: If additional space is needed in boot1, one solution would be to
-// move the "prompt" message data (below) to replace the OEM ID.
-
+/*
+ * This is the start of a standard BIOS Parameter Block (BPB). Most bootable
+ * FAT disks have this at the start of their MBR. While normal BIOS's will
+ * work fine without this section, IBM's El Torito emulation "fixes" up the
+ * BPB by writing into the memory copy of the MBR. Rather than have data
+ * written into our xread routine, we'll define a BPB to work around it.
+ * The data marked with (T) indicates a field required for a ThinkPad to
+ * recognize the disk and (W) indicates fields written from IBM BIOS code.
+ * The use of the BPB is based on what OpenBSD and NetBSD implemented in
+ * their boot code but the required fields were determined by trial and error.
+ *
+ * Note: If additional space is needed in boot1, one solution would be to
+ * move the "prompt" message data (below) to replace the OEM ID.
+ */
.org 0x03, 0x00
oemid: .space 0x08, 0x00 // OEM ID
@@ -78,21 +79,21 @@
ebpb: .byte 0 // BIOS physical drive number (W)
.org 0x25,0x90
-//
-// Trampoline used by boot2 to call read to read data from the disk via
-// the BIOS. Call with:
-//
-// %cx:%ax - long - LBA to read in
-// %es:(%bx) - caddr_t - buffer to read data into
-// %dl - byte - drive to read from
-// %dh - byte - num sectors to read
-//
+/*
+ * Trampoline used by boot2 to call read to read data from the disk via
+ * the BIOS. Call with:
+ *
+ * %cx:%ax - long - LBA to read in
+ * %es:(%bx) - caddr_t - buffer to read data into
+ * %dl - byte - drive to read from
+ * %dh - byte - num sectors to read
+ */
xread: push %ss // Address
pop %ds // data
-//
-// Setup an EDD disk packet and pass it to read
-//
+/*
+ * Setup an EDD disk packet and pass it to read
+ */
xread.1: // Starting
pushl $0x0 // absolute
push %cx // block
@@ -107,37 +108,37 @@
callw read // Read from disk
lea 0x10(%bp),%sp // Clear stack
lret // To far caller
-//
-// Load the rest of boot2 and BTX up, copy the parts to the right locations,
-// and start it all up.
-//
+/*
+ * Load the rest of boot2 and BTX up, copy the parts to the right locations,
+ * and start it all up.
+ */
-//
-// Setup the segment registers to flat addressing (segment 0) and setup the
-// stack to end just below the start of our code.
-//
+/*
+ * Setup the segment registers to flat addressing (segment 0) and setup the
+ * stack to end just below the start of our code.
+ */
main: cld // String ops inc
xor %cx,%cx // Zero
mov %cx,%es // Address
mov %cx,%ds // data
mov %cx,%ss // Set up
mov $start,%sp // stack
-//
-// Relocate ourself to MEM_REL. Since %cx == 0, the inc %ch sets
-// %cx == 0x100.
-//
+/*
+ * Relocate ourself to MEM_REL. Since %cx == 0, the inc %ch sets
+ * %cx == 0x100.
+ */
mov %sp,%si // Source
mov $MEM_REL,%di // Destination
incb %ch // Word count
rep // Copy
movsw // code
-//
-// If we are on a hard drive, then load the MBR and look for the first
-// FreeBSD slice. We use the fake partition entry below that points to
-// the MBR when we call nread. The first pass looks for the first active
-// FreeBSD slice. The second pass looks for the first non-active FreeBSD
-// slice if the first one fails.
-//
+/*
+ * If we are on a hard drive, then load the MBR and look for the first
+ * FreeBSD slice. We use the fake partition entry below that points to
+ * the MBR when we call nread. The first pass looks for the first active
+ * FreeBSD slice. The second pass looks for the first non-active FreeBSD
+ * slice if the first one fails.
+ */
mov $part4,%si // Partition
cmpb $0x80,%dl // Hard drive?
jb main.4 // No
@@ -157,30 +158,30 @@
jb main.2 // Yes
dec %cx // Do two
jcxz main.1 // passes
-//
-// If we get here, we didn't find any FreeBSD slices at all, so print an
-// error message and die.
-//
+/*
+ * If we get here, we didn't find any FreeBSD slices at all, so print an
+ * error message and die.
+ */
mov $msg_part,%si // Message
jmp error // Error
-//
-// Floppies use partition 0 of drive 0.
-//
+/*
+ * Floppies use partition 0 of drive 0.
+ */
main.4: xor %dx,%dx // Partition:drive
-//
-// Ok, we have a slice and drive in %dx now, so use that to locate and load
-// boot2. %si references the start of the slice we are looking for, so go
-// ahead and load up the first 16 sectors (boot1 + boot2) from that. When
-// we read it in, we conveniently use 0x8cec as our transfer buffer. Thus,
-// boot1 ends up at 0x8cec, and boot2 starts at 0x8cec + 0x200 = 0x8eec.
-// The first part of boot2 is the disklabel, which is 0x114 bytes long.
-// The second part is BTX, which is thus loaded into 0x9000, which is where
-// it also runs from. The boot2.bin binary starts right after the end of
-// BTX, so we have to figure out where the start of it is and then move the
-// binary to 0xc000. Normally, BTX clients start at MEM_USR, or 0xa000, but
-// when we use btxld to create boot2, we use an entry point of 0x2000. That
-// entry point is relative to MEM_USR; thus boot2.bin starts at 0xc000.
-//
+/*
+ * Ok, we have a slice and drive in %dx now, so use that to locate and load
+ * boot2. %si references the start of the slice we are looking for, so go
+ * ahead and load up the first 16 sectors (boot1 + boot2) from that. When
+ * we read it in, we conveniently use 0x8cec as our transfer buffer. Thus,
+ * boot1 ends up at 0x8cec, and boot2 starts at 0x8cec + 0x200 = 0x8eec.
+ * The first part of boot2 is the disklabel, which is 0x114 bytes long.
+ * The second part is BTX, which is thus loaded into 0x9000, which is where
+ * it also runs from. The boot2.bin binary starts right after the end of
+ * BTX, so we have to figure out where the start of it is and then move the
+ * binary to 0xc000. Normally, BTX clients start at MEM_USR, or 0xa000, but
+ * when we use btxld to create boot2, we use an entry point of 0x2000. That
+ * entry point is relative to MEM_USR; thus boot2.bin starts at 0xc000.
+ */
main.5: mov %dx,MEM_ARG // Save args
movb $NSECT,%dh // Sector count
callw nread // Read disk
@@ -198,9 +199,9 @@
stosb // up to 0x10000
callw seta20 // Enable A20
jmp start+MEM_JMP-MEM_ORG // Start BTX
-//
-// Enable A20 so we can access memory above 1 meg.
-//
+/*
+ * Enable A20 so we can access memory above 1 meg.
+ */
seta20: cli // Disable interrupts
seta20.1: inb $0x64,%al // Get status
testb $0x2,%al // Busy?
@@ -214,9 +215,9 @@
outb %al,$0x60 // A20
sti // Enable interrupts
retw // To caller
-//
-// Trampoline used to call read from within boot1.
-//
+/*
+ * Trampoline used to call read from within boot1.
+ */
nread: mov $MEM_BUF,%bx // Transfer buffer
mov 0x8(%si),%ax // Get
mov 0xa(%si),%cx // LBA
@@ -226,10 +227,10 @@
mov $msg_read,%si // Otherwise, set the error
// message and fall through to
// the error routine
-//
-// Print out the error message pointed to by %ds:(%si) followed
-// by a prompt, wait for a keypress, and then reboot the machine.
-//
+/*
+ * Print out the error message pointed to by %ds:(%si) followed
+ * by a prompt, wait for a keypress, and then reboot the machine.
+ */
error: callw putstr // Display message
mov $prompt,%si // Display
callw putstr // prompt
@@ -237,9 +238,9 @@
int $0x16 // keypress
movw $0x1234, BDA_BOOT // Do a warm boot
ljmp $0xffff,$0x0 // reboot the machine
-//
-// Display a null-terminated string using the BIOS output.
-//
+/*
+ * Display a null-terminated string using the BIOS output.
+ */
putstr.0: mov $0x7,%bx // Page:attribute
movb $0xe,%ah // BIOS: Display
int $0x10 // character
@@ -247,24 +248,24 @@
testb %al,%al // End of string?
jne putstr.0 // No
-//
-// Overused return code. ereturn is used to return an error from the
-// read function. Since we assume putstr succeeds, we (ab)use the
-// same code when we return from putstr.
-//
+/*
+ * Overused return code. ereturn is used to return an error from the
+ * read function. Since we assume putstr succeeds, we (ab)use the
+ * same code when we return from putstr.
+ */
ereturn: movb $0x1,%ah // Invalid
stc // argument
return: retw // To caller
-//
-// Reads sectors from the disk. If EDD is enabled, then check if it is
-// installed and use it if it is. If it is not installed or not enabled, then
-// fall back to using CHS. Since we use a LBA, if we are using CHS, we have to
-// fetch the drive parameters from the BIOS and divide it out ourselves.
-// Call with:
-//
-// %dl - byte - drive number
-// stack - 10 bytes - EDD Packet
-//
+/*
+ * Reads sectors from the disk. If EDD is enabled, then check if it is
+ * installed and use it if it is. If it is not installed or not enabled, then
+ * fall back to using CHS. Since we use a LBA, if we are using CHS, we have to
+ * fetch the drive parameters from the BIOS and divide it out ourselves.
+ * Call with:
+ *
+ * %dl - byte - drive number
+ * stack - 10 bytes - EDD Packet
+ */
read: push %dx // Save
movb $0x8,%ah // BIOS: Get drive
int $0x13 // parameters
@@ -343,7 +344,7 @@
int $0x13 // read
retw // To caller
-// Messages
+/* Messages */
msg_read: .asciz "Read"
msg_part: .asciz "Boot"
@@ -354,7 +355,7 @@
.org PRT_OFF,0x90
-// Partition table
+/* Partition table */
.fill 0x30,0x1,0x0
part4: .byte 0x80, 0x00, 0x01, 0x00
==== //depot/projects/netperf_socket/sys/boot/i386/boot2/sio.S#2 (text+ko) ====
@@ -1,23 +1,23 @@
-#
-# Copyright (c) 1998 Robert Nordier
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are freely
-# permitted provided that the above copyright notice and this
-# paragraph and the following disclaimer are duplicated in all
-# such forms.
-#
-# This software is provided "AS IS" and without any express or
-# implied warranties, including, without limitation, the implied
-# warranties of merchantability and fitness for a particular
-# purpose.
-#
+/*
+ * Copyright (c) 1998 Robert Nordier
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are freely
+ * permitted provided that the above copyright notice and this
+ * paragraph and the following disclaimer are duplicated in all
+ * such forms.
+ *
+ * This software is provided "AS IS" and without any express or
+ * implied warranties, including, without limitation, the implied
+ * warranties of merchantability and fitness for a particular
+ * purpose.
+ *
+ * $FreeBSD: src/sys/boot/i386/boot2/sio.S,v 1.8 2004/04/28 14:31:43 ru Exp $
+ */
-# $FreeBSD: src/sys/boot/i386/boot2/sio.S,v 1.6 2004/02/17 07:13:04 ru Exp $
-
- .set SIO_PRT,SIOPRT # Base port
- .set SIO_FMT,SIOFMT # 8N1
- .set SIO_DIV,(115200/SIOSPD) # 115200 / SPD
+ .set SIO_PRT,SIOPRT // Base port
+ .set SIO_FMT,SIOFMT // 8N1
+ .set SIO_DIV,(115200/SIOSPD) // 115200 / SPD
.globl sio_init
.globl sio_flush
@@ -25,56 +25,56 @@
.globl sio_getc
.globl sio_ischar
-# void sio_init(void)
+/* void sio_init(void) */
-sio_init: movw $SIO_PRT+0x3,%dx # Data format reg
- movb $SIO_FMT|0x80,%al # Set format
- outb %al,(%dx) # and DLAB
- pushl %edx # Save
- subb $0x3,%dl # Divisor latch reg
- movw $SIO_DIV,%ax # Set
- outw %ax,(%dx) # BPS
- popl %edx # Restore
- movb $SIO_FMT,%al # Clear
- outb %al,(%dx) # DLAB
- incl %edx # Modem control reg
- movb $0x3,%al # Set RTS,
- outb %al,(%dx) # DTR
- incl %edx # Line status reg
+sio_init: movw $SIO_PRT+0x3,%dx // Data format reg
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon May 3 19:35:06 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id C3BB916A4CE; Mon, 3 May 2004 19:35:06 -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 9D8EC16A4CE
for <perforce@freebsd.org>; Mon, 3 May 2004 19:35:06 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 804C943D1F
for <perforce@freebsd.org>; Mon, 3 May 2004 19:35:06 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i442Z6Ge011555
for <perforce@freebsd.org>; Mon, 3 May 2004 19:35:06 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i442Z6mW011552
for perforce@freebsd.org; Mon, 3 May 2004 19:35:06 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 3 May 2004 19:35:06 -0700 (PDT)
Message-Id: <200405040235.i442Z6mW011552@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52194 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, 04 May 2004 02:35:07 -0000
http://perforce.freebsd.org/chv.cgi?CH=52194
Change 52194 by rwatson@rwatson_tislabs on 2004/05/03 19:34:49
Integrate netperf_socket: pccbb uses INTR_MPSAFE when
re-registering.
Affected files ...
.. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#8 integrate
Differences ...
==== //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#8 (text+ko) ====
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.109 2004/04/23 05:25:13 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.110 2004/05/04 02:25:00 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2057,8 +2057,8 @@
cbb_set(sc, CBB_SOCKET_EVENT, tmp);
/* re-establish the interrupt. */
- if (bus_setup_intr(self, sc->irq_res, INTR_TYPE_AV, cbb_intr, sc,
- &sc->intrhand)) {
+ if (bus_setup_intr(self, sc->irq_res, INTR_TYPE_AV | INTR_MPSAFE,
+ cbb_intr, sc, &sc->intrhand)) {
device_printf(self, "couldn't re-establish interrupt");
bus_release_resource(self, SYS_RES_IRQ, 0, sc->irq_res);
bus_release_resource(self, SYS_RES_MEMORY, CBBR_SOCKBASE,
From owner-p4-projects@FreeBSD.ORG Tue May 4 05:30:25 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 1D84E16A531; Tue, 4 May 2004 05:30:25 -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 C6BBB16A52C
for <perforce@freebsd.org>; Tue, 4 May 2004 05:30:24 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id DC3D543D6A
for <perforce@freebsd.org>; Tue, 4 May 2004 05:30:21 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i44CULGe059498
for <perforce@freebsd.org>; Tue, 4 May 2004 05:30:21 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i44CULoS059495
for perforce@freebsd.org; Tue, 4 May 2004 05:30:21 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Tue, 4 May 2004 05:30:21 -0700 (PDT)
Message-Id: <200405041230.i44CULoS059495@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52218 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, 04 May 2004 12:30:26 -0000
http://perforce.freebsd.org/chv.cgi?CH=52218
Change 52218 by cvance@cvance_g5 on 2004/05/04 05:30:13
Rename windowserver program
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/WindowServer.sedarwin#1 branch
Differences ...
From owner-p4-projects@FreeBSD.ORG Tue May 4 05:41:36 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 9B94F16A4D0; Tue, 4 May 2004 05:41:36 -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 57CD216A4CE
for <perforce@freebsd.org>; Tue, 4 May 2004 05:41:36 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 0868943D53
for <perforce@freebsd.org>; Tue, 4 May 2004 05:41:36 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i44CfZGe062390
for <perforce@freebsd.org>; Tue, 4 May 2004 05:41:35 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i44CfZw7062381
for perforce@freebsd.org; Tue, 4 May 2004 05:41:35 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Tue, 4 May 2004 05:41:35 -0700 (PDT)
Message-Id: <200405041241.i44CfZw7062381@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52219 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, 04 May 2004 12:41:37 -0000
http://perforce.freebsd.org/chv.cgi?CH=52219
Change 52219 by cvance@cvance_g5 on 2004/05/04 05:41:23
Add the modified wslogin library and application to the build system
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/Makefile#5 edit
.. //depot/projects/trustedbsd/sedarwin73/release/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin73/sebsd_system/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/WindowServer#2 delete
.. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/WindowServer.sedarwin#2 edit
.. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/install-windowserver.sh#1 add
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/Makefile#5 (text+ko) ====
@@ -10,11 +10,11 @@
extattr_cmds \
mac_cmds \
sebsd_cmds \
+ sebsd_system \
policy \
apsl/file_cmds
# apsl/bootstrap_cmds
-# sebsd_system
dist:
cd release && $(MAKE) dist
==== //depot/projects/trustedbsd/sedarwin73/release/Makefile#3 (text+ko) ====
@@ -1,12 +1,15 @@
include ../Makeconfig
DIRS= $(DESTDIR)/private/etc \
+ $(DESTDIR)/private/etc/sedarwin \
$(DESTDIR)/bin \
$(DESTDIR)/usr/bin \
$(DESTDIR)/usr/lib \
$(DESTDIR)/usr/share/man/man1 \
$(DESTDIR)/usr/share/man/man8 \
- $(DESTDIR)/usr/include/sebsd
+ $(DESTDIR)/System/Library/CoreServices \
+ $(DESTDIR)/usr/include/sebsd \
+ $(DESTDIR)/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/
all:
mkdir -p $(DIRS)
==== //depot/projects/trustedbsd/sedarwin73/sebsd_system/Makefile#2 (text+ko) ====
@@ -1,9 +1,6 @@
-all:
- (cd wslogin ; make)
+include ../Makeconfig
-clean:
- (cd wslogin ; make clean)
+SUBDIR= wslogin
-install:
- (cd wslogin ; make install)
+.include <bsd.subdir.mk>
==== //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/Makefile#3 (text+ko) ====
@@ -1,4 +1,3 @@
-
include ../../Makeconfig
OBJS = wslogin.o
@@ -12,22 +11,12 @@
xcodebuild
install:
- install -m 644 -o root -g wheel wslogin.dylib /usr/lib
+ $(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 644 \
+ wslogin.dylib $(DESTDIR)/usr/lib
(cd build ; tar -cf - wsloginui.app) | (cd \
- /System/Library/CoreServices ; tar -xf -)
- chown -R root:wheel /System/Library/CoreServices/wsloginui.app
-
-#
-# Really be careful here! I wonder if we can make Make fail if it's already
-# there...?
-#
-rotate-out-old-server:
- sudo mv /System/Library/CoreServices/WindowServer \
- /System/Library/CoreServices/RealWindowServer
-
-install-window-server-wrapper:
- install -m 755 -o root -g wheel WindowServer \
- /System/Library/CoreServices
+ $(DESTDIR)/System/Library/CoreServices ; tar -xf -)
+ $(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 644 WindowServer.sedarwin $(DESTDIR)/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/
+ $(INSTALL) -o $(BINOWN) -g $(BINGRP) -m 700 install-windowserver.sh $(DESTDIR)/private/etc/sedarwin/
clean:
rm -f $(OBJS) wslogin.dylib
==== //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/WindowServer.sedarwin#2 (text+ko) ====
@@ -1,3 +1,4 @@
#!/bin/sh
-DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES=/usr/lib/wslogin.dylib /System/Library/CoreServices/RealWindowServer "$@"
+DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES=/usr/lib/wslogin.dylib \
+ /System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/WindowServer.apple
From owner-p4-projects@FreeBSD.ORG Tue May 4 06:01:01 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6A14F16A4E4; Tue, 4 May 2004 06:01:01 -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 F38D916A535
for <perforce@freebsd.org>; Tue, 4 May 2004 06:01:00 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 8DA8843D4C
for <perforce@freebsd.org>; Tue, 4 May 2004 06:01:00 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i44D10Ge065693
for <perforce@freebsd.org>; Tue, 4 May 2004 06:01:00 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i44D0xhv065690
for perforce@freebsd.org; Tue, 4 May 2004 06:00:59 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Tue, 4 May 2004 06:00:59 -0700 (PDT)
Message-Id: <200405041300.i44D0xhv065690@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52220 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, 04 May 2004 13:01:03 -0000
http://perforce.freebsd.org/chv.cgi?CH=52220
Change 52220 by cvance@cvance_g5 on 2004/05/04 06:00:14
Add two scripts to help with the system installation procedures
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/policy/Makefile#4 edit
.. //depot/projects/trustedbsd/sedarwin73/policy/create-extattr.sh#1 add
.. //depot/projects/trustedbsd/sedarwin73/policy/sebsd-relabel.sh#1 add
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/policy/Makefile#4 (text+ko) ====
@@ -1,6 +1,7 @@
include ../Makeconfig
POLICY= policy.16
+SCRIPTS= create-extattr.sh sebsd-relabel.sh
all: $(POLICY)
@@ -32,5 +33,6 @@
install:
$(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${POLICYDIR}
+ $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 700 ${SCRIPTS} ${DESTDIR}/private/etc/
.include <bsd.prog.mk>
From owner-p4-projects@FreeBSD.ORG Tue May 4 07:21:42 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 8423E16A4D0; Tue, 4 May 2004 07:21:42 -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 5198D16A4CE
for <perforce@freebsd.org>; Tue, 4 May 2004 07:21:42 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 0039943D58
for <perforce@freebsd.org>; Tue, 4 May 2004 07:21:41 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i44ELfGe084894
for <perforce@freebsd.org>; Tue, 4 May 2004 07:21:41 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i44ELerJ084875
for perforce@freebsd.org; Tue, 4 May 2004 07:21:40 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Tue, 4 May 2004 07:21:40 -0700 (PDT)
Message-Id: <200405041421.i44ELerJ084875@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52224 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, 04 May 2004 14:21:43 -0000
http://perforce.freebsd.org/chv.cgi?CH=52224
Change 52224 by cvance@cvance_g5 on 2004/05/04 07:21:29
Add a flag to supply "extattrctl initattr" with an initial attribute value to
store in the newly created attribute backing file. This allows policies like
SEBSD to apply a default value, and only label files that require a different
non-default label.
Also added a function to check if the preallocation path is on the same
file system as the backing file. If not, print a warning and continue.
This prints a message for a common failure of preallocating attributes
based on the inode count from a different file system.
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/extattr_cmds/extattrctl/extattrctl.8#2 edit
.. //depot/projects/trustedbsd/sedarwin73/extattr_cmds/extattrctl/extattrctl.c#2 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/extattr_cmds/extattrctl/extattrctl.8#2 (text+ko) ====
@@ -47,6 +47,7 @@
.Cm initattr
.Op Fl f
.Op Fl p Ar path
+.Op Fl i Ar initial_value
.Ar attrsize
.Ar attrfile
.Nm
@@ -89,6 +90,7 @@
.Cm initattr
.Op Fl f
.Op Fl p Ar path
+.Op Fl i Ar initial_value
.Ar attrsize attrfile
.Xc
Create and initialize a file to use as an attribute backing file.
@@ -111,6 +113,13 @@
for attributes when they are written, preventing low disk space conditions
from denying attribute service.
.Pp
+The
+.Fl i Ar initial_value
+argument may be used to assign a initial value for all attributes rather
+than using an empty value. This requires the use of the
+.Fl p
+flag to preallocate space as well.
+.Pp
This file should not exist before running
.Cm initattr .
.It Cm showattr Ar attrfile
==== //depot/projects/trustedbsd/sedarwin73/extattr_cmds/extattrctl/extattrctl.c#2 (text+ko) ====
@@ -60,7 +60,7 @@
"usage:\n"
" extattrctl start path\n"
" extattrctl stop path\n"
- " extattrctl initattr [-f] [-p path] attrsize attrfile\n"
+ " extattrctl initattr [-f] [-p path] [-i initial_value ] attrsize attrfile\n"
" extattrctl showattr attrfile\n"
" extattrctl enable path attrnamespace attrname attrfile\n"
" extattrctl disable path attrnamespace attrname\n");
@@ -83,16 +83,45 @@
}
int
+verify_paths(const char *fs_path, const char *attr_path)
+{
+ int error;
+ struct statfs fs1, fs2;
+
+ error = statfs(fs_path, &fs1);
+ if (error) {
+ perror("statfs");
+ return (-1);
+ }
+ error = statfs(attr_path, &fs2);
+ if (error) {
+ perror("statfs");
+ return (-1);
+ }
+
+ if (memcmp(&fs1.f_fsid, &fs2.f_fsid, sizeof(fsid_t)) != 0) {
+ printf("Warning, attribute backing file is not located on \n"
+ "the same file system as the preallocation path.\n"
+ "Continuing...\n");
+ }
+ return (0);
+}
+
+
+int
initattr(int argc, char *argv[])
{
struct hfs_extattr_fileheader uef;
char *fs_path = NULL;
char *zero_buf = NULL;
+ char *initial_value = NULL;
long loop, num_inodes;
int ch, i, error, chunksize, overwrite = 0, flags;
+ struct hfs_extattr_header header;
+ int headersize;
optind = 0;
- while ((ch = getopt(argc, argv, "fp:r:w:")) != -1)
+ while ((ch = getopt(argc, argv, "fi:p:")) != -1)
switch (ch) {
case 'f':
overwrite = 1;
@@ -103,6 +132,12 @@
return(-1);
}
break;
+ case 'i':
+ if ((initial_value = strdup(optarg)) == NULL) {
+ perror("strdup");
+ return(-1);
+ }
+ break;
case '?':
default:
usage();
@@ -114,6 +149,12 @@
if (argc != 2)
usage();
+ if ((initial_value != NULL) && (fs_path == NULL)) {
+ fprintf(stderr,"Error, initial value specified, but -p "
+ "was not specified\n");
+ usage();
+ }
+
if (overwrite)
flags = O_CREAT | O_WRONLY;
else
@@ -136,8 +177,10 @@
if (fwrite(&uef, sizeof(uef), 1, fp) != 1)
error = -1;
else if (fs_path) {
- chunksize = sizeof(struct hfs_extattr_header) +
- uef.uef_size;
+ if (verify_paths(fs_path, argv[1]))
+ usage();
+ headersize = sizeof(struct hfs_extattr_header);
+ chunksize = headersize + uef.uef_size;
zero_buf = (char *) (malloc(chunksize));
if (zero_buf == NULL) {
perror("malloc");
@@ -146,6 +189,24 @@
return (-1);
}
memset(zero_buf, 0, chunksize);
+ if (initial_value != NULL) {
+ header.ueh_flags = HFS_EXTATTR_ATTR_FLAG_INUSE;
+
+ /* Include the terminating NULL? */
+ header.ueh_len = strlen(initial_value)+1;
+ if (header.ueh_len > uef.uef_size)
+ header.ueh_len = uef.uef_size;
+
+ /*
+ * The kernel doesn't know what to do with
+ * HFS generation numbers either...
+ */
+ header.ueh_i_gen = 0;
+
+ memcpy(zero_buf, &header, headersize);
+ strncpy((char *)(zero_buf+headersize),
+ initial_value, uef.uef_size);
+ }
num_inodes = num_inodes_by_path(fs_path);
for (loop = 0; loop < num_inodes; loop++) {
error = fwrite(zero_buf, chunksize, 1, fp);
From owner-p4-projects@FreeBSD.ORG Tue May 4 08:13:46 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6462316A4D0; Tue, 4 May 2004 08:13:46 -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 3950A16A4CE
for <perforce@freebsd.org>; Tue, 4 May 2004 08:13:46 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 0E9F243D90
for <perforce@freebsd.org>; Tue, 4 May 2004 08:13:46 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i44FDjGe097097
for <perforce@freebsd.org>; Tue, 4 May 2004 08:13:45 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i44FDjwG097094
for perforce@freebsd.org; Tue, 4 May 2004 08:13:45 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Tue, 4 May 2004 08:13:45 -0700 (PDT)
Message-Id: <200405041513.i44FDjwG097094@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52226 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, 04 May 2004 15:13:47 -0000
http://perforce.freebsd.org/chv.cgi?CH=52226
Change 52226 by cvance@cvance_g5 on 2004/05/04 08:13:07
Install the policy sources as well as the binary version
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/policy/Makefile#5 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/policy/Makefile#5 (text+ko) ====
@@ -34,5 +34,6 @@
install:
$(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${POLICYDIR}
$(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 700 ${SCRIPTS} ${DESTDIR}/private/etc/
+ (cd $(.CURDIR)/..; tar -cf - policy) | (cd $(DESTDIR)/private/etc/sedarwin/; tar -xf -)
.include <bsd.prog.mk>
From owner-p4-projects@FreeBSD.ORG Tue May 4 09:43:38 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 5886616A4D0; Tue, 4 May 2004 09:43:38 -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 15FEF16A4CE
for <perforce@freebsd.org>; Tue, 4 May 2004 09:43:38 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 4207F43D1F
for <perforce@freebsd.org>; Tue, 4 May 2004 09:43:37 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i44GhbGe022368
for <perforce@freebsd.org>; Tue, 4 May 2004 09:43:37 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i44Ghaxp022365
for perforce@freebsd.org; Tue, 4 May 2004 09:43:36 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Tue, 4 May 2004 09:43:36 -0700 (PDT)
Message-Id: <200405041643.i44Ghaxp022365@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52230 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, 04 May 2004 16:43:39 -0000
http://perforce.freebsd.org/chv.cgi?CH=52230
Change 52230 by cvance@cvance_g5 on 2004/05/04 09:43:03
Checkpoint the build system and the installation instructions. The build
pieces seem to be fine at this point, but the target installation system
still won't boot normally.
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/bootstrap_instructions.txt#4 edit
.. //depot/projects/trustedbsd/sedarwin73/policy/Makefile#6 edit
.. //depot/projects/trustedbsd/sedarwin73/policy/Makefile.install#1 add
.. //depot/projects/trustedbsd/sedarwin73/policy/create-extattr.sh#2 edit
.. //depot/projects/trustedbsd/sedarwin73/policy/sebsd-relabel.sh#2 edit
.. //depot/projects/trustedbsd/sedarwin73/release/Makefile#4 edit
.. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/Makefile#4 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/bootstrap_instructions.txt#4 (text+ko) ====
@@ -56,7 +56,7 @@
and installation procedure. First, configure the SEDARWIN_ROOT
variable to point at the sedarwin73 directory:
- SEDARWIN_ROOT=/Users/andrew/p4/sedarwin/apsl/xnu
+ SEDARWIN_ROOT=/Users/cvance/p4/sedarwin/apsl/xnu
Next, set the DESTDIR variable to point to a local destination
directory; this directory will be created to store the modified
@@ -73,15 +73,14 @@
in permission errors (unless you are building as root).
EXPORT_OWNER = cvance
-
-Step 4: Build
+Step 4: Build kernel, libraries, and program binaries
A top-level makefile automates the build process. To build the
kernel, libraries, and program binaries, run the following command
from the top of the extracted source tree:
- bsdmake
+ bsdmake
NOTE: This step will fail if you have not installed bootstrap_cmds
due to a dependence on the relpath tool.
@@ -94,50 +93,86 @@
bsdmake install
-XXX Danger below XXX
-Step 10: Build, Install wslogin and WindowServer wrapper
+Step 6: Create system upgrade tarfile
+
+ To create a tarfile containing all the new libraries and system
+ binaries, run the following command from the top level of the source
+ tree:
+
+ bsdmake dist
+
+ This will create a compressed tarfile from the temporary
+ distribution directory. The file will be called, "sedarwin.tgz" and
+ it will be created in the root of the source tree.
+
+ This tarfile can be used to install on the current machine, or any
+ other appropriately updated 10.3.3 system. The following steps
+ presume that you have copied the tar file to the target machine.
+
+Step 7: Backup files
+
+ If the target machine contains binaries that you do not wish to
+ overwrite, you may wish to back them up first. In particular, if
+ you do not have a second bootable partition on the machine, you
+ probably want the kernel (and possibly turn on remote login).
+
+Step 8: Extract distribution
+
+ Extract the distribution tarfile from the root of the target machine:
- In order to allow users to select roles during GUI login, you must
- install our WindowServer wrapper. This will cause a dialog box
- prompting for a role selection to pop up during login prior to
- launching user applications. The process here is somewhat complicated,
- as LoginWindow appears not to offer any convenient hooks to allow
- this to be done without some subversion of its mechanisms.
+ cd /
+ sudo gnutar xvzf sedarwin.tgz
- First, build and install the wslogin dynamic library and wsloginui.app
- dialog:
+Step 9: Backup and Replace the WindowServer
- cd sebsd_system/wslogin
- make ; sudo make install
+ The distribution includes a shell script to replace Apple's Login
+ Window application with a wrapper that will allow a user role to be
+ selected during the login process. Run the script:
- In order to run the WindowServer in our modified environment, you must
- replace the existing WindowServer binary with our wrapper. NOTE:
- It is extremely important that these commands be executed cautiously:
- the new name for the old WindowServer must be RealWindowServer, and
- you really don't want to fail to rename before you install the new
- one, or you end up with no WindowServer at all:
+ sudo /etc/sedarwin/install-windowserver.sh
- sudo make rotate-out-old-server # run exactly once
- sudo make install-window-server-wrapper
- cd ../..
+Step 10: Create Extended Attribute File
+ The distribution includes a shell script that creates an extended
+ attribute backing file for the SEBSD policy module. Run the script:
-Step 16: Create extended attribute backing files
+ sudo /etc/sedarwin/create-extattr.sh
This will allocate storage space for MAC labels on the root file system.
You may wish to run similar commands on other file systems. Replace the
- "/" in this command with the root of the file systme in question, and
+ "/" in the script with the root of the file systme in question, and
insert the same directory in front of "/.attribute/system/sebsd" to
- store the attributes in that file system.
+ store the attributes in that file system. For example:
+
+ sudo extattrctl initattr -p /Volumes/Spare -i "system_u:object_r:file_t" \
+ 256 /Volumes/Spare/.attribute/system/sebsd
+
+Step 11: Configure Policy path
+
+ The system boot loader needs to know where the SEBSD policy file is
+ located; at boot time, it reads the location from the system
+ firmware. Set the location in the firmware with the following
+ command:
+
+ sudo nvram load_sebsd_policy=policy.16
+
+ Our sample policy file ships with three users: root, andrew, and
+ rwatson. Chances are, you'll want to add a line for your own user
+ based on one of those lines. The policy sources were installed into
+ /etc/sedarwin/policy, make changes there and rebuild the binary
+ policy file:
+
+ cd /etc/sedarwin/policy
+ [edit as root]
+ sudo bsdmake
+ sudo bsdmake install
- sudo mkdir -p /.attribute/system
- sudo extattrctl initattr -p / 256 /.attribute/system/sebsd
-Step 18: Reboot
+Step 12: Reboot
At this point, you should now have a new Darwin kernel, support libraries,
command line tools, and configuration files installed. Reboot to single-
- user mode by pressing Command-S during the boot. Check the file system
+ user mode by holding down Command-S during the boot. Check the file system
and mount the root file system writable:
/sbin/fsck -y
@@ -146,12 +181,7 @@
Now set the label on various binaries so they can transition
during system startup:
- cd policy; make relabel
+ sudo /etc/sedarwin/sebsd-relabel.sh
Missing this step will result in login attempts failing, or
the entire system not working if enforcing mode is enabled.
-
- If you want to run in enforcing mode, you can use the "kenv_sebsd_enforce"
- OF variable. Set it with:
-
- sudo nvram kenv_sebsd_enforce=1
==== //depot/projects/trustedbsd/sedarwin73/policy/Makefile#6 (text+ko) ====
@@ -33,7 +33,8 @@
install:
$(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${POLICYDIR}
- $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 700 ${SCRIPTS} ${DESTDIR}/private/etc/
+ $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 700 ${SCRIPTS} ${DESTDIR}/private/etc/sedarwin
(cd $(.CURDIR)/..; tar -cf - policy) | (cd $(DESTDIR)/private/etc/sedarwin/; tar -xf -)
+ cp Makefile.install $(DESTDIR)/private/etc/sedarwin/policy/Makefile
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sedarwin73/policy/create-extattr.sh#2 (text+ko) ====
@@ -2,5 +2,5 @@
mkdir -p /.attribute/system
-extattrctl initattr -p / 256 -i "system_u:object_r:file_t" \
- /.attribute/system/sebsd
+extattrctl initattr -p / -i "system_u:object_r:file_t" \
+ 256 /.attribute/system/sebsd
==== //depot/projects/trustedbsd/sedarwin73/policy/sebsd-relabel.sh#2 (text+ko) ====
@@ -1,24 +1,24 @@
#!/bin/sh
-SETFMAC= "/usr/bin/setfmac -h"
+SETFMAC='/usr/bin/setfmac -h'
if [ ! -f /.attribute/system/sebsd ]; then
echo "ERROR, can't find attribute backing file"
exit;
fi
-$SETFMAC system_u:object_r:bin_t /sbin/*
-$SETFMAC system_u:object_r:bin_t /usr/sbin/*
-$SETFMAC system_u:object_r:bin_t /bin/*
-$SETFMAC system_u:object_r:bin_t /usr/bin/*
-$SETFMAC system_u:object_r:bin_t /usr/local/bin/*
-$SETFMAC system_u:object_r:shell_exec_t /bin/*sh
-$SETFMAC system_u:object_r:lookupd_exec_t /usr/sbin/lookupd
-$SETFMAC -R system_u:object_r:appl_t /Applications/*
-$SETFMAC system_u:object_r:systemstarter_exec_t /sbin/SystemStarter
-$SETFMAC system_u:object_r:coreservices_exec_t /System/Library/CoreServices/coreservicesd
-$SETFMAC system_u:object_r:loginwindow_exec_t /System/Library/CoreServices/loginwindow.app/Contents/MacOS/loginwindow
-$SETFMAC system_u:object_r:pbs_exec_t /System/Library/CoreServices/pbs
-$SETFMAC system_u:object_r:windowserver_exec_t /System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/WindowServer*
-$SETFMAC system_u:object_r:securityserver_exec_t /System/Library/CoreServices/SecurityServer
-$SETFMAC system_u:object_r:coreservices_exec_t /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Support/coreservicesd+$SETFMAC sebsd/system_u:object_r:bin_t /sbin/*
+$SETFMAC sebsd/system_u:object_r:bin_t /usr/sbin/*
+$SETFMAC sebsd/system_u:object_r:bin_t /bin/*
+$SETFMAC sebsd/system_u:object_r:bin_t /usr/bin/*
+$SETFMAC sebsd/system_u:object_r:bin_t /usr/local/bin/*
+$SETFMAC sebsd/system_u:object_r:shell_exec_t /bin/*sh
+$SETFMAC sebsd/system_u:object_r:lookupd_exec_t /usr/sbin/lookupd
+$SETFMAC -R sebsd/system_u:object_r:appl_t /Applications/*
+$SETFMAC sebsd/system_u:object_r:systemstarter_exec_t /sbin/SystemStarter
+$SETFMAC sebsd/system_u:object_r:coreservices_exec_t /System/Library/CoreServices/coreservicesd
+$SETFMAC sebsd/system_u:object_r:loginwindow_exec_t /System/Library/CoreServices/loginwindow.app/Contents/MacOS/loginwindow
+$SETFMAC sebsd/system_u:object_r:pbs_exec_t /System/Library/CoreServices/pbs
+$SETFMAC sebsd/system_u:object_r:windowserver_exec_t /System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/WindowServer*
+$SETFMAC sebsd/system_u:object_r:securityserver_exec_t /System/Library/CoreServices/SecurityServer
+$SETFMAC sebsd/system_u:object_r:coreservices_exec_t /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Support/coreservicesd
==== //depot/projects/trustedbsd/sedarwin73/release/Makefile#4 (text+ko) ====
@@ -9,7 +9,7 @@
$(DESTDIR)/usr/share/man/man8 \
$(DESTDIR)/System/Library/CoreServices \
$(DESTDIR)/usr/include/sebsd \
- $(DESTDIR)/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/
+ $(DESTDIR)System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Resources
all:
mkdir -p $(DIRS)
==== //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/Makefile#4 (text+ko) ====
@@ -11,11 +11,11 @@
xcodebuild
install:
- $(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 644 \
+ $(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 755 \
wslogin.dylib $(DESTDIR)/usr/lib
(cd build ; tar -cf - wsloginui.app) | (cd \
$(DESTDIR)/System/Library/CoreServices ; tar -xf -)
- $(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 644 WindowServer.sedarwin $(DESTDIR)/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/
+ $(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 755 WindowServer.sedarwin $(DESTDIR)/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Resources/
$(INSTALL) -o $(BINOWN) -g $(BINGRP) -m 700 install-windowserver.sh $(DESTDIR)/private/etc/sedarwin/
clean:
From owner-p4-projects@FreeBSD.ORG Tue May 4 10:21:24 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id DCF0C16A4D1; Tue, 4 May 2004 10:21:23 -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 AB86D16A4CE
for <perforce@freebsd.org>; Tue, 4 May 2004 10:21:23 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 84B5F43D49
for <perforce@freebsd.org>; Tue, 4 May 2004 10:21:23 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i44HLNGe030597
for <perforce@freebsd.org>; Tue, 4 May 2004 10:21:23 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i44HLMYr030583
for perforce@freebsd.org; Tue, 4 May 2004 10:21:22 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Tue, 4 May 2004 10:21:22 -0700 (PDT)
Message-Id: <200405041721.i44HLMYr030583@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52231 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, 04 May 2004 17:21:24 -0000
http://perforce.freebsd.org/chv.cgi?CH=52231
Change 52231 by cvance@cvance_g5 on 2004/05/04 10:20:54
Fix typo and missing -f
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/policy/Makefile#7 edit
.. //depot/projects/trustedbsd/sedarwin73/release/Makefile#5 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/policy/Makefile#7 (text+ko) ====
@@ -35,6 +35,6 @@
$(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${POLICYDIR}
$(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 700 ${SCRIPTS} ${DESTDIR}/private/etc/sedarwin
(cd $(.CURDIR)/..; tar -cf - policy) | (cd $(DESTDIR)/private/etc/sedarwin/; tar -xf -)
- cp Makefile.install $(DESTDIR)/private/etc/sedarwin/policy/Makefile
+ cp -f Makefile.install $(DESTDIR)/private/etc/sedarwin/policy/Makefile
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sedarwin73/release/Makefile#5 (text+ko) ====
@@ -9,7 +9,7 @@
$(DESTDIR)/usr/share/man/man8 \
$(DESTDIR)/System/Library/CoreServices \
$(DESTDIR)/usr/include/sebsd \
- $(DESTDIR)System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Resources
+ $(DESTDIR)/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Resources
all:
mkdir -p $(DIRS)
From owner-p4-projects@FreeBSD.ORG Tue May 4 10:37:45 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id C433416A4D1; Tue, 4 May 2004 10:37:44 -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 9242116A4CE
for <perforce@freebsd.org>; Tue, 4 May 2004 10:37:44 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 7816E43D2D
for <perforce@freebsd.org>; Tue, 4 May 2004 10:37:44 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i44HbhGe033709
for <perforce@freebsd.org>; Tue, 4 May 2004 10:37:43 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i44HbhCr033706
for perforce@freebsd.org; Tue, 4 May 2004 10:37:43 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Date: Tue, 4 May 2004 10:37:43 -0700 (PDT)
Message-Id: <200405041737.i44HbhCr033706@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52232 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, 04 May 2004 17:37:45 -0000
http://perforce.freebsd.org/chv.cgi?CH=52232
Change 52232 by areisse@areisse_ibook on 2004/05/04 10:37:17
Temporarily disable using the domain chooser due to it not
working correctly.
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/wslogin.c#2 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/wslogin.c#2 (text+ko) ====
@@ -86,6 +86,7 @@
if (get_ordered_context_list(username, NULL, &contexts,
&ncontexts) != 0 || ncontexts == 0)
errexit ("Getting context list for %s: %s", username, strerror (errno));
+#if 0
int retries = 3;
const char *wexe = "/System/Library/CoreServices/wsloginui.app/Contents/MacOS/wsloginui";
size_t warglen = strlen (wexe);
@@ -125,6 +126,9 @@
}
else
queried = contexts[r];
+#else
+ queried = contexts[0];
+#endif
if (asprintf(&labeltext, "sebsd/%s", queried) == -1 ||
mac_from_text(&execlabel, labeltext) != 0)
@@ -138,7 +142,10 @@
}
if (mac_set_proc (execlabel))
+ {
+ errexit ("error changing process label: %s", strerror(errno));
kill (getppid (), 15);
+ }
return 0;
}
From owner-p4-projects@FreeBSD.ORG Tue May 4 19:59:43 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 17CE816A4D0; Tue, 4 May 2004 19:59:43 -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 DC55716A4CE
for <perforce@freebsd.org>; Tue, 4 May 2004 19:59:42 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 2C0A543D2F
for <perforce@freebsd.org>; Tue, 4 May 2004 19:59:41 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i452xeGe070295
for <perforce@freebsd.org>; Tue, 4 May 2004 19:59:40 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i452xd9l070292
for perforce@freebsd.org; Tue, 4 May 2004 19:59:39 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Date: Tue, 4 May 2004 19:59:39 -0700 (PDT)
Message-Id: <200405050259.i452xd9l070292@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52267 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: Wed, 05 May 2004 02:59:43 -0000
http://perforce.freebsd.org/chv.cgi?CH=52267
Change 52267 by marcel@marcel_nfs on 2004/05/04 19:59:31
IFC @52266
Affected files ...
.. //depot/projects/gdb/bin/ls/util.c#4 integrate
.. //depot/projects/gdb/gnu/usr.bin/gzip/gzip.c#2 integrate
.. //depot/projects/gdb/gnu/usr.bin/gzip/unzip.c#3 integrate
.. //depot/projects/gdb/lib/libarchive/archive.h#7 integrate
.. //depot/projects/gdb/lib/libarchive/archive_entry.c#12 integrate
.. //depot/projects/gdb/lib/libarchive/archive_entry.h#8 integrate
.. //depot/projects/gdb/lib/libarchive/archive_platform.h#8 integrate
.. //depot/projects/gdb/lib/libarchive/archive_private.h#8 integrate
.. //depot/projects/gdb/lib/libarchive/archive_read_support_format_cpio.c#8 integrate
.. //depot/projects/gdb/lib/libarchive/archive_string.h#3 integrate
.. //depot/projects/gdb/sbin/Makefile#7 integrate
.. //depot/projects/gdb/sbin/gconcat/Makefile#3 integrate
.. //depot/projects/gdb/sbin/ggate/ggatec/Makefile#2 integrate
.. //depot/projects/gdb/sbin/ggate/ggatec/ggatec.8#2 integrate
.. //depot/projects/gdb/sbin/ggate/ggatec/ggatec.c#3 integrate
.. //depot/projects/gdb/sbin/ggate/ggated/Makefile#2 integrate
.. //depot/projects/gdb/sbin/ggate/ggated/ggated.c#3 integrate
.. //depot/projects/gdb/sbin/ggate/ggatel/Makefile#2 integrate
.. //depot/projects/gdb/sbin/ggate/ggatel/ggatel.8#2 integrate
.. //depot/projects/gdb/sbin/route/route.c#5 integrate
.. //depot/projects/gdb/sbin/sunlabel/sunlabel.c#2 integrate
.. //depot/projects/gdb/share/examples/cvsup/cvs-supfile#4 integrate
.. //depot/projects/gdb/share/man/man4/atapicam.4#2 integrate
.. //depot/projects/gdb/share/man/man4/rl.4#2 integrate
.. //depot/projects/gdb/share/man/man4/sio.4#3 integrate
.. //depot/projects/gdb/share/man/man9/mbuf.9#6 integrate
.. //depot/projects/gdb/share/misc/bsd-family-tree#3 integrate
.. //depot/projects/gdb/sys/arm/include/_types.h#3 integrate
.. //depot/projects/gdb/sys/arm/include/elf.h#2 integrate
.. //depot/projects/gdb/sys/arm/include/endian.h#2 integrate
.. //depot/projects/gdb/sys/arm/include/signal.h#3 integrate
.. //depot/projects/gdb/sys/conf/NOTES#19 integrate
.. //depot/projects/gdb/sys/conf/files#23 integrate
.. //depot/projects/gdb/sys/conf/files.i386#13 integrate
.. //depot/projects/gdb/sys/conf/files.pc98#8 integrate
.. //depot/projects/gdb/sys/conf/options#18 integrate
.. //depot/projects/gdb/sys/dev/asr/asr.c#7 integrate
.. //depot/projects/gdb/sys/dev/led/led.c#5 integrate
.. //depot/projects/gdb/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/gdb/sys/dev/mii/dcphy.c#2 integrate
.. //depot/projects/gdb/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/gdb/sys/dev/mii/mii.c#2 integrate
.. //depot/projects/gdb/sys/dev/mii/mii_physubr.c#2 integrate
.. //depot/projects/gdb/sys/dev/mii/mlphy.c#2 integrate
.. //depot/projects/gdb/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/gdb/sys/dev/mii/ruephy.c#2 integrate
.. //depot/projects/gdb/sys/dev/mii/tlphy.c#2 integrate
.. //depot/projects/gdb/sys/dev/mii/xmphy.c#2 integrate
.. //depot/projects/gdb/sys/dev/pccbb/pccbb.c#8 integrate
.. //depot/projects/gdb/sys/dev/sio/sio.c#9 integrate
.. //depot/projects/gdb/sys/dev/uart/uart_core.c#4 integrate
.. //depot/projects/gdb/sys/dev/uart/uart_dev_z8530.c#2 integrate
.. //depot/projects/gdb/sys/dev/usb/if_axe.c#4 integrate
.. //depot/projects/gdb/sys/dev/usb/usbdevs#8 integrate
.. //depot/projects/gdb/sys/dev/usb/usbdevs.h#8 integrate
.. //depot/projects/gdb/sys/dev/usb/usbdevs_data.h#8 integrate
.. //depot/projects/gdb/sys/geom/concat/g_concat.c#5 integrate
.. //depot/projects/gdb/sys/geom/gate/g_gate.c#3 integrate
.. //depot/projects/gdb/sys/geom/gate/g_gate.h#3 integrate
.. //depot/projects/gdb/sys/i386/acpica/acpi_machdep.c#4 integrate
.. //depot/projects/gdb/sys/i386/acpica/madt.c#4 integrate
.. //depot/projects/gdb/sys/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/gdb/sys/i386/i386/io_apic.c#2 integrate
.. //depot/projects/gdb/sys/i386/i386/local_apic.c#3 integrate
.. //depot/projects/gdb/sys/i386/i386/mptable.c#2 integrate
.. //depot/projects/gdb/sys/i386/i386/mptable_pci.c#2 integrate
.. //depot/projects/gdb/sys/i386/i386/nexus.c#2 integrate
.. //depot/projects/gdb/sys/i386/include/apicvar.h#2 integrate
.. //depot/projects/gdb/sys/i386/include/bus_pc98.h#2 integrate
.. //depot/projects/gdb/sys/i386/include/intr_machdep.h#2 integrate
.. //depot/projects/gdb/sys/i386/include/legacyvar.h#2 integrate
.. //depot/projects/gdb/sys/i386/include/pci_cfgreg.h#3 integrate
.. //depot/projects/gdb/sys/i386/isa/atpic.c#4 integrate
.. //depot/projects/gdb/sys/i386/isa/elcr.c#1 branch
.. //depot/projects/gdb/sys/i386/pci/pci_bus.c#3 integrate
.. //depot/projects/gdb/sys/i386/pci/pci_pir.c#3 integrate
.. //depot/projects/gdb/sys/kern/kern_mac.c#4 integrate
.. //depot/projects/gdb/sys/libkern/quad.h#4 integrate
.. //depot/projects/gdb/sys/modules/geom/Makefile#3 integrate
.. //depot/projects/gdb/sys/net/if.h#4 integrate
.. //depot/projects/gdb/sys/net/if_var.h#11 integrate
.. //depot/projects/gdb/sys/net/if_vlan.c#3 integrate
.. //depot/projects/gdb/sys/net/rtsock.c#8 integrate
.. //depot/projects/gdb/sys/netinet/ip_fastfwd.c#4 integrate
.. //depot/projects/gdb/sys/netinet/raw_ip.c#6 integrate
.. //depot/projects/gdb/sys/netinet/tcp_output.c#4 integrate
.. //depot/projects/gdb/sys/netinet/tcp_subr.c#7 integrate
.. //depot/projects/gdb/sys/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/gdb/sys/netinet/udp_usrreq.c#6 integrate
.. //depot/projects/gdb/sys/netipsec/key.c#4 integrate
.. //depot/projects/gdb/sys/pc98/conf/NOTES#10 integrate
.. //depot/projects/gdb/sys/security/mac/mac_net.c#3 integrate
.. //depot/projects/gdb/sys/security/mac_test/mac_test.c#5 integrate
.. //depot/projects/gdb/sys/sparc64/sparc64/nexus.c#3 integrate
.. //depot/projects/gdb/sys/sys/elf_common.h#2 integrate
.. //depot/projects/gdb/sys/sys/imgact_aout.h#3 integrate
.. //depot/projects/gdb/tools/regression/geom_gate/Makefile#1 branch
.. //depot/projects/gdb/tools/regression/geom_gate/runtests.sh#1 branch
.. //depot/projects/gdb/tools/regression/geom_gate/test-1.sh#1 branch
.. //depot/projects/gdb/tools/regression/geom_gate/test-2.sh#1 branch
.. //depot/projects/gdb/tools/regression/geom_gate/test-3.sh#1 branch
.. //depot/projects/gdb/usr.bin/id/id.1#2 integrate
.. //depot/projects/gdb/usr.bin/id/id.c#2 integrate
.. //depot/projects/gdb/usr.bin/tar/bsdtar.h#5 integrate
.. //depot/projects/gdb/usr.bin/tar/fts.c#1 branch
.. //depot/projects/gdb/usr.bin/tar/fts.h#1 branch
.. //depot/projects/gdb/usr.bin/tar/read.c#5 integrate
.. //depot/projects/gdb/usr.bin/tar/util.c#3 integrate
.. //depot/projects/gdb/usr.bin/tar/write.c#9 integrate
.. //depot/projects/gdb/usr.sbin/jail/jail.8#3 integrate
.. //depot/projects/gdb/usr.sbin/watchdogd/watchdogd.c#4 integrate
Differences ...
==== //depot/projects/gdb/bin/ls/util.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.34 2004/05/02 11:25:37 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.35 2004/05/03 11:48:55 tjr Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -79,7 +79,8 @@
for (i = 0; i < (int)clen; i++)
putchar((unsigned char)s[i]);
s += clen;
- n += wcwidth(wc);
+ if (iswprint(wc))
+ n += wcwidth(wc);
}
return (n);
}
==== //depot/projects/gdb/gnu/usr.bin/gzip/gzip.c#2 (text+ko) ====
@@ -45,7 +45,7 @@
*/
#ifdef RCSID
-static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/gzip.c,v 1.10 1999/08/27 23:35:50 peter Exp $";
+static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/gzip.c,v 1.11 2004/05/03 10:29:23 obrien Exp $";
#endif
#include <ctype.h>
@@ -1011,14 +1011,15 @@
#ifdef NO_MULTIPLE_DOTS
char *dot; /* pointer to ifname extension, or NULL */
#endif
+ int max_suffix_len = (z_len > 3 ? z_len : 3);
- if (strlen(iname) >= sizeof(ifname) - 3) {
+ /* Leave enough room in ifname or ofname for suffix: */
+ if (strlen(iname) >= sizeof(ifname) - max_suffix_len) {
errno = ENAMETOOLONG;
perror(iname);
exit_code = ERROR;
return ERROR;
}
-
strcpy(ifname, iname);
/* If input file exists, return OK. */
==== //depot/projects/gdb/gnu/usr.bin/gzip/unzip.c#3 (text+ko) ====
@@ -14,8 +14,10 @@
*/
#ifdef RCSID
-static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unzip.c,v 1.7 2004/05/02 02:54:37 tjr Exp $";
+static char rcsid[] = "$Id: unzip.c,v 0.13 1993/06/10 13:29:00 jloup Exp $";
#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gzip/unzip.c,v 1.8 2004/05/03 10:33:27 obrien Exp $");
#include "tailor.h"
#include "gzip.h"
==== //depot/projects/gdb/lib/libarchive/archive.h#7 (text+ko) ====
@@ -23,7 +23,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/lib/libarchive/archive.h,v 1.7 2004/04/28 04:41:26 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $
*/
#ifndef ARCHIVE_H_INCLUDED
@@ -58,11 +58,11 @@
* platform-dependent error code.
*/
/* Unrecognized or invalid file format. */
-/* #define ARCHIVE_ERRNO_FILE_FORMAT */
+/* #define ARCHIVE_ERRNO_FILE_FORMAT */
/* Illegal usage of the library. */
-/* #define ARCHIVE_ERRNO_PROGRAMMER_ERROR */
+/* #define ARCHIVE_ERRNO_PROGRAMMER_ERROR */
/* Unknown or unclassified error. */
-/* #define ARCHIVE_ERRNO_MISC */
+/* #define ARCHIVE_ERRNO_MISC */
/*
* Callbacks are invoked to automatically read/write/open/close the archive.
@@ -96,9 +96,9 @@
#define ARCHIVE_FORMAT_BASE_MASK 0xff0000U
#define ARCHIVE_FORMAT_CPIO 0x10000
#define ARCHIVE_FORMAT_CPIO_POSIX (ARCHIVE_FORMAT_CPIO | 1)
-#define ARCHIVE_FORMAT_SHAR 0x20000
-#define ARCHIVE_FORMAT_SHAR_BASE (ARCHIVE_FORMAT_SHAR | 1)
-#define ARCHIVE_FORMAT_SHAR_DUMP (ARCHIVE_FORMAT_SHAR | 2)
+#define ARCHIVE_FORMAT_SHAR 0x20000
+#define ARCHIVE_FORMAT_SHAR_BASE (ARCHIVE_FORMAT_SHAR | 1)
+#define ARCHIVE_FORMAT_SHAR_DUMP (ARCHIVE_FORMAT_SHAR | 2)
#define ARCHIVE_FORMAT_TAR 0x30000
#define ARCHIVE_FORMAT_TAR_USTAR (ARCHIVE_FORMAT_TAR | 1)
#define ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE (ARCHIVE_FORMAT_TAR | 2)
==== //depot/projects/gdb/lib/libarchive/archive_entry.c#12 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.11 2004/05/02 00:38:38 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.12 2004/05/03 01:40:34 kientzle Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -1341,8 +1341,8 @@
#endif
{ NULL, NULL, 0, 0 }
};
-#define longestflaglen 12
-#define nmappings (sizeof(mapping) / sizeof(mapping[0]))
+#define longestflaglen 12
+#define nmappings (sizeof(mapping) / sizeof(mapping[0]))
/*
* fflagstostr --
==== //depot/projects/gdb/lib/libarchive/archive_entry.h#8 (text+ko) ====
@@ -23,7 +23,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/lib/libarchive/archive_entry.h,v 1.7 2004/04/26 23:37:54 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $
*/
#ifndef ARCHIVE_ENTRY_H_INCLUDED
@@ -130,9 +130,9 @@
* "permset"/"perm" abstract type nonsense. A permset is just a simple
* bitmap, following long-standing Unix tradition.
*/
-#define ARCHIVE_ENTRY_ACL_EXECUTE 1
-#define ARCHIVE_ENTRY_ACL_WRITE 2
-#define ARCHIVE_ENTRY_ACL_READ 4
+#define ARCHIVE_ENTRY_ACL_EXECUTE 1
+#define ARCHIVE_ENTRY_ACL_WRITE 2
+#define ARCHIVE_ENTRY_ACL_READ 4
/* We need to be able to specify either or both of these. */
#define ARCHIVE_ENTRY_ACL_TYPE_ACCESS 256
==== //depot/projects/gdb/lib/libarchive/archive_platform.h#8 (text+ko) ====
@@ -23,7 +23,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/lib/libarchive/archive_platform.h,v 1.7 2004/04/21 05:13:42 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $
*/
/*
@@ -48,24 +48,24 @@
#include <inttypes.h> /* For int64_t, etc. */
#if __FreeBSD__ > 4
-#define HAVE_POSIX_ACL 1
+#define HAVE_POSIX_ACL 1
#endif
-#define HAVE_CHFLAGS 1
-#define HAVE_LUTIMES 1
-#define HAVE_LCHMOD 1
-#define HAVE_STRERROR_R 1
-#define ARCHIVE_ERRNO_FILE_FORMAT EFTYPE
-#define ARCHIVE_ERRNO_PROGRAMMER EINVAL
-#define ARCHIVE_ERRNO_MISC (-1)
+#define HAVE_CHFLAGS 1
+#define HAVE_LUTIMES 1
+#define HAVE_LCHMOD 1
+#define HAVE_STRERROR_R 1
+#define ARCHIVE_ERRNO_FILE_FORMAT EFTYPE
+#define ARCHIVE_ERRNO_PROGRAMMER EINVAL
+#define ARCHIVE_ERRNO_MISC (-1)
/* Fetch/set high-resolution time data through a struct stat pointer. */
-#define ARCHIVE_STAT_ATIME_NANOS(st) (st)->st_atimespec.tv_nsec
-#define ARCHIVE_STAT_CTIME_NANOS(st) (st)->st_ctimespec.tv_nsec
-#define ARCHIVE_STAT_MTIME_NANOS(st) (st)->st_mtimespec.tv_nsec
-#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atimespec.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctimespec.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtimespec.tv_nsec = (n)
+#define ARCHIVE_STAT_ATIME_NANOS(st) (st)->st_atimespec.tv_nsec
+#define ARCHIVE_STAT_CTIME_NANOS(st) (st)->st_ctimespec.tv_nsec
+#define ARCHIVE_STAT_MTIME_NANOS(st) (st)->st_mtimespec.tv_nsec
+#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atimespec.tv_nsec = (n)
+#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctimespec.tv_nsec = (n)
+#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtimespec.tv_nsec = (n)
/*
* Older versions of inttypes.h don't have INT64_MAX, etc. Since
@@ -76,11 +76,11 @@
#ifndef INT64_MAX
/* XXX Is this really necessary? XXX */
#ifdef __i386__
-#define INT64_MAX 0x7fffffffffffffffLL
-#define UINT64_MAX 0xffffffffffffffffULL
+#define INT64_MAX 0x7fffffffffffffffLL
+#define UINT64_MAX 0xffffffffffffffffULL
#else /* __alpha__ */
-#define INT64_MAX 0x7fffffffffffffffL
-#define UINT64_MAX 0xffffffffffffffffUL
+#define INT64_MAX 0x7fffffffffffffffL
+#define UINT64_MAX 0xffffffffffffffffUL
#endif
#endif /* ! INT64_MAX */
@@ -88,35 +88,35 @@
/* No non-FreeBSD platform will have __FBSDID, so just define it here. */
#ifndef __FreeBSD__
-#define __FBSDID(a) /* null */
+#define __FBSDID(a) /* null */
#endif
/* Linux */
#ifdef LINUX
-#define _FILE_OFFSET_BITS 64 /* Needed for 64-bit file size handling. */
+#define _FILE_OFFSET_BITS 64 /* Needed for 64-bit file size handling. */
#include <inttypes.h>
-#define ARCHIVE_ERRNO_FILE_FORMAT EILSEQ
-#define ARCHIVE_ERRNO_PROGRAMMER EINVAL
-#define ARCHIVE_ERRNO_MISC (-1)
-#define HAVE_STRERROR_R 1
-#define STRERROR_R_CHAR_P 1
+#define ARCHIVE_ERRNO_FILE_FORMAT EILSEQ
+#define ARCHIVE_ERRNO_PROGRAMMER EINVAL
+#define ARCHIVE_ERRNO_MISC (-1)
+#define HAVE_STRERROR_R 1
+#define STRERROR_R_CHAR_P 1
#ifdef HAVE_STRUCT_STAT_TIMESPEC
/* Fetch the nanosecond portion of the timestamp from a struct stat pointer. */
-#define ARCHIVE_STAT_ATIME_NANOS(pstat) (pstat)->st_atim.tv_nsec
-#define ARCHIVE_STAT_CTIME_NANOS(pstat) (pstat)->st_ctim.tv_nsec
-#define ARCHIVE_STAT_MTIME_NANOS(pstat) (pstat)->st_mtim.tv_nsec
-#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atim.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctim.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtim.tv_nsec = (n)
+#define ARCHIVE_STAT_ATIME_NANOS(pstat) (pstat)->st_atim.tv_nsec
+#define ARCHIVE_STAT_CTIME_NANOS(pstat) (pstat)->st_ctim.tv_nsec
+#define ARCHIVE_STAT_MTIME_NANOS(pstat) (pstat)->st_mtim.tv_nsec
+#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atim.tv_nsec = (n)
+#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctim.tv_nsec = (n)
+#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtim.tv_nsec = (n)
#else
/* High-res timestamps aren't available, so just use stubs here. */
-#define ARCHIVE_STAT_ATIME_NANOS(pstat) 0
-#define ARCHIVE_STAT_CTIME_NANOS(pstat) 0
-#define ARCHIVE_STAT_MTIME_NANOS(pstat) 0
-#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n)
-#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n)
-#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n)
+#define ARCHIVE_STAT_ATIME_NANOS(pstat) 0
+#define ARCHIVE_STAT_CTIME_NANOS(pstat) 0
+#define ARCHIVE_STAT_MTIME_NANOS(pstat) 0
+#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n)
+#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n)
+#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n)
#endif
#endif
==== //depot/projects/gdb/lib/libarchive/archive_private.h#8 (text+ko) ====
@@ -23,7 +23,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/lib/libarchive/archive_private.h,v 1.7 2004/04/28 04:41:26 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $
*/
#ifndef ARCHIVE_PRIVATE_H_INCLUDED
@@ -209,7 +209,7 @@
#define ARCHIVE_STATE_NEW 1U
#define ARCHIVE_STATE_HEADER 2U
#define ARCHIVE_STATE_DATA 4U
-#define ARCHIVE_STATE_EOF 8U
+#define ARCHIVE_STATE_EOF 8U
#define ARCHIVE_STATE_CLOSED 0x10U
#define ARCHIVE_STATE_FATAL 0x8000U
@@ -231,6 +231,6 @@
int (*bid)(const void *, size_t),
int (*init)(struct archive *, const void *, size_t));
-#define err_combine(a,b) ((a) < (b) ? (a) : (b))
+#define err_combine(a,b) ((a) < (b) ? (a) : (b))
#endif
==== //depot/projects/gdb/lib/libarchive/archive_read_support_format_cpio.c#8 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.8 2004/04/28 03:44:08 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.9 2004/05/03 01:40:34 kientzle Exp $");
#include <sys/stat.h>
@@ -94,7 +94,7 @@
char *name;
};
-#define CPIO_MAGIC 0x13141516
+#define CPIO_MAGIC 0x13141516
struct cpio {
int magic;
int (*read_header)(struct archive *, struct stat *,
==== //depot/projects/gdb/lib/libarchive/archive_string.h#3 (text+ko) ====
@@ -23,7 +23,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/lib/libarchive/archive_string.h,v 1.2 2004/03/19 22:37:06 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_string.h,v 1.3 2004/05/03 01:40:34 kientzle Exp $
*
*/
@@ -51,7 +51,7 @@
};
/* Initialize an archive_string object on the stack or elsewhere. */
-#define archive_string_init(a) \
+#define archive_string_init(a) \
do { (a)->s = NULL; (a)->length = 0; (a)->buffer_length = 0; } while(0)
/* Append a C char to an archive_string, resizing as necessary. */
@@ -102,11 +102,11 @@
/* Like 'vsprintf', but resizes the underlying string as necessary. */
void __archive_string_vsprintf(struct archive_string *, const char *,
va_list);
-#define archive_string_vsprintf __archive_string_vsprintf
+#define archive_string_vsprintf __archive_string_vsprintf
/* Like 'sprintf', but resizes the underlying string as necessary. */
void __archive_string_sprintf(struct archive_string *, const char *, ...);
-#define archive_string_sprintf __archive_string_sprintf
+#define archive_string_sprintf __archive_string_sprintf
#endif
==== //depot/projects/gdb/sbin/Makefile#7 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.5 (Berkeley) 3/31/94
-# $FreeBSD: src/sbin/Makefile,v 1.138 2004/05/01 18:17:23 marcel Exp $
+# $FreeBSD: src/sbin/Makefile,v 1.139 2004/05/03 21:14:03 pjd Exp $
# XXX MISSING: icheck ncheck
@@ -30,6 +30,7 @@
fsirand \
gbde \
gconcat \
+ ggate \
${_gpt} \
growfs \
ifconfig \
==== //depot/projects/gdb/sbin/gconcat/Makefile#3 (text+ko) ====
@@ -1,10 +1,9 @@
-# $FreeBSD: src/sbin/gconcat/Makefile,v 1.3 2004/02/24 03:46:12 bde Exp $
+# $FreeBSD: src/sbin/gconcat/Makefile,v 1.4 2004/05/03 07:20:27 pjd Exp $
PROG= gconcat
MAN= gconcat.8
DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML}
LDADD= -lgeom -lsbuf -lbsdxml
WARNS?= 6
-CFLAGS+=-I${.CURDIR}/../../sys
.include <bsd.prog.mk>
==== //depot/projects/gdb/sbin/ggate/ggatec/Makefile#2 (text+ko) ====
@@ -1,6 +1,6 @@
-# $FreeBSD: src/sbin/ggate/ggatec/Makefile,v 1.1 2004/04/30 16:18:01 pjd Exp $
+# $FreeBSD: src/sbin/ggate/ggatec/Makefile,v 1.2 2004/05/03 07:21:59 pjd Exp $
-.PATH: ../shared
+.PATH: ${.CURDIR}/../shared
BINDIR= /sbin
PROG= ggatec
@@ -9,7 +9,7 @@
DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML}
LDADD= -lgeom -lsbuf -lbsdxml
WARNS= 6
-CFLAGS+=-I../shared
+CFLAGS+=-I${.CURDIR}/../shared
CFLAGS+=-DLIBGEOM
.include <bsd.prog.mk>
==== //depot/projects/gdb/sbin/ggate/ggatec/ggatec.8#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/ggate/ggatec/ggatec.8,v 1.1 2004/04/30 16:18:01 pjd Exp $
+.\" $FreeBSD: src/sbin/ggate/ggatec/ggatec.8,v 1.2 2004/05/03 21:31:19 pjd Exp $
.\"
.Dd April 26, 2004
.Dt GGATEC 8
@@ -157,7 +157,7 @@
client RO /dev/acd0
server# ggated
-client# ggatec -o ro server /dev/acd0
+client# ggatec create -o ro server /dev/acd0
ggate0
client# mount_cd9660 /dev/ggate0 /cdrom
.Ed
==== //depot/projects/gdb/sbin/ggate/ggatec/ggatec.c#3 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sbin/ggate/ggatec/ggatec.c,v 1.2 2004/05/02 17:59:49 pjd Exp $
+ * $FreeBSD: src/sbin/ggate/ggatec/ggatec.c,v 1.3 2004/05/03 18:24:41 pjd Exp $
*/
#include <stdio.h>
@@ -289,15 +289,15 @@
for (;;) {
int error;
+ error = serve(sfd);
+ close(sfd);
+ if (error != EAGAIN)
+ g_gate_xlog("%s.", strerror(error));
sfd = handshake();
if (sfd < 0) {
sleep(2);
continue;
}
- error = serve(sfd);
- close(sfd);
- if (error != EAGAIN)
- g_gate_xlog("%s.", strerror(error));
}
}
==== //depot/projects/gdb/sbin/ggate/ggated/Makefile#2 (text+ko) ====
@@ -1,12 +1,12 @@
-# $FreeBSD: src/sbin/ggate/ggated/Makefile,v 1.1 2004/04/30 16:19:50 pjd Exp $
+# $FreeBSD: src/sbin/ggate/ggated/Makefile,v 1.2 2004/05/03 07:21:59 pjd Exp $
-.PATH: ../shared
+.PATH: ${.CURDIR}/../shared
BINDIR= /sbin
PROG= ggated
SRCS= ggated.c ggate.c
MAN= ggated.8
WARNS= 6
-CFLAGS+=-I../shared
+CFLAGS+=-I${.CURDIR}/../shared
.include <bsd.prog.mk>
==== //depot/projects/gdb/sbin/ggate/ggated/ggated.c#3 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sbin/ggate/ggated/ggated.c,v 1.2 2004/05/02 17:59:49 pjd Exp $
+ * $FreeBSD: src/sbin/ggate/ggated/ggated.c,v 1.3 2004/05/04 07:08:04 bde Exp $
*/
#include <stdio.h>
@@ -37,6 +37,7 @@
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
+#include <sys/time.h>
#include <sys/disk.h>
#include <sys/bio.h>
#include <netinet/in.h>
==== //depot/projects/gdb/sbin/ggate/ggatel/Makefile#2 (text+ko) ====
@@ -1,6 +1,6 @@
-# $FreeBSD: src/sbin/ggate/ggatel/Makefile,v 1.1 2004/04/30 16:15:13 pjd Exp $
+# $FreeBSD: src/sbin/ggate/ggatel/Makefile,v 1.2 2004/05/03 07:21:59 pjd Exp $
-.PATH: ../shared
+.PATH: ${.CURDIR}/../shared
BINDIR= /sbin
PROG= ggatel
@@ -9,7 +9,7 @@
DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML}
LDADD= -lgeom -lsbuf -lbsdxml
WARNS= 6
-CFLAGS+=-I../shared
+CFLAGS+=-I${.CURDIR}/../shared
CFLAGS+=-DLIBGEOM
.include <bsd.prog.mk>
==== //depot/projects/gdb/sbin/ggate/ggatel/ggatel.8#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/ggate/ggatel/ggatel.8,v 1.1 2004/04/30 16:15:13 pjd Exp $
+.\" $FreeBSD: src/sbin/ggate/ggatel/ggatel.8,v 1.2 2004/05/03 21:29:22 pjd Exp $
.\"
.Dd April 26, 2004
.Dt GGATEL 8
@@ -131,7 +131,7 @@
to encrypt data on a floppy.
.Pp
.Bd -literal -offset indent
-ggatel -u 5 /dev/fd0
+ggatel create -u 5 /dev/fd0
gbde init /dev/ggate5
gbde attach ggate5
newfs /dev/ggate5.bde
@@ -139,6 +139,7 @@
cp /private/foo /secret/
umount /secret
gbde detach ggate5
+ggatel destroy -u 5
.Ed
.Pp
.Sh DIAGNOSTICS
==== //depot/projects/gdb/sbin/route/route.c#5 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/route/route.c,v 1.73 2004/04/30 22:34:12 ambrisko Exp $";
+ "$FreeBSD: src/sbin/route/route.c,v 1.74 2004/05/03 16:30:32 andre Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -1318,6 +1318,7 @@
struct ifma_msghdr *ifmam;
#endif
struct if_announcemsghdr *ifan;
+ char *state;
if (verbose == 0)
return;
@@ -1334,7 +1335,19 @@
switch (rtm->rtm_type) {
case RTM_IFINFO:
ifm = (struct if_msghdr *)rtm;
- (void) printf("if# %d, flags:", ifm->ifm_index);
+ (void) printf("if# %d, ", ifm->ifm_index);
+ switch (ifm->ifm_data.ifi_link_state) {
+ case LINK_STATE_DOWN:
+ state = "down";
+ break;
+ case LINK_STATE_UP:
+ state = "up";
+ break;
+ default:
+ state = "unknown";
+ break;
+ }
+ (void) printf("link: %s, flags:", state);
bprintf(stdout, ifm->ifm_flags, ifnetflags);
pmsg_addrs((char *)(ifm + 1), ifm->ifm_addrs);
break;
==== //depot/projects/gdb/sbin/sunlabel/sunlabel.c#2 (text+ko) ====
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/sunlabel/sunlabel.c,v 1.7 2003/10/30 15:04:37 harti Exp $");
+__FBSDID("$FreeBSD: src/sbin/sunlabel/sunlabel.c,v 1.8 2004/05/04 09:50:41 joerg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -75,6 +75,7 @@
#include <sys/sun_disklabel.h>
#include <sys/wait.h>
+#include <ctype.h>
#include <err.h>
#include <fcntl.h>
#include <inttypes.h>
@@ -459,6 +460,7 @@
char offset[32];
char size[32];
char buf[128];
+ char *bp;
uint8_t part;
FILE *fp;
int line;
@@ -468,13 +470,28 @@
err(1, "fopen");
bzero(sl->sl_part, sizeof(sl->sl_part));
while (fgets(buf, sizeof(buf), fp) != NULL) {
- if (buf[0] != ' ' || buf[1] != ' ')
+ /*
+ * In order to recognize a partition entry, we search
+ * for lines starting with a single letter followed by
+ * a colon as their first non-white characters. We
+ * silently ignore any other lines, so any comment etc.
+ * lines in the label template will be ignored.
+ *
+ * XXX We should probably also recognize the geometry
+ * fields on top, and allow changing the geometry
+ * emulated by this disk.
+ */
+ for (bp = buf; isspace(*bp); bp++)
+ ;
+ if (strlen(bp) < 2 || bp[1] != ':') {
+ line++;
continue;
- if (sscanf(buf, " %c: %s %s\n", &part, size, offset) != 3 ||
+ }
+ if (sscanf(bp, "%c: %s %s\n", &part, size, offset) != 3 ||
parse_size(sl, part - 'a', size) ||
parse_offset(sl, part - 'a', offset)) {
- warnx("%s: syntex error on line %d",
- file, line);
+ warnx("%s: syntax error on line %d",
+ file, line + 1);
fclose(fp);
return (1);
}
==== //depot/projects/gdb/share/examples/cvsup/cvs-supfile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.41 2004/02/23 19:07:47 marcus Exp $
+# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.42 2004/05/04 20:03:50 josef Exp $
#
# This file contains all of the "CVSup collections" that make up the
# CVS development tree of the FreeBSD system.
@@ -176,6 +176,12 @@
# collections,
doc-all
+## Website
+#
+# This collection retrieves the www tree of the FreeBSD
+# repository
+www
+
## CVSROOT control files
#
# This is to get the control files that cvs(1) needs and the commit logs.
==== //depot/projects/gdb/share/man/man4/atapicam.4#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2002
+.\" Copyright (c) 2002, 2004
.\" Thomas Quinot <thomas@FreeBSD.org>. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
.\" 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/atapicam.4,v 1.3 2002/12/10 14:21:55 ru Exp $
+.\" $FreeBSD: src/share/man/man4/atapicam.4,v 1.4 2004/05/03 12:03:15 thomas Exp $
.\"
.Dd October 23, 2002
.Dt ATAPICAM 4
@@ -75,6 +75,7 @@
information.
.Sh EXAMPLES
.Bd -literal -offset indent
+device ata
device atapicam
device scbus
device cd
@@ -89,7 +90,7 @@
.Pp
Print the list of all devices available through CAM.
.Pp
-.Dl "mount -t cd9660 /dev/cd0c /mnt"
+.Dl "mount -t cd9660 /dev/cd0 /mnt"
.Pp
Mount a CD-ROM from an ATAPI CD-ROM drive
(the command above assumes that the ATAPI drive is the only CD-ROM unit).
==== //depot/projects/gdb/share/man/man4/rl.4#2 (text+ko) ====
@@ -28,7 +28,7 @@
.\" 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/rl.4,v 1.33 2003/11/08 17:31:49 bmah Exp $
+.\" $FreeBSD: src/share/man/man4/rl.4,v 1.34 2004/05/03 09:54:51 sanpei Exp $
.\"
.Dd November 4, 1998
.Dt RL 4
@@ -56,6 +56,8 @@
.It
Belkin F5D5000
.It
+BUFFALO(Melco INC.) LPC-CB-CLX(CardBus)
+.It
Compaq HNE-300
.It
CompUSA no-name 10/100 PCI Ethernet NIC
==== //depot/projects/gdb/share/man/man4/sio.4#3 (text+ko) ====
@@ -34,7 +34,7 @@
.\"
.\" from: @(#)dca.4 5.2 (Berkeley) 3/27/91
.\" from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp
-.\" $FreeBSD: src/share/man/man4/sio.4,v 1.51 2004/04/30 21:16:52 ambrisko Exp $
+.\" $FreeBSD: src/share/man/man4/sio.4,v 1.52 2004/05/03 22:35:27 ambrisko Exp $
.\"
.Dd July 10, 2002
.Dt SIO 4
@@ -178,8 +178,6 @@
PPS timestamping on CTS instead of DCD
.It 0x20000
device is assumed to use a 16650A-type (extended FIFO) chip
-.It 0x400000
-If no comconsole found then mark as a comconsole
.El
.Pp
Minor numbering:
==== //depot/projects/gdb/share/man/man9/mbuf.9#6 (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/man9/mbuf.9,v 1.46 2004/04/28 14:53:49 maxim Exp $
+.\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.47 2004/05/04 14:53:34 maxim Exp $
.\"
.Dd October 17, 2000
.Dt MBUF 9
@@ -77,6 +77,8 @@
.Ft struct mbuf *
.Fn m_getm "struct mbuf *orig" "int len" "int how" "int type"
.Ft struct mbuf *
+.Fn m_getcl "int how" "short type" "int flags"
+.Ft struct mbuf *
.Fn m_getclr "int how" "int type"
.Ft struct mbuf *
.Fn m_gethdr "int how" "int type"
@@ -530,6 +532,21 @@
A function version of
.Fn MGETHDR
for non-critical paths.
+.It Fn m_getcl how type flags
+Fetch an
+.Vt mbuf
+with a
+.Vt mbuf cluster
+attached to it.
+If one of the allocations fails, the entire allocation fails.
+This routine is the preferred way of fetching both the
+.Vt mbuf
+and
+.Vt mbuf cluster
+together, as it avoids having to unlock/relock between allocations.
+Returns
+.Dv NULL
+on failure.
.It Fn m_getclr how type
Allocate an
.Vt mbuf
==== //depot/projects/gdb/share/misc/bsd-family-tree#3 (text+ko) ====
@@ -164,7 +164,7 @@
| | | | | |
| v | | NetBSD 1.6.2 |
| | | | |
- | | | v |
+ | | | v OpenBSD 3.5
FreeBSD 5.0 | | |
| | | |
FreeBSD 5.1 | NetBSD -current OpenBSD -current
@@ -395,7 +395,8 @@
OpenBSD 3.4 2003-11-01 [OBD]
FreeBSD 5.2 2004-01-12 [FBD]
FreeBSD 5.2.1 2004-02-22 [FBD] (patch release)
-NetBSD 1.6.2 2004-03-01 [NBD]
+NetBSD 1.6.2 2004-03-01 [NBD] (patch release)
+OpenBSD 3.5 2004-04-01 [OBD]
Bibliography
------------------------
@@ -452,4 +453,4 @@
Copyright (c) 1997-2004 Wolfram Schneider <wosch@FreeBSD.ORG>
URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree
-$FreeBSD: src/share/misc/bsd-family-tree,v 1.79 2004/03/07 16:44:10 wosch Exp $
+$FreeBSD: src/share/misc/bsd-family-tree,v 1.80 2004/05/03 08:19:45 maxim Exp $
==== //depot/projects/gdb/sys/arm/include/_types.h#3 (text+ko) ====
@@ -33,7 +33,7 @@
*
* From: @(#)ansi.h 8.2 (Berkeley) 1/4/94
* From: @(#)types.h 8.3 (Berkeley) 1/5/94
- * $FreeBSD: src/sys/arm/include/_types.h,v 1.4 2004/03/20 20:41:39 marcel Exp $
+ * $FreeBSD: src/sys/arm/include/_types.h,v 1.5 2004/05/04 22:16:29 cognet Exp $
*/
#ifndef _MACHINE__TYPES_H_
@@ -65,6 +65,8 @@
typedef __uint32_t __clock_t; /* clock()... */
typedef unsigned int __cpumask_t;
typedef __int32_t __critical_t;
+typedef double __double_t;
+typedef double __float_t;
typedef __int32_t __intfptr_t;
typedef __int64_t __intmax_t;
typedef __int32_t __intptr_t;
==== //depot/projects/gdb/sys/arm/include/elf.h#2 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/include/elf.h,v 1.4 2003/09/25 01:10:23 peter Exp $
+ * $FreeBSD: src/sys/arm/include/elf.h,v 1.5 2004/05/04 22:21:36 cognet Exp $
*/
#ifndef _MACHINE_ELF_H_
@@ -40,6 +40,17 @@
#define __ELF_WORD_SIZE 32 /* Used by <sys/elf_generic.h> */
#include <sys/elf_generic.h>
+typedef struct { /* Auxiliary vector entry on initial stack */
+ int a_type; /* Entry type. */
+ union {
+ long a_val; /* Integer value. */
+ void *a_ptr; /* Address. */
+ void (*a_fcn)(void); /* Function pointer (not used). */
+ } a_un;
+} Elf32_Auxinfo;
+
+__ElfType(Auxinfo);
+
#define ELF_ARCH EM_ARM
#define ELF_MACHINE_OK(x) ((x) == EM_ARM)
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Tue May 4 20:02:46 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CF9AF16A4D0; Tue, 4 May 2004 20:02:45 -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 8A83616A4CE
for <perforce@freebsd.org>; Tue, 4 May 2004 20:02:45 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 6161A43D39
for <perforce@freebsd.org>; Tue, 4 May 2004 20:02:45 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i4532jGe072154
for <perforce@freebsd.org>; Tue, 4 May 2004 20:02:45 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i4532jsp072151
for perforce@freebsd.org; Tue, 4 May 2004 20:02:45 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Date: Tue, 4 May 2004 20:02:45 -0700 (PDT)
Message-Id: <200405050302.i4532jsp072151@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52268 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: Wed, 05 May 2004 03:02:46 -0000
http://perforce.freebsd.org/chv.cgi?CH=52268
Change 52268 by marcel@marcel_nfs on 2004/05/04 20:01:57
IFC @52266
Affected files ...
.. //depot/projects/gdb/sys/ia64/ia64/trap.c#7 integrate
Differences ...
==== //depot/projects/gdb/sys/ia64/ia64/trap.c#7 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.97 2004/01/20 03:29:24 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.98 2004/05/03 04:13:31 marcel Exp $");
#include "opt_ddb.h"
#include "opt_ktrace.h"
@@ -670,11 +670,10 @@
FPSWA_BUNDLE bundle;
char *ip;
- /* Always fatal in kernel. Should never happen. */
- if (!user)
- trap_panic(vector, tf);
+ if (fpswa_interface == NULL) {
+ if (!user)
+ trap_panic(vector, tf);
- if (fpswa_interface == NULL) {
sig = SIGFPE;
ucode = 0;
break;
@@ -684,12 +683,15 @@
if (vector == IA64_VEC_FLOATING_POINT_TRAP &&
(tf->tf_special.psr & IA64_PSR_RI) == 0)
ip -= 16;
- error = copyin(ip, &bundle, 16);
- if (error) {
- sig = SIGBUS; /* EFAULT, basically */
- ucode = 0; /* exception summary */
- break;
- }
+ if (user) {
+ error = copyin(ip, &bundle, 16);
+ if (error) {
+ sig = SIGBUS; /* EFAULT, basically */
+ ucode = 0; /* exception summary */
+ break;
+ }
+ } else
+ bcopy(ip, &bundle, 16);
/* f6-f15 are saved in exception_save */
fp_state.bitmask_low64 = 0xffc0; /* bits 6 - 15 */
@@ -741,11 +743,12 @@
printf("FATAL: FPSWA err1 %lx, err2 %lx, err3 %lx\n",
fpswa_ret.err1, fpswa_ret.err2, fpswa_ret.err3);
panic("fpswa fatal error on fp fault");
- } else {
+ } else if (user) {
sig = SIGFPE;
ucode = 0; /* XXX exception summary */
break;
- }
+ } else
+ goto out;
}
case IA64_VEC_IA32_EXCEPTION:
From owner-p4-projects@FreeBSD.ORG Wed May 5 05:51:53 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CD6CC16A4D1; Wed, 5 May 2004 05:51:52 -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 A0CD916A4CE
for <perforce@freebsd.org>; Wed, 5 May 2004 05:51:52 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 8E67443D64
for <perforce@freebsd.org>; Wed, 5 May 2004 05:51:52 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i45CpqGe019544
for <perforce@freebsd.org>; Wed, 5 May 2004 05:51:52 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i45CppCj019538
for perforce@freebsd.org; Wed, 5 May 2004 05:51:51 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Date: Wed, 5 May 2004 05:51:51 -0700 (PDT)
Message-Id: <200405051251.i45CppCj019538@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52290 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: Wed, 05 May 2004 12:51:53 -0000
http://perforce.freebsd.org/chv.cgi?CH=52290
Change 52290 by areisse@areisse_ibook on 2004/05/05 05:50:52
Fix panic when attempting to write to a readonly directory.
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/vfs/vfs_vnops.c#3 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/vfs/vfs_vnops.c#3 (text+ko) ====
@@ -149,7 +149,11 @@
#ifdef MAC
error = mac_check_vnode_create(cred, ndp->ni_dvp,
&ndp->ni_cnd, vap);
- if (error == 0)
+ if (error) {
+ vput(ndp->ni_dvp);
+ remove_name (nameptr);
+ return error;
+ }
#endif
if (error = VOP_CREATE(ndp->ni_dvp, &ndp->ni_vp,
&ndp->ni_cnd, vap)) {
From owner-p4-projects@FreeBSD.ORG Wed May 5 06:16:25 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 192AC16A4D0; Wed, 5 May 2004 06:16:25 -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 E42C116A4CE
for <perforce@freebsd.org>; Wed, 5 May 2004 06:16:24 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id D16A443D1D
for <perforce@freebsd.org>; Wed, 5 May 2004 06:16:24 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i45DGOGe025663
for <perforce@freebsd.org>; Wed, 5 May 2004 06:16:24 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i45DGOju025660
for perforce@freebsd.org; Wed, 5 May 2004 06:16:24 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Date: Wed, 5 May 2004 06:16:24 -0700 (PDT)
Message-Id: <200405051316.i45DGOju025660@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52293 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: Wed, 05 May 2004 13:16:25 -0000
http://perforce.freebsd.org/chv.cgi?CH=52293
Change 52293 by areisse@areisse_ibook on 2004/05/05 06:15:37
mac check returned backwards values from cansignal.
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/kern/kern_sig.c#3 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/kern/kern_sig.c#3 (text+ko) ====
@@ -208,11 +208,9 @@
struct proc *q;
int signum;
{
- int error;
-
#ifdef MAC
- if ((error = mac_check_proc_signal(pc->pc_ucred, q, signum)))
- return (error);
+ if (0 != mac_check_proc_signal(pc->pc_ucred, q, signum))
+ return 0;
#endif
/* you can signal yourself */
From owner-p4-projects@FreeBSD.ORG Wed May 5 07:50:23 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 50FA916A4D0; Wed, 5 May 2004 07:50:23 -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 0D43316A4CE
for <perforce@freebsd.org>; Wed, 5 May 2004 07:50:23 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id E41CE43D41
for <perforce@freebsd.org>; Wed, 5 May 2004 07:50:22 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i45EoMGe045764
for <perforce@freebsd.org>; Wed, 5 May 2004 07:50:22 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i45EoLNq045758
for perforce@freebsd.org; Wed, 5 May 2004 07:50:21 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Date: Wed, 5 May 2004 07:50:21 -0700 (PDT)
Message-Id: <200405051450.i45EoLNq045758@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52298 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: Wed, 05 May 2004 14:50:23 -0000
http://perforce.freebsd.org/chv.cgi?CH=52298
Change 52298 by areisse@areisse_ibook on 2004/05/05 07:49:42
test some more hooks
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/policy/rules#2 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/policy/rules#2 (text+ko) ====
@@ -1,6 +1,7 @@
attribute domain;
attribute domain2;
attribute file;
+attribute xfile;
attribute fs;
attribute names;
@@ -15,6 +16,7 @@
type login_d, domain, domain2;
type user_d, domain, domain2;
type user_secret_d, domain, domain2;
+type protected_d, domain2;
type sysadm_d, domain, domain2;
type kernel_d, domain, domain2;
type security_t;
@@ -29,7 +31,8 @@
type zero_device_t;
type console_device_t;
type random_device_t;
-type secret_t;
+type secret_t, xfile;
+type readonly_t, xfile;
type user_port_t;
type time_port_t;
@@ -88,6 +91,7 @@
role object_r types secret_t;
role user_r types user_d;
role user_r types user_port_t;
+role user_r types protected_d;
role user_secret_r types user_secret_d;
role sysadm_r types sysadm_d;
@@ -96,6 +100,7 @@
allow system_r sysadm_r;
allow file fs:filesystem associate;
+allow xfile fs:filesystem associate;
#allow init_d { bin_t shell_exec_t file_t }:dir_file_class_set rw_file_perms;
#allow init_d bin_t:file execute_no_trans;
@@ -111,12 +116,12 @@
type_change user_d devpts_t:chr_file user_devpts_t;
-allow domain self:mach_port { send make_send copy_send move_recv };
-allow domain kernel_d:mach_port { send make_send copy_send };
-allow domain self:mach_task set_special_port;
-allow domain self:mach_names { look_up };
-allow domain root_t:dir { search getattr read };
-allow kernel_d domain:mach_port { send make_send copy_send };
+allow domain2 self:mach_port { send make_send copy_send move_recv };
+allow domain2 kernel_d:mach_port { send make_send copy_send };
+allow domain2 self:mach_task set_special_port;
+allow domain2 self:mach_names { look_up };
+allow domain2 root_t:dir { search getattr read };
+allow kernel_d domain2:mach_port { send make_send copy_send };
allow domain2 file:{file lnk_file sock_file} {create_file_perms execute };
allow domain2 file:file execute_no_trans;
@@ -126,6 +131,12 @@
allow domain2 {devpts_t user_devpts_t sysadm_devpts_t}:chr_file create_file_perms;
allow domain2 domain:process { signal sigkill setsched getsession };
allow domain2 file:{dir file lnk_file sock_file} { relabelfrom relabelto };
+allow domain2 readonly_t:{dir file lnk_file sock_file} { relabelfrom relabelto r_file_perms };
+allow domain2 readonly_t:dir r_dir_perms;
+allow protected_d self:process { signal sigkill setsched getsession };
+
+domain_trans(user_d,shell_exec_t,protected_d);
+allow user_d security_t:security *;
domain_auto_trans(init_d,windowserver_exec_t,windowserver_d);
domain_auto_trans(systemstarter_d,windowserver_exec_t,windowserver_d);
@@ -189,6 +200,7 @@
allow_mach_ipc(windowserver_d,init_d); # for wsloginui
allow_mach_ipc(windowserver_d,coreservices_d); # for wsloginui
mach_bootstrap_register(windowserver_d,boot_names_t);
+allow windowserver_d init_d:mach_names register;
allow_mach_ipc(loginwindow_d,coreservices_d);
allow_mach_ipc(loginwindow_d,init_d);
@@ -233,6 +245,7 @@
allow_mach_ipc(pbs_d,unlabeled_t);
allow_mach_ipc(user_d,unlabeled_t);
allow_mach_ipc(user_secret_d,unlabeled_t);
+allow_mach_ipc(protected_d,unlabeled_t);
allow_mach_ipc(lookupd_d,unlabeled_t);
allow_mach_ipc(coreservices_d,unlabeled_t);
allow_mach_ipc(windowserver_d,unlabeled_t);
@@ -291,4 +304,5 @@
')
user_sys_access(user_d,user_names_t);
+user_sys_access(protected_d,user_names_t);
user_sys_access(user_secret_d,user_names_t); # can't use other names types yet
From owner-p4-projects@FreeBSD.ORG Wed May 5 08:04:41 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0172116A4D0; Wed, 5 May 2004 08:04:41 -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 CB60C16A4CE
for <perforce@freebsd.org>; Wed, 5 May 2004 08:04:40 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id A29DA43D39
for <perforce@freebsd.org>; Wed, 5 May 2004 08:04:40 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i45F4eGe050599
for <perforce@freebsd.org>; Wed, 5 May 2004 08:04:40 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i45F4eaY050596
for perforce@freebsd.org; Wed, 5 May 2004 08:04:40 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Date: Wed, 5 May 2004 08:04:40 -0700 (PDT)
Message-Id: <200405051504.i45F4eaY050596@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52299 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: Wed, 05 May 2004 15:04:41 -0000
http://perforce.freebsd.org/chv.cgi?CH=52299
Change 52299 by areisse@areisse_ibook on 2004/05/05 08:04:01
add a comment about vop_create releasing vnodes
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/vfs/vfs_vnops.c#4 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/vfs/vfs_vnops.c#4 (text+ko) ====
@@ -157,6 +157,7 @@
#endif
if (error = VOP_CREATE(ndp->ni_dvp, &ndp->ni_vp,
&ndp->ni_cnd, vap)) {
+ /* vop_create does the vput(dvp) for us */
remove_name(nameptr);
return (error);
}
From owner-p4-projects@FreeBSD.ORG Wed May 5 11:19:42 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 976E516A4D0; Wed, 5 May 2004 11:19:42 -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 5184816A4CE
for <perforce@freebsd.org>; Wed, 5 May 2004 11:19:42 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 204F643D62
for <perforce@freebsd.org>; Wed, 5 May 2004 11:19:42 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i45IJfGe098248
for <perforce@freebsd.org>; Wed, 5 May 2004 11:19:41 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i45IJfja098245
for perforce@freebsd.org; Wed, 5 May 2004 11:19:41 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Wed, 5 May 2004 11:19:41 -0700 (PDT)
Message-Id: <200405051819.i45IJfja098245@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52306 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: Wed, 05 May 2004 18:19:43 -0000
http://perforce.freebsd.org/chv.cgi?CH=52306
Change 52306 by cvance@cvance_g5 on 2004/05/05 11:18:40
Remove note about building and installing on the same machine.
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/bootstrap_instructions.txt#5 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/bootstrap_instructions.txt#5 (text+ko) ====
@@ -4,14 +4,10 @@
Step 1: Mac OS X Jaguar 10.3.3
Install Panther from your installation medium. In our environment,
- we typically install 10.3.0, then use Software Update to slide
- forward to 10.3.3. Currently, older releases are not supported.
- The 10.3.3 combined updated is included on the SEDarwin source CD.
-
- The instructions assume that / is the root of the system that
- will have SEdarwin installed. Boot into that partition before
- continuing, so that absolute paths and 'make install' targets
- will be in the right place.
+ we typically install 10.3.0 (the Black Panther CDs), then use
+ Software Update to slide forward to 10.3.3. Currently, older
+ releases are not supported. The 10.3.3 combined updated is included
+ on the SEDarwin source CD.
Enabling sshd (under "Remote Login" in "Sharing" control panel)
will help in recovering systems that boot, but can't login graphically.
From owner-p4-projects@FreeBSD.ORG Wed May 5 12:20:58 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 59E9216A4D1; Wed, 5 May 2004 12:20:58 -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 282C916A4CE
for <perforce@freebsd.org>; Wed, 5 May 2004 12:20:58 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 1186143D2D
for <perforce@freebsd.org>; Wed, 5 May 2004 12:20:58 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i45JKvGe011796
for <perforce@freebsd.org>; Wed, 5 May 2004 12:20:57 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i45JKv3a011793
for perforce@freebsd.org; Wed, 5 May 2004 12:20:57 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Date: Wed, 5 May 2004 12:20:57 -0700 (PDT)
Message-Id: <200405051920.i45JKv3a011793@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52309 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: Wed, 05 May 2004 19:20:58 -0000
http://perforce.freebsd.org/chv.cgi?CH=52309
Change 52309 by areisse@areisse_ibook on 2004/05/05 12:20:57
mac_check_vnode_open passes open flags, not access flags.
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/sebsd/sebsd.c#2 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/sebsd/sebsd.c#2 (text+ko) ====
@@ -48,6 +48,7 @@
#include <sys/systm.h>
#include <sys/vnode.h>
#include <sys/dirent.h>
+#include <sys/fcntl.h>
#ifdef __APPLE__
/*
@@ -1788,8 +1789,15 @@
static int
sebsd_check_vnode_open(struct ucred *cred, struct vnode *vp,
- struct label *filelabel, int acc_mode)
+ struct label *filelabel, int fmode)
{
+ int acc_mode = 0;
+ if (fmode & O_TRUNC)
+ acc_mode |= VWRITE;
+ if (fmode & FWRITE)
+ acc_mode |= VWRITE;
+ if (fmode & FREAD)
+ acc_mode |= VREAD;
if (!acc_mode)
return 0;
From owner-p4-projects@FreeBSD.ORG Wed May 5 18:12:16 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0377716A4D0; Wed, 5 May 2004 18:12:16 -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 CE1A016A4CE
for <perforce@freebsd.org>; Wed, 5 May 2004 18:12:15 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id B732A43D41
for <perforce@freebsd.org>; Wed, 5 May 2004 18:12:15 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i461CFGe004182
for <perforce@freebsd.org>; Wed, 5 May 2004 18:12:15 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i461CFlO004176
for perforce@freebsd.org; Wed, 5 May 2004 18:12:15 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 5 May 2004 18:12:15 -0700 (PDT)
Message-Id: <200405060112.i461CFlO004176@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52328 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: Thu, 06 May 2004 01:12:16 -0000
http://perforce.freebsd.org/chv.cgi?CH=52328
Change 52328 by rwatson@rwatson_paprika on 2004/05/05 18:11:47
Move to using the inpcb for labeling in most situations has been
merged.
Affected files ...
.. //depot/projects/trustedbsd/mac/MERGE#7 edit
Differences ...
==== //depot/projects/trustedbsd/mac/MERGE#7 (text+ko) ====
@@ -16,10 +16,6 @@
NFS client credential fixes.
- Use inpcb in preference to socket as label source where possible
- in netinet. This helps to avoid the need for socket label
- locking in a number of important cases.
-
Consider to merge TODO:
p_canwait().
From owner-p4-projects@FreeBSD.ORG Wed May 5 18:16:21 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 90FCF16A4D1; Wed, 5 May 2004 18:16:21 -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 6A95C16A4CE
for <perforce@freebsd.org>; Wed, 5 May 2004 18:16:21 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 4256943D31
for <perforce@freebsd.org>; Wed, 5 May 2004 18:16:21 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i461GLGe004582
for <perforce@freebsd.org>; Wed, 5 May 2004 18:16:21 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i461GK3s004579
for perforce@freebsd.org; Wed, 5 May 2004 18:16:20 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 5 May 2004 18:16:20 -0700 (PDT)
Message-Id: <200405060116.i461GK3s004579@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52329 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: Thu, 06 May 2004 01:16:22 -0000
http://perforce.freebsd.org/chv.cgi?CH=52329
Change 52329 by rwatson@rwatson_paprika on 2004/05/05 18:15:33
libugidfw(3) rule adding function merged.
Affected files ...
.. //depot/projects/trustedbsd/mac/MERGE#8 edit
Differences ...
==== //depot/projects/trustedbsd/mac/MERGE#8 (text+ko) ====
@@ -34,8 +34,6 @@
mac_prepare changes to support arbitrary objects, /etc/mac.conf changes
- bsd_add_rule in libugidfw
-
setfsmac in /sbin
fsck_ffs ea support
From owner-p4-projects@FreeBSD.ORG Wed May 5 18:19:26 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0484116A4D0; Wed, 5 May 2004 18:19:26 -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 D22D816A4CE
for <perforce@freebsd.org>; Wed, 5 May 2004 18:19:25 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id AB7A543D31
for <perforce@freebsd.org>; Wed, 5 May 2004 18:19:25 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i461JPGe004626
for <perforce@freebsd.org>; Wed, 5 May 2004 18:19:25 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i461JPtY004623
for perforce@freebsd.org; Wed, 5 May 2004 18:19:25 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 5 May 2004 18:19:25 -0700 (PDT)
Message-Id: <200405060119.i461JPtY004623@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52330 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: Thu, 06 May 2004 01:19:26 -0000
http://perforce.freebsd.org/chv.cgi?CH=52330
Change 52330 by rwatson@rwatson_paprika on 2004/05/05 18:18:40
mac_prepare() changes for arbitrary object labeling have been
merged.
Affected files ...
.. //depot/projects/trustedbsd/mac/MERGE#9 edit
Differences ...
==== //depot/projects/trustedbsd/mac/MERGE#9 (text+ko) ====
@@ -32,8 +32,6 @@
FFS resilience improvements for EA support
- mac_prepare changes to support arbitrary objects, /etc/mac.conf changes
-
setfsmac in /sbin
fsck_ffs ea support
From owner-p4-projects@FreeBSD.ORG Wed May 5 18:41:53 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 9EE8416A4D0; Wed, 5 May 2004 18:41:53 -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 7457416A4CE
for <perforce@freebsd.org>; Wed, 5 May 2004 18:41:53 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 5FD1843D39
for <perforce@freebsd.org>; Wed, 5 May 2004 18:41:53 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i461frGe009690
for <perforce@freebsd.org>; Wed, 5 May 2004 18:41:53 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i461fqnX009681
for perforce@freebsd.org; Wed, 5 May 2004 18:41:52 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 5 May 2004 18:41:52 -0700 (PDT)
Message-Id: <200405060141.i461fqnX009681@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52331 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: Thu, 06 May 2004 01:41:54 -0000
http://perforce.freebsd.org/chv.cgi?CH=52331
Change 52331 by rwatson@rwatson_paprika on 2004/05/05 18:41:19
Remove dup items in the MERGE list.
Affected files ...
.. //depot/projects/trustedbsd/mac/MERGE#10 edit
Differences ...
==== //depot/projects/trustedbsd/mac/MERGE#10 (text+ko) ====
@@ -36,8 +36,6 @@
fsck_ffs ea support
- direct exec of rc
-
acl.9 expansions
ls(1) labels without long form
@@ -61,8 +59,6 @@
Build a MAC kernel by default, include in installs/releases.
- setfsmac(8) reference in sbin rather than usr/sbin.
-
SAVESTART flag in kern_exec.c -- is this needed?
missingops?
From owner-p4-projects@FreeBSD.ORG Thu May 6 07:06:04 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 4386116A4D0; Thu, 6 May 2004 07:06:04 -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 1563416A4CE
for <perforce@freebsd.org>; Thu, 6 May 2004 07:06:04 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id DEECC43D2D
for <perforce@freebsd.org>; Thu, 6 May 2004 07:06:03 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i46E63Ge094012
for <perforce@freebsd.org>; Thu, 6 May 2004 07:06:03 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i46E63SJ094008
for perforce@freebsd.org; Thu, 6 May 2004 07:06:03 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Thu, 6 May 2004 07:06:03 -0700 (PDT)
Message-Id: <200405061406.i46E63SJ094008@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52353 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: Thu, 06 May 2004 14:06:04 -0000
http://perforce.freebsd.org/chv.cgi?CH=52353
Change 52353 by cvance@cvance_g5 on 2004/05/06 07:05:40
Add missing makefiles
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/extattr_cmds/extattr/Makefile#1 add
.. //depot/projects/trustedbsd/sedarwin73/extattr_cmds/extattrctl/Makefile#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Thu May 6 11:35:35 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 5A82816A4D0; Thu, 6 May 2004 11:35:35 -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 193B216A4CE
for <perforce@freebsd.org>; Thu, 6 May 2004 11:35:35 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 3243C43D41
for <perforce@freebsd.org>; Thu, 6 May 2004 11:35:34 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i46IZXGe058878
for <perforce@freebsd.org>; Thu, 6 May 2004 11:35:33 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i46IZXnG058875
for perforce@freebsd.org; Thu, 6 May 2004 11:35:33 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Thu, 6 May 2004 11:35:33 -0700 (PDT)
Message-Id: <200405061835.i46IZXnG058875@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52360 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: Thu, 06 May 2004 18:35:36 -0000
http://perforce.freebsd.org/chv.cgi?CH=52360
Change 52360 by cvance@cvance_osx_laptop on 2004/05/06 11:34:52
Update instructions to remove uncertainty about setting the
EXPORT_OWNER variable
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/bootstrap_instructions.txt#6 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/bootstrap_instructions.txt#6 (text+ko) ====
@@ -64,9 +64,9 @@
Finally, in order to override the owner and groups that are set by
system installation tools, set the EXPORT_OWNER variable to the user
- and group of the person building the system. By default, the install
- program will try to chown/chgrp the files to the root:wheel, resulting
- in permission errors (unless you are building as root).
+ and group of the person building the system. If this variable isn't
+ set to a valid user on the build system, the install program will
+ fail.
EXPORT_OWNER = cvance
From owner-p4-projects@FreeBSD.ORG Thu May 6 11:36:36 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 578F516A4D0; Thu, 6 May 2004 11:36:36 -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 326E916A4CE
for <perforce@freebsd.org>; Thu, 6 May 2004 11:36:36 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 1F62343D31
for <perforce@freebsd.org>; Thu, 6 May 2004 11:36:36 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i46IaZGe058898
for <perforce@freebsd.org>; Thu, 6 May 2004 11:36:35 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i46IaZ1E058895
for perforce@freebsd.org; Thu, 6 May 2004 11:36:35 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Thu, 6 May 2004 11:36:35 -0700 (PDT)
Message-Id: <200405061836.i46IaZ1E058895@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52361 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: Thu, 06 May 2004 18:36:37 -0000
http://perforce.freebsd.org/chv.cgi?CH=52361
Change 52361 by cvance@cvance_osx_laptop on 2004/05/06 11:36:09
Remove ambiguity about setting the EXPORT_OWNER variable
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/Makeconfig#5 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/Makeconfig#5 (text+ko) ====
@@ -4,8 +4,7 @@
# Set the following variable to the installation directory
DESTDIR = $(SEDARWIN_ROOT)/export
-# if you aren't going to install as root, you need to set the
-# user and group for /usr/bin/install to use.
+# You must set this variable to a valid user that /usr/bin/install can use.
EXPORT_OWNER= cvance
#
From owner-p4-projects@FreeBSD.ORG Thu May 6 12:05:23 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0287916A4D0; Thu, 6 May 2004 12:05:23 -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 DBF1216A4CF
for <perforce@freebsd.org>; Thu, 6 May 2004 12:05:20 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 7906743D2D
for <perforce@freebsd.org>; Thu, 6 May 2004 12:05:20 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i46J5KGe065930
for <perforce@freebsd.org>; Thu, 6 May 2004 12:05:20 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i46J5K33065915
for perforce@freebsd.org; Thu, 6 May 2004 12:05:20 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Date: Thu, 6 May 2004 12:05:20 -0700 (PDT)
Message-Id: <200405061905.i46J5K33065915@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52363 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: Thu, 06 May 2004 19:05:23 -0000
http://perforce.freebsd.org/chv.cgi?CH=52363
Change 52363 by areisse@areisse_ibook on 2004/05/06 12:04:45
added a readme
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/README#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Thu May 6 12:07:28 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 7A36F16A4D1; Thu, 6 May 2004 12:07:28 -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 5330416A4CE
for <perforce@freebsd.org>; Thu, 6 May 2004 12:07:28 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 99D8443D48
for <perforce@freebsd.org>; Thu, 6 May 2004 12:07:26 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i46J7QGe066122
for <perforce@freebsd.org>; Thu, 6 May 2004 12:07:26 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i46J7QPD066119
for perforce@freebsd.org; Thu, 6 May 2004 12:07:26 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Date: Thu, 6 May 2004 12:07:26 -0700 (PDT)
Message-Id: <200405061907.i46J7QPD066119@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52365 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: Thu, 06 May 2004 19:07:29 -0000
http://perforce.freebsd.org/chv.cgi?CH=52365
Change 52365 by jhb@jhb_slimer on 2004/05/06 12:06:32
Various priority fixups.
Affected files ...
.. //depot/projects/smpng/sys/dev/sio/sio.c#42 edit
.. //depot/projects/smpng/sys/kern/kern_idle.c#19 edit
.. //depot/projects/smpng/sys/notes#14 edit
.. //depot/projects/smpng/sys/pc98/pc98/sio.c#39 edit
.. //depot/projects/smpng/sys/sys/interrupt.h#11 edit
Differences ...
==== //depot/projects/smpng/sys/dev/sio/sio.c#42 (text+ko) ====
@@ -1122,9 +1122,9 @@
printf("\n");
if (sio_fast_ih == NULL) {
- swi_add(&tty_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0,
+ swi_add(&tty_ithd, "sio", siopoll, NULL, SWI_TTY, 0,
&sio_fast_ih);
- swi_add(&clk_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0,
+ swi_add(&clk_ithd, "sio", siopoll, NULL, SWI_CLOCK, 0,
&sio_slow_ih);
}
minorbase = UNIT_TO_MINOR(unit);
==== //depot/projects/smpng/sys/kern/kern_idle.c#19 (text+ko) ====
@@ -60,6 +60,7 @@
td = FIRST_THREAD_IN_PROC(p);
td->td_state = TDS_CAN_RUN;
td->td_flags |= TDF_IDLETD;
+ td->td_priority = PRI_MAX_IDLE;
mtx_unlock_spin(&sched_lock);
PROC_UNLOCK(p);
#ifdef SMP
==== //depot/projects/smpng/sys/notes#14 (text+ko) ====
@@ -1,6 +1,13 @@
This file serves as a sort of todo list for this branch as well as documenting
what patches currently live in this branch.
+- SWI Priorities
+ + SWI_CLOCK
+ + SWI_TQ*
+ + Fix tty hacks on clock to use SWI_CLOCK
+ + sio
+ - cy
+ - cx
- Consolidate linux module version and dependencies into MI location.
- Untested
- Enable a pmap_emulate_reference check for Alpha under INVARIANTS instead
==== //depot/projects/smpng/sys/pc98/pc98/sio.c#39 (text+ko) ====
@@ -1797,7 +1797,7 @@
if (sio_fast_ih == NULL) {
swi_add(&tty_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0,
&sio_fast_ih);
- swi_add(&clk_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0,
+ swi_add(&clk_ithd, "tty:sio", siopoll, NULL, SWI_CLOCK, 0,
&sio_slow_ih);
}
minorbase = UNIT_TO_MINOR(unit);
==== //depot/projects/smpng/sys/sys/interrupt.h#11 (text+ko) ====
@@ -85,19 +85,18 @@
#define SWI_DELAY 0x2
/*
- * Software interrupt bit numbers in priority order. The priority only
- * determines which swi will be dispatched next; a higher priority swi
- * may be dispatched when a nested h/w interrupt handler returns.
+ * Software interrupt numbers in priority order. The priority determines
+ * the priority of the corresponding interrupt thread.
*/
#define SWI_TTY 0
#define SWI_NET 1
#define SWI_CAMNET 2
#define SWI_CAMBIO 3
#define SWI_VM 4
-#define SWI_TQ_FAST 5
+#define SWI_CLOCK 5
+#define SWI_TQ_FAST 6
+#define SWI_TQ 6
#define SWI_TQ_GIANT 6
-#define SWI_TQ 7
-#define SWI_CLOCK 8
extern struct ithd *tty_ithd;
extern struct ithd *clk_ithd;
From owner-p4-projects@FreeBSD.ORG Thu May 6 12:08:30 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id A171416A505; Thu, 6 May 2004 12:08:29 -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 75F5916A4DA
for <perforce@freebsd.org>; Thu, 6 May 2004 12:08:29 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 5621A43D58
for <perforce@freebsd.org>; Thu, 6 May 2004 12:08:29 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i46J8SGe066223
for <perforce@freebsd.org>; Thu, 6 May 2004 12:08:28 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i46J8SnX066220
for perforce@freebsd.org; Thu, 6 May 2004 12:08:28 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Thu, 6 May 2004 12:08:28 -0700 (PDT)
Message-Id: <200405061908.i46J8SnX066220@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52367 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: Thu, 06 May 2004 19:08:30 -0000
http://perforce.freebsd.org/chv.cgi?CH=52367
Change 52367 by cvance@cvance_osx_laptop on 2004/05/06 12:08:24
Fix bug reported by andrew and andy, if you accidently run this
on a non-sedarwin system, bad things will happen (you'll have no
windowserver)
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/install-windowserver.sh#2 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/install-windowserver.sh#2 (text+ko) ====
@@ -2,6 +2,11 @@
cd /System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/
+if [ ! -f WindowServer.sedarwin ]; then
+ echo "SEDarwin is not installed on this system"
+ exit
+fi
+
if [ -f WindowServer.apple ]; then
exit
fi
From owner-p4-projects@FreeBSD.ORG Thu May 6 12:18:42 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 66EC916A4D0; Thu, 6 May 2004 12:18:42 -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 42A7A16A4CE
for <perforce@freebsd.org>; Thu, 6 May 2004 12:18:42 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 1EB8643D39
for <perforce@freebsd.org>; Thu, 6 May 2004 12:18:42 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i46JIfGe068305
for <perforce@freebsd.org>; Thu, 6 May 2004 12:18:41 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i46JIfUN068301
for perforce@freebsd.org; Thu, 6 May 2004 12:18:41 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Date: Thu, 6 May 2004 12:18:41 -0700 (PDT)
Message-Id: <200405061918.i46JIfUN068301@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52368 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: Thu, 06 May 2004 19:18:43 -0000
http://perforce.freebsd.org/chv.cgi?CH=52368
Change 52368 by areisse@areisse_ibook on 2004/05/06 12:17:41
fix some minor things
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/README#2 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/README#2 (text+ko) ====
@@ -8,7 +8,7 @@
This is a port of our original Darwin 6.8 based implementation,
to Darwin version 7.3 (MacOSX 10.3.3). It includes the security framework,
-a test policy module, a mostly SElinux compatible type enforcement
+a test policy module, a port of the SElinux type enforcement
policy module, file labelling tools, and extended attribute tools. Also
included are modified versions of ps and ls for viewing labels.
@@ -18,7 +18,7 @@
adv_cmds-63
bootstrap_cmds-44
-SEdarwin is compatible with Apple MacOSX 10.3.3 build 7F44 systems.
+SEDarwin is compatible with Apple MacOSX 10.3.3 build 7F44 systems.
(To check the build number of a running system, select "About this Mac"
from the apple menu, then click on the "Version 10.3.3" text in the
dialog that appears.)
From owner-p4-projects@FreeBSD.ORG Thu May 6 12:19:44 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 2FF5116A4D1; Thu, 6 May 2004 12:19:44 -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 04C4716A4D0
for <perforce@freebsd.org>; Thu, 6 May 2004 12:19:44 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id DF7BC43D39
for <perforce@freebsd.org>; Thu, 6 May 2004 12:19:43 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i46JJhGe068367
for <perforce@freebsd.org>; Thu, 6 May 2004 12:19:43 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i46JJhkq068364
for perforce@freebsd.org; Thu, 6 May 2004 12:19:43 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Date: Thu, 6 May 2004 12:19:43 -0700 (PDT)
Message-Id: <200405061919.i46JJhkq068364@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52369 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: Thu, 06 May 2004 19:19:44 -0000
http://perforce.freebsd.org/chv.cgi?CH=52369
Change 52369 by jhb@jhb_blue on 2004/05/06 12:19:05
Delete unused cx_slow_ih.
Affected files ...
.. //depot/projects/smpng/sys/dev/cx/if_cx.c#5 edit
Differences ...
==== //depot/projects/smpng/sys/dev/cx/if_cx.c#5 (text+ko) ====
@@ -226,7 +226,6 @@
static swihand_t cx_softintr;
#else
static void cx_softintr (void *);
-static void *cx_slow_ih;
static void *cx_fast_ih;
#endif
static void cx_down (drv_t *d);
@@ -3143,10 +3142,8 @@
#if __FreeBSD_version < 500000
register_swi (SWI_TTY, cx_softintr);
#else
- swi_add(&tty_ithd, "tty:cx", cx_softintr, NULL, SWI_TTY, 0,
+ swi_add(&tty_ithd, "cx", cx_softintr, NULL, SWI_TTY, 0,
&cx_fast_ih);
- swi_add(&clk_ithd, "tty:cx", cx_softintr, NULL, SWI_TTY, 0,
- &cx_slow_ih);
#endif
break;
case MOD_UNLOAD:
@@ -3163,7 +3160,6 @@
untimeout (cx_timeout, 0, timeout_handle);
#if __FreeBSD_version >= 500000
ithread_remove_handler (cx_fast_ih);
- ithread_remove_handler (cx_slow_ih);
#else
unregister_swi (SWI_TTY, cx_softintr);
#endif
From owner-p4-projects@FreeBSD.ORG Thu May 6 12:19:45 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id E03BF16A50F; Thu, 6 May 2004 12:19:44 -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 63BE616A4F2
for <perforce@freebsd.org>; Thu, 6 May 2004 12:19:44 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 4563A43D46
for <perforce@freebsd.org>; Thu, 6 May 2004 12:19:44 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i46JJiGe068374
for <perforce@freebsd.org>; Thu, 6 May 2004 12:19:44 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i46JJhKA068370
for perforce@freebsd.org; Thu, 6 May 2004 12:19:43 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Date: Thu, 6 May 2004 12:19:43 -0700 (PDT)
Message-Id: <200405061919.i46JJhKA068370@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52370 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: Thu, 06 May 2004 19:19:45 -0000
http://perforce.freebsd.org/chv.cgi?CH=52370
Change 52370 by areisse@areisse_ibook on 2004/05/06 12:19:36
removed package list as it's already in the build instructions.
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/README#3 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/README#3 (text+ko) ====
@@ -12,12 +12,6 @@
policy module, file labelling tools, and extended attribute tools. Also
included are modified versions of ps and ls for viewing labels.
-Based on Apple Darwin 7.3:
- xnu-5.17.3.15
- BootX-59.1.1
- adv_cmds-63
- bootstrap_cmds-44
-
SEDarwin is compatible with Apple MacOSX 10.3.3 build 7F44 systems.
(To check the build number of a running system, select "About this Mac"
from the apple menu, then click on the "Version 10.3.3" text in the
From owner-p4-projects@FreeBSD.ORG Thu May 6 12:20:46 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 7863916A4D0; Thu, 6 May 2004 12:20:46 -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 50DDB16A4CE
for <perforce@freebsd.org>; Thu, 6 May 2004 12:20:46 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 3C83B43D2F
for <perforce@freebsd.org>; Thu, 6 May 2004 12:20:46 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i46JKkGe068484
for <perforce@freebsd.org>; Thu, 6 May 2004 12:20:46 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i46JKjMF068481
for perforce@freebsd.org; Thu, 6 May 2004 12:20:45 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Date: Thu, 6 May 2004 12:20:45 -0700 (PDT)
Message-Id: <200405061920.i46JKjMF068481@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52371 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: Thu, 06 May 2004 19:20:47 -0000
http://perforce.freebsd.org/chv.cgi?CH=52371
Change 52371 by jhb@jhb_blue on 2004/05/06 12:19:56
Fixup swi names (shorter is good).
Affected files ...
.. //depot/projects/smpng/sys/pc98/pc98/sio.c#40 edit
Differences ...
==== //depot/projects/smpng/sys/pc98/pc98/sio.c#40 (text+ko) ====
@@ -1795,9 +1795,9 @@
printf("\n");
if (sio_fast_ih == NULL) {
- swi_add(&tty_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0,
+ swi_add(&tty_ithd, "sio", siopoll, NULL, SWI_TTY, 0,
&sio_fast_ih);
- swi_add(&clk_ithd, "tty:sio", siopoll, NULL, SWI_CLOCK, 0,
+ swi_add(&clk_ithd, "sio", siopoll, NULL, SWI_CLOCK, 0,
&sio_slow_ih);
}
minorbase = UNIT_TO_MINOR(unit);
From owner-p4-projects@FreeBSD.ORG Thu May 6 12:35:04 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 5707D16A4D0; Thu, 6 May 2004 12:35:04 -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 31EAC16A4CE
for <perforce@freebsd.org>; Thu, 6 May 2004 12:35:04 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 0B62A43D3F
for <perforce@freebsd.org>; Thu, 6 May 2004 12:35:04 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i46JZ3Ge072722
for <perforce@freebsd.org>; Thu, 6 May 2004 12:35:03 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i46JZ32m072719
for perforce@freebsd.org; Thu, 6 May 2004 12:35:03 -0700 (PDT)
(envelope-from areisse@nailabs.com)
Date: Thu, 6 May 2004 12:35:03 -0700 (PDT)
Message-Id: <200405061935.i46JZ32m072719@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52372 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: Thu, 06 May 2004 19:35:04 -0000
http://perforce.freebsd.org/chv.cgi?CH=52372
Change 52372 by areisse@areisse_ibook on 2004/05/06 12:34:35
clean up usage section
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/README#4 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/README#4 (text+ko) ====
@@ -35,16 +35,20 @@
Usage:
Following the build instructions will yield a system with sedarwin installed,
and the sample TE policy configured. To test some functionality, enable
-enforcing mode (by default, the TE module runs in permissive mode, logging
-access control failures but not enforcing them) and set some file labels:
+enforcing mode by running "sudo nvram kenv_sebsd_enforce=1" from the shell
+(by default, the TE module runs in permissive mode, logging
+access control failures but not enforcing them) and set some file labels.
+TE labels are of the form user:role:type. When passed to or from the
+system, labels begin with the name of the policy module (in this case,
+sebsd). Objects use the object_r "role".
+
$ getpmac
sebsd/andrew:user_r:user_d
-(TE labels are of the form user:role:type. The sebsd/ indicates that the
-label is for the sebsd policy module. Objects use the object_r "role".)
$ touch test_readonly
$ setfmac sebsd/andrew:object_r:readonly_t test_readonly
$ echo > test_readonly
test_readonly: Permission denied
+
$ touch test_secret
$ setfmac sebsd/andrew:object_r:secret_t test_secret
$ cat test_secret
@@ -56,7 +60,9 @@
sebsd/andrew:user_r:protected_d
2$ echo $$
700
-In the original shell,
+Back in the original shell,
+$ getpmac
+sebsd/andrew:user_r:user_d
$ kill 700
-bash: kill (700) - Operation not permitted
$
From owner-p4-projects@FreeBSD.ORG Thu May 6 13:25:06 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id C923316A4D0; Thu, 6 May 2004 13:25:05 -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 87CC416A4CE
for <perforce@freebsd.org>; Thu, 6 May 2004 13:25:05 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 1089943D49
for <perforce@freebsd.org>; Thu, 6 May 2004 13:25:05 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i46KP4Ge090501
for <perforce@freebsd.org>; Thu, 6 May 2004 13:25:04 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i46KP4G9090490
for perforce@freebsd.org; Thu, 6 May 2004 13:25:04 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 6 May 2004 13:25:04 -0700 (PDT)
Message-Id: <200405062025.i46KP4G9090490@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52373 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: Thu, 06 May 2004 20:25:06 -0000
http://perforce.freebsd.org/chv.cgi?CH=52373
Change 52373 by rwatson@rwatson_tislabs on 2004/05/06 13:24:50
Add "Prototype" to name.
List a few more features present in the feature list.
Some reformatting and spell checking.
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/README#5 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/README#5 (text+ko) ====
@@ -1,21 +1,22 @@
-SEDarwin - Security-Enhanced Darwin
+SEDarwin - Security-Enhanced Darwin Prototype
Andrew Reisse (areisse@nailabs.com)
Chris Vance (cvance@nailabs.com)
Robert Watson (rwatson@nailabs.com)
-McAfee Research (division of McAfee Inc.)
+McAfee Research
-This is a port of our original Darwin 6.8 based implementation,
-to Darwin version 7.3 (MacOSX 10.3.3). It includes the security framework,
-a test policy module, a port of the SElinux type enforcement
-policy module, file labelling tools, and extended attribute tools. Also
-included are modified versions of ps and ls for viewing labels.
+This is a port of our original Darwin 6.8 implementation to Darwin version
+7.3 (MacOSX 10.3.3). It includes HFS extended attributes, the MAC
+Framework, a test policy module, a port of the SELinux type enforcement
+policy module, SELinux policy tools, file labeling tools, and extended
+attribute tools. Modified versions of the ls and ps commands capable of
+viewing labels are also included.
-SEDarwin is compatible with Apple MacOSX 10.3.3 build 7F44 systems.
-(To check the build number of a running system, select "About this Mac"
-from the apple menu, then click on the "Version 10.3.3" text in the
-dialog that appears.)
+SEDarwin is compatible with Apple MacOSX 10.3.3 build 7F44 systems. (To
+check the build number of a running system, select "About this Mac" from
+the Apple Menu, then click on the "Version 10.3.3" text in the dialog that
+appears.)
Package Layout:
bootstrap_instructions.txt Instructions for building and installing
@@ -33,14 +34,18 @@
export (created) Location of build results
Usage:
-Following the build instructions will yield a system with sedarwin installed,
-and the sample TE policy configured. To test some functionality, enable
-enforcing mode by running "sudo nvram kenv_sebsd_enforce=1" from the shell
-(by default, the TE module runs in permissive mode, logging
+
+Following the build instructions will yield a system with sedarwin
+installed, and the sample TE policy configured. To test some
+functionality, enable enforcing mode by running:
+
+ sudo nvram kenv_sebsd_enforce=1
+
+from the shell (by default, the TE module runs in permissive mode, logging
access control failures but not enforcing them) and set some file labels.
TE labels are of the form user:role:type. When passed to or from the
-system, labels begin with the name of the policy module (in this case,
-sebsd). Objects use the object_r "role".
+system, labels begin with the name of the policy module (in this case,
+sebsd). Objects use the object_r "role".
$ getpmac
sebsd/andrew:user_r:user_d
From owner-p4-projects@FreeBSD.ORG Thu May 6 13:36:20 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 1CF7416A4D0; Thu, 6 May 2004 13:36:20 -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 D5B6516A4CE
for <perforce@freebsd.org>; Thu, 6 May 2004 13:36:19 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 5046643D2F
for <perforce@freebsd.org>; Thu, 6 May 2004 13:36:19 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i46KaJGe092579
for <perforce@freebsd.org>; Thu, 6 May 2004 13:36:19 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i46KaIbJ092568
for perforce@freebsd.org; Thu, 6 May 2004 13:36:18 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 6 May 2004 13:36:18 -0700 (PDT)
Message-Id: <200405062036.i46KaIbJ092568@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52374 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: Thu, 06 May 2004 20:36:20 -0000
http://perforce.freebsd.org/chv.cgi?CH=52374
Change 52374 by rwatson@rwatson_tislabs on 2004/05/06 13:35:20
Bulletize component list.
Refer to MAC Framework as MAC Framework rather than Security
Framework.
Flesh out some missing yet interesting items in the packing
list.
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/README#6 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/README#6 (text+ko) ====
@@ -7,31 +7,50 @@
McAfee Research
This is a port of our original Darwin 6.8 implementation to Darwin version
-7.3 (MacOSX 10.3.3). It includes HFS extended attributes, the MAC
-Framework, a test policy module, a port of the SELinux type enforcement
-policy module, SELinux policy tools, file labeling tools, and extended
-attribute tools. Modified versions of the ls and ps commands capable of
-viewing labels are also included.
+7.3 (MacOSX 10.3.3). It includes the following modifications relative
+to the Apple Darwin 7.3 release:
+
+- HFS extended attributes
+- A subset of the MAC Framework labeling and protecting files and
+ processes, as well as initial labeling and controls for Mach IPC.
+- A port of the mac_test policy module.
+- A port of the SELinux FLASK and Type Enforcement implementation from
+ FreeBSD as the SEBSD policy module.
+- Ports of the SELinux policy tools.
+- Ports of the TrustedBSD MAC label management tools and extended
+ attribute tools.
+- Modifications to the ls(1) and ps(1) commands to optionally display
+ label information.
-SEDarwin is compatible with Apple MacOSX 10.3.3 build 7F44 systems. (To
-check the build number of a running system, select "About this Mac" from
-the Apple Menu, then click on the "Version 10.3.3" text in the dialog that
-appears.)
+SEDarwin is compatible with Apple MacOSX 10.3.3 build 7F44 systems, and is
+derived from the Darwin 7.3 source code tarballs found on Apple's open
+source web site. (To check the build number of a running system, select
+"About this Mac" from the Apple Menu, then click on the "Version 10.3.3"
+text in the dialog that appears.) Using this source code or resulting
+binaries with another version or build of Darwin may result in a
+non-functional system, data loss, etc.
Package Layout:
+
bootstrap_instructions.txt Instructions for building and installing
Makeconfig Build environment configuration
-apsl/xnu Kernel sources
+Makefile Top level Makefile to build system
+export (created) Location of build results
+
+apsl/file_cmds File commands, including modified ls(1)
+apsl/xnu XNU kernel sources
+apsl/xnu/mac_test mac_test policy module
+apsl/xnu/sebsd SEBSD policy module
apsl/BootX Bootloader sources
-etc Security framework configuration files
+etc MAC Framework configuration files
+extattr_cmds Commands for using extended attributes
libextattr Interface to extended attributes
-extattr_cmds Commands for using extended attributes
-libmac,libsebsd Interface to security framework and policies
-mac_cmds,sebsd_cmds Commands for interacting with policies
-sebsd_system System libraries for sebsd
+libmac, libsebsd Interface to MAC Framework and policies
+mac_cmds, sebsd_cmds Commands for interacting with policies
+other/adv_cmds Advanced commands, including modified ps(1)
policy Sample TE policy for sebsd
release Release building scripts
-export (created) Location of build results
+sebsd_system System libraries for sebsd
Usage:
From owner-p4-projects@FreeBSD.ORG Thu May 6 13:43:29 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id D75C916A4D0; Thu, 6 May 2004 13:43:28 -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 B108E16A4CE
for <perforce@freebsd.org>; Thu, 6 May 2004 13:43:28 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 82C6543D46
for <perforce@freebsd.org>; Thu, 6 May 2004 13:43:28 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i46KhSGe094518
for <perforce@freebsd.org>; Thu, 6 May 2004 13:43:28 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i46KhSX5094515
for perforce@freebsd.org; Thu, 6 May 2004 13:43:28 -0700 (PDT)
(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 6 May 2004 13:43:28 -0700 (PDT)
Message-Id: <200405062043.i46KhSX5094515@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52375 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: Thu, 06 May 2004 20:43:29 -0000
http://perforce.freebsd.org/chv.cgi?CH=52375
Change 52375 by rwatson@rwatson_tislabs on 2004/05/06 13:43:26
A bit more fleshing, contact address.
Affected files ...
.. //depot/projects/trustedbsd/sedarwin73/README#7 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin73/README#7 (text+ko) ====
@@ -1,8 +1,5 @@
SEDarwin - Security-Enhanced Darwin Prototype
-
-Andrew Reisse (areisse@nailabs.com)
-Chris Vance (cvance@nailabs.com)
-Robert Watson (rwatson@nailabs.com)
+ SEDarwin Team <sedarwin@nailabs.com>
McAfee Research
@@ -10,7 +7,7 @@
7.3 (MacOSX 10.3.3). It includes the following modifications relative
to the Apple Darwin 7.3 release:
-- HFS extended attributes
+- HFS extended attributes.
- A subset of the MAC Framework labeling and protecting files and
processes, as well as initial labeling and controls for Mach IPC.
- A port of the mac_test policy module.
@@ -33,9 +30,9 @@
Package Layout:
bootstrap_instructions.txt Instructions for building and installing
+export (created) Location of build results
Makeconfig Build environment configuration
Makefile Top level Makefile to build system
-export (created) Location of build results
apsl/file_cmds File commands, including modified ls(1)
apsl/xnu XNU kernel sources
@@ -66,6 +63,8 @@
system, labels begin with the name of the policy module (in this case,
sebsd). Objects use the object_r "role".
+Some sample usage to illustrate protections being enforced:
+
$ getpmac
sebsd/andrew:user_r:user_d
$ touch test_readonly
From owner-p4-projects@FreeBSD.ORG Thu May 6 20:46:14 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id BC36216A4D0; Thu, 6 May 2004 20:46:13 -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 767BA16A4CE
for <perforce@freebsd.org>; Thu, 6 May 2004 20:46:13 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id AE38743D53
for <perforce@freebsd.org>; Thu, 6 May 2004 20:46:10 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i473kAGe091319
for <perforce@freebsd.org>; Thu, 6 May 2004 20:46:10 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i473k0Fs091316
for perforce@freebsd.org; Thu, 6 May 2004 20:46:00 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Thu, 6 May 2004 20:46:00 -0700 (PDT)
Message-Id: <200405070346.i473k0Fs091316@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 52383 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: Fri, 07 May 2004 03:46:14 -0000
http://perforce.freebsd.org/chv.cgi?CH=52383
Change 52383 by peter@peter_daintree on 2004/05/06 20:45:16
IFC @52382
Affected files ...
.. //depot/projects/hammer/MAINTAINERS#20 integrate
.. //depot/projects/hammer/Makefile.inc1#49 integrate
.. //depot/projects/hammer/UPDATING#38 integrate
.. //depot/projects/hammer/bin/df/Makefile#3 integrate
.. //depot/projects/hammer/bin/df/df.1#6 integrate
.. //depot/projects/hammer/bin/df/df.c#15 integrate
.. //depot/projects/hammer/bin/kenv/kenv.c#3 integrate
.. //depot/projects/hammer/bin/ls/extern.h#6 integrate
.. //depot/projects/hammer/bin/ls/ls.1#12 integrate
.. //depot/projects/hammer/bin/ls/print.c#12 integrate
.. //depot/projects/hammer/bin/ls/util.c#6 integrate
.. //depot/projects/hammer/bin/sh/sh.1#9 integrate
.. //depot/projects/hammer/contrib/bsnmp/NEWS#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/VERSION#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/gensnmpdef/gensnmpdef.1#1 branch
.. //depot/projects/hammer/contrib/bsnmp/gensnmpdef/gensnmpdef.c#1 branch
.. //depot/projects/hammer/contrib/bsnmp/gensnmptree/gensnmptree.c#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/lib/asn1.3#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/lib/bsnmpagent.3#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/lib/bsnmpclient.3#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/lib/bsnmplib.3#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/lib/snmpagent.c#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/lib/snmpagent.h#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII.c#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/snmp_mibII.3#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/snmpd/action.c#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/snmpd/bsnmpd.1#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/snmpd/config.c#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/snmpd/main.c#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpd.config#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpmod.3#3 integrate
.. //depot/projects/hammer/contrib/bsnmp/snmpd/trans_lsock.c#2 integrate
.. //depot/projects/hammer/contrib/bsnmp/snmpd/trap.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/AUTHORS#2 integrate
.. //depot/projects/hammer/contrib/cvs/BUGS#2 integrate
.. //depot/projects/hammer/contrib/cvs/ChangeLog#4 integrate
.. //depot/projects/hammer/contrib/cvs/FAQ#3 integrate
.. //depot/projects/hammer/contrib/cvs/INSTALL#4 integrate
.. //depot/projects/hammer/contrib/cvs/Makefile.am#4 integrate
.. //depot/projects/hammer/contrib/cvs/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/cvs/NEWS#4 integrate
.. //depot/projects/hammer/contrib/cvs/README#3 integrate
.. //depot/projects/hammer/contrib/cvs/TESTS#3 integrate
.. //depot/projects/hammer/contrib/cvs/TODO#4 integrate
.. //depot/projects/hammer/contrib/cvs/acinclude.m4#4 integrate
.. //depot/projects/hammer/contrib/cvs/aclocal.m4#4 integrate
.. //depot/projects/hammer/contrib/cvs/config.h.in#4 integrate
.. //depot/projects/hammer/contrib/cvs/configure#4 integrate
.. //depot/projects/hammer/contrib/cvs/configure.in#4 integrate
.. //depot/projects/hammer/contrib/cvs/contrib/ChangeLog#4 integrate
.. //depot/projects/hammer/contrib/cvs/contrib/Makefile.am#4 integrate
.. //depot/projects/hammer/contrib/cvs/contrib/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/cvs/contrib/check_cvs.in#2 integrate
.. //depot/projects/hammer/contrib/cvs/contrib/commit_prep.in#2 integrate
.. //depot/projects/hammer/contrib/cvs/contrib/cvs2vendor.sh#2 integrate
.. //depot/projects/hammer/contrib/cvs/contrib/log_accum.in#2 integrate
.. //depot/projects/hammer/contrib/cvs/contrib/rcs2log.sh#3 integrate
.. //depot/projects/hammer/contrib/cvs/contrib/rcs2sccs.sh#3 integrate
.. //depot/projects/hammer/contrib/cvs/contrib/sccs2rcs.in#3 integrate
.. //depot/projects/hammer/contrib/cvs/depcomp#3 integrate
.. //depot/projects/hammer/contrib/cvs/diff/ChangeLog#4 integrate
.. //depot/projects/hammer/contrib/cvs/diff/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/cvs/diff/diff.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/diff/diff3.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/diff/diffrun.h#2 integrate
.. //depot/projects/hammer/contrib/cvs/diff/io.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/diff/system.h#4 integrate
.. //depot/projects/hammer/contrib/cvs/diff/util.c#2 integrate
.. //depot/projects/hammer/contrib/cvs/doc/ChangeLog#4 integrate
.. //depot/projects/hammer/contrib/cvs/doc/Makefile.am#3 integrate
.. //depot/projects/hammer/contrib/cvs/doc/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/cvs/doc/cvs.texinfo#4 integrate
.. //depot/projects/hammer/contrib/cvs/doc/cvsclient.texi#3 integrate
.. //depot/projects/hammer/contrib/cvs/doc/stamp-1#3 integrate
.. //depot/projects/hammer/contrib/cvs/doc/stamp-vti#3 integrate
.. //depot/projects/hammer/contrib/cvs/doc/version-client.texi#3 integrate
.. //depot/projects/hammer/contrib/cvs/doc/version.texi#3 integrate
.. //depot/projects/hammer/contrib/cvs/lib/ChangeLog#4 integrate
.. //depot/projects/hammer/contrib/cvs/lib/Makefile.am#3 integrate
.. //depot/projects/hammer/contrib/cvs/lib/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/cvs/lib/fncase.c#2 integrate
.. //depot/projects/hammer/contrib/cvs/lib/getdate.y#4 integrate
.. //depot/projects/hammer/contrib/cvs/lib/getpass.c#1 branch
.. //depot/projects/hammer/contrib/cvs/lib/mkdir.c#2 integrate
.. //depot/projects/hammer/contrib/cvs/lib/regex.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/lib/system.h#3 integrate
.. //depot/projects/hammer/contrib/cvs/lib/wait.h#2 integrate
.. //depot/projects/hammer/contrib/cvs/man/ChangeLog#4 integrate
.. //depot/projects/hammer/contrib/cvs/man/Makefile.am#2 integrate
.. //depot/projects/hammer/contrib/cvs/man/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/cvs/man/cvs.1#4 integrate
.. //depot/projects/hammer/contrib/cvs/man/cvs.5#3 integrate
.. //depot/projects/hammer/contrib/cvs/mktemp.sh#1 branch
.. //depot/projects/hammer/contrib/cvs/noautomake.sh#3 delete
.. //depot/projects/hammer/contrib/cvs/src/ChangeLog#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/Makefile.am#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/add.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/admin.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/annotate.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/buffer.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/buffer.h#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/checkin.c#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/checkout.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/classify.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/client.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/client.h#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/commit.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/create_adm.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/cvs.h#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/cvsbug.in#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/cvsrc.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/diff.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/edit.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/edit.h#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/entries.c#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/error.c#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/expand_path.c#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/fileattr.c#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/fileattr.h#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/filesubr.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/find_names.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/hardlink.c#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/hash.c#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/hash.h#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/history.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/history.h#1 branch
.. //depot/projects/hammer/contrib/cvs/src/ignore.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/import.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/lock.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/log.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/login.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/logmsg.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/main.c#5 integrate
.. //depot/projects/hammer/contrib/cvs/src/mkmodules.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/modules.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/myndbm.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/no_diff.c#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/parseinfo.c#5 integrate
.. //depot/projects/hammer/contrib/cvs/src/patch.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/rcs.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/rcs.h#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/rcscmds.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/recurse.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/release.c#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/remove.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/repos.c#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/root.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/root.h#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/run.c#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/sanity.sh#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/server.c#5 integrate
.. //depot/projects/hammer/contrib/cvs/src/server.h#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/stack.c#1 branch
.. //depot/projects/hammer/contrib/cvs/src/stack.h#1 branch
.. //depot/projects/hammer/contrib/cvs/src/status.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/subr.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/tag.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/update.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/update.h#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/vers_ts.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/watch.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/watch.h#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/wrapper.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/zlib.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/tools/ChangeLog#4 integrate
.. //depot/projects/hammer/contrib/cvs/tools/Makefile.am#2 integrate
.. //depot/projects/hammer/contrib/cvs/tools/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/groff/tmac/doc-common#9 integrate
.. //depot/projects/hammer/contrib/groff/tmac/doc-syms#4 integrate
.. //depot/projects/hammer/contrib/less/LICENSE#2 integrate
.. //depot/projects/hammer/contrib/less/Makefile.aut#2 integrate
.. //depot/projects/hammer/contrib/less/Makefile.dsg#2 integrate
.. //depot/projects/hammer/contrib/less/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/less/NEWS#2 integrate
.. //depot/projects/hammer/contrib/less/README#2 integrate
.. //depot/projects/hammer/contrib/less/acconfig.h#2 delete
.. //depot/projects/hammer/contrib/less/brac.c#2 integrate
.. //depot/projects/hammer/contrib/less/ch.c#2 integrate
.. //depot/projects/hammer/contrib/less/charset.c#2 integrate
.. //depot/projects/hammer/contrib/less/cmd.h#2 integrate
.. //depot/projects/hammer/contrib/less/cmdbuf.c#2 integrate
.. //depot/projects/hammer/contrib/less/command.c#2 integrate
.. //depot/projects/hammer/contrib/less/configure#2 integrate
.. //depot/projects/hammer/contrib/less/configure.ac#1 branch
.. //depot/projects/hammer/contrib/less/configure.in#2 delete
.. //depot/projects/hammer/contrib/less/decode.c#2 integrate
.. //depot/projects/hammer/contrib/less/defines.ds#2 integrate
.. //depot/projects/hammer/contrib/less/defines.h.in#2 integrate
.. //depot/projects/hammer/contrib/less/defines.h.top#2 delete
.. //depot/projects/hammer/contrib/less/defines.o2#2 integrate
.. //depot/projects/hammer/contrib/less/defines.wn#2 integrate
.. //depot/projects/hammer/contrib/less/edit.c#2 integrate
.. //depot/projects/hammer/contrib/less/filename.c#2 integrate
.. //depot/projects/hammer/contrib/less/forwback.c#2 integrate
.. //depot/projects/hammer/contrib/less/funcs.h#2 integrate
.. //depot/projects/hammer/contrib/less/help.c#2 integrate
.. //depot/projects/hammer/contrib/less/ifile.c#2 integrate
.. //depot/projects/hammer/contrib/less/input.c#2 integrate
.. //depot/projects/hammer/contrib/less/jump.c#2 integrate
.. //depot/projects/hammer/contrib/less/less.h#2 integrate
.. //depot/projects/hammer/contrib/less/less.hlp#2 integrate
.. //depot/projects/hammer/contrib/less/less.man#2 integrate
.. //depot/projects/hammer/contrib/less/less.nro#2 integrate
.. //depot/projects/hammer/contrib/less/lessecho.c#2 integrate
.. //depot/projects/hammer/contrib/less/lesskey.c#2 integrate
.. //depot/projects/hammer/contrib/less/lesskey.h#2 integrate
.. //depot/projects/hammer/contrib/less/lesskey.man#2 integrate
.. //depot/projects/hammer/contrib/less/lesskey.nro#2 integrate
.. //depot/projects/hammer/contrib/less/lglob.h#2 integrate
.. //depot/projects/hammer/contrib/less/line.c#2 integrate
.. //depot/projects/hammer/contrib/less/linenum.c#2 integrate
.. //depot/projects/hammer/contrib/less/lsystem.c#2 integrate
.. //depot/projects/hammer/contrib/less/main.c#2 integrate
.. //depot/projects/hammer/contrib/less/mark.c#2 integrate
.. //depot/projects/hammer/contrib/less/mkhelp.c#2 integrate
.. //depot/projects/hammer/contrib/less/optfunc.c#2 integrate
.. //depot/projects/hammer/contrib/less/option.c#2 integrate
.. //depot/projects/hammer/contrib/less/option.h#2 integrate
.. //depot/projects/hammer/contrib/less/opttbl.c#2 integrate
.. //depot/projects/hammer/contrib/less/os.c#2 integrate
.. //depot/projects/hammer/contrib/less/output.c#2 integrate
.. //depot/projects/hammer/contrib/less/pckeys.h#2 integrate
.. //depot/projects/hammer/contrib/less/position.c#2 integrate
.. //depot/projects/hammer/contrib/less/position.h#2 integrate
.. //depot/projects/hammer/contrib/less/prompt.c#2 integrate
.. //depot/projects/hammer/contrib/less/screen.c#2 integrate
.. //depot/projects/hammer/contrib/less/scrsize.c#2 integrate
.. //depot/projects/hammer/contrib/less/search.c#2 integrate
.. //depot/projects/hammer/contrib/less/signal.c#2 integrate
.. //depot/projects/hammer/contrib/less/tags.c#2 integrate
.. //depot/projects/hammer/contrib/less/ttyin.c#2 integrate
.. //depot/projects/hammer/contrib/less/version.c#2 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/fetch.c#4 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/ftp.1#5 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/ftp.c#4 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/progressbar.c#4 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/progressbar.h#2 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/util.c#4 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/version.h#4 integrate
.. //depot/projects/hammer/contrib/patch/COPYING#2 delete
.. //depot/projects/hammer/contrib/patch/ChangeLog#2 delete
.. //depot/projects/hammer/contrib/patch/FREEBSD-upgrade#2 delete
.. //depot/projects/hammer/contrib/patch/INSTALL#2 delete
.. //depot/projects/hammer/contrib/patch/Makefile.in#2 delete
.. //depot/projects/hammer/contrib/patch/NEWS#2 delete
.. //depot/projects/hammer/contrib/patch/README#2 delete
.. //depot/projects/hammer/contrib/patch/acconfig.h#2 delete
.. //depot/projects/hammer/contrib/patch/addext.c#2 delete
.. //depot/projects/hammer/contrib/patch/argmatch.c#2 delete
.. //depot/projects/hammer/contrib/patch/argmatch.h#2 delete
.. //depot/projects/hammer/contrib/patch/backupfile.c#2 delete
.. //depot/projects/hammer/contrib/patch/backupfile.h#2 delete
.. //depot/projects/hammer/contrib/patch/basename.c#2 delete
.. //depot/projects/hammer/contrib/patch/common.h#2 delete
.. //depot/projects/hammer/contrib/patch/config.hin#2 delete
.. //depot/projects/hammer/contrib/patch/configure#2 delete
.. //depot/projects/hammer/contrib/patch/configure.in#2 delete
.. //depot/projects/hammer/contrib/patch/getopt.c#2 delete
.. //depot/projects/hammer/contrib/patch/getopt.h#2 delete
.. //depot/projects/hammer/contrib/patch/getopt1.c#2 delete
.. //depot/projects/hammer/contrib/patch/inp.c#2 delete
.. //depot/projects/hammer/contrib/patch/inp.h#2 delete
.. //depot/projects/hammer/contrib/patch/install-sh#2 delete
.. //depot/projects/hammer/contrib/patch/maketime.c#2 delete
.. //depot/projects/hammer/contrib/patch/maketime.h#2 delete
.. //depot/projects/hammer/contrib/patch/partime.c#2 delete
.. //depot/projects/hammer/contrib/patch/partime.h#2 delete
.. //depot/projects/hammer/contrib/patch/patch.1#2 delete
.. //depot/projects/hammer/contrib/patch/patch.c#2 delete
.. //depot/projects/hammer/contrib/patch/pch.c#2 delete
.. //depot/projects/hammer/contrib/patch/pch.h#2 delete
.. //depot/projects/hammer/contrib/patch/quotearg.c#2 delete
.. //depot/projects/hammer/contrib/patch/quotearg.h#2 delete
.. //depot/projects/hammer/contrib/patch/util.c#2 delete
.. //depot/projects/hammer/contrib/patch/util.h#2 delete
.. //depot/projects/hammer/contrib/patch/version.c#2 delete
.. //depot/projects/hammer/contrib/patch/version.h#2 delete
.. //depot/projects/hammer/contrib/pf/man/pf.4#2 integrate
.. //depot/projects/hammer/contrib/pf/man/pflog.4#2 integrate
.. //depot/projects/hammer/contrib/pf/man/pfsync.4#2 integrate
.. //depot/projects/hammer/contrib/traceroute/traceroute.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/.cvsignore#1 branch
.. //depot/projects/hammer/crypto/openssh/ChangeLog#6 integrate
.. //depot/projects/hammer/crypto/openssh/README#4 integrate
.. //depot/projects/hammer/crypto/openssh/acconfig.h#7 integrate
.. //depot/projects/hammer/crypto/openssh/auth-krb5.c#6 integrate
.. //depot/projects/hammer/crypto/openssh/auth-pam.c#7 integrate
.. //depot/projects/hammer/crypto/openssh/auth-pam.h#6 integrate
.. //depot/projects/hammer/crypto/openssh/auth-passwd.c#6 integrate
.. //depot/projects/hammer/crypto/openssh/auth-sia.c#5 integrate
.. //depot/projects/hammer/crypto/openssh/auth-sia.h#4 integrate
.. //depot/projects/hammer/crypto/openssh/auth-skey.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/auth.h#6 integrate
.. //depot/projects/hammer/crypto/openssh/auth1.c#7 integrate
.. //depot/projects/hammer/crypto/openssh/auth2.c#7 integrate
.. //depot/projects/hammer/crypto/openssh/canohost.c#7 integrate
.. //depot/projects/hammer/crypto/openssh/config.h#6 integrate
.. //depot/projects/hammer/crypto/openssh/configure.ac#6 integrate
.. //depot/projects/hammer/crypto/openssh/contrib/Makefile#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/README#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/aix/README#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/aix/buildbff.sh#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/aix/inventory.sh#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/aix/pam.conf#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/caldera/openssh.spec#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/caldera/ssh-host-keygen#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/caldera/sshd.init#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/caldera/sshd.pam#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/cygwin/Makefile#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/cygwin/README#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/cygwin/ssh-host-config#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/cygwin/ssh-user-config#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/findssl.sh#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/gnome-ssh-askpass1.c#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/gnome-ssh-askpass2.c#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/hpux/README#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/hpux/egd#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/hpux/egd.rc#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/hpux/sshd#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/hpux/sshd.rc#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/redhat/gnome-ssh-askpass.csh#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/redhat/openssh.spec#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/redhat/sshd.init#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/redhat/sshd.pam#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/solaris/README#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/solaris/buildpkg.sh#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/solaris/opensshd.in#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/ssh-copy-id#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/ssh-copy-id.1#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/sshd.pam.freebsd#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/sshd.pam.generic#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/suse/openssh.spec#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/suse/rc.config.sshd#1 branch
.. //depot/projects/hammer/crypto/openssh/contrib/suse/rc.sshd#1 branch
.. //depot/projects/hammer/crypto/openssh/defines.h#6 integrate
.. //depot/projects/hammer/crypto/openssh/dh.c#6 integrate
.. //depot/projects/hammer/crypto/openssh/gss-serv-krb5.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/loginrec.c#6 integrate
.. //depot/projects/hammer/crypto/openssh/monitor.c#8 integrate
.. //depot/projects/hammer/crypto/openssh/monitor_wrap.c#6 integrate
.. //depot/projects/hammer/crypto/openssh/monitor_wrap.h#5 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/.cvsignore#1 branch
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#4 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.h#5 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-rfc2553.h#4 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/setenv.c#6 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/xcrypt.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/readconf.c#6 integrate
.. //depot/projects/hammer/crypto/openssh/readconf.h#5 integrate
.. //depot/projects/hammer/crypto/openssh/regress/Makefile#5 integrate
.. //depot/projects/hammer/crypto/openssh/regress/README.regress#3 integrate
.. //depot/projects/hammer/crypto/openssh/regress/dynamic-forward.sh#2 integrate
.. //depot/projects/hammer/crypto/openssh/regress/login-timeout.sh#1 branch
.. //depot/projects/hammer/crypto/openssh/regress/sftp-cmds.sh#4 integrate
.. //depot/projects/hammer/crypto/openssh/regress/ssh-com-client.sh#4 integrate
.. //depot/projects/hammer/crypto/openssh/regress/ssh-com-keygen.sh#4 integrate
.. //depot/projects/hammer/crypto/openssh/regress/ssh-com-sftp.sh#4 integrate
.. //depot/projects/hammer/crypto/openssh/regress/ssh-com.sh#5 integrate
.. //depot/projects/hammer/crypto/openssh/regress/test-exec.sh#4 integrate
.. //depot/projects/hammer/crypto/openssh/regress/try-ciphers.sh#3 integrate
.. //depot/projects/hammer/crypto/openssh/scard/.cvsignore#1 branch
.. //depot/projects/hammer/crypto/openssh/scp.1#5 integrate
.. //depot/projects/hammer/crypto/openssh/session.c#9 integrate
.. //depot/projects/hammer/crypto/openssh/sftp-client.c#6 integrate
.. //depot/projects/hammer/crypto/openssh/sftp.1#6 integrate
.. //depot/projects/hammer/crypto/openssh/sftp.c#6 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-agent.c#8 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-keyscan.c#7 integrate
.. //depot/projects/hammer/crypto/openssh/ssh.1#6 integrate
.. //depot/projects/hammer/crypto/openssh/ssh.c#6 integrate
.. //depot/projects/hammer/crypto/openssh/ssh_config#8 integrate
.. //depot/projects/hammer/crypto/openssh/ssh_config.5#8 integrate
.. //depot/projects/hammer/crypto/openssh/sshconnect2.c#7 integrate
.. //depot/projects/hammer/crypto/openssh/sshd.c#8 integrate
.. //depot/projects/hammer/crypto/openssh/sshd_config#9 integrate
.. //depot/projects/hammer/crypto/openssh/sshd_config.5#10 integrate
.. //depot/projects/hammer/crypto/openssh/sshlogin.c#6 integrate
.. //depot/projects/hammer/crypto/openssh/version.h#9 integrate
.. //depot/projects/hammer/etc/defaults/periodic.conf#8 integrate
.. //depot/projects/hammer/etc/mtree/BSD.include.dist#17 integrate
.. //depot/projects/hammer/etc/mtree/BSD.local.dist#20 integrate
.. //depot/projects/hammer/etc/mtree/BSD.usr.dist#24 integrate
.. //depot/projects/hammer/etc/periodic/security/610.ipf6denied#1 branch
.. //depot/projects/hammer/etc/rc.d/Makefile#23 integrate
.. //depot/projects/hammer/etc/rc.d/initdiskless#11 integrate
.. //depot/projects/hammer/etc/rc.d/ipfilter#17 integrate
.. //depot/projects/hammer/etc/rc.d/ipfw#8 integrate
.. //depot/projects/hammer/etc/rc.d/ipmon#8 integrate
.. //depot/projects/hammer/etc/rc.d/netif#6 integrate
.. //depot/projects/hammer/etc/rc.d/preseedrandom#1 branch
.. //depot/projects/hammer/etc/rc.d/resolv#2 integrate
.. //depot/projects/hammer/etc/rc.d/sendmail#7 integrate
.. //depot/projects/hammer/etc/rc.d/watchdogd#3 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#20 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes-o.real#4 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes.sp.ok#3 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes2#12 integrate
.. //depot/projects/hammer/gnu/lib/libg2c/Makefile#4 integrate
.. //depot/projects/hammer/gnu/lib/libg2c/config.h#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/Makefile#6 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/i386/bfd.h#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/cvs/cvs/Makefile#6 integrate
.. //depot/projects/hammer/gnu/usr.bin/groff/src/libs/libgroff/Makefile#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#16 integrate
.. //depot/projects/hammer/gnu/usr.bin/gzip/gzip.c#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/gzip/gzip.h#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/gzip/unzip.c#2 integrate
.. //depot/projects/hammer/include/Makefile#21 integrate
.. //depot/projects/hammer/include/ctype.h#3 integrate
.. //depot/projects/hammer/lib/Makefile#34 integrate
.. //depot/projects/hammer/lib/libarchive/Makefile#6 integrate
.. //depot/projects/hammer/lib/libarchive/archive.h#6 integrate
.. //depot/projects/hammer/lib/libarchive/archive_entry.3#4 integrate
.. //depot/projects/hammer/lib/libarchive/archive_entry.c#8 integrate
.. //depot/projects/hammer/lib/libarchive/archive_entry.h#7 integrate
.. //depot/projects/hammer/lib/libarchive/archive_platform.h#5 integrate
.. //depot/projects/hammer/lib/libarchive/archive_private.h#7 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_bzip2.c#4 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#5 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_none.c#5 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#7 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#8 integrate
.. //depot/projects/hammer/lib/libarchive/archive_string.h#3 integrate
.. //depot/projects/hammer/lib/libarchive/archive_util.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#4 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#4 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#4 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#9 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_format_shar.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ustar.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/libarchive-formats.5#1 branch
.. //depot/projects/hammer/lib/libbsnmp/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/libbsnmp/modules/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#3 integrate
.. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#4 integrate
.. //depot/projects/hammer/lib/libc/Makefile#15 integrate
.. //depot/projects/hammer/lib/libc/gen/fmtcheck.c#3 integrate
.. //depot/projects/hammer/lib/libc/gen/fts.c#4 integrate
.. //depot/projects/hammer/lib/libc/gen/getpwent.c#11 integrate
.. //depot/projects/hammer/lib/libc/gen/signal.3#5 integrate
.. //depot/projects/hammer/lib/libc/locale/ldpart.c#5 integrate
.. //depot/projects/hammer/lib/libc/net/res_query.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#14 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfscanf.c#11 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#13 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfwscanf.c#9 integrate
.. //depot/projects/hammer/lib/libc/sys/acct.2#5 integrate
.. //depot/projects/hammer/lib/libc/sys/kqueue.2#7 integrate
.. //depot/projects/hammer/lib/libc/sys/mmap.2#4 integrate
.. //depot/projects/hammer/lib/libdisk/chunk.c#10 integrate
.. //depot/projects/hammer/lib/libdisk/create_chunk.c#15 integrate
.. //depot/projects/hammer/lib/libdisk/disk.c#17 integrate
.. //depot/projects/hammer/lib/libdisk/libdisk.h#14 integrate
.. //depot/projects/hammer/lib/libdisk/open_disk.c#4 integrate
.. //depot/projects/hammer/lib/libdisk/write_powerpc_disk.c#1 branch
.. //depot/projects/hammer/lib/libradius/Makefile#4 integrate
.. //depot/projects/hammer/lib/libradius/libradius.3#3 integrate
.. //depot/projects/hammer/lib/libradius/radlib.c#2 integrate
.. //depot/projects/hammer/lib/libradius/radlib.h#3 integrate
.. //depot/projects/hammer/lib/libradius/radlib_private.h#2 integrate
.. //depot/projects/hammer/lib/libradius/radlib_vs.h#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_spinlock.c#8 integrate
.. //depot/projects/hammer/lib/msun/man/hypot.3#3 integrate
.. //depot/projects/hammer/lib/msun/src/math.h#11 integrate
.. //depot/projects/hammer/release/Makefile#47 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#9 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#66 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml#4 integrate
.. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#18 integrate
.. //depot/projects/hammer/sbin/Makefile#25 integrate
.. //depot/projects/hammer/sbin/adjkerntz/adjkerntz.c#3 integrate
.. //depot/projects/hammer/sbin/fsck_msdosfs/boot.c#4 integrate
.. //depot/projects/hammer/sbin/gconcat/Makefile#2 integrate
.. //depot/projects/hammer/sbin/ggate/Makefile#1 branch
.. //depot/projects/hammer/sbin/ggate/ggatec/Makefile#1 branch
.. //depot/projects/hammer/sbin/ggate/ggatec/ggatec.8#1 branch
.. //depot/projects/hammer/sbin/ggate/ggatec/ggatec.c#1 branch
.. //depot/projects/hammer/sbin/ggate/ggated/Makefile#1 branch
.. //depot/projects/hammer/sbin/ggate/ggated/ggated.8#1 branch
.. //depot/projects/hammer/sbin/ggate/ggated/ggated.c#1 branch
.. //depot/projects/hammer/sbin/ggate/ggatel/Makefile#1 branch
.. //depot/projects/hammer/sbin/ggate/ggatel/ggatel.8#1 branch
.. //depot/projects/hammer/sbin/ggate/ggatel/ggatel.c#1 branch
.. //depot/projects/hammer/sbin/ggate/shared/ggate.c#1 branch
.. //depot/projects/hammer/sbin/ggate/shared/ggate.h#1 branch
.. //depot/projects/hammer/sbin/idmapd/idmapd.c#5 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#17 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#21 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#21 integrate
.. //depot/projects/hammer/sbin/mount/Makefile#4 integrate
.. //depot/projects/hammer/sbin/mount/mount.c#14 integrate
.. //depot/projects/hammer/sbin/route/route.c#6 integrate
.. //depot/projects/hammer/sbin/sunlabel/sunlabel.c#6 integrate
.. //depot/projects/hammer/secure/Makefile#5 integrate
.. //depot/projects/hammer/secure/Makefile.inc#3 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/Makefile#10 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/Makefile.inc#8 integrate
.. //depot/projects/hammer/share/Makefile#5 integrate
.. //depot/projects/hammer/share/colldef/Makefile#14 integrate
.. //depot/projects/hammer/share/examples/cvsup/cvs-supfile#7 integrate
.. //depot/projects/hammer/share/man/man3/fpgetround.3#2 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#38 integrate
.. //depot/projects/hammer/share/man/man4/acpi.4#21 integrate
.. //depot/projects/hammer/share/man/man4/asr.4#5 integrate
.. //depot/projects/hammer/share/man/man4/atapicam.4#3 integrate
.. //depot/projects/hammer/share/man/man4/aue.4#5 integrate
.. //depot/projects/hammer/share/man/man4/axe.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ciss.4#3 integrate
.. //depot/projects/hammer/share/man/man4/hme.4#2 integrate
.. //depot/projects/hammer/share/man/man4/icmp.4#4 integrate
.. //depot/projects/hammer/share/man/man4/ip.4#8 integrate
.. //depot/projects/hammer/share/man/man4/led.4#4 integrate
.. //depot/projects/hammer/share/man/man4/mac_none.4#6 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#19 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_asus.4#1 branch
.. //depot/projects/hammer/share/man/man4/ng_bridge.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ng_ether.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ng_hub.4#1 branch
.. //depot/projects/hammer/share/man/man4/ng_one2many.4#5 integrate
.. //depot/projects/hammer/share/man/man4/ng_pptpgre.4#2 integrate
.. //depot/projects/hammer/share/man/man4/rl.4#8 integrate
.. //depot/projects/hammer/share/man/man4/rue.4#5 integrate
.. //depot/projects/hammer/share/man/man4/sio.4#5 integrate
.. //depot/projects/hammer/share/man/man4/vlan.4#4 integrate
.. //depot/projects/hammer/share/man/man4/watchdog.4#3 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#26 integrate
.. //depot/projects/hammer/share/man/man7/hier.7#14 integrate
.. //depot/projects/hammer/share/man/man7/release.7#17 integrate
.. //depot/projects/hammer/share/man/man9/buf.9#4 integrate
.. //depot/projects/hammer/share/man/man9/cd.9#4 integrate
.. //depot/projects/hammer/share/man/man9/hexdump.9#3 integrate
.. //depot/projects/hammer/share/man/man9/mbuf.9#13 integrate
.. //depot/projects/hammer/share/man/man9/rtentry.9#4 integrate
.. //depot/projects/hammer/share/man/man9/time.9#3 integrate
.. //depot/projects/hammer/share/man/man9/timeout.9#4 integrate
.. //depot/projects/hammer/share/man/man9/uio.9#3 integrate
.. //depot/projects/hammer/share/man/man9/vm_map_remove.9#2 integrate
.. //depot/projects/hammer/share/man/man9/vm_page_io.9#2 integrate
.. //depot/projects/hammer/share/man/man9/zero_copy.9#4 integrate
.. //depot/projects/hammer/share/misc/bsd-family-tree#15 integrate
.. //depot/projects/hammer/share/mk/sys.mk#12 integrate
.. //depot/projects/hammer/share/mklocale/Makefile#12 integrate
.. //depot/projects/hammer/share/monetdef/Makefile#13 integrate
.. //depot/projects/hammer/share/monetdef/he_IL.UTF-8.src#1 branch
.. //depot/projects/hammer/share/msgdef/Makefile#13 integrate
.. //depot/projects/hammer/share/msgdef/he_IL.UTF-8.src#1 branch
.. //depot/projects/hammer/share/numericdef/Makefile#12 integrate
.. //depot/projects/hammer/share/snmp/Makefile#1 branch
.. //depot/projects/hammer/share/snmp/mibs/FREEBSD-MIB.txt#1 branch
.. //depot/projects/hammer/share/snmp/mibs/Makefile#1 branch
.. //depot/projects/hammer/share/timedef/Makefile#14 integrate
.. //depot/projects/hammer/share/timedef/he_IL.UTF-8.src#1 branch
.. //depot/projects/hammer/sys/alpha/alpha/fp_emulate.c#4 integrate
.. //depot/projects/hammer/sys/alpha/alpha/ieee_float.c#4 integrate
.. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#12 integrate
.. //depot/projects/hammer/sys/alpha/alpha/pmap.c#22 integrate
.. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#16 integrate
.. //depot/projects/hammer/sys/alpha/conf/GENERIC#16 integrate
.. //depot/projects/hammer/sys/alpha/include/float.h#4 integrate
.. //depot/projects/hammer/sys/alpha/include/fpu.h#3 integrate
.. //depot/projects/hammer/sys/alpha/include/sf_buf.h#2 integrate
.. //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#10 integrate
.. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#10 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#64 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#41 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#36 integrate
.. //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#10 integrate
.. //depot/projects/hammer/sys/amd64/include/float.h#7 integrate
.. //depot/projects/hammer/sys/amd64/include/sf_buf.h#4 integrate
.. //depot/projects/hammer/sys/arm/include/_types.h#4 integrate
.. //depot/projects/hammer/sys/arm/include/elf.h#3 integrate
.. //depot/projects/hammer/sys/arm/include/endian.h#3 integrate
.. //depot/projects/hammer/sys/arm/include/signal.h#4 integrate
.. //depot/projects/hammer/sys/boot/forth/loader.conf#9 integrate
.. //depot/projects/hammer/sys/boot/i386/boot0/Makefile#6 integrate
.. //depot/projects/hammer/sys/boot/i386/boot0/boot0.S#1 branch
.. //depot/projects/hammer/sys/boot/i386/boot0/boot0.s#6 delete
.. //depot/projects/hammer/sys/boot/i386/boot0/boot0ext.S#1 branch
.. //depot/projects/hammer/sys/boot/i386/boot0/boot0ext.s#2 delete
.. //depot/projects/hammer/sys/boot/i386/boot0/boot0sio.s#4 delete
.. //depot/projects/hammer/sys/boot/i386/boot0ext/Makefile#2 integrate
.. //depot/projects/hammer/sys/boot/i386/boot0sio/Makefile#3 integrate
.. //depot/projects/hammer/sys/boot/i386/boot2/boot1.S#2 integrate
.. //depot/projects/hammer/sys/boot/i386/boot2/sio.S#2 integrate
.. //depot/projects/hammer/sys/boot/i386/btx/btx/Makefile#4 integrate
.. //depot/projects/hammer/sys/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/projects/hammer/sys/boot/i386/btx/btxldr/Makefile#6 integrate
.. //depot/projects/hammer/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate
.. //depot/projects/hammer/sys/boot/i386/cdboot/Makefile#4 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/amd64_tramp.S#6 integrate
.. //depot/projects/hammer/sys/boot/i386/mbr/Makefile#4 integrate
.. //depot/projects/hammer/sys/boot/i386/pxeldr/Makefile#7 integrate
.. //depot/projects/hammer/sys/boot/i386/pxeldr/pxeldr.S#2 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/serial_16550.S#2 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/serial_8251.S#2 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/btx/Makefile#4 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/btx/btx.S#2 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/btxldr/Makefile#4 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/btxldr/btxldr.S#2 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#21 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32.h#5 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#12 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#16 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#15 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#15 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#15 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#18 integrate
.. //depot/projects/hammer/sys/compat/ia32/ia32_signal.h#8 integrate
.. //depot/projects/hammer/sys/compat/ndis/hal_var.h#3 integrate
.. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#15 integrate
.. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#10 integrate
.. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#9 integrate
.. //depot/projects/hammer/sys/compat/ndis/pe_var.h#4 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#5 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#12 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#13 integrate
.. //depot/projects/hammer/sys/conf/NOTES#43 integrate
.. //depot/projects/hammer/sys/conf/files#56 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#41 integrate
.. //depot/projects/hammer/sys/conf/files.i386#29 integrate
.. //depot/projects/hammer/sys/conf/files.pc98#27 integrate
.. //depot/projects/hammer/sys/conf/files.sparc64#16 integrate
.. //depot/projects/hammer/sys/conf/kern.pre.mk#24 integrate
.. //depot/projects/hammer/sys/conf/majors#23 integrate
.. //depot/projects/hammer/sys/conf/options#37 integrate
.. //depot/projects/hammer/sys/conf/options.sparc64#6 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/CHANGES.txt#8 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#10 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acdisasm.h#8 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#11 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acglobal.h#10 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/achware.h#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acinterp.h#7 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/aclocal.h#8 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acpica_prep.sh#6 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/actypes.h#9 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acutils.h#10 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/common/adisasm.c#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslload.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbexec.c#10 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dmopcode.c#7 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dmutils.c#6 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dmwalk.c#6 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dsmthdat.c#10 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dswload.c#8 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#6 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/evgpeblk.c#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/evmisc.c#9 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/evxfevnt.c#6 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/excreate.c#8 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exdump.c#9 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exfldio.c#10 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exresnte.c#7 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exstore.c#10 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exstoren.c#7 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/hwgpe.c#6 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/hwregs.c#9 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/hwsleep.c#9 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsaccess.c#9 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsdump.c#8 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nseval.c#7 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nssearch.c#8 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsutils.c#9 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfeval.c#7 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/rsaddr.c#7 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/uteval.c#8 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utglobal.c#10 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utmisc.c#8 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#4 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#4 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#6 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#5 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_norm.c#3 integrate
.. //depot/projects/hammer/sys/dev/aac/aac.c#20 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdDebug.c#4 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#10 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdInterrupt.c#6 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdMemory.c#3 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#8 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdStream.c#3 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSynch.c#6 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdTable.c#6 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#32 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#10 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#17 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#18 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#12 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#16 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_powerres.c#9 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#14 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#8 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpivar.h#24 integrate
.. //depot/projects/hammer/sys/dev/arl/if_arl.c#4 integrate
.. //depot/projects/hammer/sys/dev/arl/if_arlreg.h#4 integrate
.. //depot/projects/hammer/sys/dev/asr/asr.c#10 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#24 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#17 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#33 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-commands.h#2 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.h#6 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-isa.c#9 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#13 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.c#20 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#21 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-queue.c#11 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.h#7 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-fd.h#5 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-tape.h#4 integrate
.. //depot/projects/hammer/sys/dev/awi/awi.c#10 integrate
.. //depot/projects/hammer/sys/dev/ciss/ciss.c#20 integrate
.. //depot/projects/hammer/sys/dev/ciss/cissreg.h#5 integrate
.. //depot/projects/hammer/sys/dev/ciss/cissvar.h#4 integrate
.. //depot/projects/hammer/sys/dev/cp/cpddk.c#1 branch
.. //depot/projects/hammer/sys/dev/cp/cpddk.h#1 branch
.. //depot/projects/hammer/sys/dev/cp/if_cp.c#1 branch
.. //depot/projects/hammer/sys/dev/cp/ng_cp.h#1 branch
.. //depot/projects/hammer/sys/dev/cs/if_cs.c#11 integrate
.. //depot/projects/hammer/sys/dev/cy/cy.c#1 branch
.. //depot/projects/hammer/sys/dev/cy/cy_isa.c#1 branch
.. //depot/projects/hammer/sys/dev/cy/cy_pci.c#1 branch
.. //depot/projects/hammer/sys/dev/cy/cyreg.h#1 branch
.. //depot/projects/hammer/sys/dev/cy/cyvar.h#1 branch
.. //depot/projects/hammer/sys/dev/ed/if_ed.c#16 integrate
.. //depot/projects/hammer/sys/dev/ex/if_ex.c#9 integrate
.. //depot/projects/hammer/sys/dev/fe/if_fe.c#11 integrate
.. //depot/projects/hammer/sys/dev/gem/if_gem.c#10 integrate
.. //depot/projects/hammer/sys/dev/hfa/fore_load.c#5 delete
.. //depot/projects/hammer/sys/dev/hme/if_hme.c#8 integrate
.. //depot/projects/hammer/sys/dev/ic/cd1400.h#1 branch
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#14 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#7 integrate
.. //depot/projects/hammer/sys/dev/led/led.c#7 integrate
.. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#14 integrate
.. //depot/projects/hammer/sys/dev/mii/brgphy.c#13 integrate
.. //depot/projects/hammer/sys/dev/mii/dcphy.c#7 integrate
.. //depot/projects/hammer/sys/dev/mii/e1000phy.c#6 integrate
.. //depot/projects/hammer/sys/dev/mii/mii.c#6 integrate
.. //depot/projects/hammer/sys/dev/mii/mii_physubr.c#5 integrate
.. //depot/projects/hammer/sys/dev/mii/mlphy.c#5 integrate
.. //depot/projects/hammer/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/hammer/sys/dev/mii/ruephy.c#3 integrate
.. //depot/projects/hammer/sys/dev/mii/tlphy.c#6 integrate
.. //depot/projects/hammer/sys/dev/mii/xmphy.c#7 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#26 integrate
.. //depot/projects/hammer/sys/dev/pci/pci.c#19 integrate
.. //depot/projects/hammer/sys/dev/puc/puc_pccard.c#5 integrate
.. //depot/projects/hammer/sys/dev/puc/pucdata.c#14 integrate
.. //depot/projects/hammer/sys/dev/puc/pucvar.h#8 integrate
.. //depot/projects/hammer/sys/dev/random/harvest.c#7 integrate
.. //depot/projects/hammer/sys/dev/random/nehemiah.c#2 integrate
.. //depot/projects/hammer/sys/dev/random/randomdev.c#13 integrate
.. //depot/projects/hammer/sys/dev/random/randomdev.h#4 integrate
.. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#2 integrate
.. //depot/projects/hammer/sys/dev/sbni/if_sbni.c#11 integrate
.. //depot/projects/hammer/sys/dev/sio/sio.c#30 integrate
.. //depot/projects/hammer/sys/dev/sio/sio_ebus.c#4 delete
.. //depot/projects/hammer/sys/dev/sn/if_sn.c#14 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/ess.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/mss.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sb8.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sbc.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/cmi.c#9 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/csa.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/csapcm.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/ds1.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#9 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/ich.c#13 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/buffer.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/sound.h#9 integrate
.. //depot/projects/hammer/sys/dev/sx/sx_pci.c#2 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_core.c#6 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_dev_sab82532.c#5 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.c#5 integrate
.. //depot/projects/hammer/sys/dev/usb/devlist2h.awk#2 integrate
.. //depot/projects/hammer/sys/dev/usb/if_aue.c#16 integrate
.. //depot/projects/hammer/sys/dev/usb/if_axe.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/ohcireg.h#4 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#33 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs.h#32 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#32 integrate
.. //depot/projects/hammer/sys/dev/usb/uvisor.c#11 integrate
.. //depot/projects/hammer/sys/dev/usb/uvscom.c#8 integrate
.. //depot/projects/hammer/sys/dev/vinum/vinumio.c#14 integrate
.. //depot/projects/hammer/sys/dev/wl/if_wl.c#11 integrate
.. //depot/projects/hammer/sys/dev/xe/if_xe.c#15 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs_io.c#8 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_io.c#10 integrate
.. //depot/projects/hammer/sys/fs/specfs/spec_vnops.c#19 integrate
.. //depot/projects/hammer/sys/geom/concat/g_concat.c#5 integrate
.. //depot/projects/hammer/sys/geom/gate/g_gate.c#1 branch
.. //depot/projects/hammer/sys/geom/gate/g_gate.h#1 branch
.. //depot/projects/hammer/sys/geom/geom_gpt.c#17 integrate
.. //depot/projects/hammer/sys/i386/acpica/OsdEnvironment.c#7 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_asus.c#1 branch
.. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#14 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_toshiba.c#5 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#16 integrate
.. //depot/projects/hammer/sys/i386/acpica/madt.c#9 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#22 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#40 integrate
.. //depot/projects/hammer/sys/i386/i386/apic_vector.s#9 integrate
.. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#16 integrate
.. //depot/projects/hammer/sys/i386/i386/exception.s#7 integrate
.. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#7 integrate
.. //depot/projects/hammer/sys/i386/i386/io_apic.c#5 integrate
.. //depot/projects/hammer/sys/i386/i386/legacy.c#7 integrate
.. //depot/projects/hammer/sys/i386/i386/local_apic.c#8 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#31 integrate
.. //depot/projects/hammer/sys/i386/i386/mptable.c#9 integrate
.. //depot/projects/hammer/sys/i386/i386/mptable_pci.c#2 integrate
.. //depot/projects/hammer/sys/i386/i386/nexus.c#10 integrate
.. //depot/projects/hammer/sys/i386/i386/support.s#9 integrate
.. //depot/projects/hammer/sys/i386/include/acpica_machdep.h#5 integrate
.. //depot/projects/hammer/sys/i386/include/apicvar.h#6 integrate
.. //depot/projects/hammer/sys/i386/include/bus_pc98.h#4 integrate
.. //depot/projects/hammer/sys/i386/include/float.h#5 integrate
.. //depot/projects/hammer/sys/i386/include/intr_machdep.h#3 integrate
.. //depot/projects/hammer/sys/i386/include/legacyvar.h#4 integrate
.. //depot/projects/hammer/sys/i386/include/mpapic.h#2 delete
.. //depot/projects/hammer/sys/i386/include/pci_cfgreg.h#6 integrate
.. //depot/projects/hammer/sys/i386/isa/atpic.c#9 integrate
.. //depot/projects/hammer/sys/i386/isa/atpic_vector.s#7 integrate
.. //depot/projects/hammer/sys/i386/isa/clock.c#15 integrate
.. //depot/projects/hammer/sys/i386/isa/cy.c#10 delete
.. //depot/projects/hammer/sys/i386/isa/cyreg.h#2 delete
.. //depot/projects/hammer/sys/i386/isa/elcr.c#1 branch
.. //depot/projects/hammer/sys/i386/isa/ic/cd1400.h#2 delete
.. //depot/projects/hammer/sys/i386/pci/pci_bus.c#15 integrate
.. //depot/projects/hammer/sys/i386/pci/pci_pir.c#2 integrate
.. //depot/projects/hammer/sys/ia64/acpica/OsdEnvironment.c#5 integrate
.. //depot/projects/hammer/sys/ia64/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/hammer/sys/ia64/acpica/madt.c#5 integrate
.. //depot/projects/hammer/sys/ia64/conf/GENERIC#14 integrate
.. //depot/projects/hammer/sys/ia64/conf/SKI#9 integrate
.. //depot/projects/hammer/sys/ia64/ia64/trap.c#23 integrate
.. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#22 integrate
.. //depot/projects/hammer/sys/ia64/include/acpica_machdep.h#3 integrate
.. //depot/projects/hammer/sys/ia64/include/float.h#5 integrate
.. //depot/projects/hammer/sys/ia64/include/sf_buf.h#2 integrate
.. //depot/projects/hammer/sys/isa/fd.c#16 integrate
.. //depot/projects/hammer/sys/isa/psm.c#16 integrate
.. //depot/projects/hammer/sys/kern/imgact_elf.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_clock.c#16 integrate
.. //depot/projects/hammer/sys/kern/kern_environment.c#6 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#26 integrate
.. //depot/projects/hammer/sys/kern/kern_intr.c#23 integrate
.. //depot/projects/hammer/sys/kern/kern_jail.c#10 integrate
.. //depot/projects/hammer/sys/kern/kern_mac.c#27 integrate
.. //depot/projects/hammer/sys/kern/kern_poll.c#8 integrate
.. //depot/projects/hammer/sys/kern/kern_thr.c#16 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#47 integrate
.. //depot/projects/hammer/sys/kern/kern_timeout.c#14 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#30 integrate
.. //depot/projects/hammer/sys/kern/subr_mbuf.c#20 integrate
.. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#4 integrate
.. //depot/projects/hammer/sys/kern/subr_smp.c#18 integrate
.. //depot/projects/hammer/sys/kern/uipc_mbuf.c#15 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#22 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#29 integrate
.. //depot/projects/hammer/sys/kern/vfs_export.c#6 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#26 integrate
.. //depot/projects/hammer/sys/libkern/quad.h#6 integrate
.. //depot/projects/hammer/sys/modules/Makefile#41 integrate
.. //depot/projects/hammer/sys/modules/acpi/Makefile#14 integrate
.. //depot/projects/hammer/sys/modules/acpi/acpi/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/acpi/acpi_asus/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/asr/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/cam/Makefile#7 integrate
.. //depot/projects/hammer/sys/modules/cp/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/geom/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/geom/geom_gate/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ipfilter/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/netgraph/Makefile#9 integrate
.. //depot/projects/hammer/sys/modules/netgraph/hub/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/sio/Makefile#2 integrate
.. //depot/projects/hammer/sys/net/bridge.c#12 integrate
.. //depot/projects/hammer/sys/net/if.c#18 integrate
.. //depot/projects/hammer/sys/net/if.h#9 integrate
.. //depot/projects/hammer/sys/net/if_arcsubr.c#10 integrate
.. //depot/projects/hammer/sys/net/if_arp.h#4 integrate
.. //depot/projects/hammer/sys/net/if_atmsubr.c#14 integrate
.. //depot/projects/hammer/sys/net/if_ethersubr.c#25 integrate
.. //depot/projects/hammer/sys/net/if_faith.c#11 integrate
.. //depot/projects/hammer/sys/net/if_fddisubr.c#12 integrate
.. //depot/projects/hammer/sys/net/if_gif.c#12 integrate
.. //depot/projects/hammer/sys/net/if_gre.c#14 integrate
.. //depot/projects/hammer/sys/net/if_iso88025subr.c#11 integrate
.. //depot/projects/hammer/sys/net/if_loop.c#17 integrate
.. //depot/projects/hammer/sys/net/if_ppp.c#12 integrate
.. //depot/projects/hammer/sys/net/if_stf.c#12 integrate
.. //depot/projects/hammer/sys/net/if_var.h#15 integrate
.. //depot/projects/hammer/sys/net/if_vlan.c#12 integrate
.. //depot/projects/hammer/sys/net/radix.c#9 integrate
.. //depot/projects/hammer/sys/net/radix.h#5 integrate
.. //depot/projects/hammer/sys/net/route.c#14 integrate
.. //depot/projects/hammer/sys/net/route.h#10 integrate
.. //depot/projects/hammer/sys/net/rtsock.c#11 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211.c#10 integrate
.. //depot/projects/hammer/sys/netatalk/aarp.c#11 integrate
.. //depot/projects/hammer/sys/netatalk/at_extern.h#3 integrate
.. //depot/projects/hammer/sys/netatalk/ddp_usrreq.c#10 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/common/ng_bluetooth.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#5 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#5 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#9 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#5 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#6 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_misc.c#6 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#6 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#4 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#6 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#6 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#6 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#4 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket.c#6 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#10 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#8 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#8 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#5 integrate
.. //depot/projects/hammer/sys/netgraph/ng_eiface.c#7 integrate
.. //depot/projects/hammer/sys/netgraph/ng_ether.c#8 integrate
.. //depot/projects/hammer/sys/netgraph/ng_fec.c#5 integrate
.. //depot/projects/hammer/sys/netgraph/ng_hub.c#1 branch
.. //depot/projects/hammer/sys/netgraph/ng_hub.h#1 branch
.. //depot/projects/hammer/sys/netgraph/ng_parse.c#5 integrate
.. //depot/projects/hammer/sys/netgraph/ng_pptpgre.c#6 integrate
.. //depot/projects/hammer/sys/netgraph/ng_pptpgre.h#3 integrate
.. //depot/projects/hammer/sys/netinet/if_ether.c#12 integrate
.. //depot/projects/hammer/sys/netinet/in_gif.c#6 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.c#23 integrate
.. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#7 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw.h#10 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#26 integrate
.. //depot/projects/hammer/sys/netinet/ip_icmp.c#15 integrate
.. //depot/projects/hammer/sys/netinet/ip_input.c#29 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#28 integrate
.. //depot/projects/hammer/sys/netinet/ip_var.h#17 integrate
.. //depot/projects/hammer/sys/netinet/raw_ip.c#19 integrate
.. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#4 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#24 integrate
.. //depot/projects/hammer/sys/netinet/tcp_output.c#14 integrate
.. //depot/projects/hammer/sys/netinet/tcp_subr.c#20 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#15 integrate
.. //depot/projects/hammer/sys/netinet/tcp_var.h#12 integrate
.. //depot/projects/hammer/sys/netinet/udp_usrreq.c#17 integrate
.. //depot/projects/hammer/sys/netinet6/nd6.c#12 integrate
.. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#10 integrate
.. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#8 integrate
.. //depot/projects/hammer/sys/netipsec/key.c#8 integrate
.. //depot/projects/hammer/sys/netipsec/xform_ipip.c#5 integrate
.. //depot/projects/hammer/sys/netipsec/xform_tcp.c#2 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#16 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#13 integrate
.. //depot/projects/hammer/sys/nfsclient/nfsnode.h#6 integrate
.. //depot/projects/hammer/sys/pc98/conf/GENERIC#18 integrate
.. //depot/projects/hammer/sys/pc98/conf/NOTES#26 integrate
.. //depot/projects/hammer/sys/pc98/pc98/fd.c#16 integrate
.. //depot/projects/hammer/sys/pc98/pc98/sio.c#19 integrate
.. //depot/projects/hammer/sys/pci/agp.c#12 integrate
.. //depot/projects/hammer/sys/pci/agp_i810.c#14 integrate
.. //depot/projects/hammer/sys/pci/amdpm.c#7 integrate
.. //depot/projects/hammer/sys/pci/cy_pci.c#6 delete
.. //depot/projects/hammer/sys/pci/if_sk.c#24 integrate
.. //depot/projects/hammer/sys/powerpc/conf/GENERIC#14 integrate
.. //depot/projects/hammer/sys/powerpc/include/float.h#5 integrate
.. //depot/projects/hammer/sys/powerpc/include/param.h#8 integrate
.. //depot/projects/hammer/sys/powerpc/include/pmap.h#7 integrate
.. //depot/projects/hammer/sys/powerpc/include/sf_buf.h#2 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#3 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/ata_macio.c#7 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#17 integrate
.. //depot/projects/hammer/sys/security/mac/mac_net.c#10 integrate
.. //depot/projects/hammer/sys/security/mac_test/mac_test.c#22 integrate
.. //depot/projects/hammer/sys/sparc64/conf/GENERIC#20 integrate
.. //depot/projects/hammer/sys/sparc64/conf/NOTES#4 integrate
.. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#8 integrate
.. //depot/projects/hammer/sys/sparc64/include/float.h#4 integrate
.. //depot/projects/hammer/sys/sparc64/include/nexusvar.h#2 integrate
.. //depot/projects/hammer/sys/sparc64/isa/ofw_isa.c#4 integrate
.. //depot/projects/hammer/sys/sparc64/isa/ofw_isa.h#3 integrate
.. //depot/projects/hammer/sys/sparc64/pci/psycho.c#16 integrate
.. //depot/projects/hammer/sys/sparc64/pci/psychoreg.h#4 integrate
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Thu May 6 22:45:46 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 9C1ED16A4D0; Thu, 6 May 2004 22:45:46 -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 74FD916A4CE
for <perforce@freebsd.org>; Thu, 6 May 2004 22:45:46 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 2C21843D41
for <perforce@freebsd.org>; Thu, 6 May 2004 22:45:44 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i475jiGe023651
for <perforce@freebsd.org>; Thu, 6 May 2004 22:45:44 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i475jhSS023648
for perforce@freebsd.org; Thu, 6 May 2004 22:45:43 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Date: Thu, 6 May 2004 22:45:43 -0700 (PDT)
Message-Id: <200405070545.i475jhSS023648@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52394 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: Fri, 07 May 2004 05:45:47 -0000
http://perforce.freebsd.org/chv.cgi?CH=52394
Change 52394 by marcel@marcel_nfs on 2004/05/06 22:45:41
IFC @52393
Affected files ...
.. //depot/projects/gdb/etc/rc.d/power_profile#3 integrate
.. //depot/projects/gdb/lib/libc/gen/fts.c#2 integrate
.. //depot/projects/gdb/lib/msun/man/hypot.3#2 integrate
.. //depot/projects/gdb/release/Makefile#5 integrate
.. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 integrate
.. //depot/projects/gdb/share/man/man3/fpgetround.3#2 integrate
.. //depot/projects/gdb/share/man/man4/acpi.4#5 integrate
.. //depot/projects/gdb/share/man/man4/icmp.4#2 integrate
.. //depot/projects/gdb/share/man/man4/vlan.4#2 integrate
.. //depot/projects/gdb/share/man/man9/buf.9#2 integrate
.. //depot/projects/gdb/share/man/man9/cd.9#2 integrate
.. //depot/projects/gdb/share/man/man9/hexdump.9#2 integrate
.. //depot/projects/gdb/share/man/man9/rtentry.9#2 integrate
.. //depot/projects/gdb/share/man/man9/time.9#2 integrate
.. //depot/projects/gdb/share/man/man9/timeout.9#3 integrate
.. //depot/projects/gdb/share/man/man9/vm_map_remove.9#2 integrate
.. //depot/projects/gdb/share/man/man9/vm_page_io.9#2 integrate
.. //depot/projects/gdb/sys/alpha/alpha/fp_emulate.c#2 integrate
.. //depot/projects/gdb/sys/alpha/alpha/ieee_float.c#2 integrate
.. //depot/projects/gdb/sys/alpha/include/fpu.h#2 integrate
.. //depot/projects/gdb/sys/amd64/acpica/OsdEnvironment.c#2 integrate
.. //depot/projects/gdb/sys/amd64/include/acpica_machdep.h#2 integrate
.. //depot/projects/gdb/sys/conf/files.i386#14 integrate
.. //depot/projects/gdb/sys/conf/files.ia64#5 integrate
.. //depot/projects/gdb/sys/conf/files.pc98#9 integrate
.. //depot/projects/gdb/sys/conf/majors#6 integrate
.. //depot/projects/gdb/sys/contrib/dev/acpica/acfreebsd.h#5 integrate
.. //depot/projects/gdb/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate
.. //depot/projects/gdb/sys/dev/acpica/Osd/OsdSynch.c#3 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi.c#15 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_acad.c#5 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_cpu.c#6 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_pci.c#8 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_pcib.c#6 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_thermal.c#6 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpivar.h#10 integrate
.. //depot/projects/gdb/sys/dev/asr/asr.c#8 integrate
.. //depot/projects/gdb/sys/dev/cp/cpddk.c#1 branch
.. //depot/projects/gdb/sys/dev/cp/cpddk.h#1 branch
.. //depot/projects/gdb/sys/dev/cp/if_cp.c#1 branch
.. //depot/projects/gdb/sys/dev/cp/ng_cp.h#1 branch
.. //depot/projects/gdb/sys/dev/hme/if_hme.c#3 integrate
.. //depot/projects/gdb/sys/dev/if_ndis/if_ndis.c#15 integrate
.. //depot/projects/gdb/sys/dev/usb/ohcireg.h#2 integrate
.. //depot/projects/gdb/sys/dev/usb/usbdevs#9 integrate
.. //depot/projects/gdb/sys/dev/usb/usbdevs.h#9 integrate
.. //depot/projects/gdb/sys/dev/usb/usbdevs_data.h#9 integrate
.. //depot/projects/gdb/sys/dev/usb/uvisor.c#3 integrate
.. //depot/projects/gdb/sys/fs/nwfs/nwfs_io.c#3 integrate
.. //depot/projects/gdb/sys/fs/smbfs/smbfs_io.c#3 integrate
.. //depot/projects/gdb/sys/fs/specfs/spec_vnops.c#7 integrate
.. //depot/projects/gdb/sys/geom/gate/g_gate.c#4 integrate
.. //depot/projects/gdb/sys/i386/acpica/OsdEnvironment.c#2 integrate
.. //depot/projects/gdb/sys/i386/acpica/acpi_machdep.c#5 integrate
.. //depot/projects/gdb/sys/i386/acpica/acpi_wakeup.c#3 integrate
.. //depot/projects/gdb/sys/i386/i386/legacy.c#2 integrate
.. //depot/projects/gdb/sys/i386/i386/machdep.c#6 integrate
.. //depot/projects/gdb/sys/i386/i386/mptable.c#3 integrate
.. //depot/projects/gdb/sys/i386/include/acpica_machdep.h#2 integrate
.. //depot/projects/gdb/sys/i386/isa/atpic.c#5 integrate
.. //depot/projects/gdb/sys/ia64/acpica/OsdEnvironment.c#2 integrate
.. //depot/projects/gdb/sys/ia64/ia64/interrupt.c#4 integrate
.. //depot/projects/gdb/sys/ia64/ia64/trap.c#8 integrate
.. //depot/projects/gdb/sys/ia64/include/acpica_machdep.h#2 integrate
.. //depot/projects/gdb/sys/kern/subr_smp.c#6 integrate
.. //depot/projects/gdb/sys/kern/uipc_syscalls.c#9 integrate
.. //depot/projects/gdb/sys/kern/vfs_bio.c#5 integrate
.. //depot/projects/gdb/sys/libkern/quad.h#5 integrate
.. //depot/projects/gdb/sys/modules/Makefile#9 integrate
.. //depot/projects/gdb/sys/modules/cp/Makefile#1 branch
.. //depot/projects/gdb/sys/net80211/ieee80211.c#5 integrate
.. //depot/projects/gdb/sys/netatalk/ddp_usrreq.c#5 integrate
.. //depot/projects/gdb/sys/netinet/ip_fastfwd.c#5 integrate
.. //depot/projects/gdb/sys/netinet/ip_icmp.c#5 integrate
.. //depot/projects/gdb/sys/netinet/ip_input.c#7 integrate
.. //depot/projects/gdb/sys/netinet/ip_var.h#6 integrate
.. //depot/projects/gdb/sys/nfsclient/nfs_bio.c#6 integrate
.. //depot/projects/gdb/sys/pc98/pc98/sio.c#7 integrate
.. //depot/projects/gdb/sys/sys/condvar.h#4 integrate
.. //depot/projects/gdb/sys/vm/swap_pager.c#4 integrate
.. //depot/projects/gdb/sys/vm/vm_fault.c#4 integrate
.. //depot/projects/gdb/sys/vm/vm_map.c#7 integrate
.. //depot/projects/gdb/sys/vm/vnode_pager.c#4 integrate
.. //depot/projects/gdb/usr.bin/calendar/calendars/calendar.freebsd#7 integrate
.. //depot/projects/gdb/usr.bin/tar/bsdtar.c#7 integrate
.. //depot/projects/gdb/usr.bin/tip/tip/tip.h#2 integrate
.. //depot/projects/gdb/usr.bin/tip/tip/value.c#2 integrate
Differences ...
==== //depot/projects/gdb/etc/rc.d/power_profile#3 (text+ko) ====
@@ -5,7 +5,7 @@
#
# Arguments: 0x00 (AC offline, economy) or 0x01 (AC online, performance)
#
-# $FreeBSD: src/etc/rc.d/power_profile,v 1.2 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/power_profile,v 1.3 2004/05/07 05:22:38 njl Exp $
#
# PROVIDE: power_profile
@@ -71,9 +71,9 @@
# Set the various sysctls based on the profile's values.
node="hw.acpi.cpu.cx_lowest"
-highest_value=0
+highest_value="C1"
lowest_value="$(sysctl -n hw.acpi.cpu.cx_supported | \
- awk '{ print split($0, a) - 1 }' - 2> /dev/null)"
+ awk '{ print "C" split($0, a) }' - 2> /dev/null)"
eval value=\$${profile}_cx_lowest
sysctl_set
==== //depot/projects/gdb/lib/libc/gen/fts.c#2 (text+ko) ====
@@ -37,7 +37,7 @@
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.22 2003/01/03 23:25:25 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.23 2004/05/05 06:33:00 kientzle Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -599,6 +599,7 @@
FTSENT *cur, *tail;
DIR *dirp;
void *oldaddr;
+ size_t dnamlen;
int cderrno, descend, len, level, maxlen, nlinks, oflag, saved_errno,
nostat, doadjust;
char *cp;
@@ -704,14 +705,15 @@
/* Read the directory, attaching each entry to the `link' pointer. */
doadjust = 0;
for (head = tail = NULL, nitems = 0; dirp && (dp = readdir(dirp));) {
+ dnamlen = dp->d_namlen;
if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
continue;
- if ((p = fts_alloc(sp, dp->d_name, (int)dp->d_namlen)) == NULL)
+ if ((p = fts_alloc(sp, dp->d_name, (int)dnamlen)) == NULL)
goto mem1;
- if (dp->d_namlen >= maxlen) { /* include space for NUL */
+ if (dnamlen >= maxlen) { /* include space for NUL */
oldaddr = sp->fts_path;
- if (fts_palloc(sp, dp->d_namlen + len + 1)) {
+ if (fts_palloc(sp, dnamlen + len + 1)) {
/*
* No more memory for path or structures. Save
* errno, free up the current structure and the
@@ -736,7 +738,7 @@
maxlen = sp->fts_pathlen - len;
}
- if (len + dp->d_namlen >= USHRT_MAX) {
+ if (len + dnamlen >= USHRT_MAX) {
/*
* In an FTSENT, fts_pathlen is a u_short so it is
* possible to wraparound here. If we do, free up
@@ -753,7 +755,7 @@
}
p->fts_level = level;
p->fts_parent = sp->fts_cur;
- p->fts_pathlen = len + dp->d_namlen;
+ p->fts_pathlen = len + dnamlen;
#ifdef FTS_WHITEOUT
if (dp->d_type == DT_WHT)
==== //depot/projects/gdb/lib/msun/man/hypot.3#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)hypot.3 6.7 (Berkeley) 5/6/91
-.\" $FreeBSD: src/lib/msun/man/hypot.3,v 1.10 2002/12/27 12:15:31 schweikh Exp $
+.\" $FreeBSD: src/lib/msun/man/hypot.3,v 1.11 2004/05/06 13:11:18 stefanf Exp $
.\"
.Dd May 6, 1991
.Dt HYPOT 3
@@ -49,24 +49,27 @@
.Fn hypot "double x" "double y"
.Ft float
.Fn hypotf "float x" "float y"
-.Vt struct {double x, y;} z ;
+.In complex.h
.Ft double
-.Fn cabs z
-.Vt struct {float x, y;} z ;
+.Fn cabs "double complex z"
.Ft float
-.Fn cabsf z
+.Fn cabsf "float complex z"
.Sh DESCRIPTION
The
-.Fn hypot ,
-.Fn hypotf ,
-.Fn cabs
+.Fn hypot
and
-.Fn cabsf
+.Fn hypotf
functions
compute the
sqrt(x*x+y*y)
in such a way that underflow will not happen, and overflow
occurs only if the final result deserves it.
+The
+.Fn cabs
+and
+.Fn cabsf
+functions compute the complex absolute value of
+.Ar z .
.Pp
.Fn hypot "\*(If" "v"
=
==== //depot/projects/gdb/release/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.843 2004/04/30 13:52:09 kensmith Exp $
+# $FreeBSD: src/release/Makefile,v 1.844 2004/05/05 13:06:40 hrs Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -965,7 +965,8 @@
WITHOUT_PYTHON=yes FORCE_PKG_REGISTER=yes; \
done
@cd /usr/doc && make all install 'FORMATS=html html-split txt' \
- INSTALL_COMPRESSED='' DOCDIR=${RD}/trees/base/usr/share/doc
+ INSTALL_COMPRESSED='' DOCDIR=${RD}/trees/base/usr/share/doc \
+ URLS_ABSOLUTE=YES
touch ${.TARGET}
#
==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 (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.723 2004/05/01 18:11:20 brueffer Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.724 2004/05/06 13:51:00 joerg Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -220,6 +220,10 @@
<para>The &man.getvfsent.3; API has been removed.</para>
+ <para arch="sparc64">The &man.hme.4; driver now natively supports
+ long frames, so it can be used for &man.vlan.4; with full ethernet
+ MTU size.</para>
+
<para>&man.jail.8; now supports use of raw sockets from within a jail.
This feature is disabled by default, and controlled using the
<varname>security.jail.allow_raw_sockets</varname> sysctl.</para>
==== //depot/projects/gdb/share/man/man3/fpgetround.3#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)fpgetround.3 1.0 (Berkeley) 9/23/93
-.\" $FreeBSD: src/share/man/man3/fpgetround.3,v 1.11 2001/10/01 16:09:20 ru Exp $
+.\" $FreeBSD: src/share/man/man3/fpgetround.3,v 1.12 2004/05/05 09:53:29 das Exp $
.\"
.Dd August 23, 1993
.Dt FPGETROUND 3
@@ -154,6 +154,13 @@
fpresetsticky(FP_X_DZ);
fpsetmask(FP_X_DZ);
.Ed
+.Sh IMPLEMENTATION NOTES
+The
+.Fn fpgetprec
+and
+.Fn fpsetprec
+functions provide functionality unavailable on many platforms.
+At present, they are implemented only on the i386 and amd64 platforms.
.Sh SEE ALSO
.Xr isnan 3
.Sh CAVEAT
==== //depot/projects/gdb/share/man/man4/acpi.4#5 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.33 2004/04/20 17:45:47 njl Exp $
+.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.34 2004/05/07 05:22:37 njl Exp $
.\"
.Dd July 2, 2001
.Dt ACPI 4
@@ -366,19 +366,21 @@
.Va hw.acpi.cpu.cx_lowest
is modified.
.It Va hw.acpi.cpu.cx_lowest
-Zero-based index of the lowest CPU idle state to use.
-A scheduling algorithm will select between 0...index for the state
-to use during the next sleep.
+Lowest Cx state to use for idling the CPU.
+A scheduling algorithm will select states between C1 and this setting
+as system load dictates.
To enable ACPI CPU idling control,
.Va machdep.cpu_idle_hlt
must be set to 1.
.It Va hw.acpi.cpu.cx_supported
List of supported CPU idle states and their transition latency
in microseconds.
-Each state has a type, C1-3.
+Each state has a type (e.g., C2.)
C1 is equivalent to the ia32 HLT instruction, C2 provides a deeper
sleep with the same semantics, and C3 provides the deepest sleep
but additionally requires bus mastering to be disabled.
+States greater than C3 provide even more power savings with the same
+semantics as the C3 state.
Deeper sleeps provide more power savings but increased transition
latency when an interrupt occurs.
.El
==== //depot/projects/gdb/share/man/man4/icmp.4#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)icmp.4 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/share/man/man4/icmp.4,v 1.13 2003/06/28 23:53:37 ru Exp $
+.\" $FreeBSD: src/share/man/man4/icmp.4,v 1.14 2004/05/07 01:24:53 maxim Exp $
.\"
.Dd March 21, 2003
.Dt ICMP 4
@@ -132,6 +132,11 @@
.Pq Vt boolean
Enable/disable ICMP replies received via broadcast or multicast.
Defaults to false.
+.It Va reply_src
+.Pq Vt str
+An interface name used for the ICMP reply source in reponse to packets
+which are not directly addressed to us.
+By default continue with normal source selection.
.El
.Sh ERRORS
A socket operation may fail with one of the following errors returned:
==== //depot/projects/gdb/share/man/man4/vlan.4#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/share/man/man4/vlan.4,v 1.11 2002/11/15 00:25:33 sam Exp $
+.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.12 2004/05/06 13:38:53 joerg Exp $
.\"
.Dd November 14, 2002
.Dt VLAN 4
@@ -124,6 +124,10 @@
supports long frames for
.Nm
natively.
+.It Xr hme 4
+supports long frames for
+.Nm
+natively.
.It Xr sis 4
supports long frames for
.Nm
==== //depot/projects/gdb/share/man/man9/buf.9#2 (text+ko) ====
@@ -29,7 +29,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/buf.9,v 1.13 2003/10/23 02:22:07 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/buf.9,v 1.14 2004/05/05 10:47:19 hmp Exp $
.\"
.Dd December 22, 1998
.Dt BUF 9
@@ -125,8 +125,11 @@
In the case
where B_DELWRI is not set, the underlying dirty pages are still properly
marked as dirty and the buffer can be completely freed without losing that
-clean/dirty state information. ( XXX do we have to check other flags in
-regards to this situation ??? ).
+clean/dirty state information.
+.Po
+XXX do we have to check other flags in
+regards to this situation ???
+.Pc
.Pp
The kernel reserves a portion of its KVM space to hold VM Buffer's data
maps.
==== //depot/projects/gdb/share/man/man9/cd.9#2 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/cd.9,v 1.20 2003/10/23 05:34:13 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/cd.9,v 1.21 2004/05/05 10:47:19 hmp Exp $
.\"
.Dd September 2, 2003
.Dt CD 9
@@ -90,9 +90,13 @@
determine whether the drive in question needs 10 byte commands.
First, it
issues a CAM Path Inquiry command to determine whether the protocol that
-the drive speaks typically only allows 10 byte commands. (ATAPI and USB
+the drive speaks typically only allows 10 byte commands.
+.Po
+ATAPI and USB
are two prominent examples of protocols where you generally only want to
-send 10 byte commands.) Then, if it gets an ILLEGAL REQUEST error back
+send 10 byte commands.
+.Pc
+Then, if it gets an ILLEGAL REQUEST error back
from a 6 byte MODE SENSE or MODE SELECT command, it attempts to send the 10
byte version of the command instead.
The only reason you would need a
==== //depot/projects/gdb/share/man/man9/hexdump.9#2 (text+ko) ====
@@ -26,7 +26,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/share/man/man9/hexdump.9,v 1.2 2003/12/12 11:08:51 roam Exp $
+.\" $FreeBSD: src/share/man/man9/hexdump.9,v 1.3 2004/05/05 10:47:19 hmp Exp $
.\"
.Dd December 7, 2003
.Os
@@ -40,26 +40,29 @@
.Fn hexdump "void *ptr" "int length" "const char *hdr" "int flags"
.Sh DESCRIPTION
Hexdump prints an array of bytes to the console in hexadecimal form, along with
-the ASCII representation of the bytes, if possible. By default, each line of
+the ASCII representation of the bytes, if possible.
+By default, each line of
output will start with an offset count, followed by 16 hexadecimal values,
followed by 16 ASCII characters.
.Bl -tag -width 6n
.It Fa ptr
-Pointer to the array of bytes to print. It does not need to be NULL-terminated.
+Pointer to the array of bytes to print.
+It does not need to be NULL-terminated.
.It Fa length
Number of bytes to print
.It Fa hdr
Pointer to a NULL-terminated character string that will be prepended to each
-line of output. A value of NULL implies that no header will be printed.
+line of output.
+A value of NULL implies that no header will be printed.
.It Fa flags
Flags for controlling the formatting of the output
.Bl -tag -width HD_OMIT_COUNT
.It Fa Bits 0-7
-Integer value of the number of bytes to display on each line. A value of 0
-implies that the default value of 16 will be used.
+Integer value of the number of bytes to display on each line.
+A value of 0 implies that the default value of 16 will be used.
.It Fa Bits 8-15
-Character ASCII value to use as the separator for the hexadecimal output. A
-value of 0 implies that the default value of 32 (ASCII space) will be used.
+Character ASCII value to use as the separator for the hexadecimal output.
+A value of 0 implies that the default value of 32 (ASCII space) will be used.
.It Fa HD_OMIT_COUNT
Don't print the offset column at the beginning of each line
.It Fa HD_OMIT_HEX
==== //depot/projects/gdb/share/man/man9/rtentry.9#2 (text+ko) ====
@@ -26,7 +26,7 @@
.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/rtentry.9,v 1.19 2003/10/23 02:15:46 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/rtentry.9,v 1.20 2004/05/05 10:47:19 hmp Exp $
.Dd October 8, 1996
.Os
.Dt RTENTRY 9
@@ -62,9 +62,9 @@
their substructure the key (i.e., destination address) and mask used
when the route was created.
The
-.Fn rt_key \&rt
+.Vt rt_key \&rt
and
-.Fn rt_mask \&rt
+.Vt rt_mask \&rt
macros can be used to extract this information (in the form of a
.Dq Li "struct sockaddr *" )
given a
@@ -125,10 +125,13 @@
When the
.Dv RTF_LLINFO
flag is set, this field contains information specific to the link
-layer represented by the named interface address. (It is normally
-managed by the
-.Fn rt_ifa->ifa_rtrequest
-routine.) Protocols such as
+layer represented by the named interface address.
+.Po
+It is normally managed by the
+.Vt rt_ifa->ifa_rtrequest
+routine.
+.Pc
+Protocols such as
.Xr arp 4
use this field to reference per-destination state internal to that
protocol.
@@ -194,8 +197,11 @@
the
.Xr route 4
interface requesting that an external process perform resolution for
-this route. (Used in conjunction with
-.Dv RTF_CLONING . )
+this route.
+.Po
+Used in conjunction with
+.Dv RTF_CLONING .
+.Pc
.It Dv RTF_LLINFO
Indicates that this route represents information being managed by a
link layer's adaptation layer (e.g.,
@@ -213,11 +219,14 @@
.It Dv RTF_PRCLONING
Like
.Dv RTF_CLONING ,
-only managed by an entire protocol. (E.g.,
+only managed by an entire protocol.
+.Po
+E.g.,
.Tn IP
uses this flag to manage a per-host cache integrated with the routing
table, for those destinations which do not have a link layer
-performing this function.)
+performing this function.
+.Pc
.It Dv RTF_WASCLONED
Indicates that this route was generated as a result of cloning
requested by the
@@ -337,7 +346,7 @@
There is some disagreement over whether it is legitimate for
.Dv RTF_LLINFO
to be set by any process other than
-.Fn rt_ifa->ifa_rtrequest .
+.Vt rt_ifa->ifa_rtrequest .
.Sh AUTHORS
This manual page was written by
.An Garrett Wollman .
==== //depot/projects/gdb/share/man/man9/time.9#2 (text+ko) ====
@@ -29,7 +29,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/share/man/man9/time.9,v 1.10 2003/10/23 02:33:03 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/time.9,v 1.11 2004/05/05 10:47:19 hmp Exp $
.\"
.Dd March 22, 1997
.Dt TIME 9
@@ -92,9 +92,12 @@
It is set
from
.Va time
-at boot, and is updated by the periodic timer interrupt. (It is
+at boot, and is updated by the periodic timer interrupt.
+.Po
+It is
not updated by
-.Xr settimeofday 2 . )
+.Xr settimeofday 2 .
+.Pc
.Pp
All of these variables contain times
expressed in seconds and microseconds since midnight (0 hour),
==== //depot/projects/gdb/share/man/man9/timeout.9#3 (text+ko) ====
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/timeout.9,v 1.21 2004/04/06 23:08:49 cperciva Exp $
+.\" $FreeBSD: src/share/man/man9/timeout.9,v 1.22 2004/05/05 10:47:19 hmp Exp $
.\"
.Dd September 10, 1996
.Dt TIMEOUT 9
@@ -203,7 +203,8 @@
is identical to
.Fn callout_stop
except that it will wait for the callout to be completed if it is
-already in progress. This MUST NOT be called while holding any
+already in progress.
+This function MUST NOT be called while holding any
locks on which the callout might block, or deadlock will result.
.Pp
The function
==== //depot/projects/gdb/share/man/man9/vm_map_remove.9#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/share/man/man9/vm_map_remove.9,v 1.1 2003/09/30 00:51:31 bms Exp $
+.\" $FreeBSD: src/share/man/man9/vm_map_remove.9,v 1.2 2004/05/05 10:59:50 hmp Exp $
.\"
.Dd July 19, 2003
.Dt vm_map_remove 9
@@ -47,7 +47,7 @@
.Fa map .
.Sh IMPLEMENTATION NOTES
This is the exported form of
-.Xr vm_map_remove 9
+.Xr vm_map_delete 9
which may be called by consumers of the VM subsystem.
.Pp
The function calls
==== //depot/projects/gdb/share/man/man9/vm_page_io.9#2 (text+ko) ====
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
.\" DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/vm_page_io.9,v 1.3 2001/10/04 10:10:56 bde Exp $
+.\" $FreeBSD: src/share/man/man9/vm_page_io.9,v 1.4 2004/05/05 10:01:06 hmp Exp $
.\"
.Dd July 17, 2001
.Dt VM_PAGE_IO_START 9
@@ -44,17 +44,19 @@
.Sh DESCRIPTION
The
.Fn vm_page_io_start
-function prepares the page for I/O by incrementing its busy flag by 1.
+function prepares the page for I/O by incrementing its busy flag by one.
.Pp
The
.Fn vm_page_io_finish
function lowers the busy count on the page by one, if the resulting busy
-count is zero, a wakeup will be issued if the page has been marked
+count is zero, a
+.Xr wakeup 9
+will be issued if the page has been marked
.Dv PG_WANTED .
A page is typically marked
.Dv PG_WANTED
-by a thread to register interested in
-the page either completing I/O or becoming available for general use.
+by a thread to register its interest in
+the page to either complete I/O or becoming available for general use.
.Sh AUTHORS
.An -nosplit
This man page was written by
==== //depot/projects/gdb/sys/alpha/alpha/fp_emulate.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.13 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.14 2004/05/06 09:35:57 das Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -296,7 +296,7 @@
td->td_pcb->pcb_fp_control = control;
/* Regenerate the control register */
- fpcr = fpregs->fpr_cr & FPCR_DYN_MASK;
+ fpcr = fpregs->fpr_cr & (FPCR_DYN_MASK | FPCR_STATUS_MASK);
fpcr |= ((control & IEEE_STATUS_MASK)
<< IEEE_STATUS_TO_FPCR_SHIFT);
if (!(control & IEEE_TRAP_ENABLE_INV))
==== //depot/projects/gdb/sys/alpha/alpha/ieee_float.c#2 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.9 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.10 2004/05/06 09:36:11 das Exp $");
#include <sys/types.h>
#ifdef TEST
@@ -312,6 +312,9 @@
break;
}
+ if (frac == 0)
+ *status |= FPCR_UNF;
+
/*
* Rounding up may take us to TWO if
* fraclo == (TWO - epsilon). Also If fraclo has been
==== //depot/projects/gdb/sys/alpha/include/fpu.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/sys/alpha/include/fpu.h,v 1.6 2002/11/16 06:35:51 deischen Exp $
+ * $FreeBSD: src/sys/alpha/include/fpu.h,v 1.7 2004/05/06 09:35:57 das Exp $
*/
#ifndef _MACHINE_FPU_H_
@@ -56,6 +56,8 @@
#define FPCR_INED (1LL << 62) /* Inexact Disable */
#define FPCR_SUM (1LL << 63) /* Summary Bit */
#define FPCR_MASK (~0LL << 49)
+#define FPCR_STATUS_MASK (FPCR_INV | FPCR_DZE | FPCR_OVF | \
+ FPCR_UNF | FPCR_INE | FPCR_IOV)
/*
* Exception summary bits.
==== //depot/projects/gdb/sys/amd64/acpica/OsdEnvironment.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.11 2003/08/28 16:30:31 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.12 2004/05/06 02:18:57 njl Exp $");
/*
* 6.1 : Environmental support
@@ -37,7 +37,7 @@
#include "acpi.h"
-u_long amd64_acpi_root;
+static u_long amd64_acpi_root;
SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &amd64_acpi_root, 0,
"The physical address of the RSDP");
==== //depot/projects/gdb/sys/amd64/include/acpica_machdep.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/sys/amd64/include/acpica_machdep.h,v 1.4 2003/11/21 03:02:00 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.5 2004/05/05 20:04:14 njl Exp $
*/
/******************************************************************************
@@ -59,44 +59,14 @@
#define ACPI_FLUSH_CPU_CACHE() wbinvd()
-#define asm __asm
-/*! [Begin] no source code translation
- *
- * A brief explanation as GNU inline assembly is a bit hairy
- * %0 is the output parameter in EAX ("=a")
- * %1 and %2 are the input parameters in ECX ("c")
- * and an immediate value ("i") respectively
- * All actual register references are preceded with "%%" as in "%%edx"
- * Immediate values in the assembly are preceded by "$" as in "$0x1"
- * The final asm parameter are the operation altered non-output registers.
- */
+/* Section 5.2.9.1: global lock acquire/release functions */
+extern int acpi_acquire_global_lock(uint32_t *lock);
+extern int acpi_release_global_lock(uint32_t *lock);
#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \
- do { \
- asm("1: movl %1,%%eax;" \
- "movl %%eax,%%edx;" \
- "andl %2,%%edx;" \
- "btsl $0x1,%%edx;" \
- "adcl $0x0,%%edx;" \
- "lock; cmpxchgl %%edx,%1;" \
- "jnz 1b;" \
- "cmpb $0x3,%%dl;" \
- "sbbl %%eax,%%eax" \
- : "=a" (Acq), "+m" (GLptr) : "i" (~1L) : "edx"); \
- } while(0)
-
+ ((Acq) = acpi_acquire_global_lock(GLptr))
#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \
- do { \
- asm("1: movl %1,%%eax;" \
- "movl %%eax,%%edx;" \
- "andl %2,%%edx;" \
- "lock; cmpxchgl %%edx,%1;" \
- "jnz 1b;" \
- "andl $0x1,%%eax" \
- : "=a" (Acq), "+m" (GLptr) : "i" (~3L) : "edx"); \
- } while(0)
-
-
-/*! [End] no source code translation !*/
+ ((Acq) = acpi_release_global_lock(GLptr))
+
#endif /* _KERNEL */
#define ACPI_MACHINE_WIDTH 64
==== //depot/projects/gdb/sys/conf/files.i386#14 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.487 2004/05/04 20:07:45 jhb Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.489 2004/05/05 11:17:26 bde Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -79,24 +79,24 @@
compat/ndis/subr_ndis.c optional ndisapi pci
compat/ndis/subr_ntoskrnl.c optional ndisapi pci
compat/ndis/subr_pe.c optional ndisapi pci
-compat/pecoff/imgact_pecoff.c optional pecoff_support
-compat/svr4/imgact_svr4.c optional compat_svr4
-compat/svr4/svr4_fcntl.c optional compat_svr4
-compat/svr4/svr4_filio.c optional compat_svr4
-compat/svr4/svr4_ioctl.c optional compat_svr4
-compat/svr4/svr4_ipc.c optional compat_svr4
-compat/svr4/svr4_misc.c optional compat_svr4
-compat/svr4/svr4_resource.c optional compat_svr4
-compat/svr4/svr4_signal.c optional compat_svr4
-compat/svr4/svr4_socket.c optional compat_svr4
-compat/svr4/svr4_sockio.c optional compat_svr4
-compat/svr4/svr4_stat.c optional compat_svr4
-compat/svr4/svr4_stream.c optional compat_svr4
-compat/svr4/svr4_syscallnames.c optional compat_svr4
-compat/svr4/svr4_sysent.c optional compat_svr4
-compat/svr4/svr4_sysvec.c optional compat_svr4
-compat/svr4/svr4_termios.c optional compat_svr4
-compat/svr4/svr4_ttold.c optional compat_svr4
+compat/pecoff/imgact_pecoff.c optional pecoff_support
+compat/svr4/imgact_svr4.c optional compat_svr4
+compat/svr4/svr4_fcntl.c optional compat_svr4
+compat/svr4/svr4_filio.c optional compat_svr4
+compat/svr4/svr4_ioctl.c optional compat_svr4
+compat/svr4/svr4_ipc.c optional compat_svr4
+compat/svr4/svr4_misc.c optional compat_svr4
+compat/svr4/svr4_resource.c optional compat_svr4
+compat/svr4/svr4_signal.c optional compat_svr4
+compat/svr4/svr4_socket.c optional compat_svr4
+compat/svr4/svr4_sockio.c optional compat_svr4
+compat/svr4/svr4_stat.c optional compat_svr4
+compat/svr4/svr4_stream.c optional compat_svr4
+compat/svr4/svr4_syscallnames.c optional compat_svr4
+compat/svr4/svr4_sysent.c optional compat_svr4
+compat/svr4/svr4_sysvec.c optional compat_svr4
+compat/svr4/svr4_termios.c optional compat_svr4
+compat/svr4/svr4_ttold.c optional compat_svr4
contrib/dev/fla/fla.c optional fla
contrib/dev/oltr/if_oltr.c optional oltr
contrib/dev/oltr/trlldbm.c optional oltr
@@ -120,8 +120,8 @@
dev/advansys/adv_isa.c optional adv isa
dev/aic/aic_isa.c optional aic isa
dev/ar/if_ar.c optional ar
+dev/ar/if_ar_isa.c optional ar isa
dev/ar/if_ar_pci.c optional ar pci
-dev/ar/if_ar_isa.c optional ar isa
dev/arl/if_arl.c optional arl
dev/arl/if_arl_isa.c optional arl isa
dev/cm/if_cm_isa.c optional cm isa
@@ -138,10 +138,10 @@
dev/fb/vga.c optional vga
dev/fe/if_fe_isa.c optional fe isa
dev/if_ndis/if_ndis.c optional ndis
-dev/if_ndis/if_ndis_pci.c optional ndis pci
-dev/if_ndis/if_ndis_pci.c optional ndis cardbus
dev/if_ndis/if_ndis_pccard.c optional ndis card
dev/if_ndis/if_ndis_pccard.c optional ndis pccard
+dev/if_ndis/if_ndis_pci.c optional ndis cardbus
+dev/if_ndis/if_ndis_pci.c optional ndis pci
dev/kbd/atkbd.c optional atkbd
dev/kbd/atkbdc.c optional atkbdc
dev/kbd/kbd.c optional atkbd
@@ -176,8 +176,6 @@
geom/geom_bsd_enc.c standard
geom/geom_mbr.c standard
geom/geom_mbr_enc.c standard
-libkern/ffsl.c standard
-libkern/flsl.c standard
i386/acpica/OsdEnvironment.c optional acpi
i386/acpica/acpi_asus.c optional acpi_asus acpi
i386/acpica/acpi_machdep.c optional acpi
@@ -296,8 +294,8 @@
i386/linux/linux_ptrace.c optional compat_linux
i386/linux/linux_sysent.c optional compat_linux
i386/linux/linux_sysvec.c optional compat_linux
+i386/pci/pci_bus.c optional pci
i386/pci/pci_cfgreg.c optional pci
-i386/pci/pci_bus.c optional pci
i386/pci/pci_pir.c optional pci
i386/svr4/svr4_locore.s optional compat_svr4 \
dependency "svr4_assym.h" \
@@ -401,15 +399,17 @@
kern/imgact_aout.c optional compat_aout
kern/imgact_gzip.c optional gzip
libkern/divdi3.c standard
+libkern/ffsl.c standard
+libkern/flsl.c standard
libkern/moddi3.c standard
libkern/qdivrem.c standard
libkern/ucmpdi2.c standard
libkern/udivdi3.c standard
libkern/umoddi3.c standard
-pci/agp_intel.c optional agp
-pci/agp_via.c optional agp
-pci/agp_sis.c optional agp
pci/agp_ali.c optional agp
pci/agp_amd.c optional agp
pci/agp_i810.c optional agp
+pci/agp_intel.c optional agp
pci/agp_nvidia.c optional agp
+pci/agp_sis.c optional agp
+pci/agp_via.c optional agp
==== //depot/projects/gdb/sys/conf/files.ia64#5 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.ia64,v 1.65 2004/03/20 21:06:20 alc Exp $
+# $FreeBSD: src/sys/conf/files.ia64,v 1.66 2004/05/07 03:56:00 marcel Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -36,13 +36,10 @@
contrib/ia64/libuwx/src/uwx_context.c standard
contrib/ia64/libuwx/src/uwx_env.c standard
contrib/ia64/libuwx/src/uwx_scoreboard.c standard
-#contrib/ia64/libuwx/src/uwx_self.c standard
-#contrib/ia64/libuwx/src/uwx_self_context.s standard
contrib/ia64/libuwx/src/uwx_step.c standard
contrib/ia64/libuwx/src/uwx_str.c standard
contrib/ia64/libuwx/src/uwx_swap.c standard
contrib/ia64/libuwx/src/uwx_trace.c standard
-#contrib/ia64/libuwx/src/uwx_ttrace.c standard
contrib/ia64/libuwx/src/uwx_uinfo.c standard
contrib/ia64/libuwx/src/uwx_utable.c standard
crypto/blowfish/bf_enc.c optional crypto
==== //depot/projects/gdb/sys/conf/files.pc98#9 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.293 2004/05/04 16:01:47 bde Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.296 2004/05/06 13:49:53 nyan Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -55,24 +55,24 @@
compat/linux/linux_sysctl.c optional compat_linux
compat/linux/linux_uid16.c optional compat_linux
compat/linux/linux_util.c optional compat_linux
-compat/pecoff/imgact_pecoff.c optional pecoff_support
-compat/svr4/imgact_svr4.c optional compat_svr4
-compat/svr4/svr4_fcntl.c optional compat_svr4
-compat/svr4/svr4_filio.c optional compat_svr4
-compat/svr4/svr4_ioctl.c optional compat_svr4
-compat/svr4/svr4_ipc.c optional compat_svr4
-compat/svr4/svr4_misc.c optional compat_svr4
-compat/svr4/svr4_resource.c optional compat_svr4
-compat/svr4/svr4_signal.c optional compat_svr4
-compat/svr4/svr4_socket.c optional compat_svr4
-compat/svr4/svr4_sockio.c optional compat_svr4
-compat/svr4/svr4_stat.c optional compat_svr4
-compat/svr4/svr4_stream.c optional compat_svr4
-compat/svr4/svr4_syscallnames.c optional compat_svr4
-compat/svr4/svr4_sysent.c optional compat_svr4
-compat/svr4/svr4_sysvec.c optional compat_svr4
-compat/svr4/svr4_termios.c optional compat_svr4
-compat/svr4/svr4_ttold.c optional compat_svr4
+compat/pecoff/imgact_pecoff.c optional pecoff_support
+compat/svr4/imgact_svr4.c optional compat_svr4
+compat/svr4/svr4_fcntl.c optional compat_svr4
+compat/svr4/svr4_filio.c optional compat_svr4
+compat/svr4/svr4_ioctl.c optional compat_svr4
+compat/svr4/svr4_ipc.c optional compat_svr4
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Fri May 7 07:32:45 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id EF8FB16A4D1; Fri, 7 May 2004 07:32:44 -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 C916A16A4CF
for <perforce@freebsd.org>; Fri, 7 May 2004 07:32:44 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 9BB7943D54
for <perforce@freebsd.org>; Fri, 7 May 2004 07:32:44 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47EWiGe046911
for <perforce@freebsd.org>; Fri, 7 May 2004 07:32:44 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47EWiuV046908
for perforce@freebsd.org; Fri, 7 May 2004 07:32:44 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 07:32:44 -0700 (PDT)
Message-Id: <200405071432.i47EWiuV046908@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 52419 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: Fri, 07 May 2004 14:32:45 -0000
http://perforce.freebsd.org/chv.cgi?CH=52419
Change 52419 by peter@peter_daintree on 2004/05/07 07:31:54
Fix mismerge
Affected files ...
.. //depot/projects/hammer/secure/lib/libcrypto/Makefile#11 edit
Differences ...
==== //depot/projects/hammer/secure/lib/libcrypto/Makefile#11 (text+ko) ====
@@ -333,7 +333,7 @@
_bn_asmpath= ${LCRYPTO_SRC}/crypto/bn/asm
.endif
-.if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES
+.if defined(MAKE_IDEA)
_ideapath= ${LCRYPTO_SRC}/crypto/idea
.endif
From owner-p4-projects@FreeBSD.ORG Fri May 7 07:33:47 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id C95FD16A4D0; Fri, 7 May 2004 07:33:46 -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 A41DD16A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 07:33:46 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 6D3EA43D1D
for <perforce@freebsd.org>; Fri, 7 May 2004 07:33:46 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47EXkGe046934
for <perforce@freebsd.org>; Fri, 7 May 2004 07:33:46 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47EXkkT046931
for perforce@freebsd.org; Fri, 7 May 2004 07:33:46 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 07:33:46 -0700 (PDT)
Message-Id: <200405071433.i47EXkkT046931@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 52420 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: Fri, 07 May 2004 14:33:47 -0000
http://perforce.freebsd.org/chv.cgi?CH=52420
Change 52420 by peter@peter_daintree on 2004/05/07 07:33:34
sync id's
Affected files ...
.. //depot/projects/hammer/sys/kern/link_elf_obj.c#28 edit
Differences ...
==== //depot/projects/hammer/sys/kern/link_elf_obj.c#28 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/link_elf.c,v 1.76 2003/08/11 07:14:07 bms Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/link_elf_obj.c,v 1.77 2004/04/30 16:32:40 peter Exp $");
#include "opt_ddb.h"
#include "opt_mac.h"
From owner-p4-projects@FreeBSD.ORG Fri May 7 07:37:53 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id C758B16A4D0; Fri, 7 May 2004 07:37:52 -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 946FD16A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 07:37:52 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 7565343D39
for <perforce@freebsd.org>; Fri, 7 May 2004 07:37:52 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47EbqGe047080
for <perforce@freebsd.org>; Fri, 7 May 2004 07:37:52 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47EbpHE047077
for perforce@freebsd.org; Fri, 7 May 2004 07:37:51 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 07:37:51 -0700 (PDT)
Message-Id: <200405071437.i47EbpHE047077@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 52421 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: Fri, 07 May 2004 14:37:53 -0000
http://perforce.freebsd.org/chv.cgi?CH=52421
Change 52421 by peter@peter_daintree on 2004/05/07 07:37:25
fix mismerge
Affected files ...
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#13 edit
Differences ...
==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#13 (text+ko) ====
@@ -961,33 +961,6 @@
#endif
int
-freebsd4_freebsd32_fhstatfs(struct thread *td, struct freebsd4_freebsd32_fhstatfs_args *uap)
-{
- int error;
- caddr_t sg;
- struct statfs32 *p32, s32;
- struct statfs *p = NULL, s;
-
- p32 = uap->buf;
- if (p32) {
- sg = stackgap_init();
- p = stackgap_alloc(&sg, sizeof(struct statfs));
- uap->buf = (struct statfs32 *)p;
- }
- error = fhstatfs(td, (struct fhstatfs_args *) uap);
- if (error)
- return (error);
- if (p32) {
- error = copyin(p, &s, sizeof(s));
- if (error)
- return (error);
- copy_statfs(&s, &s32);
- error = copyout(&s32, p32, sizeof(s32));
- }
- return (error);
-}
-
-int
freebsd32_semsys(struct thread *td, struct freebsd32_semsys_args *uap)
{
/*
From owner-p4-projects@FreeBSD.ORG Fri May 7 07:39:58 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 1EB1216A4D0; Fri, 7 May 2004 07:39:58 -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 ECA1D16A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 07:39:57 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id DA40743D66
for <perforce@freebsd.org>; Fri, 7 May 2004 07:39:55 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47EdtGe047175
for <perforce@freebsd.org>; Fri, 7 May 2004 07:39:55 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47Edt30047172
for perforce@freebsd.org; Fri, 7 May 2004 07:39:55 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 07:39:55 -0700 (PDT)
Message-Id: <200405071439.i47Edt30047172@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 52422 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: Fri, 07 May 2004 14:39:58 -0000
http://perforce.freebsd.org/chv.cgi?CH=52422
Change 52422 by peter@peter_daintree on 2004/05/07 07:39:13
IFC @52413
Affected files ...
.. //depot/projects/hammer/etc/rc.d/power_profile#3 integrate
.. //depot/projects/hammer/share/man/man4/acpi.4#22 integrate
.. //depot/projects/hammer/share/man/man5/link.5#4 integrate
.. //depot/projects/hammer/share/man/man5/style.Makefile.5#4 integrate
.. //depot/projects/hammer/share/mk/bsd.lib.mk#19 integrate
.. //depot/projects/hammer/sys/conf/files.ia64#17 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#18 integrate
.. //depot/projects/hammer/sys/dev/ctau/if_ct.c#2 integrate
.. //depot/projects/hammer/sys/dev/cx/if_cx.c#3 integrate
.. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#14 integrate
.. //depot/projects/hammer/sys/ia64/ia64/trap.c#24 integrate
.. //depot/projects/hammer/sys/vm/vm_glue.c#27 integrate
Differences ...
==== //depot/projects/hammer/etc/rc.d/power_profile#3 (text+ko) ====
@@ -5,7 +5,7 @@
#
# Arguments: 0x00 (AC offline, economy) or 0x01 (AC online, performance)
#
-# $FreeBSD: src/etc/rc.d/power_profile,v 1.2 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/power_profile,v 1.3 2004/05/07 05:22:38 njl Exp $
#
# PROVIDE: power_profile
@@ -71,9 +71,9 @@
# Set the various sysctls based on the profile's values.
node="hw.acpi.cpu.cx_lowest"
-highest_value=0
+highest_value="C1"
lowest_value="$(sysctl -n hw.acpi.cpu.cx_supported | \
- awk '{ print split($0, a) - 1 }' - 2> /dev/null)"
+ awk '{ print "C" split($0, a) }' - 2> /dev/null)"
eval value=\$${profile}_cx_lowest
sysctl_set
==== //depot/projects/hammer/share/man/man4/acpi.4#22 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.33 2004/04/20 17:45:47 njl Exp $
+.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.34 2004/05/07 05:22:37 njl Exp $
.\"
.Dd July 2, 2001
.Dt ACPI 4
@@ -366,19 +366,21 @@
.Va hw.acpi.cpu.cx_lowest
is modified.
.It Va hw.acpi.cpu.cx_lowest
-Zero-based index of the lowest CPU idle state to use.
-A scheduling algorithm will select between 0...index for the state
-to use during the next sleep.
+Lowest Cx state to use for idling the CPU.
+A scheduling algorithm will select states between C1 and this setting
+as system load dictates.
To enable ACPI CPU idling control,
.Va machdep.cpu_idle_hlt
must be set to 1.
.It Va hw.acpi.cpu.cx_supported
List of supported CPU idle states and their transition latency
in microseconds.
-Each state has a type, C1-3.
+Each state has a type (e.g., C2.)
C1 is equivalent to the ia32 HLT instruction, C2 provides a deeper
sleep with the same semantics, and C3 provides the deepest sleep
but additionally requires bus mastering to be disabled.
+States greater than C3 provide even more power savings with the same
+semantics as the C3 state.
Deeper sleeps provide more power savings but increased transition
latency when an interrupt occurs.
.El
==== //depot/projects/hammer/share/man/man5/link.5#4 (text+ko) ====
@@ -26,7 +26,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/share/man/man5/link.5,v 1.26 2003/09/08 19:57:20 ru Exp $
+.\" $FreeBSD: src/share/man/man5/link.5,v 1.27 2004/05/07 13:00:01 brueffer Exp $
.\"
.Dd October 23, 1993
.Dt LINK 5
@@ -295,7 +295,7 @@
.Fa sod
structure that was responsible for loading this shared object.
.It Fa som_sodbase
-Tossed in later versions the run-time linker.
+Tossed out in later versions of the run-time linker.
.It Fa som_write
Set if (some portion of) this object's text segment is currently writable.
.It Fa som_dynamic
@@ -393,7 +393,7 @@
Virtual address of next rt_symbol.
.It Fa rt_link
Next in hash bucket.
-Used by internally by
+Used internally by
.Nm ld.so .
.It Fa rt_srcaddr
Location of the source of initialized data within a shared object.
@@ -436,7 +436,7 @@
.It Fa dd_sym_loaded
Set by the run-time linker whenever it adds symbols by loading shared objects.
.It Fa dd_bpt_addr
-The address were a breakpoint will be set by the run-time linker to
+The address where a breakpoint will be set by the run-time linker to
divert control to the debugger.
This address is determined by the start-up
module,
==== //depot/projects/hammer/share/man/man5/style.Makefile.5#4 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/style.Makefile.5,v 1.7 2003/09/08 19:57:20 ru Exp $
+.\" $FreeBSD: src/share/man/man5/style.Makefile.5,v 1.8 2004/05/07 09:59:03 des Exp $
.\"
.Dd February 28, 2003
.Dt STYLE.MAKEFILE 5
@@ -70,7 +70,7 @@
The general
.Dq product
order is:
-.Va PROG Ns / Ns Va LIB Ns / Ns Va SCRIPT
+.Va PROG Ns / Ns Oo Va SH Oc Ns Va LIB Ns / Ns Va SCRIPT
.Va FILES
.Va LINKS
.Oo Va NO Oc Ns Va MAN
@@ -84,7 +84,7 @@
The general
.Dq build
order is:
-.Va PROG Ns / Ns Va LIB Ns / Ns Va SCRIPT
+.Va PROG Ns / Ns Oo Va SH Oc Ns Va LIB Ns / Ns Va SCRIPT
.Va SRCS
.Va WARNS
.Va CFLAGS
==== //depot/projects/hammer/share/mk/bsd.lib.mk#19 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91
-# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.159 2004/03/15 17:01:31 trhodes Exp $
+# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.160 2004/05/07 09:58:36 des Exp $
#
.include <bsd.init.mk>
@@ -12,8 +12,11 @@
.undef SHLIB_NAME
.undef INSTALL_PIC_ARCHIVE
.else
-.if !defined(SHLIB_NAME) && defined(LIB) && defined(SHLIB_MAJOR)
-SHLIB_NAME= lib${LIB}.so.${SHLIB_MAJOR}
+.if !defined(SHLIB) && defined(LIB)
+SHLIB= ${LIB}
+.endif
+.if !defined(SHLIB_NAME) && defined(SHLIB) && defined(SHLIB_MAJOR)
+SHLIB_NAME= lib${SHLIB}.so.${SHLIB_MAJOR}
.endif
.if defined(SHLIB_NAME) && !empty(SHLIB_NAME:M*.so.*)
SHLIB_LINK?= ${SHLIB_NAME:R}
==== //depot/projects/hammer/sys/conf/files.ia64#17 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.ia64,v 1.65 2004/03/20 21:06:20 alc Exp $
+# $FreeBSD: src/sys/conf/files.ia64,v 1.66 2004/05/07 03:56:00 marcel Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -36,13 +36,10 @@
contrib/ia64/libuwx/src/uwx_context.c standard
contrib/ia64/libuwx/src/uwx_env.c standard
contrib/ia64/libuwx/src/uwx_scoreboard.c standard
-#contrib/ia64/libuwx/src/uwx_self.c standard
-#contrib/ia64/libuwx/src/uwx_self_context.s standard
contrib/ia64/libuwx/src/uwx_step.c standard
contrib/ia64/libuwx/src/uwx_str.c standard
contrib/ia64/libuwx/src/uwx_swap.c standard
contrib/ia64/libuwx/src/uwx_trace.c standard
-#contrib/ia64/libuwx/src/uwx_ttrace.c standard
contrib/ia64/libuwx/src/uwx_uinfo.c standard
contrib/ia64/libuwx/src/uwx_utable.c standard
crypto/blowfish/bf_enc.c optional crypto
==== //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#18 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.35 2004/05/06 17:25:23 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.36 2004/05/07 05:22:37 njl Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -739,10 +739,8 @@
sc = device_get_softc(cpu_devices[0]);
sbuf_new(&sb, cpu_cx_supported, sizeof(cpu_cx_supported), SBUF_FIXEDLEN);
- for (i = 0; i < cpu_cx_count; i++) {
- sbuf_printf(&sb, "C%d/%d ", sc->cpu_cx_states[i].type,
- sc->cpu_cx_states[i].trans_lat);
- }
+ for (i = 0; i < cpu_cx_count; i++)
+ sbuf_printf(&sb, "C%d/%d ", i + 1, sc->cpu_cx_states[i].trans_lat);
sbuf_trim(&sb);
sbuf_finish(&sb);
SYSCTL_ADD_STRING(&acpi_cpu_sysctl_ctx,
@@ -751,8 +749,8 @@
0, "Cx/microsecond values for supported Cx states");
SYSCTL_ADD_PROC(&acpi_cpu_sysctl_ctx,
SYSCTL_CHILDREN(acpi_cpu_sysctl_tree),
- OID_AUTO, "cx_lowest", CTLTYPE_INT | CTLFLAG_RW,
- NULL, 0, acpi_cpu_cx_lowest_sysctl, "I",
+ OID_AUTO, "cx_lowest", CTLTYPE_STRING | CTLFLAG_RW,
+ NULL, 0, acpi_cpu_cx_lowest_sysctl, "A",
"lowest Cx sleep state to use");
SYSCTL_ADD_PROC(&acpi_cpu_sysctl_ctx,
SYSCTL_CHILDREN(acpi_cpu_sysctl_tree),
@@ -1085,7 +1083,8 @@
}
sbuf_trim(&sb);
sbuf_finish(&sb);
- sysctl_handle_string(oidp, sbuf_data(&sb), 0, req);
+ sysctl_handle_string(oidp, sbuf_data(&sb), sbuf_len(&sb), req);
+ sbuf_delete(&sb);
return (0);
}
@@ -1094,13 +1093,17 @@
acpi_cpu_cx_lowest_sysctl(SYSCTL_HANDLER_ARGS)
{
struct acpi_cpu_softc *sc;
+ char state[8];
int val, error, i;
sc = device_get_softc(cpu_devices[0]);
- val = cpu_cx_lowest;
- error = sysctl_handle_int(oidp, &val, 0, req);
+ snprintf(state, sizeof(state), "C%d", cpu_cx_lowest + 1);
+ error = sysctl_handle_string(oidp, state, sizeof(state), req);
if (error != 0 || req->newptr == NULL)
return (error);
+ if (strlen(state) < 2 || toupper(state[0]) != 'C')
+ return (EINVAL);
+ val = (int) strtol(state + 1, NULL, 10) - 1;
if (val < 0 || val > cpu_cx_count - 1)
return (EINVAL);
==== //depot/projects/hammer/sys/dev/ctau/if_ct.c#2 (text+ko) ====
@@ -21,7 +21,7 @@
* Cronyx Id: if_ct.c,v 1.1.2.22 2004/02/26 19:06:51 rik Exp $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.2 2004/03/02 16:39:40 rik Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.4 2004/05/07 11:59:54 rik Exp $");
#include <sys/param.h>
@@ -64,7 +64,7 @@
# include <i386/isa/intr_machdep.h>
# endif
#endif
-#if __FreeBSD_version >= 500000
+#if __FreeBSD_version >= 400000
#include <dev/cx/machdep.h>
#include <dev/ctau/ctddk.h>
#include <dev/cx/cronyxfw.h>
@@ -78,7 +78,7 @@
# include "opt_netgraph.h"
# include <netgraph/ng_message.h>
# include <netgraph/netgraph.h>
-#if __FreeBSD_version >= 500000
+#if __FreeBSD_version >= 400000
# include <dev/ctau/ng_ct.h>
#else
# include <netgraph/ng_ct.h>
@@ -107,6 +107,11 @@
#endif
#endif
+/* If we don't have Cronyx's sppp version, we don't have fr support via sppp */
+#ifndef PP_FR
+#define PP_FR 0
+#endif
+
#define CT_DEBUG(d,s) ({if (d->chan->debug) {\
printf ("%s: ", d->name); printf s;}})
#define CT_DEBUG2(d,s) ({if (d->chan->debug>1) {\
@@ -1333,7 +1338,7 @@
#ifndef NETGRAPH
case SERIAL_GETPROTO:
- strcpy ((char*)data, /*(d->pp.pp_flags & PP_FR) ? "fr" :*/
+ strcpy ((char*)data, (d->pp.pp_flags & PP_FR) ? "fr" :
(d->pp.pp_if.if_flags & PP_CISCO) ? "cisco" : "ppp");
return 0;
@@ -1351,21 +1356,21 @@
if (d->pp.pp_if.if_flags & IFF_RUNNING)
return EBUSY;
if (! strcmp ("cisco", (char*)data)) {
-/* d->pp.pp_flags &= ~(PP_FR);*/
+ d->pp.pp_flags &= ~(PP_FR);
d->pp.pp_flags |= PP_KEEPALIVE;
d->pp.pp_if.if_flags |= PP_CISCO;
-/* } else if (! strcmp ("fr", (char*)data)) {
+ } else if (! strcmp ("fr", (char*)data)) {
d->pp.pp_if.if_flags &= ~(PP_CISCO);
- d->pp.pp_flags |= PP_FR | PP_KEEPALIVE;*/
+ d->pp.pp_flags |= PP_FR | PP_KEEPALIVE;
} else if (! strcmp ("ppp", (char*)data)) {
- d->pp.pp_flags &= ~(/*PP_FR | */PP_KEEPALIVE);
+ d->pp.pp_flags &= ~(PP_FR | PP_KEEPALIVE);
d->pp.pp_if.if_flags &= ~(PP_CISCO);
} else
return EINVAL;
return 0;
case SERIAL_GETKEEPALIVE:
- if (/*(d->pp.pp_flags & PP_FR) ||*/
+ if ((d->pp.pp_flags & PP_FR) ||
(d->pp.pp_if.if_flags & PP_CISCO))
return EINVAL;
*(int*)data = (d->pp.pp_flags & PP_KEEPALIVE) ? 1 : 0;
@@ -1382,7 +1387,7 @@
#endif /* __FreeBSD_version >= 500000 */
if (error)
return error;
- if (/*(d->pp.pp_flags & PP_FR) ||*/
+ if ((d->pp.pp_flags & PP_FR) ||
(d->pp.pp_if.if_flags & PP_CISCO))
return EINVAL;
if (*(int*)data)
==== //depot/projects/hammer/sys/dev/cx/if_cx.c#3 (text+ko) ====
@@ -22,7 +22,7 @@
* Cronyx Id: if_cx.c,v 1.1.2.23 2004/02/26 17:56:40 rik Exp $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.7 2004/03/02 16:44:07 rik Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.10 2004/05/07 11:45:25 rik Exp $");
#include <sys/param.h>
@@ -67,7 +67,7 @@
# include <i386/isa/intr_machdep.h>
# endif
#endif
-#if __FreeBSD_version >= 500000
+#if __FreeBSD_version >= 400000
# include <dev/cx/machdep.h>
# include <dev/cx/cxddk.h>
# include <dev/cx/cronyxfw.h>
@@ -81,7 +81,7 @@
# include "opt_netgraph.h"
# include <netgraph/ng_message.h>
# include <netgraph/netgraph.h>
-# if __FreeBSD_version >= 500000
+# if __FreeBSD_version >= 400000
# include <dev/cx/ng_cx.h>
# else
# include <netgraph/ng_cx.h>
@@ -91,7 +91,7 @@
# if __FreeBSD_version < 500000
# include "sppp.h"
# if NSPPP <= 0
-# error The device cp requires sppp or netgraph.
+# error The device cx requires sppp or netgraph.
# endif
# endif
# include <net/if_sppp.h>
@@ -110,6 +110,11 @@
#endif
#endif
+/* If we don't have Cronyx's sppp version, we don't have fr support via sppp */
+#ifndef PP_FR
+#define PP_FR 0
+#endif
+
#define CX_DEBUG(d,s) ({if (d->chan->debug) {\
printf ("%s: ", d->name); printf s;}})
#define CX_DEBUG2(d,s) ({if (d->chan->debug>1) {\
@@ -226,7 +231,6 @@
static swihand_t cx_softintr;
#else
static void cx_softintr (void *);
-static void *cx_slow_ih;
static void *cx_fast_ih;
#endif
static void cx_down (drv_t *d);
@@ -1810,7 +1814,7 @@
CX_DEBUG2 (d, ("ioctl: getproto\n"));
s = splhigh ();
strcpy ((char*)data, (c->mode == M_ASYNC) ? "async" :
- /*(d->pp.pp_flags & PP_FR) ? "fr" :*/
+ (d->pp.pp_flags & PP_FR) ? "fr" :
(d->pp.pp_if.if_flags & PP_CISCO) ? "cisco" : "ppp");
splx (s);
return 0;
@@ -1832,14 +1836,14 @@
if (d->pp.pp_if.if_flags & IFF_RUNNING)
return EBUSY;
if (! strcmp ("cisco", (char*)data)) {
-/* d->pp.pp_flags &= ~(PP_FR);*/
+ d->pp.pp_flags &= ~(PP_FR);
d->pp.pp_flags |= PP_KEEPALIVE;
d->pp.pp_if.if_flags |= PP_CISCO;
-/* } else if (! strcmp ("fr", (char*)data)) {*/
-/* d->pp.pp_if.if_flags &= ~(PP_CISCO);*/
-/* d->pp.pp_flags |= PP_FR | PP_KEEPALIVE;*/
+ } else if (! strcmp ("fr", (char*)data)) {
+ d->pp.pp_if.if_flags &= ~(PP_CISCO);
+ d->pp.pp_flags |= PP_FR | PP_KEEPALIVE;
} else if (! strcmp ("ppp", (char*)data)) {
- d->pp.pp_flags &= ~(/*PP_FR |*/ PP_KEEPALIVE);
+ d->pp.pp_flags &= ~(PP_FR | PP_KEEPALIVE);
d->pp.pp_if.if_flags &= ~(PP_CISCO);
} else
return EINVAL;
@@ -1847,7 +1851,7 @@
case SERIAL_GETKEEPALIVE:
CX_DEBUG2 (d, ("ioctl: getkeepalive\n"));
- if (/*(d->pp.pp_flags & PP_FR) ||*/
+ if ((d->pp.pp_flags & PP_FR) ||
(d->pp.pp_if.if_flags & PP_CISCO) ||
(c->mode == M_ASYNC))
return EINVAL;
@@ -1868,7 +1872,7 @@
#endif /* __FreeBSD_version >= 500000 */
if (error)
return error;
- if (/*(d->pp.pp_flags & PP_FR) ||*/
+ if ((d->pp.pp_flags & PP_FR) ||
(d->pp.pp_if.if_flags & PP_CISCO))
return EINVAL;
s = splhigh ();
@@ -3145,8 +3149,6 @@
#else
swi_add(&tty_ithd, "tty:cx", cx_softintr, NULL, SWI_TTY, 0,
&cx_fast_ih);
- swi_add(&clk_ithd, "tty:cx", cx_softintr, NULL, SWI_TTY, 0,
- &cx_slow_ih);
#endif
break;
case MOD_UNLOAD:
@@ -3163,7 +3165,6 @@
untimeout (cx_timeout, 0, timeout_handle);
#if __FreeBSD_version >= 500000
ithread_remove_handler (cx_fast_ih);
- ithread_remove_handler (cx_slow_ih);
#else
unregister_swi (SWI_TTY, cx_softintr);
#endif
==== //depot/projects/hammer/sys/ia64/ia64/interrupt.c#14 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.44 2004/01/20 02:35:46 marcel Exp $ */
+/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.45 2004/05/07 05:29:12 marcel Exp $ */
/* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */
/*
@@ -52,6 +52,7 @@
#include <machine/clock.h>
#include <machine/cpu.h>
+#include <machine/fpu.h>
#include <machine/frame.h>
#include <machine/intr.h>
#include <machine/md_var.h>
@@ -132,6 +133,8 @@
int64_t delta;
int count;
+ ia64_set_fpsr(IA64_FPSR_DEFAULT);
+
td = curthread;
atomic_add_int(&td->td_intr_nesting_level, 1);
==== //depot/projects/hammer/sys/ia64/ia64/trap.c#24 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.98 2004/05/03 04:13:31 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.99 2004/05/07 05:35:31 marcel Exp $");
#include "opt_ddb.h"
#include "opt_ktrace.h"
@@ -358,9 +358,6 @@
user = TRAPF_USERMODE(tf) ? 1 : 0;
- /* Sanitize the FP state in case the user has trashed it. */
- ia64_set_fpsr(IA64_FPSR_DEFAULT);
-
atomic_add_int(&cnt.v_trap, 1);
td = curthread;
@@ -368,6 +365,7 @@
ucode = 0;
if (user) {
+ ia64_set_fpsr(IA64_FPSR_DEFAULT);
sticks = td->td_sticks;
td->td_frame = tf;
if (td->td_ucred != p->p_ucred)
@@ -668,10 +666,11 @@
FPSWA_BUNDLE bundle;
char *ip;
+ /* Always fatal in kernel. Should never happen. */
+ if (!user)
+ trap_panic(vector, tf);
+
if (fpswa_interface == NULL) {
- if (!user)
- trap_panic(vector, tf);
-
sig = SIGFPE;
ucode = 0;
break;
@@ -681,15 +680,12 @@
if (vector == IA64_VEC_FLOATING_POINT_TRAP &&
(tf->tf_special.psr & IA64_PSR_RI) == 0)
ip -= 16;
- if (user) {
- error = copyin(ip, &bundle, 16);
- if (error) {
- sig = SIGBUS; /* EFAULT, basically */
- ucode = 0; /* exception summary */
- break;
- }
- } else
- bcopy(ip, &bundle, 16);
+ error = copyin(ip, &bundle, 16);
+ if (error) {
+ sig = SIGBUS; /* EFAULT, basically */
+ ucode = 0; /* exception summary */
+ break;
+ }
/* f6-f15 are saved in exception_save */
fp_state.bitmask_low64 = 0xffc0; /* bits 6 - 15 */
@@ -741,12 +737,11 @@
printf("FATAL: FPSWA err1 %lx, err2 %lx, err3 %lx\n",
fpswa_ret.err1, fpswa_ret.err2, fpswa_ret.err3);
panic("fpswa fatal error on fp fault");
- } else if (user) {
+ } else {
sig = SIGFPE;
ucode = 0; /* XXX exception summary */
break;
- } else
- goto out;
+ }
}
case IA64_VEC_IA32_EXCEPTION:
@@ -897,6 +892,8 @@
int code, error;
u_int sticks;
+ ia64_set_fpsr(IA64_FPSR_DEFAULT);
+
code = tf->tf_scratch.gr15;
args = &tf->tf_scratch.gr16;
==== //depot/projects/hammer/sys/vm/vm_glue.c#27 (text+ko) ====
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.196 2004/04/06 20:15:36 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.197 2004/05/07 11:43:24 green Exp $");
#include "opt_vm.h"
#include "opt_kstack_pages.h"
@@ -216,7 +216,7 @@
return (EAGAIN);
#endif
error = vm_map_wire(&curproc->p_vmspace->vm_map, start, end,
- VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES);
+ VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES);
/*
* Return EFAULT on error to match copy{in,out}() behaviour
* rather than returning ENOMEM like mlock() would.
From owner-p4-projects@FreeBSD.ORG Fri May 7 08:39:10 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 635CD16A4D0; Fri, 7 May 2004 08:39:10 -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 23A2F16A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 08:39:10 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id CCD6043D3F
for <perforce@freebsd.org>; Fri, 7 May 2004 08:39:08 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47Fd8Ge060264
for <perforce@freebsd.org>; Fri, 7 May 2004 08:39:08 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47Fd8rR060261
for perforce@freebsd.org; Fri, 7 May 2004 08:39:08 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 08:39:08 -0700 (PDT)
Message-Id: <200405071539.i47Fd8rR060261@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 52424 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: Fri, 07 May 2004 15:39:11 -0000
http://perforce.freebsd.org/chv.cgi?CH=52424
Change 52424 by peter@peter_daintree on 2004/05/07 08:38:25
MFi386: integ -I -b i386_hammer
Affected files ...
.. //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#11 integrate
.. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#11 integrate
.. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#9 integrate
.. //depot/projects/hammer/sys/amd64/acpica/madt.c#30 integrate
.. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#19 integrate
.. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#23 integrate
.. //depot/projects/hammer/sys/amd64/amd64/exception.S#28 integrate
.. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#16 integrate
.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#23 integrate
.. //depot/projects/hammer/sys/amd64/amd64/legacy.c#9 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#35 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#83 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mptable.c#22 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#7 integrate
.. //depot/projects/hammer/sys/amd64/amd64/nexus.c#21 integrate
.. //depot/projects/hammer/sys/amd64/amd64/support.S#21 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#37 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#26 integrate
.. //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#11 integrate
.. //depot/projects/hammer/sys/amd64/include/apicvar.h#20 integrate
.. //depot/projects/hammer/sys/amd64/include/float.h#8 integrate
.. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#11 integrate
.. //depot/projects/hammer/sys/amd64/include/legacyvar.h#7 integrate
.. //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#10 integrate
.. //depot/projects/hammer/sys/amd64/isa/atpic.c#37 integrate
.. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#16 integrate
.. //depot/projects/hammer/sys/amd64/isa/clock.c#21 integrate
.. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#17 integrate
Differences ...
==== //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#11 (text+ko) ====
==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#11 (text+ko) ====
==== //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#9 (text+ko) ====
==== //depot/projects/hammer/sys/amd64/acpica/madt.c#30 (text+ko) ====
@@ -69,14 +69,15 @@
u_int la_apic_id:8;
} lapics[NLAPICS + 1];
+static int madt_found_sci_override;
static MULTIPLE_APIC_TABLE *madt;
static vm_paddr_t madt_physaddr;
static vm_offset_t madt_length;
MALLOC_DEFINE(M_MADT, "MADT Table", "ACPI MADT Table Items");
-static u_char interrupt_polarity(UINT16 Polarity);
-static u_char interrupt_trigger(UINT16 TriggerMode);
+static enum intr_polarity interrupt_polarity(UINT16 Polarity, UINT8 Source);
+static enum intr_trigger interrupt_trigger(UINT16 TriggerMode, UINT8 Source);
static int madt_find_cpu(u_int acpi_id, u_int *apic_id);
static int madt_find_interrupt(int intr, void **apic, u_int *pin);
static void *madt_map(vm_paddr_t pa, int offset, vm_offset_t length);
@@ -325,6 +326,8 @@
static int
madt_setup_io(void)
{
+ void *ioapic;
+ u_int pin;
int i;
/* Try to initialize ACPI so that we can access the FADT. */
@@ -342,6 +345,23 @@
/* Second, we run through the table tweaking interrupt sources. */
madt_walk_table(madt_parse_ints, NULL);
+ /*
+ * If there was not an explicit override entry for the SCI,
+ * force it to use level trigger and active-low polarity.
+ */
+ if (!madt_found_sci_override) {
+ if (madt_find_interrupt(AcpiGbl_FADT->SciInt, &ioapic, &pin)
+ != 0)
+ printf("MADT: Could not find APIC for SCI IRQ %d\n",
+ AcpiGbl_FADT->SciInt);
+ else {
+ printf(
+ "MADT: Forcing active-low polarity and level trigger for SCI\n");
+ ioapic_set_polarity(ioapic, pin, INTR_POLARITY_LOW);
+ ioapic_set_triggermode(ioapic, pin, INTR_TRIGGER_LEVEL);
+ }
+ }
+
/* Third, we register all the I/O APIC's. */
for (i = 0; i < NIOAPICS; i++)
if (ioapics[i].io_apic != NULL)
@@ -448,33 +468,42 @@
/*
* Determine properties of an interrupt source. Note that for ACPI,
* these are only used for ISA interrupts, so we assume ISA bus values
- * (Active Hi, Edge Triggered) for conforming values.
+ * (Active Hi, Edge Triggered) for conforming values except for the ACPI
+ * SCI for which we use Active Lo, Level Triggered..
*/
-static u_char
-interrupt_polarity(UINT16 Polarity)
+static enum intr_polarity
+interrupt_polarity(UINT16 Polarity, UINT8 Source)
{
switch (Polarity) {
case POLARITY_CONFORMS:
+ if (Source == AcpiGbl_FADT->SciInt)
+ return (INTR_POLARITY_LOW);
+ else
+ return (INTR_POLARITY_HIGH);
case POLARITY_ACTIVE_HIGH:
- return (1);
+ return (INTR_POLARITY_HIGH);
case POLARITY_ACTIVE_LOW:
- return (0);
+ return (INTR_POLARITY_LOW);
default:
panic("Bogus Interrupt Polarity");
}
}
-static u_char
-interrupt_trigger(UINT16 TriggerMode)
+static enum intr_trigger
+interrupt_trigger(UINT16 TriggerMode, UINT8 Source)
{
switch (TriggerMode) {
case TRIGGER_CONFORMS:
+ if (Source == AcpiGbl_FADT->SciInt)
+ return (INTR_TRIGGER_LEVEL);
+ else
+ return (INTR_TRIGGER_EDGE);
case TRIGGER_EDGE:
- return (1);
+ return (INTR_TRIGGER_EDGE);
case TRIGGER_LEVEL:
- return (0);
+ return (INTR_TRIGGER_LEVEL);
default:
panic("Bogus Interrupt Trigger Mode");
}
@@ -532,7 +561,9 @@
{
void *new_ioapic, *old_ioapic;
u_int new_pin, old_pin;
- int force_lo;
+ enum intr_trigger trig;
+ enum intr_polarity pol;
+ char buf[64];
if (bootverbose)
printf("MADT: intr override: source %u, irq %u\n",
@@ -546,18 +577,46 @@
}
/*
- * If the SCI is remapped to a non-ISA global interrupt,
- * force it to level trigger and active-lo polarity.
+ * Lookup the appropriate trigger and polarity modes for this
+ * entry.
+ */
+ trig = interrupt_trigger(intr->TriggerMode, intr->Source);
+ pol = interrupt_polarity(intr->Polarity, intr->Source);
+
+ /*
* If the SCI is identity mapped but has edge trigger and
- * active-hi polarity, also force it to use level/lo.
+ * active-hi polarity or the force_sci_lo tunable is set,
+ * force it to use level/lo.
*/
- force_lo = 0;
- if (intr->Source == AcpiGbl_FADT->SciInt)
- if (intr->Interrupt > 15 || (intr->Interrupt == intr->Source &&
- intr->TriggerMode == TRIGGER_EDGE &&
- intr->Polarity == POLARITY_ACTIVE_HIGH))
- force_lo = 1;
+ if (intr->Source == AcpiGbl_FADT->SciInt) {
+ madt_found_sci_override = 1;
+ if (getenv_string("hw.acpi.sci.trigger", buf, sizeof(buf))) {
+ if (tolower(buf[0]) == 'e')
+ trig = INTR_TRIGGER_EDGE;
+ else if (tolower(buf[0]) == 'l')
+ trig = INTR_TRIGGER_LEVEL;
+ else
+ panic(
+ "Invalid trigger %s: must be 'edge' or 'level'",
+ buf);
+ printf("MADT: Forcing SCI to %s trigger\n",
+ trig == INTR_TRIGGER_EDGE ? "edge" : "level");
+ }
+ if (getenv_string("hw.acpi.sci.polarity", buf, sizeof(buf))) {
+ if (tolower(buf[0]) == 'h')
+ pol = INTR_POLARITY_HIGH;
+ else if (tolower(buf[0]) == 'l')
+ pol = INTR_POLARITY_LOW;
+ else
+ panic(
+ "Invalid polarity %s: must be 'high' or 'low'",
+ buf);
+ printf("MADT: Forcing SCI to active %s polarity\n",
+ pol == INTR_POLARITY_HIGH ? "high" : "low");
+ }
+ }
+ /* Remap the IRQ if it is mapped to a different interrupt vector. */
if (intr->Source != intr->Interrupt) {
/*
* If the SCI is remapped to a non-ISA global interrupt,
@@ -577,18 +636,10 @@
intr->Source)
ioapic_disable_pin(old_ioapic, old_pin);
}
- if (force_lo) {
- printf(
- "MADT: Forcing active-lo polarity and level trigger for IRQ %d\n",
- intr->Source);
- ioapic_set_polarity(new_ioapic, new_pin, 0);
- ioapic_set_triggermode(new_ioapic, new_pin, 0);
- } else {
- ioapic_set_polarity(new_ioapic, new_pin,
- interrupt_polarity(intr->Polarity));
- ioapic_set_triggermode(new_ioapic, new_pin,
- interrupt_trigger(intr->TriggerMode));
- }
+
+ /* Program the polarity and trigger mode. */
+ ioapic_set_triggermode(new_ioapic, new_pin, trig);
+ ioapic_set_polarity(new_ioapic, new_pin, pol);
}
/*
@@ -609,10 +660,10 @@
ioapic_set_nmi(ioapic, pin);
if (nmi->TriggerMode != TRIGGER_CONFORMS)
ioapic_set_triggermode(ioapic, pin,
- interrupt_trigger(nmi->TriggerMode));
+ interrupt_trigger(nmi->TriggerMode, 0));
if (nmi->Polarity != TRIGGER_CONFORMS)
ioapic_set_polarity(ioapic, pin,
- interrupt_polarity(nmi->Polarity));
+ interrupt_polarity(nmi->Polarity, 0));
}
/*
@@ -638,10 +689,10 @@
lapic_set_lvt_mode(apic_id, pin, APIC_LVT_DM_NMI);
if (nmi->TriggerMode != TRIGGER_CONFORMS)
lapic_set_lvt_triggermode(apic_id, pin,
- interrupt_trigger(nmi->TriggerMode));
+ interrupt_trigger(nmi->TriggerMode, 0));
if (nmi->Polarity != POLARITY_CONFORMS)
lapic_set_lvt_polarity(apic_id, pin,
- interrupt_polarity(nmi->Polarity));
+ interrupt_polarity(nmi->Polarity, 0));
}
/*
==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#19 (text+ko) ====
==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#23 (text+ko) ====
==== //depot/projects/hammer/sys/amd64/amd64/exception.S#28 (text+ko) ====
==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#16 (text+ko) ====
@@ -138,6 +138,17 @@
return (error);
}
+int
+intr_config_intr(int vector, enum intr_trigger trig, enum intr_polarity pol)
+{
+ struct intsrc *isrc;
+
+ isrc = intr_lookup_source(vector);
+ if (isrc == NULL)
+ return (EINVAL);
+ return (isrc->is_pic->pic_config_intr(isrc, trig, pol));
+}
+
void
intr_execute_handlers(struct intsrc *isrc, struct intrframe *iframe)
{
==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#23 (text+ko) ====
@@ -128,6 +128,8 @@
static void ioapic_enable_intr(struct intsrc *isrc);
static int ioapic_vector(struct intsrc *isrc);
static int ioapic_source_pending(struct intsrc *isrc);
+static int ioapic_config_intr(struct intsrc *isrc, enum intr_trigger trig,
+ enum intr_polarity pol);
static void ioapic_suspend(struct intsrc *isrc);
static void ioapic_resume(struct intsrc *isrc);
static void ioapic_program_destination(struct ioapic_intsrc *intpin);
@@ -138,7 +140,8 @@
struct pic ioapic_template = { ioapic_enable_source, ioapic_disable_source,
ioapic_eoi_source, ioapic_enable_intr,
ioapic_vector, ioapic_source_pending,
- ioapic_suspend, ioapic_resume };
+ ioapic_suspend, ioapic_resume,
+ ioapic_config_intr };
static int next_ioapic_base, logical_clusters, current_cluster;
@@ -291,6 +294,41 @@
return (lapic_intr_pending(intpin->io_vector));
}
+static int
+ioapic_config_intr(struct intsrc *isrc, enum intr_trigger trig,
+ enum intr_polarity pol)
+{
+ struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc;
+ struct ioapic *io = (struct ioapic *)isrc->is_pic;
+
+ KASSERT(!(trig == INTR_TRIGGER_CONFORM || pol == INTR_POLARITY_CONFORM),
+ ("%s: Conforming trigger or polarity\n", __func__));
+
+ /*
+ * For now we ignore any requests but do output any changes that
+ * would be made to the console it bootverbose is enabled. The only
+ * known causes of these messages so far is a bug in acpi(4) that
+ * causes the ISA IRQs used for PCI interrupts in PIC mode to be
+ * set to level/low when they aren't being used. There are possibly
+ * legitimate requests, so at some point when the acpi(4) driver is
+ * fixed this code can be changed to actually change the intpin as
+ * requested.
+ */
+ if (!bootverbose)
+ return (0);
+ if (intpin->io_edgetrigger != (trig == INTR_TRIGGER_EDGE))
+ printf(
+ "ioapic%u: Request to change trigger for pin %u to %s ignored\n",
+ io->io_id, intpin->io_intpin, trig == INTR_TRIGGER_EDGE ?
+ "edge" : "level");
+ if (intpin->io_activehi != (pol == INTR_POLARITY_HIGH))
+ printf(
+ "ioapic%u: Request to change polarity for pin %u to %s ignored\n",
+ io->io_id, intpin->io_intpin, pol == INTR_POLARITY_HIGH ?
+ "high" : "low");
+ return (0);
+}
+
static void
ioapic_suspend(struct intsrc *isrc)
{
@@ -526,36 +564,36 @@
}
int
-ioapic_set_polarity(void *cookie, u_int pin, char activehi)
+ioapic_set_polarity(void *cookie, u_int pin, enum intr_polarity pol)
{
struct ioapic *io;
io = (struct ioapic *)cookie;
- if (pin >= io->io_numintr)
+ if (pin >= io->io_numintr || pol == INTR_POLARITY_CONFORM)
return (EINVAL);
if (io->io_pins[pin].io_vector >= NUM_IO_INTS)
return (EINVAL);
- io->io_pins[pin].io_activehi = activehi;
+ io->io_pins[pin].io_activehi = (pol == INTR_POLARITY_HIGH);
if (bootverbose)
printf("ioapic%u: intpin %d polarity: %s\n", io->io_id, pin,
- activehi ? "active-hi" : "active-lo");
+ pol == INTR_POLARITY_HIGH ? "high" : "low");
return (0);
}
int
-ioapic_set_triggermode(void *cookie, u_int pin, char edgetrigger)
+ioapic_set_triggermode(void *cookie, u_int pin, enum intr_trigger trigger)
{
struct ioapic *io;
io = (struct ioapic *)cookie;
- if (pin >= io->io_numintr)
+ if (pin >= io->io_numintr || trigger == INTR_TRIGGER_CONFORM)
return (EINVAL);
if (io->io_pins[pin].io_vector >= NUM_IO_INTS)
return (EINVAL);
- io->io_pins[pin].io_edgetrigger = edgetrigger;
+ io->io_pins[pin].io_edgetrigger = (trigger == INTR_TRIGGER_EDGE);
if (bootverbose)
printf("ioapic%u: intpin %d trigger: %s\n", io->io_id, pin,
- edgetrigger ? "edge" : "level");
+ trigger == INTR_TRIGGER_EDGE ? "edge" : "level");
return (0);
}
==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#9 (text+ko) ====
@@ -41,7 +41,9 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <machine/bus.h>
+#include <sys/pcpu.h>
#include <sys/rman.h>
+#include <sys/smp.h>
#include <machine/legacyvar.h>
#include <machine/resource.h>
@@ -138,7 +140,9 @@
static int
legacy_attach(device_t dev)
{
- device_t child;
+ device_t child;
+ int i;
+ struct pcpu *pc;
/*
* First, let our child driver's identify any child devices that
@@ -148,6 +152,21 @@
bus_generic_probe(dev);
bus_generic_attach(dev);
+ /* Attach CPU pseudo-driver. */
+ if (!devclass_get_device(devclass_find("cpu"), 0)) {
+ for (i = 0; i <= mp_maxid; i++)
+ if (!CPU_ABSENT(i)) {
+ pc = pcpu_find(i);
+ KASSERT(pc != NULL, ("pcpu_find failed"));
+ child = BUS_ADD_CHILD(dev, 0, "cpu", i);
+ if (child == NULL)
+ panic("legacy_attach cpu");
+ device_probe_and_attach(child);
+ pc->pc_device = child;
+ device_set_ivars(child, pc);
+ }
+ }
+
/*
* If we didn't see ISA on a pci bridge, create some
* connection points now so it shows up "on motherboard".
@@ -305,3 +324,54 @@
resource_list_delete(rl, type, rid);
}
+
+/*
+ * Legacy CPU attachment when ACPI is not available. Drivers like
+ * cpufreq(4) hang off this.
+ */
+static int cpu_read_ivar(device_t dev, device_t child, int index,
+ uintptr_t *result);
+
+static device_method_t cpu_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, bus_generic_probe),
+ DEVMETHOD(device_attach, bus_generic_attach),
+ DEVMETHOD(device_detach, bus_generic_detach),
+ DEVMETHOD(device_shutdown, bus_generic_shutdown),
+ DEVMETHOD(device_suspend, bus_generic_suspend),
+ DEVMETHOD(device_resume, bus_generic_resume),
+
+ /* Bus interface */
+ DEVMETHOD(bus_read_ivar, cpu_read_ivar),
+ DEVMETHOD(bus_print_child, bus_generic_print_child),
+ DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource),
+ DEVMETHOD(bus_release_resource, bus_generic_release_resource),
+ DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
+ DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
+ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
+ DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
+
+ { 0, 0 }
+};
+
+static driver_t cpu_driver = {
+ "cpu",
+ cpu_methods,
+ 1, /* no softc */
+};
+static devclass_t cpu_devclass;
+DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0);
+
+static int
+cpu_read_ivar(device_t dev, device_t child, int index, uintptr_t *result)
+{
+ struct pcpu *pc;
+
+ if (index != 0)
+ return (ENOENT);
+ pc = device_get_ivars(child);
+ if (pc == NULL)
+ return (ENOENT);
+ *result = (uintptr_t)pc;
+ return (0);
+}
==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#35 (text+ko) ====
@@ -427,50 +427,52 @@
}
int
-lapic_set_lvt_polarity(u_int apic_id, u_int pin, u_char activehi)
+lapic_set_lvt_polarity(u_int apic_id, u_int pin, enum intr_polarity pol)
{
- if (pin > LVT_MAX)
+ if (pin > LVT_MAX || pol == INTR_POLARITY_CONFORM)
return (EINVAL);
if (apic_id == APIC_ID_ALL) {
- lvts[pin].lvt_activehi = activehi;
+ lvts[pin].lvt_activehi = (pol == INTR_POLARITY_HIGH);
if (bootverbose)
printf("lapic:");
} else {
KASSERT(lapics[apic_id].la_present,
("%s: missing APIC %u", __func__, apic_id));
lapics[apic_id].la_lvts[pin].lvt_active = 1;
- lapics[apic_id].la_lvts[pin].lvt_activehi = activehi;
+ lapics[apic_id].la_lvts[pin].lvt_activehi =
+ (pol == INTR_POLARITY_HIGH);
if (bootverbose)
printf("lapic%u:", apic_id);
}
if (bootverbose)
printf(" LINT%u polarity: active-%s\n", pin,
- activehi ? "hi" : "lo");
+ pol == INTR_POLARITY_HIGH ? "high" : "low");
return (0);
}
int
-lapic_set_lvt_triggermode(u_int apic_id, u_int pin, u_char edgetrigger)
+lapic_set_lvt_triggermode(u_int apic_id, u_int pin, enum intr_trigger trigger)
{
- if (pin > LVT_MAX)
+ if (pin > LVT_MAX || trigger == INTR_TRIGGER_CONFORM)
return (EINVAL);
if (apic_id == APIC_ID_ALL) {
- lvts[pin].lvt_edgetrigger = edgetrigger;
+ lvts[pin].lvt_edgetrigger = (trigger == INTR_TRIGGER_EDGE);
if (bootverbose)
printf("lapic:");
} else {
KASSERT(lapics[apic_id].la_present,
("%s: missing APIC %u", __func__, apic_id));
- lapics[apic_id].la_lvts[pin].lvt_edgetrigger = edgetrigger;
+ lapics[apic_id].la_lvts[pin].lvt_edgetrigger =
+ (trigger == INTR_TRIGGER_EDGE);
lapics[apic_id].la_lvts[pin].lvt_active = 1;
if (bootverbose)
printf("lapic%u:", apic_id);
}
if (bootverbose)
printf(" LINT%u trigger: %s\n", pin,
- edgetrigger ? "edge" : "level");
+ trigger == INTR_TRIGGER_EDGE ? "edge" : "level");
return (0);
}
==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#83 (text+ko) ====
==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#22 (text+ko) ====
@@ -47,10 +47,6 @@
#include <dev/pci/pcivar.h>
-/* EISA Edge/Level trigger control registers */
-#define ELCR0 0x4d0 /* eisa irq 0-7 */
-#define ELCR1 0x4d1 /* eisa irq 8-15 */
-
/* string defined by the Intel MP Spec as identifying the MP table */
#define MP_SIG 0x5f504d5f /* _MP_ */
@@ -147,10 +143,11 @@
MALLOC_DEFINE(M_MPTABLE, "MP Table", "MP Table Items");
-static u_char conforming_polarity(u_char src_bus);
-static u_char conforming_trigger(u_char src_bus, u_char src_bus_irq);
-static u_char intentry_polarity(int_entry_ptr intr);
-static u_char intentry_trigger(int_entry_ptr intr);
+static enum intr_polarity conforming_polarity(u_char src_bus,
+ u_char src_bus_irq);
+static enum intr_trigger conforming_trigger(u_char src_bus, u_char src_bus_irq);
+static enum intr_polarity intentry_polarity(int_entry_ptr intr);
+static enum intr_trigger intentry_trigger(int_entry_ptr intr);
static int lookup_bus_type(char *name);
static void mptable_count_items(void);
static void mptable_count_items_handler(u_char *entry, void *arg);
@@ -539,19 +536,24 @@
/*
* Determine conforming polarity for a given bus type.
*/
-static u_char
-conforming_polarity(u_char src_bus)
+static enum intr_polarity
+conforming_polarity(u_char src_bus, u_char src_bus_irq)
{
KASSERT(src_bus <= mptable_maxbusid, ("bus id %d too large", src_bus));
switch (busses[src_bus].bus_type) {
case ISA:
+ return (INTR_POLARITY_HIGH);
+ case PCI:
+ return (INTR_POLARITY_LOW);
+#ifndef PC98
case EISA:
- /* Active Hi */
- return (1);
- case PCI:
- /* Active Lo */
- return (0);
+ KASSERT(src_bus_irq < 16, ("Invalid EISA IRQ %d", src_bus_irq));
+ if (elcr_read_trigger(src_bus_irq) == INTR_TRIGGER_LEVEL)
+ return (INTR_POLARITY_LOW);
+ else
+ return (INTR_POLARITY_HIGH);
+#endif
default:
panic("%s: unknown bus type %d", __func__,
busses[src_bus].bus_type);
@@ -561,52 +563,45 @@
/*
* Determine conforming trigger for a given bus type.
*/
-static u_char
+static enum intr_trigger
conforming_trigger(u_char src_bus, u_char src_bus_irq)
{
- static int eisa_int_control = -1;
KASSERT(src_bus <= mptable_maxbusid, ("bus id %d too large", src_bus));
switch (busses[src_bus].bus_type) {
case ISA:
- /* Edge Triggered */
- return (1);
+ return (INTR_TRIGGER_EDGE);
case PCI:
- /* Level Triggered */
- return (0);
+ return (INTR_TRIGGER_LEVEL);
+#ifndef PC98
case EISA:
KASSERT(src_bus_irq < 16, ("Invalid EISA IRQ %d", src_bus_irq));
- if (eisa_int_control == -1)
- eisa_int_control = inb(ELCR1) << 8 | inb(ELCR0);
- if (eisa_int_control & (1 << src_bus_irq))
- /* Level Triggered */
- return (0);
- else
- /* Edge Triggered */
- return (1);
+ return (elcr_read_trigger(src_bus_irq));
+#endif
default:
panic("%s: unknown bus type %d", __func__,
busses[src_bus].bus_type);
}
}
-static u_char
+static enum intr_polarity
intentry_polarity(int_entry_ptr intr)
{
switch (intr->int_flags & INTENTRY_FLAGS_POLARITY) {
case INTENTRY_FLAGS_POLARITY_CONFORM:
- return (conforming_polarity(intr->src_bus_id));
+ return (conforming_polarity(intr->src_bus_id,
+ intr->src_bus_irq));
case INTENTRY_FLAGS_POLARITY_ACTIVEHI:
- return (1);
+ return (INTR_POLARITY_HIGH);
case INTENTRY_FLAGS_POLARITY_ACTIVELO:
- return (0);
+ return (INTR_POLARITY_LOW);
default:
panic("Bogus interrupt flags");
}
}
-static u_char
+static enum intr_trigger
intentry_trigger(int_entry_ptr intr)
{
@@ -615,9 +610,9 @@
return (conforming_trigger(intr->src_bus_id,
intr->src_bus_irq));
case INTENTRY_FLAGS_TRIGGER_EDGE:
- return (1);
+ return (INTR_TRIGGER_EDGE);
case INTENTRY_FLAGS_TRIGGER_LEVEL:
- return (0);
+ return (INTR_TRIGGER_LEVEL);
default:
panic("Bogus interrupt flags");
}
==== //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#7 (text+ko) ====
@@ -64,10 +64,18 @@
return (0);
}
+static int
+mptable_hostb_attach(device_t dev)
+{
+
+ device_add_child(dev, "pci", pcib_get_bus(dev));
+ return (bus_generic_attach(dev));
+}
+
static device_method_t mptable_hostb_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, mptable_hostb_probe),
- DEVMETHOD(device_attach, legacy_pcib_attach),
+ DEVMETHOD(device_attach, mptable_hostb_attach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
DEVMETHOD(device_suspend, bus_generic_suspend),
DEVMETHOD(device_resume, bus_generic_resume),
==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#21 (text+ko) ====
@@ -84,6 +84,8 @@
int unit);
static struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
u_long, u_long, u_long, u_int);
+static int nexus_config_intr(device_t, int, enum intr_trigger,
+ enum intr_polarity);
static int nexus_activate_resource(device_t, device_t, int, int,
struct resource *);
static int nexus_deactivate_resource(device_t, device_t, int, int,
@@ -116,6 +118,7 @@
DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource),
DEVMETHOD(bus_setup_intr, nexus_setup_intr),
DEVMETHOD(bus_teardown_intr, nexus_teardown_intr),
+ DEVMETHOD(bus_config_intr, nexus_config_intr),
DEVMETHOD(bus_set_resource, nexus_set_resource),
DEVMETHOD(bus_get_resource, nexus_get_resource),
DEVMETHOD(bus_delete_resource, nexus_delete_resource),
@@ -453,6 +456,13 @@
}
static int
+nexus_config_intr(device_t dev, int irq, enum intr_trigger trig,
+ enum intr_polarity pol)
+{
+ return (intr_config_intr(irq, trig, pol));
+}
+
+static int
nexus_set_resource(device_t dev, device_t child, int type, int rid, u_long start, u_long count)
{
struct nexus_device *ndev = DEVTONX(child);
==== //depot/projects/hammer/sys/amd64/amd64/support.S#21 (text+ko) ====
@@ -624,11 +624,11 @@
nop
1:
movl $KDSEL, %eax
- mov %ax,%ds
- mov %ax,%es
- mov %ax,%fs /* Beware, use wrmsr to set 64 bit base */
- mov %ax,%gs
- mov %ax,%ss
+ movl %eax,%ds
+ movl %eax,%es
+ movl %eax,%fs /* Beware, use wrmsr to set 64 bit base */
+ movl %eax,%gs
+ movl %eax,%ss
/* reload code selector by turning return into intersegmental return */
popq %rax
==== //depot/projects/hammer/sys/amd64/conf/GENERIC#37 (text+ko) ====
@@ -45,6 +45,7 @@
options PROCFS # Process filesystem (requires PSEUDOFS)
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_GPT # GUID Partition Tables.
+options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!]
options IA32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI
@@ -73,6 +74,7 @@
device atpic # 8259A compatability
options NO_MIXED_MODE # Don't penalize working chipsets
+# Bus support. Do not remove isa, even if you have no isa slots
device acpi
device isa
device pci
@@ -259,6 +261,7 @@
device axe # ASIX Electronics USB Ethernet
device cue # CATC USB Ethernet
device kue # Kawasaki LSI USB Ethernet
+device rue # RealTek RTL8150 USB Ethernet
# FireWire support
device firewire # FireWire bus code
==== //depot/projects/hammer/sys/amd64/conf/NOTES#26 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# (XXX from i386:NOTES,v 1.1152)
+# (XXX from i386:NOTES,v 1.1158)
# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.12 2004/03/13 22:16:34 peter Exp $
#
@@ -120,7 +120,7 @@
#
# ISA bus
#
-device isa
+device isa # Required by npx(4)
#
# Options for `isa':
@@ -303,6 +303,12 @@
# The Rev 2 host cards use a 32K chunk, on a 32K boundary.
# The cards can use an IRQ of 11, 12 or 15.
+device cy
+options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared
+hint.cy.0.at="isa"
+hint.cy.0.irq="10"
+hint.cy.0.maddr="0xd4000"
+hint.cy.0.msize="0x2000"
device digi
hint.digi.0.at="isa"
hint.digi.0.port="0x104"
@@ -432,9 +438,10 @@
#
#---------------------------------------------------------------------------
-# sx device is i386 and pc98 only at the moment.
-device sx
-options SX_DEBUG
+#
+# System Management Bus (SMB)
+#
+options ENABLE_ALART # Control alarm on Intel intpm driver
#
# Set the number of PV entries per process. Increasing this can
@@ -505,7 +512,6 @@
options FB_INSTALL_CDEV # install a CDEV entry in /dev
-options ENABLE_ALART # Control alarm on Intel intpm driver
options KBDIO_DEBUG=2
options KBD_MAXRETRY=4
options KBD_MAXWAIT=6
==== //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#11 (text+ko) ====
==== //depot/projects/hammer/sys/amd64/include/apicvar.h#20 (text+ko) ====
@@ -143,8 +143,9 @@
int ioapic_remap_vector(void *cookie, u_int pin, int vector);
int ioapic_set_extint(void *cookie, u_int pin);
int ioapic_set_nmi(void *cookie, u_int pin);
-int ioapic_set_polarity(void *cookie, u_int pin, char activehi);
-int ioapic_set_triggermode(void *cookie, u_int pin, char edgetrigger);
+int ioapic_set_polarity(void *cookie, u_int pin, enum intr_polarity pol);
+int ioapic_set_triggermode(void *cookie, u_int pin,
+ enum intr_trigger trigger);
int ioapic_set_smi(void *cookie, u_int pin);
void lapic_create(u_int apic_id, int boot_cpu);
void lapic_disable(void);
@@ -161,8 +162,10 @@
void lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id);
int lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked);
int lapic_set_lvt_mode(u_int apic_id, u_int lvt, u_int32_t mode);
-int lapic_set_lvt_polarity(u_int apic_id, u_int lvt, u_char activehi);
-int lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, u_char edgetrigger);
+int lapic_set_lvt_polarity(u_int apic_id, u_int lvt,
+ enum intr_polarity pol);
+int lapic_set_lvt_triggermode(u_int apic_id, u_int lvt,
+ enum intr_trigger trigger);
void lapic_setup(void);
#endif /* !LOCORE */
==== //depot/projects/hammer/sys/amd64/include/float.h#8 (text+ko) ====
==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#11 (text+ko) ====
@@ -57,6 +57,8 @@
int (*pic_source_pending)(struct intsrc *);
void (*pic_suspend)(struct intsrc *);
void (*pic_resume)(struct intsrc *);
+ int (*pic_config_intr)(struct intsrc *, enum intr_trigger,
+ enum intr_polarity);
};
/*
@@ -77,8 +79,15 @@
extern struct mtx icu_lock;
+/* XXX: The elcr_* prototypes probably belong somewhere else. */
+int elcr_probe(void);
+enum intr_trigger elcr_read_trigger(u_int irq);
+void elcr_resume(void);
+void elcr_write_trigger(u_int irq, enum intr_trigger trigger);
int intr_add_handler(const char *name, int vector, driver_intr_t handler,
void *arg, enum intr_type flags, void **cookiep);
+int intr_config_intr(int vector, enum intr_trigger trig,
+ enum intr_polarity pol);
void intr_execute_handlers(struct intsrc *isrc, struct intrframe *iframe);
struct intsrc *intr_lookup_source(int vector);
int intr_register_source(struct intsrc *isrc);
==== //depot/projects/hammer/sys/amd64/include/legacyvar.h#7 (text+ko) ====
@@ -40,7 +40,6 @@
#undef LEGACY_ACCESSOR
-int legacy_pcib_attach(device_t dev);
int legacy_pcib_maxslots(device_t dev);
u_int32_t legacy_pcib_read_config(device_t dev, int bus, int slot, int func,
int reg, int bytes);
==== //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#10 (text+ko) ====
==== //depot/projects/hammer/sys/amd64/isa/atpic.c#37 (text+ko) ====
@@ -81,9 +81,16 @@
#define SLAVE_MODE BASE_SLAVE_MODE
#endif
+#define IMEN_MASK(ai) (1 << (ai)->at_irq)
+
+#define NUM_ISA_IRQS 16
+
static void atpic_init(void *dummy);
unsigned int imen; /* XXX */
+#ifndef PC98
+static int using_elcr;
+#endif
inthand_t
IDTVEC(atpic_intr0), IDTVEC(atpic_intr1), IDTVEC(atpic_intr2),
@@ -95,14 +102,15 @@
#define IRQ(ap, ai) ((ap)->at_irqbase + (ai)->at_irq)
-#define ATPIC(io, base, eoi, imenptr) \
+#define ATPIC(io, base, eoi, imenptr) \
{ { atpic_enable_source, atpic_disable_source, (eoi), \
atpic_enable_intr, atpic_vector, atpic_source_pending, NULL, \
- atpic_resume }, (io), (base), IDT_IO_INTS + (base), (imenptr) }
+ atpic_resume, atpic_config_intr }, (io), (base), \
+ IDT_IO_INTS + (base), (imenptr) }
#define INTSRC(irq) \
- { { &atpics[(irq) / 8].at_pic }, (irq) % 8, \
- IDTVEC(atpic_intr ## irq ) }
+ { { &atpics[(irq) / 8].at_pic }, IDTVEC(atpic_intr ## irq ), \
+ (irq) % 8 }
struct atpic {
struct pic at_pic;
@@ -114,8 +122,9 @@
struct atpic_intsrc {
struct intsrc at_intsrc;
- int at_irq; /* Relative to PIC base. */
inthand_t *at_intr;
+ int at_irq; /* Relative to PIC base. */
+ enum intr_trigger at_trigger;
u_long at_count;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Fri May 7 08:45:47 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 373AA16A4D0; Fri, 7 May 2004 08:45:47 -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 10A3816A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 08:45:47 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id EE3F443D46
for <perforce@freebsd.org>; Fri, 7 May 2004 08:45:46 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47FjkGe062242
for <perforce@freebsd.org>; Fri, 7 May 2004 08:45:46 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47FjkwR062239
for perforce@freebsd.org; Fri, 7 May 2004 08:45:46 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 08:45:46 -0700 (PDT)
Message-Id: <200405071545.i47FjkwR062239@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 52427 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: Fri, 07 May 2004 15:45:47 -0000
http://perforce.freebsd.org/chv.cgi?CH=52427
Change 52427 by peter@peter_daintree on 2004/05/07 08:45:39
oops, didn't mean to pick this up.
Affected files ...
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#38 edit
Differences ...
==== //depot/projects/hammer/sys/amd64/conf/GENERIC#38 (text+ko) ====
@@ -45,7 +45,6 @@
options PROCFS # Process filesystem (requires PSEUDOFS)
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_GPT # GUID Partition Tables.
-options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!]
options IA32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI
From owner-p4-projects@FreeBSD.ORG Fri May 7 08:47:50 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6A8A716A4D0; Fri, 7 May 2004 08:47:50 -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 451F916A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 08:47:50 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 19E8743D39
for <perforce@freebsd.org>; Fri, 7 May 2004 08:47:50 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47FlnGe068264
for <perforce@freebsd.org>; Fri, 7 May 2004 08:47:49 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47Fln8h068261
for perforce@freebsd.org; Fri, 7 May 2004 08:47:49 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 08:47:49 -0700 (PDT)
Message-Id: <200405071547.i47Fln8h068261@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 52428 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: Fri, 07 May 2004 15:47:51 -0000
http://perforce.freebsd.org/chv.cgi?CH=52428
Change 52428 by peter@peter_daintree on 2004/05/07 08:47:46
oops, shouldn't have killed SX, it just moved
Affected files ...
.. //depot/projects/hammer/sys/amd64/conf/NOTES#27 edit
Differences ...
==== //depot/projects/hammer/sys/amd64/conf/NOTES#27 (text+ko) ====
@@ -321,6 +321,9 @@
device digi_Xe
device digi_Xem
device digi_Xr
+# sx device is i386 and pc98 only at the moment.
+device sx
+options SX_DEBUG
# HOT1 Xilinx 6200 card (http://www.vcc.com/)
device xrpu
From owner-p4-projects@FreeBSD.ORG Fri May 7 08:50:55 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 4A30816A4D0; Fri, 7 May 2004 08:50:55 -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 09B6516A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 08:50:55 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id A940643D1D
for <perforce@freebsd.org>; Fri, 7 May 2004 08:50:54 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47FosGe068426
for <perforce@freebsd.org>; Fri, 7 May 2004 08:50:54 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47FosN0068423
for perforce@freebsd.org; Fri, 7 May 2004 08:50:54 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 08:50:54 -0700 (PDT)
Message-Id: <200405071550.i47FosN0068423@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 52429 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: Fri, 07 May 2004 15:50:56 -0000
http://perforce.freebsd.org/chv.cgi?CH=52429
Change 52429 by peter@peter_daintree on 2004/05/07 08:50:39
oops, some PC98/MCA stuff slipped back in with a recent IFC
Affected files ...
.. //depot/projects/hammer/sys/amd64/amd64/mptable.c#23 edit
.. //depot/projects/hammer/sys/amd64/isa/atpic.c#38 edit
.. //depot/projects/hammer/sys/amd64/isa/nmi.c#11 edit
Differences ...
==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#23 (text+ko) ====
@@ -546,14 +546,12 @@
return (INTR_POLARITY_HIGH);
case PCI:
return (INTR_POLARITY_LOW);
-#ifndef PC98
case EISA:
KASSERT(src_bus_irq < 16, ("Invalid EISA IRQ %d", src_bus_irq));
if (elcr_read_trigger(src_bus_irq) == INTR_TRIGGER_LEVEL)
return (INTR_POLARITY_LOW);
else
return (INTR_POLARITY_HIGH);
-#endif
default:
panic("%s: unknown bus type %d", __func__,
busses[src_bus].bus_type);
@@ -573,11 +571,9 @@
return (INTR_TRIGGER_EDGE);
case PCI:
return (INTR_TRIGGER_LEVEL);
-#ifndef PC98
case EISA:
KASSERT(src_bus_irq < 16, ("Invalid EISA IRQ %d", src_bus_irq));
return (elcr_read_trigger(src_bus_irq));
-#endif
default:
panic("%s: unknown bus type %d", __func__,
busses[src_bus].bus_type);
==== //depot/projects/hammer/sys/amd64/isa/atpic.c#38 (text+ko) ====
@@ -88,9 +88,7 @@
static void atpic_init(void *dummy);
unsigned int imen; /* XXX */
-#ifndef PC98
static int using_elcr;
-#endif
inthand_t
IDTVEC(atpic_intr0), IDTVEC(atpic_intr1), IDTVEC(atpic_intr2),
@@ -259,10 +257,8 @@
if (ai->at_irq == 0) {
i8259_init(ap, ap == &atpics[SLAVE]);
-#ifndef PC98
if (ap == &atpics[SLAVE] && using_elcr)
elcr_resume();
-#endif
}
}
@@ -292,17 +288,6 @@
if (ai->at_trigger == trig)
return (0);
-#ifdef PC98
- if ((vector == 0 || vector == 1 || vector == 7 || vector == 8) &&
- trig == INTR_TRIGGER_LEVEL) {
- if (bootverbose)
- printf(
- "atpic: Ignoring invalid level/low configuration for IRQ%u\n",
- vector);
- return (EINVAL);
- }
- return (ENXIO);
-#else
/*
* Certain IRQs can never be level/lo, so don't try to set them
* that way if asked. At least some ELCR registers ignore setting
@@ -331,7 +316,6 @@
ai->at_trigger = trig;
mtx_unlock_spin(&icu_lock);
return (0);
-#endif /* PC98 */
}
static void
@@ -397,28 +381,6 @@
ai->at_irq, ai->at_intr, SDT_SYSIGT, SEL_KPL, 0);
}
-#ifdef DEV_MCA
- /* For MCA systems, all interrupts are level triggered. */
- if (MCA_system)
- for (i = 0, ai = atintrs; i < NUM_ISA_IRQS; i++, ai++)
- ai->at_trigger = INTR_TRIGGER_LEVEL;
- else
-#endif
-
-#ifdef PC98
- for (i = 0, ai = atintrs; i < NUM_ISA_IRQS; i++, ai++)
- switch (i) {
- case 0:
- case 1:
- case 7:
- case 8:
- ai->at_trigger = INTR_TRIGGER_EDGE;
- break;
- default:
- ai->at_trigger = INTR_TRIGGER_LEVEL;
- break;
- }
-#else
/*
* Look for an ELCR. If we find one, update the trigger modes.
* If we don't find one, assume that IRQs 0, 1, 2, and 13 are
@@ -449,7 +411,6 @@
break;
}
}
-#endif /* PC98 */
}
static void
==== //depot/projects/hammer/sys/amd64/isa/nmi.c#11 (text+ko) ====
@@ -43,10 +43,6 @@
#include <machine/md_var.h>
-#ifdef DEV_MCA
-#include <i386/bios/mca_machdep.h>
-#endif
-
#define NMI_PARITY (1 << 7)
#define NMI_IOCHAN (1 << 6)
#define ENMI_WATCHDOG (1 << 7)
@@ -65,10 +61,6 @@
int eisa_port = inb(0x461);
log(LOG_CRIT, "NMI ISA %x, EISA %x\n", isa_port, eisa_port);
-#ifdef DEV_MCA
- if (MCA_system && mca_bus_nmi())
- return(0);
-#endif
if (isa_port & NMI_PARITY) {
log(LOG_CRIT, "RAM parity error, likely hardware failure.");
From owner-p4-projects@FreeBSD.ORG Fri May 7 08:51:57 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 3689A16A4D0; Fri, 7 May 2004 08:51:57 -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 11E8E16A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 08:51:57 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id D83D643D49
for <perforce@freebsd.org>; Fri, 7 May 2004 08:51:56 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47FpuGe069574
for <perforce@freebsd.org>; Fri, 7 May 2004 08:51:56 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47FpuvZ069565
for perforce@freebsd.org; Fri, 7 May 2004 08:51:56 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 08:51:56 -0700 (PDT)
Message-Id: <200405071551.i47FpuvZ069565@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 52430 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: Fri, 07 May 2004 15:51:57 -0000
http://perforce.freebsd.org/chv.cgi?CH=52430
Change 52430 by peter@peter_daintree on 2004/05/07 08:51:14
I missed this variable in the IFC.
Affected files ...
.. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#18 edit
Differences ...
==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#18 (text+ko) ====
@@ -228,7 +228,6 @@
static int
legacy_pcib_attach(device_t dev)
{
- device_t pir;
int bus;
bus = pcib_get_bus(dev);
From owner-p4-projects@FreeBSD.ORG Fri May 7 08:52:59 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 3583516A4D0; Fri, 7 May 2004 08:52:59 -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 0FFAC16A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 08:52:59 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id DD3B543D45
for <perforce@freebsd.org>; Fri, 7 May 2004 08:52:58 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47FqwGe070208
for <perforce@freebsd.org>; Fri, 7 May 2004 08:52:58 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47FqwGj070205
for perforce@freebsd.org; Fri, 7 May 2004 08:52:58 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 08:52:58 -0700 (PDT)
Message-Id: <200405071552.i47FqwGj070205@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 52431 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: Fri, 07 May 2004 15:52:59 -0000
http://perforce.freebsd.org/chv.cgi?CH=52431
Change 52431 by peter@peter_daintree on 2004/05/07 08:52:35
pick up elcr.c
Affected files ...
.. //depot/projects/hammer/sys/amd64/isa/elcr.c#1 branch
Differences ...
From owner-p4-projects@FreeBSD.ORG Fri May 7 08:54:01 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6C9A116A4D0; Fri, 7 May 2004 08:54:01 -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 45BB116A4CF
for <perforce@freebsd.org>; Fri, 7 May 2004 08:54:01 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id E20AF43D46
for <perforce@freebsd.org>; Fri, 7 May 2004 08:54:00 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47Fs0Ge070229
for <perforce@freebsd.org>; Fri, 7 May 2004 08:54:00 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47Fs0eI070224
for perforce@freebsd.org; Fri, 7 May 2004 08:54:00 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 08:54:00 -0700 (PDT)
Message-Id: <200405071554.i47Fs0eI070224@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 52432 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: Fri, 07 May 2004 15:54:02 -0000
http://perforce.freebsd.org/chv.cgi?CH=52432
Change 52432 by peter@peter_daintree on 2004/05/07 08:53:13
add elcr.c to conf/files.amd64
Affected files ...
.. //depot/projects/hammer/sys/conf/files.amd64#42 edit
Differences ...
==== //depot/projects/hammer/sys/conf/files.amd64#42 (text+ko) ====
@@ -81,6 +81,7 @@
amd64/isa/atpic.c optional atpic isa
amd64/isa/atpic_vector.S optional atpic isa
amd64/isa/clock.c standard
+amd64/isa/elcr.c standard
amd64/isa/isa.c standard
amd64/isa/isa_dma.c standard
amd64/isa/nmi.c standard
From owner-p4-projects@FreeBSD.ORG Fri May 7 08:58:07 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 1DAEC16A4D0; Fri, 7 May 2004 08:58:07 -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 E65EE16A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 08:58:06 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 8011F43D2D
for <perforce@freebsd.org>; Fri, 7 May 2004 08:58:06 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47Fw6Ge070390
for <perforce@freebsd.org>; Fri, 7 May 2004 08:58:06 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47Fw6BQ070387
for perforce@freebsd.org; Fri, 7 May 2004 08:58:06 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 08:58:06 -0700 (PDT)
Message-Id: <200405071558.i47Fw6BQ070387@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 52433 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: Fri, 07 May 2004 15:58:07 -0000
http://perforce.freebsd.org/chv.cgi?CH=52433
Change 52433 by peter@peter_daintree on 2004/05/07 08:57:26
IFC @52426
Affected files ...
.. //depot/projects/hammer/sbin/route/route.c#7 integrate
.. //depot/projects/hammer/sys/kern/tty_compat.c#4 integrate
.. //depot/projects/hammer/sys/sys/user.h#10 integrate
Differences ...
==== //depot/projects/hammer/sbin/route/route.c#7 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/route/route.c,v 1.74 2004/05/03 16:30:32 andre Exp $";
+ "$FreeBSD: src/sbin/route/route.c,v 1.75 2004/05/07 15:33:17 csjp Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -273,6 +273,8 @@
rtm->rtm_type = RTM_DELETE;
rtm->rtm_seq = seqno;
rlen = write(s, next, rtm->rtm_msglen);
+ if (rlen < 0 && errno == EPERM)
+ err(1, "write to routing socket");
if (rlen < (int)rtm->rtm_msglen) {
warn("write to routing socket");
(void) printf("got only %d for rlen\n", rlen);
@@ -1223,6 +1225,8 @@
if (debugonly)
return (0);
if ((rlen = write(s, (char *)&m_rtmsg, l)) < 0) {
+ if (errno == EPERM)
+ err(1, "writing to routing socket");
warn("writing to routing socket");
return (-1);
}
==== //depot/projects/hammer/sys/kern/tty_compat.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/tty_compat.c,v 1.33 2004/04/05 21:03:36 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/tty_compat.c,v 1.34 2004/05/07 15:35:38 cognet Exp $");
#include "opt_compat.h"
@@ -137,7 +137,7 @@
cc[VSTOP] = tc->t_stopc;
cc[VEOF] = tc->t_eofc;
cc[VEOL] = tc->t_brkc;
- if (tc->t_brkc == -1)
+ if (tc->t_brkc == (char)_POSIX_VDISABLE)
cc[VEOL2] = _POSIX_VDISABLE;
*com = TIOCSETA;
break;
==== //depot/projects/hammer/sys/sys/user.h#10 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)user.h 8.2 (Berkeley) 9/23/93
- * $FreeBSD: src/sys/sys/user.h,v 1.55 2004/04/07 04:19:50 imp Exp $
+ * $FreeBSD: src/sys/sys/user.h,v 1.56 2004/05/07 15:37:56 cognet Exp $
*/
#ifndef _SYS_USER_H_
@@ -74,7 +74,7 @@
defined(__amd64__)
#define KINFO_PROC_SIZE 912 /* the correct size for kinfo_proc */
#endif
-#ifdef __i386__
+#if __i386__ || defined __arm__
#define KINFO_PROC_SIZE 648 /* the correct size for kinfo_proc */
#endif
#ifdef __powerpc__
From owner-p4-projects@FreeBSD.ORG Fri May 7 08:59:09 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id B3C6416A4D0; Fri, 7 May 2004 08:59:08 -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 8DF0216A4CF
for <perforce@freebsd.org>; Fri, 7 May 2004 08:59:08 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 5D58243D46
for <perforce@freebsd.org>; Fri, 7 May 2004 08:59:08 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47Fx8Ge070471
for <perforce@freebsd.org>; Fri, 7 May 2004 08:59:08 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47Fx7MH070468
for perforce@freebsd.org; Fri, 7 May 2004 08:59:07 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 08:59:07 -0700 (PDT)
Message-Id: <200405071559.i47Fx7MH070468@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 52434 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: Fri, 07 May 2004 15:59:09 -0000
http://perforce.freebsd.org/chv.cgi?CH=52434
Change 52434 by peter@peter_daintree on 2004/05/07 08:58:12
IFC @52426 (create integration merge point)
Affected files ...
.. //depot/projects/hammer/sys/kern/link_elf_obj.c#29 integrate
Differences ...
==== //depot/projects/hammer/sys/kern/link_elf_obj.c#29 (text+ko) ====
From owner-p4-projects@FreeBSD.ORG Fri May 7 09:07:20 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 009A916A4D1; Fri, 7 May 2004 09:07:19 -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 CA16216A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 09:07:19 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 6A47843D45
for <perforce@freebsd.org>; Fri, 7 May 2004 09:07:19 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47G7JGe073457
for <perforce@freebsd.org>; Fri, 7 May 2004 09:07:19 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47G7ISA073454
for perforce@freebsd.org; Fri, 7 May 2004 09:07:18 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 09:07:18 -0700 (PDT)
Message-Id: <200405071607.i47G7ISA073454@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 52436 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: Fri, 07 May 2004 16:07:20 -0000
http://perforce.freebsd.org/chv.cgi?CH=52436
Change 52436 by peter@peter_daintree on 2004/05/07 09:06:49
make the new-kld glue for amd64 only so its safer to commit
Affected files ...
.. //depot/projects/hammer/sys/conf/files#57 edit
.. //depot/projects/hammer/sys/conf/files.amd64#43 edit
.. //depot/projects/hammer/sys/conf/kmod.mk#23 edit
Differences ...
==== //depot/projects/hammer/sys/conf/files#57 (text+ko) ====
@@ -1086,7 +1086,6 @@
kern/kern_uuid.c standard
kern/kern_xxx.c standard
kern/link_elf.c standard
-kern/link_elf_obj.c standard
kern/md4c.c optional netsmb
kern/md5c.c standard
kern/sched_4bsd.c optional sched_4bsd
==== //depot/projects/hammer/sys/conf/files.amd64#43 (text+ko) ====
@@ -129,6 +129,7 @@
isa/psm.c optional psm
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
+kern/link_elf_obj.c standard
pci/agp_ali.c optional agp
pci/agp_amd.c optional agp
pci/agp_i810.c optional agp
==== //depot/projects/hammer/sys/conf/kmod.mk#23 (text+ko) ====
@@ -137,12 +137,23 @@
${OBJCOPY} --strip-debug ${FULLPROG} ${PROG}
.endif
+.if ${MACHINE_ARCH} != amd64
+${FULLPROG}: ${KMOD}.kld
+ ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
+.if !defined(DEBUG_FLAGS)
+ ${OBJCOPY} --strip-debug ${.TARGET}
+.endif
+
EXPORT_SYMS?= NO
.if ${EXPORT_SYMS} != YES
CLEANFILES+= ${.OBJDIR}/export_syms
.endif
+.if ${MACHINE_ARCH} != amd64
+${KMOD}.kld: ${OBJS}
+.else
${FULLPROG}: ${OBJS}
+.endif
${LD} ${LDFLAGS} -r -d -o ${.TARGET} ${OBJS}
.if defined(EXPORT_SYMS)
.if ${EXPORT_SYMS} != YES
@@ -158,7 +169,7 @@
xargs -J% ${OBJCOPY} % ${.TARGET}
.endif
.endif
-.if !defined(DEBUG_FLAGS)
+.if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} != amd64
${OBJCOPY} --strip-debug ${.TARGET}
.endif
From owner-p4-projects@FreeBSD.ORG Fri May 7 10:31:08 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id A60E616A4EF; Fri, 7 May 2004 10:31:07 -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 7091E16A50A
for <perforce@freebsd.org>; Fri, 7 May 2004 10:31:07 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 8A17643D31
for <perforce@freebsd.org>; Fri, 7 May 2004 10:31:04 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47HV4Ge090748
for <perforce@freebsd.org>; Fri, 7 May 2004 10:31:04 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47HV1Nm090743
for perforce@freebsd.org; Fri, 7 May 2004 10:31:01 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Date: Fri, 7 May 2004 10:31:01 -0700 (PDT)
Message-Id: <200405071731.i47HV1Nm090743@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52439 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: Fri, 07 May 2004 17:31:08 -0000
http://perforce.freebsd.org/chv.cgi?CH=52439
Change 52439 by jhb@jhb_slimer on 2004/05/07 10:30:32
IFC @52438.
Affected files ...
.. //depot/projects/smpng/sys/alpha/alpha/fp_emulate.c#5 integrate
.. //depot/projects/smpng/sys/alpha/alpha/ieee_float.c#4 integrate
.. //depot/projects/smpng/sys/alpha/alpha/pmap.c#56 integrate
.. //depot/projects/smpng/sys/alpha/conf/GENERIC#36 integrate
.. //depot/projects/smpng/sys/alpha/include/float.h#5 integrate
.. //depot/projects/smpng/sys/alpha/include/fpu.h#4 integrate
.. //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#5 integrate
.. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#5 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#16 integrate
.. //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#4 integrate
.. //depot/projects/smpng/sys/amd64/include/float.h#3 integrate
.. //depot/projects/smpng/sys/arm/include/_types.h#4 integrate
.. //depot/projects/smpng/sys/arm/include/elf.h#4 integrate
.. //depot/projects/smpng/sys/arm/include/endian.h#3 integrate
.. //depot/projects/smpng/sys/arm/include/signal.h#4 integrate
.. //depot/projects/smpng/sys/boot/i386/boot0/Makefile#9 integrate
.. //depot/projects/smpng/sys/boot/i386/boot0/boot0.S#1 branch
.. //depot/projects/smpng/sys/boot/i386/boot0/boot0.s#6 delete
.. //depot/projects/smpng/sys/boot/i386/boot0/boot0ext.S#1 branch
.. //depot/projects/smpng/sys/boot/i386/boot0/boot0ext.s#3 delete
.. //depot/projects/smpng/sys/boot/i386/boot0/boot0sio.s#3 delete
.. //depot/projects/smpng/sys/boot/i386/boot0ext/Makefile#2 integrate
.. //depot/projects/smpng/sys/boot/i386/boot0sio/Makefile#3 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/boot1.S#2 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/sio.S#2 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/btx/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/btxldr/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate
.. //depot/projects/smpng/sys/boot/i386/cdboot/Makefile#5 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/amd64_tramp.S#3 integrate
.. //depot/projects/smpng/sys/boot/i386/mbr/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/i386/pxeldr/Makefile#7 integrate
.. //depot/projects/smpng/sys/boot/i386/pxeldr/pxeldr.S#2 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot2/serial_16550.S#5 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot2/serial_8251.S#2 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/btx/Makefile#6 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/btx/btx.S#2 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/btxldr/Makefile#5 integrate
.. //depot/projects/smpng/sys/boot/pc98/btx/btxldr/btxldr.S#2 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#51 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#9 integrate
.. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#14 integrate
.. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#9 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#7 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#14 integrate
.. //depot/projects/smpng/sys/conf/NOTES#68 integrate
.. //depot/projects/smpng/sys/conf/files#109 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#15 integrate
.. //depot/projects/smpng/sys/conf/files.i386#59 integrate
.. //depot/projects/smpng/sys/conf/files.ia64#39 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#57 integrate
.. //depot/projects/smpng/sys/conf/files.sparc64#37 integrate
.. //depot/projects/smpng/sys/conf/kern.pre.mk#34 integrate
.. //depot/projects/smpng/sys/conf/majors#39 integrate
.. //depot/projects/smpng/sys/conf/options#75 integrate
.. //depot/projects/smpng/sys/conf/options.sparc64#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#13 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf.c#5 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#5 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#4 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#21 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#14 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#7 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#64 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#16 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#24 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#9 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#22 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#25 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#16 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#41 integrate
.. //depot/projects/smpng/sys/dev/asr/asr.c#24 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#52 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.h#27 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#35 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-commands.h#2 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-disk.h#15 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-isa.c#17 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#14 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.c#44 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.h#22 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-queue.c#13 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-cd.h#14 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-fd.h#10 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-tape.h#7 integrate
.. //depot/projects/smpng/sys/dev/ciss/ciss.c#32 integrate
.. //depot/projects/smpng/sys/dev/ciss/cissreg.h#7 integrate
.. //depot/projects/smpng/sys/dev/cp/cpddk.c#1 branch
.. //depot/projects/smpng/sys/dev/cp/cpddk.h#1 branch
.. //depot/projects/smpng/sys/dev/cp/if_cp.c#1 branch
.. //depot/projects/smpng/sys/dev/cp/ng_cp.h#1 branch
.. //depot/projects/smpng/sys/dev/ctau/if_ct.c#3 integrate
.. //depot/projects/smpng/sys/dev/cx/if_cx.c#6 integrate
.. //depot/projects/smpng/sys/dev/cy/cy.c#1 branch
.. //depot/projects/smpng/sys/dev/cy/cy_isa.c#1 branch
.. //depot/projects/smpng/sys/dev/cy/cy_pci.c#1 branch
.. //depot/projects/smpng/sys/dev/cy/cyreg.h#1 branch
.. //depot/projects/smpng/sys/dev/cy/cyvar.h#1 branch
.. //depot/projects/smpng/sys/dev/gem/if_gem.c#18 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_load.c#8 delete
.. //depot/projects/smpng/sys/dev/hme/if_hme.c#15 integrate
.. //depot/projects/smpng/sys/dev/ic/cd1400.h#1 branch
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#14 integrate
.. //depot/projects/smpng/sys/dev/led/led.c#7 integrate
.. //depot/projects/smpng/sys/dev/mii/brgphy.c#20 integrate
.. //depot/projects/smpng/sys/dev/mii/dcphy.c#11 integrate
.. //depot/projects/smpng/sys/dev/mii/e1000phy.c#9 integrate
.. //depot/projects/smpng/sys/dev/mii/mii.c#9 integrate
.. //depot/projects/smpng/sys/dev/mii/mii_physubr.c#9 integrate
.. //depot/projects/smpng/sys/dev/mii/mlphy.c#9 integrate
.. //depot/projects/smpng/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/smpng/sys/dev/mii/ruephy.c#3 integrate
.. //depot/projects/smpng/sys/dev/mii/tlphy.c#11 integrate
.. //depot/projects/smpng/sys/dev/mii/xmphy.c#11 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#43 integrate
.. //depot/projects/smpng/sys/dev/pci/pci.c#38 integrate
.. //depot/projects/smpng/sys/dev/puc/pucdata.c#25 integrate
.. //depot/projects/smpng/sys/dev/sio/sio.c#43 integrate
.. //depot/projects/smpng/sys/dev/sio/sio_ebus.c#5 delete
.. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#21 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/buffer.c#11 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_core.c#4 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_sab82532.c#3 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_z8530.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/if_axe.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/ohcireg.h#6 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#51 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs.h#51 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#51 integrate
.. //depot/projects/smpng/sys/dev/usb/uvisor.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/uvscom.c#12 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinumio.c#19 integrate
.. //depot/projects/smpng/sys/fs/nwfs/nwfs_io.c#12 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#16 integrate
.. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#33 integrate
.. //depot/projects/smpng/sys/geom/concat/g_concat.c#4 integrate
.. //depot/projects/smpng/sys/geom/gate/g_gate.c#1 branch
.. //depot/projects/smpng/sys/geom/gate/g_gate.h#1 branch
.. //depot/projects/smpng/sys/geom/geom_gpt.c#15 integrate
.. //depot/projects/smpng/sys/i386/acpica/OsdEnvironment.c#8 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_asus.c#1 branch
.. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#14 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#24 integrate
.. //depot/projects/smpng/sys/i386/acpica/madt.c#8 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#49 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#81 integrate
.. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#18 integrate
.. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#4 integrate
.. //depot/projects/smpng/sys/i386/i386/io_apic.c#5 integrate
.. //depot/projects/smpng/sys/i386/i386/legacy.c#5 integrate
.. //depot/projects/smpng/sys/i386/i386/local_apic.c#8 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#73 integrate
.. //depot/projects/smpng/sys/i386/i386/mptable.c#8 integrate
.. //depot/projects/smpng/sys/i386/i386/mptable_pci.c#2 integrate
.. //depot/projects/smpng/sys/i386/i386/nexus.c#11 integrate
.. //depot/projects/smpng/sys/i386/include/acpica_machdep.h#6 integrate
.. //depot/projects/smpng/sys/i386/include/apicvar.h#4 integrate
.. //depot/projects/smpng/sys/i386/include/bus_pc98.h#9 integrate
.. //depot/projects/smpng/sys/i386/include/float.h#5 integrate
.. //depot/projects/smpng/sys/i386/include/intr_machdep.h#3 integrate
.. //depot/projects/smpng/sys/i386/include/legacyvar.h#3 integrate
.. //depot/projects/smpng/sys/i386/include/mpapic.h#2 delete
.. //depot/projects/smpng/sys/i386/include/pci_cfgreg.h#7 integrate
.. //depot/projects/smpng/sys/i386/isa/atpic.c#7 integrate
.. //depot/projects/smpng/sys/i386/isa/clock.c#33 integrate
.. //depot/projects/smpng/sys/i386/isa/cy.c#24 delete
.. //depot/projects/smpng/sys/i386/isa/cyreg.h#2 delete
.. //depot/projects/smpng/sys/i386/isa/elcr.c#1 branch
.. //depot/projects/smpng/sys/i386/isa/ic/cd1400.h#2 delete
.. //depot/projects/smpng/sys/i386/pci/pci_bus.c#21 integrate
.. //depot/projects/smpng/sys/i386/pci/pci_pir.c#3 integrate
.. //depot/projects/smpng/sys/ia64/acpica/OsdEnvironment.c#7 integrate
.. //depot/projects/smpng/sys/ia64/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/smpng/sys/ia64/acpica/madt.c#12 integrate
.. //depot/projects/smpng/sys/ia64/conf/GENERIC#37 integrate
.. //depot/projects/smpng/sys/ia64/conf/SKI#15 integrate
.. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#25 integrate
.. //depot/projects/smpng/sys/ia64/ia64/trap.c#63 integrate
.. //depot/projects/smpng/sys/ia64/include/acpica_machdep.h#3 integrate
.. //depot/projects/smpng/sys/ia64/include/float.h#6 integrate
.. //depot/projects/smpng/sys/isa/fd.c#33 integrate
.. //depot/projects/smpng/sys/kern/imgact_elf.c#34 integrate
.. //depot/projects/smpng/sys/kern/kern_clock.c#33 integrate
.. //depot/projects/smpng/sys/kern/kern_environment.c#13 integrate
.. //depot/projects/smpng/sys/kern/kern_exec.c#70 integrate
.. //depot/projects/smpng/sys/kern/kern_jail.c#32 integrate
.. //depot/projects/smpng/sys/kern/kern_mac.c#36 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#56 integrate
.. //depot/projects/smpng/sys/kern/kern_timeout.c#19 integrate
.. //depot/projects/smpng/sys/kern/link_elf_obj.c#1 branch
.. //depot/projects/smpng/sys/kern/sched_ule.c#29 integrate
.. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#5 integrate
.. //depot/projects/smpng/sys/kern/subr_smp.c#32 integrate
.. //depot/projects/smpng/sys/kern/tty_compat.c#6 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#51 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#61 integrate
.. //depot/projects/smpng/sys/kern/vfs_export.c#13 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#72 integrate
.. //depot/projects/smpng/sys/libkern/quad.h#7 integrate
.. //depot/projects/smpng/sys/modules/Makefile#75 integrate
.. //depot/projects/smpng/sys/modules/acpi/Makefile#21 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi_asus/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/asr/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/cp/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/geom/Makefile#6 integrate
.. //depot/projects/smpng/sys/modules/geom/geom_gate/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/ipfilter/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/netgraph/Makefile#13 integrate
.. //depot/projects/smpng/sys/modules/sio/Makefile#2 integrate
.. //depot/projects/smpng/sys/net/bridge.c#25 integrate
.. //depot/projects/smpng/sys/net/if.c#48 integrate
.. //depot/projects/smpng/sys/net/if.h#17 integrate
.. //depot/projects/smpng/sys/net/if_arcsubr.c#14 integrate
.. //depot/projects/smpng/sys/net/if_atmsubr.c#16 integrate
.. //depot/projects/smpng/sys/net/if_ethersubr.c#47 integrate
.. //depot/projects/smpng/sys/net/if_fddisubr.c#20 integrate
.. //depot/projects/smpng/sys/net/if_gre.c#16 integrate
.. //depot/projects/smpng/sys/net/if_iso88025subr.c#18 integrate
.. //depot/projects/smpng/sys/net/if_var.h#25 integrate
.. //depot/projects/smpng/sys/net/if_vlan.c#25 integrate
.. //depot/projects/smpng/sys/net/radix.c#11 integrate
.. //depot/projects/smpng/sys/net/route.c#21 integrate
.. //depot/projects/smpng/sys/net/route.h#18 integrate
.. //depot/projects/smpng/sys/net/rtsock.c#33 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211.c#9 integrate
.. //depot/projects/smpng/sys/netatalk/aarp.c#13 integrate
.. //depot/projects/smpng/sys/netatalk/at_extern.h#5 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#19 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/common/ng_bluetooth.c#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#10 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_misc.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#4 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#4 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#12 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#10 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#9 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/ng_parse.c#11 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#11 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pptpgre.h#4 integrate
.. //depot/projects/smpng/sys/netinet/if_ether.c#26 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.c#45 integrate
.. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#6 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw.h#19 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#31 integrate
.. //depot/projects/smpng/sys/netinet/ip_icmp.c#27 integrate
.. //depot/projects/smpng/sys/netinet/ip_input.c#52 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#56 integrate
.. //depot/projects/smpng/sys/netinet/ip_var.h#22 integrate
.. //depot/projects/smpng/sys/netinet/raw_ip.c#38 integrate
.. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#4 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#53 integrate
.. //depot/projects/smpng/sys/netinet/tcp_output.c#24 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#48 integrate
.. //depot/projects/smpng/sys/netinet/tcp_syncache.c#29 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#25 integrate
.. //depot/projects/smpng/sys/netinet/udp_usrreq.c#42 integrate
.. //depot/projects/smpng/sys/netinet6/nd6.c#20 integrate
.. //depot/projects/smpng/sys/netipsec/key.c#11 integrate
.. //depot/projects/smpng/sys/netipsec/xform_tcp.c#2 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#27 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#43 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#25 integrate
.. //depot/projects/smpng/sys/pc98/pc98/fd.c#32 integrate
.. //depot/projects/smpng/sys/pc98/pc98/sio.c#41 integrate
.. //depot/projects/smpng/sys/pci/agp.c#20 integrate
.. //depot/projects/smpng/sys/pci/agp_i810.c#15 integrate
.. //depot/projects/smpng/sys/pci/amdpm.c#11 integrate
.. //depot/projects/smpng/sys/pci/cy_pci.c#9 delete
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC#19 integrate
.. //depot/projects/smpng/sys/powerpc/include/float.h#5 integrate
.. //depot/projects/smpng/sys/powerpc/include/param.h#11 integrate
.. //depot/projects/smpng/sys/powerpc/include/pmap.h#13 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/ata_macio.c#9 integrate
.. //depot/projects/smpng/sys/security/mac/mac_net.c#11 integrate
.. //depot/projects/smpng/sys/security/mac_test/mac_test.c#21 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#38 integrate
.. //depot/projects/smpng/sys/sparc64/conf/NOTES#4 integrate
.. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#11 integrate
.. //depot/projects/smpng/sys/sparc64/include/float.h#5 integrate
.. //depot/projects/smpng/sys/sparc64/include/nexusvar.h#3 integrate
.. //depot/projects/smpng/sys/sparc64/isa/ofw_isa.c#6 integrate
.. //depot/projects/smpng/sys/sparc64/isa/ofw_isa.h#3 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psycho.c#28 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psychoreg.h#8 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psychovar.h#10 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/identcpu.c#12 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#23 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/nexus.c#8 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/ofw_machdep.c#7 integrate
.. //depot/projects/smpng/sys/sys/callout.h#8 integrate
.. //depot/projects/smpng/sys/sys/condvar.h#8 integrate
.. //depot/projects/smpng/sys/sys/elf_common.h#5 integrate
.. //depot/projects/smpng/sys/sys/imgact.h#10 integrate
.. //depot/projects/smpng/sys/sys/imgact_aout.h#8 integrate
.. //depot/projects/smpng/sys/sys/jail.h#10 integrate
.. //depot/projects/smpng/sys/sys/mbuf.h#38 integrate
.. //depot/projects/smpng/sys/sys/mman.h#9 integrate
.. //depot/projects/smpng/sys/sys/proc.h#114 integrate
.. //depot/projects/smpng/sys/sys/types.h#26 integrate
.. //depot/projects/smpng/sys/sys/user.h#18 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#52 integrate
.. //depot/projects/smpng/sys/vm/device_pager.c#15 integrate
.. //depot/projects/smpng/sys/vm/phys_pager.c#12 integrate
.. //depot/projects/smpng/sys/vm/swap_pager.c#44 integrate
.. //depot/projects/smpng/sys/vm/vm_fault.c#35 integrate
.. //depot/projects/smpng/sys/vm/vm_glue.c#42 integrate
.. //depot/projects/smpng/sys/vm/vm_kern.c#27 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#60 integrate
.. //depot/projects/smpng/sys/vm/vm_map.h#27 integrate
.. //depot/projects/smpng/sys/vm/vm_page.c#50 integrate
.. //depot/projects/smpng/sys/vm/vnode_pager.c#40 integrate
Differences ...
==== //depot/projects/smpng/sys/alpha/alpha/fp_emulate.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.13 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.14 2004/05/06 09:35:57 das Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -296,7 +296,7 @@
td->td_pcb->pcb_fp_control = control;
/* Regenerate the control register */
- fpcr = fpregs->fpr_cr & FPCR_DYN_MASK;
+ fpcr = fpregs->fpr_cr & (FPCR_DYN_MASK | FPCR_STATUS_MASK);
fpcr |= ((control & IEEE_STATUS_MASK)
<< IEEE_STATUS_TO_FPCR_SHIFT);
if (!(control & IEEE_TRAP_ENABLE_INV))
==== //depot/projects/smpng/sys/alpha/alpha/ieee_float.c#4 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.9 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.10 2004/05/06 09:36:11 das Exp $");
#include <sys/types.h>
#ifdef TEST
@@ -312,6 +312,9 @@
break;
}
+ if (frac == 0)
+ *status |= FPCR_UNF;
+
/*
* Rounding up may take us to TWO if
* fraclo == (TWO - epsilon). Also If fraclo has been
==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#56 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.143 2004/04/11 05:08:26 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.146 2004/04/26 17:49:05 gallatin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1074,7 +1074,7 @@
*/
VM_OBJECT_LOCK(pmap->pm_pteobj);
lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS,
- VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED);
+ VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO);
vm_page_lock_queues();
vm_page_flag_clear(lev1pg, PG_BUSY);
@@ -1083,10 +1083,7 @@
VM_OBJECT_UNLOCK(pmap->pm_pteobj);
pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg));
- if ((lev1pg->flags & PG_ZERO) == 0)
- bzero(pmap->pm_lev1, PAGE_SIZE);
-
/* install self-referential address mapping entry (not PG_ASM) */
pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg))
| PG_V | PG_KRE | PG_KWE;
@@ -1194,8 +1191,6 @@
VM_OBJECT_LOCK(pmap->pm_pteobj);
m = vm_page_grab(pmap->pm_pteobj, ptepindex,
VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY);
- if ((m->flags & PG_ZERO) == 0)
- pmap_zero_page(m);
KASSERT(m->queue == PQ_NONE,
("_pmap_allocpte: %p->queue != PQ_NONE", m));
@@ -1242,7 +1237,6 @@
vm_page_lock_queues();
m->valid = VM_PAGE_BITS_ALL;
- vm_page_flag_clear(m, PG_ZERO);
vm_page_wakeup(m);
vm_page_unlock_queues();
if (!is_object_locked)
@@ -1906,7 +1900,8 @@
* raise IPL while manipulating pv_table since pmap_enter can be
* called at interrupt time.
*/
- if (pmap_initialized && (m->flags & PG_FICTITIOUS) == 0) {
+ if (pmap_initialized &&
+ (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) {
pmap_insert_entry(pmap, va, mpte, m);
managed |= PG_MANAGED;
}
@@ -1966,7 +1961,7 @@
pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte)
{
register pt_entry_t *pte;
-
+ int managed;
/*
* In the case that a page table page is not
@@ -2031,7 +2026,11 @@
* raise IPL while manipulating pv_table since pmap_enter can be
* called at interrupt time.
*/
- pmap_insert_entry(pmap, va, mpte, m);
+ managed = 0;
+ if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) {
+ pmap_insert_entry(pmap, va, mpte, m);
+ managed = PG_MANAGED | PG_FOR | PG_FOW | PG_FOE;
+ }
/*
* Increment counters
@@ -2041,7 +2040,7 @@
/*
* Now validate mapping with RO protection
*/
- *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | PG_MANAGED | PG_FOR | PG_FOE | PG_FOW;
+ *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | managed;
alpha_pal_imb(); /* XXX overkill? */
return mpte;
==== //depot/projects/smpng/sys/alpha/conf/GENERIC#36 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.168 2004/01/24 21:45:25 jeff Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.170 2004/05/02 20:40:17 marcel Exp $
machine alpha
cpu EV4
@@ -60,6 +60,7 @@
options CD9660 #ISO 9660 Filesystem
options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework
+options GEOM_GPT #GUID Partition Tables.
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options COMPAT_FREEBSD4 #Compatible with FreeBSD4
options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI
@@ -194,10 +195,10 @@
device umass # Disks/Mass storage - Requires scbus and da0
device ums # Mouse
# USB Ethernet
-device aue # ADMtek USB ethernet
-device axe # ASIX Electronics USB ethernet
-device cue # CATC USB ethernet
-device kue # Kawasaki LSI USB ethernet
+device aue # ADMtek USB Ethernet
+device axe # ASIX Electronics USB Ethernet
+device cue # CATC USB Ethernet
+device kue # Kawasaki LSI USB Ethernet
# FireWire support
device firewire # FireWire bus code
==== //depot/projects/smpng/sys/alpha/include/float.h#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/float.h,v 1.5 2004/04/05 21:00:50 imp Exp $ */
+/* $FreeBSD: src/sys/alpha/include/float.h,v 1.6 2004/04/25 02:36:28 das Exp $ */
/* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */
/*
@@ -41,8 +41,10 @@
#define FLT_RADIX 2 /* b */
#define FLT_ROUNDS __flt_rounds()
+#if __ISO_C_VISIBLE >= 1999
#define FLT_EVAL_METHOD 0 /* no promotions */
#define DECIMAL_DIG 17 /* max precision in decimal digits */
+#endif
#define FLT_MANT_DIG 24 /* p */
#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
==== //depot/projects/smpng/sys/alpha/include/fpu.h#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/alpha/include/fpu.h,v 1.6 2002/11/16 06:35:51 deischen Exp $
+ * $FreeBSD: src/sys/alpha/include/fpu.h,v 1.7 2004/05/06 09:35:57 das Exp $
*/
#ifndef _MACHINE_FPU_H_
@@ -56,6 +56,8 @@
#define FPCR_INED (1LL << 62) /* Inexact Disable */
#define FPCR_SUM (1LL << 63) /* Summary Bit */
#define FPCR_MASK (~0LL << 49)
+#define FPCR_STATUS_MASK (FPCR_INV | FPCR_DZE | FPCR_OVF | \
+ FPCR_UNF | FPCR_INE | FPCR_IOV)
/*
* Exception summary bits.
==== //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#5 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.11 2003/08/28 16:30:31 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.12 2004/05/06 02:18:57 njl Exp $");
/*
* 6.1 : Environmental support
@@ -37,7 +37,7 @@
#include "acpi.h"
-u_long amd64_acpi_root;
+static u_long amd64_acpi_root;
SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &amd64_acpi_root, 0,
"The physical address of the RSDP");
==== //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.12 2003/09/22 22:12:46 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.13 2004/04/21 02:10:58 njl Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -40,8 +40,7 @@
{
struct acpi_softc *sc;
- if ((sc = device_get_softc(dev)) == NULL)
- return (ENXIO);
+ sc = device_get_softc(dev);
acpi_install_wakeup_handler(sc);
==== //depot/projects/smpng/sys/amd64/conf/GENERIC#16 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.405 2004/03/25 03:19:28 obrien Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.407 2004/05/02 20:40:18 marcel Exp $
machine amd64
cpu HAMMER
@@ -44,6 +44,7 @@
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
options PSEUDOFS # Pseudo-filesystem framework
+options GEOM_GPT # GUID Partition Tables.
options IA32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI
@@ -180,7 +181,7 @@
# PCI Ethernet NICs that use the common MII bus controller code.
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
device miibus # MII bus support
-device bfe # Broadcom BCM440x 10/100 ethernet
+device bfe # Broadcom BCM440x 10/100 Ethernet
device bge # Broadcom BCM570xx Gigabit Ethernet
device dc # DEC/Intel 21143 and various workalikes
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
@@ -189,9 +190,9 @@
device rl # RealTek 8129/8139
device sf # Adaptec AIC-6915 (``Starfire'')
device sis # Silicon Integrated Systems SiS 900/SiS 7016
-device sk # SysKonnect SK-984x & SK-982x gigabit ethernet
+device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
device ste # Sundance ST201 (D-Link DFE-550TX)
-device ti # Alteon Networks Tigon I/II gigabit ethernet
+device ti # Alteon Networks Tigon I/II gigabit Ethernet
device tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 ``EPIC'')
device vr # VIA Rhine, Rhine II
@@ -210,8 +211,8 @@
#device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc.
# XXX kvtop brokenness, pointer/int warnings
#device lnc # NE2100, NE32-VL Lance Ethernet cards
-device sn # SMC's 9000 series of ethernet chips
-device xe # Xircom pccard ethernet
+device sn # SMC's 9000 series of Ethernet chips
+device xe # Xircom pccard Ethernet
# ISA devices that use the old ISA shims
#device le
@@ -253,10 +254,10 @@
device urio # Diamond Rio 500 MP3 player
device uscanner # Scanners
# USB Ethernet, requires mii
-device aue # ADMtek USB ethernet
-device axe # ASIX Electronics USB ethernet
-device cue # CATC USB ethernet
-device kue # Kawasaki LSI USB ethernet
+device aue # ADMtek USB Ethernet
+device axe # ASIX Electronics USB Ethernet
+device cue # CATC USB Ethernet
+device kue # Kawasaki LSI USB Ethernet
# FireWire support
device firewire # FireWire bus code
==== //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.4 2003/11/21 03:02:00 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.5 2004/05/05 20:04:14 njl Exp $
*/
/******************************************************************************
@@ -59,44 +59,14 @@
#define ACPI_FLUSH_CPU_CACHE() wbinvd()
-#define asm __asm
-/*! [Begin] no source code translation
- *
- * A brief explanation as GNU inline assembly is a bit hairy
- * %0 is the output parameter in EAX ("=a")
- * %1 and %2 are the input parameters in ECX ("c")
- * and an immediate value ("i") respectively
- * All actual register references are preceded with "%%" as in "%%edx"
- * Immediate values in the assembly are preceded by "$" as in "$0x1"
- * The final asm parameter are the operation altered non-output registers.
- */
+/* Section 5.2.9.1: global lock acquire/release functions */
+extern int acpi_acquire_global_lock(uint32_t *lock);
+extern int acpi_release_global_lock(uint32_t *lock);
#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \
- do { \
- asm("1: movl %1,%%eax;" \
- "movl %%eax,%%edx;" \
- "andl %2,%%edx;" \
- "btsl $0x1,%%edx;" \
- "adcl $0x0,%%edx;" \
- "lock; cmpxchgl %%edx,%1;" \
- "jnz 1b;" \
- "cmpb $0x3,%%dl;" \
- "sbbl %%eax,%%eax" \
- : "=a" (Acq), "+m" (GLptr) : "i" (~1L) : "edx"); \
- } while(0)
-
+ ((Acq) = acpi_acquire_global_lock(GLptr))
#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \
- do { \
- asm("1: movl %1,%%eax;" \
- "movl %%eax,%%edx;" \
- "andl %2,%%edx;" \
- "lock; cmpxchgl %%edx,%1;" \
- "jnz 1b;" \
- "andl $0x1,%%eax" \
- : "=a" (Acq), "+m" (GLptr) : "i" (~3L) : "edx"); \
- } while(0)
-
-
-/*! [End] no source code translation !*/
+ ((Acq) = acpi_release_global_lock(GLptr))
+
#endif /* _KERNEL */
#define ACPI_MACHINE_WIDTH 64
==== //depot/projects/smpng/sys/amd64/include/float.h#3 (text+ko) ====
@@ -27,16 +27,20 @@
* SUCH DAMAGE.
*
* from: @(#)float.h 7.1 (Berkeley) 5/8/90
- * $FreeBSD: src/sys/amd64/include/float.h,v 1.11 2004/04/05 21:25:51 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/float.h,v 1.12 2004/04/25 02:36:28 das Exp $
*/
#ifndef _MACHINE_FLOAT_H_
#define _MACHINE_FLOAT_H_ 1
+#include <sys/cdefs.h>
+
#define FLT_RADIX 2 /* b */
#define FLT_ROUNDS 1 /* FP addition rounds to nearest */
+#if __ISO_C_VISIBLE >= 1999
#define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */
#define DECIMAL_DIG 21 /* max precision in decimal digits */
+#endif
#define FLT_MANT_DIG 24 /* p */
#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
==== //depot/projects/smpng/sys/arm/include/_types.h#4 (text+ko) ====
@@ -33,7 +33,7 @@
*
* From: @(#)ansi.h 8.2 (Berkeley) 1/4/94
* From: @(#)types.h 8.3 (Berkeley) 1/5/94
- * $FreeBSD: src/sys/arm/include/_types.h,v 1.4 2004/03/20 20:41:39 marcel Exp $
+ * $FreeBSD: src/sys/arm/include/_types.h,v 1.5 2004/05/04 22:16:29 cognet Exp $
*/
#ifndef _MACHINE__TYPES_H_
@@ -65,6 +65,8 @@
typedef __uint32_t __clock_t; /* clock()... */
typedef unsigned int __cpumask_t;
typedef __int32_t __critical_t;
+typedef double __double_t;
+typedef double __float_t;
typedef __int32_t __intfptr_t;
typedef __int64_t __intmax_t;
typedef __int32_t __intptr_t;
==== //depot/projects/smpng/sys/arm/include/elf.h#4 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/include/elf.h,v 1.4 2003/09/25 01:10:23 peter Exp $
+ * $FreeBSD: src/sys/arm/include/elf.h,v 1.5 2004/05/04 22:21:36 cognet Exp $
*/
#ifndef _MACHINE_ELF_H_
@@ -40,6 +40,17 @@
#define __ELF_WORD_SIZE 32 /* Used by <sys/elf_generic.h> */
#include <sys/elf_generic.h>
+typedef struct { /* Auxiliary vector entry on initial stack */
+ int a_type; /* Entry type. */
+ union {
+ long a_val; /* Integer value. */
+ void *a_ptr; /* Address. */
+ void (*a_fcn)(void); /* Function pointer (not used). */
+ } a_un;
+} Elf32_Auxinfo;
+
+__ElfType(Auxinfo);
+
#define ELF_ARCH EM_ARM
#define ELF_MACHINE_OK(x) ((x) == EM_ARM)
@@ -48,6 +59,29 @@
* Relocation types.
*/
+/* Values for a_type. */
+#define AT_NULL 0 /* Terminates the vector. */
+#define AT_IGNORE 1 /* Ignored entry. */
+#define AT_EXECFD 2 /* File descriptor of program to load. */
+#define AT_PHDR 3 /* Program header of program already loaded. */
+#define AT_PHENT 4 /* Size of each program header entry. */
+#define AT_PHNUM 5 /* Number of program header entries. */
+#define AT_PAGESZ 6 /* Page size in bytes. */
+#define AT_BASE 7 /* Interpreter's base address. */
+#define AT_FLAGS 8 /* Flags (unused). */
+#define AT_ENTRY 9 /* Where interpreter should transfer control. */
+
+#define AT_BRK 10 /* Starting point for sbrk and brk. */
+#define AT_DEBUG 11 /* Debugging level. */
+
+#define AT_NOTELF 10 /* Program is not ELF ?? */
+#define AT_UID 11 /* Real uid. */
+#define AT_EUID 12 /* Effective uid. */
+#define AT_GID 13 /* Real gid. */
+#define AT_EGID 14 /* Effective gid. */
+
+#define AT_COUNT 15 /* Count of defined aux entry types. */
+
#define R_ARM_NONE 0 /* No relocation. */
#define R_ARM_PC24 1
#define R_ARM_ABS32 2
@@ -69,7 +103,7 @@
#define R_ARM_GLOB_DAT 21 /* Set GOT entry to data address. */
#define R_ARM_JUMP_SLOT 22 /* Set GOT entry to code address. */
#define R_ARM_RELATIVE 23 /* Add load address of shared object. */
-#define R_ARM_GOTOFF 24 /* Add GOT-relative symbol address. *
+#define R_ARM_GOTOFF 24 /* Add GOT-relative symbol address. */
#define R_ARM_GOTPC 25 /* Add PC-relative GOT table address. */
#define R_ARM_GOT32 26 /* Add PC-relative GOT offset. */
#define R_ARM_PLT32 27 /* Add PC-relative PLT offset. */
==== //depot/projects/smpng/sys/arm/include/endian.h#3 (text+ko) ====
@@ -27,12 +27,71 @@
*
* @(#)endian.h 8.1 (Berkeley) 6/10/93
* $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $
- * $FreeBSD: src/sys/arm/include/endian.h,v 1.2 2003/08/03 07:50:19 obrien Exp $
+ * $FreeBSD: src/sys/arm/include/endian.h,v 1.3 2004/05/04 22:24:56 cognet Exp $
*/
#ifndef _ENDIAN_H_
#define _ENDIAN_H_
-#define BYTE_ORDER _LITTLE_ENDIAN
+#include <sys/_types.h>
+
+/*
+ * Definitions for byte order, according to byte significance from low
+ * address to high.
+ */
+#define _LITTLE_ENDIAN 1234 /* LSB first: i386, vax */
+#define _BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */
+#define _PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */
+
+#define _BYTE_ORDER _LITTLE_ENDIAN
+
+#if __BSD_VISIBLE
+#define LITTLE_ENDIAN _LITTLE_ENDIAN
+#define BIG_ENDIAN _BIG_ENDIAN
+#define PDP_ENDIAN _PDP_ENDIAN
+#define BYTE_ORDER _BYTE_ORDER
+#endif
+
+#define _QUAD_HIGHWORD 1
+#define _QUAD_LOWWORD 0
+#define __ntohl(x) (__bswap32(x))
+#define __ntohs(x) (__bswap16(x))
+#define __htonl(x) (__bswap16(x))
+#define __htons(x) (__bswap32(x))
+
+static __inline __uint64_t
+__bswap64(__uint64_t _x)
+{
+
+ return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) |
+ ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) |
+ ((_x << 24) & ((__uint64_t)0xff << 40)) |
+ ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56)));
+}
+
+static __inline __uint32_t
+__bswap32(__uint32_t v)
+{
+ __uint32_t t1;
+
+ t1 = v ^ ((v << 16) | (v >> 16));
+ t1 &= 0xff00ffffU;
+ v = (v >> 8) | (v << 24);
+ v ^= (t1 >> 8);
+
+ return (v);
+ }
+static __inline __uint16_t
+__bswap16(__uint32_t v)
+{
+ __asm __volatile(
+ "mov %0, %1, ror #8\n"
+ "orr %0, %0, %0, lsr #16\n"
+ "bic %0, %0, %0, lsl #16"
+ : "=r" (v)
+ : "0" (v));
+
+ return (v);
+}
#endif /* !_ENDIAN_H_ */
==== //depot/projects/smpng/sys/arm/include/signal.h#4 (text+ko) ====
@@ -29,7 +29,7 @@
* @(#)signal.h 8.1 (Berkeley) 6/11/93
* from: FreeBSD: src/sys/i386/include/signal.h,v 1.13 2000/11/09
* from: FreeBSD: src/sys/sparc64/include/signal.h,v 1.6 2001/09/30 18:52:17
- * $FreeBSD: src/sys/arm/include/signal.h,v 1.3 2004/04/05 21:29:41 imp Exp $
+ * $FreeBSD: src/sys/arm/include/signal.h,v 1.4 2004/05/04 22:38:22 cognet Exp $
*/
#ifndef _MACHINE_SIGNAL_H_
@@ -44,7 +44,6 @@
#endif
#if __BSD_VISIBLE
-typedef int osigset_t;
struct osigcontext {
};
==== //depot/projects/smpng/sys/boot/i386/boot0/Makefile#9 (text+ko) ====
@@ -1,13 +1,10 @@
-# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.23 2004/02/09 14:11:56 ru Exp $
+# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.29 2004/04/28 21:31:19 ru Exp $
-PROG= ${BOOT}.out
-INTERNALPROG=
-FILES= ${BOOT}
+PROG?= boot0
+STRIP=
+BINMODE=${NOBINMODE}
NOMAN=
-SRCS= ${BOOT}.s
-CLEANFILES= ${BOOT}
-
-BOOT?= boot0
+SRCS= ${PROG}.S
# The default set of flags compiled into boot0. This enables update (writing
# the modified boot0 back to disk after running so that the selection made is
@@ -30,13 +27,10 @@
# command line
BOOT_BOOT0_COMCONSOLE_SPEED?= 0xE3
-AFLAGS+=--defsym FLAGS=${BOOT_BOOT0_FLAGS} \
- --defsym TICKS=${BOOT_BOOT0_TICKS} \
- --defsym COMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED}
+CFLAGS+=-DFLAGS=${BOOT_BOOT0_FLAGS} \
+ -DTICKS=${BOOT_BOOT0_TICKS} \
+ -DCOMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED}
-LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG}
-
-${BOOT}: ${BOOT}.out
- objcopy -S -O binary ${BOOT}.out ${.TARGET}
+LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-S,--oformat,binary
.include <bsd.prog.mk>
==== //depot/projects/smpng/sys/boot/i386/boot0ext/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/sys/boot/i386/boot0ext/Makefile,v 1.1 2004/03/26 18:46:31 obrien Exp $
+# $FreeBSD: src/sys/boot/i386/boot0ext/Makefile,v 1.2 2004/04/28 21:31:20 ru Exp $
.PATH: ${.CURDIR}/../boot0
-BOOT= boot0ext
+PROG= boot0ext
.include "${.CURDIR}/../boot0/Makefile"
==== //depot/projects/smpng/sys/boot/i386/boot0sio/Makefile#3 (text+ko) ====
@@ -1,7 +1,8 @@
-# $FreeBSD: src/sys/boot/i386/boot0sio/Makefile,v 1.2 2004/02/06 21:58:31 ru Exp $
+# $FreeBSD: src/sys/boot/i386/boot0sio/Makefile,v 1.4 2004/04/28 21:31:20 ru Exp $
.PATH: ${.CURDIR}/../boot0
-BOOT= boot0sio
+PROGNAME= boot0sio
+CFLAGS+= -DSIO
.include "${.CURDIR}/../boot0/Makefile"
==== //depot/projects/smpng/sys/boot/i386/boot2/boot1.S#2 (text+ko) ====
@@ -1,21 +1,21 @@
-//
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Fri May 7 10:33:08 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id EA4AA16A4D0; Fri, 7 May 2004 10:33:07 -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 C33E516A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 10:33:07 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id A5DEB43D2F
for <perforce@freebsd.org>; Fri, 7 May 2004 10:33:07 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47HX7Ge092502
for <perforce@freebsd.org>; Fri, 7 May 2004 10:33:07 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47HX7kS092499
for perforce@freebsd.org; Fri, 7 May 2004 10:33:07 -0700 (PDT)
(envelope-from jhb@freebsd.org)
Date: Fri, 7 May 2004 10:33:07 -0700 (PDT)
Message-Id: <200405071733.i47HX7kS092499@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52440 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: Fri, 07 May 2004 17:33:08 -0000
http://perforce.freebsd.org/chv.cgi?CH=52440
Change 52440 by jhb@jhb_slimer on 2004/05/07 10:32:15
Finish up SWI_CLOCK fixes.
Affected files ...
.. //depot/projects/smpng/sys/dev/cy/cy.c#2 edit
.. //depot/projects/smpng/sys/notes#15 edit
Differences ...
==== //depot/projects/smpng/sys/dev/cy/cy.c#2 (text+ko) ====
@@ -557,9 +557,9 @@
splx(s);
if (sio_fast_ih == NULL) {
- swi_add(&tty_ithd, "tty:cy", siopoll, NULL, SWI_TTY, 0,
+ swi_add(&tty_ithd, "cy", siopoll, NULL, SWI_TTY, 0,
&sio_fast_ih);
- swi_add(&clk_ithd, "tty:cy", siopoll, NULL, SWI_TTY, 0,
+ swi_add(&clk_ithd, "cy", siopoll, NULL, SWI_CLOCK, 0,
&sio_slow_ih);
}
minorbase = UNIT_TO_MINOR(unit);
==== //depot/projects/smpng/sys/notes#15 (text+ko) ====
@@ -6,8 +6,9 @@
+ SWI_TQ*
+ Fix tty hacks on clock to use SWI_CLOCK
+ sio
- - cy
- - cx
+ + cy
+ + cx
+ - Untested
- Consolidate linux module version and dependencies into MI location.
- Untested
- Enable a pmap_emulate_reference check for Alpha under INVARIANTS instead
From owner-p4-projects@FreeBSD.ORG Fri May 7 12:13:33 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 7775216A4D0; Fri, 7 May 2004 12:13:33 -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 5124216A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 12:13:33 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 182C943D48
for <perforce@freebsd.org>; Fri, 7 May 2004 12:13:33 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47JDWGe015113
for <perforce@freebsd.org>; Fri, 7 May 2004 12:13:32 -0700 (PDT)
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47JDWWF015110
for perforce@freebsd.org; Fri, 7 May 2004 12:13:32 -0700 (PDT)
(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 12:13:32 -0700 (PDT)
Message-Id: <200405071913.i47JDWWF015110@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 52449 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: Fri, 07 May 2004 19:13:34 -0000
http://perforce.freebsd.org/chv.cgi?CH=52449
Change 52449 by peter@peter_overcee on 2004/05/07 12:12:55
oops, fix a whitespace change
Affected files ...
.. //depot/projects/hammer/sys/conf/kmod.mk#24 edit
Differences ...
==== //depot/projects/hammer/sys/conf/kmod.mk#24 (text+ko) ====
@@ -138,7 +138,7 @@
.endif
.if ${MACHINE_ARCH} != amd64
-${FULLPROG}: ${KMOD}.kld
+${FULLPROG}: ${KMOD}.kld
${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
.if !defined(DEBUG_FLAGS)
${OBJCOPY} --strip-debug ${.TARGET}
From owner-p4-projects@FreeBSD.ORG Fri May 7 12:26:17 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 04E5B16A4D0; Fri, 7 May 2004 12:26:17 -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 B558816A4CF
for <perforce@FreeBSD.org>; Fri, 7 May 2004 12:26:16 -0700 (PDT)
Received: from mail5.speakeasy.net (mail5.speakeasy.net [216.254.0.205])
by mx1.FreeBSD.org (Postfix) with ESMTP id 44A4243D48
for <perforce@FreeBSD.org>; Fri, 7 May 2004 12:26:16 -0700 (PDT)
(envelope-from jhb@FreeBSD.org)
Received: (qmail 27601 invoked from network); 7 May 2004 19:26:15 -0000
Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx)
([216.27.160.63]) (envelope-sender <jhb@FreeBSD.org>)
encrypted SMTP
for <perforce@FreeBSD.org>; 7 May 2004 19:26:15 -0000
Received: from 10.50.40.205 (gw1.twc.weather.com [216.133.140.1])
by server.baldwin.cx (8.12.11/8.12.11) with ESMTP id i47JQBWw079340;
Fri, 7 May 2004 15:26:11 -0400 (EDT)
(envelope-from jhb@FreeBSD.org)
From: John Baldwin <jhb@FreeBSD.org>
To: Peter Wemm <peter@FreeBSD.org>
Date: Fri, 7 May 2004 15:26:31 -0400
User-Agent: KMail/1.6
References: <200405071554.i47Fs0eI070224@repoman.freebsd.org>
In-Reply-To: <200405071554.i47Fs0eI070224@repoman.freebsd.org>
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <200405071526.31794.jhb@FreeBSD.org>
X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx
cc: Perforce Change Reviews <perforce@FreeBSD.org>
Subject: Re: PERFORCE change 52432 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: Fri, 07 May 2004 19:26:17 -0000
On Friday 07 May 2004 11:54 am, Peter Wemm wrote:
> http://perforce.freebsd.org/chv.cgi?CH=52432
>
> Change 52432 by peter@peter_daintree on 2004/05/07 08:53:13
>
> add elcr.c to conf/files.amd64
It should probably be 'optional atpic isa' but the mptable.c code also uses
it. Doesn't hurt it to be standard though.
--
John Baldwin <jhb@FreeBSD.org> <>< http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve" = http://www.FreeBSD.org
From owner-p4-projects@FreeBSD.ORG Fri May 7 18:15:04 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id E404A16A4D0; Fri, 7 May 2004 18:15:03 -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 A6B6516A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 18:15:03 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 5660F43D2D
for <perforce@freebsd.org>; Fri, 7 May 2004 18:15:01 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i481F1Ge006777
for <perforce@freebsd.org>; Fri, 7 May 2004 18:15:01 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i481F0aO006772
for perforce@freebsd.org; Fri, 7 May 2004 18:15:00 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Date: Fri, 7 May 2004 18:15:00 -0700 (PDT)
Message-Id: <200405080115.i481F0aO006772@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52467 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: Sat, 08 May 2004 01:15:04 -0000
http://perforce.freebsd.org/chv.cgi?CH=52467
Change 52467 by marcel@marcel_nfs on 2004/05/07 18:14:54
IFC @52456
Affected files ...
.. //depot/projects/gdb/lib/msun/Makefile#2 integrate
.. //depot/projects/gdb/lib/msun/man/ieee.3#2 integrate
.. //depot/projects/gdb/lib/msun/src/math.h#4 integrate
.. //depot/projects/gdb/lib/msun/src/s_copysignl.c#1 branch
.. //depot/projects/gdb/sbin/route/route.c#6 integrate
.. //depot/projects/gdb/share/man/man4/man4.i386/cp.4#1 branch
.. //depot/projects/gdb/share/man/man5/link.5#2 integrate
.. //depot/projects/gdb/share/man/man5/style.Makefile.5#2 integrate
.. //depot/projects/gdb/share/mk/bsd.lib.mk#4 integrate
.. //depot/projects/gdb/sys/dev/ctau/if_ct.c#2 integrate
.. //depot/projects/gdb/sys/dev/cx/if_cx.c#4 integrate
.. //depot/projects/gdb/sys/kern/tty_compat.c#3 integrate
.. //depot/projects/gdb/sys/sys/user.h#4 integrate
.. //depot/projects/gdb/sys/vm/vm_glue.c#7 integrate
.. //depot/projects/gdb/usr.bin/ctags/ctags.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sysinstall/config.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sysinstall/install.c#4 integrate
Differences ...
==== //depot/projects/gdb/lib/msun/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 5.1beta 93/09/24
-# $FreeBSD: src/lib/msun/Makefile,v 1.37 2003/10/25 09:32:18 des Exp $
+# $FreeBSD: src/lib/msun/Makefile,v 1.39 2004/05/07 18:56:31 stefanf Exp $
#
# ====================================================
# Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
@@ -102,7 +102,7 @@
CFLAGS+= -I${LIBCDIR}/include -I${LIBCDIR}/${MACHINE_ARCH}
# C99 long double functions
-COMMON_SRCS+= s_fabsl.c
+COMMON_SRCS+= s_copysignl.c s_fabsl.c
# FreeBSD's C library supplies these functions:
#COMMON_SRCS+= s_fabs.c s_frexp.c s_isnan.c s_ldexp.c s_modf.c
@@ -139,11 +139,12 @@
exp.3 expf.3 exp.3 exp10.3 exp.3 exp10f.3 \
exp.3 expm1f.3 exp.3 logf.3 exp.3 powf.3 \
exp.3 log10f.3 exp.3 log1pf.3
-MLINKS+=fabs.3 fabsf.3
+MLINKS+=fabs.3 fabsf.3 fabs.3 fabsl.3
MLINKS+=floor.3 floorf.3
MLINKS+=fmod.3 fmodf.3
MLINKS+=hypot.3 cabs.3 hypot.3 cabsf.3 hypot.3 hypotf.3
-MLINKS+=ieee.3 copysign.3 ieee.3 copysignf.3 ieee.3 finite.3 ieee.3 finitef.3 \
+MLINKS+=ieee.3 copysign.3 ieee.3 copysignf.3 ieee.3 copysignl.3 \
+ ieee.3 finite.3 ieee.3 finitef.3 \
ieee.3 ilogb.3 ieee.3 ilogbf.3 ieee.3 nextafter.3 ieee.3 nextafterf.3 \
ieee.3 remainder.3 ieee.3 remainderf.3 ieee.3 scalbn.3 ieee.3 scalbnf.3
MLINKS+=ieee_test.3 logb.3 ieee_test.3 logbf.3
==== //depot/projects/gdb/lib/msun/man/ieee.3#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)ieee.3 6.4 (Berkeley) 5/6/91
-.\" $FreeBSD: src/lib/msun/man/ieee.3,v 1.12 2001/10/15 13:34:43 dd Exp $
+.\" $FreeBSD: src/lib/msun/man/ieee.3,v 1.13 2004/05/07 18:56:31 stefanf Exp $
.\"
.Dd February 25, 1994
.Dt IEEE 3
@@ -38,6 +38,7 @@
.Sh NAME
.Nm copysign ,
.Nm copysignf ,
+.Nm copysignl ,
.Nm finite ,
.Nm finitef ,
.Nm ilogb ,
@@ -57,6 +58,8 @@
.Fn copysign "double x" "double y"
.Ft float
.Fn copysignf "float x" "float y"
+.Ft long double
+.Fn copysignl "long double x" "long double y"
.Ft int
.Fn finite "double x"
.Ft int
@@ -81,9 +84,10 @@
These functions are required or recommended by
.St -ieee754 .
.Pp
-.Fn copysign
+.Fn copysign ,
+.Fn copysignf
and
-.Fn copysignf
+.Fn copysignl
return
.Fa x
with its sign changed to
@@ -179,5 +183,9 @@
.Nm ieee
functions appeared in
.Bx 4.3 .
+The
+.Fn copysignl
+function first appeared in
+.Fx 5.3 .
.Sh STANDARDS
.St -ieee754
==== //depot/projects/gdb/lib/msun/src/math.h#4 (text+ko) ====
@@ -11,7 +11,7 @@
/*
* from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD: src/lib/msun/src/math.h,v 1.31 2004/04/25 02:35:42 das Exp $
+ * $FreeBSD: src/lib/msun/src/math.h,v 1.32 2004/05/07 18:56:31 stefanf Exp $
*/
#ifndef _MATH_H_
@@ -353,7 +353,9 @@
long double atanl(long double);
long double cbrtl(long double);
long double ceill(long double);
+#endif
long double copysignl(long double, long double);
+#if 0
long double coshl(long double);
long double cosl(long double);
long double erfcl(long double);
==== //depot/projects/gdb/sbin/route/route.c#6 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/route/route.c,v 1.74 2004/05/03 16:30:32 andre Exp $";
+ "$FreeBSD: src/sbin/route/route.c,v 1.75 2004/05/07 15:33:17 csjp Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -273,6 +273,8 @@
rtm->rtm_type = RTM_DELETE;
rtm->rtm_seq = seqno;
rlen = write(s, next, rtm->rtm_msglen);
+ if (rlen < 0 && errno == EPERM)
+ err(1, "write to routing socket");
if (rlen < (int)rtm->rtm_msglen) {
warn("write to routing socket");
(void) printf("got only %d for rlen\n", rlen);
@@ -1223,6 +1225,8 @@
if (debugonly)
return (0);
if ((rlen = write(s, (char *)&m_rtmsg, l)) < 0) {
+ if (errno == EPERM)
+ err(1, "writing to routing socket");
warn("writing to routing socket");
return (-1);
}
==== //depot/projects/gdb/share/man/man5/link.5#2 (text+ko) ====
@@ -26,7 +26,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/share/man/man5/link.5,v 1.26 2003/09/08 19:57:20 ru Exp $
+.\" $FreeBSD: src/share/man/man5/link.5,v 1.27 2004/05/07 13:00:01 brueffer Exp $
.\"
.Dd October 23, 1993
.Dt LINK 5
@@ -295,7 +295,7 @@
.Fa sod
structure that was responsible for loading this shared object.
.It Fa som_sodbase
-Tossed in later versions the run-time linker.
+Tossed out in later versions of the run-time linker.
.It Fa som_write
Set if (some portion of) this object's text segment is currently writable.
.It Fa som_dynamic
@@ -393,7 +393,7 @@
Virtual address of next rt_symbol.
.It Fa rt_link
Next in hash bucket.
-Used by internally by
+Used internally by
.Nm ld.so .
.It Fa rt_srcaddr
Location of the source of initialized data within a shared object.
@@ -436,7 +436,7 @@
.It Fa dd_sym_loaded
Set by the run-time linker whenever it adds symbols by loading shared objects.
.It Fa dd_bpt_addr
-The address were a breakpoint will be set by the run-time linker to
+The address where a breakpoint will be set by the run-time linker to
divert control to the debugger.
This address is determined by the start-up
module,
==== //depot/projects/gdb/share/man/man5/style.Makefile.5#2 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/style.Makefile.5,v 1.7 2003/09/08 19:57:20 ru Exp $
+.\" $FreeBSD: src/share/man/man5/style.Makefile.5,v 1.8 2004/05/07 09:59:03 des Exp $
.\"
.Dd February 28, 2003
.Dt STYLE.MAKEFILE 5
@@ -70,7 +70,7 @@
The general
.Dq product
order is:
-.Va PROG Ns / Ns Va LIB Ns / Ns Va SCRIPT
+.Va PROG Ns / Ns Oo Va SH Oc Ns Va LIB Ns / Ns Va SCRIPT
.Va FILES
.Va LINKS
.Oo Va NO Oc Ns Va MAN
@@ -84,7 +84,7 @@
The general
.Dq build
order is:
-.Va PROG Ns / Ns Va LIB Ns / Ns Va SCRIPT
+.Va PROG Ns / Ns Oo Va SH Oc Ns Va LIB Ns / Ns Va SCRIPT
.Va SRCS
.Va WARNS
.Va CFLAGS
==== //depot/projects/gdb/share/mk/bsd.lib.mk#4 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91
-# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.159 2004/03/15 17:01:31 trhodes Exp $
+# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.160 2004/05/07 09:58:36 des Exp $
#
.include <bsd.init.mk>
@@ -12,8 +12,11 @@
.undef SHLIB_NAME
.undef INSTALL_PIC_ARCHIVE
.else
-.if !defined(SHLIB_NAME) && defined(LIB) && defined(SHLIB_MAJOR)
-SHLIB_NAME= lib${LIB}.so.${SHLIB_MAJOR}
+.if !defined(SHLIB) && defined(LIB)
+SHLIB= ${LIB}
+.endif
+.if !defined(SHLIB_NAME) && defined(SHLIB) && defined(SHLIB_MAJOR)
+SHLIB_NAME= lib${SHLIB}.so.${SHLIB_MAJOR}
.endif
.if defined(SHLIB_NAME) && !empty(SHLIB_NAME:M*.so.*)
SHLIB_LINK?= ${SHLIB_NAME:R}
==== //depot/projects/gdb/sys/dev/ctau/if_ct.c#2 (text+ko) ====
@@ -21,7 +21,7 @@
* Cronyx Id: if_ct.c,v 1.1.2.22 2004/02/26 19:06:51 rik Exp $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.2 2004/03/02 16:39:40 rik Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.4 2004/05/07 11:59:54 rik Exp $");
#include <sys/param.h>
@@ -64,7 +64,7 @@
# include <i386/isa/intr_machdep.h>
# endif
#endif
-#if __FreeBSD_version >= 500000
+#if __FreeBSD_version >= 400000
#include <dev/cx/machdep.h>
#include <dev/ctau/ctddk.h>
#include <dev/cx/cronyxfw.h>
@@ -78,7 +78,7 @@
# include "opt_netgraph.h"
# include <netgraph/ng_message.h>
# include <netgraph/netgraph.h>
-#if __FreeBSD_version >= 500000
+#if __FreeBSD_version >= 400000
# include <dev/ctau/ng_ct.h>
#else
# include <netgraph/ng_ct.h>
@@ -107,6 +107,11 @@
#endif
#endif
+/* If we don't have Cronyx's sppp version, we don't have fr support via sppp */
+#ifndef PP_FR
+#define PP_FR 0
+#endif
+
#define CT_DEBUG(d,s) ({if (d->chan->debug) {\
printf ("%s: ", d->name); printf s;}})
#define CT_DEBUG2(d,s) ({if (d->chan->debug>1) {\
@@ -1333,7 +1338,7 @@
#ifndef NETGRAPH
case SERIAL_GETPROTO:
- strcpy ((char*)data, /*(d->pp.pp_flags & PP_FR) ? "fr" :*/
+ strcpy ((char*)data, (d->pp.pp_flags & PP_FR) ? "fr" :
(d->pp.pp_if.if_flags & PP_CISCO) ? "cisco" : "ppp");
return 0;
@@ -1351,21 +1356,21 @@
if (d->pp.pp_if.if_flags & IFF_RUNNING)
return EBUSY;
if (! strcmp ("cisco", (char*)data)) {
-/* d->pp.pp_flags &= ~(PP_FR);*/
+ d->pp.pp_flags &= ~(PP_FR);
d->pp.pp_flags |= PP_KEEPALIVE;
d->pp.pp_if.if_flags |= PP_CISCO;
-/* } else if (! strcmp ("fr", (char*)data)) {
+ } else if (! strcmp ("fr", (char*)data)) {
d->pp.pp_if.if_flags &= ~(PP_CISCO);
- d->pp.pp_flags |= PP_FR | PP_KEEPALIVE;*/
+ d->pp.pp_flags |= PP_FR | PP_KEEPALIVE;
} else if (! strcmp ("ppp", (char*)data)) {
- d->pp.pp_flags &= ~(/*PP_FR | */PP_KEEPALIVE);
+ d->pp.pp_flags &= ~(PP_FR | PP_KEEPALIVE);
d->pp.pp_if.if_flags &= ~(PP_CISCO);
} else
return EINVAL;
return 0;
case SERIAL_GETKEEPALIVE:
- if (/*(d->pp.pp_flags & PP_FR) ||*/
+ if ((d->pp.pp_flags & PP_FR) ||
(d->pp.pp_if.if_flags & PP_CISCO))
return EINVAL;
*(int*)data = (d->pp.pp_flags & PP_KEEPALIVE) ? 1 : 0;
@@ -1382,7 +1387,7 @@
#endif /* __FreeBSD_version >= 500000 */
if (error)
return error;
- if (/*(d->pp.pp_flags & PP_FR) ||*/
+ if ((d->pp.pp_flags & PP_FR) ||
(d->pp.pp_if.if_flags & PP_CISCO))
return EINVAL;
if (*(int*)data)
==== //depot/projects/gdb/sys/dev/cx/if_cx.c#4 (text+ko) ====
@@ -22,7 +22,7 @@
* Cronyx Id: if_cx.c,v 1.1.2.23 2004/02/26 17:56:40 rik Exp $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.7 2004/03/02 16:44:07 rik Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.10 2004/05/07 11:45:25 rik Exp $");
#include <sys/param.h>
@@ -67,7 +67,7 @@
# include <i386/isa/intr_machdep.h>
# endif
#endif
-#if __FreeBSD_version >= 500000
+#if __FreeBSD_version >= 400000
# include <dev/cx/machdep.h>
# include <dev/cx/cxddk.h>
# include <dev/cx/cronyxfw.h>
@@ -81,7 +81,7 @@
# include "opt_netgraph.h"
# include <netgraph/ng_message.h>
# include <netgraph/netgraph.h>
-# if __FreeBSD_version >= 500000
+# if __FreeBSD_version >= 400000
# include <dev/cx/ng_cx.h>
# else
# include <netgraph/ng_cx.h>
@@ -91,7 +91,7 @@
# if __FreeBSD_version < 500000
# include "sppp.h"
# if NSPPP <= 0
-# error The device cp requires sppp or netgraph.
+# error The device cx requires sppp or netgraph.
# endif
# endif
# include <net/if_sppp.h>
@@ -110,6 +110,11 @@
#endif
#endif
+/* If we don't have Cronyx's sppp version, we don't have fr support via sppp */
+#ifndef PP_FR
+#define PP_FR 0
+#endif
+
#define CX_DEBUG(d,s) ({if (d->chan->debug) {\
printf ("%s: ", d->name); printf s;}})
#define CX_DEBUG2(d,s) ({if (d->chan->debug>1) {\
@@ -226,7 +231,6 @@
static swihand_t cx_softintr;
#else
static void cx_softintr (void *);
-static void *cx_slow_ih;
static void *cx_fast_ih;
#endif
static void cx_down (drv_t *d);
@@ -1810,7 +1814,7 @@
CX_DEBUG2 (d, ("ioctl: getproto\n"));
s = splhigh ();
strcpy ((char*)data, (c->mode == M_ASYNC) ? "async" :
- /*(d->pp.pp_flags & PP_FR) ? "fr" :*/
+ (d->pp.pp_flags & PP_FR) ? "fr" :
(d->pp.pp_if.if_flags & PP_CISCO) ? "cisco" : "ppp");
splx (s);
return 0;
@@ -1832,14 +1836,14 @@
if (d->pp.pp_if.if_flags & IFF_RUNNING)
return EBUSY;
if (! strcmp ("cisco", (char*)data)) {
-/* d->pp.pp_flags &= ~(PP_FR);*/
+ d->pp.pp_flags &= ~(PP_FR);
d->pp.pp_flags |= PP_KEEPALIVE;
d->pp.pp_if.if_flags |= PP_CISCO;
-/* } else if (! strcmp ("fr", (char*)data)) {*/
-/* d->pp.pp_if.if_flags &= ~(PP_CISCO);*/
-/* d->pp.pp_flags |= PP_FR | PP_KEEPALIVE;*/
+ } else if (! strcmp ("fr", (char*)data)) {
+ d->pp.pp_if.if_flags &= ~(PP_CISCO);
+ d->pp.pp_flags |= PP_FR | PP_KEEPALIVE;
} else if (! strcmp ("ppp", (char*)data)) {
- d->pp.pp_flags &= ~(/*PP_FR |*/ PP_KEEPALIVE);
+ d->pp.pp_flags &= ~(PP_FR | PP_KEEPALIVE);
d->pp.pp_if.if_flags &= ~(PP_CISCO);
} else
return EINVAL;
@@ -1847,7 +1851,7 @@
case SERIAL_GETKEEPALIVE:
CX_DEBUG2 (d, ("ioctl: getkeepalive\n"));
- if (/*(d->pp.pp_flags & PP_FR) ||*/
+ if ((d->pp.pp_flags & PP_FR) ||
(d->pp.pp_if.if_flags & PP_CISCO) ||
(c->mode == M_ASYNC))
return EINVAL;
@@ -1868,7 +1872,7 @@
#endif /* __FreeBSD_version >= 500000 */
if (error)
return error;
- if (/*(d->pp.pp_flags & PP_FR) ||*/
+ if ((d->pp.pp_flags & PP_FR) ||
(d->pp.pp_if.if_flags & PP_CISCO))
return EINVAL;
s = splhigh ();
@@ -3145,8 +3149,6 @@
#else
swi_add(&tty_ithd, "tty:cx", cx_softintr, NULL, SWI_TTY, 0,
&cx_fast_ih);
- swi_add(&clk_ithd, "tty:cx", cx_softintr, NULL, SWI_TTY, 0,
- &cx_slow_ih);
#endif
break;
case MOD_UNLOAD:
@@ -3163,7 +3165,6 @@
untimeout (cx_timeout, 0, timeout_handle);
#if __FreeBSD_version >= 500000
ithread_remove_handler (cx_fast_ih);
- ithread_remove_handler (cx_slow_ih);
#else
unregister_swi (SWI_TTY, cx_softintr);
#endif
==== //depot/projects/gdb/sys/kern/tty_compat.c#3 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/tty_compat.c,v 1.33 2004/04/05 21:03:36 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/tty_compat.c,v 1.34 2004/05/07 15:35:38 cognet Exp $");
#include "opt_compat.h"
@@ -137,7 +137,7 @@
cc[VSTOP] = tc->t_stopc;
cc[VEOF] = tc->t_eofc;
cc[VEOL] = tc->t_brkc;
- if (tc->t_brkc == -1)
+ if (tc->t_brkc == (char)_POSIX_VDISABLE)
cc[VEOL2] = _POSIX_VDISABLE;
*com = TIOCSETA;
break;
==== //depot/projects/gdb/sys/sys/user.h#4 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)user.h 8.2 (Berkeley) 9/23/93
- * $FreeBSD: src/sys/sys/user.h,v 1.55 2004/04/07 04:19:50 imp Exp $
+ * $FreeBSD: src/sys/sys/user.h,v 1.56 2004/05/07 15:37:56 cognet Exp $
*/
#ifndef _SYS_USER_H_
@@ -74,7 +74,7 @@
defined(__amd64__)
#define KINFO_PROC_SIZE 912 /* the correct size for kinfo_proc */
#endif
-#ifdef __i386__
+#if __i386__ || defined __arm__
#define KINFO_PROC_SIZE 648 /* the correct size for kinfo_proc */
#endif
#ifdef __powerpc__
==== //depot/projects/gdb/sys/vm/vm_glue.c#7 (text+ko) ====
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.196 2004/04/06 20:15:36 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.197 2004/05/07 11:43:24 green Exp $");
#include "opt_vm.h"
#include "opt_kstack_pages.h"
@@ -216,7 +216,7 @@
return (EAGAIN);
#endif
error = vm_map_wire(&curproc->p_vmspace->vm_map, start, end,
- VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES);
+ VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES);
/*
* Return EFAULT on error to match copy{in,out}() behaviour
* rather than returning ENOMEM like mlock() would.
==== //depot/projects/gdb/usr.bin/ctags/ctags.c#2 (text+ko) ====
@@ -44,11 +44,14 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/ctags/ctags.c,v 1.18 2002/07/28 15:50:38 dwmalone Exp $");
+#include <sys/types.h>
+#include <sys/wait.h>
+__FBSDID("$FreeBSD: src/usr.bin/ctags/ctags.c,v 1.19 2004/05/07 19:44:40 cjc Exp $");
#include <err.h>
#include <limits.h>
#include <locale.h>
+#include <regex.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -94,7 +97,6 @@
int exit_val; /* exit value */
int step; /* step through args */
int ch; /* getopts char */
- char *cmd;
setlocale(LC_ALL, "");
@@ -164,16 +166,38 @@
put_entries(head);
else {
if (uflag) {
+ FILE *oldf;
+ regex_t *regx;
+
+ if ((oldf = fopen(outfile, "r")) == NULL)
+ err(1, "opening %s", outfile);
+ if (unlink(outfile))
+ err(1, "unlinking %s", outfile);
+ if ((outf = fopen(outfile, "w")) == NULL)
+ err(1, "recreating %s", outfile);
+ if ((regx = calloc(argc, sizeof(regex_t))) == NULL)
+ err(1, "RE alloc");
for (step = 0; step < argc; step++) {
- (void)asprintf(&cmd,
- "mv %s OTAGS; fgrep -v '\t%s\t' OTAGS >%s; rm OTAGS",
- outfile, argv[step], outfile);
- if (cmd == NULL)
- err(1, "out of space");
- system(cmd);
- free(cmd);
- cmd = NULL;
+ (void)strcpy(lbuf, "\t");
+ (void)strlcat(lbuf, argv[step], LINE_MAX);
+ (void)strlcat(lbuf, "\t", LINE_MAX);
+ if (regcomp(regx + step, lbuf,
+ REG_NOSPEC))
+ warn("RE compilation failed");
+ }
+nextline:
+ while (fgets(lbuf, LINE_MAX, oldf)) {
+ for (step = 0; step < argc; step++)
+ if (regexec(regx + step,
+ lbuf, 0, NULL, 0) == 0)
+ goto nextline;
+ fputs(lbuf, outf);
}
+ for (step = 0; step < argc; step++)
+ regfree(regx + step);
+ free(regx);
+ fclose(oldf);
+ fclose(outf);
++aflag;
}
if (!(outf = fopen(outfile, aflag ? "a" : "w")))
@@ -181,13 +205,18 @@
put_entries(head);
(void)fclose(outf);
if (uflag) {
- (void)asprintf(&cmd, "sort -o %s %s",
- outfile, outfile);
- if (cmd == NULL)
- err(1, "out of space");
- system(cmd);
- free(cmd);
- cmd = NULL;
+ pid_t pid;
+
+ if ((pid = fork()) == -1)
+ err(1, "fork failed");
+ else if (pid == 0) {
+ execlp("sort", "sort", "-o", outfile,
+ outfile, NULL);
+ err(1, "exec of sort failed");
+ }
+ /* Just assume the sort went OK. The old code
+ did not do any checks either. */
+ (void)wait(NULL);
}
}
}
==== //depot/projects/gdb/usr.sbin/sysinstall/config.c#2 (text+ko) ====
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $FreeBSD: src/usr.sbin/sysinstall/config.c,v 1.221 2004/01/02 09:33:58 obrien Exp $
+ * $FreeBSD: src/usr.sbin/sysinstall/config.c,v 1.222 2004/05/07 19:15:55 jhb Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -212,7 +212,8 @@
chunk_list[nchunks++] = c2;
}
}
- else if ((c1->type == fat || c1->type == efi) && c1->private_data)
+ else if (((c1->type == fat || c1->type == efi || c1->type == part) &&
+ c1->private_data) || (c1->type == part && c1->subtype == FS_SWAP))
chunk_list[nchunks++] = c1;
}
}
==== //depot/projects/gdb/usr.sbin/sysinstall/install.c#4 (text+ko) ====
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $FreeBSD: src/usr.sbin/sysinstall/install.c,v 1.352 2004/03/11 18:50:05 jhb Exp $
+ * $FreeBSD: src/usr.sbin/sysinstall/install.c,v 1.353 2004/05/07 19:15:56 jhb Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -1036,8 +1036,14 @@
return DITEM_FAILURE | DITEM_RESTORE;
}
for (c1 = disk->chunks->part; c1; c1 = c1->next) {
+#ifndef __ia64__
if (c1->type == freebsd) {
for (c2 = c1->part; c2; c2 = c2->next) {
+#else
+ if (c1->type == part) {
+ c2 = c1;
+ {
+#endif
if (c2->type == part && c2->subtype != FS_SWAP && c2->private_data) {
PartInfo *tmp = (PartInfo *)c2->private_data;
From owner-p4-projects@FreeBSD.ORG Fri May 7 19:25:33 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CE79A16A4D0; Fri, 7 May 2004 19:25:32 -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 A964516A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 19:25:32 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 7B2BA43D5C
for <perforce@freebsd.org>; Fri, 7 May 2004 19:25:32 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i482PWGe021842
for <perforce@freebsd.org>; Fri, 7 May 2004 19:25:32 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i482PW64021839
for perforce@freebsd.org; Fri, 7 May 2004 19:25:32 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Date: Fri, 7 May 2004 19:25:32 -0700 (PDT)
Message-Id: <200405080225.i482PW64021839@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52477 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: Sat, 08 May 2004 02:25:33 -0000
http://perforce.freebsd.org/chv.cgi?CH=52477
Change 52477 by marcel@marcel_nfs on 2004/05/07 19:24:34
Go directly to KDB for every trap that occurs while the
debugger is active, not just memory related traps.
Affected files ...
.. //depot/projects/gdb/sys/alpha/alpha/trap.c#5 edit
Differences ...
==== //depot/projects/gdb/sys/alpha/alpha/trap.c#5 (text+ko) ====
@@ -283,7 +283,7 @@
#endif
p = td->td_proc;
- if (kdb_active && entry == ALPHA_KENTRY_MM) {
+ if (kdb_active) {
kdb_trap(entry, a0, framep);
return;
}
From owner-p4-projects@FreeBSD.ORG Fri May 7 21:15:38 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 341A416A4D0; Fri, 7 May 2004 21:15:38 -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 0A35A16A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 21:15:38 -0700 (PDT)
Received: from root.org (root.org [67.118.192.226])
by mx1.FreeBSD.org (Postfix) with SMTP id 5B9F343D5F
for <perforce@freebsd.org>; Fri, 7 May 2004 21:15:37 -0700 (PDT)
(envelope-from nate@root.org)
Received: (qmail 51955 invoked by uid 1000); 8 May 2004 04:15:39 -0000
Date: Fri, 7 May 2004 21:15:39 -0700 (PDT)
From: Nate Lawson <nate@root.org>
To: John Baldwin <jhb@FreeBSD.org>
In-Reply-To: <200405031911.i43JBPk7000313@repoman.freebsd.org>
Message-ID: <20040507211416.H51922@root.org>
References: <200405031911.i43JBPk7000313@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: Perforce Change Reviews <perforce@freebsd.org>
Subject: Re: PERFORCE change 52156 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: Sat, 08 May 2004 04:15:38 -0000
On Mon, 3 May 2004, John Baldwin wrote:
> http://perforce.freebsd.org/chv.cgi?CH=52156
>
> Change 52156 by jhb@jhb_slimer on 2004/05/03 12:10:39
>
> Bah, revert accidental submits. Neither of these worked on my
> laptop, though the acpi_video one does work for some people and
> might should be committed.
>
> Affected files ...
>
> .. //depot/projects/power/sys/dev/acpica/acpi_video.c#4 edit
> .. //depot/projects/power/sys/isa/vga_isa.c#5 edit
The DPMS stuff should go in a different device driver than acpi_video. It
is a MI driver that implements only the standard ACPI interfaces. DPMS is
probed separately and should be in a separate driver. You can have DPMS
without ACPI too.
-Nate
From owner-p4-projects@FreeBSD.ORG Fri May 7 22:17:09 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 13B7C16A4D0; Fri, 7 May 2004 22:17:09 -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 CA4B916A4CF
for <perforce@freebsd.org>; Fri, 7 May 2004 22:17:08 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 7E5BD43D3F
for <perforce@freebsd.org>; Fri, 7 May 2004 22:17:08 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i485H8Ge065180
for <perforce@freebsd.org>; Fri, 7 May 2004 22:17:08 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i485H87U065177
for perforce@freebsd.org; Fri, 7 May 2004 22:17:08 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Date: Fri, 7 May 2004 22:17:08 -0700 (PDT)
Message-Id: <200405080517.i485H87U065177@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52492 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: Sat, 08 May 2004 05:17:09 -0000
http://perforce.freebsd.org/chv.cgi?CH=52492
Change 52492 by marcel@marcel_nfs on 2004/05/07 22:16:29
Add thread support functions:
o kdb_thr_first() and kdb_thr_next() are to be used when
iterating over the threads. Typically one calls these
to list threads.
o kdb_thr_lookup() maps a TID onto a struct thread. This
allows thread selection based on TIDs.
o kdb_thr_select() is used to switch the current thread.
Currently threads that haven't run yet are considered
non-existent. This is mostly done to avoid complexities
caused by not having a valid or complete trapframe.
Remove kdb_set_thread().
Affected files ...
.. //depot/projects/gdb/sys/kern/subr_kdb.c#12 edit
.. //depot/projects/gdb/sys/sys/kdb.h#9 edit
Differences ...
==== //depot/projects/gdb/sys/kern/subr_kdb.c#12 (text+ko) ====
@@ -193,20 +193,6 @@
}
/*
- * Handle contexts.
- */
-
-void *
-kdb_jmpbuf(jmp_buf new)
-{
- void *old;
-
- old = kdb_jmpbufp;
- kdb_jmpbufp = new;
- return (old);
-}
-
-/*
* Enter the currently selected debugger. If a message has been provided,
* it is printed first. If the debugger does not support the enter method,
* it is entered by using breakpoint(), which enters the debugger through
@@ -260,24 +246,79 @@
}
/*
- * Switch the current thread.
+ * Handle contexts.
+ */
+
+void *
+kdb_jmpbuf(jmp_buf new)
+{
+ void *old;
+
+ old = kdb_jmpbufp;
+ kdb_jmpbufp = new;
+ return (old);
+}
+
+/*
+ * Thread related support functions.
*/
-int
-kdb_set_thread(pid_t tid)
+struct thread *
+kdb_thr_first(void)
{
struct proc *p;
+ struct thread *thr;
p = LIST_FIRST(&allproc);
- while (p != NULL && p->p_pid != tid)
+ while (p != NULL) {
+ thr = FIRST_THREAD_IN_PROC(p);
+ while (thr != NULL && thr->td_last_frame == NULL)
+ thr = TAILQ_NEXT(thr, td_plist);
+ if (thr != NULL)
+ return (thr);
p = LIST_NEXT(p, p_list);
- if (p != NULL) {
- kdb_thread = FIRST_THREAD_IN_PROC(p);
- kdb_frame = kdb_thread->td_last_frame;
- if (kdb_frame == NULL)
- kdb_frame = kdb_thread->td_frame;
}
- return ((p != NULL) ? 1 : 0);
+ return (NULL);
+}
+
+struct thread *
+kdb_thr_lookup(pid_t tid)
+{
+ struct thread *thr;
+
+ thr = kdb_thr_first();
+ while (thr != NULL && thr->td_tid != tid)
+ thr = kdb_thr_next(thr);
+ return (thr);
+}
+
+struct thread *
+kdb_thr_next(struct thread *thr)
+{
+ struct proc *p;
+
+ p = thr->td_proc;
+ thr = TAILQ_NEXT(thr, td_plist);
+ do {
+ while (thr != NULL && thr->td_last_frame == NULL)
+ thr = TAILQ_NEXT(thr, td_plist);
+ if (thr != NULL)
+ return (thr);
+ p = LIST_NEXT(p, p_list);
+ if (p != NULL)
+ thr = FIRST_THREAD_IN_PROC(p);
+ } while (p != NULL);
+ return (NULL);
+}
+
+int
+kdb_thr_select(struct thread *thr)
+{
+ if (thr == NULL || thr->td_last_frame == NULL)
+ return (EINVAL);
+ kdb_thread = thr;
+ kdb_frame = kdb_thread->td_last_frame;
+ return (0);
}
/*
==== //depot/projects/gdb/sys/sys/kdb.h#9 (text+ko) ====
@@ -65,7 +65,10 @@
void kdb_enter(const char *);
void kdb_init(void);
void * kdb_jmpbuf(jmp_buf);
-int kdb_set_thread(pid_t);
+struct thread *kdb_thr_first(void);
+struct thread *kdb_thr_lookup(pid_t);
+struct thread *kdb_thr_next(struct thread *);
+int kdb_thr_select(struct thread *);
int kdb_trap(int, int, struct trapframe *);
#endif /* !_SYS_KDB_H_ */
From owner-p4-projects@FreeBSD.ORG Fri May 7 22:19:12 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6B56216A4D0; Fri, 7 May 2004 22:19:12 -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 28B2E16A4CE
for <perforce@freebsd.org>; Fri, 7 May 2004 22:19:12 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id F254B43D39
for <perforce@freebsd.org>; Fri, 7 May 2004 22:19:11 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i485JBGe065299
for <perforce@freebsd.org>; Fri, 7 May 2004 22:19:11 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i485JBOS065295
for perforce@freebsd.org; Fri, 7 May 2004 22:19:11 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Date: Fri, 7 May 2004 22:19:11 -0700 (PDT)
Message-Id: <200405080519.i485JBOS065295@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52494 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: Sat, 08 May 2004 05:19:13 -0000
http://perforce.freebsd.org/chv.cgi?CH=52494
Change 52494 by marcel@marcel_nfs on 2004/05/07 22:18:41
Rewrite the handling of threads to use the new thread support
functions.
Affected files ...
.. //depot/projects/gdb/sys/gdb/gdb_main.c#14 edit
Differences ...
==== //depot/projects/gdb/sys/gdb/gdb_main.c#14 (text+ko) ====
@@ -92,7 +92,7 @@
static int
gdb_trap(int type, int code)
{
- struct proc *thr_iter;
+ struct thread *thr_iter;
/*
* Send a T packet. We currently do not support watchpoints (the
@@ -138,10 +138,17 @@
break;
case 'H': { /* Set thread. */
intmax_t tid;
+ struct thread *thr;
gdb_rx_char();
gdb_rx_varhex(&tid);
- if (tid > 0)
- kdb_set_thread(tid);
+ if (tid > 0) {
+ thr = kdb_thr_lookup(tid);
+ if (thr == NULL) {
+ gdb_tx_err(ENOENT);
+ break;
+ }
+ kdb_thr_select(thr);
+ }
gdb_tx_ok();
break;
}
@@ -176,19 +183,19 @@
}
case 'q': /* General query. */
if (gdb_rx_equal("fThreadInfo")) {
- thr_iter = LIST_FIRST(&allproc);
+ thr_iter = kdb_thr_first();
gdb_tx_begin('m');
- gdb_tx_hex(thr_iter->p_pid, 8);
+ gdb_tx_hex(thr_iter->td_tid, 8);
gdb_tx_end();
} else if (gdb_rx_equal("sThreadInfo")) {
if (thr_iter == NULL) {
gdb_tx_err(ENXIO);
break;
}
- thr_iter = LIST_NEXT(thr_iter, p_list);
+ thr_iter = kdb_thr_next(thr_iter);
if (thr_iter != NULL) {
gdb_tx_begin('m');
- gdb_tx_hex(thr_iter->p_pid, 8);
+ gdb_tx_hex(thr_iter->td_tid, 8);
gdb_tx_end();
} else {
gdb_tx_begin('l');
@@ -206,14 +213,11 @@
}
case 'T': { /* Thread alive. */
intmax_t tid;
- pid_t curtid;
gdb_rx_varhex(&tid);
- curtid = kdb_thread->td_tid;
- if (kdb_set_thread(tid))
+ if (kdb_thr_lookup(tid) != NULL)
gdb_tx_ok();
else
gdb_tx_err(ENOENT);
- kdb_set_thread(curtid);
break;
}
case -1:
From owner-p4-projects@FreeBSD.ORG Fri May 7 22:25:22 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 3A0B916A4D0; Fri, 7 May 2004 22:25:22 -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 12B4A16A4CF
for <perforce@freebsd.org>; Fri, 7 May 2004 22:25:22 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 789AA43D49
for <perforce@freebsd.org>; Fri, 7 May 2004 22:25:21 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i485PLGe067286
for <perforce@freebsd.org>; Fri, 7 May 2004 22:25:21 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i485PLZw067278
for perforce@freebsd.org; Fri, 7 May 2004 22:25:21 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Date: Fri, 7 May 2004 22:25:21 -0700 (PDT)
Message-Id: <200405080525.i485PLZw067278@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52498 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: Sat, 08 May 2004 05:25:22 -0000
http://perforce.freebsd.org/chv.cgi?CH=52498
Change 52498 by marcel@marcel_nfs on 2004/05/07 22:24:58
First rough implementation for thread support. The global
ddb_regs is copied to the current KDB frame prior to switching
the thread. When a new thread is selected, its trapframe is
copied into ddb_regs. Consequently, the type of ddb_regs has
to be struct trapframe. Except for powerpc, this already is the
case.
While here, remove db_trap.c. It's unused.
Affected files ...
.. //depot/projects/gdb/sys/ddb/db_main.c#5 edit
.. //depot/projects/gdb/sys/ddb/db_thread.c#2 edit
.. //depot/projects/gdb/sys/ddb/db_trap.c#2 delete
Differences ...
==== //depot/projects/gdb/sys/ddb/db_main.c#5 (text+ko) ====
@@ -213,6 +213,7 @@
db_printf("After %d instructions (%d loads, %d stores),\n",
db_inst_count, db_load_count, db_store_count);
}
+ db_printf("[thread 0x%x]\n", kdb_thread->td_tid);
if (bkpt)
db_printf("Breakpoint at\t");
else if (watchpt)
==== //depot/projects/gdb/sys/ddb/db_thread.c#2 (text+ko) ====
@@ -33,31 +33,51 @@
#include <sys/proc.h>
#include <ddb/ddb.h>
+#include <ddb/db_command.h>
+#include <ddb/db_sym.h>
void
-db_set_thread(db_expr_t addr, boolean_t hasaddr, db_expr_t cnt, char *mod)
+db_set_thread(db_expr_t tid, boolean_t hastid, db_expr_t cnt, char *mod)
{
+ struct thread *thr;
+ int err;
- db_printf("Current thread is %d\n", kdb_thread->td_tid);
+ if (hastid) {
+ thr = kdb_thr_lookup(tid);
+ if (thr != NULL) {
+ *kdb_frame = ddb_regs;
+ err= kdb_thr_select(thr);
+ if (err == 0) {
+ db_printf("switching to thread 0x%x\n",
+ thr->td_tid);
+ ddb_regs = *kdb_frame;
+ db_dot = PC_REGS(DDB_REGS);
+ db_print_loc_and_inst(db_dot);
+ } else
+ db_printf("unable to switch to thread 0x%x\n",
+ thr->td_tid);
+ } else
+ db_printf("0x%x: invalid thread\n", (int)tid);
+ } else {
+ db_printf("current thread is 0x%x\n", kdb_thread->td_tid);
+ db_print_loc_and_inst(PC_REGS(DDB_REGS));
+ }
}
void
db_show_threads(db_expr_t addr, boolean_t hasaddr, db_expr_t cnt, char *mod)
{
- struct proc *p;
- struct thread *t;
+ struct thread *thr;
int pager_quit;
db_setup_paging(db_simple_pager, &pager_quit, DB_LINES_PER_PAGE);
- p = LIST_FIRST(&allproc);
pager_quit = 0;
- while (!pager_quit && p != NULL) {
- t = TAILQ_FIRST(&p->p_threads);
- while (!pager_quit && t != NULL) {
- db_printf(" %d (%p)\n", t->td_tid, t);
- t = TAILQ_NEXT(t, td_plist);
- }
- p = LIST_NEXT(p, p_list);
+ thr = kdb_thr_first();
+ while (!pager_quit && thr != NULL) {
+ db_printf(" 0x%x (%p) ", thr->td_tid, thr);
+ db_printsym(PC_REGS(thr->td_last_frame), DB_STGY_PROC);
+ db_printf("\n");
+ thr = kdb_thr_next(thr);
}
}
From owner-p4-projects@FreeBSD.ORG Sat May 8 06:31:15 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 178ED16A4D0; Sat, 8 May 2004 06:31:15 -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 CB2CB16A4CE
for <perforce@freebsd.org>; Sat, 8 May 2004 06:31:14 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 5464643D3F
for <perforce@freebsd.org>; Sat, 8 May 2004 06:31:14 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i48DVEGe085544
for <perforce@freebsd.org>; Sat, 8 May 2004 06:31:14 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i48DVDff085433
for perforce@freebsd.org; Sat, 8 May 2004 06:31:13 -0700 (PDT)
(envelope-from cvance@nailabs.com)
Date: Sat, 8 May 2004 06:31:13 -0700 (PDT)
Message-Id: <200405081331.i48DVDff085433@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52507 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: Sat, 08 May 2004 13:31:15 -0000
http://perforce.freebsd.org/chv.cgi?CH=52507
Change 52507 by cvance@cvance_sony on 2004/05/08 06:30:25
Fix up SEBSD branch after latest integ:
- vfs_mount call syntax error
- suser replaced with cap_check
- MAC framework now uses struct pipepair instead of struct pipe
Affected files ...
.. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_file.c#9 edit
.. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_stats.c#7 edit
.. //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#8 edit
.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#31 edit
.. //depot/projects/trustedbsd/sebsd/sys/sys/pipe.h#9 edit
Differences ...
==== //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_file.c#9 (text+ko) ====
@@ -811,7 +811,7 @@
iov[3].iov_len = strlen(mntonname) + 1;
error = vfs_nmount(td, fsflags, &auio);
} else
- error = vfs_mount(td, fstypename, mntonname, fsflags, fsdata
+ error = vfs_mount(td, fstypename, mntonname, fsflags, fsdata,
NULL);
return (error);
}
==== //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_stats.c#7 (text+ko) ====
@@ -268,7 +268,7 @@
linux_statfs.f_bavail = bsd_statfs->f_bavail;
linux_statfs.f_ffree = bsd_statfs->f_ffree;
linux_statfs.f_files = bsd_statfs->f_files;
- if (suser(td)) {
+ if (cap_check(td, CAP_SYS_ADMIN)) {
linux_statfs.f_fsid.val[0] = 0;
linux_statfs.f_fsid.val[1] = 0;
} else {
@@ -317,7 +317,7 @@
linux_statfs.f_bavail = bsd_statfs->f_bavail;
linux_statfs.f_ffree = bsd_statfs->f_ffree;
linux_statfs.f_files = bsd_statfs->f_files;
- if (suser(td)) {
+ if (cap_check(td, CAP_SYS_ADMIN)) {
linux_statfs.f_fsid.val[0] = 0;
linux_statfs.f_fsid.val[1] = 0;
} else {
==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#8 (text+ko) ====
@@ -469,7 +469,7 @@
devunlock();
}
-dev_t
+static dev_t
make_dev_credv(struct cdevsw *devsw, int minornr, uid_t uid, gid_t gid,
struct ucred *cr, int perms, const char *fmt, ...)
{
==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#31 (text+ko) ====
@@ -284,13 +284,13 @@
}
static int
-pipe_has_perm(struct ucred *cred, struct pipe *pipe, access_vector_t perm)
+pipe_has_perm(struct ucred *cred, struct pipepair *pp, access_vector_t perm)
{
struct task_security_struct *task;
struct vnode_security_struct *file;
task = SLOT(cred->cr_label);
- file = SLOT(pipe->pipe_label);
+ file = SLOT(pp->pp_label);
/*
* TBD: No audit information yet
@@ -1011,31 +1011,31 @@
}
static int
-sebsd_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe,
+sebsd_check_pipe_ioctl(struct ucred *cred, struct pipepair *pp,
struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data)
{
- return (pipe_has_perm(cred, pipe, FIFO_FILE__IOCTL));
+ return (pipe_has_perm(cred, pp, FIFO_FILE__IOCTL));
}
static int
-sebsd_check_pipe_poll(struct ucred *cred, struct pipe *pipe,
+sebsd_check_pipe_poll(struct ucred *cred, struct pipepair *pp,
struct label *pipelabel)
{
- return (pipe_has_perm(cred, pipe, FIFO_FILE__POLL));
+ return (pipe_has_perm(cred, pp, FIFO_FILE__POLL));
}
static int
-sebsd_check_pipe_read(struct ucred *cred, struct pipe *pipe,
+sebsd_check_pipe_read(struct ucred *cred, struct pipepair *pp,
struct label *pipelabel)
{
- return (pipe_has_perm(cred, pipe, FIFO_FILE__READ));
+ return (pipe_has_perm(cred, pp, FIFO_FILE__READ));
}
static int
-sebsd_check_pipe_relabel(struct ucred *cred, struct pipe *pipe,
+sebsd_check_pipe_relabel(struct ucred *cred, struct pipepair *pp,
struct label *pipelabel, struct label *newlabel)
{
struct task_security_struct *task;
@@ -1068,19 +1068,19 @@
}
static int
-sebsd_check_pipe_stat(struct ucred *cred, struct pipe *pipe,
+sebsd_check_pipe_stat(struct ucred *cred, struct pipepair *pp,
struct label *pipelabel)
{
- return (pipe_has_perm(cred, pipe, FIFO_FILE__GETATTR));
+ return (pipe_has_perm(cred, pp, FIFO_FILE__GETATTR));
}
static int
-sebsd_check_pipe_write(struct ucred *cred, struct pipe *pipe,
+sebsd_check_pipe_write(struct ucred *cred, struct pipe *pp,
struct label *pipelabel)
{
- return (pipe_has_perm(cred, pipe, FIFO_FILE__WRITE));
+ return (pipe_has_perm(cred, pp, FIFO_FILE__WRITE));
}
static int
==== //depot/projects/trustedbsd/sebsd/sys/sys/pipe.h#9 (text+ko) ====
From owner-p4-projects@FreeBSD.ORG Sat May 8 11:20:05 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 8B38616A4D0; Sat, 8 May 2004 11:20:05 -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 4910616A4CE
for <perforce@freebsd.org>; Sat, 8 May 2004 11:20:05 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 63E6043D2F
for <perforce@freebsd.org>; Sat, 8 May 2004 11:20:03 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i48IK3Ge054504
for <perforce@freebsd.org>; Sat, 8 May 2004 11:20:03 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i48IK23s054501
for perforce@freebsd.org; Sat, 8 May 2004 11:20:02 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Date: Sat, 8 May 2004 11:20:02 -0700 (PDT)
Message-Id: <200405081820.i48IK23s054501@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52510 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: Sat, 08 May 2004 18:20:05 -0000
http://perforce.freebsd.org/chv.cgi?CH=52510
Change 52510 by marcel@marcel_nfs on 2004/05/08 11:19:04
IFC @52509
Affected files ...
.. //depot/projects/gdb/include/fts.h#2 integrate
.. //depot/projects/gdb/lib/libc/gen/fts.c#3 integrate
.. //depot/projects/gdb/sys/conf/files.sparc64#5 integrate
.. //depot/projects/gdb/sys/conf/options.sparc64#3 integrate
.. //depot/projects/gdb/sys/dev/an/if_an_pccard.c#2 integrate
.. //depot/projects/gdb/sys/dev/awi/if_awi_pccard.c#4 integrate
.. //depot/projects/gdb/sys/dev/cs/if_cs_pccard.c#2 integrate
.. //depot/projects/gdb/sys/dev/ed/if_ed_pccard.c#2 integrate
.. //depot/projects/gdb/sys/dev/sn/if_sn_pccard.c#2 integrate
.. //depot/projects/gdb/sys/dev/snc/if_snc_pccard.c#2 integrate
.. //depot/projects/gdb/sys/dev/sound/pcm/ac97.c#3 integrate
.. //depot/projects/gdb/sys/dev/wi/if_wi_pccard.c#3 integrate
.. //depot/projects/gdb/sys/kern/kern_resource.c#5 integrate
.. //depot/projects/gdb/sys/kern/uipc_syscalls.c#10 integrate
.. //depot/projects/gdb/sys/kern/vfs_bio.c#6 integrate
.. //depot/projects/gdb/sys/sparc64/conf/GENERIC#5 integrate
.. //depot/projects/gdb/sys/sparc64/conf/NOTES#3 integrate
.. //depot/projects/gdb/sys/sparc64/ebus/ebus.c#5 integrate
.. //depot/projects/gdb/sys/sparc64/include/ofw_bus.h#2 integrate
.. //depot/projects/gdb/sys/sparc64/isa/isa.c#3 integrate
.. //depot/projects/gdb/sys/sparc64/isa/ofw_isa.c#3 integrate
.. //depot/projects/gdb/sys/sparc64/isa/ofw_isa.h#3 integrate
.. //depot/projects/gdb/sys/sparc64/pci/apb.c#2 integrate
.. //depot/projects/gdb/sys/sparc64/pci/ofw_pci.c#2 integrate
.. //depot/projects/gdb/sys/sparc64/pci/ofw_pci.h#2 integrate
.. //depot/projects/gdb/sys/sparc64/pci/ofw_pci_if.m#2 integrate
.. //depot/projects/gdb/sys/sparc64/pci/ofw_pcib.c#2 integrate
.. //depot/projects/gdb/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate
.. //depot/projects/gdb/sys/sparc64/pci/ofw_pcib_subr.h#2 integrate
.. //depot/projects/gdb/sys/sparc64/pci/psycho.c#4 integrate
.. //depot/projects/gdb/sys/sparc64/pci/psychovar.h#3 integrate
.. //depot/projects/gdb/sys/sparc64/sparc64/ofw_bus.c#2 integrate
.. //depot/projects/gdb/sys/sparc64/sparc64/ofw_machdep.c#3 integrate
Differences ...
==== //depot/projects/gdb/include/fts.h#2 (text+ko) ====
@@ -31,12 +31,14 @@
* SUCH DAMAGE.
*
* @(#)fts.h 8.3 (Berkeley) 8/14/94
- * $FreeBSD: src/include/fts.h,v 1.7 2002/09/21 01:28:36 wollman Exp $
+ * $FreeBSD: src/include/fts.h,v 1.8 2004/05/08 15:09:01 peadar Exp $
*/
#ifndef _FTS_H_
#define _FTS_H_
+struct _fts_private; /* implementation data */
+
typedef struct {
struct _ftsent *fts_cur; /* current node */
struct _ftsent *fts_child; /* linked list of children */
@@ -63,6 +65,7 @@
#define FTS_STOP 0x200 /* (private) unrecoverable error */
int fts_options; /* fts_open options, global flags */
void *fts_clientptr; /* thunk for sort function */
+ struct _fts_private *fts_priv; /* Implementation data */
} FTS;
typedef struct _ftsent {
==== //depot/projects/gdb/lib/libc/gen/fts.c#3 (text+ko) ====
@@ -37,12 +37,13 @@
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.23 2004/05/05 06:33:00 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.24 2004/05/08 15:09:02 peadar Exp $");
#include "namespace.h"
#include <sys/types.h>
#include <sys/param.h>
#include <sys/stat.h>
+#include <sys/mount.h>
#include <dirent.h>
#include <errno.h>
@@ -63,6 +64,7 @@
static FTSENT *fts_sort(FTS *, FTSENT *, int);
static u_short fts_stat(FTS *, FTSENT *, int);
static int fts_safe_changedir(FTS *, FTSENT *, int, char *);
+static int fts_ufslinks(FTS *sp, const FTSENT *ent);
#define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
@@ -77,12 +79,43 @@
#define BNAMES 2 /* fts_children, names only */
#define BREAD 3 /* fts_read */
+/*
+ * Internal representation of FTS, including extra implementation details.
+ * The FTS returned from fts_open is ftsp_fts from this structure, and it's
+ * fts_priv in turn points back to this internal version. i.e. for a given
+ * fts_private *priv: &priv->fts_fts == (FTS *)f == priv->fts_fts.fts_priv
+ */
+struct _fts_private {
+ FTS ftsp_fts;
+ struct statfs ftsp_statfs;
+ dev_t ftsp_dev;
+ int ftsp_linksreliable;
+};
+
+/*
+ * The "FTS_NOSTAT" option can avoid a lot of calls to stat(2) if it knows
+ * that a directory could not possibly have subdirectories. This is decided
+ * by looking at the link count: A subdirectory would increment its parent's
+ * link count by virtue of its own ".." entry.
+ * This assumption only holds for UFS-like filesystems that implement links
+ * and directories this way, so we must punt for others.
+ */
+
+static const char *ufslike_filesystems[] = {
+ "ufs",
+ "nfs",
+ "nfs4",
+ "ext2fs",
+ 0
+};
+
FTS *
fts_open(argv, options, compar)
char * const *argv;
int options;
int (*compar)(const FTSENT * const *, const FTSENT * const *);
{
+ struct _fts_private *priv;
FTS *sp;
FTSENT *p, *root;
int nitems;
@@ -96,11 +129,13 @@
}
/* Allocate/initialize the stream */
- if ((sp = malloc(sizeof(FTS))) == NULL)
+ if ((priv = malloc(sizeof(struct _fts_private))) == NULL)
return (NULL);
- memset(sp, 0, sizeof(FTS));
+ memset(priv, 0, sizeof(struct _fts_private));
+ sp = &priv->ftsp_fts;
sp->fts_compar = compar;
sp->fts_options = options;
+ sp->fts_priv = priv;
/* Shush, GCC. */
tmp = NULL;
@@ -637,7 +672,10 @@
/* Be quiet about nostat, GCC. */
nostat = 0;
} else if (ISSET(FTS_NOSTAT) && ISSET(FTS_PHYSICAL)) {
- nlinks = cur->fts_nlink - (ISSET(FTS_SEEDOT) ? 0 : 2);
+ if (fts_ufslinks(sp, cur))
+ nlinks = cur->fts_nlink - (ISSET(FTS_SEEDOT) ? 0 : 2);
+ else
+ nlinks = -1;
nostat = 1;
} else {
nlinks = -1;
@@ -1154,3 +1192,37 @@
errno = oerrno;
return (ret);
}
+
+/*
+ * Check if the filesystem for "ent" has UFS-style links.
+ */
+static int
+fts_ufslinks(FTS *sp, const FTSENT *ent)
+{
+ struct _fts_private *priv;
+ const char **cpp;
+
+ priv = sp->fts_priv;
+ /*
+ * If this node's device is different from the previous, grab
+ * the filesystem information, and decide on the reliability
+ * of the link information from this filesystem for stat(2)
+ * avoidance.
+ */
+ if (priv->ftsp_dev != ent->fts_dev) {
+ if (statfs(ent->fts_path, &priv->ftsp_statfs) != -1) {
+ priv->ftsp_dev = ent->fts_dev;
+ priv->ftsp_linksreliable = 0;
+ for (cpp = ufslike_filesystems; *cpp; cpp++) {
+ if (strcmp(priv->ftsp_statfs.f_fstypename,
+ *cpp) == 0) {
+ priv->ftsp_linksreliable = 1;
+ break;
+ }
+ }
+ } else {
+ priv->ftsp_linksreliable = 0;
+ }
+ }
+ return priv->ftsp_linksreliable;
+}
==== //depot/projects/gdb/sys/conf/files.sparc64#5 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.sparc64,v 1.52 2004/04/30 15:00:40 marius Exp $
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.53 2004/05/08 13:53:46 marius Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -54,9 +54,9 @@
sparc64/isa/ofw_isa.c optional isa
sparc64/pci/apb.c optional pci
sparc64/pci/ofw_pci.c optional pci
-sparc64/pci/ofw_pcib.c optional pci ofw_newpci
-sparc64/pci/ofw_pcib_subr.c optional pci ofw_newpci
-sparc64/pci/ofw_pcibus.c optional pci ofw_newpci
+sparc64/pci/ofw_pcib.c optional pci
+sparc64/pci/ofw_pcib_subr.c optional pci
+sparc64/pci/ofw_pcibus.c optional pci
sparc64/pci/ofw_pci_if.m optional pci
sparc64/pci/psycho.c optional pci
sparc64/sbus/sbus.c optional sbus
==== //depot/projects/gdb/sys/conf/options.sparc64#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.sparc64,v 1.9 2004/04/30 15:21:25 tmm Exp $
+# $FreeBSD: src/sys/conf/options.sparc64,v 1.10 2004/05/08 13:53:46 marius Exp $
SUN4U opt_global.h
@@ -9,7 +9,6 @@
PSYCHO_DEBUG opt_psycho.h
DEBUGGER_ON_POWERFAIL opt_psycho.h
OFW_PCI_DEBUG opt_ofw_pci.h
-OFW_NEWPCI opt_ofw_pci.h
# Debug IOMMU inserts/removes using diagnostic accesses. Very loud.
IOMMU_DIAG opt_iommu.h
PMAP_STATS opt_pmap.h
==== //depot/projects/gdb/sys/dev/an/if_an_pccard.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.23 2003/12/30 01:07:12 ambrisko Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.24 2004/05/08 06:04:05 imp Exp $");
#include "opt_inet.h"
@@ -105,7 +105,6 @@
DRIVER_MODULE(an, pccard, an_pccard_driver, an_pccard_devclass, 0, 0);
MODULE_DEPEND(an, wlan, 1, 1, 1);
-MODULE_DEPEND(an, pccard, 1, 1, 1);
static const struct pccard_product an_pccard_products[] = {
PCMCIA_CARD(AIRONET, PC4800, 0),
==== //depot/projects/gdb/sys/dev/awi/if_awi_pccard.c#4 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.16 2004/03/17 17:50:28 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.17 2004/05/08 06:04:05 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -301,4 +301,3 @@
DRIVER_MODULE(awi, pccard, awi_pccard_driver, awi_devclass, 0, 0);
MODULE_DEPEND(awi, wlan, 1, 1, 1);
-MODULE_DEPEND(awi, pccard, 1, 1, 1);
==== //depot/projects/gdb/sys/dev/cs/if_cs_pccard.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_pccard.c,v 1.8 2003/10/31 18:31:58 brooks Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_pccard.c,v 1.9 2004/05/08 06:06:13 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,5 +125,4 @@
extern devclass_t cs_devclass;
DRIVER_MODULE(cs, pccard, cs_pccard_driver, cs_devclass, 0, 0);
-MODULE_DEPEND(cs, pccard, 1, 1, 1);
MODULE_DEPEND(cs, ether, 1, 1, 1);
==== //depot/projects/gdb/sys/dev/ed/if_ed_pccard.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.55 2003/12/31 04:25:00 kato Exp $
+ * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.56 2004/05/08 06:04:06 imp Exp $
*/
#include "opt_ed.h"
@@ -65,7 +65,6 @@
MODULE_DEPEND(ed, miibus, 1, 1, 1);
#endif
MODULE_DEPEND(ed, ether, 1, 1, 1);
-MODULE_DEPEND(ed, pccard, 1, 1, 1);
/*
* PC-Card (PCMCIA) specific code.
==== //depot/projects/gdb/sys/dev/sn/if_sn_pccard.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn_pccard.c,v 1.20 2003/10/25 19:56:19 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn_pccard.c,v 1.21 2004/05/08 06:04:06 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -169,5 +169,4 @@
extern devclass_t sn_devclass;
DRIVER_MODULE(sn, pccard, sn_pccard_driver, sn_devclass, 0, 0);
-MODULE_DEPEND(sn, pccard, 1, 1, 1);
MODULE_DEPEND(sn, ether, 1, 1, 1);
==== //depot/projects/gdb/sys/dev/snc/if_snc_pccard.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc_pccard.c,v 1.4 2003/08/24 18:03:45 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc_pccard.c,v 1.5 2004/05/08 06:04:06 imp Exp $");
/*
* National Semiconductor DP8393X SONIC Driver
@@ -80,7 +80,6 @@
DRIVER_MODULE(snc, pccard, snc_pccard_driver, snc_devclass, 0, 0);
MODULE_DEPEND(snc, ether, 1, 1, 1);
-MODULE_DEPEND(snc, pccard, 1, 1, 1);
/*
* snc_pccard_detach - unload the driver and clear the table.
==== //depot/projects/gdb/sys/dev/sound/pcm/ac97.c#3 (text+ko) ====
@@ -30,7 +30,7 @@
#include "mixer_if.h"
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97.c,v 1.50 2004/01/23 16:38:54 matk Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97.c,v 1.51 2004/05/08 03:41:40 sanpei Exp $");
MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec");
@@ -150,6 +150,7 @@
{ 0x43525900, 0x07, 0, "CS4297", 0 },
{ 0x43525910, 0x07, 0, "CS4297A", 0 },
{ 0x43525920, 0x07, 0, "CS4294/98", 0 },
+ { 0x4352592d, 0x07, 0, "CS4294", 0 },
{ 0x43525930, 0x07, 0, "CS4299", 0 },
{ 0x43525940, 0x07, 0, "CS4201", 0 },
{ 0x43525958, 0x07, 0, "CS4205", 0 },
==== //depot/projects/gdb/sys/dev/wi/if_wi_pccard.c#3 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.43 2004/03/25 21:58:55 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.44 2004/05/08 06:04:06 imp Exp $");
#include "opt_wi.h"
@@ -120,7 +120,6 @@
DRIVER_MODULE(wi, pccard, wi_pccard_driver, wi_devclass, 0, 0);
MODULE_DEPEND(wi, wlan, 1, 1, 1);
-MODULE_DEPEND(wi, pccard, 1, 1, 1);
#if __FreeBSD_version >= 500000
static const struct pccard_product wi_pccard_products[] = {
==== //depot/projects/gdb/sys/kern/kern_resource.c#5 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.136 2004/04/10 11:08:16 mux Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.137 2004/05/08 08:56:05 julian Exp $");
#include "opt_compat.h"
@@ -313,11 +313,12 @@
int
rtprio(td, uap)
- struct thread *td;
+ struct thread *td; /* curthread */
register struct rtprio_args *uap;
{
struct proc *curp;
- register struct proc *p;
+ struct proc *p;
+ struct ksegrp *kg;
struct rtprio rtp;
int cierror, error;
@@ -342,7 +343,33 @@
if ((error = p_cansee(td, p)))
break;
mtx_lock_spin(&sched_lock);
- pri_to_rtp(FIRST_KSEGRP_IN_PROC(p), &rtp);
+ /*
+ * Return OUR priority if no pid specified,
+ * or if one is, report the highest priority
+ * in the process. There isn't much more you can do as
+ * there is only room to return a single priority.
+ * XXXKSE Maybe need a new interface to report
+ * priorities of multiple system scope threads.
+ * Note: specifying our own pid is not the same
+ * as leaving it zero.
+ */
+ if (uap->pid == 0) {
+ pri_to_rtp(td->td_ksegrp, &rtp);
+ } else {
+ struct rtprio rtp2;
+
+ rtp.type = RTP_PRIO_IDLE;
+ rtp.prio = RTP_PRIO_MAX;
+ FOREACH_KSEGRP_IN_PROC(p, kg) {
+ pri_to_rtp(kg, &rtp2);
+ if ((rtp2.type < rtp.type) ||
+ ((rtp2.type == rtp.type) &&
+ (rtp2.prio < rtp.prio))) {
+ rtp.type = rtp2.type;
+ rtp.prio = rtp2.prio;
+ }
+ }
+ }
mtx_unlock_spin(&sched_lock);
PROC_UNLOCK(p);
return (copyout(&rtp, uap->rtp, sizeof(struct rtprio)));
@@ -373,7 +400,21 @@
}
}
mtx_lock_spin(&sched_lock);
- error = rtp_to_pri(&rtp, FIRST_KSEGRP_IN_PROC(p));
+ /*
+ * If we are setting our own priority, set just our
+ * KSEGRP but if we are doing another process,
+ * do all the groups on that process. If we
+ * specify our own pid we do the latter.
+ */
+ if (uap->pid == 0) {
+ error = rtp_to_pri(&rtp, td->td_ksegrp);
+ } else {
+ FOREACH_KSEGRP_IN_PROC(p, kg) {
+ if ((error = rtp_to_pri(&rtp, kg)) != 0) {
+ break;
+ }
+ }
+ }
mtx_unlock_spin(&sched_lock);
break;
default:
==== //depot/projects/gdb/sys/kern/uipc_syscalls.c#10 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.182 2004/05/06 05:03:22 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.183 2004/05/08 02:24:21 rwatson Exp $");
#include "opt_compat.h"
#include "opt_ktrace.h"
@@ -1705,7 +1705,7 @@
int error, s, headersize = 0, headersent = 0;
struct iovec *hdr_iov = NULL;
- NET_LOCK_GIANT();
+ mtx_lock(&Giant);
hdtr_size = 0;
@@ -2070,7 +2070,7 @@
if (m_header)
m_freem(m_header);
- NET_UNLOCK_GIANT();
+ mtx_unlock(&Giant);
if (error == ERESTART)
error = EINTR;
==== //depot/projects/gdb/sys/kern/vfs_bio.c#6 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.433 2004/05/06 05:03:22 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.434 2004/05/08 06:46:40 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -3522,7 +3522,7 @@
void
vfs_bio_clrbuf(struct buf *bp)
{
- int i, mask = 0;
+ int i, j, mask = 0;
caddr_t sa, ea;
GIANT_REQUIRED;
@@ -3533,9 +3533,10 @@
VM_OBJECT_LOCK(bp->b_object);
if( (bp->b_npages == 1) && (bp->b_bufsize < PAGE_SIZE) &&
(bp->b_offset & PAGE_MASK) == 0) {
+ if (bp->b_pages[0] == bogus_page)
+ goto unlock;
mask = (1 << (bp->b_bufsize / DEV_BSIZE)) - 1;
- if (bp->b_pages[0] != bogus_page)
- VM_OBJECT_LOCK_ASSERT(bp->b_pages[0]->object, MA_OWNED);
+ VM_OBJECT_LOCK_ASSERT(bp->b_pages[0]->object, MA_OWNED);
if ((bp->b_pages[0]->valid & mask) == mask)
goto unlock;
if (((bp->b_pages[0]->flags & PG_ZERO) == 0) &&
@@ -3547,14 +3548,15 @@
}
ea = sa = bp->b_data;
for(i=0;i<bp->b_npages;i++,sa=ea) {
- int j = ((vm_offset_t)sa & PAGE_MASK) / DEV_BSIZE;
+ if (bp->b_pages[i] == bogus_page)
+ continue;
+ j = ((vm_offset_t)sa & PAGE_MASK) / DEV_BSIZE;
ea = (caddr_t)trunc_page((vm_offset_t)sa + PAGE_SIZE);
ea = (caddr_t)(vm_offset_t)ulmin(
(u_long)(vm_offset_t)ea,
(u_long)(vm_offset_t)bp->b_data + bp->b_bufsize);
mask = ((1 << ((ea - sa) / DEV_BSIZE)) - 1) << j;
- if (bp->b_pages[i] != bogus_page)
- VM_OBJECT_LOCK_ASSERT(bp->b_pages[i]->object, MA_OWNED);
+ VM_OBJECT_LOCK_ASSERT(bp->b_pages[i]->object, MA_OWNED);
if ((bp->b_pages[i]->valid & mask) == mask)
continue;
if ((bp->b_pages[i]->valid & mask) == 0) {
==== //depot/projects/gdb/sys/sparc64/conf/GENERIC#5 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.71 2004/05/02 20:40:19 marcel Exp $
+# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.72 2004/05/08 13:53:46 marius Exp $
machine sparc64
cpu SUN4U
@@ -76,14 +76,6 @@
device central
device fhc
-# New OpenFirmware PCI framework. This fixes a number of interrupt-
-# routing problems and changes the device enumeration to be hopefully
-# closer to Solaris. Be aware that, because of the latter, enabling or
-# disabling this option may require reconfiguration, and can even
-# cause the machine to not boot without manual intervention before the
-# fstab is adjusted.
-options OFW_NEWPCI
-
# Floppy drives
#device fdc
==== //depot/projects/gdb/sys/sparc64/conf/NOTES#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/sparc64/conf/NOTES,v 1.5 2004/04/30 15:00:41 marius Exp $
+# $FreeBSD: src/sys/sparc64/conf/NOTES,v 1.6 2004/05/08 13:53:46 marius Exp $
#
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
@@ -31,14 +31,6 @@
device central
device fhc
-# New OpenFirmware PCI framework. This fixes a number of interrupt-
-# routing problems and changes the device enumeration to be hopefully
-# closer to Solaris. Be aware that, because of the latter, enabling or
-# disabling this option may require reconfiguration, and can even
-# cause the machine to not boot without manual intervention before the
-# fstab is adjusted.
-#options OFW_NEWPCI
-
#####################################################################
# HARDWARE DEVICE CONFIGURATION
==== //depot/projects/gdb/sys/sparc64/ebus/ebus.c#5 (text+ko) ====
@@ -28,7 +28,7 @@
*
* from: NetBSD: ebus.c,v 1.26 2001/09/10 16:27:53 eeh Exp
*
- * $FreeBSD: src/sys/sparc64/ebus/ebus.c,v 1.14 2004/04/30 19:19:55 tmm Exp $
+ * $FreeBSD: src/sys/sparc64/ebus/ebus.c,v 1.15 2004/05/08 13:53:46 marius Exp $
*/
/*
@@ -46,8 +46,6 @@
* there are machines with both ISA and EBus.
*/
-#include "opt_ofw_pci.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
@@ -59,7 +57,6 @@
#include <sys/rman.h>
#include <dev/ofw/openfirm.h>
-#include <dev/ofw/ofw_pci.h>
#include <machine/ofw_bus.h>
#include <machine/resource.h>
@@ -99,9 +96,7 @@
int sc_nrange;
int sc_nimap;
-#ifdef OFW_NEWPCI
struct ofw_bus_iinfo sc_iinfo;
-#endif
};
static device_probe_t ebus_probe;
@@ -151,25 +146,13 @@
DRIVER_MODULE(ebus, pci, ebus_driver, ebus_devclass, 0, 0);
-static phandle_t
-ebus_get_busnode(device_t dev)
-{
-
-#ifdef OFW_NEWPCI
- return (ofw_pci_get_node(dev));
-#else
- return (ofw_pci_find_node(pci_get_bus(dev), pci_get_slot(dev),
- pci_get_function(dev)));
-#endif
-}
-
static int
ebus_probe(device_t dev)
{
char name[10];
phandle_t node;
- if ((node = ebus_get_busnode(dev)) == 0)
+ if ((node = ofw_pci_get_node(dev)) == 0)
return (ENXIO);
OF_getprop(node, "name", &name, sizeof(name));
@@ -200,7 +183,7 @@
int i, rnum, rid;
sc = device_get_softc(dev);
- sc->sc_node = node = ebus_get_busnode(dev);
+ sc->sc_node = node = ofw_pci_get_node(dev);
sc->sc_nrange = OF_getprop_alloc(node, "ranges",
sizeof(*sc->sc_range), (void **)&sc->sc_range);
@@ -239,9 +222,7 @@
}
}
-#ifdef OFW_NEWPCI
ofw_bus_setup_iinfo(node, &sc->sc_iinfo, sizeof(ofw_isa_intr_t));
-#endif
/*
* Now attach our children.
@@ -490,17 +471,10 @@
nintr = OF_getprop_alloc(node, "interrupts", sizeof(*intrs),
(void **)&intrs);
for (i = 0; i < nintr; i++) {
-#ifdef OFW_NEWPCI
rintr = ofw_isa_route_intr(dev, node, &sc->sc_iinfo, intrs[i]);
- if (rintr == PCI_INVALID_IRQ) {
-#else
- rintr = ofw_bus_route_intr(node, intrs[i], ofw_pci_orb_callback,
- dev);
- if (rintr == ORIR_NOTFOUND) {
-#endif
+ if (rintr == PCI_INVALID_IRQ)
panic("ebus_setup_dinfo: could not map ebus "
"interrupt %d", intrs[i]);
- }
resource_list_add(&edi->edi_rl, SYS_RES_IRQ, i,
rintr, rintr, 1);
}
==== //depot/projects/gdb/sys/sparc64/include/ofw_bus.h#2 (text+ko) ====
@@ -22,7 +22,7 @@
* OR TORT (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/sparc64/include/ofw_bus.h,v 1.5 2003/07/01 14:52:46 tmm Exp $
+ * $FreeBSD: src/sys/sparc64/include/ofw_bus.h,v 1.6 2004/05/08 13:53:46 marius Exp $
*/
#ifndef _MACHINE_OFW_BUS_H_
@@ -37,8 +37,6 @@
*/
typedef u_int32_t pcell_t;
-#ifdef OFW_NEWPCI
-
struct ofw_bus_iinfo {
u_int8_t *opi_imap;
u_int8_t *opi_imapmsk;
@@ -52,13 +50,4 @@
int ofw_bus_search_intrmap(void *, int, void *, int, void *, int, void *,
void *, void *, int);
-#else
-
-typedef int obr_callback_t(phandle_t, u_int8_t *, int, u_int8_t *, int,
- u_int8_t **, int *, void *);
-
-u_int32_t ofw_bus_route_intr(phandle_t, int, obr_callback_t *, void *);
-
-#endif
-
#endif /* !_MACHINE_OFW_BUS_H_ */
==== //depot/projects/gdb/sys/sparc64/isa/isa.c#3 (text+ko) ====
@@ -26,36 +26,28 @@
*
* from: FreeBSD: src/sys/alpha/isa/isa.c,v 1.26 2001/07/11
*
- * $FreeBSD: src/sys/sparc64/isa/isa.c,v 1.11 2004/03/17 21:45:55 jmg Exp $
+ * $FreeBSD: src/sys/sparc64/isa/isa.c,v 1.12 2004/05/08 13:53:47 marius Exp $
*/
-#include "opt_ofw_pci.h"
-
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
#include <sys/bus.h>
+
#include <machine/bus.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
+
#include <sys/rman.h>
-#include <sys/interrupt.h>
#include <isa/isareg.h>
#include <isa/isavar.h>
#include <isa/isa_common.h>
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-
-#include <dev/ofw/ofw_pci.h>
#include <dev/ofw/openfirm.h>
-#include <machine/intr_machdep.h>
-#include <machine/ofw_bus.h>
#include <machine/resource.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+
#include <sparc64/pci/ofw_pci.h>
#include <sparc64/isa/ofw_isa.h>
@@ -65,19 +57,16 @@
bus_space_tag_t isa_mem_bt = NULL;
bus_space_handle_t isa_mem_hdl;
-u_int64_t isa_io_base;
-u_int64_t isa_io_limit;
-u_int64_t isa_mem_base;
-u_int64_t isa_mem_limit;
+static u_int64_t isa_io_base;
+static u_int64_t isa_io_limit;
+static u_int64_t isa_mem_base;
+static u_int64_t isa_mem_limit;
device_t isa_bus_device;
static phandle_t isab_node;
static ofw_pci_intr_t isa_ino[8];
-
-#ifdef OFW_NEWPCI
struct ofw_bus_iinfo isa_iinfo;
-#endif
/*
* XXX: This is really partly partly PCI-specific, but unfortunately is
@@ -117,26 +106,17 @@
device_t bridge;
phandle_t node;
ofw_isa_intr_t ino;
-#ifndef OFW_NEWPCI
- ofw_pci_intr_t rino;
-#endif
struct isa_ranges *br;
int nbr, i;
/* The parent of the bus must be a PCI-ISA bridge. */
bridge = device_get_parent(dev);
-#ifdef OFW_NEWPCI
isab_node = ofw_pci_get_node(bridge);
-#else
- isab_node = ofw_pci_node(bridge);
-#endif
nbr = OF_getprop_alloc(isab_node, "ranges", sizeof(*br), (void **)&br);
if (nbr <= 0)
panic("isa_init: cannot get bridge range property");
-#ifdef OFW_NEWPCI
ofw_bus_setup_iinfo(isab_node, &isa_iinfo, sizeof(ofw_isa_intr_t));
-#endif
/*
* This is really a bad kludge; however, it is needed to provide
@@ -150,13 +130,8 @@
continue;
if (ino > 7)
panic("isa_init: XXX: ino too large");
-#ifdef OFW_NEWPCI
isa_ino[ino] = ofw_isa_route_intr(bridge, node, &isa_iinfo,
ino);
-#else
- rino = ofw_bus_route_intr(node, ino, ofw_pci_orb_callback, dev);
- isa_ino[ino] = rino == ORIR_NOTFOUND ? PCI_INVALID_IRQ : rino;
-#endif
}
for (nbr -= 1; nbr >= 0; nbr--) {
==== //depot/projects/gdb/sys/sparc64/isa/ofw_isa.c#3 (text+ko) ====
@@ -28,21 +28,18 @@
*
* from: NetBSD: ebus.c,v 1.26 2001/09/10 16:27:53 eeh Exp
*
- * $FreeBSD: src/sys/sparc64/isa/ofw_isa.c,v 1.7 2004/04/28 13:06:45 tmm Exp $
+ * $FreeBSD: src/sys/sparc64/isa/ofw_isa.c,v 1.8 2004/05/08 13:53:47 marius Exp $
*/
/*
* Helper functions which can be used in both ISA and EBus code.
*/
-#include "opt_ofw_pci.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
#include <dev/ofw/openfirm.h>
-#include <dev/ofw/ofw_pci.h>
#include <machine/bus.h>
#include <machine/resource.h>
@@ -100,7 +97,6 @@
*start, *end);
}
-#ifdef OFW_NEWPCI
ofw_pci_intr_t
ofw_isa_route_intr(device_t bridge, phandle_t node, struct ofw_bus_iinfo *ii,
ofw_isa_intr_t intr)
@@ -122,4 +118,3 @@
}
return (mintr);
}
-#endif /* OFW_NEWPCI */
==== //depot/projects/gdb/sys/sparc64/isa/ofw_isa.h#3 (text+ko) ====
@@ -28,7 +28,7 @@
*
* from: NetBSD: ebus.c,v 1.26 2001/09/10 16:27:53 eeh Exp
*
- * $FreeBSD: src/sys/sparc64/isa/ofw_isa.h,v 1.3 2004/04/28 13:06:45 tmm Exp $
+ * $FreeBSD: src/sys/sparc64/isa/ofw_isa.h,v 1.4 2004/05/08 13:53:47 marius Exp $
*/
#ifndef _SPARC64_ISA_OFW_ISA_H_
@@ -64,27 +64,11 @@
typedef u_int32_t ofw_isa_intr_t;
-struct isa_imap {
- u_int32_t phys_hi; /* high phys addr mask */
- u_int32_t phys_lo; /* low phys addr mask */
- ofw_isa_intr_t intr; /* interrupt mask */
- phandle_t cnode; /* child node */
- ofw_pci_intr_t cintr; /* child interrupt */
-};
-
-struct isa_imap_msk {
- u_int32_t phys_hi; /* high phys addr */
- u_int32_t phys_lo; /* low phys addr */
- ofw_isa_intr_t intr; /* interrupt */
-};
-
int ofw_isa_range_restype(struct isa_ranges *);
/* Map an IO range. Returns the resource type of the range. */
int ofw_isa_range_map(struct isa_ranges *, int, u_long *, u_long *, int *);
-#ifdef OFW_NEWPCI
ofw_pci_intr_t ofw_isa_route_intr(device_t, phandle_t, struct ofw_bus_iinfo *,
ofw_isa_intr_t);
-#endif
#endif /* !_SPARC64_ISA_OFW_ISA_H_ */
==== //depot/projects/gdb/sys/sparc64/pci/apb.c#2 (text+ko) ====
@@ -30,14 +30,14 @@
*
* from: FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.3 2000/12/13
*
- * $FreeBSD: src/sys/sparc64/pci/apb.c,v 1.7 2003/08/22 07:38:07 imp Exp $
+ * $FreeBSD: src/sys/sparc64/pci/apb.c,v 1.8 2004/05/08 13:53:47 marius Exp $
*/
/*
* Support for the Sun APB (Advanced PCI Bridge) PCI-PCI bridge.
* This bridge does not fully comply to the PCI bridge specification, and is
* therefore not supported by the generic driver.
- * We can use some pf the pcib methods anyway.
+ * We can use some of the pcib methods anyway.
*/
#include "opt_ofw_pci.h"
@@ -45,11 +45,9 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/bus.h>
#include <dev/ofw/openfirm.h>
-#include <dev/ofw/ofw_pci.h>
#include <machine/bus.h>
#include <machine/ofw_bus.h>
@@ -76,9 +74,6 @@
static device_probe_t apb_probe;
static device_attach_t apb_attach;
static bus_alloc_resource_t apb_alloc_resource;
-#ifndef OFW_NEWPCI
-static pcib_route_interrupt_t apb_route_interrupt;
-#endif
static device_method_t apb_methods[] = {
/* Device interface */
@@ -103,17 +98,11 @@
DEVMETHOD(pcib_maxslots, pcib_maxslots),
DEVMETHOD(pcib_read_config, pcib_read_config),
DEVMETHOD(pcib_write_config, pcib_write_config),
-#ifdef OFW_NEWPCI
DEVMETHOD(pcib_route_interrupt, ofw_pcib_gen_route_interrupt),
-#else
- DEVMETHOD(pcib_route_interrupt, apb_route_interrupt),
-#endif
/* ofw_pci interface */
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sat May 8 13:47:44 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 5EE9C16A4D0; Sat, 8 May 2004 13:47:44 -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 2C3B316A4CE; Sat, 8 May 2004 13:47:44 -0700 (PDT)
Received: from fledge.watson.org (fledge.watson.org [204.156.12.50])
by mx1.FreeBSD.org (Postfix) with ESMTP
id BC4C043D2F; Sat, 8 May 2004 13:47:43 -0700 (PDT)
(envelope-from robert@fledge.watson.org)
Received: from fledge.watson.org (localhost [127.0.0.1])
by fledge.watson.org (8.12.11/8.12.11) with ESMTP id i48KlQgx046068;
Sat, 8 May 2004 16:47:27 -0400 (EDT)
(envelope-from robert@fledge.watson.org)
Received: from localhost (robert@localhost)i48KlQKJ046065;
Sat, 8 May 2004 16:47:26 -0400 (EDT)
(envelope-from robert@fledge.watson.org)
Date: Sat, 8 May 2004 16:47:26 -0400 (EDT)
From: Robert Watson <rwatson@FreeBSD.org>
X-Sender: robert@fledge.watson.org
To: Chris Vance <cvance@FreeBSD.org>
In-Reply-To: <200405081331.i48DVDff085433@repoman.freebsd.org>
Message-ID: <Pine.NEB.3.96L.1040508164543.27309I-100000@fledge.watson.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: Perforce Change Reviews <perforce@FreeBSD.org>
Subject: Re: PERFORCE change 52507 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: Sat, 08 May 2004 20:47:44 -0000
On Sat, 8 May 2004, Chris Vance wrote:
<snip>
> static int
> -pipe_has_perm(struct ucred *cred, struct pipe *pipe, access_vector_t perm)
> +pipe_has_perm(struct ucred *cred, struct pipepair *pp, access_vector_t perm)
> {
> struct task_security_struct *task;
> struct vnode_security_struct *file;
>
> task = SLOT(cred->cr_label);
> - file = SLOT(pipe->pipe_label);
> + file = SLOT(pp->pp_label);
>
> /*
> * TBD: No audit information yet
> @@ -1011,31 +1011,31 @@
> }
>
> static int
> -sebsd_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe,
> +sebsd_check_pipe_ioctl(struct ucred *cred, struct pipepair *pp,
> struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data)
> {
>
> - return (pipe_has_perm(cred, pipe, FIFO_FILE__IOCTL));
> + return (pipe_has_perm(cred, pp, FIFO_FILE__IOCTL));
> }
</snip>
Out of curiosity -- is there a reason we pass around the pipepair
reference instead of just passing the label reference? That avoids having
to dereference the pipe pair again to find the label since it's already
passed in...
Robert N M Watson FreeBSD Core Team, TrustedBSD Projects
robert@fledge.watson.org Senior Research Scientist, McAfee Research
From owner-p4-projects@FreeBSD.ORG Sat May 8 17:18:15 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 431A816A4D0; Sat, 8 May 2004 17:18:15 -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 1045816A4CF
for <perforce@freebsd.org>; Sat, 8 May 2004 17:18:15 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id CD51E43D2F
for <perforce@freebsd.org>; Sat, 8 May 2004 17:18:14 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i490IEGe044448
for <perforce@freebsd.org>; Sat, 8 May 2004 17:18:14 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i490IEOL044445
for perforce@freebsd.org; Sat, 8 May 2004 17:18:14 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Date: Sat, 8 May 2004 17:18:14 -0700 (PDT)
Message-Id: <200405090018.i490IEOL044445@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52512 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: Sun, 09 May 2004 00:18:16 -0000
http://perforce.freebsd.org/chv.cgi?CH=52512
Change 52512 by marcel@marcel_nfs on 2004/05/08 17:18:03
Re-enter the debugger for any trap.
Affected files ...
.. //depot/projects/gdb/sys/i386/i386/trap.c#9 edit
Differences ...
==== //depot/projects/gdb/sys/i386/i386/trap.c#9 (text+ko) ====
@@ -187,7 +187,7 @@
type = frame.tf_trapno;
#ifdef KDB
- if (kdb_active && type == T_PAGEFLT) {
+ if (kdb_active) {
kdb_trap(type, 0, &frame);
goto out;
}
From owner-p4-projects@FreeBSD.ORG Sat May 8 20:25:12 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id E834416A4CF; Sat, 8 May 2004 20:25:11 -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 B78DF16A4D0
for <perforce@freebsd.org>; Sat, 8 May 2004 20:25:11 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 3D38143D1F
for <perforce@freebsd.org>; Sat, 8 May 2004 20:25:05 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i493P5Ge085226
for <perforce@freebsd.org>; Sat, 8 May 2004 20:25:05 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i493P46i085223
for perforce@freebsd.org; Sat, 8 May 2004 20:25:04 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Date: Sat, 8 May 2004 20:25:04 -0700 (PDT)
Message-Id: <200405090325.i493P46i085223@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52521 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: Sun, 09 May 2004 03:25:12 -0000
http://perforce.freebsd.org/chv.cgi?CH=52521
Change 52521 by marcel@marcel_nfs on 2004/05/08 20:24:54
IFC @52520
Affected files ...
.. //depot/projects/gdb/sbin/ipfw/ipfw2.c#5 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src.diff#1 branch
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_self-new.c#1 branch
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate
.. //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate
.. //depot/projects/gdb/sys/sparc64/sparc64/pmap.c#5 integrate
.. //depot/projects/gdb/sys/vm/vm_page.c#7 integrate
.. //depot/projects/gdb/usr.sbin/pkg_install/add/main.c#3 integrate
Differences ...
==== //depot/projects/gdb/sbin/ipfw/ipfw2.c#5 (text+ko) ====
@@ -17,7 +17,7 @@
*
* NEW command line interface for IP firewall facility
*
- * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.47 2004/04/23 14:28:38 andre Exp $
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.48 2004/05/09 01:53:31 csjp Exp $
*/
#include <sys/param.h>
@@ -3388,8 +3388,6 @@
break;
case TOK_MAC:
- if (ac < 2)
- errx(EX_USAGE, "MAC dst-mac src-mac");
if (add_mac(cmd, ac, av)) {
ac -= 2; av += 2;
}
==== //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx.h#2 (text+ko) ====
@@ -22,6 +22,9 @@
OTHER DEALINGS IN THE SOFTWARE.
*/
+#ifndef __UWX_INCLUDED
+#define __UWX_INCLUDED 1
+
#ifndef _KERNEL
#include <stdlib.h>
#include <inttypes.h>
@@ -30,22 +33,30 @@
#include <sys/systm.h>
#endif
+#if defined(__cplusplus)
+#define __EXTERN_C extern "C"
+#else
+#define __EXTERN_C extern
+#endif
+
+#define UWX_VERSION 1 /* Version id for callback interfaces */
+
/* Unwind environment structure (opaque) */
struct uwx_env;
/* Allocate and free callbacks */
typedef void *(*alloc_cb)(size_t size);
typedef void (*free_cb)(void *ptr);
-extern int uwx_register_alloc_cb(alloc_cb alloc, free_cb free);
+__EXTERN_C int uwx_register_alloc_cb(alloc_cb alloc, free_cb free);
/* Allocate and initialize an unwind environment */
-extern struct uwx_env *uwx_init(void);
+__EXTERN_C struct uwx_env *uwx_init(void);
/* Free an unwind environment */
-extern int uwx_free(struct uwx_env *env);
+__EXTERN_C int uwx_free(struct uwx_env *env);
/* Put unwind express into cross-process mode */
-extern int uwx_set_remote(struct uwx_env *env, int is_big_endian_target);
+__EXTERN_C int uwx_set_remote(struct uwx_env *env, int is_big_endian_target);
/* Copy-in callback */
typedef int (*copyin_cb)(
@@ -63,14 +74,14 @@
uint64_t **vecp); /* parameter vector (in/out) */
/* Register copy-in and lookup IP callbacks */
-extern int uwx_register_callbacks(
+__EXTERN_C int uwx_register_callbacks(
struct uwx_env *env, /* unwind environment */
intptr_t tok, /* callback token */
copyin_cb copyin, /* copy-in callback */
lookupip_cb lookupip); /* lookup IP callback */
/* Initialize a context with the basic info needed to start an unwind */
-extern int uwx_init_context(
+__EXTERN_C int uwx_init_context(
struct uwx_env *env, /* unwind environment */
uint64_t ip, /* IP (instruction pointer) */
uint64_t sp, /* SP (stack pointer) */
@@ -78,51 +89,51 @@
uint64_t cfm); /* CFM (current frame marker) */
/* Set the value of a specific register in the current context (non fp) */
-extern int uwx_set_reg(
+__EXTERN_C int uwx_set_reg(
struct uwx_env *env, /* unwind environment */
int regid, /* register id (see below) */
uint64_t val); /* register value */
/* Set the value of a floating-point register in the current context */
-extern int uwx_set_fr(
+__EXTERN_C int uwx_set_fr(
struct uwx_env *env, /* unwind environment */
int regid, /* register id (see below) */
uint64_t *val); /* register value (ptr to 16 bytes) */
/* (memory spill format) */
/* Initialize the unwind history */
-extern int uwx_init_history(struct uwx_env *env);
+__EXTERN_C int uwx_init_history(struct uwx_env *env);
/* Step one frame */
-extern int uwx_step(struct uwx_env *env);
+__EXTERN_C int uwx_step(struct uwx_env *env);
/* Get symbol information, if available, for current frame */
-extern int uwx_get_sym_info(
+__EXTERN_C int uwx_get_sym_info(
struct uwx_env *env, /* unwind environment */
char **modp, /* load module name (out) */
char **symp, /* function name (out) */
uint64_t *offsetp); /* offset from start of function (out) */
/* Get the value of a register from the current context */
-extern int uwx_get_reg(
+__EXTERN_C int uwx_get_reg(
struct uwx_env *env, /* unwind environment */
int regid, /* register id (see below) */
uint64_t *valp); /* register value (out) */
/* Get the NaT bit of a GR from the current context */
-extern int uwx_get_nat(
+__EXTERN_C int uwx_get_nat(
struct uwx_env *env, /* unwind environment */
int regid, /* register id (see below) */
int *natp); /* NaT value (out: 0 or 1) */
/* Get the spill location for a register in the current context */
-extern int uwx_get_spill_loc(
+__EXTERN_C int uwx_get_spill_loc(
struct uwx_env *env, /* unwind environment */
int regid, /* register id (see below) */
uint64_t *dispp); /* disposition code (see below) (out) */
/* Get the ABI context code (if uwx_step returned UWX_ABI_FRAME) */
-extern int uwx_get_abi_context_code(struct uwx_env *env);
+__EXTERN_C int uwx_get_abi_context_code(struct uwx_env *env);
/* Return status codes for uwx_ APIs */
#define UWX_OK 0
@@ -165,6 +176,8 @@
#define UWX_LKUP_UTABLE 2 /* Returned ref to unwind table */
#define UWX_LKUP_FDESC 3 /* Returned frame description */
#define UWX_LKUP_SYMINFO 4 /* Returned symbolic information */
+#define UWX_LKUP_REMAP 5 /* Returned remapped IP */
+#define UWX_LKUP_UINFO 6 /* Returned unw info block ptr */
/* The lookup IP callback receives a parameter vector, and returns */
/* one on success. This vector is a series of key/value pairs; each */
@@ -175,26 +188,40 @@
/* Keys passed to lookup IP callback */
#define UWX_KEY_PREDS 1 /* Predicate registers */
+#define UWX_KEY_VERSION 2 /* Version id of unwind engine */
+/* UWX_KEY_FUNCSTART (below) may also be passed with the UWX_LKUP_SYMINFO */
+/* request. */
/* Keys returned with UWX_LKUP_UTABLE */
/* These key/value pairs describe the unwind table corresponding */
/* to the load module in which the current IP resides. */
#define UWX_KEY_TBASE 1 /* Base address of text seg */
-#define UWX_KEY_UFLAGS 2 /* Unwind flags */
+#define UWX_KEY_UFLAGS 2 /* Unwind flags (optional) */
#define UWX_KEY_USTART 3 /* Base of unwind tbl */
#define UWX_KEY_UEND 4 /* End of unwind tbl */
/* Keys returned with UWX_LKUP_FDESC */
/* These key/value pairs describe the state of the frame at the */
/* given IP. They are typically used for dynamically-generated code. */
+/* If UWX_KEY_CONTEXT is returned, it must be the only key returned. */
#define UWX_KEY_FSIZE 1 /* Frame size */
#define UWX_KEY_SPILL(reg_id) (2 | ((reg_id) << 4)) /* Reg spilled */
#define UWX_KEY_CONTEXT 3 /* ABI-dep. context */
-/* Keys returned with UWX_LKUP_FDESC or UWX_LKUP_SYMINFO */
-#define UWX_KEY_MODULE 5 /* Name of load module */
-#define UWX_KEY_FUNC 6 /* Name of function */
-#define UWX_KEY_FUNCSTART 7 /* Address of start of function */
+/* Keys returned with UWX_LKUP_REMAP */
+#define UWX_KEY_NEWIP 5 /* Remapped IP */
+
+/* Keys returned with UWX_LKUP_UINFO */
+/* Use UWX_KEY_FUNCSTART for the start address of the function */
+/* Use UWX_KEY_UFLAGS for the unwind flags (optional) */
+#define UWX_KEY_UINFO 6 /* Address of unwind info block */
+
+/* Keys returned with UWX_LKUP_SYMINFO */
+/* These keys may be returned with UWX_LKUP_FDESC or UWX_LKUP_UINFO, */
+/* if the information is cheap to obtain. */
+#define UWX_KEY_MODULE 17 /* Name of load module */
+#define UWX_KEY_FUNC 18 /* Name of function */
+#define UWX_KEY_FUNCSTART 19 /* Address of start of function */
/* Register identifiers */
/* For use in UWX_LKUP_FDESC result vectors and context access APIs. */
@@ -255,3 +282,75 @@
#define UWX_GET_DISP_OFFSET(disp) ((disp) & ~(uint64_t)0x07)
#define UWX_GET_DISP_ADDR(disp) ((disp) & ~(uint64_t)0x07)
#define UWX_GET_DISP_REGID(disp) ((int)(disp) >> 4)
+
+#undef __EXTERN_C
+
+#if defined(__cplusplus)
+
+class UnwindExpress {
+
+public:
+
+ UnwindExpress() {
+ env = uwx_init();
+ }
+
+ ~UnwindExpress() {
+ if (env != 0)
+ uwx_free(env);
+ env = 0;
+ }
+
+ int init_context(uint64_t ip, uint64_t sp, uint64_t bsp, uint64_t cfm) {
+ return uwx_init_context(env, ip, sp, bsp, cfm);
+ }
+
+ int init_history() {
+ return uwx_init_history(env);
+ }
+
+ int set_reg(int regid, uint64_t val) {
+ return uwx_set_reg(env, regid, val);
+ }
+
+ int set_fr(int regid, uint64_t *valp) {
+ return uwx_set_fr(env, regid, valp);
+ }
+
+ int step() {
+ return uwx_step(env);
+ }
+
+ int get_sym_info(char **modp, char **symp, uint64_t *offsetp) {
+ return uwx_get_sym_info(env, modp, symp, offsetp);
+ }
+
+ int get_reg(int regid, uint64_t *valp) {
+ return uwx_get_reg(env, regid, valp);
+ }
+
+ int get_nat(int regid, int *natp) {
+ return uwx_get_nat(env, regid, natp);
+ }
+
+ int get_spill_loc(int regid, uint64_t *dispp) {
+ return uwx_get_spill_loc(env, regid, dispp);
+ }
+
+ int get_abi_context_code() {
+ return uwx_get_abi_context_code(env);
+ }
+
+ struct uwx_env *get_env() {
+ return env;
+ }
+
+protected:
+
+ struct uwx_env *env;
+
+};
+
+#endif /* __cplusplus */
+
+#endif /* __UWX_INCLUDED */
==== //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_context.c#2 (text+ko) ====
@@ -181,11 +181,7 @@
}
bsp = uwx_add_to_bsp(bsp, regid);
natcollp = bsp | 0x01f8;
- if (natcollp >= bsp)
- n = (*env->copyin)(UWX_COPYIN_REG, (char *)&natcoll,
- (uint64_t)UWX_REG_AR_RNAT, DWORDSZ, env->cb_token);
- else
- n = (*env->copyin)(UWX_COPYIN_RSTACK, (char *)&natcoll,
+ n = (*env->copyin)(UWX_COPYIN_RSTACK, (char *)&natcoll,
bsp, DWORDSZ, env->cb_token);
if (n != DWORDSZ)
return UWX_ERR_COPYIN_RSTK;
@@ -319,28 +315,86 @@
* bsp
* <------- adjusted (nslots + bias) ------->
- * When subtracting from bsp, we bias the bsp in the opposite
- * direction so that it is at the next NaT collection.
+ * When subtracting from bsp, we avoid depending on the sign of
+ * the quotient by adding 63*8 before division and subtracting 8
+ * after division. (Assumes that we will never be called upon
+ * to subtract more than 504 slots from bsp.)
*
* 0 1f8 3f8
* +---------------------------------------------------------------+
* | X X|
* +---------------------------------------------------------------+
- * <------- bias ------->
- * <--- nslots --->
- * ^
- * |
- * bsp
- * <------ adjusted (nslots + bias) ------>
+ * <-- bias -->
+ * <--- |nslots| --->
+ * ^
+ * |
+ * bsp
+ * <----------------->
+ * adjusted |nslots + bias|
*/
- if (nslots > 0) {
- bias = ((unsigned int)bsp & 0x1f8) / DWORDSZ;
- nslots += (nslots + bias) / 63;
+ bias = ((unsigned int)bsp & 0x1f8) / DWORDSZ;
+ nslots += (nslots + bias + 63*8) / 63 - 8;
+ return bsp + nslots * DWORDSZ;
+}
+
+#if 0
+int uwx_selftest_bsp_arithmetic()
+{
+ int i;
+ int j;
+ int r;
+ uint64_t bstore[161];
+ uint64_t *bsp;
+ uint64_t *p;
+ int failed = 0;
+
+ printf("uwx_selftest_bsp_arithmetic: bsp at %08lx\n", (unsigned int)bstore);
+ r = 0;
+ bsp = bstore;
+ for (i = 0; i < 161; i++) {
+ if (((unsigned int)bsp & 0x1f8) == 0x1f8)
+ *bsp++ = 1000 + r;
+ else
+ *bsp++ = r++;
+ }
+
+ printf("uwx_selftest_bsp_arithmetic: plus tests...\n");
+ bsp = bstore;
+ for (i = 0; i < 64; i++) {
+ r = (int)*bsp;
+ if (r >= 1000)
+ r -= 1000;
+ for (j = 0; j < 96; j++) {
+ p = (uint64_t *)uwx_add_to_bsp((uint64_t)bsp, j);
+ if (*p != (r + j)) {
+ failed++;
+ printf("%d [%08lx] + %d -> %08lx ",
+ i, (unsigned int)bsp, j, (unsigned int)p);
+ printf("(read %d instead of %d)\n", (int)*p, r + j);
+ }
+ }
+ bsp++;
}
- else if (nslots < 0) {
- bias = (0x1f8 - ((unsigned int)bsp & 0x1f8)) / DWORDSZ;
- nslots -= (-nslots + bias) / 63;
+
+ printf("uwx_selftest_bsp_arithmetic: minus tests...\n");
+ bsp = &bstore[161];
+ for (i = 63; i >= 0; i--) {
+ bsp--;
+ r = (int)*bsp;
+ if (r >= 1000)
+ r -= 1000;
+ for (j = 0; j < 96; j++) {
+ p = (uint64_t *)uwx_add_to_bsp((uint64_t)bsp, -j);
+ if (*p != (r - j)) {
+ failed++;
+ printf("%d [%08lx] - %d -> %08lx ",
+ i, (unsigned int)bsp, j, (unsigned int)p);
+ printf("(read %d instead of %d)\n", (int)*p, r - j);
+ }
+ }
}
- return bsp + nslots * DWORDSZ;
+
+ return failed;
}
+#endif
==== //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_env.c#2 (text+ko) ====
@@ -24,9 +24,6 @@
#ifndef _KERNEL
#include <stdlib.h>
-#else
-#define free(p) /* nullified */
-#define malloc(sz) NULL
#endif
#include "uwx_env.h"
@@ -34,6 +31,12 @@
#include "uwx_str.h"
#include "uwx_trace.h"
+#ifdef _KERNEL
+static struct uwx_env uwx_env;
+#define free(p) /* nullified */
+#define malloc(sz) ((sz == sizeof(uwx_env)) ? &uwx_env : NULL)
+#endif
+
alloc_cb uwx_allocate_cb = 0;
free_cb uwx_free_cb = 0;
@@ -88,6 +91,7 @@
env->context.fr[i].part1 = 0;
}
env->rstate = 0;
+ env->remapped_ip = 0;
env->function_offset = 0;
(void)uwx_init_history(env);
env->allocate_cb = uwx_allocate_cb;
==== //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_env.h#2 (text+ko) ====
@@ -78,6 +78,7 @@
struct uwx_env {
struct uwx_context context;
uint64_t *rstate;
+ uint64_t remapped_ip;
int64_t function_offset;
struct uwx_history history;
alloc_cb allocate_cb;
==== //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 (text+ko) ====
@@ -24,15 +24,39 @@
#ifndef _KERNEL
#include <stdlib.h>
-#else
-#define free(p) /* nullified */
-#define malloc(sz) NULL
#endif
#include "uwx_env.h"
#include "uwx_scoreboard.h"
#include "uwx_trace.h"
+#ifdef _KERNEL
+static unsigned short uwx_allocated;
+static struct uwx_scoreboard uwx_scoreboard[sizeof(uwx_allocated) << 3];
+
+static void
+free(struct uwx_scoreboard *p)
+{
+ int idx = p - uwx_scoreboard;
+ uwx_allocated &= ~(1 << idx);
+}
+
+static struct uwx_scoreboard *
+malloc(size_t sz)
+{
+ int idx;
+ if (sz != sizeof(struct uwx_scoreboard))
+ return (NULL);
+ for (idx = 0; idx < (sizeof(uwx_allocated) << 3); idx++) {
+ if ((uwx_allocated & (1 << idx)) == 0) {
+ uwx_allocated |= 1 << idx;
+ return (uwx_scoreboard + idx);
+ }
+ }
+ return (NULL);
+}
+#endif
+
struct uwx_scoreboard *uwx_alloc_scoreboard(struct uwx_env *env)
{
==== //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_self.c#2 (text+ko) ====
@@ -22,12 +22,10 @@
OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifndef _KERNEL
#include <stdlib.h>
#include <crt0.h>
#include <dlfcn.h>
#include <sys/uc_access.h>
-#endif
#include "uwx_env.h"
#include "uwx_context.h"
@@ -37,6 +35,7 @@
#define UWX_ABI_HPUX_SIGCONTEXT 0x0101 /* abi = HP-UX, context = 1 */
struct uwx_self_info {
+ struct uwx_env *env;
ucontext_t *ucontext;
uint64_t bspstore;
uint64_t rvec[10];
@@ -60,6 +59,7 @@
if (info == 0)
return 0;
+ info->env = env;
info->ucontext = 0;
info->bspstore = 0;
info->sendsig_start = __load_info->li_sendsig_txt;
@@ -155,72 +155,78 @@
unsigned long *wp;
uint64_t *dp;
+ status = -1;
+
dp = (uint64_t *) loc;
- if (request == UWX_COPYIN_UINFO ||
- request == UWX_COPYIN_MSTACK) {
- if (len == 4) {
- wp = (unsigned long *) loc;
- *wp = *(unsigned long *)rem;
- TRACE_SELF_COPYIN4(rem, len, wp)
- }
- else if (len == 8) {
- *dp = *(uint64_t *)rem;
- TRACE_SELF_COPYIN4(rem, len, dp)
- }
- else
- return 0;
- }
- else if (request == UWX_COPYIN_RSTACK && len == 8) {
- if (info->ucontext == 0 || rem < info->bspstore) {
- *dp = *(uint64_t *)rem;
- TRACE_SELF_COPYIN4(rem, len, dp)
- }
- else {
- status = __uc_get_rsebs(info->ucontext, (uint64_t *)rem, 1, dp);
- if (status != 0)
- return 0;
- }
- }
- else if (request == UWX_COPYIN_REG && len == 8) {
- if (info->ucontext == 0)
- return 0;
- regid = (int)rem;
- if (rem < UWX_REG_GR(0)) {
- switch (regid) {
- case UWX_REG_PREDS:
- status = __uc_get_prs(info->ucontext, dp);
- break;
- case UWX_REG_AR_PFS:
- status = __uc_get_ar(info->ucontext, 64, dp);
- break;
- case UWX_REG_AR_RNAT:
- status = __uc_get_ar(info->ucontext, 19, dp);
- break;
- case UWX_REG_AR_UNAT:
- status = __uc_get_ar(info->ucontext, 36, dp);
- break;
- case UWX_REG_AR_FPSR:
- status = __uc_get_ar(info->ucontext, 40, dp);
- break;
- case UWX_REG_AR_LC:
- status = __uc_get_ar(info->ucontext, 65, dp);
- break;
- default:
- return 0;
+ switch (request) {
+ case UWX_COPYIN_UINFO:
+ case UWX_COPYIN_MSTACK:
+ if (len == 4) {
+ wp = (unsigned long *) loc;
+ *wp = *(unsigned long *)rem;
+ TRACE_SELF_COPYIN4(rem, len, wp)
+ status = 0;
+ }
+ else if (len == 8) {
+ *dp = *(uint64_t *)rem;
+ TRACE_SELF_COPYIN8(rem, len, dp)
+ status = 0;
+ }
+ break;
+ case UWX_COPYIN_RSTACK:
+ if (len == 8) {
+ if (info->ucontext == 0 && rem == (info->bspstore | 0x1f8)) {
+ *dp = info->env->context.special[UWX_REG_AR_RNAT];
+ status = 0;
+ }
+ else if (info->ucontext == 0 || rem < info->bspstore) {
+ *dp = *(uint64_t *)rem;
+ TRACE_SELF_COPYIN8(rem, len, dp)
+ status = 0;
+ }
+ else {
+ status = __uc_get_rsebs(info->ucontext,
+ (uint64_t *)rem, 1, dp);
+ }
+ }
+ break;
+ case UWX_COPYIN_REG:
+ regid = (int)rem;
+ if (info->ucontext != 0) {
+ if (len == 8) {
+ if (rem == UWX_REG_PREDS)
+ status = __uc_get_prs(info->ucontext, dp);
+ else if (rem == UWX_REG_AR_PFS)
+ status = __uc_get_ar(info->ucontext, 64, dp);
+ else if (rem == UWX_REG_AR_RNAT)
+ status = __uc_get_ar(info->ucontext, 19, dp);
+ else if (rem == UWX_REG_AR_UNAT)
+ status = __uc_get_ar(info->ucontext, 36, dp);
+ else if (rem == UWX_REG_AR_FPSR)
+ status = __uc_get_ar(info->ucontext, 40, dp);
+ else if (rem == UWX_REG_AR_LC)
+ status = __uc_get_ar(info->ucontext, 65, dp);
+ else if (regid >= UWX_REG_GR(1) &&
+ regid <= UWX_REG_GR(31))
+ status = __uc_get_grs(info->ucontext,
+ regid - UWX_REG_GR(0), 1, dp, &nat);
+ else if (regid >= UWX_REG_BR(0) &&
+ regid <= UWX_REG_BR(7))
+ status = __uc_get_brs(info->ucontext,
+ regid - UWX_REG_BR(0), 1, dp);
+ }
+ else if (len == 16) {
+ if (regid >= UWX_REG_FR(2) && regid <= UWX_REG_FR(127)) {
+ status = __uc_get_frs(info->ucontext,
+ regid - UWX_REG_FR(0), 1, (fp_regval_t *)dp);
+ }
+ }
}
- }
- else if (regid >= UWX_REG_GR(1) && regid <= UWX_REG_GR(31)) {
- status = __uc_get_grs(info->ucontext,
- regid - UWX_REG_GR(0), 1, dp, &nat);
- }
- else if (regid >= UWX_REG_BR(0) && regid <= UWX_REG_BR(7)) {
- status = __uc_get_brs(info->ucontext,
- regid - UWX_REG_BR(0), 1, dp);
- }
- if (status != 0)
- return 0;
+ break;
}
+ if (status != 0)
+ return 0;
return len;
}
==== //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_self.h#2 (text+ko) ====
@@ -22,38 +22,91 @@
OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifndef _KERNEL
+#ifndef __UWX_SELF_INCLUDED
+#define __UWX_SELF_INCLUDED 1
+
#include <signal.h>
+
+#ifndef __UWX_INCLUDED
+#include "uwx.h"
+#endif /* __UWX_INCLUDED */
+
+#if defined(__cplusplus)
+#define __EXTERN_C extern "C"
+#else
+#define __EXTERN_C extern
#endif
struct uwx_self_info;
-extern struct uwx_self_info *uwx_self_init_info(struct uwx_env *env);
+__EXTERN_C struct uwx_self_info *uwx_self_init_info(struct uwx_env *env);
-extern int uwx_self_free_info(struct uwx_self_info *info);
+__EXTERN_C int uwx_self_free_info(struct uwx_self_info *info);
-extern int uwx_self_init_context(struct uwx_env *env);
+__EXTERN_C int uwx_self_init_context(struct uwx_env *env);
-extern int uwx_self_init_from_sigcontext(
+__EXTERN_C int uwx_self_init_from_sigcontext(
struct uwx_env *env,
struct uwx_self_info *info,
ucontext_t *ucontext);
-extern int uwx_self_do_context_frame(
+__EXTERN_C int uwx_self_do_context_frame(
struct uwx_env *env,
struct uwx_self_info *info);
-extern int uwx_self_copyin(
+__EXTERN_C int uwx_self_copyin(
int request,
char *loc,
uint64_t rem,
int len,
intptr_t tok);
-extern int uwx_self_lookupip(
+__EXTERN_C int uwx_self_lookupip(
int request,
uint64_t ip,
intptr_t tok,
uint64_t **resultp);
#define UWX_SELF_ERR_BADABICONTEXT (-101)
+
+#undef __EXTERN_C
+
+#if defined(__cplusplus)
+
+class UnwindExpressSelf : public UnwindExpress {
+
+public:
+
+ UnwindExpressSelf() {
+ info = uwx_self_init_info(env);
+ (void)uwx_register_callbacks(env, (intptr_t)info,
+ uwx_self_copyin, uwx_self_lookupip);
+ }
+
+ ~UnwindExpressSelf() {
+ if (info != 0)
+ uwx_self_free_info(info);
+ info = 0;
+ }
+
+ int init_context() {
+ return uwx_self_init_context(env);
+ }
+
+ int init_context(ucontext_t *ucontext) {
+ return uwx_self_init_from_sigcontext(env, info, ucontext);
+ }
+
+ int do_context_frame() {
+ return uwx_self_do_context_frame(env, info);
+ }
+
+protected:
+
+ struct uwx_self_info *info;
+
+};
+
+#endif /* __cplusplus */
+
+#endif /* __UWX_SELF_INCLUDED */
==== //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 (text+ko) ====
@@ -1,24 +1,24 @@
-/*
- * Copyright (c) 2002,2003 Hewlett-Packard Company
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
+// Copyright (c) 2003 Hewlett-Packard Development Company, L.P.
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
#ifdef _LP64
#define SWIZZLE add
@@ -48,6 +48,21 @@
rTMP4 = r31
rTMP5 = r8
+VALID_IP = 1
+VALID_SP = 1 << 1
+VALID_BSP = 1 << 2
+VALID_CFM = 1 << 3
+VALID_PREDS = 1 << 7
+VALID_RNAT = 1 << 10
+VALID_UNAT = 1 << 11
+VALID_FPSR = 1 << 12
+VALID_LC = 1 << 13
+VALID_GRS = 0xf << 16
+VALID_BRS = 0x1f << 20
+VALID_BASIC4 = VALID_IP | VALID_SP | VALID_BSP | VALID_CFM
+VALID_SPEC = VALID_PREDS | VALID_RNAT | VALID_UNAT | VALID_FPSR | VALID_LC
+VALID_BITS = (VALID_BASIC4 | VALID_SPEC | VALID_GRS | VALID_BRS) << 32
+
.text
.proc uwx_self_init_context
.global uwx_self_init_context
@@ -63,40 +78,42 @@
mov rRP = b0
;;
mov rRSC = ar.rsc
- add rENV1 = 120, rENV0 // rENV1 = &env->context.gr[0]
- add rENV2 = 128, rENV0 // rENV2 = &env->context.gr[1]
+ add rENV1 = 136, rENV0 // rENV1 = &env->context.gr[0]
+ add rENV2 = 144, rENV0 // rENV2 = &env->context.gr[1]
;;
and rRSC0 = -4, rRSC // clear ar.rsc.mode
adds rNATP = 0x1f8, r0
mov rTMP1 = b1
;;
- st8.spill [rENV1] = r4, 16 // env+120: r4
- st8.spill [rENV2] = r5, 16 // env+128: r5
+ st8.spill [rENV1] = r4, 16 // env+136: r4
+ st8.spill [rENV2] = r5, 16 // env+144: r5
mov rTMP2 = b2
;;
- st8.spill [rENV1] = r6, 16 // env+136: r6
- st8.spill [rENV2] = r7, 16 // env+144: r7
+ st8.spill [rENV1] = r6, 16 // env+152: r6
+ st8.spill [rENV2] = r7, 16 // env+160: r7
mov rTMP3 = b3
;;
- st8 [rENV1] = rTMP1, 16 // env+152: b1
- st8 [rENV2] = rTMP2, 16 // env+160: b2
+ st8 [rENV1] = rTMP1, 16 // env+168: b1
+ st8 [rENV2] = rTMP2, 16 // env+176: b2
mov rTMP1 = b4
;;
- st8 [rENV1] = rTMP3, 16 // env+168: b3
- st8 [rENV2] = rTMP1, 16 // env+176: b4
+ st8 [rENV1] = rTMP3, 16 // env+184: b3
+ st8 [rENV2] = rTMP1, 16 // env+192: b4
mov rTMP2 = b5
;;
- st8 [rENV1] = rTMP2 // env+184: b5
+ st8 [rENV1] = rTMP2 // env+200: b5
mov ar.rsc = rRSC0 // enforced lazy mode
add rENV1 = 8, rENV0
;;
mov rRNAT = ar.rnat // get copy of ar.rnat
- movl rTMP1 = 0x7fec8f00000000 // valid_regs: ip, sp, bsp, cfm,
- // preds, rnat, unat, lc, grs, brs
+ movl rTMP1 = VALID_BITS // valid_regs: ip, sp, bsp, cfm,
+ // preds, rnat, unat, fpsr,
+ // lc, grs, brs
+ // = 0x1ff3c8f00000000
;;
mov ar.rsc = rRSC // restore ar.rsc
mov rBSP = ar.bsp
- add rTMP3 = 120, rENV0 // spill_loc = &env->context.gr[0]
+ add rTMP3 = 136, rENV0 // spill_loc = &env->context.gr[0]
;;
mov rTMP2 = ar.unat
nop
@@ -143,7 +160,7 @@
add rENV2 = 320, rENV2 // rENV2 = &env->context.rstate
;;
st8 [rENV1] = rTMP1 // env+112: lc
- STPTR [rENV2] = r0 // env+512: env->rstate = 0
+ STPTR [rENV2] = r0 // env+528: env->rstate = 0
nop
;;
mov ar.unat = rUNAT
==== //depot/projects/gdb/sys/contrib/ia64/libuwx/src/uwx_step.c#2 (text+ko) ====
@@ -52,6 +52,19 @@
int uwx_restore_nat(struct uwx_env *env, uint64_t rstate, int unat);
+/* uwx_lookupip_hook: Hook routine so dynamic instrumentation */
+/* tools can intercept Lookup IP events. When not */
+/* intercepted, it just returns "Not found", so that */
+/* the callback routine is invoked. */
+
+/*ARGSUSED*/
+int uwx_lookupip_hook(int request, uint64_t ip, intptr_t tok, uint64_t **vecp,
+ size_t uvecsize)
+{
+ return UWX_LKUP_NOTFOUND;
+}
+
+
/* uwx_get_frame_info: Gets unwind info for current frame */
static
int uwx_get_frame_info(struct uwx_env *env)
@@ -59,10 +72,12 @@
int i;
int status;
int cbstatus;
+ int cbcalled = 0;
+ uint64_t ip;
uint64_t *uvec;
uint64_t *rstate;
struct uwx_utable_entry uentry;
- uint64_t uvecout[4];
+ uint64_t uvecout[UVECSIZE];
if (env->copyin == 0 || env->lookupip == 0)
return UWX_ERR_NOCALLBACKS;
@@ -76,7 +91,14 @@
/* current IP. If the predicate registers are valid, pass them */
/* in the uvec. */
+ /* When self-unwinding, we call a hook routine before the */
+ /* callback. If the application is running under control of */
+ /* a dynamic instrumentation tool, that tool will have an */
+ /* opportunity to intercept lookup IP requests. */
+
i = 0;
+ uvecout[i++] = UWX_KEY_VERSION;
+ uvecout[i++] = UWX_VERSION;
if (env->context.valid_regs & (1 << UWX_REG_PREDS)) {
uvecout[i++] = UWX_KEY_PREDS;
uvecout[i++] = env->context.special[UWX_REG_PREDS];
@@ -84,8 +106,52 @@
uvecout[i++] = UWX_KEY_END;
uvecout[i++] = 0;
uvec = uvecout;
- cbstatus = (*env->lookupip)(UWX_LKUP_LOOKUP,
- env->context.special[UWX_REG_IP], env->cb_token, &uvec);
+ cbstatus = UWX_LKUP_NOTFOUND;
+ ip = env->context.special[UWX_REG_IP];
+ env->remapped_ip = ip;
+
+ /* Call the hook routine. */
+
+ if (env->remote == 0)
+ cbstatus = uwx_lookupip_hook(UWX_LKUP_LOOKUP, ip, env->cb_token, &uvec,
+ sizeof(uvecout));
+
+ /* If the hook routine remapped the IP, use the new IP for */
+ /* the callback instead of the original IP. */
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sat May 8 22:06:08 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 3C24516A4D0; Sat, 8 May 2004 22:06:08 -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 F0ABE16A4CE
for <perforce@freebsd.org>; Sat, 8 May 2004 22:06:07 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 9767743D39
for <perforce@freebsd.org>; Sat, 8 May 2004 22:06:07 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i49567Ge013288
for <perforce@freebsd.org>; Sat, 8 May 2004 22:06:07 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i49567Up013285
for perforce@freebsd.org; Sat, 8 May 2004 22:06:07 -0700 (PDT)
(envelope-from marcel@freebsd.org)
Date: Sat, 8 May 2004 22:06:07 -0700 (PDT)
Message-Id: <200405090506.i49567Up013285@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52522 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: Sun, 09 May 2004 05:06:08 -0000
http://perforce.freebsd.org/chv.cgi?CH=52522
Change 52522 by marcel@marcel_nfs on 2004/05/08 22:05:40
Have the thread command parse its own arguments so that
thread IDs can be parsed with radix 10. While here, add
db_print_thread() to print the current thread.
Affected files ...
.. //depot/projects/gdb/sys/ddb/db_command.c#4 edit
.. //depot/projects/gdb/sys/ddb/db_main.c#6 edit
.. //depot/projects/gdb/sys/ddb/db_thread.c#3 edit
.. //depot/projects/gdb/sys/ddb/ddb.h#6 edit
Differences ...
==== //depot/projects/gdb/sys/ddb/db_command.c#4 (text+ko) ====
@@ -417,7 +417,7 @@
{ "reset", db_reset, 0, 0 },
{ "kill", db_kill, CS_OWN, 0 },
{ "watchdog", db_watchdog, 0, 0 },
- { "thread", db_set_thread, 0, 0 },
+ { "thread", db_set_thread, CS_OWN, 0 },
{ (char *)0, }
};
==== //depot/projects/gdb/sys/ddb/db_main.c#6 (text+ko) ====
@@ -213,17 +213,18 @@
db_printf("After %d instructions (%d loads, %d stores),\n",
db_inst_count, db_load_count, db_store_count);
}
- db_printf("[thread 0x%x]\n", kdb_thread->td_tid);
- if (bkpt)
- db_printf("Breakpoint at\t");
- else if (watchpt)
- db_printf("Watchpoint at\t");
- else
- db_printf("Stopped at\t");
- db_dot = PC_REGS(DDB_REGS);
prev_jb = kdb_jmpbuf(jb);
- if (setjmp(jb) == 0)
+ if (setjmp(jb) == 0) {
+ db_dot = PC_REGS(DDB_REGS);
+ db_print_thread();
+ if (bkpt)
+ db_printf("Breakpoint at\t");
+ else if (watchpt)
+ db_printf("Watchpoint at\t");
+ else
+ db_printf("Stopped at\t");
db_print_loc_and_inst(db_dot);
+ }
db_command_loop();
(void)kdb_jmpbuf(prev_jb);
}
==== //depot/projects/gdb/sys/ddb/db_thread.c#3 (text+ko) ====
@@ -37,31 +37,48 @@
#include <ddb/db_sym.h>
void
+db_print_thread(void)
+{
+ db_printf("[thread %d]\n", kdb_thread->td_tid);
+}
+
+void
db_set_thread(db_expr_t tid, boolean_t hastid, db_expr_t cnt, char *mod)
{
struct thread *thr;
+ db_expr_t radix;
int err;
+ /*
+ * We parse our own arguments. We don't like the default radix.
+ */
+ radix = db_radix;
+ db_radix = 10;
+ hastid = db_expression(&tid);
+ db_radix = radix;
+ db_skip_to_eol();
+
if (hastid) {
thr = kdb_thr_lookup(tid);
if (thr != NULL) {
*kdb_frame = ddb_regs;
- err= kdb_thr_select(thr);
+ err = kdb_thr_select(thr);
if (err == 0) {
- db_printf("switching to thread 0x%x\n",
- thr->td_tid);
ddb_regs = *kdb_frame;
db_dot = PC_REGS(DDB_REGS);
- db_print_loc_and_inst(db_dot);
- } else
- db_printf("unable to switch to thread 0x%x\n",
- thr->td_tid);
- } else
- db_printf("0x%x: invalid thread\n", (int)tid);
- } else {
- db_printf("current thread is 0x%x\n", kdb_thread->td_tid);
- db_print_loc_and_inst(PC_REGS(DDB_REGS));
+ } else {
+ db_printf("unable to switch to thread %d\n",
+ (int)thr->td_tid);
+ return;
+ }
+ } else {
+ db_printf("%d: invalid thread\n", (int)tid);
+ return;
+ }
}
+
+ db_print_thread();
+ db_print_loc_and_inst(PC_REGS(DDB_REGS));
}
void
@@ -75,7 +92,7 @@
pager_quit = 0;
thr = kdb_thr_first();
while (!pager_quit && thr != NULL) {
- db_printf(" 0x%x (%p) ", thr->td_tid, thr);
+ db_printf(" %6d (%p) ", (int)thr->td_tid, thr);
db_printsym(PC_REGS(thr->td_last_frame), DB_STGY_PROC);
db_printf("\n");
thr = kdb_thr_next(thr);
==== //depot/projects/gdb/sys/ddb/ddb.h#6 (text+ko) ====
@@ -93,6 +93,7 @@
boolean_t db_map_current(struct vm_map *);
boolean_t db_map_equal(struct vm_map *, struct vm_map *);
void db_print_loc_and_inst(db_addr_t loc);
+void db_print_thread(void);
void db_printf(const char *fmt, ...) __printflike(1, 2);
void db_read_bytes(vm_offset_t addr, size_t size, char *data);
/* machine-dependent */
@@ -106,9 +107,6 @@
#define db_strcpy strcpy
int db_value_of_name(const char *name, db_expr_t *valuep);
void db_write_bytes(vm_offset_t addr, size_t size, char *data);
- /* machine-dependent */
-void db_stack_thread(db_expr_t addr, boolean_t have_addr,
- db_expr_t count, char *modif);
db_cmdfcn_t db_breakpoint_cmd;
db_cmdfcn_t db_continue_cmd;