Date: Fri, 27 Jun 2003 12:26:10 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 33751 for review Message-ID: <200306271926.h5RJQAMS070061@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=33751 Change 33751 by peter@peter_hammer on 2003/06/27 12:25:25 IFC @33750 Affected files ... .. //depot/projects/hammer/lib/Makefile#20 integrate .. //depot/projects/hammer/lib/libc/gen/getpwent.c#7 integrate .. //depot/projects/hammer/lib/libc/sys/uuidgen.2#4 integrate .. //depot/projects/hammer/lib/libpthread/arch/ia64/ia64/context.S#2 integrate .. //depot/projects/hammer/lib/libthr/Makefile#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/Makefile#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/amd64/Makefile#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/Makefile#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/amd64/Makefile#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/amd64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/Makefile#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#8 integrate .. //depot/projects/hammer/release/doc/share/examples/Makefile.relnotesng#5 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#10 integrate .. //depot/projects/hammer/share/man/man4/ath.4#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#13 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#10 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohcivar.h#4 integrate .. //depot/projects/hammer/sys/dev/wi/if_wavelan_ieee.h#5 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#12 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#10 integrate .. //depot/projects/hammer/sys/ia64/ia64/busdma_machdep.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/hammer/sys/pci/agp_via.c#6 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#7 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#14 integrate .. //depot/projects/hammer/usr.bin/ar/Makefile#2 delete .. //depot/projects/hammer/usr.bin/ar/append.c#2 delete .. //depot/projects/hammer/usr.bin/ar/ar.1#2 delete .. //depot/projects/hammer/usr.bin/ar/ar.1aout#2 delete .. //depot/projects/hammer/usr.bin/ar/ar.5#2 delete .. //depot/projects/hammer/usr.bin/ar/ar.c#2 delete .. //depot/projects/hammer/usr.bin/ar/archive.c#2 delete .. //depot/projects/hammer/usr.bin/ar/archive.h#2 delete .. //depot/projects/hammer/usr.bin/ar/contents.c#2 delete .. //depot/projects/hammer/usr.bin/ar/delete.c#2 delete .. //depot/projects/hammer/usr.bin/ar/extern.h#2 delete .. //depot/projects/hammer/usr.bin/ar/extract.c#2 delete .. //depot/projects/hammer/usr.bin/ar/misc.c#2 delete .. //depot/projects/hammer/usr.bin/ar/move.c#2 delete .. //depot/projects/hammer/usr.bin/ar/pathnames.h#2 delete .. //depot/projects/hammer/usr.bin/ar/print.c#2 delete .. //depot/projects/hammer/usr.bin/ar/replace.c#2 delete .. //depot/projects/hammer/usr.bin/nm/Makefile#2 delete .. //depot/projects/hammer/usr.bin/nm/nm.1#3 delete .. //depot/projects/hammer/usr.bin/nm/nm.1aout#3 delete .. //depot/projects/hammer/usr.bin/nm/nm.c#3 delete .. //depot/projects/hammer/usr.bin/size/Makefile#2 delete .. //depot/projects/hammer/usr.bin/size/size.1#2 delete .. //depot/projects/hammer/usr.bin/size/size.1aout#2 delete .. //depot/projects/hammer/usr.bin/size/size.c#2 delete .. //depot/projects/hammer/usr.bin/strings/Makefile#2 delete .. //depot/projects/hammer/usr.bin/strings/strings.1#2 delete .. //depot/projects/hammer/usr.bin/strings/strings.1aout#2 delete .. //depot/projects/hammer/usr.bin/strings/strings.c#2 delete .. //depot/projects/hammer/usr.bin/strip/Makefile#2 delete .. //depot/projects/hammer/usr.bin/strip/strip.1#2 delete .. //depot/projects/hammer/usr.bin/strip/strip.1aout#2 delete .. //depot/projects/hammer/usr.bin/strip/strip.c#2 delete Differences ... ==== //depot/projects/hammer/lib/Makefile#20 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.161 2003/06/26 03:48:23 peter Exp $ +# $FreeBSD: src/lib/Makefile,v 1.162 2003/06/27 07:41:51 marcel Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -40,9 +40,12 @@ _csu=csu .endif +# libc_r is obsolete on ia64. +.if ${MACHINE_ARCH} != "ia64" .if !defined(NOLIBC_R) _libc_r= libc_r .endif +.endif .if !defined(NO_BIND) _libbind= libbind @@ -69,6 +72,9 @@ .endif .if ${MACHINE_ARCH} == "ia64" +.if !defined(NOLIBPTHREAD) +_libpthread= libpthread +.endif .if !defined(NOLIBTHR) _libthr= libthr .endif ==== //depot/projects/hammer/lib/libc/gen/getpwent.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.81 2003/05/01 19:03:13 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.82 2003/06/27 03:37:44 jwd Exp $"); #include "namespace.h" #include <sys/param.h> @@ -938,14 +938,15 @@ nis_map(char *domain, enum nss_lookup_type how, char *buffer, size_t bufsize, int *master) { - int rv, order; + int rv; + char *outname; *master = 0; if (geteuid() == 0) { if (snprintf(buffer, bufsize, "master.passwd.by%s", (how == nss_lt_id) ? "uid" : "name") >= bufsize) return (NS_UNAVAIL); - rv = yp_order(domain, buffer, &order); + rv = yp_master(domain, buffer, &outname); if (rv == 0) { *master = 1; return (NS_SUCCESS); @@ -954,7 +955,7 @@ if (snprintf(buffer, bufsize, "passwd.by%s", (how == nss_lt_id) ? "uid" : "name") >= bufsize) return (NS_UNAVAIL); - rv = yp_order(domain, buffer, &order); + rv = yp_master(domain, buffer, &outname); if (rv == 0) return (NS_SUCCESS); return (NS_UNAVAIL); ==== //depot/projects/hammer/lib/libc/sys/uuidgen.2#4 (text+ko) ==== @@ -22,7 +22,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/libc/sys/uuidgen.2,v 1.6 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/uuidgen.2,v 1.7 2003/06/27 13:41:29 yar Exp $ .\" .Dd May 26, 2002 .Dt UUIDGEN 2 @@ -83,7 +83,7 @@ The least significant 16 bits of the most significant 28 bits of the 60-bit timestamp. This field is stored in the native byte-order. -.It Va time_hi_and_reserved +.It Va time_hi_and_version The most significant 12 bits of the 60-bit timestamp multiplexed with a 4-bit version number. The version number is stored in the most significant 4 bits of the 16-bit ==== //depot/projects/hammer/lib/libpthread/arch/ia64/ia64/context.S#2 (text+ko) ==== @@ -25,16 +25,301 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libpthread/arch/ia64/ia64/context.S,v 1.1 2003/06/26 05:40:15 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/arch/ia64/ia64/context.S,v 1.2 2003/06/27 06:15:13 marcel Exp $"); + +#define SIZEOF_SPECIAL (18*8) /* * int _ia64_restore_context(mcontext_t *mc, intptr_t val, intptr_t *loc); */ ENTRY(_ia64_restore_context, 3) +{ .mmi + invala + mov ar.rsc=0xc + add r32=16,r32 + ;; +} +{ .mmi + loadrs + ld8 r12=[r32] // sp + add r31=8,r32 + ;; +} +{ .mii + ld8 r16=[r31],16 // unat (before) + add r30=16,r32 + add r14=SIZEOF_SPECIAL,r32 + ;; +} +{ .mmi + ld8 r17=[r30],16 // rp + ld8 r18=[r31],16 // pr + mov r2=r33 + ;; +} +{ .mmi + ld8 r19=[r30],16 // pfs + ld8 r20=[r31],24 // bspstore + mov rp=r17 + ;; +} +{ .mmi + ld8 r21=[r30],24 // rnat + ld8 r13=[r31],16 // tp + mov pr=r18,0x1fffe + ;; +} +{ .mmi + ld8 r22=[r30],16 // rsc + ld8 r23=[r31],16 // fpsr + mov r3=r34 + ;; +} +{ .mmi + ld8 r17=[r14],8 // unat (after) + mov ar.bspstore=r20 + cmp.ne p15,p0=r0,r3 + ;; +} +{ .mmi + mov ar.rnat=r21 + mov ar.unat=r17 + add r15=8,r14 + ;; +} +{ .mmi + ld8.fill r4=[r14],16 // r4 + ld8.fill r5=[r15],16 // r5 + mov ar.pfs=r19 + ;; +} +{ .mmi + ld8.fill r6=[r14],16 // r6 + ld8.fill r7=[r15],16 // r7 + nop 0 + ;; +} +{ .mmi + mov ar.unat=r16 + mov ar.rsc=r22 + nop 0 +} +{ .mmi + ld8 r17=[r14],16 // b1 + ld8 r18=[r15],16 // b2 + nop 0 + ;; +} +{ .mmi + ld8 r19=[r14],16 // b3 + ld8 r20=[r15],16 // b4 + mov b1=r17 + ;; +} +{ .mmi + ld8 r16=[r14],24 // b5 + ld8 r17=[r15],32 // lc + mov b2=r18 + ;; +} +{ .mmi + ldf.fill f2=[r14],32 + ldf.fill f3=[r15],32 + mov b3=r19 + ;; +} +{ .mmi + ldf.fill f4=[r14],32 + ldf.fill f5=[r15],32 + mov b4=r20 + ;; +} +{ .mmi + ldf.fill f16=[r14],32 + ldf.fill f17=[r15],32 + mov b5=r16 + ;; +} +{ .mmi + ldf.fill f18=[r14],32 + ldf.fill f19=[r15],32 + mov ar.lc=r17 + ;; +} + ldf.fill f20=[r14],32 + ldf.fill f21=[r15],32 + ;; + ldf.fill f22=[r14],32 + ldf.fill f23=[r15],32 + ;; + ldf.fill f24=[r14],32 + ldf.fill f25=[r15],32 + ;; + ldf.fill f26=[r14],32 + ldf.fill f27=[r15],32 + ;; + ldf.fill f28=[r14],32 + ldf.fill f29=[r15],32 + ;; +{ .mmi + ldf.fill f30=[r14] + ldf.fill f31=[r15] + add r8=1,r0 + ;; +} +{ .mmb +(p15) st8 [r3]=r2 + mov ar.fpsr=r23 + br.ret.sptk rp + ;; +} END(_ia64_restore_context) /* * int _ia64_save_context(mcontext_t *mc); */ ENTRY(_ia64_save_context, 1) +{ .mmi + mov r14=ar.rsc + mov r15=ar.fpsr + add r31=8,r32 + ;; +} +{ .mmi + st8 [r32]=r0,16 + st8 [r31]=r0,16 + nop 0 + ;; +} +{ .mmi + mov ar.rsc=0xc + mov r16=ar.unat + nop 0 + ;; +} +{ .mmi + flushrs + st8 [r32]=sp,16 // sp + mov r17=rp + ;; +} +{ .mmi + st8 [r31]=r16,16 // unat (before) + st8 [r32]=r17,16 // rp + mov r16=pr + ;; +} +{ .mmi + st8 [r31]=r16,16 // pr + mov r17=ar.bsp + mov r16=ar.pfs + ;; +} +{ .mmi + st8 [r32]=r16,16 // pfs + st8 [r31]=r17,16 // bspstore + nop 0 + ;; +} +{ .mmi + mov r16=ar.rnat + mov ar.rsc=r14 + add r30=SIZEOF_SPECIAL-(6*8),r32 + ;; +} +{ .mmi + st8 [r32]=r16,16 // rnat + st8 [r31]=r0,16 // __spare + nop 0 + ;; +} +{ .mmi + st8 [r32]=r13,16 // tp + st8 [r31]=r14,16 // rsc + mov r16=b1 + ;; +} +{ .mmi + st8 [r32]=r15,10*8 // fpr + st8 [r31]=r0,8*8 // psr + nop 0 + ;; +} + /* callee_saved */ +{ .mmi + .mem.offset 8,0 + st8.spill [r31]=r4,16 // r4 + .mem.offset 16,0 + st8.spill [r32]=r5,16 // r5 + mov r17=b2 + ;; +} +{ .mmi + .mem.offset 24,0 + st8.spill [r31]=r6,16 // r6 + .mem.offset 32,0 + st8.spill [r32]=r7,16 // r7 + mov r18=b3 + ;; +} +{ .mmi + st8 [r31]=r16,16 // b1 + mov r16=ar.unat + mov r19=b4 + ;; +} +{ .mmi + st8 [r30]=r16 // unat (after) + st8 [r32]=r17,16 // b2 + mov r16=b5 + ;; +} +{ .mmi + st8 [r31]=r18,16 // b3 + st8 [r32]=r19,16 // b4 + mov r17=ar.lc + ;; +} + st8 [r31]=r16,16 // b5 + st8 [r32]=r17,16 // lc + ;; + st8 [r31]=r0,24 // __spare + stf.spill [r32]=f2,32 + ;; + stf.spill [r31]=f3,32 + stf.spill [r32]=f4,32 + ;; + stf.spill [r31]=f5,32 + stf.spill [r32]=f16,32 + ;; + stf.spill [r31]=f17,32 + stf.spill [r32]=f18,32 + ;; + stf.spill [r31]=f19,32 + stf.spill [r32]=f20,32 + ;; + stf.spill [r31]=f21,32 + stf.spill [r32]=f22,32 + ;; + stf.spill [r31]=f23,32 + stf.spill [r32]=f24,32 + ;; + stf.spill [r31]=f25,32 + stf.spill [r32]=f26,32 + ;; + stf.spill [r31]=f27,32 + stf.spill [r32]=f28,32 + ;; +{ .mmi + stf.spill [r31]=f29,32 + stf.spill [r32]=f30 + add r8=0,r0 + ;; +} +{ .mmb + stf.spill [r31]=f31 + mf + br.ret.sptk rp + ;; +} END(_ia64_save_context) ==== //depot/projects/hammer/lib/libthr/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthr/Makefile,v 1.3 2003/05/23 09:48:20 mtm Exp $ +# $FreeBSD: src/lib/libthr/Makefile,v 1.4 2003/06/27 18:07:47 marcel 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 @@ -26,4 +26,16 @@ .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" +.if !defined(NOLIBC_R) +.if ${MACHINE_ARCH} == "ia64" +SYMLINKS+=libthr.a ${LIBDIR}/libc_r.a +.if !defined(NOPIC) +SYMLINKS+=libthr.so ${SHLIBDIR}/libc_r.so +.endif +.if !defined(NOPROFILE) +SYMLINKS+=libthr_p.a ${LIBDIR}/libc_r_p.a +.endif +.endif +.endif + .include <bsd.lib.mk> ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/Makefile#3 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.5 2002/11/08 18:36:04 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.6 2003/06/27 03:50:35 bmah Exp $ RELN_ROOT?= ${.CURDIR}/../.. SUBDIR = alpha +SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 (text+ko) ==== @@ -1,5 +1,5 @@ <!-- -*- sgml -*- --> -<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent,v 1.4 2002/05/31 18:00:38 nyan Exp $ --> +<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent,v 1.5 2003/06/27 03:50:35 bmah Exp $ --> <!-- Text constants which probably don't need to be changed.--> @@ -8,6 +8,7 @@ <!ENTITY artheader SYSTEM "../common/artheader.sgml"> <!ENTITY sect.intro SYSTEM "../common/intro.sgml"> <!ENTITY sect.proc.alpha SYSTEM "../alpha/proc-alpha.sgml"> +<!ENTITY sect.proc.amd64 SYSTEM "../amd64/proc-amd64.sgml"> <!ENTITY sect.proc.i386 SYSTEM "../i386/proc-i386.sgml"> <!ENTITY sect.proc.ia64 SYSTEM "../ia64/proc-ia64.sgml"> <!ENTITY sect.proc.pc98 SYSTEM "../pc98/proc-pc98.sgml"> ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/Makefile#3 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.5 2002/11/08 18:36:04 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.6 2003/06/27 03:50:36 bmah Exp $ RELN_ROOT?= ${.CURDIR}/../.. SUBDIR = alpha +SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/Makefile#3 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.5 2002/11/08 18:36:04 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.6 2003/06/27 03:50:36 bmah Exp $ RELN_ROOT?= ${.CURDIR}/../.. SUBDIR = alpha +SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 ==== //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#8 (text+ko) ==== @@ -1,9 +1,9 @@ <!-- FreeBSD Japanese Documentation Project - $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.87 2003/06/11 21:08:52 hrs Exp $ + $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.88 2003/06/27 17:15:20 hrs Exp $ - Original revision: 1.575 + Original revision: 1.580 --> <articleinfo> @@ -11,7 +11,7 @@ <corpauthor>FreeBSD プロジェクト</corpauthor> - <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.87 2003/06/11 21:08:52 hrs Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.88 2003/06/27 17:15:20 hrs Exp $</pubdate> <copyright> <year>2000</year> @@ -138,7 +138,9 @@ <sect2 id="kernel"> <title>カーネルの変更点</title> - <para></para> + <para>カーネルにソフトウェアウォッチドッグ機能が実装されました。 + 詳しくは &man.watchdog.4; と + &man.watchdogd.8; をご覧ください。</para> <!-- Above this line, sort kernel changes by manpage/keyword--> @@ -149,6 +151,9 @@ 常に PCI 割り込みが使われるようになりました。 これにより、今まで使用できなかった (特にラップトップの) PCI カードが使用できるようになっています。</para> + + <para arch="i386">PAE 機能をある特定の量のメモリを搭載しているマシンで有効にした場合に、 + カーネルがパニックさせる原因となる整数演算のオーバフローが修正されました。</para> </sect3> <sect3 id="boot"> @@ -163,7 +168,15 @@ <sect3 id="net-if"> <title>ネットワークインターフェイスの対応状況</title> - <para></para> + <para>&man.ath.4; および &man.ath.hal.4; ドライバが新しく追加されました。 + これは、AR5210, AR5211, AR5212 ベースの + 802.11a/b/g デバイスに対応しています。</para> + + <para>&man.bge.4; にあったバグが修正され、 + 10Mbps で正常に動作するようになりました。</para> + + <para>802.11 対応レイヤが、 + 拡張や新機能の追加が可能なように書き直されました。</para> </sect3> <sect3 id="net-proto"> @@ -187,6 +200,12 @@ <filename>geom_vol_ffs</filename> といった、さまざまある &man.geom.4; モジュールが、 カーネルモジュールとして読み込み可能になりました。</para> + + <para>マルチパスストレージデバイスの検出や、アクセスパス選択を可能にする + <literal>GEOM_FOX</literal> モジュールが追加されました。</para> + + <para arch="i386">松下 CR-562 および CR-563 CD ドライブに対応した + &man.matcd.4; ドライバが、再び使えるようになりました。</para> </sect3> <sect3 id="fs"> @@ -210,6 +229,8 @@ 設定にはそれぞれ、<option>-u</option>, <option>-g</option>, <option>-G</option> オプションを使います。</para> + <para>devfs が必須となったため、dev_db ユーティリティは削除されました。</para> + <para><filename>libcipher</filename> DES 暗号ライブラリが削除されました。 これらの機能はすべて <filename>libcrypto</filename> ライブラリで @@ -221,18 +242,36 @@ <para arch="i386,ia64"><filename>libthr</filename> 1:1 スレッドライブラリがデフォルトで構築されるようになりました。</para> + <para>&man.locale.1; ユーティリティが再実装され、POSIX + 標準に準拠しました。</para> + <para>ゲストログインに対応する &man.pam.guest.8; PAM モジュールが追加されました。 これは pam_ftp(8) モジュールを置き換えるものです。</para> + + <para>&man.ps.1; に、各プロセスのカーネルスレッドを表示する + <option>-H</option> オプションが追加されました。</para> </sect2> <sect2 id="contrib"> <title>寄贈ソフトウェア</title> + <para><application>BIND</application> がバージョン 8.3.4 + から、バージョン 8.3.6 に更新されました。</para> + + <para><application>lukemftp</application> がバージョン + 1.6beta2 から、NetBSD の 2003 年 6 月 15 + 日時点のスナップショットに更新されました。</para> + <para><application>OpenPAM</application> が - <quote>Digitalis</quote> リリースに更新されました。</para> + <quote>Dianthus</quote> リリースに更新されました。</para> + + <para><application>texinfo</application> がバージョン 4.5 + から、バージョン 4.6 に更新されました。 + &merged;</para> </sect2> + <sect2 id="ports"> <title>Ports/Packages Collection インフラストラクチャ</title> ==== //depot/projects/hammer/release/doc/share/examples/Makefile.relnotesng#5 (text+ko) ==== @@ -1,12 +1,12 @@ # -*- makefile -*- # -# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.8 2002/11/13 17:28:44 bmah Exp $ +# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.9 2003/06/27 03:50:36 bmah Exp $ # # Sample makefile for rendering and uploading RELNOTESng files outside # the build tree. # -ARCHS= alpha ia64 i386 pc98 sparc64 +ARCHS= alpha amd64 ia64 i386 pc98 sparc64 MULTITEXTS= installation relnotes hardware UNITEXTS= readme errata early-adopter ==== //depot/projects/hammer/sbin/ipfw/ipfw2.c#10 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.28 2003/06/23 22:32:14 luigi Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.29 2003/06/27 17:18:14 luigi Exp $ */ #include <sys/param.h> @@ -1225,7 +1225,7 @@ case O_VERREVPATH: printf(" verrevpath"); break; - + case O_KEEP_STATE: printf(" keep-state"); break; @@ -1277,9 +1277,7 @@ if (!d->expire && !(d->dyn_type == O_LIMIT_PARENT)) return; } - bcopy(&d->rule, &rulenum, sizeof(rulenum)); - printf("%05d %*llu %*llu (%ds)", rulenum, pcwidth, align_uint64(&d->pcnt), bcwidth, align_uint64(&d->bcnt), d->expire); @@ -1519,7 +1517,6 @@ bcopy(&((struct ip_fw *)data)->next_rule, &set_disable, sizeof(set_disable)); - for (i = 0, msg = "disable" ; i < 31; i++) if ( (set_disable & (1<<i))) { printf("%s %d", msg, i); @@ -3272,7 +3269,7 @@ case TOK_VERREVPATH: fill_cmd(cmd, O_VERREVPATH, 0, 0); break; - + default: errx(EX_USAGE, "unrecognised option [%d] %s\n", i, s); } ==== //depot/projects/hammer/share/man/man4/ath.4#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGES. .\" -.\" $FreeBSD: src/share/man/man4/ath.4,v 1.1 2003/06/23 20:34:28 sam Exp $ +.\" $FreeBSD: src/share/man/man4/ath.4,v 1.2 2003/06/26 23:48:56 sam Exp $ .\"/ -.Dd June 23, 2003 +.Dd June 26, 2003 .Dt ATH 4 .Os .Sh NAME @@ -70,7 +70,7 @@ ``rate control'' algorithm employed by the driver. All chips support WEP encryption. AR5211 and AR5212 support the AES, TKIP, and Michael cryptographic -operations required for WPA but at this time the driver does support them. +operations required for WPA but at this time the driver does not support them. To enable encryption, use .Xr ifconfig 8 as shown below. ==== //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.38 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.39 2003/06/27 08:31:47 scottl Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -94,6 +94,7 @@ vm_offset_t busaddress; /* address in bus space */ bus_dmamap_callback_t *callback; void *callback_arg; + struct mtx *callback_mtx; void *sgmaphandle; /* handle into sgmap */ STAILQ_ENTRY(bus_dmamap) links; }; @@ -931,8 +932,12 @@ while ((map = STAILQ_FIRST(&bounce_map_callbacklist)) != NULL) { STAILQ_REMOVE_HEAD(&bounce_map_callbacklist, links); mtx_unlock(&bounce_lock); + if (map->callback_mtx != NULL) + mtx_lock(map->callback_mtx); bus_dmamap_load(map->dmat, map, map->buf, map->buflen, map->callback, map->callback_arg, /*flags*/0); + if (map->callback_mtx != NULL) + mtx_unlock(map->callback_mtx); mtx_lock(&bounce_lock); } mtx_unlock(&bounce_lock); ==== //depot/projects/hammer/sys/dev/ata/ata-card.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-card.c,v 1.14 2003/06/17 12:33:53 imp Exp $ + * $FreeBSD: src/sys/dev/ata/ata-card.c,v 1.15 2003/06/27 03:25:43 imp Exp $ */ #include <sys/param.h> @@ -131,10 +131,6 @@ start + ATA_ALTOFFSET, ATA_ALTIOSIZE); } } - else { - bus_release_resource(dev, SYS_RES_IOPORT, rid, io); - return ENXIO; - } /* allocate the altport range */ rid = ATA_ALTADDR_RID; ==== //depot/projects/hammer/sys/dev/ata/ata-chipset.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.30 2003/06/19 15:11:04 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.31 2003/06/27 10:11:54 grehan Exp $ */ #include "opt_ata.h" #include <sys/param.h> @@ -1509,6 +1509,12 @@ } else ctlr->setmode = ata_cmd_setmode; + + if ((pci_read_config(dev, 0x51, 1) & 0x08) != 0x08) { + device_printf(dev, "secondary channel disabled\n"); + ctlr->channels = 1; + } + return 0; } ==== //depot/projects/hammer/sys/dev/firewire/fwohci.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.52 2003/06/15 04:09:26 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.53 2003/06/27 00:27:33 simokawa Exp $ * */ @@ -144,7 +144,6 @@ static int fwohci_itxbuf_enable __P((struct firewire_comm *, int)); static int fwohci_itx_disable __P((struct firewire_comm *, int)); static void fwohci_timeout __P((void *)); -static void fwohci_poll __P((struct firewire_comm *, int, int)); static void fwohci_set_intr __P((struct firewire_comm *, int)); static int fwohci_add_rx_buf __P((struct fwohci_dbch *, struct fwohcidb_tr *, int, struct fwdma_alloc *)); @@ -2010,7 +2009,7 @@ #endif } -static void +void fwohci_poll(struct firewire_comm *fc, int quick, int count) { int s; ==== //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.23 2003/06/04 04:26:14 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.24 2003/06/27 00:27:33 simokawa Exp $ */ #define BOUNCE_BUFFER_TEST 0 @@ -317,8 +317,9 @@ * Clear the bus reset event flag to start transactions even when * interrupt is disabled during the boot process. */ + DELAY(250); /* 2 cycles */ s = splfw(); - fwohci_intr((void *)sc); + fwohci_poll((void *)sc, 0, -1); splx(s); return 0; ==== //depot/projects/hammer/sys/dev/firewire/fwohcivar.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohcivar.h,v 1.8 2003/04/17 03:38:02 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohcivar.h,v 1.9 2003/06/27 00:27:33 simokawa Exp $ * */ @@ -84,6 +84,7 @@ void fwohci_intr __P((void *arg)); int fwohci_init __P((struct fwohci_softc *, device_t)); +void fwohci_poll __P((struct firewire_comm *, int, int)); void fwohci_reset __P((struct fwohci_softc *, device_t)); int fwohci_detach __P((struct fwohci_softc *, device_t)); int fwohci_resume __P((struct fwohci_softc *, device_t)); ==== //depot/projects/hammer/sys/dev/wi/if_wavelan_ieee.h#5 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/wi/if_wavelan_ieee.h,v 1.17 2003/01/15 20:11:31 sam Exp $ + * $FreeBSD: src/sys/dev/wi/if_wavelan_ieee.h,v 1.18 2003/06/27 00:49:04 sam Exp $ */ #ifndef _IF_WAVELAN_IEEE_H @@ -466,9 +466,9 @@ u_int8_t wi_src_addr[6]; u_int16_t wi_len; }; -#define WI_DATA_HDRLEN WI_802_11_OFFSET -#define WI_MGMT_HDRLEN WI_802_11_OFFSET_RAW -#define WI_CTL_HDRLEN WI_802_11_OFFSET_RAW +#define WI_DATA_HDRLEN 0x44 +#define WI_MGMT_HDRLEN 0x3C +#define WI_CTL_HDRLEN 0x3C /* ==== //depot/projects/hammer/sys/dev/wi/if_wi.c#12 (text+ko) ==== @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.142 2003/06/13 00:40:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.143 2003/06/27 00:49:04 sam Exp $"); #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -145,7 +145,7 @@ static int wi_newstate(void *, enum ieee80211_state); -static int wi_scan_ap(struct wi_softc *); +static int wi_scan_ap(struct wi_softc *, u_int16_t, u_int16_t); static void wi_scan_result(struct wi_softc *, int, int); static void wi_dump_pkt(struct wi_frame *, struct ieee80211_node *, int rssi); @@ -1297,6 +1297,89 @@ } static void +wi_rx_monitor(struct wi_softc *sc, int fid) +{ + struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = &ic->ic_if; + struct wi_frame *rx_frame; + struct mbuf *m; + int datlen, hdrlen; + + /* first allocate mbuf for packet storage */ + m = m_getcl(M_DONTWAIT, MT_DATA, 0); + if (m == NULL) { >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306271926.h5RJQAMS070061>