PERFORCE change 140323 for review
Peter Wemm
peter at FreeBSD.org
Sun Apr 20 19:28:00 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=140323
Change 140323 by peter at peter_overcee on 2008/04/20 19:27:58
IFC @140322
Affected files ...
.. //depot/projects/hammer/ObsoleteFiles.inc#51 integrate
.. //depot/projects/hammer/lib/libc/stdlib/strfmon.c#8 integrate
.. //depot/projects/hammer/lib/libc/sys/cpuset.2#2 integrate
.. //depot/projects/hammer/lib/libc/sys/cpuset_getaffinity.2#2 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#33 integrate
.. //depot/projects/hammer/release/doc/share/sgml/release.dsl#6 integrate
.. //depot/projects/hammer/release/doc/share/sgml/release.ent#24 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#167 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#107 integrate
.. //depot/projects/hammer/sys/conf/NOTES#143 integrate
.. //depot/projects/hammer/sys/conf/files#180 integrate
.. //depot/projects/hammer/sys/conf/files.pc98#66 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#37 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#68 integrate
.. //depot/projects/hammer/sys/dev/awi/am79c930.c#6 delete
.. //depot/projects/hammer/sys/dev/awi/am79c930reg.h#3 delete
.. //depot/projects/hammer/sys/dev/awi/am79c930var.h#3 delete
.. //depot/projects/hammer/sys/dev/awi/awi.c#22 delete
.. //depot/projects/hammer/sys/dev/awi/awireg.h#3 delete
.. //depot/projects/hammer/sys/dev/awi/awivar.h#8 delete
.. //depot/projects/hammer/sys/dev/awi/if_awi_pccard.c#18 delete
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_l2t.c#7 delete
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_l2t.h#6 delete
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#19 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.c#9 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.h#9 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#7 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_defs.h#4 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_listen.c#4 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#3 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom.c#4 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#3 integrate
.. //depot/projects/hammer/sys/dev/iscsi/initiator/iscsi.c#2 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#16 integrate
.. //depot/projects/hammer/sys/dev/usb/uipaq.c#5 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#101 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#65 integrate
.. //depot/projects/hammer/sys/i386/conf/PAE#26 integrate
.. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#22 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#67 integrate
.. //depot/projects/hammer/sys/modules/Makefile#124 integrate
.. //depot/projects/hammer/sys/modules/awi/Makefile#5 delete
.. //depot/projects/hammer/sys/modules/cxgb/cxgb/Makefile#6 integrate
.. //depot/projects/hammer/sys/modules/cxgb/tom/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/firmware/Makefile#2 integrate
.. //depot/projects/hammer/sys/net/if.c#75 integrate
.. //depot/projects/hammer/sys/net/if_media.h#22 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#59 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.c#57 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#95 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#70 integrate
.. //depot/projects/hammer/sys/netinet/tcp_offload.h#2 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#59 integrate
.. //depot/projects/hammer/sys/netinet/tcp_var.h#53 integrate
.. //depot/projects/hammer/sys/netinet6/in6_pcb.c#36 integrate
.. //depot/projects/hammer/sys/pc98/cbus/clock.c#15 integrate
.. //depot/projects/hammer/sys/pc98/cbus/pcrtc.c#1 branch
.. //depot/projects/hammer/sys/pc98/conf/GENERIC#51 integrate
.. //depot/projects/hammer/sys/pc98/include/clock.h#4 integrate
.. //depot/projects/hammer/sys/security/audit/audit_arg.c#14 integrate
.. //depot/projects/hammer/sys/security/mac/mac_inet.c#8 integrate
.. //depot/projects/hammer/usr.bin/procstat/procstat.1#2 integrate
Differences ...
==== //depot/projects/hammer/ObsoleteFiles.inc#51 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.136 2008/04/01 11:05:26 flz Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.137 2008/04/20 16:03:19 antoine Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -19,6 +19,22 @@
OLD_FILES+=usr/sbin/pkg_sign
OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
+# 20080325: tzdata2008b import
+OLD_FILES+=usr/share/zoneinfo/Asia/Calcutta
+OLD_FILES+=usr/share/zoneinfo/Asia/Saigon
+# 20080314: stack_print(9) mlink fixed
+OLD_FILES+=usr/share/man/man9/stack_printf.9.gz
+# 20080312: libkse removal
+OLD_FILES+=usr/include/sys/kse.h
+OLD_FILES+=usr/lib/libkse.so
+OLD_LIBS+=usr/lib/libkse.so.3
+OLD_FILES+=usr/share/man/man2/kse.2.gz
+OLD_FILES+=usr/share/man/man2/kse_create.2.gz
+OLD_FILES+=usr/share/man/man2/kse_exit.2.gz
+OLD_FILES+=usr/share/man/man2/kse_release.2.gz
+OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz
+OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz
+OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
# 20080220: geom_lvm rename to geom_linux_lvm
OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
# 20080126: oldcard.4 removal
==== //depot/projects/hammer/lib/libc/stdlib/strfmon.c#8 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.16 2008/04/13 08:05:08 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.18 2008/04/19 07:22:58 ru Exp $");
#include <sys/types.h>
#include <ctype.h>
@@ -67,6 +67,8 @@
while (isdigit((unsigned char)*fmt)) { \
VAR *= 10; \
VAR += *fmt - '0'; \
+ if (VAR < 0) \
+ goto e2big_error; \
fmt++; \
} \
} while (0)
@@ -187,7 +189,7 @@
/* Do we have enough space to put number with
* required width ?
*/
- if (dst + width >= s + maxsize)
+ if ((unsigned int)width >= maxsize - (dst - s))
goto e2big_error;
}
@@ -196,6 +198,8 @@
if (!isdigit((unsigned char)*++fmt))
goto format_error;
GET_NUMBER(left_prec);
+ if ((unsigned int)left_prec >= maxsize - (dst - s))
+ goto e2big_error;
}
/* Right precision */
@@ -203,6 +207,9 @@
if (!isdigit((unsigned char)*++fmt))
goto format_error;
GET_NUMBER(right_prec);
+ if ((unsigned int)right_prec >= maxsize - (dst - s) -
+ left_prec)
+ goto e2big_error;
}
/* Conversion Characters */
@@ -218,6 +225,8 @@
goto format_error;
}
+ if (currency_symbol != NULL)
+ free(currency_symbol);
if (flags & USE_INTL_CURRENCY) {
currency_symbol = strdup(lc->int_curr_symbol);
if (currency_symbol != NULL)
@@ -246,6 +255,8 @@
pad_size = 0;
}
+ if (asciivalue != NULL)
+ free(asciivalue);
asciivalue = __format_grouped_double(value, &flags,
left_prec, right_prec, pad_char);
if (asciivalue == NULL)
==== //depot/projects/hammer/lib/libc/sys/cpuset.2#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/lib/libc/sys/cpuset.2,v 1.1 2008/03/29 10:06:30 jeff Exp $
+.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.2 2008/04/20 15:51:56 antoine Exp $
.\"
.Dd March 29, 2008
.Dt CPUSET 2
@@ -36,6 +36,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
+.In sys/param.h
.In sys/cpuset.h
.Ft int
.Fn cpuset "cpusetid_t *setid"
==== //depot/projects/hammer/lib/libc/sys/cpuset_getaffinity.2#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/lib/libc/sys/cpuset_getaffinity.2,v 1.1 2008/03/29 10:26:29 jeff Exp $
+.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.2 2008/04/20 15:51:56 antoine Exp $
.\"
.Dd March 29, 2008
.Dt CPUSET 2
@@ -35,6 +35,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
+.In sys/param.h
.In sys/cpuset.h
.Ft int
.Fn cpuset_getaffinity "cpulevel_t level" "cpuwhich_t which" "id_t id" "size_t setsize" "cpuset_t *mask"
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#33 (text+ko) ====
@@ -7,9 +7,6 @@
<!-- Text constants which probably don't need to be changed.-->
-<!-- The marker for MFCs. -->
-<!ENTITY merged "[MERGED]">
-
<!ENTITY % include.historic "IGNORE">
<!ENTITY % no.include.historic "IGNORE">
]>
@@ -20,7 +17,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1085 2008/04/17 00:57:34 delphij Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1088 2008/04/20 18:17:33 hrs Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -145,27 +142,27 @@
assignment. The &man.cpuset.1; userland utility has been added
to allow manipulation of processor sets.</para>
- <para>The &man.ddb.4; kernel debugger now has an output capture
+ <para role="merged">The &man.ddb.4; kernel debugger now has an output capture
facility. Input and output from &man.ddb.4; can now be captured
to a memory buffer for later inspection using &man.sysctl.8; or
a textdump. The new <command>capture</command> command controls
- this feature. &merged;</para>
+ this feature.</para>
- <para>The &man.ddb.4; debugger now supports a simple scripting
+ <para role="merged">The &man.ddb.4; debugger now supports a simple scripting
facility, which supports a set of named scripts consisting of a
set of &man.ddb.4; commands. These commands can be managed from
within &man.ddb.4; or with the use of the new &man.ddb.8;
utility. More details can be found in the &man.ddb.4; manual
- page. &merged;</para>
+ page.</para>
- <para>The kernel now supports a new textdump format of kernel
+ <para role="merged">The kernel now supports a new textdump format of kernel
dumps. A textdump provides higher-level information via
mechanically generated/extracted debugging output, rather than a
simple memory dump. This facility can be used to generate brief
kernel bug reports that are rich in debugging information, but
are not dependent on kernel symbol tables or precisely
synchronized source code. More information can be found in the
- &man.textdump.4; manual page. &merged;</para>
+ &man.textdump.4; manual page.</para>
<para>Kernel support for M:N threading has been removed. While
the KSE (Kernel Scheduled Entities) project was quite successful
@@ -181,39 +178,39 @@
interface for user applications to test the presence of
features.</para>
- <para>[&arch.amd64;] The &os; kernel now has support for large
+ <para arch="amd64">The &os; kernel now has support for large
memory page mappings (<quote>superpages</quote>).</para>
- <para>[&arch.amd64;, &arch.i386;, &arch.powerpc;] The ULE
+ <para arch="amd64,i386,ia64,powerpc" role="merged">The ULE
scheduler is now the default process scheduler
- in <filename>GENERIC</filename> kernels. &merged;</para>
+ in <filename>GENERIC</filename> kernels.</para>
<sect3 id="boot">
<title>Boot Loader Changes</title>
- <para>[&arch.amd64;, &arch.i386;] The BTX kernel used by the boot
+ <para arch="amd64,i386" role="merged">The BTX kernel used by the boot
loader has been changed to invoke BIOS routines from real
mode. This change makes it possible to boot &os; from USB
- devices. &merged;</para>
+ devices.</para>
- <para>[&arch.amd64;, &arch.i386;] A new gptboot boot loader has
+ <para arch="amd64,i386" role="merged">A new gptboot boot loader has
been added to support booting from a GPT labeled disk. A
new <command>boot</command> command has been added to
&man.gpt.8;, which makes a GPT disk bootable by writing the
required bits of the boot loader, creating a new boot
- partition if required. &merged;</para>
+ partition if required.</para>
</sect3>
<sect3 id="proc">
<title>Hardware Support</title>
- <para>The &man.cmx.4; driver, a driver for Omnikey CardMan 4040
- PCMCIA smartcard readers, has been added. &merged;</para>
+ <para role="merged">The &man.cmx.4; driver, a driver for Omnikey CardMan 4040
+ PCMCIA smartcard readers, has been added.</para>
- <para>The &man.uslcom.4; driver, a driver for Silicon
+ <para role="merged">The &man.uslcom.4; driver, a driver for Silicon
Laboratories CP2101/CP2102-based USB serial adapters, has been
- imported from OpenBSD. &merged;</para>
+ imported from OpenBSD.</para>
<sect4 id="mm">
<title>Multimedia Support</title>
@@ -250,9 +247,8 @@
number of outstanding issues. It also now works on all
architectures.</para>
- <para>[&arch.amd64;, &arch.i386;] The &man.wpi.4; driver has
- been updated to include a number of stability fixes.
- &merged;</para>
+ <para arch="amd64,i386" role="merged">The &man.wpi.4; driver has
+ been updated to include a number of stability fixes.</para>
</sect4>
</sect3>
@@ -267,16 +263,16 @@
the <varname>net.bpf.zerocopy_enable</varname> sysctl
variable to <literal>1</literal>.</para>
- <para>A bug in TCP options padding, where the wrong padding
- bytes were used, has been fixed. &merged;</para>
+ <para role="merged">A bug in TCP options padding, where the wrong padding
+ bytes were used, has been fixed.</para>
</sect3>
<sect3 id="disks">
<title>Disks and Storage</title>
- <para>The &man.aac.4; driver now supports volumes larger than
- 2TB in size. &merged;</para>
+ <para role="merged">The &man.aac.4; driver now supports volumes larger than
+ 2TB in size.</para>
<para>The &man.ata.4; driver now supports a spindown command for
disks; after a configurable amount of time, if no requests
@@ -285,8 +281,8 @@
supports a <command>spindown</command> command to configure
this feature.</para>
- <para>The &man.hptrr.4; driver has been updated to version 1.2
- from Highpoint. &merged;</para>
+ <para role="merged">The &man.hptrr.4; driver has been updated to version 1.2
+ from Highpoint.</para>
</sect3>
@@ -307,23 +303,31 @@
<sect2 id="userland">
<title>Userland Changes</title>
- <para>The &man.adduser.8; utility now supports
+ <para role="merged">The &man.adduser.8; utility now supports
a <option>-M</option> option to set the mode of a new user's
- home directory. &merged;</para>
+ home directory.</para>
<para>BSD-licensed versions of &man.ar.1; and &man.ranlib.1;,
based on <filename>libarchive</filename>, have replaced the GNU
Binutils versions of these utilities.</para>
- <para>&man.chflags.1; now supports a <option>-v</option> flag for
+ <para role="merged">&man.chflags.1; now supports a <option>-v</option> flag for
verbose output and a <option>-f</option> flag to ignore errors
with the same semantics as (for example)
- &man.chmod.1;. &merged;</para>
+ &man.chmod.1;.</para>
<para>For compatiblity with other implementations, &man.cp.1; now
supports a <option>-a</option> flag, which is equivalent to
specifying the <option>-RrP</option> flags.</para>
+ <para>The &man.env.1; program now supports <option>-u
+ <replaceable>name</replaceable></option>
+ which will completely unset the given variable
+ <replaceable>name</replaceable> by removing it from the environment,
+ instead of just setting it to a null value.</para>
+
+ <para>The &man.fdopendir.3; library function has been added.</para>
+
<para>&man.find.1; has been enhanced by the addition of a number
of primaries that were present in GNU find but not &os;
&man.find.1;.</para>
@@ -342,9 +346,9 @@
<para>The &man.procstat.1; utility has been added to display
detailed information about processes.</para>
- <para>The &man.realpath.1; utility now supports
+ <para role="merged">The &man.realpath.1; utility now supports
a <option>-q</option> flag to suppress warnings; it now also
- accepts multiple paths on its command line. &merged; </para>
+ accepts multiple paths on its command line.</para>
<para>The &man.split.1; utility now supports a <option>-n</option>
flag to split a file into a certain number of chunks.</para>
@@ -353,6 +357,11 @@
flag to enable &man.compress.1;-style
compression/decompression.</para>
+ <para>The &man.tcgetsid.3; library function has been added to
+ return the process group ID for the session leader for the
+ controlling terminal. It is defined in IEEE Std 1003.1-2001
+ (POSIX).</para>
+
<para>&man.top.1; now supports a <option>-P</option> flag to
provide per-CPU usage statistics.</para>
@@ -376,14 +385,14 @@
<sect2 id="contrib">
<title>Contributed Software</title>
- <para><application>AMD</application> has been updated from 6.0.10
- to 6.1.5. &merged;</para>
+ <para role="merged"><application>AMD</application> has been updated from 6.0.10
+ to 6.1.5.</para>
- <para><application>awk</application> has been updated from 1 May
- 2007 release to the 23 October 2007 release. &merged;</para>
+ <para role="merged"><application>awk</application> has been updated from 1 May
+ 2007 release to the 23 October 2007 release.</para>
- <para><application>bzip2</application> has been updated from 1.0.4
- to 1.0.5. &merged;</para>
+ <para role="merged"><application>bzip2</application> has been updated from 1.0.4
+ to 1.0.5.</para>
<para><application>CVS</application> has been updated from 1.11.17
to a post-1.11.22 snapshot from 10 March 2008.</para>
@@ -400,15 +409,15 @@
<para><application>ncurses</application> has been updated from
5.6-20061217 to 5.6-20080209.</para>
- <para><application>OpenPAM</application> has been updated from the
- Figwort release to the Hydrangea release. &merged;</para>
+ <para role="merged"><application>OpenPAM</application> has been updated from the
+ Figwort release to the Hydrangea release.</para>
- <para><application>sendmail</application> has been updated from
- 8.14.1 to 8.14.2. &merged;</para>
+ <para role="merged"><application>sendmail</application> has been updated from
+ 8.14.1 to 8.14.2.</para>
- <para>The timezone database has been updated from
+ <para role="merged">The timezone database has been updated from
the <application>tzdata2007h</application> release to
- the <application>tzdata2008b</application> release. &merged;</para>
+ the <application>tzdata2008b</application> release.</para>
<para><application>WPA Supplicant</application> has been
updated from 0.5.8 to 0.5.10.</para>
@@ -429,10 +438,10 @@
<sect2 id="releng">
<title>Release Engineering and Integration</title>
- <para>The supported version of
+ <para role="merged">The supported version of
the <application>GNOME</application> desktop environment
(<filename role="package">x11/gnome2</filename>) has been
- updated from 2.20.1 to 2.22. &merged;</para>
+ updated from 2.20.1 to 2.22.</para>
</sect2>
@@ -447,7 +456,7 @@
<sect1 id="upgrade">
<title>Upgrading from previous releases of &os;</title>
- <para>[&arch.i386;, &arch.amd64;] Beginning with &os; 6.2-RELEASE,
+ <para arch="amd64,i386">Beginning with &os; 6.2-RELEASE,
binary upgrades between RELEASE versions (and snapshots of the
various security branches) are supported using the
&man.freebsd-update.8; utility. The binary upgrade procedure will
==== //depot/projects/hammer/release/doc/share/sgml/release.dsl#6 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: src/release/doc/share/sgml/release.dsl,v 1.10 2005/11/28 06:24:19 hrs Exp $ -->
+<!-- $FreeBSD: src/release/doc/share/sgml/release.dsl,v 1.12 2008/04/20 18:28:31 hrs Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY % output.html "IGNORE">
@@ -56,90 +56,34 @@
; Deal with conditional inclusion of text via entities.
(default
- (let* ((arch (attribute-string (normalize "arch")))
- (role (attribute-string (normalize "role")))
+ (let* ((role (attribute-string (normalize "role")))
(for-arch (entity-text "arch")))
(cond
- ; If role=historic, and we're not printing historic things, then
- ; don't output this element.
+ ;; If role=historic, and we're not printing historic things, then
+ ;; don't output this element.
((and (equal? role "historic")
- (not %include-historic%))
+ (not %include-historic%))
(empty-sosofo))
-
- ; If arch= not specified, then print unconditionally. This clause
- ; handles the majority of cases.
- ((or (equal? arch #f) (equal? arch ""))
- (next-match))
-
- ; arch= specified, see if it's equal to "all". If so, then
- ; print unconditionally. Note that this clause could be
- ; combined with the check to see if arch= wasn't specified
- ; or was empty; they have the same outcome.
- ((equal? arch "all")
- (next-match))
-
- ; arch= specified. If we're building for all architectures,
- ; then print it prepended with the set of architectures to which
- ; this element applies.
- ;
- ; XXX This doesn't work.
-; ((equal? for-arch "all")
-; (sosofo-append (literal "[") (literal arch) (literal "] ")
-; (process-children)))
-
- ; arch= specified, so we need to check to see if the specified
- ; parameter includes the architecture we're building for.
- ((string-list-match? for-arch (split-string-to-list arch))
- (next-match))
+ ;; None of the above
+ (else (next-match)))))
- ; None of the above
- (else (empty-sosofo)))))
-
(mode qandatoc
(default
- (let* ((arch (attribute-string (normalize "arch")))
- (role (attribute-string (normalize "role")))
- (for-arch (entity-text "arch")))
- (cond
+ (let* ((role (attribute-string (normalize "role")))
+ (for-arch (entity-text "arch")))
+ (cond
- ; If role=historic, and we're not printing historic things, then
- ; don't output this element.
- ((and (equal? role "historic")
- (not %include-historic%))
- (empty-sosofo))
-
+ ;; If role=historic, and we're not printing historic things, then
+ ;; don't output this element.
+ ((and (equal? role "historic")
+ (not %include-historic%))
+ (empty-sosofo))
- ; If arch= not specified, then print unconditionally. This clause
- ; handles the majority of cases.
- ((or (equal? arch #f) (equal? arch ""))
- (next-match))
+ ;; None of the above
+ (else (next-match))))))
- ; arch= specified, see if it's equal to "all". If so, then
- ; print unconditionally. Note that this clause could be
- ; combined with the check to see if arch= wasn't specified
- ; or was empty; they have the same outcome.
- ((equal? arch "all")
- (next-match))
-
- ; arch= specified. If we're building for all architectures,
- ; then print it prepended with the set of architectures to which
- ; this element applies.
- ;
- ; XXX This doesn't work.
-; ((equal? for-arch "all")
-; (sosofo-append (literal "[") (literal arch) (literal "] ")
-; (process-children)))
-
- ; arch= specified, so we need to check to see if the specified
- ; parameter includes the architecture we're building for.
- ((string-list-match? for-arch (split-string-to-list arch))
- (next-match))
-
- ; None of the above
- (else (empty-sosofo))))))
-
; We might have some sect1 level elements where the modification times
; are significant. An example of this is the "What's New" section in
; the release notes. We enable the printing of pubdate entry in
@@ -177,6 +121,55 @@
(("netbsd") (string-append u "&" "manpath=NetBSD+&release.manpath.netbsd;"))
(("ports") (string-append u "&" "manpath=FreeBSD+&release.manpath.freebsd-ports;"))
(else (string-append u "&" "manpath=FreeBSD+&release.manpath.freebsd;")))))
+
+ ;; $paragraph$ function with arch attribute support.
+ (define ($paragraph$ #!optional (para-wrapper "P"))
+ (let ((footnotes (select-elements (descendants (current-node))
+ (normalize "footnote")))
+ (tgroup (have-ancestor? (normalize "tgroup")))
+ (arch (attribute-string (normalize "arch")))
+ (role (attribute-string (normalize "role")))
+ (arch-string (entity-text "arch"))
+ (merged-string (entity-text "merged")))
+ (make sequence
+ (make element gi: para-wrapper
+ attributes: (append
+ (if %default-quadding%
+ (list (list "ALIGN" %default-quadding%))
+ '()))
+ (make sequence
+ (cond
+ ;; If arch= not specified, then print unconditionally. This clause
+ ;; handles the majority of cases.
+ ((or (equal? arch #f)
+ (equal? arch "")
+ (equal? arch "all"))
+ (process-children))
+ (else
+ (sosofo-append
+ (make sequence
+ (literal "[")
+ (let loop ((prev (car (split-string-to-list arch)))
+ (rest (cdr (split-string-to-list arch))))
+ (make sequence
+ (literal prev)
+ (if (not (null? rest))
+ (make sequence
+ (literal ", ")
+ (loop (car rest) (cdr rest)))
+ (empty-sosofo))))
+ (literal "] ")
+ (process-children)
+ (if (and (not (null? role)) (equal? role "merged"))
+ (literal " [" merged-string "]")
+ (empty-sosofo))))))
+ (if (or %footnotes-at-end% tgroup (node-list-empty? footnotes))
+ (empty-sosofo)
+ (make element gi: "BLOCKQUOTE"
+ attributes: (list
+ (list "CLASS" "FOOTNOTES"))
+ (with-mode footnote-mode
+ (process-node-list footnotes)))))))))
]]>
(define (toc-depth nd)
==== //depot/projects/hammer/release/doc/share/sgml/release.ent#24 (text+ko) ====
@@ -1,6 +1,6 @@
<!-- -*- sgml -*-
- $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.31 2007/11/30 05:01:23 bmah Exp $
+ $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.32 2008/04/20 17:58:05 hrs Exp $
OS Release Information -->
@@ -59,3 +59,5 @@
<!ENTITY arch.sparc64 "sparc64">
<!ENTITY arch.sun4v "sun4v">
+<!-- The marker for MFCs. -->
+<!ENTITY merged "MERGED">
==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#167 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.683 2008/03/16 10:58:02 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.684 2008/04/19 07:25:57 peter Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -849,11 +849,23 @@
#if !defined(DEV_ATPIC) && defined(DEV_ISA)
#include <isa/isavar.h>
-u_int
+#include <isa/isareg.h>
+/*
+ * Return a bitmap of the current interrupt requests. This is 8259-specific
+ * and is only suitable for use at probe time.
+ * This is only here to pacify sio. It is NOT FATAL if this doesn't work.
+ * It shouldn't be here. There should probably be an APIC centric
+ * implementation in the apic driver code, if at all.
+ */
+intrmask_t
isa_irq_pending(void)
{
+ u_char irr1;
+ u_char irr2;
- return (0);
+ irr1 = inb(IO_ICU1);
+ irr2 = inb(IO_ICU2);
+ return ((irr2 << 8) | irr1);
}
#endif
==== //depot/projects/hammer/sys/amd64/conf/GENERIC#107 (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.495 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.496 2008/04/20 19:20:36 sam Exp $
cpu HAMMER
ident GENERIC
@@ -245,7 +245,6 @@
device ath # Atheros pci/cardbus NIC's
device ath_hal # Atheros HAL (Hardware Access Layer)
device ath_rate_sample # SampleRate tx rate control for ath
-device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
==== //depot/projects/hammer/sys/conf/NOTES#143 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1479 2008/04/02 16:17:19 imp Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1480 2008/04/20 19:20:37 sam Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -707,7 +707,7 @@
# according to IEEE 802.1Q. It requires `device miibus'.
# The `wlan' device provides generic code to support 802.11
# drivers, including host AP mode; it is MANDATORY for the wi,
-# ath, and awi drivers and will eventually be required by all 802.11 drivers.
+# and ath drivers and will eventually be required by all 802.11 drivers.
# The `wlan_wep', `wlan_tkip', and `wlan_ccmp' devices provide
# support for WEP, TKIP, and AES-CCMP crypto protocols optionally
# used with 802.11 devices that depend on the `wlan' module.
@@ -1744,8 +1744,6 @@
# an: Aironet 4500/4800 802.11 wireless adapters. Supports the PCMCIA,
# PCI and ISA varieties.
-# awi: Support for IEEE 802.11 PC Card devices using the AMD Am79C930 and
-# Harris (Intersil) Chipset with PCnetMobile firmware by AMD.
# bce: Broadcom NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet
# adapters.
# bfe: Broadcom BCM4401 Ethernet adapter.
@@ -1881,7 +1879,6 @@
hint.sn.0.port="0x300"
hint.sn.0.irq="10"
device an
-device awi
device cnw
device wi
device xe
==== //depot/projects/hammer/sys/conf/files#180 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1290 2008/04/16 17:24:18 rrs Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1292 2008/04/20 19:20:37 sam Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -486,9 +486,6 @@
compile-with "${NORMAL_C} -I$S/dev/ath"
dev/ath/if_ath_pci.c optional ath pci \
compile-with "${NORMAL_C} -I$S/dev/ath"
-dev/awi/am79c930.c optional awi
-dev/awi/awi.c optional awi
-dev/awi/if_awi_pccard.c optional awi pccard
dev/bce/if_bce.c optional bce
dev/bfe/if_bfe.c optional bfe
dev/bge/if_bge.c optional bge
@@ -518,7 +515,6 @@
dev/cs/if_cs_pccard.c optional cs pccard
dev/cxgb/cxgb_main.c optional cxgb pci
dev/cxgb/cxgb_offload.c optional cxgb pci
-dev/cxgb/cxgb_l2t.c optional cxgb pci
dev/cxgb/cxgb_lro.c optional cxgb pci
dev/cxgb/cxgb_sge.c optional cxgb pci
dev/cxgb/cxgb_multiq.c optional cxgb pci
==== //depot/projects/hammer/sys/conf/files.pc98#66 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801/PC-9821
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.360 2008/04/13 06:18:34 nyan Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.361 2008/04/19 08:18:47 nyan Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -336,6 +336,7 @@
pc98/cbus/nmi.c standard
pc98/cbus/olpt.c optional olpt
pc98/cbus/pckbd.c optional pckbd
+pc98/cbus/pcrtc.c standard
pc98/cbus/pmc.c optional pmc
pc98/cbus/scgdcrndr.c optional sc gdc
pc98/cbus/scterm-sck.c optional sc
==== //depot/projects/hammer/sys/contrib/pf/net/pf.c#37 (text+ko) ====
@@ -40,7 +40,7 @@
#include "opt_inet6.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.52 2008/04/17 21:38:15 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.53 2008/04/20 00:21:54 rwatson Exp $");
#endif
#ifdef __FreeBSD__
@@ -2915,7 +2915,7 @@
pd->lookup.pid = NO_PID; /* XXX: revisit */
#ifdef __FreeBSD__
if (inp_arg != NULL) {
- INP_WLOCK_ASSERT(inp_arg);
+ INP_LOCK_ASSERT(inp_arg);
if (inp_arg->inp_socket) {
pd->lookup.uid = inp_arg->inp_socket->so_cred->cr_uid;
pd->lookup.gid =
@@ -3018,16 +3018,15 @@
return (-1);
}
#ifdef __FreeBSD__
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
+ INP_INFO_RUNLOCK(pi);
if ((inp->inp_socket == NULL) || (inp->inp_socket->so_cred == NULL)) {
- INP_WUNLOCK(inp);
- INP_INFO_RUNLOCK(pi);
+ INP_RUNLOCK(inp);
return (-1);
}
pd->lookup.uid = inp->inp_socket->so_cred->cr_uid;
pd->lookup.gid = inp->inp_socket->so_cred->cr_groups[0];
- INP_WUNLOCK(inp);
- INP_INFO_RUNLOCK(pi);
+ INP_RUNLOCK(inp);
#else
pd->lookup.uid = inp->inp_socket->so_euid;
pd->lookup.gid = inp->inp_socket->so_egid;
==== //depot/projects/hammer/sys/dev/ata/ata-all.c#68 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.286 2008/04/18 15:15:04 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.287 2008/04/20 17:45:32 bz Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -366,12 +366,13 @@
switch (cmd) {
case IOCATAGMAXCHANNEL:
+ /* In case we have channel 0..n this will return n+1. */
*value = devclass_get_maxunit(ata_devclass);
error = 0;
break;
case IOCATAREINIT:
- if (*value > devclass_get_maxunit(ata_devclass) ||
+ if (*value >= devclass_get_maxunit(ata_devclass) ||
!(device = devclass_get_device(ata_devclass, *value)))
return ENXIO;
error = ata_reinit(device);
@@ -379,7 +380,7 @@
break;
case IOCATAATTACH:
- if (*value > devclass_get_maxunit(ata_devclass) ||
+ if (*value >= devclass_get_maxunit(ata_devclass) ||
!(device = devclass_get_device(ata_devclass, *value)))
return ENXIO;
/* XXX SOS should enable channel HW on controller */
@@ -387,7 +388,7 @@
break;
case IOCATADETACH:
- if (*value > devclass_get_maxunit(ata_devclass) ||
+ if (*value >= devclass_get_maxunit(ata_devclass) ||
!(device = devclass_get_device(ata_devclass, *value)))
return ENXIO;
error = ata_detach(device);
@@ -395,7 +396,7 @@
break;
case IOCATADEVICES:
- if (devices->channel > devclass_get_maxunit(ata_devclass) ||
+ if (devices->channel >= devclass_get_maxunit(ata_devclass) ||
!(device = devclass_get_device(ata_devclass, devices->channel)))
return ENXIO;
bzero(devices->name[0], 32);
==== //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#19 (text+ko) ====
@@ -1,6 +1,6 @@
/**************************************************************************
-Copyright (c) 2007, Chelsio Inc.
+Copyright (c) 2007-2008, Chelsio Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-2. Neither the name of the Chelsio Corporation nor the names of its
+ 2. Neither the name of the Chelsio Corporation nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.53 2008/03/20 20:52:37 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.54 2008/04/19 03:22:41 kmacy Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -723,9 +723,10 @@
printf("cxgb_free: DEVMAP_BIT not set\n");
} else
printf("not offloading set\n");
-
+#ifdef notyet
if (sc->flags & CXGB_OFLD_INIT)
cxgb_offload_deactivate(sc);
+#endif
free(sc->filters, M_DEVBUF);
t3_sge_free(sc);
@@ -1732,9 +1733,6 @@
t3_tp_set_offload_mode(adapter, 1);
tdev->lldev = pi->ifp;
- err = cxgb_offload_activate(adapter);
- if (err)
- goto out;
init_port_mtus(adapter);
t3_load_mtus(adapter, adapter->params.mtus, adapter->params.a_wnd,
@@ -1743,10 +1741,6 @@
adapter->port[0].ifp->if_mtu : 0xffff);
init_smt(adapter);
- /* Call back all registered clients */
- cxgb_add_clients(tdev);
-
-out:
/* restore them in case the offload module has changed them */
if (err) {
t3_tp_set_offload_mode(adapter, 0);
@@ -1764,8 +1758,6 @@
if (!isset(&adapter->open_device_map, OFFLOAD_DEVMAP_BIT))
return (0);
- /* Call back all registered clients */
- cxgb_remove_clients(tdev);
tdev->lldev = NULL;
cxgb_set_dummy_ops(tdev);
t3_tp_set_offload_mode(adapter, 0);
==== //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.c#9 (text+ko) ====
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_offload.c,v 1.12 2008/02/23 06:19:16 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_offload.c,v 1.14 2008/04/19 03:43:06 kmacy Exp $");
#include <sys/param.h>
#include <sys/systm.h>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list