PERFORCE change 75225 for review
David Xu
davidxu at FreeBSD.org
Thu Apr 14 18:39:14 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=75225
Change 75225 by davidxu at davidxu_celeron on 2005/04/15 01:38:40
IFC.
Affected files ...
.. //depot/projects/davidxu_thread/src/contrib/top/commands.c#2 integrate
.. //depot/projects/davidxu_thread/src/contrib/top/top.c#2 integrate
.. //depot/projects/davidxu_thread/src/etc/rc.d/cleanvar#2 integrate
.. //depot/projects/davidxu_thread/src/lib/libc/net/getaddrinfo.c#4 integrate
.. //depot/projects/davidxu_thread/src/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#4 integrate
.. //depot/projects/davidxu_thread/src/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml#2 integrate
.. //depot/projects/davidxu_thread/src/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#2 integrate
.. //depot/projects/davidxu_thread/src/sbin/idmapd/idmapd.c#2 integrate
.. //depot/projects/davidxu_thread/src/sys/amd64/amd64/local_apic.c#5 integrate
.. //depot/projects/davidxu_thread/src/sys/amd64/amd64/sys_machdep.c#2 integrate
.. //depot/projects/davidxu_thread/src/sys/amd64/include/sysarch.h#2 integrate
.. //depot/projects/davidxu_thread/src/sys/arm/arm/pmap.c#10 integrate
.. //depot/projects/davidxu_thread/src/sys/boot/pc98/libpc98/vidconsole.c#2 integrate
.. //depot/projects/davidxu_thread/src/sys/cam/scsi/scsi_all.c#4 integrate
.. //depot/projects/davidxu_thread/src/sys/cam/scsi/scsi_da.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/cam/scsi/scsi_sa.c#4 integrate
.. //depot/projects/davidxu_thread/src/sys/conf/options.i386#5 integrate
.. //depot/projects/davidxu_thread/src/sys/ddb/db_print.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/ddb/db_run.c#4 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi.c#8 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_ec.c#5 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.h#7 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-lowlevel.c#10 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/pci/pci.c#11 integrate
.. //depot/projects/davidxu_thread/src/sys/dev/ppbus/pps.c#5 integrate
.. //depot/projects/davidxu_thread/src/sys/fs/udf/ecma167-udf.h#2 integrate
.. //depot/projects/davidxu_thread/src/sys/i386/acpica/madt.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/i386/i386/io_apic.c#4 integrate
.. //depot/projects/davidxu_thread/src/sys/i386/i386/local_apic.c#6 integrate
.. //depot/projects/davidxu_thread/src/sys/i386/i386/machdep.c#9 integrate
.. //depot/projects/davidxu_thread/src/sys/i386/i386/mptable.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/i386/i386/sys_machdep.c#6 integrate
.. //depot/projects/davidxu_thread/src/sys/i386/include/apicvar.h#5 integrate
.. //depot/projects/davidxu_thread/src/sys/i386/include/pcb.h#3 integrate
.. //depot/projects/davidxu_thread/src/sys/i386/pci/pci_pir.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/ia64/ia64/mp_machdep.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#13 edit
.. //depot/projects/davidxu_thread/src/sys/kern/subr_sleepqueue.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/netinet/ip_fw2.c#6 integrate
.. //depot/projects/davidxu_thread/src/sys/netinet/tcp_input.c#7 integrate
.. //depot/projects/davidxu_thread/src/sys/netinet/tcp_sack.c#8 integrate
.. //depot/projects/davidxu_thread/src/sys/netinet/tcp_var.h#7 integrate
.. //depot/projects/davidxu_thread/src/sys/netinet6/icmp6.c#6 integrate
.. //depot/projects/davidxu_thread/src/sys/nfs4client/nfs4_vnops.c#9 integrate
.. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_vnops.c#11 integrate
.. //depot/projects/davidxu_thread/src/sys/pc98/i386/machdep.c#10 integrate
.. //depot/projects/davidxu_thread/src/sys/security/mac/mac_vfs.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/security/mac_biba/mac_biba.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/security/mac_lomac/mac_lomac.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/security/mac_mls/mac_mls.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/security/mac_stub/mac_stub.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/security/mac_test/mac_test.c#3 integrate
.. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/machdep.c#8 integrate
.. //depot/projects/davidxu_thread/src/sys/sys/mac.h#2 integrate
.. //depot/projects/davidxu_thread/src/sys/sys/mac_policy.h#2 integrate
.. //depot/projects/davidxu_thread/src/sys/vm/vm_mmap.c#4 integrate
.. //depot/projects/davidxu_thread/src/tools/regression/usr.bin/printf/regress.m1.out#2 integrate
.. //depot/projects/davidxu_thread/src/tools/regression/usr.bin/printf/regress.sh#2 integrate
.. //depot/projects/davidxu_thread/src/usr.bin/printf/Makefile#2 integrate
.. //depot/projects/davidxu_thread/src/usr.bin/printf/printf.1#4 integrate
.. //depot/projects/davidxu_thread/src/usr.bin/printf/printf.c#5 integrate
.. //depot/projects/davidxu_thread/src/usr.bin/top/machine.c#3 integrate
Differences ...
==== //depot/projects/davidxu_thread/src/contrib/top/commands.c#2 (text+ko) ====
@@ -8,7 +8,7 @@
* Copyright (c) 1984, 1989, William LeFebvre, Rice University
* Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
*
- * $FreeBSD: src/contrib/top/commands.c,v 1.10 2004/08/16 07:51:21 alfred Exp $
+ * $FreeBSD: src/contrib/top/commands.c,v 1.11 2005/04/14 15:02:03 keramida Exp $
*/
/*
@@ -78,7 +78,7 @@
#ifdef ORDER
if (displaymode == DISP_CPU)
fputs("\
-o - specify sort order (pri, size, res, cpu, time)\n", stdout);
+o - specify sort order (pri, size, res, cpu, time, threads)\n", stdout);
else
fputs("\
o - specify sort order (vcsw, ivcsw, read, write, fault, total)\n", stdout);
==== //depot/projects/davidxu_thread/src/contrib/top/top.c#2 (text+ko) ====
@@ -13,7 +13,7 @@
* Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
* Copyright (c) 1996, William LeFebvre, Group sys Consulting
*
- * $FreeBSD: src/contrib/top/top.c,v 1.15 2004/08/16 07:51:21 alfred Exp $
+ * $FreeBSD: src/contrib/top/top.c,v 1.16 2005/04/14 15:02:03 keramida Exp $
*/
/*
@@ -84,6 +84,7 @@
static int max_topn; /* maximum displayable processes */
/* miscellaneous things */
+struct process_select ps;
char *myname = "top";
jmp_buf jmp_int;
@@ -179,7 +180,6 @@
char *iptr;
char no_command = 1;
struct timeval timeout;
- struct process_select ps;
#ifdef ORDER
char *order_name = NULL;
int order_index = 0;
@@ -987,8 +987,10 @@
case CMD_thrtog:
ps.thread = !ps.thread;
new_message(MT_standout | MT_delayed,
- " %sisplaying threads.",
- ps.thread ? "D" : "Not d");
+ "Displaying threads %s",
+ ps.thread ? "separately" : "as a count");
+ header_text = format_header(uname_field);
+ reset_display();
putchar('\r');
break;
case CMD_viewtog:
==== //depot/projects/davidxu_thread/src/etc/rc.d/cleanvar#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/cleanvar,v 1.7 2004/10/07 13:55:25 mtm Exp $
+# $FreeBSD: src/etc/rc.d/cleanvar,v 1.8 2005/04/14 03:56:06 csjp Exp $
#
# PROVIDE: cleanvar
@@ -18,6 +18,8 @@
(
cd "$dir" && for file in .* *
do
+ # Skip over logging sockets
+ [ -S "$file" -a "$file" = "log" ] && continue
[ ."$file" = .. -o ."$file" = ... ] && continue
if [ -d "$file" -a ! -L "$file" ]
then
==== //depot/projects/davidxu_thread/src/lib/libc/net/getaddrinfo.c#4 (text+ko) ====
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.62 2005/04/06 15:36:34 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.63 2005/04/14 11:44:43 ume Exp $");
#include "namespace.h"
#include "reentrant.h"
@@ -2310,11 +2310,6 @@
rcode = NOERROR;
ancount = 0;
- if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
- h_errno = NETDB_INTERNAL;
- return (-1);
- }
-
buf = malloc(MAXPACKET);
if (!buf) {
h_errno = NETDB_INTERNAL;
@@ -2561,10 +2556,6 @@
const char *longname = nbuf;
size_t n, d;
- if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
- h_errno = NETDB_INTERNAL;
- return (-1);
- }
#ifdef DEBUG
if (_res.options & RES_DEBUG)
printf(";; res_querydomain(%s, %s)\n",
==== //depot/projects/davidxu_thread/src/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#4 (text+ko) ====
@@ -1,10 +1,10 @@
<!--
The FreeBSD Russian Documentation Project
-$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.6 2005/03/09 14:03:59 den Exp $
-$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.5 2004/09/06 14:05:03 den Exp $
+$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.7 2005/04/14 13:29:07 den Exp $
+$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.7 2005/04/14 13:30:11 den Exp $
-Original revision: 1.30
+Original revision: 1.31
install.sgml
@@ -142,12 +142,12 @@
<para arch="i386,alpha">äÌÑ ÂÏÌØÛÉÎÓÔ×Á ÕÓÔÁÎÏ×ÏË Ó CDROM ÉÌÉ ÐÏ ÓÅÔÉ,
×ÁÍ ÐÏÔÒÅÂÕÀÔÓÑ ÓËÏÐÉÒÏ×ÁÔØ ÏÂÒÁÚÙ ÄÉÓËÅÔ
- <filename>boot.flp</filename> É <filename>kernX.flp</filename>
+ <filename>boot.flp</filename> É <filename>kern<replaceable>X</replaceable>.flp</filename>
ÉÚ ËÁÔÁÌÏÇÁ <filename>floppies/</filename> (ÄÌÑ 1.44MB ÄÉÓËÅÔ).</para>
<para arch="pc98">äÌÑ ÏÂÙÞÎÏÊ ÕÓÔÁÎÏ×ËÉ Ó CDROM ÉÌÉ ÐÏ ÓÅÔÉ, ×ÁÍ
ÐÏÔÒÅÂÕÅÔÓÑ ÓËÏÐÉÒÏ×ÁÔØ ÏÂÒÁÚÙ ÄÉÓËÅÔ <filename>boot.flp</filename>
- É <filename>kernX.flp</filename> ÉÚ ËÁÔÁÌÏÇÁ
+ É <filename>kern<replaceable>X</replaceable>.flp</filename> ÉÚ ËÁÔÁÌÏÇÁ
<filename>floppies/</filename> (ÄÌÑ 1.44MB ÄÉÓËÅÔ) ÉÌÉ
<filename>boot-small.flp</filename> É
<filename>kern-small.flp</filename> (ÄÌÑ 1.2MB ÄÉÓËÅÔ).</para>
@@ -156,17 +156,17 @@
úÁÇÒÕÚÉÔÅ
<replaceable>release</replaceable><filename>/floppies/boot.flp</filename>
É ×ÓÅ
- <replaceable>release</replaceable><filename>/floppies/kernX.flp</filename>
+ <replaceable>release</replaceable><filename>/floppies/kern<replaceable>X</replaceable>.flp</filename>
Ó <ulink url="&release.url;"></ulink> ÉÌÉ Ó ÏÄÎÏÇÏ ÉÚ ÚÅÒËÁÌ,
ÐÅÒÅÞÉÓÌÅÎÎÙÈ × ÒÁÚÄÅÌÅ <ulink
url="&url.books.handbook;/mirrors-ftp.html">FTP
ÚÅÒËÁÌÁ</ulink> òÕËÏ×ÏÄÓÔ×Á ÉÌÉ, ÉÌÉ ÎÁ ÓÔÒÁÎÉÃÁÈ
<ulink url="http://mirrorlist.FreeBSD.org/"></ulink>.</para>
- <para arch="i386,alpha">÷ÏÚØÍÉÔÅ ÔÒÉ (ÉÌÉ ÓËÏÌØËÏ ÐÏÔÒÅÂÕÅÔÓÑ) ÞÉÓÔÙÈ,
+ <para arch="i386,alpha">÷ÏÚØÍÉÔÅ ÎÅÓËÏÌØËÏ ÞÉÓÔÙÈ,
ÔÏÌØËÏ ÞÔÏ ÏÔÆÏÒÍÁÔÉÒÏ×ÁÎÎÙÈ
ÄÉÓËÅÔ É ÐÏÍÅÓÔÉÔÅ ÏÂÒÁÚ <filename>boot.flp</filename> ÎÁ ÐÅÒ×ÕÀ,
- Á <filename>kernX.flp</filename> ÎÁ ÏÓÔÁÌØÎÙÅ. üÔÉ ÏÂÒÁÚÙ
+ Á <filename>kern<replaceable>X</replaceable>.flp</filename> ÎÁ ÏÓÔÁÌØÎÙÅ. üÔÉ ÏÂÒÁÚÙ
<emphasis>ÎÅ</emphasis> DOS ÆÁÊÌÙ. ÷Ù ÎÅ ÍÏÖÅÔÅ ÐÒÏÓÔÏ ÓËÏÐÉÒÏ×ÁÔØ
ÉÈ ÎÁ DOS ÉÌÉ UFS ÄÉÓËÅÔÕ ËÁË ÏÂÙÞÎÙÅ ÆÁÊÌÙ, ÐÏÔÒÅÂÕÅÔÓÑ
ÒÁÚÍÅÝÅÎÉÅ ÏÂÒÁÚÏ× ÎÁ ÄÉÓËÅ Ó ÐÏÍÏÝØÀ <filename>fdimage.exe</filename>
@@ -174,10 +174,10 @@
ÉÌÉ ÎÁ FTP ÚÅÒËÁÌÁÈ &os;) ÉÌÉ Ó ÐÏÍÏÝØÀ ËÏÍÁÎÄÙ &man.dd.1;
× UNIX.</para>
- <para arch="pc98">÷ÏÚØÍÉÔÅ ÔÒÉ (ÉÌÉ ÓËÏÌØËÏ ÐÏÔÒÅÂÕÅÔÓÑ) ÞÉÓÔÙÈ,
+ <para arch="pc98">÷ÏÚØÍÉÔÅ ÎÅÓËÏÌØËÏ ÞÉÓÔÙÈ,
ÔÏÌØËÏ ÞÔÏ ÏÔÆÏÒÍÁÔÉÒÏ×ÁÎÎÙÈ
ÄÉÓËÅÔ É ÐÏÍÅÓÔÉÔÅ ÏÂÒÁÚ <filename>boot.flp</filename> ÎÁ ÐÅÒ×ÕÀ,
- Á <filename>kernX.flp</filename> ÎÁ ÏÓÔÁÌØÎÙÅ. üÔÉ ÏÂÒÁÚÙ
+ Á <filename>kern<replaceable>X</replaceable>.flp</filename> ÎÁ ÏÓÔÁÌØÎÙÅ. üÔÉ ÏÂÒÁÚÙ
<emphasis>ÎÅ</emphasis> DOS ÆÁÊÌÙ. ÷Ù ÎÅ ÍÏÖÅÔÅ ÐÒÏÓÔÏ ÓËÏÐÉÒÏ×ÁÔØ
ÉÈ ÎÁ DOS ÉÌÉ UFS ÄÉÓËÅÔÕ ËÁË ÏÂÙÞÎÙÅ ÆÁÊÌÙ, ÐÏÔÒÅÂÕÅÔÓÑ
ÒÁÚÍÅÝÅÎÉÅ ÏÂÒÁÚÏ× ÎÁ ÄÉÓËÅ Ó ÐÏÍÏÝØÀ <filename>rawrite.exe</filename>
@@ -193,12 +193,12 @@
<para arch="i386,alpha">ðÒÅÄÐÏÌÁÇÁÅÔÓÑ, ÞÔÏ ×Ù ÓËÏÐÉÒÏ×ÁÌÉ
<filename>fdimage.exe</filename> É <filename>boot.flp</filename>
- × ÏÔÄÅÌØÎÙÊ ËÁÔÁÌÏÇ. äÌÑ ÆÁÊÌÏ× <filename>kernX.flp</filename>
+ × ÏÔÄÅÌØÎÙÊ ËÁÔÁÌÏÇ. äÌÑ ÆÁÊÌÏ× <filename>kern<replaceable>X</replaceable>.flp</filename>
ÄÅÊÓÔ×ÉÑ ÂÕÄÕÔ ÁÎÁÌÏÇÉÞÎÙ.</para>
<para arch="pc98">ðÒÅÄÐÏÌÁÇÁÅÔÓÑ, ÞÔÏ ×Ù ÓËÏÐÉÒÏ×ÁÌÉ
<filename>rawrite.exe</filename> É <filename>boot.flp</filename>
- × ÏÔÄÅÌØÎÙÊ ËÁÔÁÌÏÇ. äÌÑ ÆÁÊÌÏ× <filename>kernX.flp</filename>
+ × ÏÔÄÅÌØÎÙÊ ËÁÔÁÌÏÇ. äÌÑ ÆÁÊÌÏ× <filename>kern<replaceable>X</replaceable>.flp</filename>
ÄÅÊÓÔ×ÉÑ ÂÕÄÕÔ ÁÎÁÌÏÇÉÞÎÙ.</para>
<para arch="i386,alpha,pc98">åÓÌÉ ×Ù ÓÏÚÄÁÅÔÅ ÚÁÇÒÕÚÏÞÎÕÀ ÄÉÓËÅÔÕ ÎÁ
@@ -271,7 +271,7 @@
ÞÅÒÅÚ ÓÅÔØ, ÉÓÐÏÌØÚÕÑ PPP, SLIP ÉÌÉ ×ÙÄÅÌÅÎÎÏÅ ÓÏÅÄÉÎÅÎÉÅ.
îÁÞÎÉÔÅ ÕÓÔÁÎÏ×ËÕ, ÓÏÚÄÁ× ÎÁÂÏÒ ÚÁÇÒÕÚÏÞÎÙÈ ÄÉÓËÅÔ &os;
ÉÚ ÆÁÊÌÏ× <filename>floppies/boot.flp</filename> É
- <filename>floppies/kernX.flp</filename>, ÉÓÐÏÌØÚÕÑ ÉÎÓÔÒÕËÃÉÉ
+ <filename>floppies/kern<replaceable>X</replaceable>.flp</filename>, ÉÓÐÏÌØÚÕÑ ÉÎÓÔÒÕËÃÉÉ
× <xref linkend="floppies">. ðÅÒÅÚÁÇÒÕÚÉÔÅ ËÏÍÐØÀÔÅÒ,
ÄÉÓË <filename>boot.flp</filename>; ÐÏÓÌÅ ÚÁÐÒÏÓÁ ×ÓÔÁ×ØÔÅ
ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏ ÏÓÔÁÌØÎÙÅ ÄÉÓËÉ. ðÒÏÞÔÉÔÅ
@@ -303,7 +303,7 @@
<para arch="alpha">÷ ËÁÞÅÓÔ×Å ÁÌØÔÅÒÎÁÔÉ×Ù ×Ù ÍÏÖÅÔÅ ÎÁÞÁÔØ ÕÓÔÁÎÏ×ËÕ
Ó ÄÉÓËÅÔÙ. äÌÑ ÎÁÞÁÌÁ ×ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ÓÏÚÄÁÔØ ÎÁÂÏÒ ÚÁÇÒÕÚÏÞÎÙÈ
ÄÉÓËÅÔ ÉÚ <filename>floppies/boot.flp</filename> É ÆÁÊÌÏ×
- <filename>floppies/kernX.flp</filename>, ÉÓÐÏÌØÚÕÑ ÉÎÓÔÒÕËÃÉÉ ÉÚ
+ <filename>floppies/kern<replaceable>X</replaceable>.flp</filename>, ÉÓÐÏÌØÚÕÑ ÉÎÓÔÒÕËÃÉÉ ÉÚ
<xref linkend="floppies">. ÷ÓÔÁ×ØÔÅ <filename>boot.flp</filename>,
ÄÌÑ ÚÁÐÕÓËÁ ÕÓÔÁÎÏ×ËÉ ÉÚ ÐÒÉÇÌÁÛÅÎÉÑ SRM ËÏÎÓÏÌÉ
(<literal>>>></literal>) ÎÁÂÅÒÉÔÅ ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</para>
@@ -837,11 +837,11 @@
</step>
<step>
<para>ðÒÉ ÚÁÇÒÕÚËÅ Ó ÄÉÓËÅÔ, ÐÏÓÌÅ ÏÓÔÁÎÏ×ËÉ ÞÔÅÎÉÑ Ó ÄÉÓËÁ
- ×ÓÔÁ×ØÔÅ ÐÅÒ×ÙÊ ÄÉÓË <filename>kernX.flp</filename> É ÎÁÖÍÉÔÅ
+ ×ÓÔÁ×ØÔÅ ÐÅÒ×ÙÊ ÄÉÓË <filename>kern<replaceable>X</replaceable>.flp</filename> É ÎÁÖÍÉÔÅ
<keycap>Enter</keycap>. ðÏÓÌÅ ÏÓÔÁÎÏ×ËÉ ÞÔÅÎÉÑ Ó ÄÉÓËÁ
- ×ÓÔÁ×ØÔÅ ÓÌÅÄÕÀÝÉÊ ÄÉÓË <filename>kernX.flp</filename> É ÎÁÖÍÉÔÅ
+ ×ÓÔÁ×ØÔÅ ÓÌÅÄÕÀÝÉÊ ÄÉÓË <filename>kern<replaceable>X</replaceable>.flp</filename> É ÎÁÖÍÉÔÅ
<keycap>Enter</keycap>, É ÔÁË ÄÁÌÅÅ ÄÌÑ ×ÓÅÈ ÄÉÓËÏ×
- <filename>kernX.flp</filename>. ëÏÇÄÁ ÚÁÇÒÕÚËÁ ÚÁ×ÅÒÛÉÔÓÑ,
+ <filename>kern<replaceable>X</replaceable>.flp</filename>. ëÏÇÄÁ ÚÁÇÒÕÚËÁ ÚÁ×ÅÒÛÉÔÓÑ,
×ÓÔÁ×ØÔÅ ÏÐÑÔØ <filename>boot.flp</filename> É ÎÁÖÍÉÔÅ
<keycap>Enter</keycap>.</para>
</step>
==== //depot/projects/davidxu_thread/src/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml#2 (text+ko) ====
@@ -1,10 +1,10 @@
<!--
The FreeBSD Russian Documentation Project
- $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml,v 1.4 2004/09/10 13:56:41 den Exp $
- $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml,v 1.4 2004/09/06 14:05:03 den Exp $
+ $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml,v 1.5 2005/04/14 13:29:07 den Exp $
+ $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml,v 1.5 2005/04/14 13:30:11 den Exp $
- Original revision: 1.9
+ Original revision: 1.10
This section contains the contents of the old LAYOUT.TXT file.
-->
@@ -23,10 +23,21 @@
INSTALL.TXT catpages compat4x games src
README.HTM cdrom.inf crypto info tools</screen>
- <para>åÓÌÉ ×Ù ÈÏÔÉÔÅ ×ÙÐÏÌÎÉÔØ CDROM, FTP ÉÌÉ NFS ÕÓÔÁÎÏ×ËÕ ÉÚ ÜÔÏÇÏ
- ËÁÔÁÌÏÇÁ, ×ÓÅ, ÞÔÏ ÐÏÔÒÅÂÕÅÔÓÑ, ÜÔÏ ÓÄÅÌÁÔØ 1.44MB ÚÁÇÒÕÚÏÞÎÙÅ ÄÉÓËÅÔÙ
- (ÓÍ. <xref linkend="floppies">), ÚÁÇÒÕÚÉÔØÓÑ Ó ÎÉÈ É ÓÌÅÄÏ×ÁÔØ
- ÉÎÓÔÒÕËÃÉÑÍ. ïÓÔÁÌØÎÙÅ ÆÁÊÌÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÕÓÔÁÎÏ×ËÉ, ÂÕÄÕÔ
+
+ <para>ôÅ ÖÅ ÆÁÊÌÙ ÎÁÈÏÄÑÔÓÑ ÎÁ ÐÅÒ×ÏÍ ÄÉÓËÅ ÍÕÌØÔÉÄÉÓËÏ×ÏÇÏ ÎÁÂÏÒÁ,
+ ÎÏ ÒÁÓÐÏÌÏÖÅÎÙ ÔÁÍ ÎÅÍÎÏÇÏ ÐÏ-ÄÒÕÇÏÍÕ. äÌÑ ÂÏÌØÛÉÎÓÔ×Á ÁÒÈÉÔÅËÔÕÒ
+ ÎÁ ÄÉÓËÅ Ó ÕÓÔÁÎÏ×ËÏÊ ÎÁÈÏÄÉÔÓÑ ÔÁËÖÅ <quote>live filesystem</quote>.
+ ïÎÁ ÐÏÌÅÚÎÁ ÐÒÉ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÉ ÉÌÉ ÒÅÛÅÎÉÉ ÐÒÏÂÌÅÍ Ó ÓÕÝÅÓÔ×ÕÀÝÅÊ
+ ÕÓÔÁÎÏ×ËÏÊ &os; (ÏÂÒÁÔÉÔÅÓØ Ë <xref
+ linkend="trouble"> ÚÁ ÉÎÓÔÒÕËÃÉÑÍÉ ÐÏ ÅÅ ÉÓÐÏÌØÚÏ×ÁÎÉÀ).</para>
+
+ <para>ëÁÔÁÌÏÇ <filename>floppies</filename> ÐÒÅÄÓÔÁ×ÌÑÅÔ ÏÐÒÅÄÅÌÅÎÎÙÊ
+ ÉÎÔÅÒÅÓ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ, ËÏÔÏÒÙÅ ÎÅ ÍÏÇÕÔ ×ÙÐÏÌÎÉÔØ ÚÁÇÒÕÚËÕ Ó
+ ËÏÍÐÁËÔ-ÄÉÓËÁ (ÎÏ ÍÏÇÕÔ ÐÒÏÞÉÔÁÔØ ÅÇÏ ÓÏÄÅÒÖÉÍÏÅ. îÅÓÌÏÖÎÏ
+ ÓÏÚÄÁÔØ ÎÁÂÏÒ 1.44í ÚÁÇÒÕÚÏÞÎÙÈ ÄÉÓËÅÔ, ×ÏÓÐÏÌØÚÏ×Á×ÛÉÓØ ËÁÔÁÌÏÇÏÍ
+ <filename>floppies</filename> (ÓÍ. <xref linkend="floppies">), É
+ ÉÓÐÏÌØÚÏ×ÁÔØ ÉÈ ÄÌÑ ÚÁÐÕÓËÁ ÕÓÔÁÎÏ×ËÉ Ó CDROM, FTP, ÉÌÉ NFS.
+ ïÓÔÁÌØÎÙÅ ÆÁÊÌÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÕÓÔÁÎÏ×ËÉ, ÂÕÄÕÔ
ÐÏÌÕÞÅÎÙ Á×ÔÏÍÁÔÉÞÅÓËÉ ÎÁ ÏÓÎÏ×Å ×ÁÛÅÇÏ ×ÙÂÏÒÁ. åÓÌÉ ×Ù ÎÉËÏÇÄÁ ÒÁÎØÛÅ
ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÌÉ &os;, ÐÏÔÒÅÂÕÅÔÓÑ ÔÁËÖÅ ÐÏÌÎÏÓÔØÀ ÐÒÏÞÉÔÁÔØ ÜÔÏÔ
ÄÏËÕÍÅÎÔ (ÆÁÊÌ ÉÎÓÔÒÕËÃÉÊ ÐÏ ÕÓÔÁÎÏ×ËÅ).</para>
==== //depot/projects/davidxu_thread/src/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#2 (text+ko) ====
@@ -1,10 +1,10 @@
<!--
The FreeBSD Russian Documentation Project
- $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml,v 1.3 2004/09/10 13:56:41 den Exp $
- $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml,v 1.3 2004/09/06 14:05:03 den Exp $
+ $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml,v 1.4 2005/04/14 13:29:07 den Exp $
+ $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml,v 1.4 2005/04/14 13:30:11 den Exp $
- Original revision: 1.16
+ Original revision: 1.17
This file contains the comments of the old TROUBLE.TXT file.
-->
@@ -14,21 +14,54 @@
<sect2 id="repairing">
<title>÷ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÓÕÝÅÓÔ×ÕÀÝÅÊ ÕÓÔÁÎÏ×ËÉ &os;</title>
- <para>&os; ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÏÐÃÉÀ
- <quote>Fixit</quote> × ×ÅÒÈÎÅÍ ÍÅÎÀ ÚÁÇÒÕÚÏÞÎÏÊ ÄÉÓËÅÔÙ.
- äÌÑ ÅÅ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ×ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ÉÌÉ ÄÉÓËÅÔÁ Ó
- <filename>fixit.flp</filename>, ÓÏÚÄÁÎÎÁÑ ÔÅÍ ÖÅ ÓÐÏÓÏÂÏÍ, ÞÔÏ É
- ÚÁÇÒÕÚÏÞÎÁÑ ÄÉÓËÅÔÁ, ÉÌÉ <quote>live filesystem</quote> CDROM;
- ÏÂÙÞÎÏ ÜÔÏ ×ÔÏÒÏÊ CDROM × ÍÎÏÇÏÄÉÓËÏ×ÏÍ ÄÉÓÔÒÉÂÕÔÉ×Å &os;.</para>
+ <para>&os; ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÏÐÃÉÀ <quote>fixit</quote> × ÇÌÁ×ÎÏÍ ÍÅÎÀ
+ ÐÒÏÇÒÁÍÍÙ ÕÓÔÁÎÏ×ËÉ &man.sysinstall.8;. ïÐÃÉÑ ÏÔËÒÙ×ÁÅÔ
+ ËÏÍÁÎÄÎÕÀ ÓÔÒÏËÕ, ÉÚ ËÏÔÏÒÏÊ ÄÏÓÔÕÐÎÙ ÏÓÎÏ×ÎÙÅ ÐÒÏÇÒÁÍÍÙ ÂÁÚÏ×ÏÊ
+ ÓÉÓÔÅÍÙ &os;; ÜÔÁ ÏÐÃÉÑ ÐÏÌÅÚÎÁ ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÉÌÉ ÒÅÛÅÎÉÑ
+ ÐÒÏÂÌÅÍ ÓÕÝÅÓÔ×ÕÀÝÅÊ ÕÓÔÁÎÏ×ËÅ &os;. äÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÒÅÖÉÍÁ
+ fixit ×ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ÌÉÂÏ ÄÉÓËÅÔÁ <filename>fixit.flp</filename>,
+ ÓÏÚÄÁÎÎÁÑ ÔÁËÉÍ ÖÅ ÏÂÒÁÚÏÍ, ËÁË É ÚÁÇÒÕÚÏÞÎÙÅ ÄÉÓËÅÔÙ, ÉÌÉ
+ ËÏÍÐÁËÔ-ÄÉÓË Ó <quote>live filesystem</quote>. ÷ ÍÎÏÇÏÄÉÓËÏ×ÙÈ
+ ÎÁÂÏÒÁÈ &os;, ÏÂÒÁÚ live filesystem ÏÂÙÞÎÏ ÎÁÈÏÄÉÔÓÑ ÎÁ ÄÉÓËÅ Ó
+ ÕÓÔÁÎÏ×ËÏÊ. ïÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ, ÞÔÏ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÒÅÖÉÍÁ
+ fixit ÔÒÅÂÕÅÔÓÑ ÎÅËÏÔÏÒÙÊ ÏÐÙÔ ÓÉÓÔÅÍÎÏÇÏ ÁÄÍÉÎÉÓÔÒÉÒÏ×ÁÎÉÑ
+ UNIX.</para>
+
+ <para>åÓÔØ Ä×Á ÓÔÁÎÄÁÒÔÎÙÈ ÓÐÏÓÏÂÁ ×ÏÊÔÉ × ÒÅÖÉÍ fixit. ðÏÌØÚÏ×ÁÔÅÌÉ,
+ ËÏÔÏÒÙÅ ÍÏÇÕÔ ÚÁÇÒÕÚÉÔØÓÑ Ó ÕÓÔÁÎÏ×ÏÞÎÏÇÏ ËÏÍÐÁËÔ-ÄÉÓËÁ &os;,
+ ÍÏÇÕÔ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ÐÕÎËÔÏÍ <quote>fixit</quote> ÉÚ ÇÌÁ×ÎÏÇÏ
+ ÍÅÎÀ &man.sysinstall.8;. úÁÔÅÍ ÎÕÖÎÏ ×ÙÂÒÁÔØ ÏÐÃÉÀ
+ ÜÔÏÇÏ ÍÅÎÀ <quote>CDROM/DVD</quote>.</para>
+
+ <para>ðÏÌØÚÏ×ÁÔÅÌÑÍ, ËÏÔÏÒÙÅ ÎÅ ÍÏÇÕÔ ÚÁÇÒÕÚÉÔØÓÑ Ó ËÏÍÐÁËÔ-ÄÉÓËÁ,
+ ÎÏ ÍÏÇÕÔ ÚÁÇÒÕÚÉÔØÓÑ Ó ÄÉÓËÅÔ, ÐÏÔÒÅÂÕÅÔÓÑ ×ÙÐÏÌÎÉÔØ ÎÅÓËÏÌØËÏ ÂÏÌØÛÅ
+ ÛÁÇÏ×. ÷ ÄÏÐÏÌÎÅÎÉÅ Ë ÄÉÓËÅÔÁÍ <filename>boot.flp</filename> É
+ <filename>kern<replaceable>X</replaceable>.flp</filename>,
+ ÎÅÏÂÈÏÄÉÍÙÍ ÄÌÑ ÕÓÔÁÎÏ×ËÉ, ÓÏÚÄÁÊÔÅ ÄÉÓËÅÔÕ
+ <filename>fixit.flp</filename>, ÔÅÍ ÖÅ ÓÐÏÓÏÂÏÍ, ÞÔÏ É ÄÒÕÇÉÅ
+ ÄÉÓËÅÔÙ. óÌÅÄÕÊÔÅ ÉÎÓÔÒÕËÃÉÑÍ ÐÏ ÚÁÇÒÕÚËÅ ÐÒÏÇÒÁÍÍÙ ÕÓÔÁÎÏ×ËÉ
+ Ó ÄÉÓËÅÔ ÄÏ ÍÏÍÅÎÔÁ ×ÈÏÄÁ × ÍÅÎÀ &man.sysinstall.8;. ðÏÓÌÅ ÜÔÏÇÏ
+ ×ÙÂÅÒÉÔÅ ÏÐÃÉÀ <quote>fixit</quote> ÉÚ ÇÌÁ×ÎÏÇÏ ÍÅÎÀ
+ &man.sysinstall.8;. úÁÔÅÍ ×ÙÂÅÒÉÔÅ ÏÐÃÉÀ <quote>Floppy</quote>
+ É ×ÓÔÁ×ØÔÅ ÄÉÓËÅÔÕ <filename>fixit.flp</filename>, ËÏÇÄÁ
+ ÐÏÑ×ÉÔÓÑ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ ÐÒÉÇÌÁÛÅÎÉÅ.</para>
+
+ <para>óÏÄÅÒÖÉÍÏÅ ËÏÍÐÁËÔ-ÄÉÓËÁ É ÄÉÓËÅÔÙ ÐÏÈÏÖÉ, ÎÏ ÎÅ ÉÄÅÎÔÉÞÎÙ.
+ ÷ ÏÂÅÉÈ ÓÌÕÞÁÑÈ ÐÒÅÄÏÓÔÁ×ÌÑÅÔÓÑ ËÏÍÁÎÄÎÁÑ ÓÔÒÏËÁ Ó ÎÁÂÏÒÏÍ
+ ËÏÍÁÎÄ ÄÌÑ ÐÒÏ×ÅÒËÉ, ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ É ÉÈ
+ ÓÏÄÅÒÖÉÍÏÇÏ. ÷ÅÒÓÉÑ ÎÁ ËÏÍÐÁËÔ-ÄÉÓËÅ ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÐÏÓÒÅÄÓÔ×ÏÍ
+ live filesystem ×ÅÓØ ÎÁÂÏÒ ËÏÍÁÎÄ É ÐÒÏÇÒÁÍÍ, ÄÏÓÔÕÐÎÙÈ × ÂÁÚÏ×ÏÊ
+ ÓÉÓÔÅÍÅ &os;. îÁ ÄÉÓËÅÔÅ ÎÁÈÏÄÉÔÓÑ ÏÇÒÁÎÉÞÅÎÎÙÊ ÎÁÂÏÒ
+ ËÏÍÁÎÄ, ×ÓÌÅÄÓÔ×ÉÅ ÏÇÒÁÎÉÞÅÎÉÊ ÐÏ ÏÂßÅÍÕ.</para>
+
+ <para>÷ ×ÅÒÓÉÉ ÎÁ ÄÉÓËÅÔÅ, ÎÅËÏÔÏÒÙÅ ÕÔÉÌÉÔÙ ÍÏÇÕÔ ÎÁÈÏÄÉÔØÓÑ ×
+ ËÁÔÁÌÏÇÅ <filename>/stand</filename>, ÉÌÉ
+ <filename>/mnt2/stand</filename>. ÷ ×ÅÒÓÉÉ ÎÁ ËÏÍÐÁËÔ ÄÉÓËÅ, ÔÅ ÖÅ
+ ÐÒÏÇÒÁÍÍÙ ÍÏÇÕÔ ÎÁÈÏÄÉÔØÓÑ × ËÁÔÁÌÏÇÅ <filename>/stand</filename>
+ ÉÌÉ <filename>/mnt2/rescue</filename> (×ÍÅÓÔÅ Ó ÄÒÕÇÉÍÉ ÐÒÏÇÒÁÍÍÁÍÉ
+ ÉÚ live filesystem, ËÏÔÏÒÙÅ ÒÁÓÐÏÌÏÖÅÎÙ ×
+ <filename>/mnt</filename>).</para>
- <para>äÌÑ ÚÁÐÕÓËÁ fixit ÚÁÇÒÕÚÉÔÅ ÄÉÓËÅÔÕ <filename>kern.flp</filename>,
- ×ÙÂÅÒÉÔÅ <quote>Fixit</quote> ÉÚ ÍÅÎÀ É ×ÓÔÁ×ØÔÅ fixit ÄÉÓËÅÔÕ
- ÉÌÉ CDROM ÐÏÓÌÅ ÐÒÉÇÌÁÛÅÎÉÑ. ðÏÑ×ÉÔÓÑ ÏÂÏÌÏÞËÁ Ó ÍÎÏÖÅÓÔ×ÏÍ
- ËÏÍÁÎÄ (× ËÁÔÁÌÏÇÁÈ <filename>/stand</filename> É
- <filename>/mnt2/stand</filename>) ÄÌÑ ÐÒÏ×ÅÒËÉ, ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ É
- ÐÒÏÓÍÏÔÒÁ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ É ÉÈ ÓÏÄÅÒÖÉÍÏÇÏ. äÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ
- ÜÔÏÊ ×ÏÚÍÏÖÎÏÓÔÉ <emphasis>ÔÒÅÂÕÅÔÓÑ</emphasis> ÎÅËÏÔÏÒÙÊ ÏÐÙÔ
- ÁÄÍÉÎÉÓÔÒÉÒÏ×ÁÎÉÑ UNIX.</para>
</sect2>
<sect2>
==== //depot/projects/davidxu_thread/src/sbin/idmapd/idmapd.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sbin/idmapd/idmapd.c,v 1.5 2004/04/15 16:12:12 rees Exp $ */
+/* $FreeBSD: src/sbin/idmapd/idmapd.c,v 1.6 2005/04/14 20:27:30 rees Exp $ */
/* $Id: idmapd.c,v 1.5 2003/11/05 14:58:58 rees Exp $ */
/*
@@ -339,12 +339,6 @@
TAILQ_INIT(&upcall_q);
- if (error) {
- perror("sigaction");
- exit(1);
- }
-
-
fd = open(DEV_PATH, O_RDWR, S_IRUSR | S_IWUSR);
if (fd < 0) {
==== //depot/projects/davidxu_thread/src/sys/amd64/amd64/local_apic.c#5 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.13 2005/03/11 22:12:38 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.14 2005/04/14 05:56:17 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -335,10 +335,6 @@
if (lapic == NULL)
return (0);
- /* If we've only got one CPU, then use the RTC and ISA timer instead. */
- if (mp_ncpus == 1)
- return (0);
-
/* Start off with a divisor of 2 (power on reset default). */
lapic_timer_divisor = 2;
==== //depot/projects/davidxu_thread/src/sys/amd64/amd64/sys_machdep.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.88 2004/04/05 23:55:13 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.89 2005/04/14 16:57:58 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,8 +56,29 @@
{
int error = 0;
struct pcb *pcb = curthread->td_pcb;
+ uint32_t i386base;
switch(uap->op) {
+ case I386_GET_FSBASE:
+ i386base = pcb->pcb_fsbase;
+ error = copyout(&i386base, uap->parms, sizeof(i386base));
+ break;
+ case I386_SET_FSBASE:
+ error = copyin(uap->parms, &i386base, sizeof(i386base));
+ pcb->pcb_fsbase = i386base;
+ if (!error)
+ wrmsr(MSR_FSBASE, pcb->pcb_fsbase);
+ break;
+ case I386_GET_GSBASE:
+ i386base = pcb->pcb_gsbase;
+ error = copyout(&i386base, uap->parms, sizeof(i386base));
+ break;
+ case I386_SET_GSBASE:
+ error = copyin(uap->parms, &i386base, sizeof(i386base));
+ pcb->pcb_gsbase = i386base;
+ if (!error)
+ wrmsr(MSR_KGSBASE, pcb->pcb_gsbase);
+ break;
case AMD64_GET_FSBASE:
error = copyout(&pcb->pcb_fsbase, uap->parms, sizeof(pcb->pcb_fsbase));
break;
==== //depot/projects/davidxu_thread/src/sys/amd64/include/sysarch.h#2 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.23 2004/04/05 21:25:51 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.24 2005/04/14 16:57:58 peter Exp $
*/
/*
@@ -35,6 +35,11 @@
#ifndef _MACHINE_SYSARCH_H_
#define _MACHINE_SYSARCH_H_
+#define I386_GET_FSBASE 7
+#define I386_SET_FSBASE 8
+#define I386_GET_GSBASE 9
+#define I386_SET_GSBASE 10
+
/* Leave space for 0-127 for to avoid translating syscalls */
#define AMD64_GET_FSBASE 128
#define AMD64_SET_FSBASE 129
==== //depot/projects/davidxu_thread/src/sys/arm/arm/pmap.c#10 (text+ko) ====
@@ -147,7 +147,7 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.27 2005/04/07 22:01:53 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.28 2005/04/14 14:32:32 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -2276,7 +2276,7 @@
pcb->pcb_pl1vec = &pm->pm_l1->l1_kva[L1_IDX(vector_page)];
l2b = pmap_get_l2_bucket(pm, vector_page);
pcb->pcb_l1vec = l2b->l2b_phys | L1_C_PROTO |
- L1_C_DOM(pm->pm_domain);
+ L1_C_DOM(pm->pm_domain) | L1_C_DOM(PMAP_DOMAIN_KERNEL);
} else
pcb->pcb_pl1vec = NULL;
}
@@ -2731,7 +2731,7 @@
/* Distribute new L1 entry to all other L1s */
SLIST_FOREACH(l1, &l1_list, l1_link) {
- pl1pd = &l1->l1_kva[L1_IDX(pmap_curmaxkvaddr)];
+ pl1pd = &l1->l1_kva[L1_IDX(va)];
*pl1pd = l2b->l2b_phys | L1_C_DOM(PMAP_DOMAIN_KERNEL) |
L1_C_PROTO;
PTE_SYNC(pl1pd);
@@ -2919,6 +2919,8 @@
pt_entry_t *pte, opte;
l2b = pmap_get_l2_bucket(pmap_kernel(), va);
+ if (!l2b)
+ return;
KASSERT(l2b != NULL, ("No L2 Bucket"));
pte = &l2b->l2b_kva[l2pte_index(va)];
opte = *pte;
==== //depot/projects/davidxu_thread/src/sys/boot/pc98/libpc98/vidconsole.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/vidconsole.c,v 1.12 2004/01/18 04:10:45 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/vidconsole.c,v 1.13 2005/04/14 14:12:54 nyan Exp $");
#include <stand.h>
#include <bootstrap.h>
@@ -538,7 +538,7 @@
}
static void
-get_arg(c)
+get_arg(int c)
{
if (argc < 0)
==== //depot/projects/davidxu_thread/src/sys/cam/scsi/scsi_all.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.47 2005/02/21 00:28:36 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.48 2005/04/14 03:52:50 mjacob Exp $");
#include <sys/param.h>
@@ -2312,6 +2312,15 @@
int i;
int num_syncrates;
+ /*
+ * It's a bug if period is zero, but if it is anyway, don't
+ * die with a divide fault- instead return something which
+ * 'approximates' async
+ */
+ if (period_factor == 0) {
+ return (3300);
+ }
+
num_syncrates = sizeof(scsi_syncrates) / sizeof(scsi_syncrates[0]);
/* See if the period is in the "exception" table */
for (i = 0; i < num_syncrates; i++) {
==== //depot/projects/davidxu_thread/src/sys/cam/scsi/scsi_da.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.173 2005/01/05 22:34:34 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.178 2005/04/14 04:46:46 mjacob Exp $");
#include <sys/param.h>
@@ -200,6 +200,7 @@
{
/*
* Doesn't like the synchronize cache command.
+ * Reported by: Blaz Zupan <blaz at gold.amis.net>
*/
{T_DIRECT, SIP_MEDIA_FIXED, quantum, "MAVERICK 540S", "*"},
/*quirks*/ DA_Q_NO_SYNC_CACHE
@@ -213,6 +214,14 @@
},
{
/*
+ * Doesn't like the synchronize cache command.
+ * Reported by: walter at pelissero.de
+ */
+ {T_DIRECT, SIP_MEDIA_FIXED, quantum, "LPS540S", "*"},
+ /*quirks*/ DA_Q_NO_SYNC_CACHE
+ },
+ {
+ /*
* Doesn't work correctly with 6 byte reads/writes.
* Returns illegal request, and points to byte 9 of the
* 6-byte CDB.
@@ -228,6 +237,14 @@
},
{
/*
+ * Doesn't like the synchronize cache command.
+ * Reported by: walter at pelissero.de
+ */
+ {T_DIRECT, SIP_MEDIA_FIXED, "CONNER", "CP3500*", "*"},
+ /*quirks*/ DA_Q_NO_SYNC_CACHE
+ },
+ {
+ /*
* The CISS RAID controllers do not support SYNC_CACHE
*/
{T_DIRECT, SIP_MEDIA_FIXED, "COMPAQ", "RAID*", "*"},
@@ -311,7 +328,15 @@
* Frontier Labs NEX IA+ Digital Audio Player, rev 1.10/0.01
* PR: kern/70158
*/
- {T_DIRECT, SIP_MEDIA_REMOVABLE, "FL" , "NexIA+*", "*"},
+ {T_DIRECT, SIP_MEDIA_REMOVABLE, "FL" , "Nex*", "*"},
+ /*quirks*/ DA_Q_NO_SYNC_CACHE
+ },
+ {
+ /*
+ * ZICPlay USB MP3 Player with FM
+ * PR: kern/75057
+ */
+ {T_DIRECT, SIP_MEDIA_REMOVABLE, "ACTIONS*" , "USB DISK*", "*"},
/*quirks*/ DA_Q_NO_SYNC_CACHE
},
};
==== //depot/projects/davidxu_thread/src/sys/cam/scsi/scsi_sa.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.103 2005/03/31 21:43:19 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.104 2005/04/14 04:51:18 mjacob Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -810,10 +810,29 @@
}
break;
+ case MTIOCTOP:
+ {
+ struct mtop *mt = (struct mtop *) arg;
+
+ /*
+ * Check to make sure it's an OP we can perform
+ * with no media inserted.
+ */
+ switch (mt->mt_op) {
+ case MTSETBSIZ:
+ case MTSETDNSTY:
+ case MTCOMP:
+ mt = NULL;
+ /* FALLTHROUGH */
+ default:
+ break;
+ }
+ if (mt != NULL) {
+ break;
+ }
+ /* FALLTHROUGH */
+ }
case MTIOCSETEOTMODEL:
- case MTSETBSIZ:
- case MTSETDNSTY:
- case MTCOMP:
/*
* We need to acquire the peripheral here rather
* than at open time because we are sharing writable
==== //depot/projects/davidxu_thread/src/sys/conf/options.i386#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.i386,v 1.218 2005/03/17 01:20:49 cognet Exp $
+# $FreeBSD: src/sys/conf/options.i386,v 1.219 2005/04/14 17:59:57 jhb Exp $
# Options specific to the i386 platform kernels
AUTO_EOI_1 opt_auto_eoi.h
@@ -9,7 +9,6 @@
I586_PMC_GUPROF opt_i586_guprof.h
MAXMEM
MPTABLE_FORCE_HTT
-NO_MIXED_MODE
PERFMON
PMAP_SHPGPERPROC opt_pmap.h
POWERFAIL_NMI opt_trap.h
==== //depot/projects/davidxu_thread/src/sys/ddb/db_print.c#3 (text+ko) ====
@@ -34,10 +34,11 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_print.c,v 1.29 2005/01/06 01:34:41 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_print.c,v 1.30 2005/04/14 05:25:40 peter Exp $");
#include <sys/param.h>
#include <sys/kdb.h>
+#include <sys/proc.h>
#include <machine/pcb.h>
==== //depot/projects/davidxu_thread/src/sys/ddb/db_run.c#4 (text+ko) ====
@@ -33,10 +33,11 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_run.c,v 1.26 2005/01/06 01:34:41 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_run.c,v 1.27 2005/04/14 05:25:40 peter Exp $");
#include <sys/param.h>
#include <sys/kdb.h>
+#include <sys/proc.h>
#include <machine/kdb.h>
#include <machine/pcb.h>
==== //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi.c#8 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.210 2005/03/31 19:07:26 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.211 2005/04/14 06:45:24 jhb Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -1495,6 +1495,7 @@
/*
* 1. I/O port and memory system resource holders
* 2. Embedded controllers (to handle early accesses)
+ * 3. PCI Link Devices
*/
ret = 0;
if (acpi_MatchHid(handle, "PNP0C01") || acpi_MatchHid(handle, "PNP0C02")) {
@@ -1503,6 +1504,9 @@
} else if (acpi_MatchHid(handle, "PNP0C09")) {
*order = 2;
ret = 1;
+ } else if (acpi_MatchHid(handle, "PNP0C0F")) {
+ *order = 3;
+ ret = 1;
}
return (ret);
==== //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_ec.c#5 (text+ko) ====
@@ -136,7 +136,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.63 2005/03/20 01:27:27 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.64 2005/04/14 06:50:13 marks Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -733,7 +733,7 @@
/* Evaluate _Qxx to respond to the controller. */
sprintf(qxx, "_Q%02x", Data);
- strupr(qxx);
+ AcpiUtStrupr(qxx);
Status = AcpiEvaluateObject(sc->ec_handle, qxx, NULL, NULL);
if (ACPI_FAILURE(Status) && Status != AE_NOT_FOUND) {
ACPI_VPRINT(sc->ec_dev, acpi_device_get_parent_softc(sc->ec_dev),
==== //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.h#7 (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-all.h,v 1.91 2005/04/10 10:20:25 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.92 2005/04/14 08:48:45 sos Exp $
*/
/* ATA register defines */
@@ -258,7 +258,7 @@
union {
struct {
u_int8_t command; /* command reg */
- u_int8_t feature; /* feature reg */
+ u_int16_t feature; /* feature reg */
u_int16_t count; /* count reg */
u_int64_t lba; /* lba reg */
} ata;
==== //depot/projects/davidxu_thread/src/sys/dev/ata/ata-lowlevel.c#10 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.59 2005/04/08 09:37:47 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.60 2005/04/14 08:48:45 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -391,11 +391,28 @@
/* on control commands read back registers to the request struct */
if (request->flags & ATA_R_CONTROL) {
- request->u.ata.count = ATA_IDX_INB(ch, ATA_COUNT);
- request->u.ata.lba = ATA_IDX_INB(ch, ATA_SECTOR) |
- (ATA_IDX_INB(ch, ATA_CYL_LSB) << 8) |
- (ATA_IDX_INB(ch, ATA_CYL_MSB) << 16) |
- ((ATA_IDX_INB(ch, ATA_DRIVE) & 0x0f) << 24);
+ if (ch->flags & ATA_48BIT_ACTIVE) {
+ ATA_IDX_OUTB(ch, ATA_CONTROL, ATA_A_4BIT | ATA_A_HOB);
+ request->u.ata.count = (ATA_IDX_INB(ch, ATA_COUNT) << 8);
+ request->u.ata.lba =
+ ((u_int64_t)(ATA_IDX_INB(ch, ATA_SECTOR)) << 24) |
+ ((u_int64_t)(ATA_IDX_INB(ch, ATA_CYL_LSB)) << 32) |
+ ((u_int64_t)(ATA_IDX_INB(ch, ATA_CYL_MSB)) << 40);
+
+ ATA_IDX_OUTB(ch, ATA_CONTROL, ATA_A_4BIT);
+ request->u.ata.count |= ATA_IDX_INB(ch, ATA_COUNT);
+ request->u.ata.lba |=
+ (ATA_IDX_INB(ch, ATA_SECTOR) |
+ (ATA_IDX_INB(ch, ATA_CYL_LSB) << 8) |
+ (ATA_IDX_INB(ch, ATA_CYL_MSB) << 16));
+ }
+ else {
+ request->u.ata.count = ATA_IDX_INB(ch, ATA_COUNT);
+ request->u.ata.lba = ATA_IDX_INB(ch, ATA_SECTOR) |
+ (ATA_IDX_INB(ch, ATA_CYL_LSB) << 8) |
+ (ATA_IDX_INB(ch, ATA_CYL_MSB) << 16) |
+ ((ATA_IDX_INB(ch, ATA_DRIVE) & 0xf) << 24);
+ }
}
/* if we got an error we are done with the HW */
==== //depot/projects/davidxu_thread/src/sys/dev/pci/pci.c#11 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.287 2005/04/11 02:08:05 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.288 2005/04/14 17:52:55 jhb Exp $");
#include "opt_bus.h"
@@ -1011,8 +1011,8 @@
resource_list_init(&dinfo->resources);
pci_cfg_save(dinfo->cfg.dev, dinfo, 0);
pci_cfg_restore(dinfo->cfg.dev, dinfo);
+ pci_print_verbose(dinfo);
pci_add_resources(pcib, bus, dinfo->cfg.dev);
- pci_print_verbose(dinfo);
}
static int
==== //depot/projects/davidxu_thread/src/sys/dev/ppbus/pps.c#5 (text+ko) ====
@@ -15,7 +15,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ppbus/pps.c,v 1.49 2005/03/17 20:45:24 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/pps.c,v 1.50 2005/04/14 15:56:10 imp Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -206,7 +206,7 @@
/* attach the interrupt handler */
if ((error = bus_setup_intr(ppsdev, sc->intr_resource,
(INTR_TYPE_TTY | INTR_MPSAFE | INTR_FAST), ppsintr,
- ppsdev, &sc->intr_cookie))) {
+ sc, &sc->intr_cookie))) {
ppb_release_bus(ppbus, ppsdev);
return (error);
}
@@ -279,22 +279,18 @@
static void
ppsintr(void *arg)
{
- device_t ppsdev = (device_t)arg;
- struct pps_data *sc = DEVTOSOFTC(ppsdev);
- device_t ppbus = sc->ppbus;
+ struct pps_data *sc = (struct pps_data *)arg;
- mtx_lock_spin(&sc->mtx);
pps_capture(&sc->pps[0]);
- if (!(ppb_rstr(ppbus) & nACK)) {
- mtx_unlock_spin(&sc->mtx);
+ if (!(ppb_rstr(sc->ppbus) & nACK))
return;
- }
if (sc->pps[0].ppsparam.mode & PPS_ECHOASSERT)
- ppb_wctr(ppbus, IRQENABLE | AUTOFEED);
+ ppb_wctr(sc->ppbus, IRQENABLE | AUTOFEED);
+ mtx_lock_spin(&sc->mtx);
pps_event(&sc->pps[0], PPS_CAPTUREASSERT);
+ mtx_unlock_spin(&sc->mtx);
if (sc->pps[0].ppsparam.mode & PPS_ECHOASSERT)
- ppb_wctr(ppbus, IRQENABLE);
- mtx_unlock_spin(&sc->mtx);
+ ppb_wctr(sc->ppbus, IRQENABLE);
}
static int
==== //depot/projects/davidxu_thread/src/sys/fs/udf/ecma167-udf.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/fs/udf/ecma167-udf.h,v 1.4 2002/09/23 18:54:30 alfred Exp $
+ * $FreeBSD: src/sys/fs/udf/ecma167-udf.h,v 1.5 2005/04/14 14:40:09 brueffer Exp $
*/
/* ecma167-udf.h */
@@ -314,7 +314,7 @@
uint8_t file_char;
uint8_t l_fi; /* Length of file identifier area */
struct long_ad icb;
- uint16_t l_iu; /* Length of implementaion use area */
+ uint16_t l_iu; /* Length of implementation use area */
uint8_t data[1];
} __packed;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list