PERFORCE change 31507 for review
Marcel Moolenaar
marcel at FreeBSD.org
Tue May 20 00:03:28 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=31507
Change 31507 by marcel at marcel_nfs on 2003/05/20 00:02:38
IFC @31506
Affected files ...
.. //depot/projects/ia64/Makefile.inc1#62 integrate
.. //depot/projects/ia64/bin/ed/Makefile#3 integrate
.. //depot/projects/ia64/contrib/groff/tmac/doc.tmac#5 integrate
.. //depot/projects/ia64/games/factor/Makefile#3 integrate
.. //depot/projects/ia64/lib/Makefile#25 integrate
.. //depot/projects/ia64/lib/libcrypt/Makefile#2 integrate
.. //depot/projects/ia64/lib/libfetch/Makefile#14 integrate
.. //depot/projects/ia64/lib/libpam/modules/modules.inc#16 integrate
.. //depot/projects/ia64/lib/libpthread/arch/i386/i386/ksd.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#8 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#16 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_pselect.c#3 integrate
.. //depot/projects/ia64/libexec/Makefile#16 integrate
.. //depot/projects/ia64/release/Makefile#52 integrate
.. //depot/projects/ia64/release/alpha/drivers.conf#14 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#50 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#3 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#92 integrate
.. //depot/projects/ia64/sbin/disklabel/disklabel.8#17 integrate
.. //depot/projects/ia64/sbin/routed/rtquery/rtquery.8#4 integrate
.. //depot/projects/ia64/sbin/umount/umount.8#5 integrate
.. //depot/projects/ia64/sbin/vinum/vinum.8#9 integrate
.. //depot/projects/ia64/share/examples/etc/make.conf#31 integrate
.. //depot/projects/ia64/share/man/man5/make.conf.5#34 integrate
.. //depot/projects/ia64/share/mk/bsd.cpu.mk#14 integrate
.. //depot/projects/ia64/sys/alpha/include/_limits.h#5 integrate
.. //depot/projects/ia64/sys/alpha/include/limits.h#6 integrate
.. //depot/projects/ia64/sys/amd64/include/_limits.h#3 integrate
.. //depot/projects/ia64/sys/amd64/include/limits.h#2 integrate
.. //depot/projects/ia64/sys/arm/include/_limits.h#4 integrate
.. //depot/projects/ia64/sys/arm/include/limits.h#5 integrate
.. //depot/projects/ia64/sys/conf/Makefile.amd64#4 integrate
.. //depot/projects/ia64/sys/conf/options.amd64#4 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#16 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-disk.c#24 integrate
.. //depot/projects/ia64/sys/i386/include/_limits.h#4 integrate
.. //depot/projects/ia64/sys/i386/include/limits.h#7 integrate
.. //depot/projects/ia64/sys/ia64/ia64/clock.c#16 integrate
.. //depot/projects/ia64/sys/ia64/ia64/exception.s#22 integrate
.. //depot/projects/ia64/sys/ia64/ia64/pmap.c#63 integrate
.. //depot/projects/ia64/sys/ia64/include/_limits.h#4 integrate
.. //depot/projects/ia64/sys/ia64/include/limits.h#7 integrate
.. //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#20 integrate
.. //depot/projects/ia64/sys/powerpc/include/_limits.h#4 integrate
.. //depot/projects/ia64/sys/powerpc/include/limits.h#8 integrate
.. //depot/projects/ia64/sys/sparc64/include/_limits.h#4 integrate
.. //depot/projects/ia64/sys/sparc64/include/limits.h#7 integrate
.. //depot/projects/ia64/sys/sys/limits.h#4 integrate
.. //depot/projects/ia64/usr.bin/Makefile#47 integrate
.. //depot/projects/ia64/usr.bin/fetch/Makefile#7 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/Makefile#4 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/add/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/create/Makefile#4 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/delete/Makefile#5 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/info/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/version/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/ppp/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/pppd/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/sendmail/Makefile#6 integrate
.. //depot/projects/ia64/usr.sbin/tcpdump/tcpdump/Makefile#3 integrate
Differences ...
==== //depot/projects/ia64/Makefile.inc1#62 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.360 2003/05/18 20:22:26 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.361 2003/05/19 15:51:58 des Exp $
#
# Make command line options:
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -8,7 +8,6 @@
# -DNOCRYPT will prevent building of crypt versions
# -DNOMAN do not build the manual pages
# -DNOPROFILE do not build profiled libraries
-# -DNOSECURE do not go into secure subdir
# -DNOGAMES do not go into games subdir
# -DNOSHARE do not go into share subdir
# -DNOINFO do not make or install info files
@@ -70,7 +69,7 @@
.if exists(${.CURDIR}/sbin)
SUBDIR+= sbin
.endif
-.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE)
+.if exists(${.CURDIR}/secure) && !defined(NOCRYPT)
SUBDIR+= secure
.endif
.if exists(${.CURDIR}/share) && !defined(NOSHARE)
@@ -803,7 +802,7 @@
_generic_libs+= lib
-.if !defined(NOCRYPT) && !defined(NOSECURE)
+.if !defined(NOCRYPT)
.if !defined(NO_OPENSSL)
_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl
.if !defined(NO_OPENSSH)
==== //depot/projects/ia64/bin/ed/Makefile#3 (text+ko) ====
@@ -1,11 +1,11 @@
-# $FreeBSD: src/bin/ed/Makefile,v 1.21 2001/12/06 10:50:23 ru Exp $
+# $FreeBSD: src/bin/ed/Makefile,v 1.22 2003/05/19 15:51:58 des Exp $
PROG= ed
SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
LINKS= ${BINDIR}/ed ${BINDIR}/red
MLINKS= ed.1 red.1
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE)
+.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT)
DISTRIBUTION=crypto
CFLAGS+=-DDES
DPADD= ${LIBCIPHER}
==== //depot/projects/ia64/contrib/groff/tmac/doc.tmac#5 (text+ko) ====
@@ -3959,15 +3959,16 @@
. ti -\n[doc-reg-dtl]u
.
. nh
-. ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \{\
-. doc-item-box\n[doc-list-depth]
+. doc-item-box\n[doc-list-depth]
+. ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \
. br
-. \}
. el \{\
-. chop doc-item-box\n[doc-list-depth]
-. \" Using \Z prevents stretching of the spaces in the tag
-. nop \Z'\*[doc-item-box\n[doc-list-depth]]'\c
-. nop \h'\n[doc-reg-dtl]u'\c
+. \" format the tag separately to prevent stretching of spaces
+. vpt 0
+. br
+. sp -1
+. vpt 1
+. nop \&\c
. nr doc-have-space 1
. \}
.
==== //depot/projects/ia64/games/factor/Makefile#3 (text+ko) ====
@@ -1,11 +1,11 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/factor/Makefile,v 1.5 2002/10/09 19:55:04 fanf Exp $
+# $FreeBSD: src/games/factor/Makefile,v 1.6 2003/05/19 15:52:50 des Exp $
PROG= factor
SRCS= factor.c pr_tbl.c
CFLAGS+=-I${.CURDIR}/../primes
-.if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL)
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
CFLAGS+=-DHAVE_OPENSSL
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}
==== //depot/projects/ia64/lib/Makefile#25 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.156 2003/05/05 07:58:42 markm Exp $
+# $FreeBSD: src/lib/Makefile,v 1.157 2003/05/19 15:51:59 des Exp $
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
@@ -79,13 +79,11 @@
.if defined(RELEASEDIR) || \
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
- defined(NOCRYPT) || defined(NO_OPENSSL) || \
- (defined(NOSECURE) && defined(NO_KERBEROS))
+ defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS)
_libtelnet= libtelnet
.endif
-.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) \
- && !defined(NOSECURE)
+.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
_libmp= libmp
.endif
==== //depot/projects/ia64/lib/libcrypt/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/lib/libcrypt/Makefile,v 1.30 2001/03/27 17:26:59 ru Exp $
+# $FreeBSD: src/lib/libcrypt/Makefile,v 1.31 2003/05/19 15:51:59 des Exp $
#
SHLIB_MAJOR= 2
@@ -13,7 +13,7 @@
CFLAGS+= -DLIBC_SCCS -Wall
# Pull in the crypt-des.c source, assuming it is present.
.if exists(${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c) && \
- !defined(NOSECURE) && !defined(NOCRYPT)
+ !defined(NOCRYPT)
.PATH: ${.CURDIR}/../../secure/lib/libcrypt
SRCS+= crypt-des.c crypt-blowfish.c blowfish.c
CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH
==== //depot/projects/ia64/lib/libfetch/Makefile#14 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libfetch/Makefile,v 1.40 2003/05/01 14:39:43 des Exp $
+# $FreeBSD: src/lib/libfetch/Makefile,v 1.41 2003/05/19 15:51:59 des Exp $
LIB= fetch
CFLAGS+= -I.
@@ -9,7 +9,7 @@
MAN= fetch.3
CLEANFILES= ftperr.h httperr.h
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
CFLAGS+= -DWITH_SSL
DPADD= ${LIBSSL} ${LIBCRYPTO}
LDADD= -lssl -lcrypto
==== //depot/projects/ia64/lib/libpam/modules/modules.inc#16 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libpam/modules/modules.inc,v 1.16 2003/05/05 07:58:42 markm Exp $
+# $FreeBSD: src/lib/libpam/modules/modules.inc,v 1.17 2003/05/19 15:51:59 des Exp $
MODULES =
MODULES += pam_chroot
@@ -24,8 +24,7 @@
MODULES += pam_rootok
MODULES += pam_securetty
MODULES += pam_self
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) && \
- !defined(NOSECURE)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
MODULES += pam_ssh
.endif
MODULES += pam_tacplus
==== //depot/projects/ia64/lib/libpthread/arch/i386/i386/ksd.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/ksd.c,v 1.2 2003/04/18 07:09:42 deischen Exp $");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/ksd.c,v 1.3 2003/05/19 23:04:49 deischen Exp $");
#include <sys/types.h>
#include <machine/cpufunc.h>
@@ -48,7 +48,9 @@
static unsigned int ldt_mask[LDT_WORDS];
static int initialized = 0;
-void
+static void initialize(void);
+
+static void
initialize(void)
{
int i, j;
==== //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#8 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.40 2003/05/16 19:58:29 deischen Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.41 2003/05/19 23:04:50 deischen Exp $
*/
#include <stdlib.h>
#include <errno.h>
@@ -49,10 +49,16 @@
static inline void cond_queue_remove(pthread_cond_t, pthread_t);
static inline void cond_queue_enq(pthread_cond_t, pthread_t);
+/*
+ * Double underscore versions are cancellation points. Single underscore
+ * versions are not and are provided for libc internal usage (which
+ * shouldn't introduce cancellation points).
+ */
+__weak_reference(__pthread_cond_wait, pthread_cond_wait);
+__weak_reference(__pthread_cond_timedwait, pthread_cond_timedwait);
+
__weak_reference(_pthread_cond_init, pthread_cond_init);
__weak_reference(_pthread_cond_destroy, pthread_cond_destroy);
-__weak_reference(_pthread_cond_wait, pthread_cond_wait);
-__weak_reference(_pthread_cond_timedwait, pthread_cond_timedwait);
__weak_reference(_pthread_cond_signal, pthread_cond_signal);
__weak_reference(_pthread_cond_broadcast, pthread_cond_broadcast);
@@ -167,22 +173,16 @@
int unlock_mutex = 1;
int seqno;
- _thr_enter_cancellation_point(curthread);
-
- if (cond == NULL) {
- _thr_leave_cancellation_point(curthread);
+ if (cond == NULL)
return (EINVAL);
- }
/*
* If the condition variable is statically initialized,
* perform the dynamic initialization:
*/
if (*cond == NULL &&
- (rval = pthread_cond_init(cond, NULL)) != 0) {
- _thr_leave_cancellation_point(curthread);
+ (rval = pthread_cond_init(cond, NULL)) != 0)
return (rval);
- }
/*
* Enter a loop waiting for a condition signal or broadcast
@@ -348,8 +348,6 @@
curthread->continuation((void *) curthread);
} while ((done == 0) && (rval == 0));
- _thr_leave_cancellation_point(curthread);
-
/* Return the completion status: */
return (rval);
}
@@ -379,21 +377,16 @@
THR_ASSERT(curthread->locklevel == 0,
"cv_timedwait: locklevel is not zero!");
- _thr_enter_cancellation_point(curthread);
if (abstime == NULL || abstime->tv_sec < 0 || abstime->tv_nsec < 0 ||
- abstime->tv_nsec >= 1000000000) {
- _thr_leave_cancellation_point(curthread);
+ abstime->tv_nsec >= 1000000000)
return (EINVAL);
- }
/*
* If the condition variable is statically initialized, perform dynamic
* initialization.
*/
- if (*cond == NULL && (rval = pthread_cond_init(cond, NULL)) != 0) {
- _thr_leave_cancellation_point(curthread);
+ if (*cond == NULL && (rval = pthread_cond_init(cond, NULL)) != 0)
return (rval);
- }
/*
* Enter a loop waiting for a condition signal or broadcast
@@ -556,8 +549,6 @@
curthread->continuation((void *)curthread);
} while ((done == 0) && (rval == 0));
- _thr_leave_cancellation_point(curthread);
-
/* Return the completion status: */
return (rval);
}
==== //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#16 (text+ko) ====
@@ -33,7 +33,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.65 2003/05/16 19:58:29 deischen Exp $");
+__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.66 2003/05/19 23:04:50 deischen Exp $");
#include <sys/types.h>
#include <sys/kse.h>
@@ -117,6 +117,9 @@
static int active_kse_count = 0;
static int active_kseg_count = 0;
+#ifdef DEBUG_THREAD_KERN
+static void dump_queues(struct kse *curkse);
+#endif
static void kse_check_completed(struct kse *kse);
static void kse_check_waitq(struct kse *kse);
static void kse_check_signals(struct kse *kse);
@@ -762,7 +765,8 @@
}
#endif
-void
+#ifdef DEBUG_THREAD_KERN
+static void
dump_queues(struct kse *curkse)
{
struct pthread *thread;
@@ -773,6 +777,7 @@
thread, thread->state, thread->blocked);
}
}
+#endif
/*
* This is the scheduler for a KSE which runs multiple threads.
==== //depot/projects/ia64/lib/libpthread/thread/thr_pselect.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_pselect.c,v 1.3 2003/04/18 05:04:16 deischen Exp $");
+__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_pselect.c,v 1.4 2003/05/19 23:04:50 deischen Exp $");
#include <sys/select.h>
#include <sys/time.h>
@@ -40,8 +40,10 @@
extern int __pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds,
const struct timespec *timo, const sigset_t *mask);
+__weak_reference(_pselect, pselect);
+
int
-pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds,
+_pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds,
const struct timespec *timo, const sigset_t *mask)
{
struct pthread *curthread = _get_curthread();
==== //depot/projects/ia64/libexec/Makefile#16 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/libexec/Makefile,v 1.60 2003/05/11 18:48:29 markm Exp $
+# $FreeBSD: src/libexec/Makefile,v 1.61 2003/05/19 15:51:59 des Exp $
# Present but disabled: kpasswdd
SUBDIR= atrun \
@@ -43,8 +43,7 @@
.if defined(RELEASEDIR) || \
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
- defined(NOCRYPT) || defined(NO_OPENSSL) || \
- (defined(NOSECURE) && defined(NO_KERBEROS))
+ defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS)
# make release needs both
SUBDIR+=telnetd
.endif
==== //depot/projects/ia64/release/Makefile#52 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.777 2003/05/18 19:34:03 jmallett Exp $
+# $FreeBSD: src/release/Makefile,v 1.778 2003/05/20 01:46:09 scottl Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -190,7 +190,7 @@
FIXITSIZE= 2880
MFSSIZE= 4320
BIGBOOTSIZE= 2880
-DRIVERINODE= 80000
+DRIVERINODE= 40000
BOOTINODE= 80000
FIXITINODE= 40000
MFSINODE= 8000
==== //depot/projects/ia64/release/alpha/drivers.conf#14 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/alpha/drivers.conf,v 1.18 2003/05/17 11:58:28 wilko Exp $
+# $FreeBSD: src/release/alpha/drivers.conf,v 1.19 2003/05/20 01:46:09 scottl Exp $
#
# drv: driver name in kernel config file
@@ -52,7 +52,6 @@
ahc ahc 3 disk "Adaptec 2940"
ahc ahc_eisa 3 disk "Adaptec 2940 EISA"
ahc ahc_pci 3 disk "Adaptec 2940 PCI"
-isp isp 3 disk "Qlogic SCSI"
amr amr 3 disk "AMI MegaRAID"
ispfw ispfw 3 disk "Qlogic SCSI firmware modules"
mlx mlx 3 disk "Mylex DAC-family RAID"
==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#50 (text+ko) ====
@@ -31,7 +31,7 @@
<sect1 id="support">
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.149 2003/05/13 18:15:28 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.150 2003/05/19 21:32:45 blackend Exp $</pubdate>
</sect1info>
<title>Supported Devices</title>
@@ -3077,7 +3077,7 @@
</para>
<para arch="i386,ia64,pc98">USB 2.0 controllers using the EHCI
- interface (ehci driver)</para>
+ interface (&man.ehci.4; driver)</para>
<para arch="i386,pc98,alpha">Hubs
<itemizedlist>
==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#3 (text+ko) ====
@@ -1,8 +1,32 @@
<!--
- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.3 2003/01/12 18:27:03 roam Exp $
+ $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.6 2003/05/19 22:15:17 bmah Exp $
-->
<sect1 id="proc-ia64">
<title>Supported Processors and Motherboards</title>
- <para>Need to write this section.</para>
+ <para>Currently supported processors are the
+ <ulink url="http://www.intel.com/design/itanium/itanium/index.htm">Itanium</ulink>
+ and the <ulink url="http://www.intel.com/design/itanium2/index.htm">Itanium 2</ulink>.</para>
+
+ <para>Supported chipsets include:</para>
+ <itemizedlist>
+ <listitem>
+ <para>HP zx1 (only on development branch, see the
+ <ulink url="http://perforce.freebsd.org/">Perforce repository</ulink>)</para>
+ </listitem>
+ <listitem>
+ <para>HP i2000
+ </listitem>
+ <listitem>
+ <para>Intel 460GX</para>
+ </listitem>
+ <listitem>
+ <para>Intel E8870</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Both Uniprocessor (UP) and Symmetric Multi-processor (SMP)
+ configurations are under active development. At this time,
+ SMP-enabled systems are considered less stable. The current
+ priorities are UP fixes to improve stability.</para>
</sect1>
==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#92 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The FreeBSD Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.567 2003/05/13 18:15:28 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.569 2003/05/20 04:03:29 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -170,7 +170,7 @@
<literal>NODEVFS</literal> option has been removed from the set of
possible kernel configuration options.</para>
- <para arch="i386,ia64,pc98">An ehci driver has been added; it supports
+ <para arch="i386,ia64,pc98">An &man.ehci.4; driver has been added; it supports
the USB Enhanced Host Controller Interface used by USB 2.0
controllers.</para>
@@ -1011,7 +1011,7 @@
has been updated to 2.2.1. &merged;</para>
<para>The supported release of <application>KDE</application>
- has been updated to 3.1.1a. &merged;</para>
+ has been updated to 3.1.2. &merged;</para>
<para>There is no longer a separate <filename>krb5</filename>
distribution. The Kerberos 5 libraries and utilities have been
==== //depot/projects/ia64/sbin/disklabel/disklabel.8#17 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)disklabel.8 8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.51 2003/04/17 17:36:31 trhodes Exp $
+.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.52 2003/05/19 19:52:29 ru Exp $
.\"
.Dd March 15, 2003
.Dt DISKLABEL 8
@@ -973,4 +973,4 @@
partition does not start at 0 or does not cover the entire slice,
if a partition runs past the end of the device,
and a number of other errors,
-but no warning is given if space remains unused.+but no warning is given if space remains unused.
==== //depot/projects/ia64/sbin/routed/rtquery/rtquery.8#4 (text+ko) ====
@@ -1,5 +1,5 @@
.\" $Revision: 1.10 $
-.\" $FreeBSD: src/sbin/routed/rtquery/rtquery.8,v 1.17 2003/05/04 06:13:25 murray Exp $
+.\" $FreeBSD: src/sbin/routed/rtquery/rtquery.8,v 1.18 2003/05/19 19:54:00 ru Exp $
.\"
.Dd June 1, 1996
.Dt RTQUERY 8
@@ -45,17 +45,17 @@
command, an
undocumented extension to the RIP protocol supported by
the commercial
-.Li gated
+.Nm gated
routing product.
When querying
-.Li gated ,
+.Nm gated ,
the
.Em poll
command is preferred over the
.Em request
command because the response is not subject to Split Horizon and/or
Poisoned Reverse, and because some versions of
-.Li gated
+.Nm gated
do not answer the
.Em request
command.
@@ -82,9 +82,9 @@
uses the
.Em poll
command to request full routing information from
-.Li gated .
+.Nm gated .
This is an undocumented extension RIP protocol supported only by
-.Li gated .
+.Nm gated .
.It Fl 1
queries using RIP version 1 instead of RIP version 2.
.It Fl w Ar timeout
@@ -102,7 +102,7 @@
is one of the following.
Requests from processes not running with UID 0 or on distant networks
are generally ignored by the daemon except for a message in the system log.
-.Li gated
+.Nm gated
is likely to ignore these debugging requests.
.El
.Bl -tag -width Ds -offset indent-two
==== //depot/projects/ia64/sbin/umount/umount.8#5 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)umount.8 8.2 (Berkeley) 5/8/95
-.\" $FreeBSD: src/sbin/umount/umount.8,v 1.16 2003/04/07 22:58:35 mdodd Exp $
+.\" $FreeBSD: src/sbin/umount/umount.8,v 1.17 2003/05/19 19:58:29 ru Exp $
.\"
.Dd April 7, 2003
.Dt UMOUNT 8
@@ -121,17 +121,17 @@
is unmounted.
.El
.Sh ENVIRONMENT
-.Bl -tag -width PATH_FSTAB
-.It Pa PATH_FSTAB
+.Bl -tag -width ".Ev PATH_FSTAB"
+.It Ev PATH_FSTAB
If the environment variable
-.Pa PATH_FSTAB
-is set all operations are performed against the specified file.
-.Pa PATH_FSTAB
+.Ev PATH_FSTAB
+is set, all operations are performed against the specified file.
+.Ev PATH_FSTAB
will not be honored if the process environment or memory address space is
considred
.Dq tainted .
(See
-.Fn issetugid
+.Xr issetugid 2
for more information.)
.El
.Sh FILES
==== //depot/projects/ia64/sbin/vinum/vinum.8#9 (text+ko) ====
@@ -35,9 +35,9 @@
.\" advised of the possibility of such damage.
.\"
.\" $Id: vinum.8,v 1.15 2001/05/14 01:10:37 grog Exp grog $
-.\" $FreeBSD: src/sbin/vinum/vinum.8,v 1.62 2003/05/05 16:33:43 phk Exp $
+.\" $FreeBSD: src/sbin/vinum/vinum.8,v 1.63 2003/05/19 20:03:28 ru Exp $
.\"
-.Dd December 20, 2000
+.Dd May 5, 2003
.Dt VINUM 8
.Os
.Sh NAME
@@ -2589,7 +2589,6 @@
not partitions such as
.Pa /dev/da0e .
.El
-.\"XXX.Sh BUGS
.Sh FILES
.Bl -tag -width /dev/vinum/control -compact
.It Pa /dev/vinum
@@ -2641,8 +2640,10 @@
.Pq Pa www.cybernet.com
for its NetMAX product.
.Sh BUGS
-.Nm
+.Xr vinum 4
does not use the
.Xr geom 4
-subsystem so vinum volumes can not be used with GEOM based facilities like
+subsystem so
+.Xr vinum 4
+volumes cannot be used with GEOM based facilities like
.Xr gbde 8 .
==== //depot/projects/ia64/share/examples/etc/make.conf#31 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/etc/make.conf,v 1.214 2003/05/06 19:26:55 obrien Exp $
+# $FreeBSD: src/share/examples/etc/make.conf,v 1.215 2003/05/19 15:51:59 des Exp $
#
# NOTE: Please would any committer updating this file also update the
# make.conf(5) manual page, if necessary, which is located in
@@ -124,7 +124,6 @@
#NOLIBC_R= true # do not build libc_r (re-entrant version of libc)
#NOMAN= true # do not build manual pages
#NOPROFILE= true # Avoid compiling profiled libraries
-#NOSECURE= true # do not build crypto code in secure/ subdir
#NOSHARE= true # do not go into the share subdir
#
# To build sys/modules when building the world (our old way of doing things)
==== //depot/projects/ia64/share/man/man5/make.conf.5#34 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.72 2003/05/05 07:58:43 markm Exp $
+.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.73 2003/05/19 15:51:59 des Exp $
.\"
.Dd November 3, 2000
.Dt MAKE.CONF 5
@@ -536,11 +536,6 @@
.It Va NOPROFILE
.Pq Vt bool
Set to avoid compiling profiled libraries.
-.It Va NOSECURE
-.Pq Vt bool
-set to not build crypto code in
-.Pa secure
-subdir.
.It Va NOSHARE
.Pq Vt bool
Set to not build in the
==== //depot/projects/ia64/share/mk/bsd.cpu.mk#14 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.26 2003/04/14 17:36:29 obrien Exp $
+# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.27 2003/05/20 01:46:16 peter Exp $
# Set default CPU compile flags and baseline CPUTYPE for each arch. The
# compile flags must support the minimum CPU type for each architecture but
@@ -11,8 +11,8 @@
. elif ${MACHINE_ARCH} == "alpha"
_CPUCFLAGS = -mcpu=ev4 -mtune=ev5
MACHINE_CPU = ev4
-.elif ${MACHINE_ARCH} == "x86-64" || ${MACHINE_ARCH} == "x86_64"
-MACHINE_CPU = x86-64 sse2 sse
+.elif ${MACHINE_ARCH} == "amd64"
+MACHINE_CPU = amd64 sse2 sse
. elif ${MACHINE_ARCH} == "ia64"
_CPUCFLAGS =
MACHINE_CPU = itanium
@@ -128,8 +128,8 @@
. elif ${CPUTYPE} == "ev4"
MACHINE_CPU = ev4
. endif
-. elif ${MACHINE_ARCH} == "x86-64" || ${MACHINE_ARCH} == "x86_64"
-MACHINE_CPU = x86-64 sse2 sse
+. elif ${MACHINE_ARCH} == "amd64"
+MACHINE_CPU = amd64 sse2 sse
. elif ${MACHINE_ARCH} == "ia64"
. if ${CPUTYPE} == "itanium"
MACHINE_CPU = itanium
==== //depot/projects/ia64/sys/alpha/include/_limits.h#5 (text+ko) ====
@@ -32,14 +32,12 @@
*
* @(#)limits.h 8.3 (Berkeley) 1/4/94
* From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp
- * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.13 2003/05/04 22:13:03 kan Exp $
+ * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.14 2003/05/19 20:29:06 kan Exp $
*/
-#ifndef _MACHINE__LIMITS_H_
+#ifndef _MACHINE__LIMITS_H_
#define _MACHINE__LIMITS_H_
-#define __CHAR_BIT 8 /* number of bits in a char */
-
/*
* According to ANSI (section 2.2.4.2), the values below must be usable by
* #if preprocessing directives. Additionally, the expression must have the
@@ -51,6 +49,8 @@
* some other compilers as well, but this should not be depended on.
*/
+#define __CHAR_BIT 8 /* number of bits in a char */
+
#define __SCHAR_MAX 0x7f /* max value for a signed char */
#define __SCHAR_MIN (-0x7f-1) /* min value for a signed char */
==== //depot/projects/ia64/sys/alpha/include/limits.h#6 (text+ko) ====
@@ -32,10 +32,10 @@
*
* @(#)limits.h 8.3 (Berkeley) 1/4/94
* From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp
- * $FreeBSD: src/sys/alpha/include/limits.h,v 1.11 2003/04/29 13:35:58 kan Exp $
+ * $FreeBSD: src/sys/alpha/include/limits.h,v 1.12 2003/05/19 20:29:06 kan Exp $
*/
-#ifndef _MACHINE_LIMITS_H_
+#ifndef _MACHINE_LIMITS_H_
#define _MACHINE_LIMITS_H_
#if __GNUC__
==== //depot/projects/ia64/sys/amd64/include/_limits.h#3 (text+ko) ====
@@ -33,14 +33,12 @@
* @(#)limits.h 8.3 (Berkeley) 1/4/94
* From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp
* From: FreeBSD: src/sys/alpha/include/limits.h,v 1.8 2001/11/02
- * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.6 2003/05/04 22:13:04 kan Exp $
+ * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.7 2003/05/19 20:29:06 kan Exp $
*/
#ifndef _MACHINE__LIMITS_H_
#define _MACHINE__LIMITS_H_
-#define __CHAR_BIT 8 /* number of bits in a char */
-
/*
* According to ANSI (section 2.2.4.2), the values below must be usable by
* #if preprocessing directives. Additionally, the expression must have the
@@ -52,6 +50,8 @@
* some other compilers as well, but this should not be depended on.
*/
+#define __CHAR_BIT 8 /* number of bits in a char */
+
#define __SCHAR_MAX 0x7f /* max value for a signed char */
#define __SCHAR_MIN (-0x7f-1) /* min value for a signed char */
==== //depot/projects/ia64/sys/amd64/include/limits.h#2 (text+ko) ====
@@ -33,10 +33,10 @@
* @(#)limits.h 8.3 (Berkeley) 1/4/94
* From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp
* From: FreeBSD: src/sys/alpha/include/limits.h,v 1.8 2001/11/02
- * $FreeBSD: src/sys/amd64/include/limits.h,v 1.5 2003/04/29 13:36:06 kan Exp $
+ * $FreeBSD: src/sys/amd64/include/limits.h,v 1.6 2003/05/19 20:29:06 kan Exp $
*/
-#ifndef _MACHINE_LIMITS_H_
+#ifndef _MACHINE_LIMITS_H_
#define _MACHINE_LIMITS_H_
#if __GNUC__
==== //depot/projects/ia64/sys/arm/include/_limits.h#4 (text+ko) ====
@@ -31,14 +31,12 @@
* SUCH DAMAGE.
*
* @(#)limits.h 8.3 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/arm/include/_limits.h,v 1.5 2003/05/04 22:13:03 kan Exp $
+ * $FreeBSD: src/sys/arm/include/_limits.h,v 1.6 2003/05/19 20:29:06 kan Exp $
*/
#ifndef _MACHINE__LIMITS_H_
#define _MACHINE__LIMITS_H_
-#define __CHAR_BIT 8 /* number of bits in a char */
-
/*
* According to ANSI (section 2.2.4.2), the values below must be usable by
* #if preprocessing directives. Additionally, the expression must have the
@@ -50,6 +48,8 @@
* some other compilers as well, but this should not be depended on.
*/
+#define __CHAR_BIT 8 /* number of bits in a char */
+
#define __SCHAR_MAX 0x7f /* max value for a signed char */
#define __SCHAR_MIN (-0x7f - 1) /* min value for a signed char */
==== //depot/projects/ia64/sys/arm/include/limits.h#5 (text+ko) ====
@@ -31,10 +31,10 @@
* SUCH DAMAGE.
*
* @(#)limits.h 8.3 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/arm/include/limits.h,v 1.4 2003/04/29 13:35:58 kan Exp $
+ * $FreeBSD: src/sys/arm/include/limits.h,v 1.5 2003/05/19 20:29:06 kan Exp $
*/
-#ifndef _MACHINE_LIMITS_H_
+#ifndef _MACHINE_LIMITS_H_
#define _MACHINE_LIMITS_H_
#if __GNUC__
==== //depot/projects/ia64/sys/conf/Makefile.amd64#4 (text+ko) ====
@@ -1,19 +1,19 @@
-# Makefile.x86_64 -- with config changes.
+# Makefile.amd64 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
-# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.7 2003/05/10 01:12:24 peter Exp $
+# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.8 2003/05/19 22:15:30 peter Exp $
#
# Makefile for FreeBSD
#
# This makefile is constructed from a machine description:
# config machineid
# Most changes should be made in the machine description
-# /sys/x86_64/conf/``machineid''
+# /sys/amd64/conf/``machineid''
# after which you should do
# config machineid
# Generic makefile changes should be made in
-# /sys/conf/Makefile.x86_64
+# /sys/conf/Makefile.amd64
# after which config should be rerun for all machines.
#
==== //depot/projects/ia64/sys/conf/options.amd64#4 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/sys/conf/options.amd64,v 1.7 2003/05/14 04:10:49 peter Exp $
-# Options specific to the AMD x86-64 platform kernels
+# $FreeBSD: src/sys/conf/options.amd64,v 1.8 2003/05/19 22:19:02 peter Exp $
+# Options specific to AMD64 platform kernels
MAXMEM
PERFMON opt_perfmon.h
==== //depot/projects/ia64/sys/dev/ata/ata-chipset.c#16 (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.27 2003/05/18 16:45:48 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.28 2003/05/19 13:42:23 sos Exp $
*/
#include "opt_ata.h"
#include <sys/param.h>
@@ -2003,26 +2003,21 @@
ata_find_chip(device_t dev, struct ata_chip_id *index, int slot)
{
device_t *children;
- u_int32_t devid;
- u_int8_t revid;
int nchildren, i;
-
if (device_get_children(device_get_parent(dev), &children, &nchildren))
return 0;
- devid = pci_get_devid(dev);
- revid = pci_get_revid(dev);
-
while (index->chipid != 0) {
for (i = 0; i < nchildren; i++) {
if (((slot >= 0 && pci_get_slot(children[i]) == slot) || slot < 0)&&
- pci_get_devid(children[i]) == devid &&
- pci_get_revid(children[i]) >= revid) {
+ pci_get_devid(children[i]) == index->chipid &&
+ pci_get_revid(children[i]) >= index->chiprev) {
free(children, M_TEMP);
return index;
}
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list