PERFORCE change 31214 for review
Marcel Moolenaar
marcel at FreeBSD.org
Wed May 14 23:15:33 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=31214
Change 31214 by marcel at marcel_pluto1 on 2003/05/14 23:15:00
IFia64
Affected files ...
.. //depot/projects/ia64_epc/crypto/openssh/log.h#3 integrate
.. //depot/projects/ia64_epc/etc/mtree/BSD.x11-4.dist#2 integrate
.. //depot/projects/ia64_epc/lib/libc/sys/stat.2#2 integrate
.. //depot/projects/ia64_epc/lib/libkvm/kvm_proc.c#6 integrate
.. //depot/projects/ia64_epc/release/alpha/dokern.sh#4 integrate
.. //depot/projects/ia64_epc/release/alpha/drivers.conf#5 integrate
.. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#13 integrate
.. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#22 integrate
.. //depot/projects/ia64_epc/sbin/bsdlabel/bsdlabel.c#6 integrate
.. //depot/projects/ia64_epc/sbin/devd/parse.y#2 integrate
.. //depot/projects/ia64_epc/sbin/ifconfig/ifconfig.8#5 integrate
.. //depot/projects/ia64_epc/share/man/man4/iir.4#4 integrate
.. //depot/projects/ia64_epc/sys/alpha/alpha/machdep.c#6 integrate
.. //depot/projects/ia64_epc/sys/alpha/osf1/osf1_signal.c#7 integrate
.. //depot/projects/ia64_epc/sys/amd64/amd64/cpu_switch.S#3 integrate
.. //depot/projects/ia64_epc/sys/amd64/amd64/exception.S#4 integrate
.. //depot/projects/ia64_epc/sys/amd64/amd64/genassym.c#3 integrate
.. //depot/projects/ia64_epc/sys/amd64/amd64/locore.S#2 integrate
.. //depot/projects/ia64_epc/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/ia64_epc/sys/amd64/amd64/support.S#3 integrate
.. //depot/projects/ia64_epc/sys/amd64/amd64/trap.c#3 integrate
.. //depot/projects/ia64_epc/sys/amd64/amd64/vm_machdep.c#2 integrate
.. //depot/projects/ia64_epc/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/ia64_epc/sys/amd64/ia32/Makefile#1 branch
.. //depot/projects/ia64_epc/sys/amd64/ia32/ia32.h#1 branch
.. //depot/projects/ia64_epc/sys/amd64/ia32/ia32_exception.S#1 branch
.. //depot/projects/ia64_epc/sys/amd64/ia32/ia32_genassym.c#1 branch
.. //depot/projects/ia64_epc/sys/amd64/ia32/ia32_misc.c#1 branch
.. //depot/projects/ia64_epc/sys/amd64/ia32/ia32_proto.h#1 branch
.. //depot/projects/ia64_epc/sys/amd64/ia32/ia32_signal.c#1 branch
.. //depot/projects/ia64_epc/sys/amd64/ia32/ia32_signal.h#1 branch
.. //depot/projects/ia64_epc/sys/amd64/ia32/ia32_sigtramp.S#1 branch
.. //depot/projects/ia64_epc/sys/amd64/ia32/ia32_syscall.c#1 branch
.. //depot/projects/ia64_epc/sys/amd64/ia32/ia32_syscall.h#1 branch
.. //depot/projects/ia64_epc/sys/amd64/ia32/ia32_sysent.c#1 branch
.. //depot/projects/ia64_epc/sys/amd64/ia32/ia32_sysvec.c#1 branch
.. //depot/projects/ia64_epc/sys/amd64/ia32/ia32_util.h#1 branch
.. //depot/projects/ia64_epc/sys/amd64/ia32/syscalls.conf#1 branch
.. //depot/projects/ia64_epc/sys/amd64/ia32/syscalls.master#1 branch
.. //depot/projects/ia64_epc/sys/amd64/include/cpufunc.h#2 integrate
.. //depot/projects/ia64_epc/sys/amd64/include/elf.h#2 integrate
.. //depot/projects/ia64_epc/sys/amd64/include/md_var.h#3 integrate
.. //depot/projects/ia64_epc/sys/amd64/include/pcb.h#3 integrate
.. //depot/projects/ia64_epc/sys/amd64/include/pmap.h#2 integrate
.. //depot/projects/ia64_epc/sys/amd64/include/segments.h#2 integrate
.. //depot/projects/ia64_epc/sys/compat/linprocfs/linprocfs.c#5 integrate
.. //depot/projects/ia64_epc/sys/compat/svr4/svr4_filio.c#4 integrate
.. //depot/projects/ia64_epc/sys/compat/svr4/svr4_misc.c#5 integrate
.. //depot/projects/ia64_epc/sys/conf/NOTES#12 integrate
.. //depot/projects/ia64_epc/sys/conf/files.amd64#4 integrate
.. //depot/projects/ia64_epc/sys/conf/options.amd64#3 integrate
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/Makefile#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx.h#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_bstream.c#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_bstream.h#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_context.c#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_context.h#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_env.c#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_env.h#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_self.c#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_self.h#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_self_context.s#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_step.c#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_str.c#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_str.h#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_swap.c#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_swap.h#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_trace.c#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_trace.h#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_utable.c#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/src/uwx_utable.h#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/test/Makefile#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/test/dump_context.c#1 branch
.. //depot/projects/ia64_epc/sys/contrib/ia64/libuwx/test/dumpmyself.c#1 branch
.. //depot/projects/ia64_epc/sys/dev/acpica/Osd/OsdHardware.c#4 integrate
.. //depot/projects/ia64_epc/sys/dev/acpica/acpivar.h#4 integrate
.. //depot/projects/ia64_epc/sys/dev/ata/atapi-cam.c#4 integrate
.. //depot/projects/ia64_epc/sys/dev/fxp/if_fxpreg.h#6 integrate
.. //depot/projects/ia64_epc/sys/dev/puc/pucdata.c#6 integrate
.. //depot/projects/ia64_epc/sys/i386/acpica/acpi_machdep.c#4 integrate
.. //depot/projects/ia64_epc/sys/i386/acpica/acpi_wakeup.c#3 integrate
.. //depot/projects/ia64_epc/sys/i386/conf/NOTES#12 integrate
.. //depot/projects/ia64_epc/sys/i386/i386/machdep.c#6 integrate
.. //depot/projects/ia64_epc/sys/i386/i386/mp_machdep.c#5 integrate
.. //depot/projects/ia64_epc/sys/i386/linux/linux_sysvec.c#8 integrate
.. //depot/projects/ia64_epc/sys/i386/svr4/svr4_machdep.c#4 integrate
.. //depot/projects/ia64_epc/sys/ia64/ia64/machdep.c#24 integrate
.. //depot/projects/ia64_epc/sys/kern/init_main.c#7 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_condvar.c#6 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_exec.c#5 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_exit.c#10 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_fork.c#10 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_kthread.c#4 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_proc.c#9 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_sig.c#15 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_synch.c#13 integrate
.. //depot/projects/ia64_epc/sys/kern/kern_time.c#3 integrate
.. //depot/projects/ia64_epc/sys/kern/subr_trap.c#8 integrate
.. //depot/projects/ia64_epc/sys/kern/tty.c#6 integrate
.. //depot/projects/ia64_epc/sys/kern/tty_pty.c#5 integrate
.. //depot/projects/ia64_epc/sys/kern/vfs_subr.c#14 integrate
.. //depot/projects/ia64_epc/sys/modules/Makefile#13 integrate
.. //depot/projects/ia64_epc/sys/netncp/ncp_ncp.c#5 integrate
.. //depot/projects/ia64_epc/sys/netsmb/smb_subr.c#5 integrate
.. //depot/projects/ia64_epc/sys/nfsclient/nfs_socket.c#5 integrate
.. //depot/projects/ia64_epc/sys/pc98/conf/NOTES#6 integrate
.. //depot/projects/ia64_epc/sys/pc98/i386/machdep.c#6 integrate
.. //depot/projects/ia64_epc/sys/powerpc/powerpc/machdep.c#7 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/machdep.c#11 integrate
.. //depot/projects/ia64_epc/sys/sys/proc.h#16 integrate
.. //depot/projects/ia64_epc/sys/sys/signalvar.h#5 integrate
.. //depot/projects/ia64_epc/sys/sys/user.h#3 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_glue.c#7 integrate
.. //depot/projects/ia64_epc/usr.sbin/extattrctl/extattrctl.8#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/rpc.lockd/kern.c#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/rpc.lockd/lock_proc.c#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/rpc.lockd/lockd_lock.c#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/sysinstall/install.c#4 integrate
Differences ...
==== //depot/projects/ia64_epc/crypto/openssh/log.h#3 (text+ko) ====
@@ -1,5 +1,5 @@
/* $OpenBSD: log.h,v 1.8 2002/07/19 15:43:33 markus Exp $ */
-/* $FreeBSD: src/crypto/openssh/log.h,v 1.2 2003/05/12 19:22:47 des Exp $ */
+/* $FreeBSD: src/crypto/openssh/log.h,v 1.3 2003/05/13 10:18:49 des Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
@@ -62,13 +62,13 @@
#define debug2 ssh_debug2
#define debug3 ssh_debug3
-void ssh_fatal(const char *, ...) __attribute__((format(printf, 1, 2)));
-void ssh_error(const char *, ...) __attribute__((format(printf, 1, 2)));
-void ssh_log(const char *, ...) __attribute__((format(printf, 1, 2)));
-void ssh_verbose(const char *, ...) __attribute__((format(printf, 1, 2)));
-void ssh_debug(const char *, ...) __attribute__((format(printf, 1, 2)));
-void ssh_debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
-void ssh_debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
+void fatal(const char *, ...) __attribute__((format(printf, 1, 2)));
+void error(const char *, ...) __attribute__((format(printf, 1, 2)));
+void log(const char *, ...) __attribute__((format(printf, 1, 2)));
+void verbose(const char *, ...) __attribute__((format(printf, 1, 2)));
+void debug(const char *, ...) __attribute__((format(printf, 1, 2)));
+void debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
+void debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
void fatal_cleanup(void);
void fatal_add_cleanup(void (*) (void *), void *);
==== //depot/projects/ia64_epc/etc/mtree/BSD.x11-4.dist#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.22 2003/01/16 02:17:28 anholt Exp $
+# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.23 2003/05/14 07:23:54 anholt Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -27,6 +27,8 @@
..
Xaw
..
+ Xcursor
+ ..
Xft
..
Xmu
@@ -115,6 +117,8 @@
..
fs
..
+ icons
+ ..
lbxproxy
..
locale
@@ -124,6 +128,8 @@
..
common
..
+ el_GR.UTF-8
+ ..
en_US.UTF-8
..
en_US.utf
@@ -142,6 +148,8 @@
..
iso8859-10
..
+ iso8859-11
+ ..
iso8859-13
..
iso8859-14
@@ -172,14 +180,22 @@
..
ja.SJIS
..
+ ja_JP.UTF-8
+ ..
ko
..
+ ko_KR.UTF-8
+ ..
koi8-c
..
koi8-r
..
koi8-u
..
+ lib
+ common
+ ..
+ ..
microsoft-cp1251
..
microsoft-cp1255
@@ -200,6 +216,8 @@
..
th_TH.TACTIS
..
+ th_TH.UTF-8
+ ..
tscii-0
..
vi_VN.tcvn
@@ -220,6 +238,10 @@
..
zh_TW.Big5
..
+ zh_TW.UTF-8
+ ..
+ zh_TW.big5
+ ..
..
proxymngr
..
@@ -241,6 +263,8 @@
..
xedit
lisp
+ progmodes
+ ..
..
..
xinit
@@ -285,6 +309,8 @@
..
nec
..
+ pc
+ ..
sgi
..
sony
@@ -322,6 +348,8 @@
..
..
libdata
+ pkgconfig
+ ..
..
libexec
..
==== //depot/projects/ia64_epc/lib/libc/sys/stat.2#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)stat.2 8.4 (Berkeley) 5/1/95
-.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.31 2002/12/19 09:40:25 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.32 2003/05/13 08:10:05 dougb Exp $
.\"
.Dd February 15, 2002
.Dt STAT 2
@@ -85,36 +85,7 @@
structure
as defined by
.Aq Pa sys/stat.h
-(shown below)
and into which information is placed concerning the file.
-.Bd -literal
-struct stat {
- dev_t st_dev; /* inode's device */
- ino_t st_ino; /* inode's number */
- mode_t st_mode; /* inode protection mode */
- nlink_t st_nlink; /* number of hard links */
- uid_t st_uid; /* user ID of the file's owner */
- gid_t st_gid; /* group ID of the file's group */
- dev_t st_rdev; /* device type */
-#ifndef _POSIX_SOURCE
- struct timespec st_atimespec; /* time of last access */
- struct timespec st_mtimespec; /* time of last data modification */
- struct timespec st_ctimespec; /* time of last file status change */
-#else
- time_t st_atime; /* time of last access */
- long st_atimensec; /* nsec of last access */
- time_t st_mtime; /* time of last data modification */
- long st_mtimensec; /* nsec of last data modification */
- time_t st_ctime; /* time of last file status change */
- long st_ctimensec; /* nsec of last file status change */
-#endif
- off_t st_size; /* file size, in bytes */
- int64_t st_blocks; /* blocks allocated for file */
- u_int32_t st_blksize; /* optimal blocksize for I/O */
- fflags_t st_flags; /* user defined flags for file */
- u_int32_t st_gen; /* file generation number */
-};
-.Ed
.Pp
The time-related fields of
.Fa struct stat
@@ -149,6 +120,8 @@
and
.Xr write 2
system calls.
+.It st_birthtime
+Time when the inode was created.
.El
.Pp
If
==== //depot/projects/ia64_epc/lib/libkvm/kvm_proc.c#6 (text+ko) ====
@@ -42,7 +42,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.66 2003/04/10 17:41:40 julian Exp $");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.68 2003/05/14 15:01:20 jhb Exp $");
/*
* Proc traversal interface for kvm. ps and w are (probably) the exclusive
@@ -100,7 +100,7 @@
struct session sess;
struct tty tty;
struct vmspace vmspace;
- struct procsig procsig;
+ struct sigacts sigacts;
struct pstats pstats;
struct ucred ucred;
struct thread mtd;
@@ -192,14 +192,14 @@
kp->ki_textvp = proc.p_textvp;
kp->ki_fd = proc.p_fd;
kp->ki_vmspace = proc.p_vmspace;
- if (proc.p_procsig != NULL) {
- if (KREAD(kd, (u_long)proc.p_procsig, &procsig)) {
+ if (proc.p_sigacts != NULL) {
+ if (KREAD(kd, (u_long)proc.p_sigacts, &sigacts)) {
_kvm_err(kd, kd->program,
- "can't read procsig at %x", proc.p_procsig);
+ "can't read sigacts at %x", proc.p_sigacts);
return (-1);
}
- kp->ki_sigignore = procsig.ps_sigignore;
- kp->ki_sigcatch = procsig.ps_sigcatch;
+ kp->ki_sigignore = sigacts.ps_sigignore;
+ kp->ki_sigcatch = sigacts.ps_sigcatch;
}
if ((proc.p_sflag & PS_INMEM) && proc.p_stats != NULL) {
if (KREAD(kd, (u_long)proc.p_stats, &pstats)) {
==== //depot/projects/ia64_epc/release/alpha/dokern.sh#4 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/release/alpha/dokern.sh,v 1.68 2003/05/07 18:14:00 obrien Exp $
+# $FreeBSD: src/release/alpha/dokern.sh,v 1.70 2003/05/15 01:28:39 obrien Exp $
#
# XXX sort by order in GENERIC, not alphabetical
sed \
- -e 's/ident.*GENERIC/ident BOOTMFS/g'
+ -e 's/ident.*GENERIC/ident BOOTMFS/g' \
-e '/DEBUG/d' \
-e '/DEC_KN8AE/d' \
-e '/SOFTUPDATES/d' \
@@ -59,6 +59,12 @@
-e '/ axe /d' \
-e '/ cue /d' \
-e '/ kue /d' \
+ -e '/ firewire /d' \
+ -e '/ sbp /d' \
+ -e '/ fwe /d' \
+
+# XXX: blank line above intentional so lines may be added below the last
+# entry with ease.
echo "options SCSI_NO_OP_STRINGS"
echo "options SCSI_NO_SENSE_STRINGS"
==== //depot/projects/ia64_epc/release/alpha/drivers.conf#5 (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.16 2003/05/12 13:12:08 wilko Exp $
+# $FreeBSD: src/release/alpha/drivers.conf,v 1.17 2003/05/14 15:38:44 obrien Exp $
#
# drv: driver name in kernel config file
@@ -43,7 +43,7 @@
miibus miibus 2 network "MII bus support"
pcn if_pcn 2 network "AMD Am79C97x PCI 10/100"
rl if_rl 2 network "RealTek 8129/8139"
-tl if_tl 2 network "Texas Instruments ThunderLAN"
+tl if_tl 3 network "Texas Instruments ThunderLAN"
txp if_txp 2 network "3Com 3XP Typhoon/Sidewinder (3CR990)"
vr if_vr 2 network "VIA Rhine, Rhine II"
vx if_vx 2 network "3Com 3c590 and 3c595 EtherLink III"
==== //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#13 (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.148 2003/05/10 16:30:56 bmah Exp $</pubdate>
+ <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>
</sect1info>
<title>Supported Devices</title>
@@ -834,6 +834,8 @@
</itemizedlist>
</para>
+ <para arch="i386">IBM / Adaptec ServeRAID series (ips driver)</para>
+
<para arch="i386,alpha,pc98,sparc64">LSI Logic Fusion/MP
architecture Fiber Channel controllers (mpt driver)
<itemizedlist>
==== //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#22 (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.566 2003/05/08 22:31:00 bmah Exp $</pubdate>
+ <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>
<copyright>
<year>2000</year>
@@ -439,6 +439,9 @@
believed to fix problems detecting attached disks during
installation.</para>
+ <para arch="i386">The ips driver, which supports the IBM (now
+ Adaptec) ServeRAID series, has been added.</para>
+
<para>A bug in the &man.mly.4; driver that caused hangs has been
corrected.</para>
==== //depot/projects/ia64_epc/sbin/bsdlabel/bsdlabel.c#6 (text+ko) ====
@@ -54,7 +54,7 @@
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.92 2003/05/09 20:26:17 phk Exp $");
+__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.93 2003/05/13 19:42:52 phk Exp $");
#include <sys/param.h>
#include <stdint.h>
@@ -165,6 +165,10 @@
labeloffset = 512;
bbsize = 8192;
alphacksum = 0;
+ } else if (!strcmp(optarg, "pc98")) {
+ labeloffset = 512;
+ bbsize = 8192;
+ alphacksum = 0;
} else if (!strcmp(optarg, "alpha")) {
labeloffset = 64;
bbsize = 8192;
==== //depot/projects/ia64_epc/sbin/devd/parse.y#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/sbin/devd/parse.y,v 1.2 2002/12/07 08:04:36 imp Exp $
+ * $FreeBSD: src/sbin/devd/parse.y,v 1.3 2003/05/15 02:23:32 imp Exp $
*/
#include "devd.h"
@@ -100,16 +100,19 @@
attach_block
: ATTACH NUMBER BEGINBLOCK match_or_action_list ENDBLOCK SEMICOLON
{ add_attach($2, $4); }
+ | ATTACH NUMBER BEGINBLOCK ENDBLOCK SEMICOLON
;
detach_block
: DETACH NUMBER BEGINBLOCK match_or_action_list ENDBLOCK SEMICOLON
{ add_detach($2, $4); }
+ | DETACH NUMBER BEGINBLOCK ENDBLOCK SEMICOLON
;
nomatch_block
: NOMATCH NUMBER BEGINBLOCK match_or_action_list ENDBLOCK SEMICOLON
{ add_nomatch($2, $4); }
+ | NOMATCH NUMBER BEGINBLOCK ENDBLOCK SEMICOLON
;
match_or_action_list
==== //depot/projects/ia64_epc/sbin/ifconfig/ifconfig.8#5 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94
-.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.69 2003/04/28 16:47:40 sam Exp $
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.71 2003/05/14 16:22:16 ru Exp $
.\"
.Dd April 28, 2003
.Dt IFCONFIG 8
@@ -307,12 +307,12 @@
operating mode on the interface to
.Ar mode .
For IEEE 802.11 wireless interfaces that support multiple operating modes
-this directive is used to select between 802.11a (\c
-.Dq 11a ),
-802.11b (\c
-.Dq 11b ),
-and 802.11g (\c
-.Dq 11g )
+this directive is used to select between 802.11a
+.Pq Dq 11a ,
+802.11b
+.Pq Dq 11b ,
+and 802.11g
+.Pq Dq 11g
operating modes.
.It Cm rxcsum , txcsum
If the driver supports user-configurable checksum offloading,
@@ -466,7 +466,7 @@
See the
.Ar address
option above for more information.
-3\" see
+.\" see
.\" Xr eon 5 .
.\" .It Cm nsellength Ar n
.\" .Pf ( Tn ISO
==== //depot/projects/ia64_epc/share/man/man4/iir.4#4 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/share/man/man4/iir.4,v 1.3 2003/03/25 18:13:20 trhodes Exp $
+.\" $FreeBSD: src/share/man/man4/iir.4,v 1.4 2003/05/14 17:53:40 trhodes Exp $
.\" Written by Tom Rhodes
.\" This file is in the public domain.
.\"
@@ -63,11 +63,3 @@
.An Tom Rhodes Aq trhodes at FreeBSD.org
and is based on information supplied by the driver authors and the website of
.An Mike Smith Aq msmith at FreeBSD.org .
-.Sh BUGS
-During a
-.Fx
-install, the
-.Nm
-controller appears to correctly probe, but finds no disk devices.
-The card in question is an Intel SRCU32 RAID controller with 32Mb RAM,
-Firmware revision 2.33.01.
==== //depot/projects/ia64_epc/sys/alpha/alpha/machdep.c#6 (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/alpha/alpha/machdep.c,v 1.201 2003/04/25 01:50:28 deischen Exp $
+ * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.202 2003/05/13 20:35:56 jhb Exp $
*/
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -1135,11 +1135,13 @@
td = curthread;
p = td->td_proc;
PROC_LOCK_ASSERT(p, MA_OWNED);
+ psp = p->p_sigacts;
+ mtx_assert(&psp->ps_mtx, MA_OWNED);
+
frame = td->td_frame;
- oonstack = sigonstack(alpha_pal_rdusp());
fsize = sizeof ksi;
rndfsize = ((fsize + 15) / 16) * 16;
- psp = p->p_sigacts;
+ oonstack = sigonstack(alpha_pal_rdusp());
/*
* Allocate and validate space for the signal handler
@@ -1157,6 +1159,7 @@
#endif
} else
sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize);
+ mtx_unlock(&psp->ps_mtx);
PROC_UNLOCK(p);
/*
@@ -1212,7 +1215,8 @@
frame->tf_regs[FRAME_A0] = sig;
frame->tf_regs[FRAME_FLAGS] = 0; /* full restore */
PROC_LOCK(p);
- if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig))
+ mtx_lock(&psp->ps_mtx);
+ if (SIGISMEMBER(psp->ps_siginfo, sig))
frame->tf_regs[FRAME_A1] = (u_int64_t)sip;
else
frame->tf_regs[FRAME_A1] = code;
@@ -1237,6 +1241,7 @@
p = td->td_proc;
PROC_LOCK_ASSERT(p, MA_OWNED);
psp = p->p_sigacts;
+ mtx_assert(&psp->ps_mtx, MA_OWNED);
frame = td->td_frame;
oonstack = sigonstack(alpha_pal_rdusp());
@@ -1278,6 +1283,7 @@
#endif
} else
sfp = (struct sigframe4 *)(alpha_pal_rdusp() - rndfsize);
+ mtx_unlock(&psp->ps_mtx);
PROC_UNLOCK(p);
/* save the floating-point state, if necessary, then copy it. */
@@ -1313,7 +1319,8 @@
frame->tf_regs[FRAME_PC] = PS_STRINGS - szfreebsd4_sigcode;
frame->tf_regs[FRAME_A0] = sig;
PROC_LOCK(p);
- if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) {
+ mtx_lock(&psp->ps_mtx);
+ if (SIGISMEMBER(psp->ps_siginfo, sig)) {
frame->tf_regs[FRAME_A1] = (u_int64_t)&(sfp->sf_si);
/* Fill in POSIX parts */
@@ -1345,6 +1352,7 @@
p = td->td_proc;
PROC_LOCK_ASSERT(p, MA_OWNED);
psp = p->p_sigacts;
+ mtx_assert(&psp->ps_mtx, MA_OWNED);
#ifdef COMPAT_FREEBSD4
if (SIGISMEMBER(psp->ps_freebsd4, sig)) {
freebsd4_sendsig(catcher, sig, mask, code);
@@ -1399,6 +1407,7 @@
#endif
} else
sfp = (struct sigframe *)(alpha_pal_rdusp() - rndfsize);
+ mtx_unlock(&psp->ps_mtx);
PROC_UNLOCK(p);
/* save the floating-point state, if necessary, then copy it. */
@@ -1434,7 +1443,8 @@
frame->tf_regs[FRAME_PC] = PS_STRINGS - szsigcode;
frame->tf_regs[FRAME_A0] = sig;
PROC_LOCK(p);
- if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) {
+ mtx_lock(&psp->ps_mtx);
+ if (SIGISMEMBER(psp->ps_siginfo, sig)) {
frame->tf_regs[FRAME_A1] = (u_int64_t)&(sfp->sf_si);
/* Fill in POSIX parts */
==== //depot/projects/ia64_epc/sys/alpha/osf1/osf1_signal.c#7 (text+ko) ====
@@ -30,7 +30,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/alpha/osf1/osf1_signal.c,v 1.32 2003/04/29 06:33:03 alc Exp $
+ * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.33 2003/05/13 20:35:56 jhb Exp $
*/
#include "opt_compat.h"
@@ -471,6 +471,7 @@
p = td->td_proc;
PROC_LOCK_ASSERT(p, MA_OWNED);
psp = p->p_sigacts;
+ mtx_assert(&psp->ps_mtx, MA_OWNED);
frame = td->td_frame;
oonstack = sigonstack(alpha_pal_rdusp());
@@ -490,6 +491,7 @@
p->p_sigstk.ss_flags |= SS_ONSTACK;
} else
sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize);
+ mtx_unlock(&psp->ps_mtx);
PROC_UNLOCK(p);
/*
@@ -551,6 +553,7 @@
frame->tf_regs[FRAME_FLAGS] = 0; /* full restore */
alpha_pal_wrusp((unsigned long)sip);
PROC_LOCK(p);
+ mtx_lock(&psp->ps_mtx);
}
==== //depot/projects/ia64_epc/sys/amd64/amd64/cpu_switch.S#3 (text+ko) ====
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.139 2003/05/12 02:37:28 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.141 2003/05/15 00:23:39 peter Exp $
*/
#include <machine/asmacros.h>
@@ -118,6 +118,12 @@
movl %eax,PCB_GSBASE(%r8)
movl %edx,PCB_GSBASE+4(%r8)
+ /* Save segment selector numbers */
+ movl %ds,PCB_DS(%r8)
+ movl %es,PCB_ES(%r8)
+ movl %fs,PCB_FS(%r8)
+ movl %gs,PCB_GS(%r8)
+
/* have we used fp, and need a save? */
cmpq %rdi,PCPU(FPCURTHREAD)
jne 1f
@@ -160,6 +166,17 @@
*/
movq TD_PCB(%rsi),%r8
+ /* Restore segment selector numbers */
+ movl PCB_DS(%r8),%ds
+ movl PCB_ES(%r8),%es
+ movl PCB_FS(%r8),%fs
+
+ /* Restore userland %gs while preserving kernel gsbase */
+ movl $MSR_GSBASE,%ecx
+ rdmsr
+ movl PCB_GS(%r8),%gs
+ wrmsr
+
/* Restore userland %fs */
movl $MSR_FSBASE,%ecx
movl PCB_FSBASE(%r8),%eax
==== //depot/projects/ia64_epc/sys/amd64/amd64/exception.S#4 (text+ko) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.109 2003/05/12 18:33:19 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.110 2003/05/14 04:10:47 peter Exp $
*/
#include <machine/asmacros.h>
@@ -218,40 +218,6 @@
jmp alltraps_pushregs_no_rdi
/*
- * Call gate entry for FreeBSD ELF and Linux/NetBSD syscall (int 0x80)
- *
- * This is a SDT_SYSIDT entry point (unlike the i386 port) so that we
- * can do a swapgs before enabling interrupts. This is critical because
- * if we took an interrupt before swapgs, the interrupt code would see
- * that it originated in supervisor mode and skip the swapgs.
- */
- SUPERALIGN_TEXT
-IDTVEC(int0x80_syscall)
- swapgs
- sti
- pushq $2 /* sizeof "int 0x80" */
- subq $TF_ERR,%rsp /* skip over tf_trapno */
- movq %rdi,TF_RDI(%rsp)
- movq %rsi,TF_RSI(%rsp)
- movq %rdx,TF_RDX(%rsp)
- movq %rcx,TF_RCX(%rsp)
- movq %r8,TF_R8(%rsp)
- movq %r9,TF_R9(%rsp)
- movq %rax,TF_RAX(%rsp)
- movq %rbx,TF_RBX(%rsp)
- movq %rbp,TF_RBP(%rsp)
- movq %r10,TF_R10(%rsp)
- movq %r11,TF_R11(%rsp)
- movq %r12,TF_R12(%rsp)
- movq %r13,TF_R13(%rsp)
- movq %r14,TF_R14(%rsp)
- movq %r15,TF_R15(%rsp)
- FAKE_MCOUNT(13*4(%rsp))
- call syscall
- MEXITCOUNT
- jmp doreti
-
-/*
* Fast syscall entry point. We enter here with just our new %cs/%ss set,
* and the new privilige level. We are still running on the old user stack
* pointer. We have to juggle a few things around to find our stack etc.
@@ -353,6 +319,7 @@
*/
.text
SUPERALIGN_TEXT
+ .globl doreti
.type doreti, at function
doreti:
FAKE_MCOUNT(bintr) /* init "from" bintr -> doreti */
==== //depot/projects/ia64_epc/sys/amd64/amd64/genassym.c#3 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)genassym.c 5.11 (Berkeley) 5/10/91
- * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.144 2003/05/12 18:33:19 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.146 2003/05/15 00:23:39 peter Exp $
*/
#include "opt_compat.h"
@@ -125,6 +125,10 @@
ASSYM(PCB_RFLAGS, offsetof(struct pcb, pcb_rflags));
ASSYM(PCB_FSBASE, offsetof(struct pcb, pcb_fsbase));
ASSYM(PCB_GSBASE, offsetof(struct pcb, pcb_gsbase));
+ASSYM(PCB_DS, offsetof(struct pcb, pcb_ds));
+ASSYM(PCB_ES, offsetof(struct pcb, pcb_es));
+ASSYM(PCB_FS, offsetof(struct pcb, pcb_fs));
+ASSYM(PCB_GS, offsetof(struct pcb, pcb_gs));
ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags));
ASSYM(PCB_FULLCTX, PCB_FULLCTX);
@@ -181,8 +185,10 @@
ASSYM(KDSEL, GSEL(GDATA_SEL, SEL_KPL));
ASSYM(KUCSEL, GSEL(GUCODE_SEL, SEL_UPL));
ASSYM(KUDSEL, GSEL(GUDATA_SEL, SEL_UPL));
+ASSYM(KUC32SEL, GSEL(GUCODE32_SEL, SEL_UPL));
ASSYM(MSR_FSBASE, MSR_FSBASE);
+ASSYM(MSR_GSBASE, MSR_GSBASE);
ASSYM(MSR_KGSBASE, MSR_KGSBASE);
ASSYM(GPROC0_SEL, GPROC0_SEL);
==== //depot/projects/ia64_epc/sys/amd64/amd64/locore.S#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/amd64/amd64/locore.S,v 1.172 2003/05/01 01:05:21 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/locore.S,v 1.173 2003/05/15 00:20:17 peter Exp $
*/
#include <machine/asmacros.h>
@@ -34,15 +34,6 @@
#include "assym.s"
/*
- * PTmap is recursive pagemap at top of virtual address space.
- * Within PTmap, the page directory can be found (third indirection).
- */
- .globl PTmap,PTD,PTDpde
- .set PTmap,(PTDPTDI << PDRSHIFT)
- .set PTD,PTmap + (PTDPTDI * PAGE_SIZE)
- .set PTDpde,PTD + (PTDPTDI * PDESIZE)
-
-/*
* Compiled KERNBASE location
*/
.globl kernbase
==== //depot/projects/ia64_epc/sys/amd64/amd64/machdep.c#4 (text+ko) ====
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.575 2003/05/12 18:37:56 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.578 2003/05/15 00:23:39 peter Exp $
*/
#include "opt_atalk.h"
@@ -124,12 +124,11 @@
#define EFL_SECURE(ef, oef) ((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0)
static void cpu_startup(void *);
-static void fpstate_drop(struct thread *td);
static void get_fpcontext(struct thread *td, mcontext_t *mcp);
static int set_fpcontext(struct thread *td, const mcontext_t *mcp);
SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
-int _udatasel, _ucodesel;
+int _udatasel, _ucodesel, _ucode32sel;
u_long atdevbase;
u_int64_t modulep; /* phys addr of metadata table */
@@ -235,6 +234,7 @@
p = td->td_proc;
PROC_LOCK_ASSERT(p, MA_OWNED);
psp = p->p_sigacts;
+ mtx_assert(&psp->ps_mtx, MA_OWNED);
regs = td->td_frame;
oonstack = sigonstack(regs->tf_rsp);
@@ -262,7 +262,6 @@
sp = (char *)regs->tf_rsp - sizeof(struct sigframe) - 128;
/* Align to 16 bytes. */
sfp = (struct sigframe *)((unsigned long)sp & ~0xF);
- PROC_UNLOCK(p);
/* Translate the signal if appropriate. */
if (p->p_sysent->sv_sigtbl && sig <= p->p_sysent->sv_sigsize)
@@ -271,8 +270,7 @@
/* Build the argument list for the signal handler. */
regs->tf_rdi = sig; /* arg 1 in %rdi */
regs->tf_rdx = (register_t)&sfp->sf_uc; /* arg 3 in %rdx */
- PROC_LOCK(p);
- if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) {
+ if (SIGISMEMBER(psp->ps_siginfo, sig)) {
/* Signal handler installed with SA_SIGINFO. */
regs->tf_rsi = (register_t)&sfp->sf_si; /* arg 2 in %rsi */
sf.sf_ahu.sf_action = (__siginfohandler_t *)catcher;
@@ -287,6 +285,7 @@
regs->tf_rcx = regs->tf_addr; /* arg 4 in %rcx */
sf.sf_ahu.sf_handler = catcher;
}
+ mtx_unlock(&psp->ps_mtx);
PROC_UNLOCK(p);
/*
@@ -305,6 +304,7 @@
regs->tf_rflags &= ~PSL_T;
regs->tf_cs = _ucodesel;
PROC_LOCK(p);
+ mtx_lock(&psp->ps_mtx);
}
/*
@@ -389,6 +389,16 @@
return (EJUSTRETURN);
}
+#ifdef COMPAT_FREEBSD4
+int
+freebsd4_sigreturn(struct thread *td, struct freebsd4_sigreturn_args *uap)
+{
+
+ return sigreturn(td, (struct sigreturn_args *)uap);
+}
+#endif
+
+
/*
* Machine dependent boot() routine
*
@@ -467,10 +477,18 @@
struct trapframe *regs = td->td_frame;
struct pcb *pcb = td->td_pcb;
+ wrmsr(MSR_FSBASE, 0);
+ wrmsr(MSR_KGSBASE, 0); /* User value while we're in the kernel */
pcb->pcb_fsbase = 0;
pcb->pcb_gsbase = 0;
- wrmsr(MSR_FSBASE, 0);
- wrmsr(MSR_KGSBASE, 0); /* User value while we're in the kernel */
+ load_ds(_udatasel);
+ load_es(_udatasel);
+ load_fs(_udatasel);
+ load_gs(_udatasel);
+ pcb->pcb_ds = _udatasel;
+ pcb->pcb_es = _udatasel;
+ pcb->pcb_fs = _udatasel;
+ pcb->pcb_gs = _udatasel;
bzero((char *)regs, sizeof(struct trapframe));
regs->tf_rip = entry;
@@ -589,7 +607,7 @@
0xfffff, /* length - all address space */
SDT_MEMERA, /* segment type */
SEL_UPL, /* segment descriptor priority level */
- 0, /* segment descriptor present */
+ 1, /* segment descriptor present */
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list