From owner-p4-projects@FreeBSD.ORG Tue Apr 22 04:19:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC8941065671; Tue, 22 Apr 2008 04:19:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA5B9106566C for ; Tue, 22 Apr 2008 04:19:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9E7A18FC19 for ; Tue, 22 Apr 2008 04:19:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3M4JK8m083339 for ; Tue, 22 Apr 2008 04:19:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3M4JKSf083337 for perforce@freebsd.org; Tue, 22 Apr 2008 04:19:20 GMT (envelope-from jb@freebsd.org) Date: Tue, 22 Apr 2008 04:19:20 GMT Message-Id: <200804220419.m3M4JKSf083337@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 140382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2008 04:19:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=140382 Change 140382 by jb@freebsd3 on 2008/04/22 04:18:59 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#69 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#12 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml#12 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#27 integrate .. //depot/projects/dtrace/src/contrib/gcc/gthr-posix.h#5 integrate .. //depot/projects/dtrace/src/contrib/netcat/FREEBSD-upgrade#4 integrate .. //depot/projects/dtrace/src/contrib/netcat/FREEBSD-vendor#1 branch .. //depot/projects/dtrace/src/contrib/netcat/atomicio.c#4 integrate .. //depot/projects/dtrace/src/contrib/netcat/atomicio.h#3 integrate .. //depot/projects/dtrace/src/contrib/netcat/nc.1#6 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#32 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate .. //depot/projects/dtrace/src/release/doc/share/misc/dev.archlist.txt#18 integrate .. //depot/projects/dtrace/src/share/man/man4/textdump.4#3 integrate .. //depot/projects/dtrace/src/sys/arm/conf/AVILA#10 integrate .. //depot/projects/dtrace/src/sys/arm/conf/BWCT#4 integrate .. //depot/projects/dtrace/src/sys/arm/conf/CRB#4 integrate .. //depot/projects/dtrace/src/sys/arm/conf/EP80219#7 integrate .. //depot/projects/dtrace/src/sys/arm/conf/HL200#5 integrate .. //depot/projects/dtrace/src/sys/arm/conf/IQ31244#9 integrate .. //depot/projects/dtrace/src/sys/arm/conf/KB920X#12 integrate .. //depot/projects/dtrace/src/sys/arm/conf/SIMICS#9 integrate .. //depot/projects/dtrace/src/sys/arm/conf/SKYEYE#9 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_misc.c#12 integrate .. //depot/projects/dtrace/src/sys/conf/files#85 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#29 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#34 integrate .. //depot/projects/dtrace/src/sys/conf/files.pc98#20 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#28 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#16 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-queue.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/k8temp/k8temp.c#3 integrate .. //depot/projects/dtrace/src/sys/ia64/conf/DEFAULTS#14 integrate .. //depot/projects/dtrace/src/sys/kern/kern_linker.c#33 integrate .. //depot/projects/dtrace/src/sys/mips/conf/ADM5120#2 integrate .. //depot/projects/dtrace/src/sys/mips/conf/IDT#3 integrate .. //depot/projects/dtrace/src/sys/mips/conf/MALTA#2 integrate .. //depot/projects/dtrace/src/sys/mips/conf/QEMU#2 integrate .. //depot/projects/dtrace/src/sys/mips/conf/SENTRY5#3 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_divert.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet6/icmp6.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet6/raw_ip6.c#11 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/clock.c#4 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/nexus.c#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/conf/DEFAULTS#10 integrate .. //depot/projects/dtrace/src/sys/powerpc/conf/MPC85XX#3 integrate .. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#21 integrate .. //depot/projects/dtrace/src/sys/sparc64/conf/NOTES#9 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/DEFAULTS#10 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/NOTES#9 integrate .. //depot/projects/dtrace/src/tools/tools/nanobsd/Files/root/save_cfg#1 branch .. //depot/projects/dtrace/src/usr.bin/procstat/procstat.1#3 integrate .. //depot/projects/dtrace/src/usr.sbin/ancontrol/ancontrol.c#4 integrate .. //depot/projects/dtrace/www/en/Makefile#9 integrate .. //depot/projects/dtrace/www/en/community.xsl#2 integrate .. //depot/projects/dtrace/www/share/sgml/libcommon.xsl#11 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#69 (text+ko) ==== @@ -1,7 +1,7 @@ + 7.0-STABLE after the MFC of &man.write.2; support + to &man.psm.4;. + 700106 + + + 7.0-STABLE after the MFC of F_DUP2FD command to &man.fcntl.2;. 700107 ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#12 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Chinese Documentation Project - Original Revision: 1.180 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml,v 1.16 2008/02/09 13:33:15 loader Exp $ + Original Revision: 1.181 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml,v 1.17 2008/04/21 06:46:26 loader Exp $ --> @@ -1219,7 +1219,7 @@ 如果出现问题怎么办 - 在定制一个内核时，可能会出现五种问题。它们是： + 在定制一个内核时，可能会出现四种问题。它们是： ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml#12 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.103 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml,v 1.18 2008/04/02 16:28:58 loader Exp $ + Original Revision: 1.104 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml,v 1.19 2008/04/21 06:46:26 loader Exp $ --> @@ -3679,7 +3679,7 @@ 让应用程序的逻辑部分与 HTML 的表现层分离。 Django 依赖与 mod_python， - Apache, and 一个可选的 SQL + Apache, 和一个可选的 SQL 数据库引擎。 在设置了一些恰当的标志后，FreeBSD 的 Port 系统将会帮助你安装这些必需的依赖库。 @@ -4012,8 +4012,8 @@ 配置 默认的 Samba 配置文件会以 - /usr/local/share/examples/smb.conf.default 的名字安装。 - 这个文件必须复制为 + /usr/local/share/examples/samba/smb.conf.default + 的名字安装。这个文件必须复制为 /usr/local/etc/smb.conf 并进行定制， 才能开始使用 Samba。 ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#10 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.111 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml,v 1.10 2008/04/02 16:28:58 loader Exp $ + Original Revision: 1.112 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml,v 1.11 2008/04/21 06:46:27 loader Exp $ --> @@ -2238,10 +2238,10 @@ filters apsfilter - FreeBSD Ports Collection 包含了一个可以自动进行转换的文本过滤器， - 名字叫做 apsfilter。 - 它可以检测出纯文本， &postscript;， 和 DVI 格式的文件， - 并且运行相应的转换过滤器， 然后打印。 + FreeBSD 的 Ports 套件提供了一个可以自动进行转换的文本过滤器， + 名字叫做 apsfilter (print/apsfilter)。 + 它可以检测纯文本、 &postscript;、 DVI 以及几乎任何格式的文件， + 并在执行相应的转换之后完成打印工作。 @@ -2447,8 +2447,8 @@ 通过启用报头页， LPD 将生成出一个 长报头， 一整页的大字母， 标着用户， 主机和任务名。 - 下面是一个例子 (kelly 打印了用主机 - rose 打印了一个叫做 outline 的任务)： + 下面是一个例子 (kelly 从主机 + rose 打印了一个叫做 outline 的任务)： k ll ll k l l @@ -2928,16 +2928,16 @@ 现在， 主机 orchid 上的用户可以打印到 rattan 和 bamboo 了。 如果， - 比如， 一个用户在主机 orchid 上输入了 + 比如， 一个用户在主机 orchid 上输入了： &prompt.user; lpr -P bamboo -d sushi-review.dvi - LPD 系统在主机 orchid + LPD 系统在主机 orchid 上会复制这个任务到后台打印队列目录 /var/spool/lpd/bamboo 并且记下这是一个 DVI 任务。 当主机 rose 上的打印机 bamboo 的后台打印队列目录有空间的时， 这两个 - LPDs 系统将会传输这个文件到主机 + LPD 系统将会传输这个文件到主机 rose 上。 文件将排在主机 rose 的队列中知道最终被打印出来。 它将被从 DVI 转换成 &postscript; (因为 bamboo 是一台 &postscript; 打印机) 在主机 ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#27 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.919 - $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.37 2008/04/11 10:11:45 loader Exp $ + Original Revision: 1.924 + $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.38 2008/04/21 06:37:30 loader Exp $ --> 通过 Xvfb 来获得虚拟的 DISPLAY 某些应用程序必须在有可用的 X11 显示的时候才能成功编译。 - 这会给 FreeBSD 预编译包构建集群带来麻烦， 因为它们是不接显示器的。 - 通过下面的官方 hack， 预编译包构建集群将启动采用虚拟帧缓存的 - X server。 这样， 编译过程将有可用的 DISPLAY。 + 当编译的机器没有控制台时， 这会带来问题。 为了解决这个问题， + 如果定义了适当的变量， 联编基础设施会启动采用虚拟帧缓存的 + X server。 此时， 编译过程中将会传出可用的 DISPLAY。 USE_DISPLAY= yes @@ -11107,6 +11107,22 @@ + 为 flock 结构加入 l_sysid 之后的 7.0-STABLE。 + 700103 + + + + 在 procstat(1) MFC 之后的 7.0-STABLE。 + 700104 + + + + 为 &man.fcntl.2; MFC F_DUP2FD 之后的 + 7.0-STABLE。 + 700107 + + + 8.0-CURRENT。 分拆了宽字符和单字节字符 ctype。 800000 @@ -11303,6 +11319,11 @@ 函数之后的 8.0-CURRENT。 800034 + + 引入 fdopendir + 函数之后的 8.0-CURRENT + 800035 + ==== //depot/projects/dtrace/src/contrib/gcc/gthr-posix.h#5 (text+ko) ==== @@ -152,9 +152,12 @@ it is passed so we cannot pretend that the interface is active if -pthreads is not specified. On Solaris 2.5.1, the interface is not exposed at all so we need to play the usual game with weak symbols. On Solaris 10 and up, a - working interface is always exposed. */ + working interface is always exposed. On FreeBSD 6 and later, libc also + exposes a dummy POSIX threads interface, similar to what Solaris 2.6 up + to 9 does. FreeBSD >= 700014 even provides a pthread_cancel stub in libc, + which means the alternate __gthread_active_p below cannot be used there. */ -#if defined(__sun) && defined(__svr4__) +#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__)) static volatile int __gthread_active = -1; @@ -197,7 +200,7 @@ return __gthread_active_latest_value != 0; } -#else /* not Solaris */ +#else /* neither FreeBSD nor Solaris */ static inline int __gthread_active_p (void) @@ -207,7 +210,7 @@ return __gthread_active_ptr != 0; } -#endif /* Solaris */ +#endif /* FreeBSD or Solaris */ #else /* not SUPPORTS_WEAK */ ==== //depot/projects/dtrace/src/contrib/netcat/FREEBSD-upgrade#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/netcat/FREEBSD-upgrade,v 1.1 2005/02/06 15:26:44 delphij Exp $ +$FreeBSD: src/contrib/netcat/FREEBSD-upgrade,v 1.2 2008/04/21 18:37:08 delphij Exp $ 1. Export from OpenBSD's nc(1) into an empty directory (say "v-nc"). 2. while read pattern; do rm ${pattern} ; done < FREEBSD-Xlist @@ -9,9 +9,11 @@ 6. If there is conflicits, try to resolve them. 7. do build in f-nc/../../usr.bin/nc 8. If everything seems ok, do the actual import in v-nc: - cvs -n import src/contrib/netcat OPENBSD OPENBSD_ + cvs -n import src/contrib/netcat OPENBSD OPENBSD_ Everything appears be Ok? Do: - cvs import src/contrib/netcat OPENBSD OPENBSD_ + cvs import src/contrib/netcat OPENBSD OPENBSD_ + (note: recently we import from OpenBSD's release branches + rather than importing -HEAD snapshots) 9. Resolve the conflicits with the patchset obtained in step 6. -delphij@FreeBSD.org - 06 Feb 2005 +delphij@FreeBSD.org - 21 Apr 2008 ==== //depot/projects/dtrace/src/contrib/netcat/atomicio.c#4 (text+ko) ==== @@ -1,7 +1,7 @@ -/* $OpenBSD: atomicio.c,v 1.8 2006/02/11 19:31:18 otto Exp $ */ - +/* $OpenBSD: atomicio.c,v 1.9 2007/09/07 14:50:44 tobias Exp $ */ /* - * Copyright (c) 2005 Anil Madhavapeddy. All rights served. + * Copyright (c) 2006 Damien Miller. All rights reserved. + * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved. * Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. * All rights reserved. * @@ -26,32 +26,37 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include + #include +#include #include + #include "atomicio.h" /* * ensure all of data on socket comes through. f==read || f==vwrite */ size_t -atomicio(f, fd, _s, n) - ssize_t (*f) (int, void *, size_t); - int fd; - void *_s; - size_t n; +atomicio(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n) { char *s = _s; size_t pos = 0; ssize_t res; + struct pollfd pfd; + pfd.fd = fd; + pfd.events = f == read ? POLLIN : POLLOUT; while (n > pos) { res = (f) (fd, s + pos, n - pos); switch (res) { case -1: - if (errno == EINTR || errno == EAGAIN) + if (errno == EINTR) + continue; + if (errno == EAGAIN) { + (void)poll(&pfd, 1, -1); continue; + } return 0; case 0: errno = EPIPE; @@ -60,5 +65,5 @@ pos += (size_t)res; } } - return pos; + return (pos); } ==== //depot/projects/dtrace/src/contrib/netcat/atomicio.h#3 (text) ==== @@ -1,6 +1,7 @@ -/* $OpenBSD: atomicio.h,v 1.1 2005/05/24 20:13:28 avsm Exp $ */ +/* $OpenBSD: atomicio.h,v 1.2 2007/09/07 14:50:44 tobias Exp $ */ /* + * Copyright (c) 2006 Damien Miller. All rights reserved. * Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. * All rights reserved. * @@ -25,9 +26,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef _ATOMICIO_H +#define _ATOMICIO_H + /* * Ensure all of data on socket comes through. f==read || f==vwrite */ size_t atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t); #define vwrite (ssize_t (*)(int, void *, size_t))write + +#endif /* _ATOMICIO_H */ ==== //depot/projects/dtrace/src/contrib/netcat/nc.1#6 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $OpenBSD: nc.1,v 1.44 2006/12/02 01:08:30 jmc Exp $ +.\" $OpenBSD: nc.1,v 1.45 2007/05/31 19:20:13 jmc Exp $ .\" .\" Copyright (c) 1996 David Sacerdote .\" All rights reserved. @@ -25,9 +25,9 @@ .\" (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/contrib/netcat/nc.1,v 1.8 2008/04/01 13:54:24 bms Exp $ +.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.9 2008/04/21 18:31:50 delphij Exp $ .\" -.Dd April 2, 2008 +.Dd $Mdocdate$ .Dt NC 1 .Os .Sh NAME ==== //depot/projects/dtrace/src/etc/defaults/rc.conf#32 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.331 2008/04/20 20:37:20 sam Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.332 2008/04/21 18:17:48 brooks Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -33,7 +33,7 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). -ddb_enable="NO" # Set to YES to load ddb scripts at boot. +ddb_enable="YES" # Load ddb scripts at boot. ddb_config="/etc/ddb.conf" # ddb(8) config file. devd_enable="YES" # Run devd, to trigger programs on device tree changes. devd_flags="" # Additional flags for devd(8). ==== //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 (text+ko) ==== @@ -18,7 +18,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.329 2008/02/03 09:43:08 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.330 2008/04/21 05:43:07 brueffer Exp $ 2000 @@ -764,8 +764,6 @@ &hwlist.ath; - &hwlist.awi; - &hwlist.cnw; [&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2100 MiniPCI network ==== //depot/projects/dtrace/src/release/doc/share/misc/dev.archlist.txt#18 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.104 2008/03/11 08:28:44 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.105 2008/04/21 05:43:08 brueffer Exp $ # # @@ -47,7 +47,6 @@ asr i386 ath i386,pc98,amd64,sparc64 aue i386,pc98,ia64,amd64,powerpc -awi i386,pc98,amd64 axe i386,pc98,amd64,powerpc bce i386,amd64 bge i386,pc98,sparc64,ia64,amd64 ==== //depot/projects/dtrace/src/share/man/man4/textdump.4#3 (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/man4/textdump.4,v 1.3 2008/01/07 16:47:30 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.4 2008/04/21 17:09:53 rwatson Exp $ .\" .Dd December 26, 2007 .Dt textdump 4 @@ -48,7 +48,7 @@ By combining .Nm with other -.Xr DDB 4 +.Xr ddb 4 facilities, such as scripting and output capture, detailed bug information can be captured in a fully automated manner. .Sh FORMAT @@ -67,7 +67,7 @@ .Bl -tag -width version.txt .It Pa ddb.txt Captured -.Xr DDB 4 +.Xr ddb 4 output, if the capture facility has been used. May be disabled by clearing the .Dv debug.ddb.textdump.do_ddb @@ -110,7 +110,7 @@ dump will be regular memory dumps; however, by using the .Ic textdump set command in -.Xr DDB 4 , +.Xr ddb 4 , or by setting the .Dv debug.ddb.textdump.pending sysctl to 1 using @@ -118,7 +118,7 @@ it is possible to request that the next dump be a textdump. .Pp If at the -.Xr DDB 4 +.Xr ddb 4 command line, the commands .Ic textdump set , .Ic textdump status , ==== //depot/projects/dtrace/src/sys/arm/conf/AVILA#10 (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/arm/conf/AVILA,v 1.12 2008/04/20 20:35:34 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.13 2008/04/21 10:09:54 phk Exp $ machine arm ident AVILA @@ -80,7 +80,6 @@ #options PREEMPTION #options VERBOSE_SYSINIT -device genclock device mem # Memory and kernel memory devices #device saarm ==== //depot/projects/dtrace/src/sys/arm/conf/BWCT#4 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/BWCT,v 1.4 2008/03/27 11:54:17 dfr Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT,v 1.5 2008/04/21 10:09:54 phk Exp $ machine arm ident BWCT @@ -68,7 +68,6 @@ options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING -device genclock device loop device random device ether ==== //depot/projects/dtrace/src/sys/arm/conf/CRB#4 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CRB,v 1.4 2008/03/27 11:54:17 dfr Exp $ +# $FreeBSD: src/sys/arm/conf/CRB,v 1.5 2008/04/21 10:09:54 phk Exp $ machine arm ident CRB @@ -65,7 +65,6 @@ options BOOTP_WIRED_TO=em0 options BOOTP_COMPAT #options PREEMPTION -device genclock device loop device ether device mem # Memory and kernel memory devices ==== //depot/projects/dtrace/src/sys/arm/conf/EP80219#7 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/EP80219,v 1.7 2008/03/27 11:54:17 dfr Exp $ +# $FreeBSD: src/sys/arm/conf/EP80219,v 1.8 2008/04/21 10:09:54 phk Exp $ machine arm ident EP80219 @@ -67,7 +67,6 @@ options BOOTP_WIRED_TO=fxp0 options BOOTP_COMPAT #options PREEMPTION -device genclock device loop device ether device mem # Memory and kernel memory devices ==== //depot/projects/dtrace/src/sys/arm/conf/HL200#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/arm/conf/HL200,v 1.4 2008/04/20 20:35:34 sam Exp $ +# $FreeBSD: src/sys/arm/conf/HL200,v 1.5 2008/04/21 10:09:54 phk Exp $ machine arm ident HL200 @@ -74,7 +74,6 @@ options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING -device genclock device random device pty device loop ==== //depot/projects/dtrace/src/sys/arm/conf/IQ31244#9 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.21 2008/03/27 11:54:18 dfr Exp $ +# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.22 2008/04/21 10:09:54 phk Exp $ machine arm ident IQ31244 @@ -64,7 +64,6 @@ options BOOTP_WIRED_TO=em0 options BOOTP_COMPAT #options PREEMPTION -device genclock device loop device ether device mem # Memory and kernel memory devices ==== //depot/projects/dtrace/src/sys/arm/conf/KB920X#12 (text) ==== @@ -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/arm/conf/KB920X,v 1.16 2008/04/20 20:35:34 sam Exp $ +# $FreeBSD: src/sys/arm/conf/KB920X,v 1.17 2008/04/21 10:09:54 phk Exp $ machine arm ident KB920X @@ -62,7 +62,6 @@ options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING -device genclock device random device pty device loop ==== //depot/projects/dtrace/src/sys/arm/conf/SIMICS#9 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.15 2008/03/27 11:54:18 dfr Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.16 2008/04/21 10:09:54 phk Exp $ machine arm ident SIMICS @@ -54,7 +54,6 @@ options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -device genclock device loop device ether device saip ==== //depot/projects/dtrace/src/sys/arm/conf/SKYEYE#9 (text) ==== @@ -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/arm/conf/SKYEYE,v 1.9 2008/03/27 11:54:18 dfr Exp $ +# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.10 2008/04/21 10:09:54 phk Exp $ machine arm ident KB920X @@ -59,7 +59,6 @@ options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -device genclock device loop device ether #device saarm ==== //depot/projects/dtrace/src/sys/compat/svr4/svr4_misc.c#12 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.100 2008/01/13 14:44:01 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.101 2008/04/21 21:24:08 rdivacky Exp $"); #include "opt_mac.h" @@ -898,9 +898,7 @@ if (r == -1) r = 0x7fffffff; - mtx_lock(&Giant); /* XXX */ r += (long) vm->vm_daddr; - mtx_unlock(&Giant); if (r < 0) r = 0x7fffffff; *retval = r; ==== //depot/projects/dtrace/src/sys/conf/files#85 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1293 2008/04/20 20:35:35 sam Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1294 2008/04/21 10:09:53 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1425,7 +1425,7 @@ fs/cd9660/cd9660_vnops.c optional cd9660 fs/cd9660/cd9660_iconv.c optional cd9660_iconv kern/bus_if.m standard -kern/clock_if.m optional genclock +kern/clock_if.m standard kern/cpufreq_if.m standard kern/device_if.m standard kern/imgact_elf.c standard @@ -1527,7 +1527,7 @@ kern/subr_prf.c standard kern/subr_prof.c standard kern/subr_rman.c standard -kern/subr_rtc.c optional genclock +kern/subr_rtc.c standard kern/subr_sbuf.c standard kern/subr_scanf.c standard kern/subr_sleepqueue.c standard ==== //depot/projects/dtrace/src/sys/conf/files.amd64#29 (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.amd64,v 1.120 2008/04/14 07:59:59 phk Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.121 2008/04/21 10:09:53 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -210,9 +210,7 @@ isa/atrtc.c standard isa/syscons_isa.c optional sc isa/vga_isa.c optional vga -kern/clock_if.m standard kern/link_elf_obj.c standard -kern/subr_rtc.c standard # # IA32 binary support # ==== //depot/projects/dtrace/src/sys/conf/files.i386#34 (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.594 2008/04/14 07:59:59 phk Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.595 2008/04/21 10:09:53 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -446,10 +446,8 @@ isa/atrtc.c standard isa/syscons_isa.c optional sc isa/vga_isa.c optional vga -kern/clock_if.m standard kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip -kern/subr_rtc.c standard libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard ==== //depot/projects/dtrace/src/sys/conf/files.pc98#20 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.361 2008/04/19 08:18:47 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.362 2008/04/21 10:09:53 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -314,10 +314,8 @@ i4b/layer1/itjc/i4b_itjc_l1.c optional itjc i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc # -kern/clock_if.m standard kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip -kern/subr_rtc.c standard libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard ==== //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#28 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.217 2008/04/17 12:29:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.219 2008/04/21 10:51:38 sos Exp $"); #include "opt_ata.h" #include @@ -694,7 +694,7 @@ ATA_AHCI_P_IX_PS | ATA_AHCI_P_IX_DHR)); /* enable FIS based switching */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, 0x00000003); + //ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, 0x00000003); /* start operations on this channel */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CMD + offset, @@ -820,7 +820,7 @@ ~ATA_AHCI_P_CMD_ATAPI); /* set PM port to address */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, (port << 8) | 0x00000001); + //ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, (port << 8) | 0x00000001); /* issue command to controller */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CI + offset, (1 << request->tag)); @@ -1638,6 +1638,27 @@ /* + * Adaptec chipset support functions + */ +int +ata_adaptec_ident(device_t dev) +{ + struct ata_pci_controller *ctlr = device_get_softc(dev); + static struct ata_chip_id ids[] = + {{ ATA_ADAPTEC_1420, 0, 4, MV60XX, ATA_SA300, "1420SA" }, + { 0, 0, 0, 0, 0, 0}}; + + if (!(ctlr->chip = ata_match_chip(dev, ids))) + return ENXIO; + + ata_set_desc(dev); + ctlr->chipinit = ata_marvell_edma_chipinit; + + return 0; +} + + +/* * ATI chipset support functions */ int ==== //depot/projects/dtrace/src/sys/dev/ata/ata-pci.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.126 2008/04/17 12:29:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.127 2008/04/21 10:51:38 sos Exp $"); #include "opt_ata.h" #include @@ -96,6 +96,10 @@ if (!ata_amd_ident(dev)) return ATA_PROBE_OK; break; + case ATA_ADAPTEC_ID: + if (!ata_adaptec_ident(dev)) + return ATA_PROBE_OK; + break; case ATA_ATI_ID: if (!ata_ati_ident(dev)) return ATA_PROBE_OK; @@ -523,6 +527,7 @@ case ATA_ACARD_ID: return "Acard"; case ATA_ACER_LABS_ID: return "AcerLabs"; case ATA_AMD_ID: return "AMD"; + case ATA_ADAPTEC_ID: return "Adaptec"; case ATA_ATI_ID: return "ATI"; case ATA_CYRIX_ID: return "Cyrix"; case ATA_CYPRESS_ID: return "Cypress"; ==== //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#16 (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/sys/dev/ata/ata-pci.h,v 1.85 2008/04/12 17:21:22 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.86 2008/04/21 10:51:38 sos Exp $ */ /* structure holding chipset config info */ @@ -80,6 +80,14 @@ #define ATA_ATP865A 0x00081191 #define ATA_ATP865R 0x00091191 +#define ATA_ACER_LABS_ID 0x10b9 +#define ATA_ALI_1533 0x153310b9 +#define ATA_ALI_5229 0x522910b9 +#define ATA_ALI_5281 0x528110b9 +#define ATA_ALI_5287 0x528710b9 +#define ATA_ALI_5288 0x528810b9 +#define ATA_ALI_5289 0x528910b9 + #define ATA_AMD_ID 0x1022 #define ATA_AMD755 0x74011022 #define ATA_AMD756 0x74091022 @@ -88,13 +96,8 @@ #define ATA_AMD8111 0x74691022 #define ATA_AMD5536 0x209a1022 -#define ATA_ACER_LABS_ID 0x10b9 -#define ATA_ALI_1533 0x153310b9 -#define ATA_ALI_5229 0x522910b9 -#define ATA_ALI_5281 0x528110b9 -#define ATA_ALI_5287 0x528710b9 -#define ATA_ALI_5288 0x528810b9 -#define ATA_ALI_5289 0x528910b9 +#define ATA_ADAPTEC_ID 0x9005 +#define ATA_ADAPTEC_1420 0x02419005 #define ATA_ATI_ID 0x1002 #define ATA_ATI_IXP200 0x43491002 @@ -471,6 +474,7 @@ int ata_acard_ident(device_t); int ata_ali_ident(device_t); int ata_amd_ident(device_t); +int ata_adaptec_ident(device_t); int ata_ati_ident(device_t); int ata_cyrix_ident(device_t); int ata_cypress_ident(device_t); ==== //depot/projects/dtrace/src/sys/dev/ata/ata-queue.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include >>> TRUNCATED FOR MAIL (1000 lines) <<<