From owner-p4-projects@FreeBSD.ORG Sun Sep 7 00:12:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B31316A4C1; Sun, 7 Sep 2003 00:12:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D3C4816A4BF for ; Sun, 7 Sep 2003 00:12:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 520D343FDF for ; Sun, 7 Sep 2003 00:12:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h877Co0U019698 for ; Sun, 7 Sep 2003 00:12:50 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h877CoMQ019695 for perforce@freebsd.org; Sun, 7 Sep 2003 00:12:50 -0700 (PDT) Date: Sun, 7 Sep 2003 00:12:50 -0700 (PDT) Message-Id: <200309070712.h877CoMQ019695@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37719 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Sep 2003 07:12:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=37719 Change 37719 by marcel@marcel_nfs on 2003/09/07 00:11:54 Diff reduction. Affected files ... .. //depot/projects/ia64/lib/libpam/libpam/Makefile#23 edit Differences ... ==== //depot/projects/ia64/lib/libpam/libpam/Makefile#23 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Sep 7 17:03:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 859A216A4C1; Sun, 7 Sep 2003 17:03:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E28116A4BF for ; Sun, 7 Sep 2003 17:03:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 049B643FBD for ; Sun, 7 Sep 2003 17:03:34 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8803X0U001439 for ; Sun, 7 Sep 2003 17:03:33 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8803XnV001436 for perforce@freebsd.org; Sun, 7 Sep 2003 17:03:33 -0700 (PDT) Date: Sun, 7 Sep 2003 17:03:33 -0700 (PDT) Message-Id: <200309080003.h8803XnV001436@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37753 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2003 00:03:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=37753 Change 37753 by marcel@marcel_nfs on 2003/09/07 17:02:50 IFC @37752 Affected files ... .. //depot/projects/uart/alpha/alpha/pmap.c#10 integrate .. //depot/projects/uart/coda/cnode.h#2 integrate .. //depot/projects/uart/coda/coda.h#2 integrate .. //depot/projects/uart/coda/coda_namecache.c#2 integrate .. //depot/projects/uart/coda/coda_namecache.h#2 integrate .. //depot/projects/uart/coda/coda_subr.c#2 integrate .. //depot/projects/uart/coda/coda_subr.h#2 integrate .. //depot/projects/uart/coda/coda_venus.c#2 integrate .. //depot/projects/uart/coda/coda_venus.h#2 integrate .. //depot/projects/uart/coda/coda_vfsops.c#2 integrate .. //depot/projects/uart/coda/coda_vfsops.h#2 integrate .. //depot/projects/uart/coda/coda_vnops.c#3 integrate .. //depot/projects/uart/compat/linux/linux_misc.c#5 integrate .. //depot/projects/uart/conf/NOTES#12 integrate .. //depot/projects/uart/conf/options#11 integrate .. //depot/projects/uart/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/uart/dev/sound/isa/ess.c#3 integrate .. //depot/projects/uart/dev/sound/isa/mss.c#3 integrate .. //depot/projects/uart/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/uart/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/uart/dev/sound/isa/sndbuf_dma.c#2 integrate .. //depot/projects/uart/dev/sound/pci/aureal.c#5 integrate .. //depot/projects/uart/dev/sound/pci/aureal.h#2 integrate .. //depot/projects/uart/dev/sound/pci/emu10k1.c#5 integrate .. //depot/projects/uart/dev/sound/pci/es137x.c#6 integrate .. //depot/projects/uart/dev/sound/pci/maestro.c#5 integrate .. //depot/projects/uart/dev/sound/pci/neomagic-coeff.h#2 integrate .. //depot/projects/uart/dev/sound/pci/neomagic.c#4 integrate .. //depot/projects/uart/dev/sound/pci/neomagic.h#2 integrate .. //depot/projects/uart/dev/sound/pci/solo.c#5 integrate .. //depot/projects/uart/dev/sound/pci/t4dwave.c#5 integrate .. //depot/projects/uart/dev/sound/pci/t4dwave.h#2 integrate .. //depot/projects/uart/dev/sound/pcm/ac97.c#5 integrate .. //depot/projects/uart/dev/sound/pcm/ac97.h#3 integrate .. //depot/projects/uart/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/uart/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/uart/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/uart/dev/sound/pcm/channel.h#2 integrate .. //depot/projects/uart/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/uart/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/uart/dev/sound/pcm/fake.c#2 integrate .. //depot/projects/uart/dev/sound/pcm/feeder.c#4 integrate .. //depot/projects/uart/dev/sound/pcm/feeder.h#4 integrate .. //depot/projects/uart/dev/sound/pcm/feeder_fmt.c#3 integrate .. //depot/projects/uart/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/uart/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/uart/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/uart/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/uart/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/uart/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/uart/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/uart/dev/uart/uart_cpu.h#10 integrate .. //depot/projects/uart/dev/uart/uart_cpu_alpha.c#5 integrate .. //depot/projects/uart/dev/uart/uart_cpu_amd64.c#3 integrate .. //depot/projects/uart/dev/uart/uart_cpu_i386.c#4 integrate .. //depot/projects/uart/dev/uart/uart_cpu_ia64.c#4 integrate .. //depot/projects/uart/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#12 integrate .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#27 integrate .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#13 integrate .. //depot/projects/uart/i386/i386/db_interface.c#3 integrate .. //depot/projects/uart/i386/i386/machdep.c#4 integrate .. //depot/projects/uart/i386/isa/clock.c#5 integrate .. //depot/projects/uart/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/uart/ia64/acpica/madt.c#3 integrate .. //depot/projects/uart/ia64/conf/GENERIC#3 integrate .. //depot/projects/uart/ia64/conf/GENERIC.hints#3 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#8 integrate .. //depot/projects/uart/kern/kern_umtx.c#5 integrate .. //depot/projects/uart/modules/Makefile#8 integrate .. //depot/projects/uart/modules/coda/Makefile#2 integrate .. //depot/projects/uart/modules/coda5/Makefile#1 branch .. //depot/projects/uart/modules/uart/Makefile#7 integrate .. //depot/projects/uart/vm/vm_mmap.c#4 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/pmap.c#10 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.135 2003/08/28 23:12:28 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.136 2003/09/07 20:02:38 alc Exp $"); #include #include @@ -2749,23 +2749,30 @@ */ if ((*pte & PG_FOW) == 0) val |= MINCORE_MODIFIED|MINCORE_MODIFIED_OTHER; - /* - * Modified by someone - */ - else if (m->dirty || pmap_is_modified(m)) - val |= MINCORE_MODIFIED_OTHER; + else { + /* + * Modified by someone + */ + vm_page_lock_queues(); + if (m->dirty || pmap_is_modified(m)) + val |= MINCORE_MODIFIED_OTHER; + vm_page_unlock_queues(); + } /* * Referenced by us */ if ((*pte & (PG_FOR | PG_FOE)) == 0) val |= MINCORE_REFERENCED|MINCORE_REFERENCED_OTHER; - - /* - * Referenced by someone - */ - else if ((m->flags & PG_REFERENCED) || pmap_ts_referenced(m)) { - val |= MINCORE_REFERENCED_OTHER; - vm_page_flag_set(m, PG_REFERENCED); + else { + /* + * Referenced by someone + */ + vm_page_lock_queues(); + if ((m->flags & PG_REFERENCED) || pmap_ts_referenced(m)) { + val |= MINCORE_REFERENCED_OTHER; + vm_page_flag_set(m, PG_REFERENCED); + } + vm_page_unlock_queues(); } } return val; ==== //depot/projects/uart/coda/cnode.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/cnode.h,v 1.12 2003/03/06 10:48:03 tjr Exp $ + * $FreeBSD: src/sys/coda/cnode.h,v 1.13 2003/09/07 07:43:09 tjr Exp $ * */ @@ -101,7 +101,7 @@ struct cnode { struct vnode *c_vnode; u_short c_flags; /* flags (see below) */ - ViceFid c_fid; /* file handle */ + CodaFid c_fid; /* file handle */ struct lock c_lock; /* new lock protocol */ struct vnode *c_ovp; /* open vnode pointer */ u_short c_ocount; /* count of openers */ @@ -197,7 +197,7 @@ extern int coda_vmflush(struct cnode *cp); /* cfs_vnodeops.h */ -extern struct cnode *make_coda_node(ViceFid *fid, struct mount *vfsp, short type); +extern struct cnode *make_coda_node(CodaFid *fid, struct mount *vfsp, short type); extern int coda_vnodeopstats_init(void); /* coda_vfsops.h */ ==== //depot/projects/uart/coda/coda.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda.h,v 1.9 1999/12/29 04:54:30 peter Exp $ + * $FreeBSD: src/sys/coda/coda.h,v 1.10 2003/09/07 07:43:09 tjr Exp $ * */ @@ -41,8 +41,8 @@ #ifndef _CODA_HEADER_ #define _CODA_HEADER_ +#include "opt_coda.h" /* for COMPAT_CODA_5 option */ - /* Catch new _KERNEL defn for NetBSD */ #ifdef __NetBSD__ #include @@ -162,59 +162,70 @@ #endif -#ifndef _FID_T_ -#define _FID_T_ 1 -typedef u_long VolumeId; -typedef u_long VnodeId; -typedef u_long Unique_t; -typedef u_long FileVersion; -#endif +#ifdef CODA_COMPAT_5 -#ifndef _VICEFID_T_ -#define _VICEFID_T_ 1 -typedef struct ViceFid { - VolumeId Volume; - VnodeId Vnode; - Unique_t Unique; -} ViceFid; -#endif /* VICEFID */ +typedef struct { + u_long Volume; + u_long Vnode; + u_long Unique; +} CodaFid; +static __inline__ ino_t coda_f2i(CodaFid *fid) +{ + if (!fid) return 0; + return (fid->Unique + (fid->Vnode<<10) + (fid->Volume<<20)); +} -#ifdef __linux__ -static __inline__ ino_t coda_f2i(struct ViceFid *fid) +static __inline__ char * coda_f2s(CodaFid *fid) +{ + static char fid_str [35]; + snprintf (fid_str, 35, "[%lx.%lx.%lx]", fid->Volume, + fid->Vnode, fid->Unique); + return fid_str; +} + +static __inline__ int coda_fid_eq (CodaFid *fid1, CodaFid *fid2) { - if ( ! fid ) - return 0; - if (fid->Vnode == 0xfffffffe || fid->Vnode == 0xffffffff) - return ((fid->Volume << 20) | (fid->Unique & 0xfffff)); - else - return (fid->Unique + (fid->Vnode<<10) + (fid->Volume<<20)); + return (fid1->Volume == fid2->Volume && + fid1->Vnode == fid2->Vnode && + fid1->Unique == fid2->Unique); } - -#else -#define coda_f2i(fid)\ - ((fid) ? ((fid)->Unique + ((fid)->Vnode<<10) + ((fid)->Volume<<20)) : 0) -#endif + +struct coda_cred { + u_int32_t cr_uid, cr_euid, cr_suid, cr_fsuid; /* Real, efftve, set, fs uid*/ + u_int32_t cr_groupid, cr_egid, cr_sgid, cr_fsgid; /* same for groups */ +}; +#else /* CODA_COMPAT_5 */ -#ifndef __BIT_TYPES_DEFINED__ -#define u_int32_t unsigned int -#endif +typedef struct { + u_int32_t opaque[4]; +} CodaFid; +static __inline__ ino_t coda_f2i(CodaFid *fid) +{ + if ( ! fid ) + return 0; + return (fid->opaque[3] ^ (fid->opaque[2]<<10) ^ (fid->opaque[1]<<20) ^ fid->opaque[0]); +} + +static __inline__ char * coda_f2s(CodaFid *fid) + { + static char fid_str [35]; + snprintf (fid_str, 35, "[%x.%x.%x.%x]", fid->opaque[0], + fid->opaque[1], fid->opaque[2], fid->opaque[3]); + return fid_str; + } -#ifndef _VUID_T_ -#define _VUID_T_ -typedef u_int32_t vuid_t; -typedef u_int32_t vgid_t; -#endif /*_VUID_T_ */ +static __inline__ int coda_fid_eq (CodaFid *fid1, CodaFid *fid2) +{ + return (fid1->opaque[0] == fid2->opaque[0] && + fid1->opaque[1] == fid2->opaque[1] && + fid1->opaque[2] == fid2->opaque[2] && + fid1->opaque[3] == fid2->opaque[3]); +} -#ifndef _CODACRED_T_ -#define _CODACRED_T_ -struct coda_cred { - vuid_t cr_uid, cr_euid, cr_suid, cr_fsuid; /* Real, efftve, set, fs uid*/ - vgid_t cr_groupid, cr_egid, cr_sgid, cr_fsgid; /* same for groups */ -}; -#endif +#endif /* CODA_COMPAT_5 */ #ifndef _VENUS_VATTR_T_ #define _VENUS_VATTR_T_ @@ -227,8 +238,8 @@ int va_type; /* vnode type (for create) */ u_short va_mode; /* files access mode and type */ short va_nlink; /* number of references to file */ - vuid_t va_uid; /* owner user id */ - vgid_t va_gid; /* owner group id */ + uid_t va_uid; /* owner user id */ + gid_t va_gid; /* owner group id */ long va_fileid; /* file id */ u_quad_t va_size; /* file size in bytes */ long va_blocksize; /* blocksize preferred for i/o */ @@ -244,12 +255,21 @@ #endif +/* structure used by CODA_STATFS for getting cache information from venus */ +struct coda_statfs { + int32_t f_blocks; + int32_t f_bfree; + int32_t f_bavail; + int32_t f_files; + int32_t f_ffree; +}; + /* * Kernel <--> Venus communications. */ #define CODA_ROOT 2 -#define CODA_SYNC 3 +#define CODA_OPEN_BY_FD 3 #define CODA_OPEN 4 #define CODA_CLOSE 5 #define CODA_IOCTL 6 @@ -279,7 +299,8 @@ #define CODA_OPEN_BY_PATH 31 #define CODA_RESOLVE 32 #define CODA_REINTEGRATE 33 -#define CODA_NCALLS 34 +#define CODA_STATFS 34 +#define CODA_NCALLS 35 #define DOWNCALL(opcode) (opcode >= CODA_REPLACE && opcode <= CODA_PURGEFID) @@ -293,21 +314,36 @@ #define CODA_KERNEL_VERSION 0 /* The old venus 4.6 compatible interface */ #define CODA_KERNEL_VERSION 1 -#endif +#endif /* realms/cells */ +#ifdef CODA_COMPAT_5 /* venus_lookup gets an extra parameter to aid windows.*/ #define CODA_KERNEL_VERSION 2 +#else + /* 128-bit fids for realms */ +#define CODA_KERNEL_VERSION 3 +#endif /* * Venus <-> Coda RPC arguments */ +#ifdef CODA_COMPAT_5 struct coda_in_hdr { unsigned long opcode; - unsigned long unique; /* Keep multiple outstanding msgs distinct */ - u_short pid; /* Common to all */ - u_short pgid; /* Common to all */ + unsigned long unique; /* Keep multiple outstanding msgs distinct */ + u_short pid; /* Common to all */ + u_short pgid; /* Common to all */ u_short sid; /* Common to all */ - struct coda_cred cred; /* Common to all */ + struct coda_cred cred; /* Common to all */ +}; +#else +struct coda_in_hdr { + u_int32_t opcode; + u_int32_t unique; /* Keep multiple outstanding msgs distinct */ + pid_t pid; /* Common to all */ + pid_t pgid; /* Common to all */ + uid_t uid; /* Common to all */ }; +#endif /* Really important that opcode and unique are 1st two fields! */ struct coda_out_hdr { @@ -319,7 +355,7 @@ /* coda_root: NO_IN */ struct coda_root_out { struct coda_out_hdr oh; - ViceFid VFid; + CodaFid Fid; }; struct coda_root_in { @@ -332,7 +368,7 @@ /* coda_open: */ struct coda_open_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; int flags; }; @@ -346,7 +382,7 @@ /* coda_close: */ struct coda_close_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; int flags; }; @@ -357,7 +393,7 @@ /* coda_ioctl: */ struct coda_ioctl_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; int cmd; int len; int rwflag; @@ -374,7 +410,7 @@ /* coda_getattr: */ struct coda_getattr_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; }; struct coda_getattr_out { @@ -386,7 +422,7 @@ /* coda_setattr: NO_OUT */ struct coda_setattr_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; struct coda_vattr attr; }; @@ -397,7 +433,7 @@ /* coda_access: NO_OUT */ struct coda_access_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; int flags; }; @@ -413,14 +449,14 @@ /* coda_lookup: */ struct coda_lookup_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; int name; /* Place holder for data. */ int flags; }; struct coda_lookup_out { struct coda_out_hdr oh; - ViceFid VFid; + CodaFid Fid; int vtype; }; @@ -428,7 +464,7 @@ /* coda_create: */ struct coda_create_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; struct coda_vattr attr; int excl; int mode; @@ -437,7 +473,7 @@ struct coda_create_out { struct coda_out_hdr oh; - ViceFid VFid; + CodaFid Fid; struct coda_vattr attr; }; @@ -445,7 +481,7 @@ /* coda_remove: NO_OUT */ struct coda_remove_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; int name; /* Place holder for data. */ }; @@ -456,8 +492,8 @@ /* coda_link: NO_OUT */ struct coda_link_in { struct coda_in_hdr ih; - ViceFid sourceFid; /* cnode to link *to* */ - ViceFid destFid; /* Directory in which to place link */ + CodaFid sourceFid; /* cnode to link *to* */ + CodaFid destFid; /* Directory in which to place link */ int tname; /* Place holder for data. */ }; @@ -469,9 +505,9 @@ /* coda_rename: NO_OUT */ struct coda_rename_in { struct coda_in_hdr ih; - ViceFid sourceFid; + CodaFid sourceFid; int srcname; - ViceFid destFid; + CodaFid destFid; int destname; }; @@ -482,14 +518,14 @@ /* coda_mkdir: */ struct coda_mkdir_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; struct coda_vattr attr; int name; /* Place holder for data. */ }; struct coda_mkdir_out { struct coda_out_hdr oh; - ViceFid VFid; + CodaFid Fid; struct coda_vattr attr; }; @@ -497,7 +533,7 @@ /* coda_rmdir: NO_OUT */ struct coda_rmdir_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; int name; /* Place holder for data. */ }; @@ -508,7 +544,7 @@ /* coda_readdir: */ struct coda_readdir_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; int count; int offset; }; @@ -522,7 +558,7 @@ /* coda_symlink: NO_OUT */ struct coda_symlink_in { struct coda_in_hdr ih; - ViceFid VFid; /* Directory to put symlink in */ + CodaFid Fid; /* Directory to put symlink in */ int srcname; struct coda_vattr attr; int tname; @@ -535,7 +571,7 @@ /* coda_readlink: */ struct coda_readlink_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; }; struct coda_readlink_out { @@ -548,7 +584,7 @@ /* coda_fsync: NO_OUT */ struct coda_fsync_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; }; struct coda_fsync_out { @@ -558,18 +594,18 @@ /* coda_inactive: NO_OUT */ struct coda_inactive_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; }; /* coda_vget: */ struct coda_vget_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; }; struct coda_vget_out { struct coda_out_hdr oh; - ViceFid VFid; + CodaFid Fid; int vtype; }; @@ -582,75 +618,85 @@ /* CODA_PURGEUSER is a venus->kernel call */ struct coda_purgeuser_out { struct coda_out_hdr oh; +#ifdef CODA_COMPAT_5 struct coda_cred cred; +#else + uid_t uid; +#endif }; /* coda_zapfile: */ /* CODA_ZAPFILE is a venus->kernel call */ struct coda_zapfile_out { struct coda_out_hdr oh; - ViceFid CodaFid; + CodaFid Fid; }; /* coda_zapdir: */ /* CODA_ZAPDIR is a venus->kernel call */ struct coda_zapdir_out { struct coda_out_hdr oh; - ViceFid CodaFid; + CodaFid Fid; }; /* coda_zapnode: */ /* CODA_ZAPVNODE is a venus->kernel call */ struct coda_zapvnode_out { struct coda_out_hdr oh; +#ifdef CODA_COMPAT_5 struct coda_cred cred; - ViceFid VFid; +#endif + CodaFid Fid; }; /* coda_purgefid: */ /* CODA_PURGEFID is a venus->kernel call */ struct coda_purgefid_out { struct coda_out_hdr oh; - ViceFid CodaFid; + CodaFid Fid; }; -/* coda_rdwr: */ -struct coda_rdwr_in { - struct coda_in_hdr ih; - ViceFid VFid; - int rwflag; - int count; - int offset; - int ioflag; - caddr_t data; /* Place holder for data. */ +/* coda_replace: */ +/* CODA_REPLACE is a venus->kernel call */ +struct coda_replace_out { /* coda_replace is a venus->kernel call */ + struct coda_out_hdr oh; + CodaFid NewFid; + CodaFid OldFid; }; -struct coda_rdwr_out { - struct coda_out_hdr oh; - int rwflag; - int count; - caddr_t data; /* Place holder for data. */ +/* coda_open_by_fd: */ +struct coda_open_by_fd_in { + struct coda_in_hdr ih; + CodaFid Fid; + int flags; }; - -/* coda_replace: */ -/* CODA_REPLACE is a venus->kernel call */ -struct coda_replace_out { /* coda_replace is a venus->kernel call */ +struct coda_open_by_fd_out { struct coda_out_hdr oh; - ViceFid NewFid; - ViceFid OldFid; + int fd; + struct file *fh; }; /* coda_open_by_path: */ struct coda_open_by_path_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; int flags; }; struct coda_open_by_path_out { struct coda_out_hdr oh; - int path; + int path; +}; + +/* coda_statfs: NO_IN */ +struct coda_statfs_in { + struct coda_in_hdr ih; +}; + +struct coda_statfs_out { + struct coda_out_hdr oh; + struct coda_statfs stat; }; /* @@ -679,10 +725,10 @@ struct coda_symlink_in coda_symlink; struct coda_readlink_in coda_readlink; struct coda_fsync_in coda_fsync; - struct coda_inactive_in coda_inactive; struct coda_vget_in coda_vget; - struct coda_rdwr_in coda_rdwr; - struct coda_open_by_path_in coda_open_by_path; + struct coda_open_by_fd_in coda_open_by_fd; + struct coda_open_by_path_in coda_open_by_path; + struct coda_statfs_in coda_statfs; }; union outputArgs { @@ -702,9 +748,10 @@ struct coda_zapdir_out coda_zapdir; struct coda_zapvnode_out coda_zapvnode; struct coda_purgefid_out coda_purgefid; - struct coda_rdwr_out coda_rdwr; struct coda_replace_out coda_replace; - struct coda_open_by_path_out coda_open_by_path; + struct coda_open_by_fd_out coda_open_by_fd; + struct coda_open_by_path_out coda_open_by_path; + struct coda_statfs_out coda_statfs; }; union coda_downcalls { @@ -747,15 +794,32 @@ #define CODA_CONTROL ".CONTROL" #define CODA_CONTROLLEN 8 -#define CTL_VOL -1 -#define CTL_VNO -1 -#define CTL_UNI -1 #define CTL_INO -1 #define CTL_FILE "/coda/.CONTROL" +#ifdef CODA_COMPAT_5 +#define CTL_FID { -1, -1, -1 } +#define IS_CTL_FID(fidp) ((fidp)->Volume == -1 &&\ + (fidp)->Vnode == -1 &&\ + (fidp)->Unique == -1) +#define INVAL_FID { 0, 0, 0 } +#else +#define CTL_FID { { -1, -1, -1, -1 } } +#define IS_CTL_FID(fidp) ((fidp)->opaque[0] == -1 &&\ + (fidp)->opaque[1] == -1 &&\ + (fidp)->opaque[2] == -1 &&\ + (fidp)->opaque[3] == -1) +#define INVAL_FID { { 0, 0, 0, 0 } } +#endif + +/* Data passed to mount */ + +#define CODA_MOUNT_VERSION 1 -#define IS_CTL_FID(fidp) ((fidp)->Volume == CTL_VOL &&\ - (fidp)->Vnode == CTL_VNO &&\ - (fidp)->Unique == CTL_UNI) +struct coda_mount_data { + int version; + int fd; /* Opened device */ +}; + #endif ==== //depot/projects/uart/coda/coda_namecache.c#2 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_namecache.c,v 1.19 2003/06/10 21:21:59 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_namecache.c,v 1.20 2003/09/07 07:43:09 tjr Exp $"); #include #include @@ -354,10 +354,8 @@ * place it at the head of the lru list. */ CODA_NC_DEBUG(CODA_NC_REMOVE, - myprintf(("coda_nc_remove %s from parent %lx.%lx.%lx\n", - cncp->name, (cncp->dcp)->c_fid.Volume, - (cncp->dcp)->c_fid.Vnode, (cncp->dcp)->c_fid.Unique));) - + myprintf(("coda_nc_remove %s from parent %s\n", + cncp->name, coda_f2s(&cncp->dcp->c_fid))); ) CODA_NC_HSHREM(cncp); CODA_NC_HSHNUL(cncp); /* have it be a null chain */ @@ -385,7 +383,7 @@ */ void coda_nc_zapParentfid(fid, dcstat) - ViceFid *fid; + CodaFid *fid; enum dc_status dcstat; { /* To get to a specific fid, we might either have another hashing @@ -397,11 +395,10 @@ int i; if (coda_nc_use == 0) /* Cache is off */ - return; + return; CODA_NC_DEBUG(CODA_NC_ZAPPFID, - myprintf(("ZapParent: fid 0x%lx, 0x%lx, 0x%lx \n", - fid->Volume, fid->Vnode, fid->Unique)); ) + myprintf(("ZapParent: fid %s\n", coda_f2s(fid))); ) coda_nc_stat.zapPfids++; @@ -416,9 +413,7 @@ cncp != (struct coda_cache *)&coda_nc_hash[i]; cncp = ncncp) { ncncp = cncp->hash_next; - if ((cncp->dcp->c_fid.Volume == fid->Volume) && - (cncp->dcp->c_fid.Vnode == fid->Vnode) && - (cncp->dcp->c_fid.Unique == fid->Unique)) { + if (coda_fid_eq(&(cncp->dcp->c_fid), fid)) { coda_nc_hash[i].length--; /* Used for tuning */ coda_nc_remove(cncp, dcstat); } @@ -432,7 +427,7 @@ */ void coda_nc_zapfid(fid, dcstat) - ViceFid *fid; + CodaFid *fid; enum dc_status dcstat; { /* See comment for zapParentfid. This routine will be used @@ -445,8 +440,7 @@ return; CODA_NC_DEBUG(CODA_NC_ZAPFID, - myprintf(("Zapfid: fid 0x%lx, 0x%lx, 0x%lx \n", - fid->Volume, fid->Vnode, fid->Unique)); ) + myprintf(("Zapfid: fid %s\n", coda_f2s(fid))); ) coda_nc_stat.zapFids++; @@ -455,11 +449,9 @@ cncp != (struct coda_cache *)&coda_nc_hash[i]; cncp = ncncp) { ncncp = cncp->hash_next; - if ((cncp->cp->c_fid.Volume == fid->Volume) && - (cncp->cp->c_fid.Vnode == fid->Vnode) && - (cncp->cp->c_fid.Unique == fid->Unique)) { - coda_nc_hash[i].length--; /* Used for tuning */ - coda_nc_remove(cncp, dcstat); + if (coda_fid_eq(&cncp->cp->c_fid, fid)) { + coda_nc_hash[i].length--; /* Used for tuning */ + coda_nc_remove(cncp, dcstat); } } } @@ -470,7 +462,7 @@ */ void coda_nc_zapvnode(fid, cred, dcstat) - ViceFid *fid; + CodaFid *fid; struct ucred *cred; enum dc_status dcstat; { @@ -478,12 +470,15 @@ want to zap a file with a specific cred from the kernel. We'll leave this one unimplemented. */ + if (coda_nc_use == 0) /* Cache is off */ return; - CODA_NC_DEBUG(CODA_NC_ZAPVNODE, - myprintf(("Zapvnode: fid 0x%lx, 0x%lx, 0x%lx cred %p\n", - fid->Volume, fid->Vnode, fid->Unique, cred)); ) + CODA_NC_DEBUG(CODA_NC_ZAPVNODE, + myprintf(("Zapvnode: fid %s cred %p\n", + coda_f2s(fid), cred)); ) + + } @@ -533,7 +528,7 @@ */ void coda_nc_purge_user(uid, dcstat) - vuid_t uid; + uid_t uid; enum dc_status dcstat; { /* @@ -616,7 +611,8 @@ if (CTOV(cncp->cp)->v_vflag & VV_TEXT) { if (coda_vmflush(cncp->cp)) CODADEBUG(CODA_FLUSH, - myprintf(("coda_nc_flush: (%lx.%lx.%lx) busy\n", cncp->cp->c_fid.Volume, cncp->cp->c_fid.Vnode, cncp->cp->c_fid.Unique)); ) + myprintf(("coda_nc_flush: %s busy\n", + coda_f2s(&cncp->cp->c_fid))); ) } if ((dcstat == IS_DOWNCALL) ==== //depot/projects/uart/coda/coda_namecache.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_namecache.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_namecache.h,v 1.8 2002/09/22 13:25:57 iedowse Exp $ + * $FreeBSD: src/sys/coda/coda_namecache.h,v 1.9 2003/09/07 07:43:09 tjr Exp $ * */ @@ -140,11 +140,11 @@ extern void coda_nc_enter(struct cnode *, const char *, int, struct ucred *, struct cnode *); extern struct cnode *coda_nc_lookup(struct cnode *, const char *, int, struct ucred *); -extern void coda_nc_zapParentfid(ViceFid *, enum dc_status); -extern void coda_nc_zapfid(ViceFid *, enum dc_status); -extern void coda_nc_zapvnode(ViceFid *, struct ucred *, enum dc_status); +extern void coda_nc_zapParentfid(CodaFid *, enum dc_status); +extern void coda_nc_zapfid(CodaFid *, enum dc_status); +extern void coda_nc_zapvnode(CodaFid *, struct ucred *, enum dc_status); extern void coda_nc_zapfile(struct cnode *, const char *, int); -extern void coda_nc_purge_user(vuid_t, enum dc_status); +extern void coda_nc_purge_user(uid_t, enum dc_status); extern void coda_nc_flush(enum dc_status); extern void print_coda_nc(void); ==== //depot/projects/uart/coda/coda_subr.c#2 (text+ko) ==== @@ -52,7 +52,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_subr.c,v 1.23 2003/06/10 21:21:59 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_subr.c,v 1.24 2003/09/07 07:43:09 tjr Exp $"); #include @@ -74,9 +74,16 @@ struct cnode *coda_freelist = NULL; struct cnode *coda_cache[CODA_CACHESIZE]; -#define coda_hash(fid) (((fid)->Volume + (fid)->Vnode) & (CODA_CACHESIZE-1)) #define CNODE_NEXT(cp) ((cp)->c_next) -#define ODD(vnode) ((vnode) & 0x1) + +#ifdef CODA_COMPAT_5 +#define coda_hash(fid) \ + (((fid)->Volume + (fid)->Vnode) & (CODA_CACHESIZE-1)) +#define IS_DIR(cnode) (cnode.Vnode & 0x1) +#else +#define coda_hash(fid) (coda_f2i(fid) & (CODA_CACHESIZE-1)) +#define IS_DIR(cnode) (cnode.opaque[2] & 0x1) +#endif /* * Allocate a cnode. @@ -161,15 +168,13 @@ */ struct cnode * coda_find(fid) - ViceFid *fid; + CodaFid *fid; { struct cnode *cp; cp = coda_cache[coda_hash(fid)]; while (cp) { - if ((cp->c_fid.Vnode == fid->Vnode) && - (cp->c_fid.Volume == fid->Volume) && - (cp->c_fid.Unique == fid->Unique) && + if (coda_fid_eq(&(cp->c_fid), fid) && (!IS_UNMOUNTING(cp))) { coda_active++; @@ -218,12 +223,10 @@ #endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 7 17:10:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4208316A4C1; Sun, 7 Sep 2003 17:10:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1870716A4BF for ; Sun, 7 Sep 2003 17:10:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B307043F85 for ; Sun, 7 Sep 2003 17:10:43 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h880Ah0U002175 for ; Sun, 7 Sep 2003 17:10:43 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h880AgWG002172 for perforce@freebsd.org; Sun, 7 Sep 2003 17:10:42 -0700 (PDT) Date: Sun, 7 Sep 2003 17:10:42 -0700 (PDT) Message-Id: <200309080010.h880AgWG002172@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37754 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2003 00:10:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=37754 Change 37754 by marcel@marcel_nfs on 2003/09/07 17:10:17 IFC @37752 Affected files ... .. //depot/projects/ia64/Makefile.inc1#82 integrate .. //depot/projects/ia64/bin/sh/arith.y#6 integrate .. //depot/projects/ia64/bin/test/Makefile#3 integrate .. //depot/projects/ia64/etc/etc.ia64/ttys#3 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile#10 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/cvsbug/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/lib/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/Makefile#4 integrate .. //depot/projects/ia64/sbin/mksnap_ffs/mksnap_ffs.8#3 integrate .. //depot/projects/ia64/sbin/rcorder/rcorder.c#3 integrate .. //depot/projects/ia64/share/examples/ipfw/change_rules.sh#3 integrate .. //depot/projects/ia64/share/man/man4/uart.4#2 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#27 integrate .. //depot/projects/ia64/share/mk/bsd.man.mk#10 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#41 integrate .. //depot/projects/ia64/sys/coda/cnode.h#6 integrate .. //depot/projects/ia64/sys/coda/coda.h#2 integrate .. //depot/projects/ia64/sys/coda/coda_namecache.c#6 integrate .. //depot/projects/ia64/sys/coda/coda_namecache.h#4 integrate .. //depot/projects/ia64/sys/coda/coda_subr.c#7 integrate .. //depot/projects/ia64/sys/coda/coda_subr.h#2 integrate .. //depot/projects/ia64/sys/coda/coda_venus.c#6 integrate .. //depot/projects/ia64/sys/coda/coda_venus.h#2 integrate .. //depot/projects/ia64/sys/coda/coda_vfsops.c#10 integrate .. //depot/projects/ia64/sys/coda/coda_vfsops.h#3 integrate .. //depot/projects/ia64/sys/coda/coda_vnops.c#12 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#28 integrate .. //depot/projects/ia64/sys/conf/NOTES#67 integrate .. //depot/projects/ia64/sys/conf/options#66 integrate .. //depot/projects/ia64/sys/dev/sound/isa/ad1816.c#8 integrate .. //depot/projects/ia64/sys/dev/sound/isa/ess.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/isa/mss.c#11 integrate .. //depot/projects/ia64/sys/dev/sound/isa/sb16.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/isa/sb8.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/isa/sndbuf_dma.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pci/aureal.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pci/aureal.h#2 integrate .. //depot/projects/ia64/sys/dev/sound/pci/emu10k1.c#14 integrate .. //depot/projects/ia64/sys/dev/sound/pci/es137x.c#9 integrate .. //depot/projects/ia64/sys/dev/sound/pci/maestro.c#8 integrate .. //depot/projects/ia64/sys/dev/sound/pci/neomagic-coeff.h#2 integrate .. //depot/projects/ia64/sys/dev/sound/pci/neomagic.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pci/neomagic.h#2 integrate .. //depot/projects/ia64/sys/dev/sound/pci/solo.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pci/t4dwave.c#10 integrate .. //depot/projects/ia64/sys/dev/sound/pci/t4dwave.h#2 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#22 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/ac97.h#6 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/buffer.c#10 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/buffer.h#5 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/channel.c#12 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/channel.h#4 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/dsp.c#13 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/fake.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder.c#13 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder.h#5 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder_fmt.c#8 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/mixer.c#9 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sndstat.c#8 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sound.c#15 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sound.h#8 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/vchan.c#8 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu.h#3 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu_alpha.c#2 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/ia64/sys/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/ia64/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/ia64/sys/i386/i386/db_interface.c#12 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#44 integrate .. //depot/projects/ia64/sys/i386/isa/clock.c#22 integrate .. //depot/projects/ia64/sys/i386/linux/imgact_linux.c#12 integrate .. //depot/projects/ia64/sys/ia64/acpica/madt.c#15 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC#36 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#9 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#74 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#8 integrate .. //depot/projects/ia64/sys/modules/Makefile#62 integrate .. //depot/projects/ia64/sys/modules/coda/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/coda5/Makefile#1 branch .. //depot/projects/ia64/sys/modules/uart/Makefile#3 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#23 integrate .. //depot/projects/ia64/usr.bin/colldef/colldef.1#6 integrate .. //depot/projects/ia64/usr.bin/killall/killall.c#9 integrate .. //depot/projects/ia64/usr.bin/rpcinfo/rpcinfo.c#6 integrate .. //depot/projects/ia64/usr.bin/rsh/rsh.c#9 integrate .. //depot/projects/ia64/usr.bin/script/script.1#3 integrate .. //depot/projects/ia64/usr.bin/truss/main.c#9 integrate .. //depot/projects/ia64/usr.bin/truss/setup.c#4 integrate .. //depot/projects/ia64/usr.bin/w/w.c#8 integrate .. //depot/projects/ia64/usr.sbin/chown/chown.c#10 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#82 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.389 2003/09/01 06:43:24 scottl Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.390 2003/09/07 14:15:40 ru Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -227,6 +227,7 @@ # world stage WMAKEENV= ${CROSSENV} \ DESTDIR=${WORLDTMP} \ + _SHLIBDIRPREFIX=${WORLDTMP} \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 ==== //depot/projects/ia64/bin/sh/arith.y#6 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.16 2003/09/04 18:28:42 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.17 2003/09/07 10:14:56 schweikh Exp $"); #include #include "shell.h" @@ -155,7 +155,7 @@ } | ARITH_VAR ARITH_ASSIGN expr { - if (arith_assign($1, $3) != 1) + if (arith_assign($1, $3) != 0) yyerror("variable assignment error"); $$ = $3; } | ==== //depot/projects/ia64/bin/test/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/test/Makefile,v 1.9 2001/12/04 01:57:47 obrien Exp $ +# $FreeBSD: src/bin/test/Makefile,v 1.10 2003/09/07 12:52:17 ru Exp $ PROG= test LINKS= ${BINDIR}/test ${BINDIR}/[ -MLINKS= test.1 '[.1' +MLINKS= test.1 [.1 .include ==== //depot/projects/ia64/etc/etc.ia64/ttys#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.ia64/ttys,v 1.2 2002/04/17 10:42:41 gerald Exp $ +# $FreeBSD: src/etc/etc.ia64/ttys,v 1.3 2003/09/07 06:02:36 marcel Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -33,7 +33,7 @@ console none unknown off secure # ttyv0 "/usr/libexec/getty Pc" cons25 on secure -# Virtual terminals +# Virtual terminals. ttyv1 "/usr/libexec/getty Pc" cons25 on secure ttyv2 "/usr/libexec/getty Pc" cons25 on secure ttyv3 "/usr/libexec/getty Pc" cons25 on secure @@ -42,13 +42,13 @@ ttyv6 "/usr/libexec/getty Pc" cons25 on secure ttyv7 "/usr/libexec/getty Pc" cons25 on secure ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure -# Serial terminals -# The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyd0 "/usr/libexec/getty std.9600" vt100 on secure -ttyd1 "/usr/libexec/getty std.9600" dialup off secure -ttyd2 "/usr/libexec/getty std.9600" dialup off secure -ttyd3 "/usr/libexec/getty std.9600" dialup off secure -# Pseudo terminals +# Serial terminals. The 'dialup' keyword identifies dialin lines to login, +# fingerd etc. +ttyu0 "/usr/libexec/getty std.9600" vt100 on secure +ttyu1 "/usr/libexec/getty std.9600" dialup off secure +ttyu2 "/usr/libexec/getty std.9600" dialup off secure +ttyu3 "/usr/libexec/getty std.9600" dialup off secure +# Pseudo terminals. ttyp0 none network ttyp1 none network ttyp2 none network ==== //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile#10 (text+ko) ==== @@ -1,12 +1,14 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.65 2003/03/21 00:30:53 iedowse Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.68 2003/09/07 20:38:23 obrien Exp $ .include "../Makefile.inc0" -.PATH: ${SRCDIR}/binutils +GDBDIR= ${.CURDIR}/../../../../contrib/gdb +.PATH: ${GDBDIR}/gdb ${GDBDIR}/gdb/cli ${GDBDIR}/gdb/mi +.PATH: ${SRCDIR}/opcodes ${SRCDIR}/binutils .if ${TARGET_ARCH} == "sparc64" GDB_CPU= sparc -.elif ${TARGET_ARCH} == "x86-64" +.elif ${TARGET_ARCH} == "amd64" GDB_CPU= i386 .else GDB_CPU= ${TARGET_ARCH} @@ -25,10 +27,12 @@ remote-utils.c signals.c source.c stabsread.c stack.c symfile.c \ symmisc.c symtab.c target.c thread.c top.c tracepoint.c \ typeprint.c ui-file.c ui-out.c utils.c valarith.c valops.c \ - valprint.c values.c wrapper.c \ + varobj.c valprint.c values.c wrapper.c \ cli-cmds.c cli-cmds.h cli-decode.c cli-decode.h cli-out.c \ cli-script.c cli-script.h cli-setshow.c cli-setshow.h \ cli-utils.c cli-utils.h \ + mi-cmd-break.c mi-cmd-disas.c mi-cmd-stack.c mi-cmd-var.c \ + mi-cmds.c mi-console.c mi-getopt.c mi-main.c mi-out.c mi-parse.c\ serial.c ser-unix.c ser-tcp.c \ c-exp.y c-lang.c c-typeprint.c c-valprint.c \ ch-exp.c ch-lang.c ch-typeprint.c ch-valprint.c \ @@ -42,9 +46,7 @@ XSRCS+= freebsd-uthread.c kvm-fbsd.c solib-fbsd-kld.c SRCS= init.c ${XSRCS} nm.h tm.h xm.h gdbversion.c xregex.h -.if exists(${.CURDIR}/Makefile.${TARGET_ARCH}) .include "${.CURDIR}/Makefile.${TARGET_ARCH}" -.endif WARNS= 0 .if ${TARGET_ARCH} != ${MACHINE_ARCH} @@ -52,34 +54,23 @@ .endif CFLAGS+= -DDEFAULT_BFD_ARCH=bfd_${GDB_CPU}_arch CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} -CFLAGS+= -I${SRCDIR}/binutils -CFLAGS+= -I${SRCDIR}/bfd -CFLAGS+= -I${GDBDIR}/gdb -CFLAGS+= -I${GDBDIR}/gdb/config -DPADD= ${LIBKVM} -DPADD+= ${LIBM} -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libopcodes/libopcodes.a +CFLAGS+= -I${SRCDIR}/binutils -I${SRCDIR}/bfd +CFLAGS+= -I${GDBDIR}/gdb -I${GDBDIR}/gdb/config +CFLAGS+= -I$(.CURDIR) -I${DESTDIR}/usr/include/readline + +YFLAGS= + +DPADD= ${LIBKVM} ${LIBM} +DPADD+= ${RELTOP}/libbfd/libbfd.a ${RELTOP}/libopcodes/libopcodes.a DPADD+= ${LIBGNUREGEX} DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${LIBREADLINE} -DPADD+= ${LIBTERMCAP} -LDADD= -lkvm -LDADD+= -lm -LDADD+= ${RELTOP}/libbfd/libbfd.a -LDADD+= ${RELTOP}/libopcodes/libopcodes.a +DPADD+= ${LIBREADLINE} ${LIBTERMCAP} +LDADD= -lkvm -lm +LDADD+= ${RELTOP}/libbfd/libbfd.a ${RELTOP}/libopcodes/libopcodes.a LDADD+= -lgnuregex LDADD+= ${RELTOP}/libiberty/libiberty.a -LDADD+= -lreadline -LDADD+= -ltermcap +LDADD+= -lreadline -ltermcap -GDBDIR= ${.CURDIR}/../../../../contrib/gdb -.PATH: ${GDBDIR}/gdb ${GDBDIR}/gdb/cli -.PATH: ${SRCDIR}/opcodes - -CFLAGS+= -I$(.CURDIR) -I${DESTDIR}/usr/include/readline -YFLAGS= - CLEANFILES= init.c init.c-tmp nm.h tm.h xm.h gdbversion.c xregex.h # We do this by grepping through sources. If that turns out to be too slow, @@ -140,9 +131,9 @@ GDB_VERSION= "5.2.1 (FreeBSD)" gdbversion.c: @echo '#include "version.h"' > ${.TARGET} - @echo 'const char version[] = ${GDB_VERSION};' >>${.TARGET} - @echo 'const char host_name[] = "${MACHINE_ARCH}-undermydesk-freebsd";' >>${.TARGET} - @echo 'const char target_name[] = "${TARGET_ARCH}-undermydesk-freebsd";' >>${.TARGET} + @echo 'const char version[] = ${GDB_VERSION};' >>${.TARGET} + @echo 'const char host_name[] = "${MACHINE_ARCH}-undermydesk-freebsd";' >>${.TARGET} + @echo 'const char target_name[] = "${TARGET_ARCH}-undermydesk-freebsd";' >>${.TARGET} xregex.h: @echo '#include ' >${.TARGET} ==== //depot/projects/ia64/gnu/usr.bin/cvs/cvsbug/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.18 2003/01/21 23:00:36 peter Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.19 2003/09/07 13:17:31 ru Exp $ MAINTAINER= peter@FreeBSD.org @@ -12,10 +12,10 @@ MAN= cvsbug.8 CLEANFILES+= cvsbug -VERSION!= sed < ${CVSDIR}/configure \ - -e '/^[ ]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q cvsbug: cvsbug.in - sed -e "s,@VERSION@,${VERSION}-FreeBSD,g" ${.ALLSRC} > ${.TARGET} + version=`sed < ${CVSDIR}/configure \ + -e '/^[ ]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q`; \ + sed -e "s,@VERSION@,$${version}-FreeBSD,g" ${.ALLSRC} > ${.TARGET} .include ==== //depot/projects/ia64/gnu/usr.bin/cvs/lib/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/lib/Makefile,v 1.22 2003/01/21 23:00:36 peter Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/lib/Makefile,v 1.23 2003/09/07 13:09:47 ru Exp $ MAINTAINER= peter@FreeBSD.org @@ -16,9 +16,6 @@ YFLAGS= CLEANFILES+= config.h -VERSION!= sed < ${CVSDIR}/configure \ - -e '/^[ ]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q - CVS_UMASK_DFLT?= 002 CVS_ADMIN_GROUP?= cvsadmin CVS_TMPDIR_DFLT?= /tmp @@ -29,7 +26,9 @@ xgetwd.c yesno.c config.h: config.h.proto - sed -e "s,@VERSION@,${VERSION}-FreeBSD,g" \ + version=`sed < ${CVSDIR}/configure \ + -e '/^[ ]*VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q`; \ + sed -e "s,@VERSION@,$${version}-FreeBSD,g" \ -e "s,@UMASK_DFLT@,${CVS_UMASK_DFLT},g" \ -e "s,@TMPDIR_DFLT@,${CVS_TMPDIR_DFLT},g" \ -e "s,@CVS_ADMIN_GROUP@,${CVS_ADMIN_GROUP},g" \ ==== //depot/projects/ia64/gnu/usr.bin/send-pr/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/send-pr/Makefile,v 1.17 2002/07/29 09:40:09 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/send-pr/Makefile,v 1.18 2003/09/07 13:38:07 ru Exp $ # # Makefile for building a standalone send-pr. # @@ -7,7 +7,6 @@ MAN= send-pr.1 SUBMITTERS= current-users RELEASE= `uname -rsm` -RELEASE_EV!= uname -rsm CLEANFILES+= send-pr send-pr.el SUBDIR+= doc @@ -22,8 +21,9 @@ ${.ALLSRC:N*Makefile} > ${.TARGET} send-pr.el: send-pr-el.in Makefile + default_release=`uname -rsm`; \ sed -e 's,@DATADIR@,/etc,g' \ - -e 's/@DEFAULT_RELEASE@/$(RELEASE_EV)/g' \ + -e "s/@DEFAULT_RELEASE@/$${default_release}/g" \ -e 's/"unknown"/"$(SUBMITTERS)"/g' \ ${.ALLSRC:N*Makefile} > ${.TARGET} ==== //depot/projects/ia64/sbin/mksnap_ffs/mksnap_ffs.8#3 (text+ko) ==== @@ -32,7 +32,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.8,v 1.2 2003/05/24 19:53:08 ru Exp $ +.\" $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.8,v 1.3 2003/09/07 14:11:02 charnier Exp $ .\" .Dd January 19, 2003 .Dt MKSNAP_FFS 8 @@ -67,7 +67,7 @@ .Sh SEE ALSO .Xr chmod 2 , .Xr chown 8 , -.Xr mount_ffs 8 +.Xr mount 8 .Sh HISTORY The .Nm ==== //depot/projects/ia64/sbin/rcorder/rcorder.c#3 (text+ko) ==== @@ -33,6 +33,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sbin/rcorder/rcorder.c,v 1.2 2003/09/07 14:17:17 charnier Exp $"); + #include #include @@ -126,27 +129,27 @@ strnodelist *keep_list; strnodelist *skip_list; -void do_file __P((filenode *fnode)); -void strnode_add __P((strnodelist **, char *, filenode *)); -int skip_ok __P((filenode *fnode)); -int keep_ok __P((filenode *fnode)); -void satisfy_req __P((f_reqnode *rnode, char *filename)); -void crunch_file __P((char *)); -void parse_require __P((filenode *, char *)); -void parse_provide __P((filenode *, char *)); -void parse_before __P((filenode *, char *)); -void parse_keywords __P((filenode *, char *)); -filenode *filenode_new __P((char *)); -void add_require __P((filenode *, char *)); -void add_provide __P((filenode *, char *)); -void add_before __P((filenode *, char *)); -void add_keyword __P((filenode *, char *)); -void insert_before __P((void)); -Hash_Entry *make_fake_provision __P((filenode *)); -void crunch_all_files __P((void)); -void initialize __P((void)); -void generate_ordering __P((void)); -int main __P((int, char *[])); +void do_file(filenode *fnode); +void strnode_add(strnodelist **, char *, filenode *); +int skip_ok(filenode *fnode); +int keep_ok(filenode *fnode); +void satisfy_req(f_reqnode *rnode, char *filename); +void crunch_file(char *); +void parse_require(filenode *, char *); +void parse_provide(filenode *, char *); +void parse_before(filenode *, char *); +void parse_keywords(filenode *, char *); +filenode *filenode_new(char *); +void add_require(filenode *, char *); +void add_provide(filenode *, char *); +void add_before(filenode *, char *); +void add_keyword(filenode *, char *); +void insert_before(void); +Hash_Entry *make_fake_provision(filenode *); +void crunch_all_files(void); +void initialize(void); +void generate_ordering(void); +int main(int, char *[]); int main(argc, argv) ==== //depot/projects/ia64/share/examples/ipfw/change_rules.sh#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/share/examples/ipfw/change_rules.sh,v 1.5 2003/02/13 12:02:51 brueffer Exp $ +# $FreeBSD: src/share/examples/ipfw/change_rules.sh,v 1.6 2003/09/07 07:52:56 jmg Exp $ # Change ipfw(8) rules with safety guarantees for remote operation # @@ -82,7 +82,7 @@ } restore_rules() { - nohup sh ${firewall_script} >/dev/null 2>&1 + nohup sh ${firewall_script} /dev/null 2>&1 rm ${TMPFILE} exit 1 } @@ -129,10 +129,10 @@ if [ ${rules_edit} = yes ]; then nohup sh ${firewall_script} ${firewall_type}.new \ - > ${TMPFILE} 2>&1 + < /dev/null > ${TMPFILE} 2>&1 else nohup sh ${firewall_script}.new \ - > ${TMPFILE} 2>&1 + < /dev/null > ${TMPFILE} 2>&1 fi sleep 2; get_yes_no "Would you like to see the resulting new rules" ==== //depot/projects/ia64/share/man/man4/uart.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uart.4,v 1.2 2003/09/06 23:46:29 hmp Exp $ +.\" $FreeBSD: src/share/man/man4/uart.4,v 1.3 2003/09/07 16:34:03 hmp Exp $ .\" .Dd August 25, 2003 .Dt UART 4 @@ -113,5 +113,5 @@ device driver first appeared in .Fx 5.2 . .Sh AUTHORS -This manual page is written by +This manual page was written by .An Marcel Molenaar Aq marcel@FreeBSD.ORG . ==== //depot/projects/ia64/share/mk/bsd.lib.mk#27 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.153 2003/09/04 04:29:11 peter Exp $ +# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.154 2003/09/07 14:15:40 ru Exp $ # .include @@ -208,10 +208,15 @@ ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} .if defined(SHLIB_LINK) - ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK} -.if (${LIBDIR} != ${SHLIBDIR}) - ln -fs ${LIBDIR:C|/[^/]+|/..|g:S|^/||}${SHLIBDIR}/${SHLIB_NAME} \ +.if ${SHLIBDIR} == ${LIBDIR} + ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK} +.else + ln -fs ${_SHLIBDIRPREFIX}${SHLIBDIR}/${SHLIB_NAME} \ ${DESTDIR}${LIBDIR}/${SHLIB_LINK} +.if exists(${DESTDIR}${LIBDIR}/${SHLIB_NAME}) + -chflags noschg ${DESTDIR}${LIBDIR}/${SHLIB_NAME} + rm -f ${DESTDIR}${LIBDIR}/${SHLIB_NAME} +.endif .endif .endif .endif ==== //depot/projects/ia64/share/mk/bsd.man.mk#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.man.mk,v 1.52 2002/10/18 09:14:17 ru Exp $ +# $FreeBSD: src/share/mk/bsd.man.mk,v 1.53 2003/09/07 12:59:22 ru Exp $ # # The include file handles installing manual pages and # their links. @@ -173,7 +173,7 @@ .endif .endfor .else - @set `echo ${.ALLSRC} " " | sed 's/\.\([^.]*\) /.\1 \1 /g'`; \ + @set ${.ALLSRC:C/\.([^.]*)$/.\1 \1/}; \ while : ; do \ case $$# in \ 0) break;; \ @@ -204,7 +204,7 @@ .endif .if !defined(NOMLINKS) && defined(MLINKS) && !empty(MLINKS) - @set `echo ${MLINKS} " " | sed 's/\.\([^.]*\) /.\1 \1 /g'`; \ + @set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \ while : ; do \ case $$# in \ 0) break;; \ @@ -219,7 +219,7 @@ ln $${l}${ZEXT} $${t}${ZEXT}; \ done .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) - @set `echo ${MLINKS} " " | sed 's/\.\([^.]*\) /.\1 \1 /g'`; \ + @set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \ while : ; do \ case $$# in \ 0) break;; \ ==== //depot/projects/ia64/sys/alpha/alpha/pmap.c#41 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.135 2003/08/28 23:12:28 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.136 2003/09/07 20:02:38 alc Exp $"); #include #include @@ -2749,23 +2749,30 @@ */ if ((*pte & PG_FOW) == 0) val |= MINCORE_MODIFIED|MINCORE_MODIFIED_OTHER; - /* - * Modified by someone - */ - else if (m->dirty || pmap_is_modified(m)) - val |= MINCORE_MODIFIED_OTHER; + else { + /* + * Modified by someone + */ + vm_page_lock_queues(); + if (m->dirty || pmap_is_modified(m)) + val |= MINCORE_MODIFIED_OTHER; + vm_page_unlock_queues(); + } /* * Referenced by us */ if ((*pte & (PG_FOR | PG_FOE)) == 0) val |= MINCORE_REFERENCED|MINCORE_REFERENCED_OTHER; - - /* - * Referenced by someone - */ - else if ((m->flags & PG_REFERENCED) || pmap_ts_referenced(m)) { - val |= MINCORE_REFERENCED_OTHER; - vm_page_flag_set(m, PG_REFERENCED); + else { + /* + * Referenced by someone + */ + vm_page_lock_queues(); + if ((m->flags & PG_REFERENCED) || pmap_ts_referenced(m)) { + val |= MINCORE_REFERENCED_OTHER; + vm_page_flag_set(m, PG_REFERENCED); + } + vm_page_unlock_queues(); } } return val; ==== //depot/projects/ia64/sys/coda/cnode.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/cnode.h,v 1.12 2003/03/06 10:48:03 tjr Exp $ + * $FreeBSD: src/sys/coda/cnode.h,v 1.13 2003/09/07 07:43:09 tjr Exp $ * */ @@ -101,7 +101,7 @@ struct cnode { struct vnode *c_vnode; u_short c_flags; /* flags (see below) */ - ViceFid c_fid; /* file handle */ + CodaFid c_fid; /* file handle */ struct lock c_lock; /* new lock protocol */ struct vnode *c_ovp; /* open vnode pointer */ u_short c_ocount; /* count of openers */ @@ -197,7 +197,7 @@ extern int coda_vmflush(struct cnode *cp); /* cfs_vnodeops.h */ -extern struct cnode *make_coda_node(ViceFid *fid, struct mount *vfsp, short type); +extern struct cnode *make_coda_node(CodaFid *fid, struct mount *vfsp, short type); extern int coda_vnodeopstats_init(void); /* coda_vfsops.h */ ==== //depot/projects/ia64/sys/coda/coda.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda.h,v 1.9 1999/12/29 04:54:30 peter Exp $ + * $FreeBSD: src/sys/coda/coda.h,v 1.10 2003/09/07 07:43:09 tjr Exp $ * */ @@ -41,8 +41,8 @@ #ifndef _CODA_HEADER_ #define _CODA_HEADER_ +#include "opt_coda.h" /* for COMPAT_CODA_5 option */ - /* Catch new _KERNEL defn for NetBSD */ #ifdef __NetBSD__ #include @@ -162,59 +162,70 @@ #endif -#ifndef _FID_T_ -#define _FID_T_ 1 -typedef u_long VolumeId; -typedef u_long VnodeId; -typedef u_long Unique_t; -typedef u_long FileVersion; -#endif +#ifdef CODA_COMPAT_5 -#ifndef _VICEFID_T_ -#define _VICEFID_T_ 1 -typedef struct ViceFid { - VolumeId Volume; - VnodeId Vnode; - Unique_t Unique; -} ViceFid; -#endif /* VICEFID */ +typedef struct { + u_long Volume; + u_long Vnode; + u_long Unique; +} CodaFid; +static __inline__ ino_t coda_f2i(CodaFid *fid) +{ + if (!fid) return 0; + return (fid->Unique + (fid->Vnode<<10) + (fid->Volume<<20)); +} -#ifdef __linux__ -static __inline__ ino_t coda_f2i(struct ViceFid *fid) +static __inline__ char * coda_f2s(CodaFid *fid) +{ + static char fid_str [35]; + snprintf (fid_str, 35, "[%lx.%lx.%lx]", fid->Volume, + fid->Vnode, fid->Unique); + return fid_str; +} + +static __inline__ int coda_fid_eq (CodaFid *fid1, CodaFid *fid2) { - if ( ! fid ) - return 0; - if (fid->Vnode == 0xfffffffe || fid->Vnode == 0xffffffff) - return ((fid->Volume << 20) | (fid->Unique & 0xfffff)); - else - return (fid->Unique + (fid->Vnode<<10) + (fid->Volume<<20)); + return (fid1->Volume == fid2->Volume && + fid1->Vnode == fid2->Vnode && + fid1->Unique == fid2->Unique); } - -#else -#define coda_f2i(fid)\ - ((fid) ? ((fid)->Unique + ((fid)->Vnode<<10) + ((fid)->Volume<<20)) : 0) -#endif + +struct coda_cred { + u_int32_t cr_uid, cr_euid, cr_suid, cr_fsuid; /* Real, efftve, set, fs uid*/ + u_int32_t cr_groupid, cr_egid, cr_sgid, cr_fsgid; /* same for groups */ +}; +#else /* CODA_COMPAT_5 */ -#ifndef __BIT_TYPES_DEFINED__ -#define u_int32_t unsigned int -#endif +typedef struct { + u_int32_t opaque[4]; +} CodaFid; +static __inline__ ino_t coda_f2i(CodaFid *fid) +{ + if ( ! fid ) + return 0; + return (fid->opaque[3] ^ (fid->opaque[2]<<10) ^ (fid->opaque[1]<<20) ^ fid->opaque[0]); +} + +static __inline__ char * coda_f2s(CodaFid *fid) + { + static char fid_str [35]; + snprintf (fid_str, 35, "[%x.%x.%x.%x]", fid->opaque[0], + fid->opaque[1], fid->opaque[2], fid->opaque[3]); + return fid_str; + } -#ifndef _VUID_T_ -#define _VUID_T_ -typedef u_int32_t vuid_t; -typedef u_int32_t vgid_t; -#endif /*_VUID_T_ */ +static __inline__ int coda_fid_eq (CodaFid *fid1, CodaFid *fid2) +{ + return (fid1->opaque[0] == fid2->opaque[0] && + fid1->opaque[1] == fid2->opaque[1] && + fid1->opaque[2] == fid2->opaque[2] && + fid1->opaque[3] == fid2->opaque[3]); +} -#ifndef _CODACRED_T_ -#define _CODACRED_T_ -struct coda_cred { - vuid_t cr_uid, cr_euid, cr_suid, cr_fsuid; /* Real, efftve, set, fs uid*/ - vgid_t cr_groupid, cr_egid, cr_sgid, cr_fsgid; /* same for groups */ -}; -#endif +#endif /* CODA_COMPAT_5 */ #ifndef _VENUS_VATTR_T_ #define _VENUS_VATTR_T_ @@ -227,8 +238,8 @@ int va_type; /* vnode type (for create) */ u_short va_mode; /* files access mode and type */ short va_nlink; /* number of references to file */ - vuid_t va_uid; /* owner user id */ - vgid_t va_gid; /* owner group id */ + uid_t va_uid; /* owner user id */ + gid_t va_gid; /* owner group id */ long va_fileid; /* file id */ u_quad_t va_size; /* file size in bytes */ long va_blocksize; /* blocksize preferred for i/o */ @@ -244,12 +255,21 @@ #endif +/* structure used by CODA_STATFS for getting cache information from venus */ +struct coda_statfs { + int32_t f_blocks; + int32_t f_bfree; + int32_t f_bavail; + int32_t f_files; + int32_t f_ffree; +}; + /* * Kernel <--> Venus communications. */ #define CODA_ROOT 2 -#define CODA_SYNC 3 +#define CODA_OPEN_BY_FD 3 #define CODA_OPEN 4 #define CODA_CLOSE 5 #define CODA_IOCTL 6 @@ -279,7 +299,8 @@ #define CODA_OPEN_BY_PATH 31 #define CODA_RESOLVE 32 #define CODA_REINTEGRATE 33 -#define CODA_NCALLS 34 +#define CODA_STATFS 34 +#define CODA_NCALLS 35 #define DOWNCALL(opcode) (opcode >= CODA_REPLACE && opcode <= CODA_PURGEFID) @@ -293,21 +314,36 @@ #define CODA_KERNEL_VERSION 0 /* The old venus 4.6 compatible interface */ #define CODA_KERNEL_VERSION 1 -#endif +#endif /* realms/cells */ +#ifdef CODA_COMPAT_5 /* venus_lookup gets an extra parameter to aid windows.*/ #define CODA_KERNEL_VERSION 2 +#else + /* 128-bit fids for realms */ +#define CODA_KERNEL_VERSION 3 +#endif /* * Venus <-> Coda RPC arguments */ +#ifdef CODA_COMPAT_5 struct coda_in_hdr { unsigned long opcode; - unsigned long unique; /* Keep multiple outstanding msgs distinct */ - u_short pid; /* Common to all */ - u_short pgid; /* Common to all */ + unsigned long unique; /* Keep multiple outstanding msgs distinct */ + u_short pid; /* Common to all */ + u_short pgid; /* Common to all */ u_short sid; /* Common to all */ - struct coda_cred cred; /* Common to all */ + struct coda_cred cred; /* Common to all */ +}; +#else +struct coda_in_hdr { + u_int32_t opcode; + u_int32_t unique; /* Keep multiple outstanding msgs distinct */ + pid_t pid; /* Common to all */ + pid_t pgid; /* Common to all */ + uid_t uid; /* Common to all */ }; +#endif /* Really important that opcode and unique are 1st two fields! */ struct coda_out_hdr { @@ -319,7 +355,7 @@ /* coda_root: NO_IN */ struct coda_root_out { struct coda_out_hdr oh; - ViceFid VFid; + CodaFid Fid; }; struct coda_root_in { @@ -332,7 +368,7 @@ /* coda_open: */ struct coda_open_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; int flags; }; @@ -346,7 +382,7 @@ /* coda_close: */ struct coda_close_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; int flags; }; @@ -357,7 +393,7 @@ /* coda_ioctl: */ struct coda_ioctl_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; int cmd; int len; int rwflag; @@ -374,7 +410,7 @@ /* coda_getattr: */ struct coda_getattr_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; }; struct coda_getattr_out { @@ -386,7 +422,7 @@ /* coda_setattr: NO_OUT */ struct coda_setattr_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; struct coda_vattr attr; }; @@ -397,7 +433,7 @@ /* coda_access: NO_OUT */ struct coda_access_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; int flags; }; @@ -413,14 +449,14 @@ /* coda_lookup: */ struct coda_lookup_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; int name; /* Place holder for data. */ int flags; }; struct coda_lookup_out { struct coda_out_hdr oh; - ViceFid VFid; + CodaFid Fid; int vtype; }; @@ -428,7 +464,7 @@ /* coda_create: */ struct coda_create_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; struct coda_vattr attr; int excl; int mode; @@ -437,7 +473,7 @@ struct coda_create_out { struct coda_out_hdr oh; - ViceFid VFid; + CodaFid Fid; struct coda_vattr attr; }; @@ -445,7 +481,7 @@ /* coda_remove: NO_OUT */ struct coda_remove_in { struct coda_in_hdr ih; - ViceFid VFid; + CodaFid Fid; int name; /* Place holder for data. */ }; @@ -456,8 +492,8 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 8 11:37:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8EC1A16A4C1; Mon, 8 Sep 2003 11:37:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51E4616A4BF for ; Mon, 8 Sep 2003 11:37:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C120043FE5 for ; Mon, 8 Sep 2003 11:37:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h88Ibw0U087851 for ; Mon, 8 Sep 2003 11:37:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h88IbwXW087848 for perforce@freebsd.org; Mon, 8 Sep 2003 11:37:58 -0700 (PDT) Date: Mon, 8 Sep 2003 11:37:58 -0700 (PDT) Message-Id: <200309081837.h88IbwXW087848@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2003 18:38:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=37788 Change 37788 by peter@peter_daintree on 2003/09/08 11:37:30 update for fault address field Affected files ... .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTHeapDep.m3#2 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTHeapDep.m3#2 (text+ko) ==== @@ -102,7 +102,7 @@ code: Ctypes.int; scp : UNTRACED REF Usignal.struct_sigcontext) = VAR - sf_addr := LOOPHOLE(scp.sc_err, ADDRESS); + sf_addr := LOOPHOLE(scp.sc_addr, ADDRESS); BEGIN IF RTHeapRep.Fault(sf_addr) THEN From owner-p4-projects@FreeBSD.ORG Mon Sep 8 11:42:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC08616A4C1; Mon, 8 Sep 2003 11:42:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8FCF016A4BF for ; Mon, 8 Sep 2003 11:42:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19B1443FA3 for ; Mon, 8 Sep 2003 11:42:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h88Ig40U088090 for ; Mon, 8 Sep 2003 11:42:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h88Ig4hD088087 for perforce@freebsd.org; Mon, 8 Sep 2003 11:42:04 -0700 (PDT) Date: Mon, 8 Sep 2003 11:42:04 -0700 (PDT) Message-Id: <200309081842.h88Ig4hD088087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37790 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2003 18:42:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=37790 Change 37790 by peter@peter_daintree on 2003/09/08 11:41:39 update the sigcontext structure to match reality. Affected files ... .. //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Usignal.i3#4 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Usignal.i3#4 (text+ko) ==== @@ -121,33 +121,34 @@ * a non-standard exit is performed. *) -THIS IS ALL A LIE! THIS STRUCTURE IS 100% WRONG! TYPE struct_sigcontext = RECORD - sc_mask: sigset_t; (* signal mask to restore *) - sc_onstack: long; (* sigstack state to restore *) - sc_r15: long; - sc_r14: long; - sc_r13: long; - sc_r12: long; - sc_r11: long; - sc_r10: long; - sc_r9: long; - sc_r8: long; - sc_rdi: long; - sc_rsi: long; - sc_rbp: long; (* frame pointer *) - sc_rbx: long; - sc_rdx: long; - sc_rcx: long; - sc_rax: long; - sc_trapno: long; - sc_err: long; - sc_rip: long; (* program counter *) - sc_cs: long; - sc_rflags: long; - sc_rsp: long; (* stack pinter *) - sc_ss: long; + sc_mask : sigset_t; (* signal mask to restore *) + sc_onstack : long; (* sigstack state to restore *) + sc_rdi : long; + sc_rsi : long; + sc_rdx : long; + sc_rcx : long; + sc_r8 : long; + sc_r9 : long; + sc_rax : long; + sc_rbx : long; + sc_rbp : long; + sc_r10 : long; + sc_r11 : long; (* frame pointer *) + sc_r12 : long; + sc_r13 : long; + sc_r14 : long; + sc_r15 : long; + sc_trapno : long; + sc_addr : long; + sc_err : long; + sc_rip : long; (* program counter *) + sc_cs : long; + sc_rflags : long; + sc_rsp : long; (* stack pinter *) + sc_ss : long; + sc_len : long; END; (* Do not modifiy these variables *) From owner-p4-projects@FreeBSD.ORG Mon Sep 8 11:55:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAE6316A4C1; Mon, 8 Sep 2003 11:55:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9611716A4BF for ; Mon, 8 Sep 2003 11:55:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C876043FEC for ; Mon, 8 Sep 2003 11:55:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h88ItL0U088556 for ; Mon, 8 Sep 2003 11:55:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h88ItLml088553 for perforce@freebsd.org; Mon, 8 Sep 2003 11:55:21 -0700 (PDT) Date: Mon, 8 Sep 2003 11:55:21 -0700 (PDT) Message-Id: <200309081855.h88ItLml088553@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37791 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2003 18:55:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=37791 Change 37791 by peter@peter_daintree on 2003/09/08 11:54:48 aargh. size_t is in Utypes, not Ctypes. Affected files ... .. //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Uucontext.i3#3 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Uucontext.i3#3 (text+ko) ==== @@ -1,7 +1,7 @@ INTERFACE Uucontext; -FROM Ctypes IMPORT int, long, char_star, unsigned_int, unsigned_char, double, size_t; -FROM Utypes IMPORT u_long, caddr_t; +FROM Ctypes IMPORT int, long, char_star, unsigned_int, unsigned_char, double; +FROM Utypes IMPORT u_long, caddr_t, size_t; (* ucontext.h *) From owner-p4-projects@FreeBSD.ORG Mon Sep 8 11:58:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF4B116A4C1; Mon, 8 Sep 2003 11:58:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B4FEE16A4BF for ; Mon, 8 Sep 2003 11:58:26 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E7B143FAF for ; Mon, 8 Sep 2003 11:58:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h88IwQ0U088668 for ; Mon, 8 Sep 2003 11:58:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h88IwP44088665 for perforce@freebsd.org; Mon, 8 Sep 2003 11:58:25 -0700 (PDT) Date: Mon, 8 Sep 2003 11:58:25 -0700 (PDT) Message-Id: <200309081858.h88IwP44088665@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37792 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2003 18:58:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=37792 Change 37792 by peter@peter_daintree on 2003/09/08 11:58:21 -Wunused Affected files ... .. //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Uucontext.i3#4 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Uucontext.i3#4 (text+ko) ==== @@ -1,7 +1,7 @@ INTERFACE Uucontext; -FROM Ctypes IMPORT int, long, char_star, unsigned_int, unsigned_char, double; -FROM Utypes IMPORT u_long, caddr_t, size_t; +FROM Ctypes IMPORT int, long, char_star, unsigned_int; +FROM Utypes IMPORT size_t; (* ucontext.h *) From owner-p4-projects@FreeBSD.ORG Mon Sep 8 11:59:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC3EC16A4C1; Mon, 8 Sep 2003 11:59:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A72516A4BF for ; Mon, 8 Sep 2003 11:59:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1684143F93 for ; Mon, 8 Sep 2003 11:59:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h88IxR0U088751 for ; Mon, 8 Sep 2003 11:59:27 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h88IxRMG088748 for perforce@freebsd.org; Mon, 8 Sep 2003 11:59:27 -0700 (PDT) Date: Mon, 8 Sep 2003 11:59:27 -0700 (PDT) Message-Id: <200309081859.h88IxRMG088748@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37793 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2003 18:59:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=37793 Change 37793 by peter@peter_daintree on 2003/09/08 11:58:51 -Wunused Affected files ... .. //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Usignal.i3#5 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/unix/freebsd-4.amd64/Usignal.i3#5 (text+ko) ==== @@ -8,7 +8,7 @@ INTERFACE Usignal; -FROM Ctypes IMPORT int, unsigned_int, long, unsigned_long; +FROM Ctypes IMPORT int, unsigned_int, long; FROM Uucontext IMPORT sigset_t; (*** ***) From owner-p4-projects@FreeBSD.ORG Mon Sep 8 12:01:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D25B16A4C1; Mon, 8 Sep 2003 12:01:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 612C316A4BF for ; Mon, 8 Sep 2003 12:01:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44CE243FF7 for ; Mon, 8 Sep 2003 12:01:31 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h88J1V0U088900 for ; Mon, 8 Sep 2003 12:01:31 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h88J1UY5088897 for perforce@freebsd.org; Mon, 8 Sep 2003 12:01:30 -0700 (PDT) Date: Mon, 8 Sep 2003 12:01:30 -0700 (PDT) Message-Id: <200309081901.h88J1UY5088897@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37794 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2003 19:01:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=37794 Change 37794 by peter@peter_daintree on 2003/09/08 12:01:24 sigset_t comes from Uucontext now. Affected files ... .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThread.m3#5 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThread.m3#5 (text+ko) ==== @@ -88,7 +88,7 @@ END setup_sigvtalrm; PROCEDURE allow_sigvtalrm () = - VAR svt, old : Usignal.sigset_t; + VAR svt, old : Uucontext.sigset_t; i : INTEGER; BEGIN EVAL Usignal.sigemptyset(svt); @@ -98,7 +98,7 @@ END allow_sigvtalrm; PROCEDURE disallow_sigvtalrm () = - VAR svt, old : Usignal.sigset_t; + VAR svt, old : Uucontext.sigset_t; i : INTEGER; BEGIN EVAL Usignal.sigemptyset(svt); From owner-p4-projects@FreeBSD.ORG Mon Sep 8 12:06:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 622BF16A4C1; Mon, 8 Sep 2003 12:06:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2667D16A4BF for ; Mon, 8 Sep 2003 12:06:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86DEF43FF3 for ; Mon, 8 Sep 2003 12:06:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h88J6c0U090009 for ; Mon, 8 Sep 2003 12:06:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h88J6c0S090006 for perforce@freebsd.org; Mon, 8 Sep 2003 12:06:38 -0700 (PDT) Date: Mon, 8 Sep 2003 12:06:38 -0700 (PDT) Message-Id: <200309081906.h88J6c0S090006@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37796 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2003 19:06:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=37796 Change 37796 by peter@peter_daintree on 2003/09/08 12:06:01 Lets try importing Uucontext before using it Affected files ... .. //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThread.m3#6 edit Differences ... ==== //depot/projects/ezm3/libs/m3core/src/runtime/FBSD_AMD64/RTThread.m3#6 (text+ko) ==== @@ -9,7 +9,7 @@ UNSAFE MODULE RTThread; -IMPORT Usignal, Unix, Umman, RTMisc; +IMPORT Usignal, Unix, Umman, RTMisc, Uucontext; PROCEDURE SP (READONLY s: State): ADDRESS = BEGIN From owner-p4-projects@FreeBSD.ORG Mon Sep 8 22:22:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78D2716A4C1; Mon, 8 Sep 2003 22:22:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C43D16A4BF for ; Mon, 8 Sep 2003 22:22:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF6C543F75 for ; Mon, 8 Sep 2003 22:22:06 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h895M60U039644 for ; Mon, 8 Sep 2003 22:22:06 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h895M63X039641 for perforce@freebsd.org; Mon, 8 Sep 2003 22:22:06 -0700 (PDT) Date: Mon, 8 Sep 2003 22:22:06 -0700 (PDT) Message-Id: <200309090522.h895M63X039641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37807 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Sep 2003 05:22:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=37807 Change 37807 by marcel@marcel_nfs on 2003/09/08 22:21:28 Patch 4: Grab the right DSDT pointer from the FACP. We still need to print the FACP right. Affected files ... .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#17 edit Differences ... ==== //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#17 (text+ko) ==== @@ -85,13 +85,9 @@ static void acpi_handle_facp(struct FACPbody *facp) { - struct ACPIsdt *dsdp; acpi_print_facp(facp); - dsdp = (struct ACPIsdt *)acpi_map_sdt(facp->dsdt_ptr); - if (acpi_checksum(dsdp, dsdp->len)) - errx(1, "DSDT is corrupt"); - acpi_print_dsdt(dsdp); + acpi_print_dsdt(dsdt_from_facp(facp)); } static void @@ -627,7 +623,11 @@ { struct ACPIsdt *sdt; - sdt = (struct ACPIsdt *)acpi_map_sdt(facp->dsdt_ptr); + assert(addr_size > 0); + + sdt = (addr_size == sizeof(uint32_t)) + ? (struct ACPIsdt *)acpi_map_sdt(facp->dsdt_ptr) + : (struct ACPIsdt *)acpi_map_sdt(facp->x_dsdt); if (acpi_checksum(sdt, sdt->len)) errx(1, "DSDT is corrupt\n"); return (sdt); From owner-p4-projects@FreeBSD.ORG Tue Sep 9 13:26:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68D6716A4C1; Tue, 9 Sep 2003 13:26:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3FA7A16A4BF for ; Tue, 9 Sep 2003 13:26:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62EA243FE9 for ; Tue, 9 Sep 2003 13:26:28 -0700 (PDT) (envelope-from Hrishikesh_Dandekar@NAI.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h89KQS0U012405 for ; Tue, 9 Sep 2003 13:26:28 -0700 (PDT) (envelope-from Hrishikesh_Dandekar@NAI.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h89KQRbF012402 for perforce@freebsd.org; Tue, 9 Sep 2003 13:26:27 -0700 (PDT) Date: Tue, 9 Sep 2003 13:26:27 -0700 (PDT) Message-Id: <200309092026.h89KQRbF012402@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to Hrishikesh_Dandekar@NAI.com using -f From: Hrishikesh Dandekar To: Perforce Change Reviews Subject: PERFORCE change 37827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Sep 2003 20:26:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=37827 Change 37827 by hdandeka@hdandeka_yash on 2003/09/09 13:25:38 Integrate POSIX semaphore related changes into the parent branch. Affected files ... .. //depot/projects/trustedbsd/mac/include/Makefile#34 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#48 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#409 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/posix4/ksem.h#1 branch .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#221 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#68 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#179 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#112 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#244 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#197 integrate Differences ... ==== //depot/projects/trustedbsd/mac/include/Makefile#34 (text+ko) ==== @@ -22,7 +22,7 @@ MHDRS= float.h floatingpoint.h stdarg.h varargs.h # posix4/mqueue.h is useless without an implementation and isn't installed: -PHDRS= sched.h semaphore.h _semaphore.h # mqueue.h +PHDRS= sched.h semaphore.h _semaphore.h ksem.h# mqueue.h LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \ termios.h ucontext.h ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#48 (text+ko) ==== @@ -59,6 +59,7 @@ options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +#options P1003_1B_SEMAPHORES #POSIX P1003_1B semaphores options KBD_INSTALL_CDEV # install a CDEV entry in /dev options AHC_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~128k to driver. ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#409 (text+ko) ==== @@ -44,6 +44,7 @@ #include "opt_mac.h" #include "opt_devfs.h" +#include "opt_posix.h" #include #include @@ -73,6 +74,8 @@ #include #include +#include + #include #include #include @@ -160,6 +163,11 @@ &mac_enforce_pipe, 0, "Enforce MAC policy on pipe operations"); TUNABLE_INT("security.mac.enforce_pipe", &mac_enforce_pipe); +static int mac_enforce_posix_sem = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_posix_sem, CTLFLAG_RW, + &mac_enforce_posix_sem, 0, "Enforce MAC policy on global POSIX semaphores"); +TUNABLE_INT("security.mac.enforce_posix_sem", &mac_enforce_posix_sem); + static int mac_enforce_process = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_process, CTLFLAG_RW, &mac_enforce_process, 0, "Enforce MAC policy on inter-process operations"); @@ -212,7 +220,7 @@ static unsigned int nmacmbufs, nmaccreds, nmacifnets, nmacbpfdescs, nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, nmacipqs, nmacpipes, nmacprocs, nmacipcmsgs, nmacipcmsqs, - nmacipcsemas, nmacipcshms; + nmacipcsemas, nmacipcshms, nmacposixksems; #define MAC_DEBUG_COUNTER_INC(x) atomic_add_int(x, 1); #define MAC_DEBUG_COUNTER_DEC(x) atomic_subtract_int(x, 1); @@ -249,6 +257,8 @@ &nmacipcsemas, 0, "number of sysv ipc semaphore identifiers inuse"); SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipc_shms, CTLFLAG_RD, &nmacipcshms, 0, "number of sysv ipc shm identifiers inuse"); +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, posix_ksems, CTLFLAG_RD, + &nmacposixksems, 0, "number of posix global semaphores inuse"); #else #define MAC_DEBUG_COUNTER_INC(x) #define MAC_DEBUG_COUNTER_DEC(x) @@ -1004,6 +1014,15 @@ mac_init_pipe_label(label); } +void +mac_init_posix_ksem(struct ksem *ksemptr) +{ + + mac_init_label(&ksemptr->ks_label); + MAC_PERFORM(init_posix_ksem_label, &ksemptr->ks_label); + MAC_DEBUG_COUNTER_INC(&nmacposixksems); +} + void mac_init_proc(struct proc *p) { @@ -1215,6 +1234,15 @@ } void +mac_destroy_posix_ksem(struct ksem *ksemptr) +{ + + MAC_PERFORM(destroy_posix_ksem_label, &ksemptr->ks_label); + mac_destroy_label(&ksemptr->ks_label); + MAC_DEBUG_COUNTER_DEC(&nmacposixksems); +} + +void mac_destroy_proc(struct proc *p) { @@ -2370,6 +2398,13 @@ MAC_PERFORM(create_ipc_shm, cred, shmsegptr, &shmsegptr->label); } +void +mac_create_posix_ksem(struct ucred *cred, struct ksem *ksemptr) +{ + + MAC_PERFORM(create_posix_ksem, cred, ksemptr, &ksemptr->ks_label); +} + void mac_create_socket(struct ucred *cred, struct socket *socket) { @@ -3107,6 +3142,105 @@ } int +mac_check_posix_sem_close(struct ucred *cred, struct ksem *ksemptr) +{ + int error; + + if (!mac_enforce_posix_sem) + return (0); + + //XXX: Should we also pass &ksemptr->ks_label ?? + MAC_CHECK(check_posix_sem_close, cred, ksemptr); + + return(error); +} + +int +mac_check_posix_sem_destroy(struct ucred *cred, struct ksem *ksemptr) +{ + int error; + + if (!mac_enforce_posix_sem) + return (0); + + //XXX: Should we also pass &ksemptr->ks_label ?? + MAC_CHECK(check_posix_sem_destroy, cred, ksemptr); + + return(error); +} + +int +mac_check_posix_sem_openexisting(struct ucred *cred, struct ksem *ksemptr) +{ + int error; + + if (!mac_enforce_posix_sem) + return (0); + + //XXX: Should we also pass &ksemptr->ks_label ?? + MAC_CHECK(check_posix_sem_openexisting, cred, ksemptr); + + return(error); +} + +int +mac_check_posix_sem_getvalue(struct ucred *cred, struct ksem *ksemptr) +{ + int error; + + if (!mac_enforce_posix_sem) + return (0); + + //XXX: Should we also pass &ksemptr->ks_label ?? + MAC_CHECK(check_posix_sem_getvalue, cred, ksemptr); + + return(error); +} + +int +mac_check_posix_sem_post(struct ucred *cred, struct ksem *ksemptr) +{ + int error; + + if (!mac_enforce_posix_sem) + return (0); + + //XXX: Should we also pass &ksemptr->ks_label ?? + MAC_CHECK(check_posix_sem_post, cred, ksemptr); + + return(error); +} + +int +mac_check_posix_sem_unlink(struct ucred *cred, struct ksem *ksemptr) +{ + int error; + + if (!mac_enforce_posix_sem) + return (0); + + //XXX: Should we also pass &ksemptr->ks_label ?? + MAC_CHECK(check_posix_sem_unlink, cred, ksemptr); + + return(error); +} + +int +mac_check_posix_sem_wait(struct ucred *cred, struct ksem *ksemptr) +{ + int error; + + if (!mac_enforce_posix_sem) + return (0); + + //XXX: Should we also pass &ksemptr->ks_label ?? + MAC_CHECK(check_posix_sem_wait, cred, ksemptr); + + return(error); +} + + +int mac_check_proc_debug(struct ucred *cred, struct proc *proc) { int error; ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#9 (text+ko) ==== @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD: src/sys/kern/uipc_sem.c,v 1.9 2003/06/11 00:56:58 obrien Exp $"); #include "opt_posix.h" +#include "opt_mac.h" #include #include @@ -47,6 +48,11 @@ #include #include #include +#ifdef MAC +#include +#include +#include +#endif #include #include @@ -54,7 +60,7 @@ static struct ksem *sem_lookup_byname(const char *name); static int sem_create(struct thread *td, const char *name, - struct ksem **ksret, mode_t mode, unsigned int value); +struct ksem **ksret, mode_t mode, unsigned int value); static void sem_free(struct ksem *ksnew); static int sem_perm(struct thread *td, struct ksem *ks); static void sem_enter(struct proc *p, struct ksem *ks); @@ -80,6 +86,7 @@ #define SEM_TO_ID(x) ((intptr_t)(x)) #define ID_TO_SEM(x) id_to_sem(x) +#ifndef MAC struct kuser { pid_t ku_pid; LIST_ENTRY(kuser) ku_next; @@ -98,6 +105,10 @@ int ks_waiters; /* number of waiters */ LIST_HEAD(, kuser) ks_users; /* pids using this sem */ }; +#else +struct kuser; +struct ksem; +#endif /* * available semaphores go here, this includes sem_init and any semaphores @@ -220,9 +231,14 @@ LIST_INIT(&ret->ks_users); if (name != NULL) sem_enter(td->td_proc, ret); +#ifdef MAC + mac_init_posix_ksem(ret); + mac_create_posix_ksem(uc, ret); +#endif *ksret = ret; mtx_lock(&sem_lock); if (nsems >= p31b_getcfg(CTL_P1003_1B_SEM_NSEMS_MAX)) { + /*XXX Should sem_leave be here at all ? */ sem_leave(td->td_proc, ret); sem_free(ret); error = ENFILE; @@ -398,9 +414,16 @@ /* * if we aren't the creator, then enforce permissions. */ - error = sem_perm(td, ks); - if (!error) - sem_ref(ks); + if((error = sem_perm(td, ks))) + goto err; +#ifdef MAC + if((error = mac_check_posix_sem_openexisting(td->td_ucred, ks))) { + DP(("MAC Framework: mac_check_posix_sem_openexisting access denied\n")); + goto err; + } +#endif + sem_ref(ks); +err: mtx_unlock(&sem_lock); if (error) return (error); @@ -452,6 +475,9 @@ if (ks->ks_name != NULL) free(ks->ks_name, M_SEM); cv_destroy(&ks->ks_cv); +#ifdef MAC + mac_destroy_posix_ksem(ks); +#endif free(ks, M_SEM); } @@ -508,7 +534,7 @@ { struct kuser *ku, *k; - ku = malloc(sizeof(*ku), M_SEM, M_WAITOK); + ku = malloc(sizeof(*ku), M_SEM, M_WAITOK | M_ZERO); ku->ku_pid = p->p_pid; mtx_lock(&sem_lock); k = sem_getuser(p, ks); @@ -555,14 +581,24 @@ ks = sem_lookup_byname(name); if (ks == NULL) error = ENOENT; - else - error = sem_perm(td, ks); + else { + if ((error = sem_perm(td, ks))) + goto err; +#ifdef MAC + if((error = mac_check_posix_sem_unlink(td->td_ucred, ks))) { + DP(("MAC Framework: mac_check_posix_sem_unlink access \ + denied\n")); + goto err; + } +#endif + } DP(("sem_unlink: '%s' ks = %p, error = %d\n", name, ks, error)); if (error == 0) { LIST_REMOVE(ks, ks_entry); LIST_INSERT_HEAD(&ksem_deadhead, ks, ks_entry); sem_rel(ks); } +err: mtx_unlock(&sem_lock); return (error); } @@ -593,8 +629,17 @@ mtx_lock(&sem_lock); ks = ID_TO_SEM(id); /* this is not a valid operation for unnamed sems */ - if (ks != NULL && ks->ks_name != NULL) + if (ks != NULL && ks->ks_name != NULL) { +#ifdef MAC + if((error = mac_check_posix_sem_close(td->td_ucred, ks))) { + DP(("MAC Framework: mac_check_posix_sem_close access \ + denied\n")); + goto err; + } +#endif error = sem_leave(td->td_proc, ks); + } +err: mtx_unlock(&sem_lock); return (error); } @@ -632,6 +677,12 @@ error = EOVERFLOW; goto err; } +#ifdef MAC + if((error = mac_check_posix_sem_post(td->td_ucred, ks))) { + DP(("MAC Framework: mac_check_posix_sem_post access denied\n")); + goto err; + } +#endif ++ks->ks_value; if (ks->ks_waiters > 0) cv_signal(&ks->ks_cv); @@ -695,6 +746,12 @@ error = EINVAL; goto err; } +#ifdef MAC + if((error = mac_check_posix_sem_wait(td->td_ucred, ks))) { + DP(("MAC Framework: mac_check_posix_sem_wait access denied\n")); + goto err; + } +#endif DP(("kern_sem_wait value = %d, tryflag %d\n", ks->ks_value, tryflag)); if (ks->ks_value == 0) { ks->ks_waiters++; @@ -734,6 +791,13 @@ mtx_unlock(&sem_lock); return (EINVAL); } +#ifdef MAC + if((error = mac_check_posix_sem_getvalue(td->td_ucred, ks))) { + DP(("MAC Framework: mac_check_posix_sem_getvalue access denied\n")); + mtx_unlock(&sem_lock); + return (error); + } +#endif val = ks->ks_value; mtx_unlock(&sem_lock); error = copyout(&val, uap->val, sizeof(val)); @@ -765,6 +829,12 @@ error = EBUSY; goto err; } +#ifdef MAC + if((error = mac_check_posix_sem_destroy(td->td_ucred, ks))) { + DP(("MAC Framework: mac_check_posix_sem_destroy access denied\n")); + goto err; + } +#endif sem_rel(ks); error = 0; err: ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#221 (text+ko) ==== @@ -65,6 +65,8 @@ #include #include +#include + #include #include @@ -1105,6 +1107,18 @@ } static void +mac_biba_create_posix_ksem(struct ucred *cred, struct ksem *ksemptr, + struct label *ks_label) +{ + struct mac_biba *source, *dest; + + source = SLOT(&cred->cr_label); + dest = SLOT(ks_label); + + mac_biba_copy_single(source, dest); +} + +static void mac_biba_create_socket_from_socket(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel) @@ -2140,6 +2154,40 @@ } static int +mac_biba_check_posix_sem_write(struct ucred *cred, struct ksem *ksemptr) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((&ksemptr->ks_label)); + + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int +mac_biba_check_posix_sem_rdonly(struct ucred *cred, struct ksem *ksemptr) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((&ksemptr->ks_label)); + + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int mac_biba_check_proc_debug(struct ucred *cred, struct proc *proc) { struct mac_biba *subj, *obj; @@ -3072,6 +3120,7 @@ .mpo_init_mount_label = mac_biba_init_label, .mpo_init_mount_fs_label = mac_biba_init_label, .mpo_init_pipe_label = mac_biba_init_label, + .mpo_init_posix_ksem_label = mac_biba_init_label, .mpo_init_socket_label = mac_biba_init_label_waitcheck, .mpo_init_socket_peer_label = mac_biba_init_label_waitcheck, .mpo_init_vnode_label = mac_biba_init_label, @@ -3088,6 +3137,7 @@ .mpo_destroy_mount_label = mac_biba_destroy_label, .mpo_destroy_mount_fs_label = mac_biba_destroy_label, .mpo_destroy_pipe_label = mac_biba_destroy_label, + .mpo_destroy_posix_ksem_label = mac_biba_destroy_label, .mpo_destroy_socket_label = mac_biba_destroy_label, .mpo_destroy_socket_peer_label = mac_biba_destroy_label, .mpo_destroy_vnode_label = mac_biba_destroy_label, @@ -3119,6 +3169,7 @@ .mpo_setlabel_vnode_extattr = mac_biba_setlabel_vnode_extattr, .mpo_create_mbuf_from_socket = mac_biba_create_mbuf_from_socket, .mpo_create_pipe = mac_biba_create_pipe, + .mpo_create_posix_ksem = mac_biba_create_posix_ksem, .mpo_create_socket = mac_biba_create_socket, .mpo_create_socket_from_socket = mac_biba_create_socket_from_socket, .mpo_relabel_pipe = mac_biba_relabel_pipe, @@ -3178,6 +3229,13 @@ .mpo_check_pipe_relabel = mac_biba_check_pipe_relabel, .mpo_check_pipe_stat = mac_biba_check_pipe_stat, .mpo_check_pipe_write = mac_biba_check_pipe_write, + .mpo_check_posix_sem_close = mac_biba_check_posix_sem_write, + .mpo_check_posix_sem_destroy = mac_biba_check_posix_sem_write, + .mpo_check_posix_sem_getvalue = mac_biba_check_posix_sem_rdonly, + .mpo_check_posix_sem_openexisting = mac_biba_check_posix_sem_write, + .mpo_check_posix_sem_post = mac_biba_check_posix_sem_write, + .mpo_check_posix_sem_unlink = mac_biba_check_posix_sem_write, + .mpo_check_posix_sem_wait = mac_biba_check_posix_sem_write, .mpo_check_proc_debug = mac_biba_check_proc_debug, .mpo_check_proc_sched = mac_biba_check_proc_sched, .mpo_check_proc_signal = mac_biba_check_proc_signal, ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#68 (text+ko) ==== @@ -65,6 +65,8 @@ #include #include +#include + #include #include @@ -1178,6 +1180,18 @@ } static void +mac_lomac_create_posix_ksem(struct ucred *cred, struct ksem *ksemptr, + struct label *ks_label) +{ + struct mac_lomac *source, *dest; + + source = SLOT(&cred->cr_label); + dest = SLOT(ks_label); + + mac_lomac_copy_single(source, dest); +} + +static void mac_lomac_create_socket_from_socket(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel) @@ -2262,6 +2276,40 @@ } static int +mac_lomac_check_posix_sem_write(struct ucred *cred, struct ksem *ksemptr) +{ + struct mac_lomac *subj, *obj; + + if (!mac_lomac_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((&ksemptr->ks_label)); + + if (!mac_lomac_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int +mac_lomac_check_posix_sem_rdonly(struct ucred *cred, struct ksem *ksemptr) +{ + struct mac_lomac *subj, *obj; + + if (!mac_lomac_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((&ksemptr->ks_label)); + + if (!mac_lomac_dominate_single(obj, subj)) + return (maybe_demote(subj, obj, "sem_getvalue", "posix_sem", NULL)); + + return (0); +} + +static int mac_lomac_check_proc_debug(struct ucred *cred, struct proc *proc) { struct mac_lomac *subj, *obj; @@ -2998,6 +3046,7 @@ .mpo_init_mount_label = mac_lomac_init_label, .mpo_init_mount_fs_label = mac_lomac_init_label, .mpo_init_pipe_label = mac_lomac_init_label, + .mpo_init_posix_ksem_label = mac_lomac_init_label, .mpo_init_proc_label = mac_lomac_init_proc_label, .mpo_init_socket_label = mac_lomac_init_label_waitcheck, .mpo_init_socket_peer_label = mac_lomac_init_label_waitcheck, @@ -3015,6 +3064,7 @@ .mpo_destroy_mount_label = mac_lomac_destroy_label, .mpo_destroy_mount_fs_label = mac_lomac_destroy_label, .mpo_destroy_pipe_label = mac_lomac_destroy_label, + .mpo_destroy_posix_ksem_label = mac_lomac_destroy_label, .mpo_destroy_proc_label = mac_lomac_destroy_proc_label, .mpo_destroy_socket_label = mac_lomac_destroy_label, .mpo_destroy_socket_peer_label = mac_lomac_destroy_label, @@ -3048,6 +3098,7 @@ .mpo_setlabel_vnode_extattr = mac_lomac_setlabel_vnode_extattr, .mpo_create_mbuf_from_socket = mac_lomac_create_mbuf_from_socket, .mpo_create_pipe = mac_lomac_create_pipe, + .mpo_create_posix_ksem = mac_lomac_create_posix_ksem, .mpo_create_socket = mac_lomac_create_socket, .mpo_create_socket_from_socket = mac_lomac_create_socket_from_socket, .mpo_relabel_pipe = mac_lomac_relabel_pipe, @@ -3109,6 +3160,13 @@ .mpo_check_pipe_read = mac_lomac_check_pipe_read, .mpo_check_pipe_relabel = mac_lomac_check_pipe_relabel, .mpo_check_pipe_write = mac_lomac_check_pipe_write, + .mpo_check_posix_sem_close = mac_lomac_check_posix_sem_write, + .mpo_check_posix_sem_destroy = mac_lomac_check_posix_sem_write, + .mpo_check_posix_sem_getvalue = mac_lomac_check_posix_sem_rdonly, + .mpo_check_posix_sem_openexisting = mac_lomac_check_posix_sem_write, + .mpo_check_posix_sem_post = mac_lomac_check_posix_sem_write, + .mpo_check_posix_sem_unlink = mac_lomac_check_posix_sem_write, + .mpo_check_posix_sem_wait = mac_lomac_check_posix_sem_write, .mpo_check_proc_debug = mac_lomac_check_proc_debug, .mpo_check_proc_sched = mac_lomac_check_proc_sched, .mpo_check_proc_signal = mac_lomac_check_proc_signal, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#179 (text+ko) ==== @@ -65,6 +65,8 @@ #include #include +#include + #include #include @@ -1073,6 +1075,18 @@ } static void +mac_mls_create_posix_ksem(struct ucred *cred, struct ksem *ksemptr, + struct label *ks_label) +{ + struct mac_mls *source, *dest; + + source = SLOT(&cred->cr_label); + dest = SLOT(ks_label); + + mac_mls_copy_single(source, dest); +} + +static void mac_mls_create_socket_from_socket(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel) @@ -2034,6 +2048,40 @@ } static int +mac_mls_check_posix_sem_write(struct ucred *cred, struct ksem *ksemptr) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((&ksemptr->ks_label)); + + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int +mac_mls_check_posix_sem_rdonly(struct ucred *cred, struct ksem *ksemptr) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((&ksemptr->ks_label)); + + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_mls_check_proc_debug(struct ucred *cred, struct proc *proc) { struct mac_mls *subj, *obj; @@ -2847,6 +2895,7 @@ .mpo_init_mount_label = mac_mls_init_label, .mpo_init_mount_fs_label = mac_mls_init_label, .mpo_init_pipe_label = mac_mls_init_label, + .mpo_init_posix_ksem_label = mac_mls_init_label, .mpo_init_socket_label = mac_mls_init_label_waitcheck, .mpo_init_socket_peer_label = mac_mls_init_label_waitcheck, .mpo_init_vnode_label = mac_mls_init_label, @@ -2863,6 +2912,7 @@ .mpo_destroy_mount_label = mac_mls_destroy_label, .mpo_destroy_mount_fs_label = mac_mls_destroy_label, .mpo_destroy_pipe_label = mac_mls_destroy_label, + .mpo_destroy_posix_ksem_label = mac_mls_destroy_label, .mpo_destroy_socket_label = mac_mls_destroy_label, .mpo_destroy_socket_peer_label = mac_mls_destroy_label, .mpo_destroy_vnode_label = mac_mls_destroy_label, @@ -2894,6 +2944,7 @@ .mpo_setlabel_vnode_extattr = mac_mls_setlabel_vnode_extattr, .mpo_create_mbuf_from_socket = mac_mls_create_mbuf_from_socket, .mpo_create_pipe = mac_mls_create_pipe, + .mpo_create_posix_ksem = mac_mls_create_posix_ksem, .mpo_create_socket = mac_mls_create_socket, .mpo_create_socket_from_socket = mac_mls_create_socket_from_socket, .mpo_relabel_pipe = mac_mls_relabel_pipe, @@ -2951,6 +3002,13 @@ .mpo_check_pipe_relabel = mac_mls_check_pipe_relabel, .mpo_check_pipe_stat = mac_mls_check_pipe_stat, .mpo_check_pipe_write = mac_mls_check_pipe_write, + .mpo_check_posix_sem_close = mac_mls_check_posix_sem_write, + .mpo_check_posix_sem_destroy = mac_mls_check_posix_sem_write, + .mpo_check_posix_sem_getvalue = mac_mls_check_posix_sem_rdonly, + .mpo_check_posix_sem_openexisting = mac_mls_check_posix_sem_write, + .mpo_check_posix_sem_post = mac_mls_check_posix_sem_write, + .mpo_check_posix_sem_unlink = mac_mls_check_posix_sem_write, + .mpo_check_posix_sem_wait = mac_mls_check_posix_sem_write, .mpo_check_proc_debug = mac_mls_check_proc_debug, .mpo_check_proc_sched = mac_mls_check_proc_sched, .mpo_check_proc_signal = mac_mls_check_proc_signal, ==== //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#7 (text+ko) ==== @@ -64,6 +64,8 @@ #include #include +#include + #include #include @@ -269,6 +271,12 @@ } static void +stub_create_posix_ksem(struct ucred *cred, struct ksem *ksemptr) +{ + +} + +static void stub_create_socket_from_socket(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel) @@ -794,6 +802,55 @@ } static int +stub_check_posix_sem_close(struct ucred *cred, struct ksem *ksemptr) +{ + + return (0); +} + +static int +stub_check_posix_sem_destroy(struct ucred *cred, struct ksem *ksemptr) +{ + + return (0); +} + +static int +stub_check_posix_sem_getvalue(struct ucred *cred, struct ksem *ksemptr) +{ + + return (0); +} + +static int +stub_check_posix_sem_openexisting(struct ucred *cred, struct ksem *ksemptr) +{ + + return (0); +} + +static int +stub_check_posix_sem_post(struct ucred *cred, struct ksem *ksemptr) +{ + + return (0); +} + +static int +stub_check_posix_sem_unlink(struct ucred *cred, struct ksem *ksemptr) +{ + + return (0); +} + +static int +stub_check_posix_sem_wait(struct ucred *cred, struct ksem *ksemptr) +{ + + return (0); +} + +static int stub_check_proc_debug(struct ucred *cred, struct proc *proc) { @@ -1201,6 +1258,7 @@ .mpo_init_mount_label = stub_init_label, .mpo_init_mount_fs_label = stub_init_label, .mpo_init_pipe_label = stub_init_label, + .mpo_init_posix_ksem_label = stub_init_label, .mpo_init_socket_label = stub_init_label_waitcheck, .mpo_init_socket_peer_label = stub_init_label_waitcheck, .mpo_init_vnode_label = stub_init_label, @@ -1217,6 +1275,7 @@ .mpo_destroy_mount_label = stub_destroy_label, .mpo_destroy_mount_fs_label = stub_destroy_label, .mpo_destroy_pipe_label = stub_destroy_label, + .mpo_destroy_posix_ksem_label = stub_destroy_label, .mpo_destroy_socket_label = stub_destroy_label, .mpo_destroy_socket_peer_label = stub_destroy_label, .mpo_destroy_vnode_label = stub_destroy_label, @@ -1249,6 +1308,7 @@ .mpo_update_devfsdirent = stub_update_devfsdirent, .mpo_create_mbuf_from_socket = stub_create_mbuf_from_socket, .mpo_create_pipe = stub_create_pipe, + .mpo_create_posix_ksem = stub_create_posix_ksem, .mpo_create_socket = stub_create_socket, .mpo_create_socket_from_socket = stub_create_socket_from_socket, .mpo_relabel_pipe = stub_relabel_pipe, @@ -1317,6 +1377,13 @@ .mpo_check_pipe_relabel = stub_check_pipe_relabel, .mpo_check_pipe_stat = stub_check_pipe_stat, .mpo_check_pipe_write = stub_check_pipe_write, + .mpo_check_posix_sem_close = stub_check_posix_sem_close, + .mpo_check_posix_sem_destroy = stub_check_posix_sem_destroy, + .mpo_check_posix_sem_getvalue = stub_check_posix_sem_getvalue, + .mpo_check_posix_sem_openexisting = stub_check_posix_sem_openexisting, + .mpo_check_posix_sem_post = stub_check_posix_sem_post, + .mpo_check_posix_sem_unlink = stub_check_posix_sem_unlink, + .mpo_check_posix_sem_wait = stub_check_posix_sem_wait, .mpo_check_proc_debug = stub_check_proc_debug, .mpo_check_proc_sched = stub_check_proc_sched, .mpo_check_proc_signal = stub_check_proc_signal, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#112 (text+ko) ==== @@ -57,7 +57,13 @@ #include #include #include +#include +#include +#include +#include +#include + #include #include @@ -85,7 +91,12 @@ #define MBUFMAGIC 0xbbefa5bb #define MOUNTMAGIC 0xc7c46e47 #define SOCKETMAGIC 0x9199c6cd +#define SYSVIPCMSQMAGIC 0xea672391 +#define SYSVIPCMSGMAGIC 0x8bbba61e +#define SYSVIPCSEMMAGIC 0x896e8a0b +#define SYSVIPCSHMMAGIC 0x76119ab0 #define PIPEMAGIC 0xdc6c9919 +#define POSIXSEMMAGIC 0x78ae980c #define PROCMAGIC 0x3b4be98f #define CREDMAGIC 0x9a5a4987 #define VNODEMAGIC 0x1a67a45c @@ -107,8 +118,18 @@ SLOT(x) == 0, ("%s: Bad MOUNT label", __func__ )) #define ASSERT_SOCKET_LABEL(x) KASSERT(SLOT(x) == SOCKETMAGIC || \ SLOT(x) == 0, ("%s: Bad SOCKET label", __func__ )) +#define ASSERT_SYSVIPCMSQ_LABEL(x) KASSERT(SLOT(x) == SYSVIPCMSQMAGIC || \ + SLOT(x) == 0, ("%s: Bad SYSVIPCMSQ label", __func__ )) +#define ASSERT_SYSVIPCMSG_LABEL(x) KASSERT(SLOT(x) == SYSVIPCMSGMAGIC || \ + SLOT(x) == 0, ("%s: Bad SYSVIPCMSG label", __func__ )) +#define ASSERT_SYSVIPCSEM_LABEL(x) KASSERT(SLOT(x) == SYSVIPCSEMMAGIC || \ + SLOT(x) == 0, ("%s: Bad SYSVIPCSEM label", __func__ )) +#define ASSERT_SYSVIPCSHM_LABEL(x) KASSERT(SLOT(x) == SYSVIPCSHMMAGIC || \ + SLOT(x) == 0, ("%s: Bad SYSVIPCSHM label", __func__ )) #define ASSERT_PIPE_LABEL(x) KASSERT(SLOT(x) == PIPEMAGIC || \ SLOT(x) == 0, ("%s: Bad PIPE label", __func__ )) +#define ASSERT_POSIX_LABEL(x) KASSERT(SLOT(x) == POSIXSEMMAGIC || \ + SLOT(x) == 0, ("%s: Bad POSIX ksem label", __func__ )) #define ASSERT_PROC_LABEL(x) KASSERT(SLOT(x) == PROCMAGIC || \ SLOT(x) == 0, ("%s: Bad PROC label", __func__ )) #define ASSERT_CRED_LABEL(x) KASSERT(SLOT(x) == CREDMAGIC || \ @@ -132,6 +153,18 @@ static int init_count_ifnet; SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_ifnet, CTLFLAG_RD, &init_count_ifnet, 0, "ifnet init calls"); +static int init_count_ipc_msg; +SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_ipc_msg, CTLFLAG_RD, + &init_count_ipc_msg, 0, "ipc_msg init calls"); +static int init_count_ipc_msq; +SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_ipc_msq, CTLFLAG_RD, + &init_count_ipc_msq, 0, "ipc_msq init calls"); +static int init_count_ipc_sema; +SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_ipc_sema, CTLFLAG_RD, + &init_count_ipc_sema, 0, "ipc_sema init calls"); +static int init_count_ipc_shm; +SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_ipc_shm, CTLFLAG_RD, + &init_count_ipc_shm, 0, "ipc_shm init calls"); static int init_count_ipq; SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_ipq, CTLFLAG_RD, &init_count_ipq, 0, "ipq init calls"); @@ -154,6 +187,9 @@ static int init_count_pipe; SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_pipe, CTLFLAG_RD, &init_count_pipe, 0, "pipe init calls"); +static int init_count_posixsems; +SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_posixsems, CTLFLAG_RD, + &init_count_posixsems, 0, "posix sems init calls"); static int init_count_proc; SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_proc, CTLFLAG_RD, &init_count_proc, 0, "proc init calls"); @@ -173,6 +209,18 @@ static int destroy_count_ifnet; SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_ifnet, CTLFLAG_RD, &destroy_count_ifnet, 0, "ifnet destroy calls"); +static int destroy_count_ipc_msg; +SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_ipc_msg, CTLFLAG_RD, + &destroy_count_ipc_msg, 0, "ipc_msg destroy calls"); +static int destroy_count_ipc_msq; +SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_ipc_msq, CTLFLAG_RD, + &destroy_count_ipc_msq, 0, "ipc_msq destroy calls"); +static int destroy_count_ipc_sema; +SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_ipc_sema, CTLFLAG_RD, + &destroy_count_ipc_sema, 0, "ipc_sema destroy calls"); +static int destroy_count_ipc_shm; +SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_ipc_shm, CTLFLAG_RD, + &destroy_count_ipc_shm, 0, "ipc_shm destroy calls"); static int destroy_count_ipq; SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_ipq, CTLFLAG_RD, &destroy_count_ipq, 0, "ipq destroy calls"); @@ -196,6 +244,9 @@ static int destroy_count_pipe; SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_pipe, CTLFLAG_RD, &destroy_count_pipe, 0, "pipe destroy calls"); +static int destroy_count_posixsems; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 9 22:53:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0FBE16A4C1; Tue, 9 Sep 2003 22:53:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C431716A4BF for ; Tue, 9 Sep 2003 22:53:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56E1343F93 for ; Tue, 9 Sep 2003 22:53:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8A5rK0U053051 for ; Tue, 9 Sep 2003 22:53:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8A5rHuj053048 for perforce@freebsd.org; Tue, 9 Sep 2003 22:53:17 -0700 (PDT) Date: Tue, 9 Sep 2003 22:53:17 -0700 (PDT) Message-Id: <200309100553.h8A5rHuj053048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37844 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2003 05:53:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=37844 Change 37844 by marcel@marcel_nfs on 2003/09/09 22:53:02 IFC @37843 Affected files ... .. //depot/projects/ia64/bin/ls/util.c#7 integrate .. //depot/projects/ia64/bin/ps/ps.1#18 integrate .. //depot/projects/ia64/bin/sh/sh.1#23 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grotty/grotty.man#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/eqnrc#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/troffrc#5 integrate .. //depot/projects/ia64/contrib/groff/tmac/tty-char.tmac#5 integrate .. //depot/projects/ia64/contrib/groff/tmac/tty.tmac#4 integrate .. //depot/projects/ia64/contrib/isc-dhcp/client/scripts/freebsd#6 integrate .. //depot/projects/ia64/etc/defaults/pccard.conf#24 integrate .. //depot/projects/ia64/etc/devd.conf#7 integrate .. //depot/projects/ia64/etc/gettytab#3 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/font/devkoi8-r/R.proto#2 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/Makefile#8 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/fr.ISO8859-1#3 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/koi8-r.tmac#1 branch .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/ru.KOI8-R#3 integrate .. //depot/projects/ia64/gnu/usr.bin/man/manpath/manpath.config#5 integrate .. //depot/projects/ia64/include/pthread.h#8 integrate .. //depot/projects/ia64/lib/libalias/alias_db.c#7 integrate .. //depot/projects/ia64/lib/libalias/libalias.3#6 integrate .. //depot/projects/ia64/lib/libc/compat-43/sigvec.2#5 integrate .. //depot/projects/ia64/lib/libc/db/man/btree.3#3 integrate .. //depot/projects/ia64/lib/libc/db/man/dbm.3#4 integrate .. //depot/projects/ia64/lib/libc/db/man/dbopen.3#5 integrate .. //depot/projects/ia64/lib/libc/db/man/hash.3#3 integrate .. //depot/projects/ia64/lib/libc/db/man/recno.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/confstr.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/ctermid.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/dlinfo.3#6 integrate .. //depot/projects/ia64/lib/libc/gen/fts.3#7 integrate .. //depot/projects/ia64/lib/libc/gen/getcwd.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/getfsent.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/getgrent.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/gethostname.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/getpwent.3#7 integrate .. //depot/projects/ia64/lib/libc/gen/glob.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/msgctl.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/signal.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/sysconf.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/sysctl.3#9 integrate .. //depot/projects/ia64/lib/libc/gen/tcsetattr.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/uname.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/wordexp.3#6 integrate .. //depot/projects/ia64/lib/libc/i386/sys/i386_get_ldt.2#7 integrate .. //depot/projects/ia64/lib/libc/locale/ctype.3#4 integrate .. //depot/projects/ia64/lib/libc/locale/nl_langinfo.3#4 integrate .. //depot/projects/ia64/lib/libc/locale/rune.3#8 integrate .. //depot/projects/ia64/lib/libc/net/addr2ascii.3#3 integrate .. //depot/projects/ia64/lib/libc/net/ethers.3#4 integrate .. //depot/projects/ia64/lib/libc/net/getaddrinfo.3#5 integrate .. //depot/projects/ia64/lib/libc/net/getifaddrs.3#2 integrate .. //depot/projects/ia64/lib/libc/net/getnameinfo.3#4 integrate .. //depot/projects/ia64/lib/libc/net/if_indextoname.3#4 integrate .. //depot/projects/ia64/lib/libc/net/resolver.3#4 integrate .. //depot/projects/ia64/lib/libc/regex/regex.3#5 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc.3#6 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_svc_calls.3#5 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_svc_create.3#4 integrate .. //depot/projects/ia64/lib/libc/stdio/funopen.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/tmpnam.3#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/hcreate.3#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/rand.3#3 integrate .. //depot/projects/ia64/lib/libc/stdtime/ctime.3#4 integrate .. //depot/projects/ia64/lib/libc/string/bcmp.3#3 integrate .. //depot/projects/ia64/lib/libc/string/bcopy.3#3 integrate .. //depot/projects/ia64/lib/libc/string/bzero.3#3 integrate .. //depot/projects/ia64/lib/libc/string/ffs.3#3 integrate .. //depot/projects/ia64/lib/libc/string/index.3#6 integrate .. //depot/projects/ia64/lib/libc/string/strcasecmp.3#3 integrate .. //depot/projects/ia64/lib/libc/sys/chmod.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/getlogin.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/intro.2#10 integrate .. //depot/projects/ia64/lib/libc/sys/kqueue.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/ktrace.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/mincore.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/mount.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/poll.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/ptrace.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/reboot.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/select.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/sigaction.2#13 integrate .. //depot/projects/ia64/lib/libc/sys/sigprocmask.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/stat.2#8 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_once.3#3 integrate .. //depot/projects/ia64/lib/libcalendar/calendar.3#2 integrate .. //depot/projects/ia64/lib/libcam/cam_cdbparse.3#4 integrate .. //depot/projects/ia64/lib/libcompat/4.1/ftime.3#2 integrate .. //depot/projects/ia64/lib/libcompat/4.4/cuserid.3#3 integrate .. //depot/projects/ia64/lib/libdevinfo/devinfo.3#4 integrate .. //depot/projects/ia64/lib/libdevstat/devstat.3#5 integrate .. //depot/projects/ia64/lib/libedit/editline.3#4 integrate .. //depot/projects/ia64/lib/libfetch/fetch.3#9 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_once.3#2 integrate .. //depot/projects/ia64/lib/libpthread/pthread.map#6 integrate .. //depot/projects/ia64/lib/libpthread/thread/Makefile.inc#11 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_once.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#23 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_pspinlock.c#1 branch .. //depot/projects/ia64/lib/libradius/libradius.3#6 integrate .. //depot/projects/ia64/lib/libtacplus/libtacplus.3#4 integrate .. //depot/projects/ia64/lib/libusbhid/usbhid.3#5 integrate .. //depot/projects/ia64/libexec/talkd/talkd.8#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#11 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#25 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/readme/article.sgml#13 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.8#5 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.8#18 integrate .. //depot/projects/ia64/sbin/newfs/newfs.8#16 integrate .. //depot/projects/ia64/sbin/ping/ping.8#14 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.8#11 integrate .. //depot/projects/ia64/sbin/vinum/vinum.8#10 integrate .. //depot/projects/ia64/share/examples/mdoc/example.3#2 integrate .. //depot/projects/ia64/share/man/man3/stdarg.3#5 integrate .. //depot/projects/ia64/share/man/man3/timeradd.3#3 integrate .. //depot/projects/ia64/share/man/man4/Makefile#59 integrate .. //depot/projects/ia64/share/man/man4/agp.4#5 integrate .. //depot/projects/ia64/share/man/man4/bfe.4#1 branch .. //depot/projects/ia64/share/man/man4/bpf.4#6 integrate .. //depot/projects/ia64/share/man/man4/cd.4#6 integrate .. //depot/projects/ia64/share/man/man4/ch.4#4 integrate .. //depot/projects/ia64/share/man/man4/da.4#7 integrate .. //depot/projects/ia64/share/man/man4/fdc.4#3 integrate .. //depot/projects/ia64/share/man/man4/ifmib.4#5 integrate .. //depot/projects/ia64/share/man/man4/inet.4#5 integrate .. //depot/projects/ia64/share/man/man4/inet6.4#4 integrate .. //depot/projects/ia64/share/man/man4/ktr.4#4 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/perfmon.4#2 integrate .. //depot/projects/ia64/share/man/man4/mem.4#4 integrate .. //depot/projects/ia64/share/man/man4/mtio.4#5 integrate .. //depot/projects/ia64/share/man/man4/ng_source.4#3 integrate .. //depot/projects/ia64/share/man/man4/pci.4#4 integrate .. //depot/projects/ia64/share/man/man4/pcm.4#6 integrate .. //depot/projects/ia64/share/man/man4/pt.4#3 integrate .. //depot/projects/ia64/share/man/man4/re.4#1 branch .. //depot/projects/ia64/share/man/man4/rl.4#7 integrate .. //depot/projects/ia64/share/man/man4/ses.4#2 integrate .. //depot/projects/ia64/share/man/man4/tap.4#5 integrate .. //depot/projects/ia64/share/man/man4/targ.4#5 integrate .. //depot/projects/ia64/share/man/man4/tcp.4#15 integrate .. //depot/projects/ia64/share/man/man4/termios.4#4 integrate .. //depot/projects/ia64/share/man/man4/ti.4#7 integrate .. //depot/projects/ia64/share/man/man4/tty.4#3 integrate .. //depot/projects/ia64/share/man/man4/tun.4#3 integrate .. //depot/projects/ia64/share/man/man4/unix.4#3 integrate .. //depot/projects/ia64/share/man/man4/usb.4#10 integrate .. //depot/projects/ia64/share/man/man5/a.out.5#4 integrate .. //depot/projects/ia64/share/man/man5/core.5#5 integrate .. //depot/projects/ia64/share/man/man5/elf.5#4 integrate .. //depot/projects/ia64/share/man/man5/fs.5#7 integrate .. //depot/projects/ia64/share/man/man5/group.5#5 integrate .. //depot/projects/ia64/share/man/man5/link.5#3 integrate .. //depot/projects/ia64/share/man/man5/stab.5#2 integrate .. //depot/projects/ia64/share/man/man5/style.Makefile.5#4 integrate .. //depot/projects/ia64/share/man/man5/utmp.5#7 integrate .. //depot/projects/ia64/share/man/man7/stdint.7#5 integrate .. //depot/projects/ia64/share/man/man9/BUS_SETUP_INTR.9#5 integrate .. //depot/projects/ia64/share/man/man9/SYSCALL_MODULE.9#3 integrate .. //depot/projects/ia64/share/man/man9/ifnet.9#9 integrate .. //depot/projects/ia64/share/man/man9/ithread.9#3 integrate .. //depot/projects/ia64/share/man/man9/ktr.9#6 integrate .. //depot/projects/ia64/share/man/man9/lock.9#5 integrate .. //depot/projects/ia64/share/man/man9/make_dev.9#4 integrate .. //depot/projects/ia64/share/man/man9/malloc.9#13 integrate .. //depot/projects/ia64/share/man/man9/pfil.9#3 integrate .. //depot/projects/ia64/share/man/man9/rtentry.9#3 integrate .. //depot/projects/ia64/share/man/man9/sbuf.9#5 integrate .. //depot/projects/ia64/share/man/man9/style.9#22 integrate .. //depot/projects/ia64/share/man/man9/swi.9#5 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#42 integrate .. //depot/projects/ia64/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#13 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#22 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/ia64/sys/amd64/include/signal.h#2 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/acpi_stub.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/bootinfo.c#7 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/devicename.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/efi_stub.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/elf_freebsd.c#8 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/module.c#3 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/sal_stub.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/skifs.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/ssc.c#3 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/time.c#3 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/boot.c#4 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/disk.c#7 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/io.c#3 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/probe_keyboard.c#2 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/sys.c#4 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/table.c#2 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/biosdisk.c#8 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/biosmem.c#3 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/comconsole.c#2 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/gatea20.c#2 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/i386_module.c#2 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/time.c#2 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/vidconsole.c#2 integrate .. //depot/projects/ia64/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/ia64/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/ia64/sys/coda/coda_psdev.c#8 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#22 integrate .. //depot/projects/ia64/sys/conf/files#100 integrate .. //depot/projects/ia64/sys/conf/options.ia64#17 integrate .. //depot/projects/ia64/sys/crypto/sha2/sha2.c#6 integrate .. //depot/projects/ia64/sys/dev/aac/aac_pci.c#23 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#39 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#42 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#25 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#6 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.h#15 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.c#25 integrate .. //depot/projects/ia64/sys/dev/bfe/if_bfe.c#1 branch .. //depot/projects/ia64/sys/dev/bfe/if_bfereg.h#1 branch .. //depot/projects/ia64/sys/dev/ciss/ciss.c#25 integrate .. //depot/projects/ia64/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/ia64/sys/dev/drm/drm_context.h#5 integrate .. //depot/projects/ia64/sys/dev/drm/drm_memory.h#9 integrate .. //depot/projects/ia64/sys/dev/drm/radeon.h#5 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_drm.h#5 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_drv.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_drv.h#6 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_mem.c#4 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_state.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/sis.h#1 branch .. //depot/projects/ia64/sys/dev/drm/sis_drm.h#3 branch .. //depot/projects/ia64/sys/dev/drm/sis_drv.c#1 branch .. //depot/projects/ia64/sys/dev/drm/sis_drv.h#1 branch .. //depot/projects/ia64/sys/dev/drm/sis_ds.c#1 branch .. //depot/projects/ia64/sys/dev/drm/sis_ds.h#1 branch .. //depot/projects/ia64/sys/dev/drm/sis_mm.c#1 branch .. //depot/projects/ia64/sys/dev/mii/bmtphy.c#6 integrate .. //depot/projects/ia64/sys/dev/mii/miidevs#9 integrate .. //depot/projects/ia64/sys/dev/mii/rlphy.c#12 integrate .. //depot/projects/ia64/sys/dev/pst/pst-raid.c#11 integrate .. //depot/projects/ia64/sys/dev/re/if_re.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_crypt.c#16 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_machdep.c#12 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_wakeup.c#20 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#39 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#45 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#26 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#45 integrate .. //depot/projects/ia64/sys/i386/i386/mp_clock.c#9 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#29 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#61 integrate .. //depot/projects/ia64/sys/i386/include/acpica_machdep.h#4 integrate .. //depot/projects/ia64/sys/i386/include/apic.h#8 integrate .. //depot/projects/ia64/sys/i386/include/segments.h#7 integrate .. //depot/projects/ia64/sys/i386/isa/npx.c#18 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC#37 integrate .. //depot/projects/ia64/sys/ia64/conf/NOTES#3 integrate .. //depot/projects/ia64/sys/ia64/ia64/genassym.c#15 integrate .. //depot/projects/ia64/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#93 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#75 integrate .. //depot/projects/ia64/sys/ia64/include/vmparam.h#9 integrate .. //depot/projects/ia64/sys/kern/kern_ktr.c#16 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#41 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#20 integrate .. //depot/projects/ia64/sys/modules/Makefile#63 integrate .. //depot/projects/ia64/sys/modules/bfe/Makefile#1 branch .. //depot/projects/ia64/sys/modules/drm/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/drm/sis/Makefile#1 branch .. //depot/projects/ia64/sys/modules/re/Makefile#1 branch .. //depot/projects/ia64/sys/pc98/conf/GENERIC#35 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#45 integrate .. //depot/projects/ia64/sys/pci/if_rlreg.h#15 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#39 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#44 integrate .. //depot/projects/ia64/sys/sys/ata.h#11 integrate .. //depot/projects/ia64/sys/sys/param.h#41 integrate .. //depot/projects/ia64/sys/vm/pmap.h#20 integrate .. //depot/projects/ia64/tools/tools/tinderbox/powerpc.diff#2 integrate .. //depot/projects/ia64/usr.bin/fetch/fetch.1#9 integrate .. //depot/projects/ia64/usr.bin/file/file.1#7 integrate .. //depot/projects/ia64/usr.bin/getconf/getconf.1#5 integrate .. //depot/projects/ia64/usr.bin/make/for.c#6 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#18 edit .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpidump.8#5 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpidump.c#11 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpidump.h#11 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#22 integrate .. //depot/projects/ia64/usr.sbin/pw/pw.conf.5#3 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/devices.c#13 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslogd.8#9 integrate Differences ... ==== //depot/projects/ia64/bin/ls/util.c#7 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.31 2003/05/03 16:39:33 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.32 2003/09/09 12:02:52 tjr Exp $"); #include #include @@ -156,9 +156,9 @@ { (void)fprintf(stderr, #ifdef COLORLS - "usage: ls [-ABCFGHLPRTWZabcdfghiklnoqrstu1]" + "usage: ls [-ABCFGHLPRTWZabcdfghiklmnoqrstuwx1]" #else - "usage: ls [-ABCFHLPRTWZabcdfghiklnoqrstu1]" + "usage: ls [-ABCFHLPRTWZabcdfghiklmnoqrstuwx1]" #endif " [file ...]\n"); exit(1); ==== //depot/projects/ia64/bin/ps/ps.1#18 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.64 2003/08/05 10:31:28 brueffer Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.65 2003/09/08 19:57:13 ru Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -210,7 +210,7 @@ .It flags The flags associated with the process as in the include file -.Aq Pa sys/proc.h : +.In sys/proc.h : .Bl -column P_NOCLDSTOP P_NOCLDSTOP .It Dv "P_ADVLOCK" Ta No "0x00001 Process may hold a POSIX advisory lock" .It Dv "P_CONTROLT" Ta No "0x00002 Has a controlling terminal" ==== //depot/projects/ia64/bin/sh/sh.1#23 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.87 2003/05/16 21:19:32 ru Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.88 2003/09/08 19:57:13 ru Exp $ .\" .Dd April 12, 2003 .Dt SH 1 @@ -583,7 +583,7 @@ .Pp If a command is terminated by a signal, its exit status is 128 plus the signal number. Signal numbers are defined in the header file -.Aq Pa sys/signal.h . +.In sys/signal.h . .Ss Complex Commands Complex commands are combinations of simple commands with control operators or reserved words, together creating a larger complex ==== //depot/projects/ia64/contrib/groff/src/devices/grotty/grotty.man#4 (text+ko) ==== @@ -1,5 +1,5 @@ .ig -$FreeBSD: src/contrib/groff/src/devices/grotty/grotty.man,v 1.7 2002/10/14 09:15:17 ru Exp $ +$FreeBSD: src/contrib/groff/src/devices/grotty/grotty.man,v 1.8 2003/09/08 17:46:32 ru Exp $ Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of @@ -51,8 +51,8 @@ command with a .BR \-Tascii , -.BR \-Tkoi8-r , -.B \-Tlatin1 +.BR \-Tlatin1 , +.B \-Tkoi8-r or .B \-Tutf8 option on ASCII based systems, and with @@ -237,8 +237,8 @@ .I name is the name of the device, usually .BR ascii , +.BR latin1 , .BR koi8-r , -.BR latin1 , .BR utf8 , or .BR cp1047 . ==== //depot/projects/ia64/contrib/groff/tmac/eqnrc#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" Startup file for eqn. -.\" $FreeBSD: src/contrib/groff/tmac/eqnrc,v 1.5 2003/05/01 13:18:29 ru Exp $ +.\" $FreeBSD: src/contrib/groff/tmac/eqnrc,v 1.6 2003/09/08 17:46:32 ru Exp $ .EQ sdefine << %{ < back 20 < }% sdefine >> %{ > back 20 > }% @@ -52,9 +52,9 @@ ifdef ascii ! define n %1% ! ifdef latin1 ! define n %1% ! +ifdef koi8-r ! define n %1% ! ifdef utf8 ! define n %1% ! ifdef cp1047 ! define n %1% ! -ifdef koi8-r ! define n %1% ! ifdef n ! set nroff 1 ! ==== //depot/projects/ia64/contrib/groff/tmac/troffrc#5 (text+ko) ==== @@ -1,5 +1,5 @@ .\" Startup file for troff. -.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.15 2003/05/01 13:18:29 ru Exp $ +.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.16 2003/09/08 17:46:32 ru Exp $ . .\" This is tested by pic. .nr 0p 0 @@ -28,7 +28,10 @@ . .\" test whether we work under EBCDIC .do ie '\[char97]'a' \ -. if !"\*[.T]"koi8-r" .do tr \[char160]\~ +. ie '\*[.T]'koi8-r' \ +. do tr \[char154]\~ +. el \ +. do tr \[char160]\~ .el \ . do tr \[char65]\~ . @@ -38,13 +41,8 @@ .\" Load hyphenation patterns and exceptions. .do hpf hyphen.us .do hpfa hyphenex.us -. -.if "\*[.T]"koi8-r" \{\ -. -.\" Append hyphenation patterns from `hyphen.ru' (in the tmac directory). -.do hpfa hyphen.ru -. -.\} +.if '\*[.T]'koi8-r' \ +. do hpfa hyphen.ru . .\" Load composite mappings. .do mso composite.tmac ==== //depot/projects/ia64/contrib/groff/tmac/tty-char.tmac#5 (text+ko) ==== @@ -227,5 +227,7 @@ . .ie '\*(.T'cp1047' \ . do mso cp1047.tmac +.el .ie '\*(.T'koi8-r' \ +. do mso koi8-r.tmac .el \ . do mso latin1.tmac ==== //depot/projects/ia64/contrib/groff/tmac/tty.tmac#4 (text+ko) ==== @@ -79,9 +79,10 @@ . .ie '\*(.T'cp1047' \ . do mso cp1047.tmac -.el \ -. if !'\*(.T'ascii' \ -. do mso latin1.tmac +.el .ie '\*(.T'koi8-r' \ +. do mso koi8-r.tmac +.el .if !'\*(.T'ascii' \ +. do mso latin1.tmac . .\" If you want the character definitions in tty-char.tmac to be loaded .\" automatically, remove the `\"' from the next line. ==== //depot/projects/ia64/contrib/isc-dhcp/client/scripts/freebsd#6 (text+ko) ==== @@ -2,7 +2,7 @@ # # $Id: freebsd,v 1.13.2.5 2003/04/27 19:44:01 dhankins Exp $ # -# $FreeBSD: src/contrib/isc-dhcp/client/scripts/freebsd,v 1.23 2003/09/02 11:10:29 mbr Exp $ +# $FreeBSD: src/contrib/isc-dhcp/client/scripts/freebsd,v 1.24 2003/09/09 16:19:46 mbr Exp $ if [ -x /usr/bin/logger ]; then LOGGER="/usr/bin/logger -s -p user.notice -t dhclient" @@ -50,12 +50,7 @@ fi fi -if [ x$new_network_number != x ]; then - $LOGGER New Network Number: $new_network_number -fi - if [ x$new_broadcast_address != x ]; then - $LOGGER New Broadcast Address: $new_broadcast_address new_broadcast_arg="broadcast $new_broadcast_address" fi if [ x$old_broadcast_address != x ]; then ==== //depot/projects/ia64/etc/defaults/pccard.conf#24 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.263 2003/08/07 04:38:01 imp Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.264 2003/09/10 01:14:07 imp Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -1884,6 +1884,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Benq AWL100 wireless 11 Mbps pcmcia card +card "BENQ" "AWL100 PCMCIA ADAPTER" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # BreezeNET card "BreezeNET" "PC-DS.11" config auto "wi" ? @@ -1999,6 +2005,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# ELSA Vianect +card "ELSA" "Vianect WLAN MC-11" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # PLANEX GeoWave/GW-NS11S card "Geowave" "GW-NS11S" config auto "wi" ? ==== //depot/projects/ia64/etc/devd.conf#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.6 2003/08/22 02:18:01 imp Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.8 2003/09/09 18:17:23 wpaul Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -18,8 +18,8 @@ # Setup some shorthand for regex that we use later in the file. set ethernet-nic-regex - "(an|ar|ath|aue|awi|bge|cm|cnw|cs|cue|dc|de|ed|el|em|ep|ex|\ - fe|fxp|gem|gx|hme|ie|kue|lge|lnc|my|nge|pcn|ray|rl|rue|\ + "(an|ar|ath|aue|awi|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|ep|\ + ex|fe|fxp|gem|gx|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|rue|\ sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vr|vx|wb|wi|xe|xl)[0-9]+"; set scsi-controller-regex "(adv|advw|aic|aha|ahb|ahc|ahd|bt|ct|iir|isp|mly|mpt|ncv|nsp|\ ==== //depot/projects/ia64/etc/gettytab#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/gettytab,v 1.20 2001/08/31 22:18:50 murray Exp $ +# $FreeBSD: src/etc/gettytab,v 1.21 2003/09/09 15:37:19 yar Exp $ # from: @(#)gettytab 5.14 (Berkeley) 3/27/91 # # Most of the table entries here are just copies of the old getty table, @@ -19,11 +19,11 @@ # # Parity defaults to even, but the Pc entry and all the `std' entries # specify no parity. The different parities are: -# (none): same as even except -inpck instead of inpck for login. +# (none): same as ep for getty. login will use terminal as is. # ep: getty will use raw mode (cs8 -parenb) (unless rw is set) and # fake parity. login will use even parity (cs7 parenb -parodd). # op: same as ep except odd parity (cs7 parenb parodd) for login. -# op overrides ep. +# getty will fake odd parity as well. # ap: same as ep except -inpck instead of inpck for login. # ap overrides op and ep. # np: 1. don't fake parity in getty. The fake parity garbles @@ -32,10 +32,8 @@ # try to fake parity. It could just use cbreak mode so as # not to force cs8 and let the hardware handle the parity. # login has to be rely on the hardware anyway. -# 2. set PASS8, giving cs8 -parenb -istrip -inpck. -# np:ep: same as np except inpck. -# np:op: same as np:ep except for parodd (but parodd is overridden). -# np:ap: same as np except istrip. +# 2. set cs8 -parenb -istrip -inpck. +# ep:op: same as ap. # default:\ :cb:ce:ck:lc:fd#1000:im=\r\n%s/%m (%h) (%t)\r\n\r\n:sp#1200:\ ==== //depot/projects/ia64/gnu/usr.bin/groff/font/devkoi8-r/R.proto#2 (text+ko) ==== @@ -1,8 +1,40 @@ -# $FreeBSD: src/gnu/usr.bin/groff/font/devkoi8-r/R.proto,v 1.5 2001/05/28 07:17:58 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/font/devkoi8-r/R.proto,v 1.6 2003/09/08 17:46:33 ru Exp $ name R internalname 0 spacewidth 24 charset +--- 24 0 0000 +--- 24 0 0001 +--- 24 0 0002 +--- 24 0 0003 +--- 24 0 0004 +--- 24 0 0005 +--- 24 0 0006 +--- 24 0 0007 +--- 24 0 0010 +--- 24 0 0011 +--- 24 0 0012 +--- 24 0 0013 +--- 24 0 0014 +--- 24 0 0015 +--- 24 0 0016 +--- 24 0 0017 +--- 24 0 0020 +--- 24 0 0021 +--- 24 0 0022 +--- 24 0 0023 +--- 24 0 0024 +--- 24 0 0025 +--- 24 0 0026 +--- 24 0 0027 +--- 24 0 0030 +--- 24 0 0031 +--- 24 0 0032 +--- 24 0 0033 +--- 24 0 0034 +--- 24 0 0035 +--- 24 0 0036 +--- 24 0 0037 ! 24 0 0041 " 24 0 0042 dq " @@ -123,7 +155,6 @@ g 24 0 0147 h 24 0 0150 i 24 0 0151 -.i " j 24 0 0152 k 24 0 0153 l 24 0 0154 @@ -141,6 +172,7 @@ w 24 0 0167 x 24 0 0170 mu " +tmu " y 24 0 0171 z 24 0 0172 lC 24 0 0173 @@ -150,165 +182,151 @@ bv " br " | " -lb " -lc " -lf " -lk " -lt " -rb " -rc " -rf " -rk " -rt " rC 24 0 0175 } " a~ 24 0 0176 ~ " ap " ti " -char128 24 0 0200 -char129 24 0 0201 -char130 24 0 0202 -char131 24 0 0203 -char132 24 0 0204 -char133 24 0 0205 -char134 24 0 0206 -char135 24 0 0207 -char136 24 0 0210 -char137 24 0 0211 -char138 24 0 0212 -char139 24 0 0213 -char140 24 0 0214 -char141 24 0 0215 -char142 24 0 0216 -char143 24 0 0217 -char144 24 0 0220 -char145 24 0 0221 -char146 24 0 0222 -char147 24 0 0223 -char148 24 0 0224 -bu 24 0 0225 -char149 " -sr 24 0 0226 -char150 " -~~ 24 0 0227 +--- 24 0 0177 +u2500 24 0 0200 +u2502 24 0 0201 +br " +u250C 24 0 0202 +u2510 24 0 0203 +u2514 24 0 0204 +u2518 24 0 0205 +u251C 24 0 0206 +u2524 24 0 0207 +u252C 24 0 0210 +u2534 24 0 0211 +u253C 24 0 0212 +u2580 24 0 0213 +u2584 24 0 0214 +u2588 24 0 0215 +u258C 24 0 0216 +u2590 24 0 0217 +u2591 24 0 0220 +u2592 24 0 0221 +u2593 24 0 0222 +u2320 24 0 0223 +u25A0 24 0 0224 +u2219 24 0 0225 +u221A 24 0 0226 +sr " +sqrt " +u2248 24 0 0227 +~~ " ~= " -char151 " -<= 24 0 0230 -char152 " ->= 24 0 0231 -char153 " -char154 24 0 0232 -char155 24 0 0233 -de 24 0 0234 -char156 " -S2 24 0 0235 -char157 " -pc 24 0 0236 -char158 " -di 24 0 0237 -char159 " -char160 24 0 0240 -char161 24 0 0241 -char162 24 0 0242 -:e 24 0 0243 -char163 " -char164 24 0 0244 -char165 24 0 0245 -char166 24 0 0246 -char167 24 0 0247 -char168 24 0 0250 -char169 24 0 0251 -char170 24 0 0252 -char171 24 0 0253 -char172 24 0 0254 -char173 24 0 0255 -char174 24 0 0256 -char175 24 0 0257 -char176 24 0 0260 -char177 24 0 0261 -char178 24 0 0262 -:E 24 0 0263 -char179 " -char180 24 0 0264 -char181 24 0 0265 -char182 24 0 0266 -char183 24 0 0267 -char184 24 0 0270 -char185 24 0 0271 -char186 24 0 0272 -char187 24 0 0273 -char188 24 0 0274 -char189 24 0 0275 -char190 24 0 0276 -co 24 0 0277 -char191 " -char192 24 0 0300 -char193 24 0 0301 -char194 24 0 0302 -char195 24 0 0303 -char196 24 0 0304 -char197 24 0 0305 -*f 24 0 0306 -char198 " -char199 24 0 0307 -char200 24 0 0310 -char201 24 0 0311 -char202 24 0 0312 -char203 24 0 0313 -char204 24 0 0314 -char205 24 0 0315 -char206 24 0 0316 -char207 24 0 0317 -*p 24 0 0320 -char208 " -char209 24 0 0321 -char210 24 0 0322 -char211 24 0 0323 -char212 24 0 0324 -char213 24 0 0325 -char214 24 0 0326 -char215 24 0 0327 -char216 24 0 0330 -char217 24 0 0331 -char218 24 0 0332 -char219 24 0 0333 -char220 24 0 0334 -char221 24 0 0335 -char222 24 0 0336 -char223 24 0 0337 -char224 24 0 0340 -char225 24 0 0341 -char226 24 0 0342 -char227 24 0 0343 -char228 24 0 0344 -char229 24 0 0345 -*F 24 0 0346 -char230 " -*G 24 0 0347 -char231 " -char232 24 0 0350 -char233 24 0 0351 -char234 24 0 0352 -char235 24 0 0353 -char236 24 0 0354 -char237 24 0 0355 -char238 24 0 0356 -char239 24 0 0357 -*P 24 0 0360 -char240 " -char241 24 0 0361 -char242 24 0 0362 -char243 24 0 0363 -char244 24 0 0364 -char245 24 0 0365 -char246 24 0 0366 -char247 24 0 0367 -char248 24 0 0370 -char249 24 0 0371 -char250 24 0 0372 -char251 24 0 0373 -char252 24 0 0374 -char253 24 0 0375 -char254 24 0 0376 -char255 24 0 0377 +u2264 24 0 0230 +<= " +u2265 24 0 0231 +>= " +u00A0 24 0 0232 +u2321 24 0 0233 +u00B0 24 0 0234 +de " +u00B2 24 0 0235 +S2 " +u00B7 24 0 0236 +pc " +u00F7 24 0 0237 +di " +tdi " +u2550 24 0 0240 +u2551 24 0 0241 +u2552 24 0 0242 +u0435_0308 24 0 0243 +u2553 24 0 0244 +u2554 24 0 0245 +u2555 24 0 0246 +u2556 24 0 0247 +u2557 24 0 0250 +u2558 24 0 0251 +u2559 24 0 0252 +u255A 24 0 0253 +u255B 24 0 0254 +u255C 24 0 0255 +u255D 24 0 0256 +u255E 24 0 0257 +u255F 24 0 0260 +u2560 24 0 0261 +u2561 24 0 0262 +u0415_0308 24 0 0263 +u2562 24 0 0264 +u2563 24 0 0265 +u2564 24 0 0266 +u2565 24 0 0267 +u2566 24 0 0270 +u2567 24 0 0271 +u2568 24 0 0272 +u2569 24 0 0273 +u256A 24 0 0274 +u256B 24 0 0275 +u256C 24 0 0276 +u00A9 24 0 0277 +co " +u044E 24 0 0300 +u0430 24 0 0301 +u0431 24 0 0302 +u0446 24 0 0303 +u0434 24 0 0304 +u0435 24 0 0305 +u0444 24 0 0306 +u0433 24 0 0307 +u0445 24 0 0310 +u0438 24 0 0311 +u0438_0306 24 0 0312 +u043A 24 0 0313 +u043B 24 0 0314 +u043C 24 0 0315 +u043D 24 0 0316 +u043E 24 0 0317 +u043F 24 0 0320 +u044F 24 0 0321 +u0440 24 0 0322 +u0441 24 0 0323 +u0442 24 0 0324 +u0443 24 0 0325 +u0436 24 0 0326 +u0432 24 0 0327 +u044C 24 0 0330 +u044B 24 0 0331 +u0437 24 0 0332 +u0448 24 0 0333 +u044D 24 0 0334 +u0449 24 0 0335 +u0447 24 0 0336 +u044A 24 0 0337 +u042E 24 0 0340 +u0410 24 0 0341 +u0411 24 0 0342 +u0426 24 0 0343 +u0414 24 0 0344 +u0415 24 0 0345 +u0424 24 0 0346 +u0413 24 0 0347 +u0425 24 0 0350 +u0418 24 0 0351 +u0418_0306 24 0 0352 +u041A 24 0 0353 +u041B 24 0 0354 +u041C 24 0 0355 +u041D 24 0 0356 +u041E 24 0 0357 +u041F 24 0 0360 +u042F 24 0 0361 +u0420 24 0 0362 +u0421 24 0 0363 +u0422 24 0 0364 +u0423 24 0 0365 +u0416 24 0 0366 +u0412 24 0 0367 +u042C 24 0 0370 +u042B 24 0 0371 +u0417 24 0 0372 +u0428 24 0 0373 +u042D 24 0 0374 +u0429 24 0 0375 +u0427 24 0 0376 +u042A 24 0 0377 ==== //depot/projects/ia64/gnu/usr.bin/groff/tmac/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.41 2003/05/01 13:22:21 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.42 2003/09/08 17:46:33 ru Exp $ TMACOWN?= ${BINOWN} TMACGRP?= ${BINGRP} @@ -63,7 +63,7 @@ ${NORMALFILES} ${DESTDIR}${TMACDIR} cd ${.CURDIR}; \ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ - hyphen.ru ${DESTDIR}${TMACDIR} + koi8-r.tmac hyphen.ru ${DESTDIR}${TMACDIR} cd ${.OBJDIR} .for f in ${STRIPFILES} ${SPECIALFILES} ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ ==== //depot/projects/ia64/gnu/usr.bin/groff/tmac/fr.ISO8859-1#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/fr.ISO8859-1,v 1.2 2002/10/09 08:51:52 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/fr.ISO8859-1,v 1.3 2003/09/09 23:27:03 ru Exp $ .\" .\" %beginstrip% . @@ -82,6 +82,7 @@ .ds doc-str-Lb-libdisk Bibliothèque d'accès à l'interface des labels de partitions (libdisk, \-ldisk) .ds doc-str-Lb-libedit Bibliothèque de l'éditeur de ligne de commande (libedit, \-ledit) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 9 23:10:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF96016A4C1; Tue, 9 Sep 2003 23:10:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 73B6416A4BF for ; Tue, 9 Sep 2003 23:10:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D889643FA3 for ; Tue, 9 Sep 2003 23:10:44 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8A6Ai0U057390 for ; Tue, 9 Sep 2003 23:10:44 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8A6AiOc057387 for perforce@freebsd.org; Tue, 9 Sep 2003 23:10:44 -0700 (PDT) Date: Tue, 9 Sep 2003 23:10:44 -0700 (PDT) Message-Id: <200309100610.h8A6AiOc057387@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37846 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2003 06:10:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=37846 Change 37846 by marcel@marcel_nfs on 2003/09/09 23:10:12 Add a new bus method: BUS_CONFIG_INTR() to allow bus drivers to configure interrupt signalling. This includes trigger mode and polarity. Update the ACPI driver to use the interrupt information in the _CRS object and configure the interrupt with the newly added bus method. Provide a bogus implementation for nexus so that we can see if things are really as we expect it. The real thing will follow soon. Affected files ... .. //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#10 edit .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#20 edit .. //depot/projects/ia64/sys/ia64/ia64/nexus.c#5 edit .. //depot/projects/ia64/sys/kern/bus_if.m#8 edit .. //depot/projects/ia64/sys/kern/subr_bus.c#24 edit .. //depot/projects/ia64/sys/sys/bus.h#10 edit Differences ... ==== //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#10 (text+ko) ==== @@ -197,7 +197,8 @@ * required" */ set->set_irq(dev, context, res->Data.Irq.Interrupts, - res->Data.Irq.NumberOfInterrupts); + res->Data.Irq.NumberOfInterrupts, res->Data.Irq.EdgeLevel, + res->Data.Irq.ActiveHighLow); break; case ACPI_RSTYPE_DMA: /* @@ -350,7 +351,9 @@ case ACPI_RSTYPE_EXT_IRQ: /* XXX special handling? */ set->set_irq(dev, context,res->Data.ExtendedIrq.Interrupts, - res->Data.ExtendedIrq.NumberOfInterrupts); + res->Data.ExtendedIrq.NumberOfInterrupts, + res->Data.ExtendedIrq.EdgeLevel, + res->Data.ExtendedIrq.ActiveHighLow); break; case ACPI_RSTYPE_VENDOR: ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, @@ -383,7 +386,7 @@ u_int32_t low, u_int32_t high, u_int32_t length, u_int32_t align); static void acpi_res_set_irq(device_t dev, void *context, u_int32_t *irq, - int count); + int count, int trig, int pol); static void acpi_res_set_drq(device_t dev, void *context, u_int32_t *drq, int count); static void acpi_res_set_start_dependant(device_t dev, void *context, @@ -477,10 +480,11 @@ } static void -acpi_res_set_irq(device_t dev, void *context, u_int32_t *irq, int count) +acpi_res_set_irq(device_t dev, void *context, u_int32_t *irq, int count, + int trig, int pol) { struct acpi_res_context *cp = (struct acpi_res_context *)context; - + if (cp == NULL || irq == NULL) return; @@ -489,6 +493,9 @@ return; bus_set_resource(dev, SYS_RES_IRQ, cp->ar_nirq++, *irq, 1); + BUS_CONFIG_INTR(dev, *irq, (trig == ACPI_EDGE_SENSITIVE) ? + INTR_TRIGGER_EDGE : INTR_TRIGGER_LEVEL, (pol == ACPI_ACTIVE_HIGH) ? + INTR_POLARITY_HIGH : INTR_POLARITY_LOW); } static void ==== //depot/projects/ia64/sys/dev/acpica/acpivar.h#20 (text+ko) ==== @@ -203,7 +203,7 @@ u_int32_t high, u_int32_t length, u_int32_t align); void (*set_irq)(device_t dev, void *context, u_int32_t *irq, - int cout); + int count, int trig, int pol); void (*set_drq)(device_t dev, void *context, u_int32_t *drq, int count); void (*set_start_dependant)(device_t dev, void *context, ==== //depot/projects/ia64/sys/ia64/ia64/nexus.c#5 (text+ko) ==== @@ -95,8 +95,11 @@ static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); static int nexus_set_resource(device_t, device_t, int, int, u_long, u_long); -static int nexus_get_resource(device_t, device_t, int, int, u_long *, u_long *); +static int nexus_get_resource(device_t, device_t, int, int, u_long *, + u_long *); static void nexus_delete_resource(device_t, device_t, int, int); +static int nexus_config_intr(device_t, int, enum intr_trigger, + enum intr_polarity); static device_method_t nexus_methods[] = { /* Device interface */ @@ -121,6 +124,7 @@ DEVMETHOD(bus_set_resource, nexus_set_resource), DEVMETHOD(bus_get_resource, nexus_get_resource), DEVMETHOD(bus_delete_resource, nexus_delete_resource), + DEVMETHOD(bus_config_intr, nexus_config_intr), { 0, 0 } }; @@ -534,6 +538,15 @@ resource_list_delete(rl, type, rid); } +static int +nexus_config_intr(device_t dev, int irq, enum intr_trigger trig, + enum intr_polarity pol) +{ + + printf("XXX: %s: irq=%d, trig=%d, pol=%d\n", __func__, irq, trig, pol); + return (EINVAL); +} + #if 0 /* ==== //depot/projects/ia64/sys/kern/bus_if.m#8 (text+ko) ==== @@ -280,3 +280,14 @@ char *_buf; size_t _buflen; }; + +# +# Allow (bus) drivers to specify the trigger mode and polarity of the +# specified interrupt. +# +METHOD int config_intr { + device_t _dev; + int _irq; + enum intr_trigger _trig; + enum intr_polarity _pol; +} DEFAULT bus_generic_config_intr; ==== //depot/projects/ia64/sys/kern/subr_bus.c#24 (text+ko) ==== @@ -1926,6 +1926,17 @@ } int +bus_generic_config_intr(device_t dev, int irq, enum intr_trigger trig, + enum intr_polarity pol) +{ + + /* Propagate up the bus hierarchy until someone handles it. */ + if (dev->parent) + return (BUS_CONFIG_INTR(dev->parent, irq, trig, pol)); + return (EINVAL); +} + +int bus_generic_rl_get_resource (device_t dev, device_t child, int type, int rid, u_long *startp, u_long *countp) { ==== //depot/projects/ia64/sys/sys/bus.h#10 (text+ko) ==== @@ -110,6 +110,16 @@ INTR_ENTROPY = 1024 /* this interrupt provides entropy */ }; +enum intr_trigger { + INTR_TRIGGER_EDGE = 1, + INTR_TRIGGER_LEVEL = 2 +}; + +enum intr_polarity { + INTR_POLARITY_HIGH = 1, + INTR_POLARITY_LOW = 2 +}; + typedef int (*devop_t)(void); struct driver { @@ -219,6 +229,8 @@ u_long count, u_int flags); int bus_generic_attach(device_t dev); int bus_generic_child_present(device_t dev, device_t child); +int bus_generic_config_intr(device_t, int, enum intr_trigger, + enum intr_polarity); int bus_generic_deactivate_resource(device_t dev, device_t child, int type, int rid, struct resource *r); int bus_generic_detach(device_t dev); From owner-p4-projects@FreeBSD.ORG Wed Sep 10 00:15:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AEDE16A4C2; Wed, 10 Sep 2003 00:15:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 14E9716A4C0 for ; Wed, 10 Sep 2003 00:15:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B95543FBF for ; Wed, 10 Sep 2003 00:15:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8A7F70U061013 for ; Wed, 10 Sep 2003 00:15:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8A7F7ed061010 for perforce@freebsd.org; Wed, 10 Sep 2003 00:15:07 -0700 (PDT) Date: Wed, 10 Sep 2003 00:15:07 -0700 (PDT) Message-Id: <200309100715.h8A7F7ed061010@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37853 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2003 07:15:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=37853 Change 37853 by marcel@marcel_nfs on 2003/09/10 00:14:08 Add INTR_TRIGGER_CONFORM and INTR_POLARITY_CONFORM. They can be used to configure an interrupt to have a default or conforming trigger mode or a default or conforming polarity as defined by the parent bus. Suggested by: jhb Affected files ... .. //depot/projects/ia64/sys/sys/bus.h#11 edit Differences ... ==== //depot/projects/ia64/sys/sys/bus.h#11 (text+ko) ==== @@ -111,11 +111,13 @@ }; enum intr_trigger { + INTR_TRIGGER_CONFORM = 0, INTR_TRIGGER_EDGE = 1, INTR_TRIGGER_LEVEL = 2 }; enum intr_polarity { + INTR_POLARITY_CONFORM = 0, INTR_POLARITY_HIGH = 1, INTR_POLARITY_LOW = 2 }; From owner-p4-projects@FreeBSD.ORG Wed Sep 10 01:52:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A89F416A4C1; Wed, 10 Sep 2003 01:52:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 69D5A16A4BF for ; Wed, 10 Sep 2003 01:52:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C104543FB1 for ; Wed, 10 Sep 2003 01:52:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8A8qA0U071964 for ; Wed, 10 Sep 2003 01:52:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8A8q9jG071961 for perforce@freebsd.org; Wed, 10 Sep 2003 01:52:09 -0700 (PDT) Date: Wed, 10 Sep 2003 01:52:09 -0700 (PDT) Message-Id: <200309100852.h8A8q9jG071961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37862 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2003 08:52:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=37862 Change 37862 by marcel@marcel_nfs on 2003/09/10 01:51:57 Change the sapic code to allow us to implement bus_config_intr(). It works like this. When we find an I/O APIC in the MADT, we create a structure for it. At that time we initialize all RTEs. Interrupts will be masked by default and trigger mode and polarity are defined as before. We implement sapic_config_intr() by reading the RTE from the SAPIC, update the trigger mode and polarity and write the modified RTE back. Now when we enable an interrupt, we can always be sure that the SAPIC has the correct defaults and we only have to update the vector, set the delivery mode and unmask the interrupt. This compiles, but hasn't been runtime tested. I'm a bit uneasy with masking all interrupts but I'll notice soon enough if that works or not. With this commit, the interrupt hack has been gone, because ia64_enable() has been gone completely. /me looks at the time and knows who's going to be late tomorrow. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#32 edit .. //depot/projects/ia64/sys/ia64/ia64/nexus.c#6 edit .. //depot/projects/ia64/sys/ia64/ia64/sapic.c#21 edit .. //depot/projects/ia64/sys/ia64/include/sapicvar.h#5 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#32 (text+ko) ==== @@ -259,31 +259,6 @@ SYSINIT(ithds_init, SI_SUB_INTR, SI_ORDER_SECOND, ithds_init, NULL); static void -ia64_enable(int vector) -{ - int irq, i; - - irq = vector - IA64_HARDWARE_IRQ_BASE; - for (i = 0; i < ia64_sapic_count; i++) { - struct sapic *sa = ia64_sapics[i]; - if (irq < sa->sa_base || irq > sa->sa_limit) - continue; - /* - * KLUDGE: Not all interrupts higher or equal to 16 are - * active low and level sensitive. We don't know yet how - * to check for this, so we hardcode the 2 cases we have - * wrong explicitly. This kludge is specific to the HP - * rx2600... - */ - sapic_enable(sa, irq - sa->sa_base, vector, - ((irq < 16 || vector == 66 || vector == 67) - ? SAPIC_TRIGGER_EDGE : SAPIC_TRIGGER_LEVEL), - ((irq < 16 || vector == 66 || vector == 67) - ? SAPIC_POLARITY_HIGH : SAPIC_POLARITY_LOW)); - } -} - -static void ia64_send_eoi(int vector) { int irq, i; @@ -350,8 +325,7 @@ if (errcode) return errcode; - ia64_enable(vector); - return 0; + return (sapic_enable(irq, vector)); } int ==== //depot/projects/ia64/sys/ia64/ia64/nexus.c#6 (text+ko) ==== @@ -49,15 +49,16 @@ #include #include #include -#include -#include #include #include -#include +#include #include +#include #include +#include +#include #include #include @@ -543,8 +544,7 @@ enum intr_polarity pol) { - printf("XXX: %s: irq=%d, trig=%d, pol=%d\n", __func__, irq, trig, pol); - return (EINVAL); + return (sapic_config_intr(irq, trig, pol)); } #if 0 ==== //depot/projects/ia64/sys/ia64/ia64/sapic.c#21 (text+ko) ==== @@ -32,12 +32,13 @@ #include #include #include -#include -#include #include +#include + #include #include -#include +#include +#include static MALLOC_DEFINE(M_SAPIC, "sapic", "I/O SAPIC devices"); @@ -100,8 +101,7 @@ } static void -sapic_write_rte(struct sapic *sa, int which, - struct sapic_rte *rte) +sapic_write_rte(struct sapic *sa, int which, struct sapic_rte *rte) { u_int32_t *p = (u_int32_t *) rte; register_t c; @@ -112,11 +112,44 @@ intr_restore(c); } +int +sapic_config_intr(int irq, enum intr_trigger trig, enum intr_polarity pol) +{ + struct sapic_rte rte; + struct sapic *sa; + int i; + + for (i = 0; i < ia64_sapic_count; i++) { + sa = ia64_sapics[i]; + if (irq < sa->sa_base || irq > sa->sa_limit) + continue; + + sapic_read_rte(sa, irq - sa->sa_base, &rte); + if (trig != INTR_TRIGGER_CONFORM) + rte.rte_trigger_mode = (trig == INTR_TRIGGER_EDGE) ? + SAPIC_TRIGGER_EDGE : SAPIC_TRIGGER_LEVEL; + else + rte.rte_trigger_mode = (irq < 16) ? + SAPIC_TRIGGER_EDGE : SAPIC_TRIGGER_LEVEL; + if (pol != INTR_POLARITY_CONFORM) + rte.rte_polarity = (pol == INTR_POLARITY_HIGH) ? + SAPIC_POLARITY_HIGH : SAPIC_POLARITY_LOW; + else + rte.rte_polarity = (irq < 16) ? SAPIC_POLARITY_HIGH : + SAPIC_POLARITY_LOW; + sapic_write_rte(sa, irq - sa->sa_base, &rte); + return (0); + } + + return (ENOENT); +} + struct sapic * sapic_create(int id, int base, u_int64_t address) { + struct sapic_rte rte; struct sapic *sa; - int max; + int i, max; sa = malloc(sizeof(struct sapic), M_SAPIC, M_NOWAIT); if (!sa) @@ -131,24 +164,47 @@ ia64_sapics[ia64_sapic_count++] = sa; - return sa; + /* + * Initialize all RTEs with a default trigger mode and polarity. + * This may be changed later by calling sapic_config_intr(). We + * mask all interrupts by default. + */ + bzero(&rte, sizeof(rte)); + rte.rte_mask = 1; + for (i = base; i <= sa->sa_limit; i++) { + rte.rte_trigger_mode = (i < 16) ? SAPIC_TRIGGER_EDGE : + SAPIC_TRIGGER_LEVEL; + rte.rte_polarity = (i < 16) ? SAPIC_POLARITY_HIGH : + SAPIC_POLARITY_LOW; + sapic_write_rte(sa, i - base, &rte); + } + + return (sa); } -void -sapic_enable(struct sapic *sa, int input, int vector, - int trigger_mode, int polarity) +int +sapic_enable(int irq, int vector) { struct sapic_rte rte; - u_int64_t lid = ia64_get_lid(); + struct sapic *sa; + uint64_t lid = ia64_get_lid(); + int i; + + for (i = 0; i < ia64_sapic_count; i++) { + sa = ia64_sapics[i]; + if (irq < sa->sa_base || irq > sa->sa_limit) + continue; - bzero(&rte, sizeof(rte)); - rte.rte_destination_id = (lid >> 24) & 255; - rte.rte_destination_eid = (lid >> 16) & 255; - rte.rte_trigger_mode = trigger_mode; - rte.rte_polarity = polarity; - rte.rte_delivery_mode = SAPIC_DELMODE_LOWPRI; - rte.rte_vector = vector; - sapic_write_rte(sa, input, &rte); + sapic_read_rte(sa, irq - sa->sa_base, &rte); + rte.rte_destination_id = (lid >> 24) & 255; + rte.rte_destination_eid = (lid >> 16) & 255; + rte.rte_delivery_mode = SAPIC_DELMODE_LOWPRI; + rte.rte_vector = vector; + rte.rte_mask = 0; + sapic_write_rte(sa, irq - sa->sa_base, &rte); + return (0); + } + return (ENOENT); } void ==== //depot/projects/ia64/sys/ia64/include/sapicvar.h#5 (text+ko) ==== @@ -49,12 +49,12 @@ #define SAPIC_DELMODE_INIT 5 #define SAPIC_DELMODE_EXTINT 7 -struct sapic *sapic_create(int id, int base, u_int64_t address); -void sapic_enable(struct sapic *sa, int input, int vector, - int trigger_mode, int polarity); -void sapic_eoi(struct sapic *sa, int vector); +int sapic_config_intr(int irq, enum intr_trigger, enum intr_polarity); +struct sapic *sapic_create(int id, int base, uint64_t address); +int sapic_enable(int irq, int vector); +void sapic_eoi(struct sapic *sa, int vector); #ifdef DDB -void sapic_print(struct sapic *sa, int input); +void sapic_print(struct sapic *sa, int input); #endif #endif /* ! _MACHINE_SAPICVAR_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Sep 10 16:54:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AC8B16A4C1; Wed, 10 Sep 2003 16:54:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D79416A4BF for ; Wed, 10 Sep 2003 16:54:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC4C743FFD for ; Wed, 10 Sep 2003 16:53:58 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8ANrw0U042127 for ; Wed, 10 Sep 2003 16:53:58 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8ANrvWV042124 for perforce@freebsd.org; Wed, 10 Sep 2003 16:53:57 -0700 (PDT) Date: Wed, 10 Sep 2003 16:53:57 -0700 (PDT) Message-Id: <200309102353.h8ANrvWV042124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37884 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2003 23:54:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=37884 Change 37884 by marcel@marcel_nfs on 2003/09/10 16:53:03 IFC @37883 Affected files ... .. //depot/projects/ia64/lib/libc/gen/exec.3#7 integrate .. //depot/projects/ia64/lib/libc/gen/fnmatch.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/getdomainname.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/glob.3#6 integrate .. //depot/projects/ia64/lib/libc/net/inet6_option_space.3#5 integrate .. //depot/projects/ia64/lib/libc/net/inet6_rthdr_space.3#3 integrate .. //depot/projects/ia64/lib/libc/net/resolver.3#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/getopt.3#3 integrate .. //depot/projects/ia64/lib/libc/sys/acct.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/clock_gettime.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/getitimer.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/getsockopt.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/gettimeofday.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/ioctl.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/quotactl.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/recv.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/send.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/setgroups.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/socket.2#9 integrate .. //depot/projects/ia64/lib/libc/sys/sysarch.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/syscall.2#4 integrate .. //depot/projects/ia64/lib/libipsec/ipsec_strerror.3#4 integrate .. //depot/projects/ia64/lib/libstand/libstand.3#7 integrate .. //depot/projects/ia64/lib/libutil/realhostname.3#3 integrate .. //depot/projects/ia64/lib/libutil/realhostname_sa.3#5 integrate .. //depot/projects/ia64/libexec/lukemftpd/Makefile#13 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.5#2 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.5#7 integrate .. //depot/projects/ia64/sbin/ip6fw/ip6fw.8#8 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#26 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.8#10 integrate .. //depot/projects/ia64/share/man/man3/sysexits.3#4 integrate .. //depot/projects/ia64/share/man/man4/icmp6.4#2 integrate .. //depot/projects/ia64/share/man/man4/lomac.4#5 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/apm.4#3 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/mcd.4#5 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/mse.4#2 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/spkr.4#3 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/svr4.4#3 integrate .. //depot/projects/ia64/share/man/man4/ng_vjc.4#3 integrate .. //depot/projects/ia64/share/man/man4/ppi.4#3 integrate .. //depot/projects/ia64/share/man/man4/psm.4#5 integrate .. //depot/projects/ia64/share/man/man4/syscons.4#8 integrate .. //depot/projects/ia64/share/man/man4/sysmouse.4#3 integrate .. //depot/projects/ia64/share/man/man4/wi.4#30 integrate .. //depot/projects/ia64/share/man/man5/a.out.5#5 integrate .. //depot/projects/ia64/share/man/man5/dir.5#4 integrate .. //depot/projects/ia64/share/man/man5/elf.5#5 integrate .. //depot/projects/ia64/share/man/man5/procfs.5#7 integrate .. //depot/projects/ia64/share/man/man8/sticky.8#2 integrate .. //depot/projects/ia64/share/man/man9/DECLARE_MODULE.9#4 integrate .. //depot/projects/ia64/share/man/man9/devstat.9#3 integrate .. //depot/projects/ia64/share/man/man9/mbuf.9#12 integrate .. //depot/projects/ia64/share/man/man9/pbuf.9#2 integrate .. //depot/projects/ia64/share/man/man9/sysctl_add_oid.9#4 integrate .. //depot/projects/ia64/share/man/man9/vm_set_page_size.9#3 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/ia64/sys/cam/cam_periph.c#13 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#11 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#21 integrate .. //depot/projects/ia64/sys/dev/acpica/madt.h#1 branch .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#7 integrate .. //depot/projects/ia64/sys/dev/re/if_re.c#2 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#40 integrate .. //depot/projects/ia64/sys/i386/i386/mp_clock.c#10 integrate .. //depot/projects/ia64/sys/i386/pci/pci_cfgreg.c#17 integrate .. //depot/projects/ia64/sys/ia64/acpica/madt.c#16 integrate .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#33 integrate .. //depot/projects/ia64/sys/ia64/ia64/nexus.c#7 integrate .. //depot/projects/ia64/sys/ia64/ia64/sapic.c#22 integrate .. //depot/projects/ia64/sys/ia64/include/sapicvar.h#6 integrate .. //depot/projects/ia64/sys/kern/bus_if.m#9 integrate .. //depot/projects/ia64/sys/kern/subr_bus.c#25 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#36 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#36 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#46 integrate .. //depot/projects/ia64/sys/pci/if_rlreg.h#16 integrate .. //depot/projects/ia64/sys/sys/bus.h#12 integrate .. //depot/projects/ia64/sys/sys/syslimits.h#6 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#19 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpidump.h#12 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.8#12 integrate .. //depot/projects/ia64/usr.sbin/edquota/edquota.8#7 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/config.c#14 integrate Differences ... ==== //depot/projects/ia64/lib/libc/gen/exec.3#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)exec.3 8.3 (Berkeley) 1/24/94 -.\" $FreeBSD: src/lib/libc/gen/exec.3,v 1.22 2003/07/03 18:14:39 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/exec.3,v 1.23 2003/09/10 19:24:32 ru Exp $ .\" .Dd January 24, 1994 .Dt EXEC 3 @@ -163,7 +163,7 @@ the default path is set according to the .Dv _PATH_DEFPATH definition in -.Aq paths.h , +.In paths.h , which is set to .Dq Ev /usr/bin:/bin . For ==== //depot/projects/ia64/lib/libc/gen/fnmatch.3#3 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fnmatch.3 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/lib/libc/gen/fnmatch.3,v 1.14 2002/12/18 13:33:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/fnmatch.3,v 1.15 2003/09/10 19:24:32 ru Exp $ .\" .Dd April 28, 1995 .Dt FNMATCH 3 @@ -69,7 +69,7 @@ .Tn OR of any of the following constants, which are defined in the include file -.Pa fnmatch.h . +.In fnmatch.h . .Bl -tag -width FNM_PATHNAME .It Dv FNM_NOESCAPE Normally, every occurrence of a backslash ==== //depot/projects/ia64/lib/libc/gen/getdomainname.3#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)gethostname.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/getdomainname.3,v 1.17 2003/02/22 19:02:23 zarzycki Exp $ +.\" $FreeBSD: src/lib/libc/gen/getdomainname.3,v 1.18 2003/09/10 19:24:32 ru Exp $ .\" .Dd May 6, 1994 .Dt GETDOMAINNAME 3 @@ -94,7 +94,7 @@ Domain names are limited to .Dv MAXHOSTNAMELEN (from -.Ao Pa sys/param.h Ac ) +.In sys/param.h ) characters, currently 256. .Sh HISTORY The ==== //depot/projects/ia64/lib/libc/gen/glob.3#6 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)glob.3 8.3 (Berkeley) 4/16/94 -.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.24 2003/09/08 19:57:14 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.25 2003/09/10 19:24:32 ru Exp $ .\" .Dd April 16, 1994 .Dt GLOB 3 @@ -57,7 +57,7 @@ matching used by the shell. .Pp The include file -.Pa glob.h +.In glob.h defines the structure type .Fa glob_t , which contains at least the following fields: @@ -121,7 +121,7 @@ .Tn OR of any of the following values defined in -.Pa glob.h : +.In glob.h : .Bl -tag -width GLOB_ALTDIRFUNC .It Dv GLOB_APPEND Append pathnames generated to the ones from a previous call (or calls) ==== //depot/projects/ia64/lib/libc/net/inet6_option_space.3#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" $Id: inet6_option_space.3,v 1.4 2000/02/05 10:32:24 jinmei Exp $ -.\" $FreeBSD: src/lib/libc/net/inet6_option_space.3,v 1.11 2002/12/27 12:15:28 schweikh Exp $ +.\" $FreeBSD: src/lib/libc/net/inet6_option_space.3,v 1.12 2003/09/10 19:24:32 ru Exp $ .\" .Dd December 10, 1999 .Dt INET6_OPTION_SPACE 3 @@ -71,7 +71,7 @@ RFC2292 defines a set of functions to help the application. The function prototypes for these functions are all in the -.Aq Li netinet/in.h +.In netinet/in.h header. .\" .Ss inet6_option_space ==== //depot/projects/ia64/lib/libc/net/inet6_rthdr_space.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" $Id: inet6_rthdr_space.3,v 1.5 2000/02/05 13:19:07 jinmei Exp $ -.\" $FreeBSD: src/lib/libc/net/inet6_rthdr_space.3,v 1.9 2002/12/18 12:45:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/inet6_rthdr_space.3,v 1.10 2003/09/10 19:24:32 ru Exp $ .\" .Dd December 10, 1999 .Dt INET6_RTHDR_SPACE 3 @@ -97,7 +97,7 @@ .El .Pp The function prototypes for these functions are all in the -.Aq Li netinet/in.h +.In netinet/in.h header. .\" .Ss inet6_rthdr_space ==== //depot/projects/ia64/lib/libc/net/resolver.3#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)resolver.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.24 2003/09/08 19:57:14 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.25 2003/09/10 19:24:32 ru Exp $ .\" .Dd June 4, 1993 .Dt RESOLVER 3 @@ -131,7 +131,7 @@ stored in .Va _res.options are defined in -.Pa resolv.h +.In resolv.h and are as follows. Options are stored as a simple bit mask containing the bitwise ``or'' of the options enabled. ==== //depot/projects/ia64/lib/libc/stdlib/getopt.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getopt.3 8.5 (Berkeley) 4/27/95 -.\" $FreeBSD: src/lib/libc/stdlib/getopt.3,v 1.21 2002/12/04 18:57:45 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/getopt.3,v 1.22 2003/09/10 19:24:33 ru Exp $ .\" .Dd April 27, 1995 .Dt GETOPT 3 @@ -209,7 +209,7 @@ to decouple .Fn getopt from -.Pa . +.In stdio.h . .Pp A single dash .Dq Li - ==== //depot/projects/ia64/lib/libc/sys/acct.2#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)acct.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/acct.2,v 1.14 2002/12/19 09:40:24 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/acct.2,v 1.15 2003/09/10 19:24:33 ru Exp $ .\" .Dd June 4, 1993 .Dt ACCT 2 @@ -69,7 +69,7 @@ For more information on the record structure used by .Fn acct , see -.Pa /usr/include/sys/acct.h +.In sys/acct.h and .Xr acct 5 . .Pp ==== //depot/projects/ia64/lib/libc/sys/clock_gettime.2#6 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.16 2003/02/23 10:20:23 phk Exp $ +.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.17 2003/09/10 19:24:33 ru Exp $ .\" .Dd February 5, 2003 .Dt CLOCK_GETTIME 2 @@ -73,7 +73,7 @@ The structure pointed to by .Fa tp is defined in -.Ao Pa sys/time.h Ac +.In sys/time.h as: .Pp .Bd -literal ==== //depot/projects/ia64/lib/libc/sys/getitimer.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getitimer.2 8.3 (Berkeley) 5/16/95 -.\" $FreeBSD: src/lib/libc/sys/getitimer.2,v 1.18 2002/12/19 09:40:24 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/getitimer.2,v 1.19 2003/09/10 19:24:33 ru Exp $ .\" .Dd May 16, 1995 .Dt GETITIMER 2 @@ -53,7 +53,7 @@ .Sh DESCRIPTION The system provides each process with three interval timers, defined in -.Ao Pa sys/time.h Ac . +.In sys/time.h . The .Fn getitimer system call returns the current value for the timer specified in @@ -139,7 +139,7 @@ is 100000000. .Sh NOTES Three macros for manipulating time values are defined in -.Ao Pa sys/time.h Ac . +.In sys/time.h . The .Fn timerclear macro ==== //depot/projects/ia64/lib/libc/sys/getsockopt.2#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getsockopt.2 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/lib/libc/sys/getsockopt.2,v 1.28 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/getsockopt.2,v 1.29 2003/09/10 19:24:33 ru Exp $ .\" .Dd May 2, 1995 .Dt GETSOCKOPT 2 @@ -107,7 +107,7 @@ and any specified options are passed uninterpreted to the appropriate protocol module for interpretation. The include file -.Ao Pa sys/socket.h Ac +.In sys/socket.h contains definitions for socket level options, described below. Options at other protocol levels vary in format and @@ -127,7 +127,7 @@ uses a .Vt "struct linger" argument, defined in -.Ao Pa sys/socket.h Ac , +.In sys/socket.h , which specifies the desired state of the option and the linger interval (see below). .Dv SO_SNDTIMEO @@ -136,7 +136,7 @@ use a .Vt "struct timeval" argument, defined in -.Ao Pa sys/time.h Ac . +.In sys/time.h . .Pp The following options are recognized at the socket level. Except as noted, each may be examined with ==== //depot/projects/ia64/lib/libc/sys/gettimeofday.2#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)gettimeofday.2 8.2 (Berkeley) 5/26/95 -.\" $FreeBSD: src/lib/libc/sys/gettimeofday.2,v 1.22 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/gettimeofday.2,v 1.23 2003/09/10 19:24:33 ru Exp $ .\" .Dd May 26, 1995 .Dt GETTIMEOFDAY 2 @@ -75,7 +75,7 @@ and .Fa tzp are defined in -.Ao Pa sys/time.h Ac +.In sys/time.h as: .Pp .Bd -literal ==== //depot/projects/ia64/lib/libc/sys/ioctl.2#7 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" @(#)ioctl.2 8.2 (Berkeley) 12/11/93 .\" -.\" $FreeBSD: src/lib/libc/sys/ioctl.2,v 1.23 2003/07/15 12:23:12 ceri Exp $ +.\" $FreeBSD: src/lib/libc/sys/ioctl.2,v 1.24 2003/09/10 19:24:33 ru Exp $ .\" .Dd December 11, 1993 .Dt IOCTL 2 @@ -85,7 +85,7 @@ Macros and defines used in specifying an ioctl .Fa request are located in the file -.Ao Pa sys/ioctl.h Ac . +.In sys/ioctl.h . .Sh RETURN VALUES If an error has occurred, a value of -1 is returned and .Va errno ==== //depot/projects/ia64/lib/libc/sys/quotactl.2#7 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)quotactl.2 8.2 (Berkeley) 3/10/95 -.\" $FreeBSD: src/lib/libc/sys/quotactl.2,v 1.22 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/quotactl.2,v 1.23 2003/09/10 19:24:33 ru Exp $ .\" .Dd March 5, 1999 .Dt QUOTACTL 2 @@ -61,7 +61,7 @@ for the given user .Fa id . (NOTE: One should use the QCMD macro defined in -.Ao Pa ufs/ufs/quota.h Ac +.In ufs/ufs/quota.h to formulate the value for .Fa cmd . ) The address of an optional command specific data structure, @@ -118,7 +118,7 @@ is a pointer to a .Fa struct dqblk structure (defined in -.Ao Pa ufs/ufs/quota.h Ac ) . +.In ufs/ufs/quota.h ) . .It Dv Q_SETQUOTA Set disk quota limits for the user or group (as determined by the command type) with identifier @@ -129,7 +129,7 @@ is a pointer to a .Fa struct dqblk structure (defined in -.Ao Pa ufs/ufs/quota.h Ac ) . +.In ufs/ufs/quota.h ) . The usage fields of the .Fa dqblk structure are ignored. @@ -144,7 +144,7 @@ is a pointer to a .Fa struct dqblk structure (defined in -.Ao Pa ufs/ufs/quota.h Ac ) . +.In ufs/ufs/quota.h ) . Only the usage fields are used. This system call is restricted to the super-user. .It Dv Q_SYNC ==== //depot/projects/ia64/lib/libc/sys/recv.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)recv.2 8.3 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.18 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.19 2003/09/10 19:24:33 ru Exp $ .\" .Dd February 21, 1994 .Dt RECV 2 @@ -152,7 +152,7 @@ .Fa msghdr structure to minimize the number of directly supplied arguments. This structure has the following form, as defined in -.Ao Pa sys/socket.h Ac : +.In sys/socket.h : .Pp .Bd -literal struct msghdr { @@ -226,7 +226,7 @@ should be a structure of type .Fa cmsgcred , which is defined in -.Ao Pa sys/socket.h Ac +.In sys/socket.h as follows: .Pp .Bd -literal ==== //depot/projects/ia64/lib/libc/sys/send.2#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.21 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.22 2003/09/10 19:19:49 roberto Exp $ .\" .Dd February 15, 1995 .Dt SEND 2 @@ -189,6 +189,10 @@ The remote host was down. .It Bq Er ENETDOWN The remote network was down. +.It Bq Er EPIPE +The socket is unable to send anymore data (SS_CANTSENDMORE has +been set on the socket). This typically means that the socket +is not connected. .El .Sh BUGS Because ==== //depot/projects/ia64/lib/libc/sys/setgroups.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)setgroups.2 8.2 (Berkeley) 4/16/94 -.\" $FreeBSD: src/lib/libc/sys/setgroups.2,v 1.11 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/setgroups.2,v 1.12 2003/09/10 19:24:33 ru Exp $ .\" .Dd April 16, 1994 .Dt SETGROUPS 2 @@ -59,7 +59,7 @@ more than .Dv NGROUPS , as defined in -.Ao Pa sys/param.h Ac . +.In sys/param.h . .Pp Only the super-user may set new groups. .Sh RETURN VALUES ==== //depot/projects/ia64/lib/libc/sys/socket.2#9 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)socket.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/socket.2,v 1.28 2003/03/24 16:07:19 charnier Exp $ +.\" $FreeBSD: src/lib/libc/sys/socket.2,v 1.29 2003/09/10 19:24:33 ru Exp $ .\" .Dd November 24, 1997 .Dt SOCKET 2 @@ -57,7 +57,7 @@ communication will take place; this selects the protocol family which should be used. These families are defined in the include file -.Ao Pa sys/socket.h Ac . +.In sys/socket.h . The currently understood formats are: .Pp .Bd -literal -offset indent -compact @@ -225,7 +225,7 @@ The operation of sockets is controlled by socket level .Em options . These options are defined in the file -.Ao Pa sys/socket.h Ac . +.In sys/socket.h . The .Xr setsockopt 2 and ==== //depot/projects/ia64/lib/libc/sys/sysarch.2#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: sysarch.2,v 1.6 1998/02/25 21:24:57 perry Exp $ -.\" $FreeBSD: src/lib/libc/sys/sysarch.2,v 1.7 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/sysarch.2,v 1.8 2003/09/10 19:24:33 ru Exp $ .\" .\" Copyright (c) 1980, 1991 Regents of the University of California. .\" All rights reserved. @@ -64,7 +64,7 @@ Symbolic constants and argument structures for the architecture-dependent functions can be found in the header file -.Ao Pa machine/sysarch.h Ac . +.In machine/sysarch.h . .Pp The .Fn sysarch ==== //depot/projects/ia64/lib/libc/sys/syscall.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)syscall.2 8.1 (Berkeley) 6/16/93 -.\" $FreeBSD: src/lib/libc/sys/syscall.2,v 1.10 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/syscall.2,v 1.11 2003/09/10 19:24:33 ru Exp $ .\" .Dd June 16, 1993 .Dt SYSCALL 2 @@ -57,7 +57,7 @@ .Fa number with the specified arguments. Symbolic constants for system calls can be found in the header file -.Ao Pa sys/syscall.h Ac . +.In sys/syscall.h . The .Fn __syscall form should be used when one or more of the arguments is a ==== //depot/projects/ia64/lib/libipsec/ipsec_strerror.3#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $KAME: ipsec_strerror.3,v 1.9 2001/08/17 07:21:36 itojun Exp $ -.\" $FreeBSD: src/lib/libipsec/ipsec_strerror.3,v 1.10 2003/02/06 11:29:40 charnier Exp $ +.\" $FreeBSD: src/lib/libipsec/ipsec_strerror.3,v 1.11 2003/09/10 19:24:33 ru Exp $ .\" .\" Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project. .\" All rights reserved. @@ -42,7 +42,7 @@ .Fn ipsec_strerror .\" .Sh DESCRIPTION -.Pa netinet6/ipsec.h +.In netinet6/ipsec.h declares .Pp .Dl extern int ipsec_errcode; ==== //depot/projects/ia64/lib/libstand/libstand.3#7 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libstand/libstand.3,v 1.25 2003/03/24 15:56:36 charnier Exp $ +.\" $FreeBSD: src/lib/libstand/libstand.3,v 1.26 2003/09/10 19:24:33 ru Exp $ .\" .Dd June 22, 1998 .Dt LIBSTAND 3 @@ -176,7 +176,7 @@ .It Fn assert expression .Pp Requires -.In assert.h +.In assert.h . .It Xo .Ft int .Fn setjmp "jmp_buf env" @@ -191,7 +191,7 @@ and .Fn _longjmp respectively as there is no signal state to manipulate. Requires -.In setjmp.h +.In setjmp.h . .El .Sh CHARACTER I/O .Bl -hang -width 10n ==== //depot/projects/ia64/lib/libutil/realhostname.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libutil/realhostname.3,v 1.7 2003/03/24 15:55:04 charnier Exp $ +.\" $FreeBSD: src/lib/libutil/realhostname.3,v 1.8 2003/09/10 19:24:33 ru Exp $ .\" .Dd April 6, 1999 .Os @@ -74,7 +74,7 @@ The .Fn realhostname function will return one of the following constants which are defined in -.Pa libutil.h : +.In libutil.h : .Pp .Bl -tag -width XXX -offset XXX .It Li HOSTNAME_FOUND ==== //depot/projects/ia64/lib/libutil/realhostname_sa.3#5 (text+ko) ==== @@ -49,7 +49,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libutil/realhostname_sa.3,v 1.8 2003/03/24 15:55:04 charnier Exp $ +.\" $FreeBSD: src/lib/libutil/realhostname_sa.3,v 1.9 2003/09/10 19:24:33 ru Exp $ .\" .Dd January 11, 2000 .Os @@ -103,7 +103,7 @@ The .Fn realhostname_sa function will return one of the following constants which are defined in -.Pa libutil.h : +.In libutil.h : .Pp .Bl -tag -width XXX -offset XXX .It Li HOSTNAME_FOUND ==== //depot/projects/ia64/libexec/lukemftpd/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 4/4/94 -# $FreeBSD: src/libexec/lukemftpd/Makefile,v 1.12 2003/08/24 17:35:52 obrien Exp $ +# $FreeBSD: src/libexec/lukemftpd/Makefile,v 1.13 2003/09/10 19:03:48 obrien Exp $ LUKEMFTPD= ${.CURDIR}/../../contrib/lukemftpd .PATH: ${LUKEMFTPD}/src ${LUKEMFTPD}/libnetbsd @@ -43,3 +43,5 @@ CLEANFILES+= lukemftpd.8 .include + +${OBJS}: ${.CURDIR}/nbsd2fbsd.h ==== //depot/projects/ia64/sbin/bsdlabel/bsdlabel.5#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)disklabel.5.5 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.5,v 1.15 2002/12/12 17:25:54 ru Exp $ +.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.5,v 1.16 2003/09/10 19:24:34 ru Exp $ .\" .Dd June 5, 1993 .Dt DISKLABEL 5 @@ -103,7 +103,7 @@ .Xr disklabel 8 . .Pp The format of the disk label, as specified in -.Pa , +.In sys/disklabel.h , is .Bd -literal #ifndef _SYS_DISKLABEL_H_ ==== //depot/projects/ia64/sbin/disklabel/disklabel.5#7 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)disklabel.5.5 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/disklabel/disklabel.5,v 1.15 2002/12/12 17:25:54 ru Exp $ +.\" $FreeBSD: src/sbin/disklabel/disklabel.5,v 1.16 2003/09/10 19:24:34 ru Exp $ .\" .Dd June 5, 1993 .Dt DISKLABEL 5 @@ -103,7 +103,7 @@ .Xr disklabel 8 . .Pp The format of the disk label, as specified in -.Pa , +.In sys/disklabel.h , is .Bd -literal #ifndef _SYS_DISKLABEL_H_ ==== //depot/projects/ia64/sbin/ip6fw/ip6fw.8#8 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ip6fw/ip6fw.8,v 1.18 2003/03/03 22:46:35 ru Exp $ +.\" $FreeBSD: src/sbin/ip6fw/ip6fw.8,v 1.19 2003/09/10 19:24:34 ru Exp $ .\" .\" $KAME$ .\" @@ -328,7 +328,7 @@ and the length of the port list is limited to .Dv IPV6_FW_MAX_PORTS (as defined in -.Pa /usr/src/sys/netinet6/ip6_fw.h ) +.In netinet6/ip6_fw.h ) ports. .Pp Fragmented packets which have a non-zero offset (i.e. not the first ==== //depot/projects/ia64/sbin/ipfw/ipfw.8#26 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.131 2003/07/22 07:41:24 luigi Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.132 2003/09/10 06:41:16 roam Exp $ .\" .Dd August 13, 2002 .Dt IPFW 8 @@ -1046,11 +1046,31 @@ .Cm any keyword (matching any MAC address), or six groups of hex digits separated by colons, -and optionally followed by a mask indicating how many bits are -significant, as in +and optionally followed by a mask indicating the significant bits. +The mask may be specified using either of the following methods: +.Bl -enum -width indent +.It +A slash +.Pq / +followed by the number of significant bits. +For example, an address with 33 significant bits could be specified as: .Pp .Dl "MAC 10:20:30:40:50:60/33 any" .Pp +.It +An ampersand +.Pq & +followed by a bitmask specified as six groups of hex digits separated +by colons. +For example, an address in which the last 16 bits are significant could +be specified as: +.Pp +.Dl "MAC 10:20:30:40:50:60&00:00:00:00:ff:ff any" +.Pp +Note that the ampersand character has a special meaning in many shells +and should generally be escaped. +.Pp +.El Note that the order of MAC addresses (destination first, source second) is the same as on the wire, but the opposite of the one used for ==== //depot/projects/ia64/sbin/mount_nfs/mount_nfs.8#10 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95 -.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.39 2003/05/17 22:53:44 ru Exp $ +.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.40 2003/09/10 08:24:33 ru Exp $ .\" .Dd May 11, 2003 .Dt MOUNT_NFS 8 @@ -239,11 +239,13 @@ Useful for hosts that have both an A record and an AAAA record for the same name. .El -.Bl -tag -width ".Cm dumbtimer" -.Ss Historic Fl o Ss Options +.Pp +.Sy Historic Fl o Sy Options +.Pp Use of these options is deprecated, they are only mentioned here for compatibility with historic versions of .Nm . +.Bl -tag -width ".Cm dumbtimer" .It Cm bg Same as .Fl b . ==== //depot/projects/ia64/share/man/man3/sysexits.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/sysexits.3,v 1.11 2002/12/12 17:25:56 ru Exp $ +.\" $FreeBSD: src/share/man/man3/sysexits.3,v 1.12 2003/09/10 19:24:34 ru Exp $ .\" .\" " .Dd March 31, 1996 @@ -127,6 +127,6 @@ This man page has been written by .An J\(:org Wunsch after the comments in -.Pa . +.In sysexits.h . .Sh BUGS The choice of an appropriate exit value is often ambiguous. ==== //depot/projects/ia64/share/man/man4/icmp6.4#2 (text+ko) ==== @@ -57,7 +57,7 @@ .\" SUCH DAMAGE. .\" .\" KAME $Id: icmp6.4,v 1.1 1999/12/17 09:47:01 itojun Exp $ -.\" $FreeBSD: src/share/man/man4/icmp6.4,v 1.13 2001/10/01 16:09:21 ru Exp $ +.\" $FreeBSD: src/share/man/man4/icmp6.4,v 1.14 2003/09/10 19:24:34 ru Exp $ .\" .Dd March 13, 2000 .Dt ICMP6 4 @@ -135,7 +135,7 @@ .Pp This structure, along with the macros and constants defined later in this section, are defined as a result of including the -.Aq Li netinet/icmp6.h +.In netinet/icmp6.h header. .Pp The current filter is fetched and stored using ==== //depot/projects/ia64/share/man/man4/lomac.4#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/lomac.4,v 1.5 2002/12/12 17:25:56 ru Exp $ +.\" $FreeBSD: src/share/man/man4/lomac.4,v 1.6 2003/09/10 18:45:26 ru Exp $ .\" .Dd November 20, 2001 .Dt LOMAC 4 @@ -89,7 +89,7 @@ .Dq normal or .Dq synthetic -fileystems. +file systems. After loaded, another root .Xr mount 8 will exist on the system and appear as type ==== //depot/projects/ia64/share/man/man4/man4.i386/apm.4#3 (text+ko) ==== @@ -9,7 +9,7 @@ .\" the author assume any responsibility for damages incurred with its .\" use. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/apm.4,v 1.19 2003/01/29 21:51:05 mux Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/apm.4,v 1.20 2003/09/10 19:24:34 ru Exp $ .\" .Dd November 1, 1994 .Dt APM 4 i386 @@ -48,7 +48,7 @@ can control APM, or retrieve APM status information via this interface. .Nm exports the following interfaces. These symbols are defined in -.Dq Pa /usr/include/machine/apm_bios.h . +.In machine/apm_bios.h . .Bl -tag -width 4n -offset indent .It Sy APMIO_SUSPEND Suspend system. ==== //depot/projects/ia64/share/man/man4/man4.i386/mcd.4#5 (text+ko) ==== @@ -24,7 +24,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/share/man/man4/man4.i386/mcd.4,v 1.20 2002/12/12 17:25:57 ru Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/mcd.4,v 1.21 2003/09/10 19:24:34 ru Exp $ .\" .Dd December 8, 1994 .Dt MCD 4 i386 @@ -149,7 +149,7 @@ supported, the only interrupts that the board generates are those that aren't supported by the driver anyway. .Sh SEE ALSO -.Pa /usr/include/sys/cdio.h +.In sys/cdio.h .Sh AUTHORS .An -nosplit The driver was written by ==== //depot/projects/ia64/share/man/man4/man4.i386/mse.4#2 (text+ko) ==== @@ -10,7 +10,7 @@ .\" this software for any purpose. It is provided "as is" .\" without express or implied warranty. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/mse.4,v 1.16 2001/10/13 09:08:37 yokota Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/mse.4,v 1.17 2003/09/10 19:24:34 ru Exp $ .\" .Dd December 3, 1997 .Dt MSE 4 i386 @@ -160,7 +160,7 @@ .Xr ioctl 2 commands for mouse drivers. These commands and related structures and constants are defined in -.Ao Pa sys/mouse.h Ac . +.In sys/mouse.h . General description of the commands is given in .Xr mouse 4 . This section explains the features specific to the ==== //depot/projects/ia64/share/man/man4/man4.i386/spkr.4#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/spkr.4,v 1.21 2002/01/21 12:36:12 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/spkr.4,v 1.22 2003/09/10 19:24:34 ru Exp $ .\" .Dd November 7, 1993 .Dt SPKR 4 i386 @@ -47,7 +47,7 @@ speaker driver directly; definitions for the .Xr ioctl 2 interface are in -.Pa /usr/include/machine/speaker.h . +.In machine/speaker.h . The .Li tone_t structure used in these calls has two fields, ==== //depot/projects/ia64/share/man/man4/man4.i386/svr4.4#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 10 23:04:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA74316A4C1; Wed, 10 Sep 2003 23:04:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 65C0A16A4BF for ; Wed, 10 Sep 2003 23:04:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0348543FE3 for ; Wed, 10 Sep 2003 23:04:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8B64e0U068174 for ; Wed, 10 Sep 2003 23:04:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8B64dnD068171 for perforce@freebsd.org; Wed, 10 Sep 2003 23:04:39 -0700 (PDT) Date: Wed, 10 Sep 2003 23:04:39 -0700 (PDT) Message-Id: <200309110604.h8B64dnD068171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37896 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 06:04:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=37896 Change 37896 by marcel@marcel_nfs on 2003/09/10 23:03:55 IFC @37894 Affected files ... .. //depot/projects/uart/alpha/alpha/pmap.c#11 integrate .. //depot/projects/uart/amd64/amd64/exception.S#2 integrate .. //depot/projects/uart/amd64/amd64/machdep.c#5 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#14 integrate .. //depot/projects/uart/amd64/conf/GENERIC#3 integrate .. //depot/projects/uart/amd64/include/signal.h#2 integrate .. //depot/projects/uart/boot/ia64/libski/acpi_stub.c#2 integrate .. //depot/projects/uart/boot/ia64/libski/bootinfo.c#2 integrate .. //depot/projects/uart/boot/ia64/libski/devicename.c#2 integrate .. //depot/projects/uart/boot/ia64/libski/efi_stub.c#2 integrate .. //depot/projects/uart/boot/ia64/libski/elf_freebsd.c#2 integrate .. //depot/projects/uart/boot/ia64/libski/module.c#2 integrate .. //depot/projects/uart/boot/ia64/libski/sal_stub.c#2 integrate .. //depot/projects/uart/boot/ia64/libski/skifs.c#2 integrate .. //depot/projects/uart/boot/ia64/libski/ssc.c#2 integrate .. //depot/projects/uart/boot/ia64/libski/time.c#2 integrate .. //depot/projects/uart/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/uart/boot/pc98/boot2/disk.c#2 integrate .. //depot/projects/uart/boot/pc98/boot2/io.c#2 integrate .. //depot/projects/uart/boot/pc98/boot2/probe_keyboard.c#2 integrate .. //depot/projects/uart/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/uart/boot/pc98/boot2/table.c#2 integrate .. //depot/projects/uart/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/uart/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/uart/boot/pc98/libpc98/comconsole.c#2 integrate .. //depot/projects/uart/boot/pc98/libpc98/gatea20.c#2 integrate .. //depot/projects/uart/boot/pc98/libpc98/i386_module.c#2 integrate .. //depot/projects/uart/boot/pc98/libpc98/time.c#2 integrate .. //depot/projects/uart/boot/pc98/libpc98/vidconsole.c#2 integrate .. //depot/projects/uart/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/uart/boot/pc98/loader/main.c#2 integrate .. //depot/projects/uart/cam/cam_periph.c#2 integrate .. //depot/projects/uart/coda/coda_psdev.c#2 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/uart/conf/files#23 integrate .. //depot/projects/uart/conf/options.ia64#4 integrate .. //depot/projects/uart/crypto/sha2/sha2.c#2 integrate .. //depot/projects/uart/dev/aac/aac_pci.c#6 integrate .. //depot/projects/uart/dev/acpica/acpi.c#9 integrate .. //depot/projects/uart/dev/acpica/acpi_cmbat.c#4 integrate .. //depot/projects/uart/dev/acpica/acpi_resource.c#4 integrate .. //depot/projects/uart/dev/acpica/acpivar.h#5 integrate .. //depot/projects/uart/dev/acpica/madt.h#1 branch .. //depot/projects/uart/dev/ata/ata-all.c#6 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/uart/dev/ata/ata-lowlevel.c#6 integrate .. //depot/projects/uart/dev/ata/ata-pci.h#6 integrate .. //depot/projects/uart/dev/ata/ata-raid.c#4 integrate .. //depot/projects/uart/dev/bfe/if_bfe.c#1 branch .. //depot/projects/uart/dev/bfe/if_bfereg.h#1 branch .. //depot/projects/uart/dev/ciss/ciss.c#6 integrate .. //depot/projects/uart/dev/drm/drmP.h#3 integrate .. //depot/projects/uart/dev/drm/drm_context.h#3 integrate .. //depot/projects/uart/dev/drm/drm_memory.h#3 integrate .. //depot/projects/uart/dev/drm/radeon.h#3 integrate .. //depot/projects/uart/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/uart/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/uart/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/uart/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/uart/dev/drm/radeon_mem.c#3 integrate .. //depot/projects/uart/dev/drm/radeon_state.c#3 integrate .. //depot/projects/uart/dev/drm/sis.h#1 branch .. //depot/projects/uart/dev/drm/sis_drm.h#1 branch .. //depot/projects/uart/dev/drm/sis_drv.c#1 branch .. //depot/projects/uart/dev/drm/sis_drv.h#1 branch .. //depot/projects/uart/dev/drm/sis_ds.c#1 branch .. //depot/projects/uart/dev/drm/sis_ds.h#1 branch .. //depot/projects/uart/dev/drm/sis_mm.c#1 branch .. //depot/projects/uart/dev/mii/bmtphy.c#3 integrate .. //depot/projects/uart/dev/mii/miidevs#3 integrate .. //depot/projects/uart/dev/mii/rgephy.c#1 branch .. //depot/projects/uart/dev/mii/rgephyreg.h#1 branch .. //depot/projects/uart/dev/mii/rlphy.c#3 integrate .. //depot/projects/uart/dev/pst/pst-raid.c#4 integrate .. //depot/projects/uart/dev/re/if_re.c#1 branch .. //depot/projects/uart/dev/uart/uart_cpu_pc98.c#3 integrate .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#27 integrate .. //depot/projects/uart/geom/bde/g_bde_crypt.c#3 integrate .. //depot/projects/uart/geom/geom_io.c#3 integrate .. //depot/projects/uart/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/uart/i386/acpica/acpi_wakeup.c#6 integrate .. //depot/projects/uart/i386/conf/GENERIC#3 integrate .. //depot/projects/uart/i386/conf/NOTES#4 integrate .. //depot/projects/uart/i386/i386/identcpu.c#6 integrate .. //depot/projects/uart/i386/i386/machdep.c#5 integrate .. //depot/projects/uart/i386/i386/mp_clock.c#4 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/uart/i386/i386/pmap.c#15 integrate .. //depot/projects/uart/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/uart/i386/include/apic.h#4 integrate .. //depot/projects/uart/i386/include/segments.h#2 integrate .. //depot/projects/uart/i386/isa/npx.c#3 integrate .. //depot/projects/uart/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/uart/ia64/acpica/madt.c#4 integrate .. //depot/projects/uart/ia64/conf/GENERIC#4 integrate .. //depot/projects/uart/ia64/conf/NOTES#3 integrate .. //depot/projects/uart/ia64/ia64/genassym.c#4 integrate .. //depot/projects/uart/ia64/ia64/interrupt.c#6 integrate .. //depot/projects/uart/ia64/ia64/locore.S#2 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#11 integrate .. //depot/projects/uart/ia64/ia64/nexus.c#2 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#9 integrate .. //depot/projects/uart/ia64/ia64/sapic.c#2 integrate .. //depot/projects/uart/ia64/include/sapicvar.h#2 integrate .. //depot/projects/uart/ia64/include/vmparam.h#2 integrate .. //depot/projects/uart/kern/bus_if.m#2 integrate .. //depot/projects/uart/kern/kern_ktr.c#5 integrate .. //depot/projects/uart/kern/subr_bus.c#3 integrate .. //depot/projects/uart/kern/sys_pipe.c#8 integrate .. //depot/projects/uart/kern/vfs_aio.c#2 integrate .. //depot/projects/uart/kern/vfs_mount.c#3 integrate .. //depot/projects/uart/modules/Makefile#9 integrate .. //depot/projects/uart/modules/bfe/Makefile#1 branch .. //depot/projects/uart/modules/drm/Makefile#2 integrate .. //depot/projects/uart/modules/drm/sis/Makefile#1 branch .. //depot/projects/uart/modules/mii/Makefile#3 integrate .. //depot/projects/uart/modules/re/Makefile#1 branch .. //depot/projects/uart/pc98/conf/GENERIC#3 integrate .. //depot/projects/uart/pci/if_rl.c#13 integrate .. //depot/projects/uart/pci/if_rlreg.h#6 integrate .. //depot/projects/uart/sparc64/conf/GENERIC#5 integrate .. //depot/projects/uart/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/uart/sys/ata.h#3 integrate .. //depot/projects/uart/sys/bus.h#3 integrate .. //depot/projects/uart/sys/param.h#7 integrate .. //depot/projects/uart/sys/syslimits.h#2 integrate .. //depot/projects/uart/vm/pmap.h#4 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/pmap.c#11 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.136 2003/09/07 20:02:38 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.137 2003/09/08 02:45:01 alc Exp $"); #include #include @@ -811,6 +811,29 @@ return 0; } +/* + * Routine: pmap_extract_and_hold + * Function: + * Atomically extract and hold the physical page + * with the given pmap and virtual address. + */ +vm_page_t +pmap_extract_and_hold(pmap_t pmap, vm_offset_t va) +{ + vm_paddr_t pa; + vm_page_t m; + + m = NULL; + mtx_lock(&Giant); + if ((pa = pmap_extract(pmap, va)) != 0) { + m = PHYS_TO_VM_PAGE(pa); + vm_page_lock_queues(); + vm_page_hold(m); + vm_page_unlock_queues(); + } + mtx_unlock(&Giant); + return (m); +} /*************************************************** * Low level mapping routines..... ==== //depot/projects/uart/amd64/amd64/exception.S#2 (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.110 2003/05/14 04:10:47 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.111 2003/09/09 19:32:09 peter Exp $ */ #include @@ -227,8 +227,8 @@ swapgs movq %rsp,PCPU(SCRATCH_RSP) movq common_tss+COMMON_TSS_RSP0,%rsp - /* Now emulate a trapframe. Ugh. */ - subq $TF_SIZE,%rsp + /* Now emulate a trapframe. Make the 8 byte alignment odd for call. */ + subq $TF_SIZE+8,%rsp /* defer TF_RSP till we have a spare register */ movq %r11,TF_RFLAGS(%rsp) movq %rcx,TF_RIP(%rsp) /* %rcx original value is in %r10 */ ==== //depot/projects/uart/amd64/amd64/machdep.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.588 2003/07/31 01:26:39 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.589 2003/09/09 19:32:09 peter Exp $"); #include "opt_atalk.h" #include "opt_compat.h" @@ -1217,6 +1217,8 @@ /* make an initial tss so cpu can get interrupt stack on syscall! */ common_tss.tss_rsp0 = thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb); + /* Ensure the stack is aligned to 16 bytes */ + common_tss.tss_rsp0 &= ~0xF; /* doublefault stack space, runs on ist1 */ common_tss.tss_ist1 = (long)&dblfault_stack[sizeof(dblfault_stack)]; @@ -1434,7 +1436,6 @@ struct trapframe *tp; tp = td->td_frame; - PROC_LOCK(curthread->td_proc); mcp->mc_onstack = sigonstack(tp->tf_rsp); PROC_UNLOCK(curthread->td_proc); @@ -1486,66 +1487,42 @@ return (EINVAL); rflags = (mcp->mc_rflags & PSL_USERCHANGE) | (tp->tf_rflags & ~PSL_USERCHANGE); - if ((ret = set_fpcontext(td, mcp)) == 0) { - tp->tf_r15 = mcp->mc_r15; - tp->tf_r14 = mcp->mc_r14; - tp->tf_r13 = mcp->mc_r13; - tp->tf_r12 = mcp->mc_r12; - tp->tf_r11 = mcp->mc_r11; - tp->tf_r10 = mcp->mc_r10; - tp->tf_r9 = mcp->mc_r9; - tp->tf_r8 = mcp->mc_r8; - tp->tf_rdi = mcp->mc_rdi; - tp->tf_rsi = mcp->mc_rsi; - tp->tf_rbp = mcp->mc_rbp; - tp->tf_rbx = mcp->mc_rbx; - tp->tf_rdx = mcp->mc_rdx; - tp->tf_rcx = mcp->mc_rcx; - tp->tf_rax = mcp->mc_rax; - tp->tf_rip = mcp->mc_rip; - tp->tf_rflags = rflags; - tp->tf_rsp = mcp->mc_rsp; - tp->tf_ss = mcp->mc_ss; - ret = 0; - } - return (ret); + ret = set_fpcontext(td, mcp); + if (ret != 0) + return (ret); + tp->tf_r15 = mcp->mc_r15; + tp->tf_r14 = mcp->mc_r14; + tp->tf_r13 = mcp->mc_r13; + tp->tf_r12 = mcp->mc_r12; + tp->tf_r11 = mcp->mc_r11; + tp->tf_r10 = mcp->mc_r10; + tp->tf_r9 = mcp->mc_r9; + tp->tf_r8 = mcp->mc_r8; + tp->tf_rdi = mcp->mc_rdi; + tp->tf_rsi = mcp->mc_rsi; + tp->tf_rbp = mcp->mc_rbp; + tp->tf_rbx = mcp->mc_rbx; + tp->tf_rdx = mcp->mc_rdx; + tp->tf_rcx = mcp->mc_rcx; + tp->tf_rax = mcp->mc_rax; + tp->tf_rip = mcp->mc_rip; + tp->tf_rflags = rflags; + tp->tf_rsp = mcp->mc_rsp; + tp->tf_ss = mcp->mc_ss; + return (0); } static void get_fpcontext(struct thread *td, mcontext_t *mcp) { - struct savefpu *addr; - /* - * XXX mc_fpstate might be misaligned, since its declaration is not - * unportabilized using __attribute__((aligned(16))) like the - * declaration of struct savemm, and anyway, alignment doesn't work - * for auto variables since we don't use gcc's pessimal stack - * alignment. Work around this by abusing the spare fields after - * mcp->mc_fpstate. - * - * XXX unpessimize most cases by only aligning when fxsave might be - * called, although this requires knowing too much about - * npxgetregs()'s internals. - */ - addr = (struct savefpu *)&mcp->mc_fpstate; - if (td == PCPU_GET(fpcurthread) && ((uintptr_t)(void *)addr & 0xF)) { - do - addr = (void *)((char *)addr + 4); - while ((uintptr_t)(void *)addr & 0xF); - } - mcp->mc_ownedfp = npxgetregs(td, addr); - if (addr != (struct savefpu *)&mcp->mc_fpstate) { - bcopy(addr, &mcp->mc_fpstate, sizeof(mcp->mc_fpstate)); - bzero(&mcp->mc_spare2, sizeof(mcp->mc_spare2)); - } + mcp->mc_ownedfp = npxgetregs(td, (struct savefpu *)&mcp->mc_fpstate); mcp->mc_fpformat = npxformat(); } static int set_fpcontext(struct thread *td, const mcontext_t *mcp) { - struct savefpu *addr; if (mcp->mc_fpformat == _MC_FPFMT_NODEV) return (0); @@ -1556,25 +1533,12 @@ fpstate_drop(td); else if (mcp->mc_ownedfp == _MC_FPOWNED_FPU || mcp->mc_ownedfp == _MC_FPOWNED_PCB) { - /* XXX align as above. */ - addr = (struct savefpu *)&mcp->mc_fpstate; - if (td == PCPU_GET(fpcurthread) && - ((uintptr_t)(void *)addr & 0xF)) { - do - addr = (void *)((char *)addr + 4); - while ((uintptr_t)(void *)addr & 0xF); - bcopy(&mcp->mc_fpstate, addr, sizeof(mcp->mc_fpstate)); - } /* * XXX we violate the dubious requirement that npxsetregs() * be called with interrupts disabled. + * XXX obsolete on trap-16 systems? */ - npxsetregs(td, addr); - /* - * Don't bother putting things back where they were in the - * misaligned case, since we know that the caller won't use - * them again. - */ + npxsetregs(td, (struct savefpu *)&mcp->mc_fpstate); } else return (EINVAL); return (0); ==== //depot/projects/uart/amd64/amd64/pmap.c#14 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.434 2003/08/24 08:07:06 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.435 2003/09/08 02:45:02 alc Exp $"); /* * Manages physical address maps. @@ -749,6 +749,30 @@ } +/* + * Routine: pmap_extract_and_hold + * Function: + * Atomically extract and hold the physical page + * with the given pmap and virtual address. + */ +vm_page_t +pmap_extract_and_hold(pmap_t pmap, vm_offset_t va) +{ + vm_paddr_t pa; + vm_page_t m; + + m = NULL; + mtx_lock(&Giant); + if ((pa = pmap_extract(pmap, va)) != 0) { + m = PHYS_TO_VM_PAGE(pa); + vm_page_lock_queues(); + vm_page_hold(m); + vm_page_unlock_queues(); + } + mtx_unlock(&Giant); + return (m); +} + vm_paddr_t pmap_kextract(vm_offset_t va) { ==== //depot/projects/uart/amd64/conf/GENERIC#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.391 2003/09/03 01:24:47 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.394 2003/09/10 18:54:58 obrien Exp $ machine amd64 cpu HAMMER @@ -118,8 +118,8 @@ # RAID controllers #XXX pointer/int warnings -#device aac # Adaptec FSA RAID -#device aacp # SCSI passthrough for aac (requires CAM) +device aac # Adaptec FSA RAID +device aacp # SCSI passthrough for aac (requires CAM) device amr # AMI MegaRAID device ida # Compaq Smart RAID device ips # IBM (Adaptec) ServeRAID @@ -168,9 +168,11 @@ # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support +device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') +device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 @@ -182,7 +184,6 @@ device vr # VIA Rhine, Rhine II device wb # Winbond W89C840F device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') -device bge # Broadcom BCM570xx Gigabit Ethernet # ISA Ethernet NICs. pccard nics included. device cs # Crystal Semiconductor CS89x0 NIC ==== //depot/projects/uart/amd64/include/signal.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signal.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/amd64/include/signal.h,v 1.21 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/signal.h,v 1.23 2003/09/08 18:31:48 peter Exp $ */ #ifndef _MACHINE_SIGNAL_H_ @@ -74,22 +74,23 @@ struct sigcontext { struct __sigset sc_mask; /* signal mask to restore */ long sc_onstack; /* sigstack state to restore */ - long sc_r15; /* machine state (struct trapframe) */ - long sc_r14; - long sc_r13; - long sc_r12; - long sc_r11; - long sc_r10; - long sc_r9; - long sc_r8; - long sc_rdi; + long sc_rdi; /* machine state (struct trapframe) */ long sc_rsi; - long sc_rbp; - long sc_rbx; long sc_rdx; long sc_rcx; + long sc_r8; + long sc_r9; long sc_rax; + long sc_rbx; + long sc_rbp; + long sc_r10; + long sc_r11; + long sc_r12; + long sc_r13; + long sc_r14; + long sc_r15; long sc_trapno; + long sc_addr; long sc_err; long sc_rip; long sc_cs; @@ -104,7 +105,7 @@ long sc_fpformat; long sc_ownedfp; long sc_spare1[1]; - long sc_fpstate[128] __aligned(16); + long sc_fpstate[64] __aligned(16); long sc_spare2[8]; }; #endif /* __BSD_VISIBLE */ ==== //depot/projects/uart/boot/ia64/libski/acpi_stub.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (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/boot/ia64/libski/acpi_stub.c,v 1.1 2003/02/01 22:50:08 marcel Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/acpi_stub.c,v 1.2 2003/09/08 09:11:32 obrien Exp $"); + #include #define APIC_IO_SAPIC 6 ==== //depot/projects/uart/boot/ia64/libski/bootinfo.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/boot/ia64/libski/bootinfo.c,v 1.8 2003/02/20 06:47:54 marcel Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/bootinfo.c,v 1.9 2003/09/08 09:11:32 obrien Exp $"); + #include #include #include ==== //depot/projects/uart/boot/ia64/libski/devicename.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/boot/ia64/libski/devicename.c,v 1.1 2001/09/12 08:34:26 dfr Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/devicename.c,v 1.2 2003/09/08 09:11:32 obrien Exp $"); + #include #include #include ==== //depot/projects/uart/boot/ia64/libski/efi_stub.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (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/boot/ia64/libski/efi_stub.c,v 1.1 2003/02/01 22:50:08 marcel Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/efi_stub.c,v 1.2 2003/09/08 09:11:32 obrien Exp $"); + #include #include #include ==== //depot/projects/uart/boot/ia64/libski/elf_freebsd.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/ia64/libski/elf_freebsd.c,v 1.8 2003/05/01 03:56:29 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -37,7 +36,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -76,6 +74,9 @@ * @(#)boot.c 8.1 (Berkeley) 6/10/93 */ +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/elf_freebsd.c,v 1.9 2003/09/08 09:11:32 obrien Exp $"); + #include #include ==== //depot/projects/uart/boot/ia64/libski/module.c#2 (text+ko) ==== @@ -24,9 +24,8 @@ * SUCH DAMAGE. */ - #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/module.c,v 1.2 2003/04/03 21:36:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/module.c,v 1.3 2003/09/08 09:11:32 obrien Exp $"); #include ==== //depot/projects/uart/boot/ia64/libski/sal_stub.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (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/boot/ia64/libski/sal_stub.c,v 1.1 2003/02/01 22:50:08 marcel Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/sal_stub.c,v 1.2 2003/09/08 09:11:32 obrien Exp $"); + #include #include #include ==== //depot/projects/uart/boot/ia64/libski/skifs.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/boot/ia64/libski/skifs.c,v 1.1 2001/09/12 08:34:27 dfr Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/skifs.c,v 1.2 2003/09/08 09:11:32 obrien Exp $"); + #include #include #include ==== //depot/projects/uart/boot/ia64/libski/ssc.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/boot/ia64/libski/ssc.c,v 1.3 2003/02/01 22:50:08 marcel Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/ssc.c,v 1.4 2003/09/08 09:11:32 obrien Exp $"); + #include #include "libski.h" ==== //depot/projects/uart/boot/ia64/libski/time.c#2 (text+ko) ==== @@ -35,11 +35,10 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. - * */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/time.c,v 1.3 2003/04/03 21:36:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/time.c,v 1.4 2003/09/08 09:11:32 obrien Exp $"); #include #include ==== //depot/projects/uart/boot/pc98/boot2/boot.c#2 (text+ko) ==== @@ -24,10 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, [92/04/03 16:51:14 rvb] - * $FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.10 2003/01/06 13:43:13 nyan Exp $ */ - - /* Copyright 1988, 1989, 1990, 1991, 1992 by Intel Corporation, Santa Clara, California. @@ -51,6 +48,9 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/boot.c,v 1.11 2003/09/08 09:11:20 obrien Exp $"); + #include "boot.h" #include #include ==== //depot/projects/uart/boot/pc98/boot2/disk.c#2 (text+ko) ==== @@ -24,9 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:49 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/disk.c,v 1.9 2003/04/04 16:35:15 phk Exp $ */ - /* * Ported to PC-9801 by Yoshio Kimura */ @@ -41,6 +39,9 @@ * partition, which is not always at the end of the disk. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/disk.c,v 1.10 2003/09/08 09:11:20 obrien Exp $"); + #include "boot.h" #include #include ==== //depot/projects/uart/boot/pc98/boot2/io.c#2 (text+ko) ==== @@ -24,9 +24,11 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:57 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/io.c,v 1.4 2002/05/14 12:34:03 nyan Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/io.c,v 1.5 2003/09/08 09:11:20 obrien Exp $"); + #include "boot.h" #include #include ==== //depot/projects/uart/boot/pc98/boot2/probe_keyboard.c#2 (text+ko) ==== @@ -23,10 +23,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (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/boot/pc98/boot2/probe_keyboard.c,v 1.2 2000/05/01 20:26:25 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/probe_keyboard.c,v 1.3 2003/09/08 09:11:20 obrien Exp $"); + #include "boot.h" int probe_keyboard(void) ==== //depot/projects/uart/boot/pc98/boot2/sys.c#2 (text+ko) ==== @@ -24,9 +24,11 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:34 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.4 2003/04/04 16:35:15 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.5 2003/09/08 09:11:20 obrien Exp $"); + /* * Ported to PC-9801 by Yoshio Kimura */ ==== //depot/projects/uart/boot/pc98/boot2/table.c#2 (text+ko) ==== @@ -24,9 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:43 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/table.c,v 1.3 1999/08/28 00:40:27 peter Exp $ */ - /* Copyright 1988, 1989, 1990, 1991, 1992 by Intel Corporation, Santa Clara, California. @@ -50,6 +48,9 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/table.c,v 1.4 2003/09/08 09:11:20 obrien Exp $"); + #include "boot.h" /* Segment Descriptor ==== //depot/projects/uart/boot/pc98/libpc98/biosdisk.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/boot/pc98/libpc98/biosdisk.c,v 1.24 2003/04/04 16:35:15 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.25 2003/09/08 09:11:20 obrien Exp $"); + /* * BIOS disk device handling. * ==== //depot/projects/uart/boot/pc98/libpc98/biosmem.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/boot/pc98/libpc98/biosmem.c,v 1.5 2002/09/23 18:54:27 alfred Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosmem.c,v 1.6 2003/09/08 09:11:20 obrien Exp $"); + /* * Obtain memory configuration information from the BIOS */ ==== //depot/projects/uart/boot/pc98/libpc98/comconsole.c#2 (text+ko) ==== @@ -21,10 +21,11 @@ * LIABILITY, OR TORT (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/boot/pc98/libpc98/comconsole.c,v 1.3 2000/11/05 12:35:40 nyan Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/comconsole.c,v 1.4 2003/09/08 09:11:20 obrien Exp $"); + #include #include #include ==== //depot/projects/uart/boot/pc98/libpc98/gatea20.c#2 (text+ko) ==== @@ -1,8 +1,10 @@ /* - * $FreeBSD: src/sys/boot/pc98/libpc98/gatea20.c,v 1.3 2000/11/05 12:35:40 nyan Exp $ - * From: $NetBSD: gatea20.c,v 1.2 1997/10/29 00:32:49 fvdl Exp $ + * $NetBSD: gatea20.c,v 1.2 1997/10/29 00:32:49 fvdl Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/gatea20.c,v 1.4 2003/09/08 09:11:20 obrien Exp $"); + /* extracted from freebsd:sys/i386/boot/biosboot/io.c */ #include ==== //depot/projects/uart/boot/pc98/libpc98/i386_module.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/boot/pc98/libpc98/i386_module.c,v 1.1 2003/06/08 03:16:59 nyan Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/i386_module.c,v 1.2 2003/09/08 09:11:20 obrien Exp $"); + int i386_autoload(void) { ==== //depot/projects/uart/boot/pc98/libpc98/time.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/boot/pc98/libpc98/time.c,v 1.4 2000/11/05 12:35:40 nyan Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/time.c,v 1.5 2003/09/08 09:11:20 obrien Exp $"); + #include #include #ifdef PC98 ==== //depot/projects/uart/boot/pc98/libpc98/vidconsole.c#2 (text+ko) ==== @@ -24,11 +24,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * From Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp - * - * $FreeBSD: src/sys/boot/pc98/libpc98/vidconsole.c,v 1.10 2001/10/17 15:15:01 nyan Exp $ + * Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp */ +#include +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/vidconsole.c,v 1.11 2003/09/08 09:11:20 obrien Exp $"); + #include #include #include ==== //depot/projects/uart/boot/pc98/loader/conf.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/boot/pc98/loader/conf.c,v 1.1 2003/05/01 13:17:06 nyan Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/conf.c,v 1.2 2003/09/08 09:11:21 obrien Exp $"); + #include #include #include "libi386/libi386.h" ==== //depot/projects/uart/boot/pc98/loader/main.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/boot/pc98/loader/main.c,v 1.15 2001/11/06 12:31:56 nyan Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.16 2003/09/08 09:11:21 obrien Exp $"); + /* * MD bootstrap main() and assorted miscellaneous * commands. ==== //depot/projects/uart/cam/cam_periph.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.51 2003/06/10 17:50:20 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.52 2003/09/10 18:23:43 alc Exp $"); #include #include @@ -653,16 +653,14 @@ * vmapbuf() after the useracc() check. */ if (vmapbuf(mapinfo->bp[i]) < 0) { - printf("cam_periph_mapmem: error, " - "address %p, length %lu isn't " - "user accessible any more\n", - (void *)*data_ptrs[i], - (u_long)lengths[i]); for (j = 0; j < i; ++j) { *data_ptrs[j] = mapinfo->bp[j]->b_saveaddr; + vunmapbuf(mapinfo->bp[j]); mapinfo->bp[j]->b_flags &= ~B_PHYS; relpbuf(mapinfo->bp[j], NULL); } + mapinfo->bp[i]->b_flags &= ~B_PHYS; + relpbuf(mapinfo->bp[i], NULL); PRELE(curproc); return(EACCES); } ==== //depot/projects/uart/coda/coda_psdev.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ /* These routines are the device entry points for Venus. */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_psdev.c,v 1.27 2003/06/10 21:21:59 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_psdev.c,v 1.28 2003/09/10 01:41:15 tjr Exp $"); extern int coda_nc_initialized; /* Set if cache has been initialized */ @@ -580,8 +580,10 @@ #endif } else { +#ifdef CODA_VERBOSE printf("coda_call: tsleep returns %d, cnt %d\n", error, i); +#endif #if notyet tempset = td->td_siglist; ==== //depot/projects/uart/compat/linprocfs/linprocfs.c#5 (text+ko) ==== @@ -40,13 +40,14 @@ */ #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 11 05:32:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D23E16A4C1; Thu, 11 Sep 2003 05:32:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2DB8216A4BF for ; Thu, 11 Sep 2003 05:32:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C31D44005 for ; Thu, 11 Sep 2003 05:32:44 -0700 (PDT) (envelope-from tzukanov@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BCWi0U098573 for ; Thu, 11 Sep 2003 05:32:44 -0700 (PDT) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BCWgjR098570 for perforce@freebsd.org; Thu, 11 Sep 2003 05:32:42 -0700 (PDT) Date: Thu, 11 Sep 2003 05:32:42 -0700 (PDT) Message-Id: <200309111232.h8BCWgjR098570@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov To: Perforce Change Reviews Subject: PERFORCE change 37913 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 12:32:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=37913 Change 37913 by tzukanov@tzukanov_antares on 2003/09/11 05:32:38 Partial update. Re-IFC will follow. Affected files ... .. //depot/projects/s390/Makefile.inc1#16 edit .. //depot/projects/s390/contrib/gcc/config/s390/fixdfdi.h#2 edit .. //depot/projects/s390/contrib/gcc/config/s390/freebsd.h#2 edit .. //depot/projects/s390/contrib/gcc/config/s390/libgcc-glibc.ver#2 edit .. //depot/projects/s390/contrib/gcc/config/s390/linux.h#2 edit .. //depot/projects/s390/contrib/gcc/config/s390/s390-protos.h#2 edit .. //depot/projects/s390/contrib/gcc/config/s390/s390.c#2 edit .. //depot/projects/s390/contrib/gcc/config/s390/s390.h#2 edit .. //depot/projects/s390/contrib/gcc/config/s390/s390.md#3 edit .. //depot/projects/s390/contrib/gcc/config/s390/t-linux64#2 edit .. //depot/projects/s390/gnu/usr.bin/binutils/as/s390-freebsd/config.h#4 edit .. //depot/projects/s390/gnu/usr.bin/binutils/as/s390x-freebsd/config.h#4 edit .. //depot/projects/s390/gnu/usr.bin/binutils/ld/Makefile.s390#3 edit .. //depot/projects/s390/gnu/usr.bin/binutils/ld/Makefile.s390x#3 edit .. //depot/projects/s390/gnu/usr.bin/cc/cc_tools/Makefile#6 edit .. //depot/projects/s390/sys/s390/include/_limits.h#1 add .. //depot/projects/s390/sys/s390/include/cpu.h#2 edit .. //depot/projects/s390/sys/s390/include/critical.h#2 edit .. //depot/projects/s390/sys/s390/include/limits.h#3 edit .. //depot/projects/s390/sys/s390/include/md_var.h#2 edit .. //depot/projects/s390/sys/s390/include/param.h#2 edit .. //depot/projects/s390/sys/s390/s390/autoconf.c#3 edit .. //depot/projects/s390/sys/s390/s390/clock.c#4 edit .. //depot/projects/s390/sys/s390/s390/critical.c#2 edit .. //depot/projects/s390/sys/s390/s390/dat.h#4 edit .. //depot/projects/s390/sys/s390/s390/db_disasm.c#2 edit .. //depot/projects/s390/sys/s390/s390/db_hwatch.c#2 edit .. //depot/projects/s390/sys/s390/s390/db_interface.c#2 edit .. //depot/projects/s390/sys/s390/s390/db_trace.c#2 edit .. //depot/projects/s390/sys/s390/s390/dump_machdep.c#2 edit .. //depot/projects/s390/sys/s390/s390/ebcdic.c#2 edit .. //depot/projects/s390/sys/s390/s390/ebcdic.h#2 edit .. //depot/projects/s390/sys/s390/s390/elf_machdep.c#5 edit .. //depot/projects/s390/sys/s390/s390/esa.h#4 edit .. //depot/projects/s390/sys/s390/s390/exception.S#3 edit .. //depot/projects/s390/sys/s390/s390/external.c#3 edit .. //depot/projects/s390/sys/s390/s390/external.h#2 edit .. //depot/projects/s390/sys/s390/s390/genassym.c#4 edit .. //depot/projects/s390/sys/s390/s390/hhc.c#5 edit .. //depot/projects/s390/sys/s390/s390/hmcsc.c#8 edit .. //depot/projects/s390/sys/s390/s390/identcpu.c#5 edit .. //depot/projects/s390/sys/s390/s390/in6_cksum.S#2 edit .. //depot/projects/s390/sys/s390/s390/in_cksum.S#2 edit .. //depot/projects/s390/sys/s390/s390/iucv.c#2 edit .. //depot/projects/s390/sys/s390/s390/locore.S#4 edit .. //depot/projects/s390/sys/s390/s390/machdep.c#9 edit .. //depot/projects/s390/sys/s390/s390/mcheck.c#3 edit .. //depot/projects/s390/sys/s390/s390/mcheck.h#3 edit .. //depot/projects/s390/sys/s390/s390/mem.c#7 edit .. //depot/projects/s390/sys/s390/s390/mp_machdep.c#2 edit .. //depot/projects/s390/sys/s390/s390/per.h#2 edit .. //depot/projects/s390/sys/s390/s390/pmap.c#14 edit .. //depot/projects/s390/sys/s390/s390/service.c#2 edit .. //depot/projects/s390/sys/s390/s390/service.h#3 edit .. //depot/projects/s390/sys/s390/s390/skey.h#2 edit .. //depot/projects/s390/sys/s390/s390/support.S#3 edit .. //depot/projects/s390/sys/s390/s390/swtch.S#4 edit .. //depot/projects/s390/sys/s390/s390/sys_machdep.c#3 edit .. //depot/projects/s390/sys/s390/s390/trap.c#9 edit .. //depot/projects/s390/sys/s390/s390/trap.h#2 edit .. //depot/projects/s390/sys/s390/s390/vm_machdep.c#8 edit Differences ... ==== //depot/projects/s390/Makefile.inc1#16 (text+ko) ==== ==== //depot/projects/s390/contrib/gcc/config/s390/fixdfdi.h#2 (text+ko) ==== @@ -43,6 +43,7 @@ UDItype_x ll; }; +UDItype_x __fixunsdfdi (double a1); /* convert double to unsigned int */ UDItype_x @@ -114,6 +115,8 @@ UDItype_x ll; }; +DItype_x __fixdfdi (double a1); + /* convert double to int */ DItype_x __fixdfdi (double a1) @@ -184,6 +187,8 @@ USItype_x l; }; +UDItype_x __fixunssfdi (float a1); + /* convert float to unsigned int */ UDItype_x __fixunssfdi (float a1) @@ -250,6 +255,8 @@ USItype_x l; }; +DItype_x __fixsfdi (float a1); + /* convert double to int */ DItype_x __fixsfdi (float a1) ==== //depot/projects/s390/contrib/gcc/config/s390/freebsd.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* Definitions for IBM ESA/390 and ESAME running FreeBSD. +/* Definitions for FreeBSD for S/390. Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. Contributed by Hartmut Penner (hpenner@de.ibm.com) and Ulrich Weigand (uweigand@de.ibm.com). @@ -20,12 +20,16 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _FREEBSD_H +#define _FREEBSD_H + /* Target specific version string. */ +#ifdef DEFAULT_TARGET_64BIT #undef TARGET_VERSION -#ifdef DEFAULT_TARGET_64BIT #define TARGET_VERSION fprintf (stderr, " (FreeBSD for zSeries)"); #else +#undef TARGET_VERSION #define TARGET_VERSION fprintf (stderr, " (FreeBSD for S/390)"); #endif @@ -33,6 +37,7 @@ /* Target specific type definitions. */ /* ??? Do we really want long as size_t on 31-bit? */ +/* Answer is yes for FreeBSD. */ #undef SIZE_TYPE #define SIZE_TYPE (TARGET_64BIT ? "long unsigned int" : "unsigned int") #undef PTRDIFF_TYPE @@ -46,67 +51,54 @@ #undef DEFAULT_SIGNED_CHAR #define DEFAULT_SIGNED_CHAR 1 -/* Target specific preprocessor settings. */ - -#define NO_BUILTIN_SIZE_TYPE -#define NO_BUILTIN_PTRDIFF_TYPE - -#define CPP_CPU31_SPEC \ - "-D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int \ - -D__s390__" - -#define CPP_CPU64_SPEC \ - "-D__SIZE_TYPE__=long\\ unsigned\\ int -D__PTRDIFF_TYPE__=long\\ int \ - -D__s390__ -D__s390x__ -D__LONG_MAX__=9223372036854775807L" +/* Target specific assembler settings. */ #ifdef DEFAULT_TARGET_64BIT -#define CPP_CPU_SPEC "%{m31:%(cpp_cpu31)} %{!m31:%(cpp_cpu64)}" -#else -#define CPP_CPU_SPEC "%{m64:%(cpp_cpu64)} %{!m64:%(cpp_cpu31)}" -#endif - - -/* Target specific compiler settings. */ - -/* ??? -fcaller-saves sometimes doesn't work. Fix this! */ -#undef CC1_SPEC -#define CC1_SPEC "-fno-caller-saves" -#undef CC1PLUS_SPEC -#define CC1PLUS_SPEC "-fno-caller-saves" - -/* Target specific assembler settings. */ - #undef ASM_SPEC -#ifdef DEFAULT_TARGET_64BIT #define ASM_SPEC "%{m31:-m31 -Aesa}" #else +#undef ASM_SPEC #define ASM_SPEC "%{m64:-m64 -Aesame}" #endif /* Target specific linker settings. */ -#define LINK_CPU31_SPEC "-m elf_s390" +#ifdef DEFAULT_TARGET_64BIT +#define MULTILIB_DEFAULTS { "m64" } +#else +#define MULTILIB_DEFAULTS { "m31" } +#endif -#define LINK_CPU64_SPEC "-m elf64_s390" +#define LINK_ARCH31_SPEC \ + "-m elf_s390 \ + %{p:%nconsider using '-pg' instead of '-p' with gprof(1) } \ + %{Wl,*:%*} \ + %{v:-V} \ + %{assert*} %{R*} %{rpath*} %{defsym*} \ + %{shared:-Bshareable %{h*} %{soname*}} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ + %{!dynamic-linker:-dynamic-linker /libexec/ld-elf.so.1}} \ + %{static:-Bstatic}} \ + %{symbolic:-Bsymbolic}" -#define LINK_CPUCOMMON_SPEC "%{G*} %{relax:-relax} \ - %{p:%e`-p' not supported; use `-pg' and gprof(1)} \ - %{Wl,*:%*} \ - %{assert*} %{R*} %{rpath*} %{defsym*} \ - %{shared:-Bshareable %{h*} %{soname*}} \ - %{symbolic:-Bsymbolic} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /usr/libexec/ld-elf.so.1}} \ - %{static:-Bstatic}}" +#define LINK_ARCH64_SPEC \ + "-m elf64_s390 \ + %{shared:-shared} \ + %{!shared: \ + %{static:-static} \ + %{!static: \ + %{rdynamic:-export-dynamic} \ + %{!dynamic-linker:-dynamic-linker /lib/ld64.so.1}}}" +#ifdef DEFAULT_TARGET_64BIT #undef LINK_SPEC -#ifdef DEFAULT_TARGET_64BIT -#define LINK_SPEC "%{m31:%(link_cpu31)} %{!m31:%(link_cpu64)} %(link_cpucommon)" +#define LINK_SPEC "%{m31:%(link_arch31)} %{!m31:%(link_arch64)}" #else -#define LINK_SPEC "%{m64:%(link_cpu64)} %{!m64:%(link_cpu31)} %(link_cpucommon)" +#undef LINK_SPEC +#define LINK_SPEC "%{m64:%(link_arch64)} %{!m64:%(link_arch31)}" #endif @@ -115,174 +107,93 @@ is an initializer with a subgrouping for each command option. */ #define EXTRA_SPECS \ - { "cpp_cpu31", CPP_CPU31_SPEC }, \ - { "cpp_cpu64", CPP_CPU64_SPEC }, \ - { "cpp_cpu", CPP_CPU_SPEC }, \ - { "link_cpu31", LINK_CPU31_SPEC }, \ - { "link_cpu64", LINK_CPU64_SPEC }, \ - { "link_cpucommon", LINK_CPUCOMMON_SPEC }, \ + { "link_arch31", LINK_ARCH31_SPEC }, \ + { "link_arch64", LINK_ARCH64_SPEC }, \ - -/* Character to start a comment. */ +#undef ASM_COMMENT_START #define ASM_COMMENT_START "#" -#undef ASM_APP_ON +#undef ASM_APP_ON #define ASM_APP_ON "#APP\n" - -#undef ASM_APP_OFF +#undef ASM_APP_OFF #define ASM_APP_OFF "#NO_APP\n" -/* Assembler pseudos to introduce constants of various size. */ -#define ASM_DOUBLE "\t.double" +/* Do code reading to identify a signal frame, and set the frame + state data appropriately. See unwind-dw2.c for the structs. */ -/* The LOCAL_LABEL_PREFIX variable is used by dbxelf.h. */ -#define LOCAL_LABEL_PREFIX "." +#define MD_FALLBACK_FRAME_STATE_FOR(CONTEXT, FS, SUCCESS) \ + do { \ + unsigned char *pc_ = (CONTEXT)->ra; \ + long new_cfa_; \ + int i_; \ + \ + typedef struct \ + { \ + unsigned long psw_mask; \ + unsigned long psw_addr; \ + unsigned long gprs[16]; \ + unsigned int acrs[16]; \ + unsigned int fpc; \ + unsigned int __pad; \ + double fprs[16]; \ + } __attribute__ ((__aligned__ (8))) sigregs_; \ + \ + sigregs_ *regs_; \ + \ + /* svc $__NR_sigreturn or svc $__NR_rt_sigreturn */ \ + if (pc_[0] != 0x0a || (pc_[1] != 119 && pc_[1] != 173)) \ + break; \ + \ + /* New-style RT frame: \ + retcode + alignment (8 bytes) \ + siginfo (128 bytes) \ + ucontext (contains sigregs) */ \ + if ((CONTEXT)->ra == (CONTEXT)->cfa) \ + { \ + struct ucontext_ \ + { \ + unsigned long uc_flags; \ + struct ucontext_ *uc_link; \ + unsigned long uc_stack[3]; \ + sigregs_ uc_mcontext; \ + } *uc_ = (CONTEXT)->cfa + 8 + 128; \ + \ + regs_ = &uc_->uc_mcontext; \ + } \ + \ + /* Old-style RT frame and all non-RT frames: \ + old signal mask (8 bytes) \ + pointer to sigregs */ \ + else \ + { \ + regs_ = *(sigregs_ **)((CONTEXT)->cfa + 8); \ + } \ + \ + new_cfa_ = regs_->gprs[15] + 16*sizeof(long) + 32; \ + (FS)->cfa_how = CFA_REG_OFFSET; \ + (FS)->cfa_reg = 15; \ + (FS)->cfa_offset = \ + new_cfa_ - (long) (CONTEXT)->cfa + 16*sizeof(long) + 32; \ + \ + for (i_ = 0; i_ < 16; i_++) \ + { \ + (FS)->regs.reg[i_].how = REG_SAVED_OFFSET; \ + (FS)->regs.reg[i_].loc.offset = \ + (long)®s_->gprs[i_] - new_cfa_; \ + } \ + for (i_ = 0; i_ < 16; i_++) \ + { \ + (FS)->regs.reg[16+i_].how = REG_SAVED_OFFSET; \ + (FS)->regs.reg[16+i_].loc.offset = \ + (long)®s_->fprs[i_] - new_cfa_; \ + } \ + \ + /* Load return addr from PSW into dummy register 32. */ \ + (FS)->regs.reg[32].how = REG_SAVED_OFFSET; \ + (FS)->regs.reg[32].loc.offset = (long)®s_->psw_addr - new_cfa_; \ + (FS)->retaddr_column = 32; \ + \ + goto SUCCESS; \ + } while (0) -/* Prefix for internally generated assembler labels. */ -#define LPREFIX ".L" - - -/* This is how to output the definition of a user-level label named NAME, - such as the label on a static function or variable NAME. */ -#undef ASM_OUTPUT_LABEL -#define ASM_OUTPUT_LABEL(FILE, NAME) \ - (assemble_name (FILE, NAME), fputs (":\n", FILE)) - -/* Store in OUTPUT a string (made with alloca) containing - an assembler-name for a local static variable named NAME. - LABELNO is an integer which is different for each call. */ -#undef ASM_FORMAT_PRIVATE_NAME -#define ASM_FORMAT_PRIVATE_NAME(OUTPUT, NAME, LABELNO) \ -( (OUTPUT) = (char *) alloca (strlen ((NAME)) + 10), \ - sprintf ((OUTPUT), "%s.%d", (NAME), (LABELNO))) - - -/* internal macro to output long */ -#define _ASM_OUTPUT_LONG(FILE, VALUE) \ - fprintf (FILE, "\t.long\t0x%lX\n", VALUE); - - -/* This is how to output an element of a case-vector that is absolute. */ -#define ASM_OUTPUT_ADDR_VEC_ELT(FILE, VALUE) \ - fprintf (FILE, "%s%s%d\n", integer_asm_op (UNITS_PER_WORD, TRUE), \ - LPREFIX, VALUE) - -/* This is how to output an element of a case-vector that is relative. */ -#define ASM_OUTPUT_ADDR_DIFF_ELT(FILE, BODY, VALUE, REL) \ - fprintf (FILE, "%s%s%d-%s%d\n", integer_asm_op (UNITS_PER_WORD, TRUE), \ - LPREFIX, VALUE, LPREFIX, REL) - - - -/* This is how to output an assembler line - that says to advance the location counter - to a multiple of 2**LOG bytes. */ -#undef ASM_OUTPUT_ALIGN -#define ASM_OUTPUT_ALIGN(FILE, LOG) \ - if ((LOG)!=0) fprintf ((FILE), "\t.align\t%d\n", 1<<(LOG)) - -/* This is how to output an assembler line - that says to advance the location counter by SIZE bytes. */ -#undef ASM_OUTPUT_SKIP -#define ASM_OUTPUT_SKIP(FILE, SIZE) \ - fprintf ((FILE), "\t.set\t.,.+%u\n", (SIZE)) - -/* This is how to output assembler code to declare an - uninitialized external linkage data object. */ -#undef ASM_OUTPUT_ALIGNED_BSS -#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \ - asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN) - -/* Output before read-only data. */ -#define TEXT_SECTION_ASM_OP ".text" - -/* Output before writable (initialized) data. */ -#define DATA_SECTION_ASM_OP ".data" - -/* Output before writable (uninitialized) data. */ -#define BSS_SECTION_ASM_OP ".bss" - -/* This is how to output a command to make the user-level label named NAME - defined for reference from other files. */ -#define ASM_GLOBALIZE_LABEL(FILE, NAME) \ - (fputs (".globl ", FILE), assemble_name (FILE, NAME), fputs ("\n", FILE)) - -/* Select section for constant in constant pool. - We are in the right section. - undef for 64 bit mode (linux64.h). - */ -#undef SELECT_RTX_SECTION -#define SELECT_RTX_SECTION(MODE, X, ALIGN) - - -/* Output code to add DELTA to the first argument, and then jump to FUNCTION. - Used for C++ multiple inheritance. */ -#define ASM_OUTPUT_MI_THUNK(FILE, THUNK_FNDECL, DELTA, FUNCTION) \ -do { \ - if (TARGET_64BIT) \ - { \ - if (flag_pic) \ - { \ - fprintf (FILE, "\tlarl 1,0f\n"); \ - fprintf (FILE, "\tagf %d,0(1)\n", \ - aggregate_value_p (TREE_TYPE \ - (TREE_TYPE (FUNCTION))) ? 3 :2 ); \ - fprintf (FILE, "\tlarl 1,"); \ - assemble_name (FILE, XSTR (XEXP (DECL_RTL (FUNCTION), 0), 0)); \ - fprintf (FILE, "@GOTENT\n"); \ - fprintf (FILE, "\tlg 1,0(1)\n"); \ - fprintf (FILE, "\tbr 1\n"); \ - fprintf (FILE, "0:\t.long "); \ - fprintf (FILE, HOST_WIDE_INT_PRINT_DEC, (DELTA)); \ - fprintf (FILE, "\n"); \ - } \ - else \ - { \ - fprintf (FILE, "\tlarl 1,0f\n"); \ - fprintf (FILE, "\tagf %d,0(1)\n", \ - aggregate_value_p (TREE_TYPE \ - (TREE_TYPE (FUNCTION))) ? 3 :2 ); \ - fprintf (FILE, "\tjg "); \ - assemble_name (FILE, XSTR (XEXP (DECL_RTL (FUNCTION), 0), 0)); \ - fprintf (FILE, "\n"); \ - fprintf (FILE, "0:\t.long "); \ - fprintf (FILE, HOST_WIDE_INT_PRINT_DEC, (DELTA)); \ - fprintf (FILE, "\n"); \ - } \ - } \ - else \ - { \ - if (flag_pic) \ - { \ - fprintf (FILE, "\tbras 1,0f\n"); \ - fprintf (FILE, "\t.long _GLOBAL_OFFSET_TABLE_-.\n"); \ - fprintf (FILE, "\t.long "); \ - assemble_name (FILE, XSTR (XEXP (DECL_RTL (FUNCTION), 0), 0)); \ - fprintf (FILE, "@GOT\n"); \ - fprintf (FILE, "\t.long "); \ - fprintf (FILE, HOST_WIDE_INT_PRINT_DEC, (DELTA)); \ - fprintf (FILE, "\n"); \ - fprintf (FILE, "0:\tal %d,8(1)\n", \ - aggregate_value_p (TREE_TYPE \ - (TREE_TYPE (FUNCTION))) ? 3 : 2 ); \ - fprintf (FILE, "\tl 0,4(1)\n"); \ - fprintf (FILE, "\tal 1,0(1)\n"); \ - fprintf (FILE, "\talr 1,0\n"); \ - fprintf (FILE, "\tl 1,0(1)\n"); \ - fprintf (FILE, "\tbr 1\n"); \ - } else { \ - fprintf (FILE, "\tbras 1,0f\n"); \ - fprintf (FILE, "\t.long "); \ - assemble_name (FILE, XSTR (XEXP (DECL_RTL (FUNCTION), 0), 0)); \ - fprintf (FILE, "-.\n"); \ - fprintf (FILE, "\t.long "); \ - fprintf (FILE, HOST_WIDE_INT_PRINT_DEC, (DELTA)); \ - fprintf (FILE, "\n"); \ - fprintf (FILE, "0:\tal %d,4(1)\n", \ - aggregate_value_p (TREE_TYPE \ - (TREE_TYPE (FUNCTION))) ? 3 : 2 ); \ - fprintf (FILE, "\tal 1,0(1)\n"); \ - fprintf (FILE, "\tbr 1\n"); \ - } \ - } \ -} while (0) +#endif ==== //depot/projects/s390/contrib/gcc/config/s390/libgcc-glibc.ver#2 (text+ko) ==== @@ -8,6 +8,25 @@ # because GLIBC_2.0 does not exist on this architecture, as the first # ever glibc release on the platform was GLIBC_2.2. +%ifndef __s390x__ +%inherit GCC_3.0 GLIBC_2.0 +GLIBC_2.0 { + __divdi3 + __moddi3 + __udivdi3 + __umoddi3 + + __register_frame + __register_frame_table + __deregister_frame + __register_frame_info + __deregister_frame_info + __frame_state_for + __register_frame_info_table +} +%endif + +%ifdef __s390x__ %inherit GCC_3.0 GLIBC_2.2 GLIBC_2.2 { __register_frame @@ -18,4 +37,5 @@ __frame_state_for __register_frame_info_table } +%endif ==== //depot/projects/s390/contrib/gcc/config/s390/linux.h#2 (text+ko) ==== @@ -50,37 +50,24 @@ /* Target specific preprocessor settings. */ -#define NO_BUILTIN_SIZE_TYPE -#define NO_BUILTIN_PTRDIFF_TYPE - -#define CPP_PREDEFINES \ - "-Dunix -Asystem(unix) -D__gnu_linux__ -Dlinux -Asystem(linux) -D__ELF__ \ - -Acpu(s390) -Amachine(s390) -D__s390__" - -#define CPP_ARCH31_SPEC \ - "-D__SIZE_TYPE__=long\\ unsigned\\ int -D__PTRDIFF_TYPE__=int" -#define CPP_ARCH64_SPEC \ - "-D__SIZE_TYPE__=long\\ unsigned\\ int -D__PTRDIFF_TYPE__=long\\ int \ - -D__s390x__ -D__LONG_MAX__=9223372036854775807L" +#define TARGET_OS_CPP_BUILTINS() \ + do \ + { \ + builtin_define_std ("linux"); \ + builtin_define_std ("unix"); \ + builtin_assert ("system=linux"); \ + builtin_assert ("system=unix"); \ + builtin_define ("__ELF__"); \ + builtin_define ("__gnu_linux__"); \ + if (flag_pic) \ + { \ + builtin_define ("__PIC__"); \ + builtin_define ("__pic__"); \ + } \ + } \ + while (0) -#ifdef DEFAULT_TARGET_64BIT -#undef CPP_SPEC -#define CPP_SPEC "%{m31:%(cpp_arch31)} %{!m31:%(cpp_arch64)}" -#else -#undef CPP_SPEC -#define CPP_SPEC "%{m64:%(cpp_arch64)} %{!m64:%(cpp_arch31)}" -#endif - - -/* Target specific compiler settings. */ -/* ??? -fcaller-saves sometimes doesn't work. Fix this! */ -#undef CC1_SPEC -#define CC1_SPEC "-fno-caller-saves" -#undef CC1PLUS_SPEC -#define CC1PLUS_SPEC "-fno-caller-saves" - - /* Target specific assembler settings. */ #ifdef DEFAULT_TARGET_64BIT @@ -94,6 +81,12 @@ /* Target specific linker settings. */ +#ifdef DEFAULT_TARGET_64BIT +#define MULTILIB_DEFAULTS { "m64" } +#else +#define MULTILIB_DEFAULTS { "m31" } +#endif + #define LINK_ARCH31_SPEC \ "-m elf_s390 \ %{shared:-shared} \ @@ -126,183 +119,86 @@ is an initializer with a subgrouping for each command option. */ #define EXTRA_SPECS \ - { "cpp_arch31", CPP_ARCH31_SPEC }, \ - { "cpp_arch64", CPP_ARCH64_SPEC }, \ { "link_arch31", LINK_ARCH31_SPEC }, \ { "link_arch64", LINK_ARCH64_SPEC }, \ -/* Character to start a comment. */ +/* Do code reading to identify a signal frame, and set the frame + state data appropriately. See unwind-dw2.c for the structs. */ -#define ASM_COMMENT_START "#" - - -/* Assembler pseudos to introduce constants of various size. */ - -#define ASM_DOUBLE "\t.double" - -/* The LOCAL_LABEL_PREFIX variable is used by dbxelf.h. */ -#define LOCAL_LABEL_PREFIX "." - -/* Prefix for internally generated assembler labels. */ -#define LPREFIX ".L" - - -/* This is how to output the definition of a user-level label named NAME, - such as the label on a static function or variable NAME. */ - -#undef ASM_OUTPUT_LABEL -#define ASM_OUTPUT_LABEL(FILE, NAME) \ - (assemble_name (FILE, NAME), fputs (":\n", FILE)) - -/* Store in OUTPUT a string (made with alloca) containing - an assembler-name for a local static variable named NAME. - LABELNO is an integer which is different for each call. */ - -#undef ASM_FORMAT_PRIVATE_NAME -#define ASM_FORMAT_PRIVATE_NAME(OUTPUT, NAME, LABELNO) \ -( (OUTPUT) = (char *) alloca (strlen ((NAME)) + 10), \ - sprintf ((OUTPUT), "%s.%d", (NAME), (LABELNO))) - - - /* internal macro to output long */ -#define _ASM_OUTPUT_LONG(FILE, VALUE) \ - fprintf (FILE, "\t.long\t0x%lX\n", VALUE); - - -/* This is how to output an element of a case-vector that is absolute. */ - -#define ASM_OUTPUT_ADDR_VEC_ELT(FILE, VALUE) \ - fprintf (FILE, "%s%s%d\n", integer_asm_op (UNITS_PER_WORD, TRUE), \ - LPREFIX, VALUE) - -/* This is how to output an element of a case-vector that is relative. */ - -#define ASM_OUTPUT_ADDR_DIFF_ELT(FILE, BODY, VALUE, REL) \ - fprintf (FILE, "%s%s%d-%s%d\n", integer_asm_op (UNITS_PER_WORD, TRUE), \ - LPREFIX, VALUE, LPREFIX, REL) - - - -/* This is how to output an assembler line - that says to advance the location counter - to a multiple of 2**LOG bytes. */ - -#undef ASM_OUTPUT_ALIGN -#define ASM_OUTPUT_ALIGN(FILE, LOG) \ - if ((LOG)!=0) fprintf ((FILE), "\t.align\t%d\n", 1<<(LOG)) - -/* This is how to output an assembler line - that says to advance the location counter by SIZE bytes. */ - -#undef ASM_OUTPUT_SKIP -#define ASM_OUTPUT_SKIP(FILE, SIZE) \ - fprintf ((FILE), "\t.set\t.,.+%u\n", (SIZE)) - -/* This is how to output assembler code to declare an - uninitialized external linkage data object. */ - -#undef ASM_OUTPUT_ALIGNED_BSS -#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \ - asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN) - -/* Output before read-only data. */ - -#define TEXT_SECTION_ASM_OP ".text" - -/* Output before writable (initialized) data. */ - -#define DATA_SECTION_ASM_OP ".data" - -/* Output before writable (uninitialized) data. */ - -#define BSS_SECTION_ASM_OP ".bss" - -/* This is how to output a command to make the user-level label named NAME - defined for reference from other files. */ - -#define ASM_GLOBALIZE_LABEL(FILE, NAME) \ - (fputs (".globl ", FILE), assemble_name (FILE, NAME), fputs ("\n", FILE)) - -/* Select section for constant in constant pool. - We are in the right section. - undef for 64 bit mode (linux64.h). - */ - -#undef SELECT_RTX_SECTION -#define SELECT_RTX_SECTION(MODE, X, ALIGN) - - -/* Output code to add DELTA to the first argument, and then jump to FUNCTION. - Used for C++ multiple inheritance. */ -#define ASM_OUTPUT_MI_THUNK(FILE, THUNK_FNDECL, DELTA, FUNCTION) \ -do { \ - if (TARGET_64BIT) \ - { \ - if (flag_pic) \ - { \ - fprintf (FILE, "\tlarl 1,0f\n"); \ - fprintf (FILE, "\tagf %d,0(1)\n", \ - aggregate_value_p (TREE_TYPE \ - (TREE_TYPE (FUNCTION))) ? 3 :2 ); \ - fprintf (FILE, "\tlarl 1,"); \ - assemble_name (FILE, XSTR (XEXP (DECL_RTL (FUNCTION), 0), 0)); \ - fprintf (FILE, "@GOTENT\n"); \ - fprintf (FILE, "\tlg 1,0(1)\n"); \ - fprintf (FILE, "\tbr 1\n"); \ - fprintf (FILE, "0:\t.long "); \ - fprintf (FILE, HOST_WIDE_INT_PRINT_DEC, (DELTA)); \ - fprintf (FILE, "\n"); \ - } \ - else \ - { \ - fprintf (FILE, "\tlarl 1,0f\n"); \ - fprintf (FILE, "\tagf %d,0(1)\n", \ - aggregate_value_p (TREE_TYPE \ - (TREE_TYPE (FUNCTION))) ? 3 :2 ); \ - fprintf (FILE, "\tjg "); \ - assemble_name (FILE, XSTR (XEXP (DECL_RTL (FUNCTION), 0), 0)); \ - fprintf (FILE, "\n"); \ - fprintf (FILE, "0:\t.long "); \ - fprintf (FILE, HOST_WIDE_INT_PRINT_DEC, (DELTA)); \ - fprintf (FILE, "\n"); \ - } \ - } \ - else \ - { \ - if (flag_pic) \ - { \ - fprintf (FILE, "\tbras 1,0f\n"); \ - fprintf (FILE, "\t.long _GLOBAL_OFFSET_TABLE_-.\n"); \ - fprintf (FILE, "\t.long "); \ - assemble_name (FILE, XSTR (XEXP (DECL_RTL (FUNCTION), 0), 0)); \ - fprintf (FILE, "@GOT\n"); \ - fprintf (FILE, "\t.long "); \ - fprintf (FILE, HOST_WIDE_INT_PRINT_DEC, (DELTA)); \ - fprintf (FILE, "\n"); \ - fprintf (FILE, "0:\tal %d,8(1)\n", \ - aggregate_value_p (TREE_TYPE \ - (TREE_TYPE (FUNCTION))) ? 3 : 2 ); \ - fprintf (FILE, "\tl 0,4(1)\n"); \ - fprintf (FILE, "\tal 1,0(1)\n"); \ - fprintf (FILE, "\talr 1,0\n"); \ - fprintf (FILE, "\tl 1,0(1)\n"); \ - fprintf (FILE, "\tbr 1\n"); \ - } else { \ - fprintf (FILE, "\tbras 1,0f\n"); \ - fprintf (FILE, "\t.long "); \ - assemble_name (FILE, XSTR (XEXP (DECL_RTL (FUNCTION), 0), 0)); \ - fprintf (FILE, "-.\n"); \ - fprintf (FILE, "\t.long "); \ - fprintf (FILE, HOST_WIDE_INT_PRINT_DEC, (DELTA)); \ - fprintf (FILE, "\n"); \ - fprintf (FILE, "0:\tal %d,4(1)\n", \ - aggregate_value_p (TREE_TYPE \ - (TREE_TYPE (FUNCTION))) ? 3 : 2 ); \ - fprintf (FILE, "\tal 1,0(1)\n"); \ - fprintf (FILE, "\tbr 1\n"); \ - } \ - } \ -} while (0) +#define MD_FALLBACK_FRAME_STATE_FOR(CONTEXT, FS, SUCCESS) \ + do { \ + unsigned char *pc_ = (CONTEXT)->ra; \ + long new_cfa_; \ + int i_; \ + \ + typedef struct \ + { \ + unsigned long psw_mask; \ + unsigned long psw_addr; \ + unsigned long gprs[16]; \ + unsigned int acrs[16]; \ + unsigned int fpc; \ + unsigned int __pad; \ + double fprs[16]; \ + } __attribute__ ((__aligned__ (8))) sigregs_; \ + \ + sigregs_ *regs_; \ + \ + /* svc $__NR_sigreturn or svc $__NR_rt_sigreturn */ \ + if (pc_[0] != 0x0a || (pc_[1] != 119 && pc_[1] != 173)) \ + break; \ + \ + /* New-style RT frame: \ + retcode + alignment (8 bytes) \ + siginfo (128 bytes) \ + ucontext (contains sigregs) */ \ + if ((CONTEXT)->ra == (CONTEXT)->cfa) \ + { \ + struct ucontext_ \ + { \ + unsigned long uc_flags; \ + struct ucontext_ *uc_link; \ + unsigned long uc_stack[3]; \ + sigregs_ uc_mcontext; \ + } *uc_ = (CONTEXT)->cfa + 8 + 128; \ + \ + regs_ = &uc_->uc_mcontext; \ + } \ + \ + /* Old-style RT frame and all non-RT frames: \ + old signal mask (8 bytes) \ + pointer to sigregs */ \ + else \ + { \ + regs_ = *(sigregs_ **)((CONTEXT)->cfa + 8); \ + } \ + \ + new_cfa_ = regs_->gprs[15] + 16*sizeof(long) + 32; \ + (FS)->cfa_how = CFA_REG_OFFSET; \ + (FS)->cfa_reg = 15; \ + (FS)->cfa_offset = \ + new_cfa_ - (long) (CONTEXT)->cfa + 16*sizeof(long) + 32; \ + \ + for (i_ = 0; i_ < 16; i_++) \ + { \ + (FS)->regs.reg[i_].how = REG_SAVED_OFFSET; \ + (FS)->regs.reg[i_].loc.offset = \ + (long)®s_->gprs[i_] - new_cfa_; \ + } \ + for (i_ = 0; i_ < 16; i_++) \ + { \ + (FS)->regs.reg[16+i_].how = REG_SAVED_OFFSET; \ + (FS)->regs.reg[16+i_].loc.offset = \ + (long)®s_->fprs[i_] - new_cfa_; \ + } \ + \ + /* Load return addr from PSW into dummy register 32. */ \ + (FS)->regs.reg[32].how = REG_SAVED_OFFSET; \ + (FS)->regs.reg[32].loc.offset = (long)®s_->psw_addr - new_cfa_; \ + (FS)->retaddr_column = 32; \ + \ + goto SUCCESS; \ + } while (0) #endif ==== //depot/projects/s390/contrib/gcc/config/s390/s390-protos.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* Definitions of target machine for GNU compiler, for IBM S/390. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. Contributed by Hartmut Penner (hpenner@de.ibm.com) This file is part of GNU CC. @@ -24,17 +24,16 @@ extern void optimization_options PARAMS ((int, int)); extern void override_options PARAMS ((void)); extern int s390_arg_frame_offset PARAMS ((void)); -extern void s390_function_prologue PARAMS ((FILE *, HOST_WIDE_INT)); -extern void s390_function_epilogue PARAMS ((FILE *, HOST_WIDE_INT)); extern void s390_emit_prologue PARAMS ((void)); extern void s390_emit_epilogue PARAMS ((void)); extern void s390_function_profiler PARAMS ((FILE *, int)); #ifdef RTX_CODE +extern int s390_address_cost PARAMS ((rtx)); +extern int q_constraint PARAMS ((rtx)); extern int const0_operand PARAMS ((rtx, enum machine_mode)); extern int consttable_operand PARAMS ((rtx, enum machine_mode)); extern int larl_operand PARAMS ((rtx, enum machine_mode)); -extern int fp_operand PARAMS ((rtx, enum machine_mode)); extern int s_operand PARAMS ((rtx, enum machine_mode)); extern int s_imm_operand PARAMS ((rtx, enum machine_mode)); extern int bras_sym_operand PARAMS ((rtx, enum machine_mode)); @@ -44,12 +43,17 @@ extern int s390_extract_hi PARAMS ((rtx, enum machine_mode, int)); extern int s390_single_qi PARAMS ((rtx, enum machine_mode, int)); extern int s390_extract_qi PARAMS ((rtx, enum machine_mode, int)); +extern bool s390_split_ok_p PARAMS ((rtx, rtx, enum machine_mode, int)); +extern int tls_symbolic_operand PARAMS ((rtx)); extern int s390_match_ccmode PARAMS ((rtx, enum machine_mode)); +extern enum machine_mode s390_tm_ccmode PARAMS ((rtx, rtx, int)); extern enum machine_mode s390_select_ccmode PARAMS ((enum rtx_code, rtx, rtx)); extern int symbolic_reference_mentioned_p PARAMS ((rtx)); +extern int tls_symbolic_reference_mentioned_p PARAMS ((rtx)); +extern rtx s390_tls_get_offset PARAMS ((void)); extern int legitimate_la_operand_p PARAMS ((rtx)); -extern rtx legitimize_la_operand PARAMS ((rtx)); +extern int preferred_la_operand_p PARAMS ((rtx)); extern int legitimate_pic_operand_p PARAMS ((rtx)); extern int legitimate_constant_p PARAMS ((rtx)); extern int legitimate_reload_constant_p PARAMS ((rtx)); @@ -58,18 +62,25 @@ extern rtx legitimize_address PARAMS ((rtx, rtx, enum machine_mode)); extern enum reg_class s390_preferred_reload_class PARAMS ((rtx, enum reg_class)); extern enum reg_class s390_secondary_input_reload_class PARAMS ((enum reg_class, enum machine_mode, rtx)); +extern enum reg_class s390_secondary_output_reload_class PARAMS ((enum reg_class, enum machine_mode, rtx)); extern int s390_plus_operand PARAMS ((rtx, enum machine_mode)); extern void s390_expand_plus_operand PARAMS ((rtx, rtx, rtx)); -extern void emit_pic_move PARAMS ((rtx *, enum machine_mode)); +extern void emit_symbolic_move PARAMS ((rtx *)); +extern void s390_load_address PARAMS ((rtx, rtx)); +extern void s390_expand_movstr PARAMS ((rtx, rtx, rtx)); +extern void s390_expand_clrstr PARAMS ((rtx, rtx)); +extern void s390_expand_cmpstr PARAMS ((rtx, rtx, rtx, rtx)); +extern rtx s390_return_addr_rtx PARAMS ((int, rtx)); extern void s390_output_symbolic_const PARAMS ((FILE *, rtx)); extern void print_operand_address PARAMS ((FILE *, rtx)); extern void print_operand PARAMS ((FILE *, rtx, int)); -extern void s390_output_constant_pool PARAMS ((FILE *)); +extern void s390_output_constant_pool PARAMS ((rtx, rtx)); extern void s390_trampoline_template PARAMS ((FILE *)); extern void s390_initialize_trampoline PARAMS ((rtx, rtx, rtx)); extern rtx s390_gen_rtx_const_DI PARAMS ((int, int)); extern rtx s390_simplify_dwarf_addr PARAMS ((rtx)); +extern void s390_machine_dependent_reorg PARAMS ((rtx)); #endif /* RTX_CODE */ #ifdef TREE_CODE @@ -78,7 +89,7 @@ extern tree s390_build_va_list PARAMS ((void)); #ifdef RTX_CODE extern rtx s390_function_arg PARAMS ((CUMULATIVE_ARGS *, enum machine_mode, tree, int)); -extern void s390_va_start PARAMS ((int, tree, rtx)); +extern void s390_va_start PARAMS ((tree, rtx)); extern rtx s390_va_arg PARAMS ((tree, tree)); #endif /* RTX_CODE */ #endif /* TREE_CODE */ ==== //depot/projects/s390/contrib/gcc/config/s390/s390.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* Subroutines used for code generation on IBM S/390 and zSeries - Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Hartmut Penner (hpenner@de.ibm.com) and Ulrich Weigand (uweigand@de.ibm.com). @@ -45,11 +45,22 @@ #include "target.h" #include "target-def.h" #include "debug.h" +#include "langhooks.h" +#include "optabs.h" - static bool s390_assemble_integer PARAMS ((rtx, unsigned int, int)); static int s390_adjust_cost PARAMS ((rtx, rtx, rtx, int)); static int s390_adjust_priority PARAMS ((rtx, int)); +static void s390_select_rtx_section PARAMS ((enum machine_mode, rtx, + unsigned HOST_WIDE_INT)); +static void s390_encode_section_info PARAMS ((tree, int)); +static const char *s390_strip_name_encoding PARAMS ((const char *)); +static bool s390_cannot_force_const_mem PARAMS ((rtx)); +static void s390_init_builtins PARAMS ((void)); +static rtx s390_expand_builtin PARAMS ((tree, rtx, rtx, + enum machine_mode, int)); +static void s390_output_mi_thunk PARAMS ((FILE *, tree, HOST_WIDE_INT, + HOST_WIDE_INT, tree)); #undef TARGET_ASM_ALIGNED_HI_OP #define TARGET_ASM_ALIGNED_HI_OP "\t.word\t" @@ -58,24 +69,43 @@ #undef TARGET_ASM_INTEGER #define TARGET_ASM_INTEGER s390_assemble_integer -#undef TARGET_ASM_FUNCTION_PROLOGUE -#define TARGET_ASM_FUNCTION_PROLOGUE s390_function_prologue - -#undef TARGET_ASM_FUNCTION_EPILOGUE -#define TARGET_ASM_FUNCTION_EPILOGUE s390_function_epilogue - #undef TARGET_ASM_OPEN_PAREN #define TARGET_ASM_OPEN_PAREN "" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 11 06:06:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A635B16A4C1; Thu, 11 Sep 2003 06:06:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7318116A4BF for ; Thu, 11 Sep 2003 06:06:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0D3D43FA3 for ; Thu, 11 Sep 2003 06:06:34 -0700 (PDT) (envelope-from tzukanov@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BD6Y0U000756 for ; Thu, 11 Sep 2003 06:06:34 -0700 (PDT) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BD6PFE000753 for perforce@freebsd.org; Thu, 11 Sep 2003 06:06:25 -0700 (PDT) Date: Thu, 11 Sep 2003 06:06:25 -0700 (PDT) Message-Id: <200309111306.h8BD6PFE000753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov To: Perforce Change Reviews Subject: PERFORCE change 37914 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 13:06:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=37914 Change 37914 by tzukanov@tzukanov_antares on 2003/09/11 06:05:40 IFC. Affected files ... .. //depot/projects/s390/Makefile.inc1#17 integrate .. //depot/projects/s390/bin/ps/ps.1#7 integrate .. //depot/projects/s390/bin/sh/arith.h#3 integrate .. //depot/projects/s390/bin/sh/arith.y#4 integrate .. //depot/projects/s390/bin/sh/arith_lex.l#4 integrate .. //depot/projects/s390/bin/sh/sh.1#8 integrate .. //depot/projects/s390/bin/sh/shell.h#4 integrate .. //depot/projects/s390/bin/test/Makefile#2 integrate .. //depot/projects/s390/contrib/gcc/config/freebsd-spec.h#5 integrate .. //depot/projects/s390/contrib/groff/src/devices/grotty/grotty.man#4 integrate .. //depot/projects/s390/contrib/groff/tmac/eqnrc#3 integrate .. //depot/projects/s390/contrib/groff/tmac/troffrc#6 integrate .. //depot/projects/s390/contrib/groff/tmac/tty-char.tmac#5 integrate .. //depot/projects/s390/contrib/groff/tmac/tty.tmac#4 integrate .. //depot/projects/s390/contrib/isc-dhcp/client/scripts/freebsd#4 integrate .. //depot/projects/s390/etc/defaults/pccard.conf#9 integrate .. //depot/projects/s390/etc/devd.conf#5 integrate .. //depot/projects/s390/etc/etc.ia64/ttys#2 integrate .. //depot/projects/s390/etc/etc.sparc64/ttys#4 integrate .. //depot/projects/s390/etc/gettytab#2 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/gdb/Makefile#5 integrate .. //depot/projects/s390/gnu/usr.bin/cvs/cvsbug/Makefile#3 integrate .. //depot/projects/s390/gnu/usr.bin/cvs/lib/Makefile#3 integrate .. //depot/projects/s390/gnu/usr.bin/groff/font/devkoi8-r/R.proto#2 integrate .. //depot/projects/s390/gnu/usr.bin/groff/tmac/Makefile#7 integrate .. //depot/projects/s390/gnu/usr.bin/groff/tmac/fr.ISO8859-1#2 integrate .. //depot/projects/s390/gnu/usr.bin/groff/tmac/koi8-r.tmac#1 branch .. //depot/projects/s390/gnu/usr.bin/groff/tmac/ru.KOI8-R#3 integrate .. //depot/projects/s390/gnu/usr.bin/man/manpath/manpath.config#3 integrate .. //depot/projects/s390/gnu/usr.bin/send-pr/Makefile#3 integrate .. //depot/projects/s390/gnu/usr.bin/tar/config.h#3 integrate .. //depot/projects/s390/include/pthread.h#5 integrate .. //depot/projects/s390/lib/libalias/alias_db.c#4 integrate .. //depot/projects/s390/lib/libalias/libalias.3#3 integrate .. //depot/projects/s390/lib/libc/amd64/sys/Makefile.inc#3 integrate .. //depot/projects/s390/lib/libc/amd64/sys/getcontext.S#1 branch .. //depot/projects/s390/lib/libc/amd64/sys/vfork.S#2 integrate .. //depot/projects/s390/lib/libc/compat-43/sigvec.2#4 integrate .. //depot/projects/s390/lib/libc/db/man/btree.3#3 integrate .. //depot/projects/s390/lib/libc/db/man/dbm.3#3 integrate .. //depot/projects/s390/lib/libc/db/man/dbopen.3#4 integrate .. //depot/projects/s390/lib/libc/db/man/hash.3#3 integrate .. //depot/projects/s390/lib/libc/db/man/recno.3#2 integrate .. //depot/projects/s390/lib/libc/gen/confstr.3#2 integrate .. //depot/projects/s390/lib/libc/gen/ctermid.3#3 integrate .. //depot/projects/s390/lib/libc/gen/dlinfo.3#5 integrate .. //depot/projects/s390/lib/libc/gen/exec.3#4 integrate .. //depot/projects/s390/lib/libc/gen/fnmatch.3#3 integrate .. //depot/projects/s390/lib/libc/gen/fts.3#6 integrate .. //depot/projects/s390/lib/libc/gen/getcwd.3#2 integrate .. //depot/projects/s390/lib/libc/gen/getdomainname.3#4 integrate .. //depot/projects/s390/lib/libc/gen/getfsent.3#4 integrate .. //depot/projects/s390/lib/libc/gen/getgrent.3#4 integrate .. //depot/projects/s390/lib/libc/gen/gethostname.3#4 integrate .. //depot/projects/s390/lib/libc/gen/getpwent.3#6 integrate .. //depot/projects/s390/lib/libc/gen/glob.3#5 integrate .. //depot/projects/s390/lib/libc/gen/msgctl.3#3 integrate .. //depot/projects/s390/lib/libc/gen/signal.3#4 integrate .. //depot/projects/s390/lib/libc/gen/sysconf.3#2 integrate .. //depot/projects/s390/lib/libc/gen/sysctl.3#4 integrate .. //depot/projects/s390/lib/libc/gen/tcsetattr.3#4 integrate .. //depot/projects/s390/lib/libc/gen/uname.3#3 integrate .. //depot/projects/s390/lib/libc/gen/wordexp.3#4 integrate .. //depot/projects/s390/lib/libc/i386/sys/Makefile.inc#4 integrate .. //depot/projects/s390/lib/libc/i386/sys/getcontext.S#1 branch .. //depot/projects/s390/lib/libc/i386/sys/i386_get_ldt.2#4 integrate .. //depot/projects/s390/lib/libc/locale/ctype.3#3 integrate .. //depot/projects/s390/lib/libc/locale/nl_langinfo.3#2 integrate .. //depot/projects/s390/lib/libc/locale/rune.3#4 integrate .. //depot/projects/s390/lib/libc/locale/table.c#3 integrate .. //depot/projects/s390/lib/libc/net/addr2ascii.3#3 integrate .. //depot/projects/s390/lib/libc/net/ethers.3#3 integrate .. //depot/projects/s390/lib/libc/net/getaddrinfo.3#3 integrate .. //depot/projects/s390/lib/libc/net/getifaddrs.3#2 integrate .. //depot/projects/s390/lib/libc/net/getnameinfo.3#3 integrate .. //depot/projects/s390/lib/libc/net/if_indextoname.3#3 integrate .. //depot/projects/s390/lib/libc/net/inet6_option_space.3#4 integrate .. //depot/projects/s390/lib/libc/net/inet6_rthdr_space.3#3 integrate .. //depot/projects/s390/lib/libc/net/resolver.3#3 integrate .. //depot/projects/s390/lib/libc/regex/regex.3#4 integrate .. //depot/projects/s390/lib/libc/rpc/rpc.3#6 integrate .. //depot/projects/s390/lib/libc/rpc/rpc_svc_calls.3#4 integrate .. //depot/projects/s390/lib/libc/rpc/rpc_svc_create.3#3 integrate .. //depot/projects/s390/lib/libc/stdio/funopen.3#2 integrate .. //depot/projects/s390/lib/libc/stdio/tmpnam.3#3 integrate .. //depot/projects/s390/lib/libc/stdlib/getopt.3#3 integrate .. //depot/projects/s390/lib/libc/stdlib/hcreate.3#3 integrate .. //depot/projects/s390/lib/libc/stdlib/rand.3#3 integrate .. //depot/projects/s390/lib/libc/stdtime/ctime.3#3 integrate .. //depot/projects/s390/lib/libc/string/bcmp.3#3 integrate .. //depot/projects/s390/lib/libc/string/bcopy.3#3 integrate .. //depot/projects/s390/lib/libc/string/bzero.3#3 integrate .. //depot/projects/s390/lib/libc/string/ffs.3#3 integrate .. //depot/projects/s390/lib/libc/string/index.3#5 integrate .. //depot/projects/s390/lib/libc/string/strcasecmp.3#3 integrate .. //depot/projects/s390/lib/libc/string/strchr.3#4 integrate .. //depot/projects/s390/lib/libc/sys/accept.2#3 integrate .. //depot/projects/s390/lib/libc/sys/acct.2#4 integrate .. //depot/projects/s390/lib/libc/sys/chmod.2#4 integrate .. //depot/projects/s390/lib/libc/sys/clock_gettime.2#5 integrate .. //depot/projects/s390/lib/libc/sys/getitimer.2#3 integrate .. //depot/projects/s390/lib/libc/sys/getlogin.2#3 integrate .. //depot/projects/s390/lib/libc/sys/getsockopt.2#3 integrate .. //depot/projects/s390/lib/libc/sys/gettimeofday.2#4 integrate .. //depot/projects/s390/lib/libc/sys/intro.2#6 integrate .. //depot/projects/s390/lib/libc/sys/ioctl.2#4 integrate .. //depot/projects/s390/lib/libc/sys/kqueue.2#5 integrate .. //depot/projects/s390/lib/libc/sys/ktrace.2#3 integrate .. //depot/projects/s390/lib/libc/sys/mincore.2#6 integrate .. //depot/projects/s390/lib/libc/sys/mount.2#6 integrate .. //depot/projects/s390/lib/libc/sys/poll.2#3 integrate .. //depot/projects/s390/lib/libc/sys/ptrace.2#4 integrate .. //depot/projects/s390/lib/libc/sys/quotactl.2#3 integrate .. //depot/projects/s390/lib/libc/sys/reboot.2#3 integrate .. //depot/projects/s390/lib/libc/sys/recv.2#3 integrate .. //depot/projects/s390/lib/libc/sys/select.2#4 integrate .. //depot/projects/s390/lib/libc/sys/send.2#3 integrate .. //depot/projects/s390/lib/libc/sys/setgroups.2#3 integrate .. //depot/projects/s390/lib/libc/sys/sigaction.2#7 integrate .. //depot/projects/s390/lib/libc/sys/sigprocmask.2#6 integrate .. //depot/projects/s390/lib/libc/sys/socket.2#6 integrate .. //depot/projects/s390/lib/libc/sys/stat.2#5 integrate .. //depot/projects/s390/lib/libc/sys/sysarch.2#3 integrate .. //depot/projects/s390/lib/libc/sys/syscall.2#3 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_once.3#3 integrate .. //depot/projects/s390/lib/libcalendar/calendar.3#2 integrate .. //depot/projects/s390/lib/libcam/cam_cdbparse.3#3 integrate .. //depot/projects/s390/lib/libcompat/4.1/ftime.3#2 integrate .. //depot/projects/s390/lib/libcompat/4.4/cuserid.3#3 integrate .. //depot/projects/s390/lib/libdevinfo/devinfo.3#4 integrate .. //depot/projects/s390/lib/libdevstat/devstat.3#5 integrate .. //depot/projects/s390/lib/libedit/editline.3#4 integrate .. //depot/projects/s390/lib/libfetch/fetch.3#8 integrate .. //depot/projects/s390/lib/libipsec/ipsec_strerror.3#3 integrate .. //depot/projects/s390/lib/libpthread/arch/alpha/include/atomic_ops.h#2 integrate .. //depot/projects/s390/lib/libpthread/arch/amd64/include/atomic_ops.h#2 integrate .. //depot/projects/s390/lib/libpthread/arch/i386/include/atomic_ops.h#2 integrate .. //depot/projects/s390/lib/libpthread/man/pthread_once.3#2 integrate .. //depot/projects/s390/lib/libpthread/pthread.map#3 integrate .. //depot/projects/s390/lib/libpthread/support/Makefile.inc#3 integrate .. //depot/projects/s390/lib/libpthread/sys/lock.c#3 integrate .. //depot/projects/s390/lib/libpthread/sys/lock.h#3 integrate .. //depot/projects/s390/lib/libpthread/thread/Makefile.inc#9 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_barrier.c#1 branch .. //depot/projects/s390/lib/libpthread/thread/thr_barrierattr.c#1 branch .. //depot/projects/s390/lib/libpthread/thread/thr_cond.c#5 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_creat.c#3 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_kern.c#8 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_mutex.c#5 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_once.c#3 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_pause.c#3 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_private.h#7 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_pspinlock.c#1 branch .. //depot/projects/s390/lib/libpthread/thread/thr_rwlock.c#5 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_sleep.c#3 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_system.c#3 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_tcdrain.c#3 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_wait.c#3 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_wait4.c#3 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_waitpid.c#3 integrate .. //depot/projects/s390/lib/libradius/libradius.3#3 integrate .. //depot/projects/s390/lib/libstand/libstand.3#5 integrate .. //depot/projects/s390/lib/libtacplus/libtacplus.3#4 integrate .. //depot/projects/s390/lib/libusbhid/usbhid.3#4 integrate .. //depot/projects/s390/lib/libutil/realhostname.3#3 integrate .. //depot/projects/s390/lib/libutil/realhostname_sa.3#5 integrate .. //depot/projects/s390/libexec/lukemftpd/Makefile#7 integrate .. //depot/projects/s390/libexec/lukemftpd/nbsd2fbsd.h#2 integrate .. //depot/projects/s390/libexec/talkd/talkd.8#2 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#6 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/errata/article.sgml#10 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#11 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/readme/article.sgml#6 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#17 integrate .. //depot/projects/s390/sbin/bsdlabel/bsdlabel.5#2 integrate .. //depot/projects/s390/sbin/bsdlabel/bsdlabel.8#3 integrate .. //depot/projects/s390/sbin/disklabel/disklabel.5#4 integrate .. //depot/projects/s390/sbin/disklabel/disklabel.8#10 integrate .. //depot/projects/s390/sbin/ip6fw/ip6fw.8#5 integrate .. //depot/projects/s390/sbin/ipfw/ipfw.8#10 integrate .. //depot/projects/s390/sbin/ipfw/ipfw2.c#8 integrate .. //depot/projects/s390/sbin/mksnap_ffs/mksnap_ffs.8#3 integrate .. //depot/projects/s390/sbin/mount_nfs/mount_nfs.8#6 integrate .. //depot/projects/s390/sbin/newfs/newfs.8#7 integrate .. //depot/projects/s390/sbin/ping/ping.8#9 integrate .. //depot/projects/s390/sbin/rcorder/rcorder.c#2 integrate .. //depot/projects/s390/sbin/savecore/savecore.8#3 integrate .. //depot/projects/s390/sbin/savecore/savecore.c#3 integrate .. //depot/projects/s390/sbin/sysctl/sysctl.8#4 integrate .. //depot/projects/s390/sbin/vinum/vinum.8#5 integrate .. //depot/projects/s390/share/doc/papers/timecounter/Makefile#2 integrate .. //depot/projects/s390/share/doc/papers/timecounter/timecounter.ms#2 integrate .. //depot/projects/s390/share/examples/ipfw/change_rules.sh#3 integrate .. //depot/projects/s390/share/examples/mdoc/example.3#2 integrate .. //depot/projects/s390/share/man/Makefile#3 integrate .. //depot/projects/s390/share/man/man3/stdarg.3#4 integrate .. //depot/projects/s390/share/man/man3/sysexits.3#3 integrate .. //depot/projects/s390/share/man/man3/timeradd.3#2 integrate .. //depot/projects/s390/share/man/man4/Makefile#13 integrate .. //depot/projects/s390/share/man/man4/agp.4#3 integrate .. //depot/projects/s390/share/man/man4/aue.4#3 integrate .. //depot/projects/s390/share/man/man4/bfe.4#1 branch .. //depot/projects/s390/share/man/man4/bpf.4#3 integrate .. //depot/projects/s390/share/man/man4/cd.4#3 integrate .. //depot/projects/s390/share/man/man4/ch.4#3 integrate .. //depot/projects/s390/share/man/man4/da.4#4 integrate .. //depot/projects/s390/share/man/man4/fdc.4#2 integrate .. //depot/projects/s390/share/man/man4/icmp6.4#2 integrate .. //depot/projects/s390/share/man/man4/ifmib.4#4 integrate .. //depot/projects/s390/share/man/man4/inet.4#5 integrate .. //depot/projects/s390/share/man/man4/inet6.4#3 integrate .. //depot/projects/s390/share/man/man4/isp.4#3 integrate .. //depot/projects/s390/share/man/man4/ktr.4#4 integrate .. //depot/projects/s390/share/man/man4/kue.4#3 integrate .. //depot/projects/s390/share/man/man4/lomac.4#4 integrate .. //depot/projects/s390/share/man/man4/man4.i386/apm.4#3 integrate .. //depot/projects/s390/share/man/man4/man4.i386/mcd.4#3 integrate .. //depot/projects/s390/share/man/man4/man4.i386/mse.4#2 integrate .. //depot/projects/s390/share/man/man4/man4.i386/perfmon.4#2 integrate .. //depot/projects/s390/share/man/man4/man4.i386/spkr.4#2 integrate .. //depot/projects/s390/share/man/man4/man4.i386/svr4.4#2 integrate .. //depot/projects/s390/share/man/man4/mem.4#3 integrate .. //depot/projects/s390/share/man/man4/mtio.4#3 integrate .. //depot/projects/s390/share/man/man4/ng_source.4#3 integrate .. //depot/projects/s390/share/man/man4/ng_vjc.4#3 integrate .. //depot/projects/s390/share/man/man4/pci.4#3 integrate .. //depot/projects/s390/share/man/man4/pcm.4#5 integrate .. //depot/projects/s390/share/man/man4/ppi.4#3 integrate .. //depot/projects/s390/share/man/man4/psm.4#4 integrate .. //depot/projects/s390/share/man/man4/pt.4#3 integrate .. //depot/projects/s390/share/man/man4/re.4#1 branch .. //depot/projects/s390/share/man/man4/rl.4#5 integrate .. //depot/projects/s390/share/man/man4/ses.4#2 integrate .. //depot/projects/s390/share/man/man4/stg.4#1 branch .. //depot/projects/s390/share/man/man4/syscons.4#5 integrate .. //depot/projects/s390/share/man/man4/sysmouse.4#3 integrate .. //depot/projects/s390/share/man/man4/tap.4#4 integrate .. //depot/projects/s390/share/man/man4/targ.4#5 integrate .. //depot/projects/s390/share/man/man4/tcp.4#8 integrate .. //depot/projects/s390/share/man/man4/termios.4#3 integrate .. //depot/projects/s390/share/man/man4/ti.4#5 integrate .. //depot/projects/s390/share/man/man4/tl.4#3 integrate .. //depot/projects/s390/share/man/man4/tty.4#3 integrate .. //depot/projects/s390/share/man/man4/tun.4#3 integrate .. //depot/projects/s390/share/man/man4/uart.4#1 branch .. //depot/projects/s390/share/man/man4/unix.4#3 integrate .. //depot/projects/s390/share/man/man4/usb.4#6 integrate .. //depot/projects/s390/share/man/man4/wi.4#13 integrate .. //depot/projects/s390/share/man/man4/worm.4#3 integrate .. //depot/projects/s390/share/man/man5/a.out.5#2 integrate .. //depot/projects/s390/share/man/man5/core.5#2 integrate .. //depot/projects/s390/share/man/man5/device.hints.5#5 integrate .. //depot/projects/s390/share/man/man5/dir.5#3 integrate .. //depot/projects/s390/share/man/man5/elf.5#4 integrate .. //depot/projects/s390/share/man/man5/fs.5#6 integrate .. //depot/projects/s390/share/man/man5/group.5#4 integrate .. //depot/projects/s390/share/man/man5/link.5#3 integrate .. //depot/projects/s390/share/man/man5/procfs.5#4 integrate .. //depot/projects/s390/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/s390/share/man/man5/stab.5#2 integrate .. //depot/projects/s390/share/man/man5/style.Makefile.5#4 integrate .. //depot/projects/s390/share/man/man5/utmp.5#4 integrate .. //depot/projects/s390/share/man/man7/stdint.7#3 integrate .. //depot/projects/s390/share/man/man8/sticky.8#2 integrate .. //depot/projects/s390/share/man/man9/BUS_SETUP_INTR.9#4 integrate .. //depot/projects/s390/share/man/man9/DECLARE_MODULE.9#2 integrate .. //depot/projects/s390/share/man/man9/SYSCALL_MODULE.9#2 integrate .. //depot/projects/s390/share/man/man9/devstat.9#2 integrate .. //depot/projects/s390/share/man/man9/ifnet.9#7 integrate .. //depot/projects/s390/share/man/man9/ithread.9#2 integrate .. //depot/projects/s390/share/man/man9/ktr.9#4 integrate .. //depot/projects/s390/share/man/man9/lock.9#2 integrate .. //depot/projects/s390/share/man/man9/make_dev.9#3 integrate .. //depot/projects/s390/share/man/man9/malloc.9#9 integrate .. //depot/projects/s390/share/man/man9/mbuf.9#9 integrate .. //depot/projects/s390/share/man/man9/pbuf.9#2 integrate .. //depot/projects/s390/share/man/man9/pfil.9#2 integrate .. //depot/projects/s390/share/man/man9/rtentry.9#2 integrate .. //depot/projects/s390/share/man/man9/sbuf.9#3 integrate .. //depot/projects/s390/share/man/man9/style.9#7 integrate .. //depot/projects/s390/share/man/man9/swi.9#4 integrate .. //depot/projects/s390/share/man/man9/sysctl_add_oid.9#3 integrate .. //depot/projects/s390/share/man/man9/vm_set_page_size.9#2 integrate .. //depot/projects/s390/share/mk/bsd.lib.mk#5 integrate .. //depot/projects/s390/share/mk/bsd.man.mk#5 integrate .. //depot/projects/s390/sys/alpha/alpha/pmap.c#11 integrate .. //depot/projects/s390/sys/alpha/include/db_machdep.h#3 integrate .. //depot/projects/s390/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/s390/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/s390/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/s390/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/s390/sys/amd64/include/signal.h#2 integrate .. //depot/projects/s390/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/s390/sys/boot/ia64/libski/acpi_stub.c#2 integrate .. //depot/projects/s390/sys/boot/ia64/libski/bootinfo.c#4 integrate .. //depot/projects/s390/sys/boot/ia64/libski/devicename.c#2 integrate .. //depot/projects/s390/sys/boot/ia64/libski/efi_stub.c#2 integrate .. //depot/projects/s390/sys/boot/ia64/libski/elf_freebsd.c#4 integrate .. //depot/projects/s390/sys/boot/ia64/libski/module.c#3 integrate .. //depot/projects/s390/sys/boot/ia64/libski/sal_stub.c#2 integrate .. //depot/projects/s390/sys/boot/ia64/libski/skifs.c#2 integrate .. //depot/projects/s390/sys/boot/ia64/libski/ssc.c#3 integrate .. //depot/projects/s390/sys/boot/ia64/libski/time.c#3 integrate .. //depot/projects/s390/sys/boot/pc98/boot2/boot.c#4 integrate .. //depot/projects/s390/sys/boot/pc98/boot2/disk.c#5 integrate .. //depot/projects/s390/sys/boot/pc98/boot2/io.c#2 integrate .. //depot/projects/s390/sys/boot/pc98/boot2/probe_keyboard.c#2 integrate .. //depot/projects/s390/sys/boot/pc98/boot2/sys.c#4 integrate .. //depot/projects/s390/sys/boot/pc98/boot2/table.c#2 integrate .. //depot/projects/s390/sys/boot/pc98/libpc98/biosdisk.c#6 integrate .. //depot/projects/s390/sys/boot/pc98/libpc98/biosmem.c#3 integrate .. //depot/projects/s390/sys/boot/pc98/libpc98/comconsole.c#2 integrate .. //depot/projects/s390/sys/boot/pc98/libpc98/gatea20.c#2 integrate .. //depot/projects/s390/sys/boot/pc98/libpc98/i386_module.c#2 integrate .. //depot/projects/s390/sys/boot/pc98/libpc98/time.c#2 integrate .. //depot/projects/s390/sys/boot/pc98/libpc98/vidconsole.c#2 integrate .. //depot/projects/s390/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/s390/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/s390/sys/cam/cam_periph.c#8 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_cd.c#12 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_da.c#16 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_target.c#9 integrate .. //depot/projects/s390/sys/coda/cnode.h#5 integrate .. //depot/projects/s390/sys/coda/coda.h#2 integrate .. //depot/projects/s390/sys/coda/coda_namecache.c#4 integrate .. //depot/projects/s390/sys/coda/coda_namecache.h#3 integrate .. //depot/projects/s390/sys/coda/coda_psdev.c#5 integrate .. //depot/projects/s390/sys/coda/coda_subr.c#4 integrate .. //depot/projects/s390/sys/coda/coda_subr.h#2 integrate .. //depot/projects/s390/sys/coda/coda_venus.c#4 integrate .. //depot/projects/s390/sys/coda/coda_venus.h#2 integrate .. //depot/projects/s390/sys/coda/coda_vfsops.c#5 integrate .. //depot/projects/s390/sys/coda/coda_vfsops.h#3 integrate .. //depot/projects/s390/sys/coda/coda_vnops.c#5 integrate .. //depot/projects/s390/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/s390/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/s390/sys/conf/NOTES#15 integrate .. //depot/projects/s390/sys/conf/files#17 integrate .. //depot/projects/s390/sys/conf/files.alpha#8 integrate .. //depot/projects/s390/sys/conf/files.amd64#3 integrate .. //depot/projects/s390/sys/conf/files.i386#10 integrate .. //depot/projects/s390/sys/conf/files.ia64#10 integrate .. //depot/projects/s390/sys/conf/files.pc98#11 integrate .. //depot/projects/s390/sys/conf/files.sparc64#10 integrate .. //depot/projects/s390/sys/conf/kmod.mk#10 integrate .. //depot/projects/s390/sys/conf/ldscript.ia64#5 integrate .. //depot/projects/s390/sys/conf/options#12 integrate .. //depot/projects/s390/sys/conf/options.ia64#8 integrate .. //depot/projects/s390/sys/crypto/sha2/sha2.c#5 integrate .. //depot/projects/s390/sys/dev/aac/aac_pci.c#12 integrate .. //depot/projects/s390/sys/dev/acpica/acpi.c#12 integrate .. //depot/projects/s390/sys/dev/acpica/acpi_cmbat.c#6 integrate .. //depot/projects/s390/sys/dev/acpica/acpi_resource.c#5 integrate .. //depot/projects/s390/sys/dev/acpica/acpivar.h#9 integrate .. //depot/projects/s390/sys/dev/acpica/madt.h#1 branch .. //depot/projects/s390/sys/dev/adlink/adlink.c#3 integrate .. //depot/projects/s390/sys/dev/ata/ata-all.c#12 integrate .. //depot/projects/s390/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/s390/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/s390/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/s390/sys/dev/ata/ata-raid.c#10 integrate .. //depot/projects/s390/sys/dev/ata/atapi-cd.c#10 integrate .. //depot/projects/s390/sys/dev/ata/atapi-cd.h#6 integrate .. //depot/projects/s390/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/s390/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/s390/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/s390/sys/dev/awi/awi_wep.c#7 integrate .. //depot/projects/s390/sys/dev/bfe/if_bfe.c#1 branch .. //depot/projects/s390/sys/dev/bfe/if_bfereg.h#1 branch .. //depot/projects/s390/sys/dev/ciss/ciss.c#11 integrate .. //depot/projects/s390/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/s390/sys/dev/drm/drm_context.h#5 integrate .. //depot/projects/s390/sys/dev/drm/drm_memory.h#8 integrate .. //depot/projects/s390/sys/dev/drm/radeon.h#5 integrate .. //depot/projects/s390/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/s390/sys/dev/drm/radeon_drm.h#5 integrate .. //depot/projects/s390/sys/dev/drm/radeon_drv.c#5 integrate .. //depot/projects/s390/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/s390/sys/dev/drm/radeon_mem.c#4 integrate .. //depot/projects/s390/sys/dev/drm/radeon_state.c#5 integrate .. //depot/projects/s390/sys/dev/drm/sis.h#1 branch .. //depot/projects/s390/sys/dev/drm/sis_drm.h#3 branch .. //depot/projects/s390/sys/dev/drm/sis_drv.c#1 branch .. //depot/projects/s390/sys/dev/drm/sis_drv.h#1 branch .. //depot/projects/s390/sys/dev/drm/sis_ds.c#1 branch .. //depot/projects/s390/sys/dev/drm/sis_ds.h#1 branch .. //depot/projects/s390/sys/dev/drm/sis_mm.c#1 branch .. //depot/projects/s390/sys/dev/fxp/if_fxp.c#11 integrate .. //depot/projects/s390/sys/dev/fxp/if_fxpvar.h#6 integrate .. //depot/projects/s390/sys/dev/mii/bmtphy.c#5 integrate .. //depot/projects/s390/sys/dev/mii/miidevs#6 integrate .. //depot/projects/s390/sys/dev/mii/rgephy.c#1 branch .. //depot/projects/s390/sys/dev/mii/rgephyreg.h#1 branch .. //depot/projects/s390/sys/dev/mii/rlphy.c#7 integrate .. //depot/projects/s390/sys/dev/pccard/pccard.c#8 integrate .. //depot/projects/s390/sys/dev/pci/pci.c#9 integrate .. //depot/projects/s390/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/s390/sys/dev/pst/pst-raid.c#7 integrate .. //depot/projects/s390/sys/dev/puc/puc.c#9 integrate .. //depot/projects/s390/sys/dev/puc/puc_ebus.c#1 branch .. //depot/projects/s390/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/s390/sys/dev/puc/puc_sbus.c#1 branch .. //depot/projects/s390/sys/dev/puc/pucdata.c#8 integrate .. //depot/projects/s390/sys/dev/puc/pucvar.h#6 integrate .. //depot/projects/s390/sys/dev/re/if_re.c#1 branch .. //depot/projects/s390/sys/dev/smbus/smbus.c#4 integrate .. //depot/projects/s390/sys/dev/sound/isa/ad1816.c#6 integrate .. //depot/projects/s390/sys/dev/sound/isa/ess.c#5 integrate .. //depot/projects/s390/sys/dev/sound/isa/mss.c#8 integrate .. //depot/projects/s390/sys/dev/sound/isa/sb16.c#6 integrate .. //depot/projects/s390/sys/dev/sound/isa/sb8.c#5 integrate .. //depot/projects/s390/sys/dev/sound/isa/sndbuf_dma.c#2 integrate .. //depot/projects/s390/sys/dev/sound/pci/aureal.c#5 integrate .. //depot/projects/s390/sys/dev/sound/pci/aureal.h#2 integrate .. //depot/projects/s390/sys/dev/sound/pci/emu10k1.c#8 integrate .. //depot/projects/s390/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pci/maestro.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pci/neomagic-coeff.h#2 integrate .. //depot/projects/s390/sys/dev/sound/pci/neomagic.c#3 integrate .. //depot/projects/s390/sys/dev/sound/pci/neomagic.h#2 integrate .. //depot/projects/s390/sys/dev/sound/pci/solo.c#5 integrate .. //depot/projects/s390/sys/dev/sound/pci/t4dwave.c#6 integrate .. //depot/projects/s390/sys/dev/sound/pci/t4dwave.h#2 integrate .. //depot/projects/s390/sys/dev/sound/pcm/ac97.c#11 integrate .. //depot/projects/s390/sys/dev/sound/pcm/ac97.h#5 integrate .. //depot/projects/s390/sys/dev/sound/pcm/buffer.c#7 integrate .. //depot/projects/s390/sys/dev/sound/pcm/buffer.h#4 integrate .. //depot/projects/s390/sys/dev/sound/pcm/channel.c#7 integrate .. //depot/projects/s390/sys/dev/sound/pcm/channel.h#3 integrate .. //depot/projects/s390/sys/dev/sound/pcm/dsp.c#10 integrate .. //depot/projects/s390/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/s390/sys/dev/sound/pcm/fake.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pcm/feeder.c#9 integrate .. //depot/projects/s390/sys/dev/sound/pcm/feeder.h#3 integrate .. //depot/projects/s390/sys/dev/sound/pcm/feeder_fmt.c#7 integrate .. //depot/projects/s390/sys/dev/sound/pcm/mixer.c#7 integrate .. //depot/projects/s390/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/s390/sys/dev/sound/pcm/sndstat.c#7 integrate .. //depot/projects/s390/sys/dev/sound/pcm/sound.c#7 integrate .. //depot/projects/s390/sys/dev/sound/pcm/sound.h#6 integrate .. //depot/projects/s390/sys/dev/sound/pcm/vchan.c#7 integrate .. //depot/projects/s390/sys/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/s390/sys/dev/uart/uart.h#1 branch .. //depot/projects/s390/sys/dev/uart/uart_bus.h#1 branch .. //depot/projects/s390/sys/dev/uart/uart_bus_acpi.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_bus_ebus.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_bus_isa.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_bus_pci.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_bus_puc.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_core.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_cpu.h#1 branch .. //depot/projects/s390/sys/dev/uart/uart_cpu_alpha.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_cpu_amd64.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_cpu_i386.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_cpu_ia64.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_cpu_pc98.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_cpu_sparc64.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_dev_i8251.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_dev_i8251.h#1 branch .. //depot/projects/s390/sys/dev/uart/uart_dev_ns8250.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_dev_ns8250.h#1 branch .. //depot/projects/s390/sys/dev/uart/uart_dev_sab82532.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_dev_sab82532.h#1 branch .. //depot/projects/s390/sys/dev/uart/uart_dev_z8530.c#1 branch .. //depot/projects/s390/sys/dev/uart/uart_dev_z8530.h#1 branch .. //depot/projects/s390/sys/dev/uart/uart_if.m#1 branch .. //depot/projects/s390/sys/dev/uart/uart_tty.c#1 branch .. //depot/projects/s390/sys/dev/wi/if_wi.c#13 integrate .. //depot/projects/s390/sys/dev/wi/if_wi_pccard.c#10 integrate .. //depot/projects/s390/sys/dev/wi/if_wi_pci.c#5 integrate .. //depot/projects/s390/sys/dev/wi/if_wireg.h#5 integrate .. //depot/projects/s390/sys/dev/wi/if_wivar.h#6 integrate .. //depot/projects/s390/sys/geom/bde/g_bde_crypt.c#8 integrate .. //depot/projects/s390/sys/geom/geom_dev.c#15 integrate .. //depot/projects/s390/sys/geom/geom_io.c#15 integrate .. //depot/projects/s390/sys/i386/acpica/acpi_machdep.c#9 integrate .. //depot/projects/s390/sys/i386/acpica/acpi_wakeup.c#8 integrate .. //depot/projects/s390/sys/i386/conf/GENERIC#13 integrate .. //depot/projects/s390/sys/i386/conf/NOTES#12 integrate .. //depot/projects/s390/sys/i386/i386/db_interface.c#6 integrate .. //depot/projects/s390/sys/i386/i386/identcpu.c#9 integrate .. //depot/projects/s390/sys/i386/i386/machdep.c#11 integrate .. //depot/projects/s390/sys/i386/i386/mp_clock.c#5 integrate .. //depot/projects/s390/sys/i386/i386/mp_machdep.c#13 integrate .. //depot/projects/s390/sys/i386/i386/pmap.c#15 integrate .. //depot/projects/s390/sys/i386/i386/sys_machdep.c#10 integrate .. //depot/projects/s390/sys/i386/include/acpica_machdep.h#3 integrate .. //depot/projects/s390/sys/i386/include/apic.h#5 integrate .. //depot/projects/s390/sys/i386/include/segments.h#4 integrate .. //depot/projects/s390/sys/i386/isa/clock.c#11 integrate .. //depot/projects/s390/sys/i386/isa/isa.h#2 integrate .. //depot/projects/s390/sys/i386/isa/isa_compat.c#3 integrate .. //depot/projects/s390/sys/i386/isa/isa_device.h#2 integrate .. //depot/projects/s390/sys/i386/isa/npx.c#7 integrate .. //depot/projects/s390/sys/i386/linux/imgact_linux.c#6 integrate .. //depot/projects/s390/sys/i386/pci/pci_cfgreg.c#6 integrate .. //depot/projects/s390/sys/ia64/acpica/madt.c#5 integrate .. //depot/projects/s390/sys/ia64/conf/GENERIC#11 integrate .. //depot/projects/s390/sys/ia64/conf/GENERIC.hints#3 integrate .. //depot/projects/s390/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/s390/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/s390/sys/ia64/ia64/genassym.c#8 integrate .. //depot/projects/s390/sys/ia64/ia64/interrupt.c#9 integrate .. //depot/projects/s390/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/s390/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/s390/sys/ia64/ia64/nexus.c#3 integrate .. //depot/projects/s390/sys/ia64/ia64/pmap.c#14 integrate .. //depot/projects/s390/sys/ia64/ia64/sapic.c#5 integrate .. //depot/projects/s390/sys/ia64/include/md_var.h#5 integrate .. //depot/projects/s390/sys/ia64/include/sapicvar.h#3 integrate .. //depot/projects/s390/sys/ia64/include/vmparam.h#4 integrate .. //depot/projects/s390/sys/isa/fd.c#9 integrate .. //depot/projects/s390/sys/isa/isareg.h#3 integrate .. //depot/projects/s390/sys/kern/bus_if.m#4 integrate .. //depot/projects/s390/sys/kern/init_sysent.c#9 integrate .. //depot/projects/s390/sys/kern/kern_ktr.c#7 integrate .. //depot/projects/s390/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/s390/sys/kern/subr_bus.c#11 integrate .. //depot/projects/s390/sys/kern/subr_msgbuf.c#2 integrate .. //depot/projects/s390/sys/kern/subr_taskqueue.c#5 integrate .. //depot/projects/s390/sys/kern/subr_trap.c#13 integrate .. //depot/projects/s390/sys/kern/subr_witness.c#13 integrate .. //depot/projects/s390/sys/kern/sys_pipe.c#11 integrate .. //depot/projects/s390/sys/kern/syscalls.c#9 integrate .. //depot/projects/s390/sys/kern/syscalls.master#11 integrate .. //depot/projects/s390/sys/kern/vfs_aio.c#11 integrate .. //depot/projects/s390/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/s390/sys/modules/Makefile#15 integrate .. //depot/projects/s390/sys/modules/bfe/Makefile#1 branch .. //depot/projects/s390/sys/modules/coda/Makefile#2 integrate .. //depot/projects/s390/sys/modules/coda5/Makefile#1 branch .. //depot/projects/s390/sys/modules/drm/Makefile#3 integrate .. //depot/projects/s390/sys/modules/drm/sis/Makefile#1 branch .. //depot/projects/s390/sys/modules/mii/Makefile#6 integrate .. //depot/projects/s390/sys/modules/re/Makefile#1 branch .. //depot/projects/s390/sys/modules/uart/Makefile#1 branch .. //depot/projects/s390/sys/net/bpf.c#10 integrate .. //depot/projects/s390/sys/net/if_vlan.c#7 integrate .. //depot/projects/s390/sys/net80211/ieee80211_radiotap.h#1 branch .. //depot/projects/s390/sys/netinet/ip_divert.c#8 integrate .. //depot/projects/s390/sys/netinet/ip_input.c#13 integrate .. //depot/projects/s390/sys/netinet/ip_mroute.c#10 integrate .. //depot/projects/s390/sys/nfsclient/bootp_subr.c#7 integrate .. //depot/projects/s390/sys/nfsclient/nfs_vnops.c#12 integrate .. //depot/projects/s390/sys/pc98/conf/GENERIC#11 integrate .. //depot/projects/s390/sys/pci/amdpm.c#5 integrate .. //depot/projects/s390/sys/pci/if_rl.c#12 integrate .. //depot/projects/s390/sys/pci/if_rlreg.h#7 integrate .. //depot/projects/s390/sys/pci/if_sis.c#12 integrate .. //depot/projects/s390/sys/pci/if_sisreg.h#5 integrate .. //depot/projects/s390/sys/sparc64/conf/GENERIC#12 integrate .. //depot/projects/s390/sys/sparc64/pci/psycho.c#11 integrate .. //depot/projects/s390/sys/sparc64/pci/psychoreg.h#4 integrate .. //depot/projects/s390/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/s390/sys/sys/ata.h#6 integrate .. //depot/projects/s390/sys/sys/bus.h#6 integrate .. //depot/projects/s390/sys/sys/interrupt.h#3 integrate .. //depot/projects/s390/sys/sys/ioctl_bt848.h#1 branch .. //depot/projects/s390/sys/sys/ioctl_meteor.h#1 branch .. //depot/projects/s390/sys/sys/param.h#14 integrate .. //depot/projects/s390/sys/sys/syscall.h#9 integrate .. //depot/projects/s390/sys/sys/syscall.mk#9 integrate .. //depot/projects/s390/sys/sys/syslimits.h#5 integrate .. //depot/projects/s390/sys/sys/sysproto.h#10 integrate .. //depot/projects/s390/sys/sys/taskqueue.h#4 integrate .. //depot/projects/s390/sys/vm/pmap.h#8 integrate .. //depot/projects/s390/sys/vm/vm_mmap.c#7 integrate .. //depot/projects/s390/tools/tools/tinderbox/powerpc.diff#2 integrate .. //depot/projects/s390/usr.bin/Makefile#11 integrate .. //depot/projects/s390/usr.bin/colldef/colldef.1#5 integrate .. //depot/projects/s390/usr.bin/elfdump/elfdump.c#4 integrate .. //depot/projects/s390/usr.bin/fetch/fetch.1#7 integrate .. //depot/projects/s390/usr.bin/file/file.1#5 integrate .. //depot/projects/s390/usr.bin/getconf/getconf.1#5 integrate .. //depot/projects/s390/usr.bin/killall/killall.c#5 integrate .. //depot/projects/s390/usr.bin/make/cond.c#5 integrate .. //depot/projects/s390/usr.bin/make/for.c#3 integrate .. //depot/projects/s390/usr.bin/mklocale/lex.l#3 integrate .. //depot/projects/s390/usr.bin/mt/mt.1#4 integrate .. //depot/projects/s390/usr.bin/ranlib/Makefile#2 delete .. //depot/projects/s390/usr.bin/ranlib/build.c#2 delete .. //depot/projects/s390/usr.bin/ranlib/extern.h#2 delete .. //depot/projects/s390/usr.bin/ranlib/misc.c#2 delete .. //depot/projects/s390/usr.bin/ranlib/pathnames.h#2 delete .. //depot/projects/s390/usr.bin/ranlib/ranlib.1#2 delete .. //depot/projects/s390/usr.bin/ranlib/ranlib.1aout#2 delete .. //depot/projects/s390/usr.bin/ranlib/ranlib.5#2 delete .. //depot/projects/s390/usr.bin/ranlib/ranlib.c#2 delete .. //depot/projects/s390/usr.bin/ranlib/touch.c#2 delete .. //depot/projects/s390/usr.bin/rpcinfo/rpcinfo.c#4 integrate .. //depot/projects/s390/usr.bin/rsh/rsh.c#4 integrate .. //depot/projects/s390/usr.bin/script/script.1#2 integrate .. //depot/projects/s390/usr.bin/symorder/Makefile#2 delete .. //depot/projects/s390/usr.bin/symorder/symorder.1#4 delete .. //depot/projects/s390/usr.bin/symorder/symorder.c#2 delete .. //depot/projects/s390/usr.bin/tcopy/tcopy.1#4 integrate .. //depot/projects/s390/usr.bin/tip/tip/tip.1#6 integrate .. //depot/projects/s390/usr.bin/truss/main.c#5 integrate .. //depot/projects/s390/usr.bin/truss/setup.c#3 integrate .. //depot/projects/s390/usr.bin/tsort/tsort.c#3 integrate .. //depot/projects/s390/usr.bin/w/w.c#4 integrate .. //depot/projects/s390/usr.sbin/acpi/acpidump/acpi.c#6 integrate .. //depot/projects/s390/usr.sbin/acpi/acpidump/acpidump.8#4 integrate .. //depot/projects/s390/usr.sbin/acpi/acpidump/acpidump.c#4 integrate .. //depot/projects/s390/usr.sbin/acpi/acpidump/acpidump.h#6 integrate .. //depot/projects/s390/usr.sbin/adduser/adduser.8#8 integrate .. //depot/projects/s390/usr.sbin/chown/chown.c#6 integrate .. //depot/projects/s390/usr.sbin/edquota/edquota.8#6 integrate .. //depot/projects/s390/usr.sbin/newsyslog/newsyslog.c#10 integrate .. //depot/projects/s390/usr.sbin/pw/pw.conf.5#3 integrate .. //depot/projects/s390/usr.sbin/rmt/rmt.c#4 integrate .. //depot/projects/s390/usr.sbin/sysinstall/config.c#7 integrate .. //depot/projects/s390/usr.sbin/sysinstall/devices.c#7 integrate .. //depot/projects/s390/usr.sbin/syslogd/syslogd.8#6 integrate Differences ... ==== //depot/projects/s390/Makefile.inc1#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.389 2003/09/01 06:43:24 scottl Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.390 2003/09/07 14:15:40 ru Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -227,6 +227,7 @@ # world stage WMAKEENV= ${CROSSENV} \ DESTDIR=${WORLDTMP} \ + _SHLIBDIRPREFIX=${WORLDTMP} \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 ==== //depot/projects/s390/bin/ps/ps.1#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.64 2003/08/05 10:31:28 brueffer Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.65 2003/09/08 19:57:13 ru Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -210,7 +210,7 @@ .It flags The flags associated with the process as in the include file -.Aq Pa sys/proc.h : +.In sys/proc.h : .Bl -column P_NOCLDSTOP P_NOCLDSTOP .It Dv "P_ADVLOCK" Ta No "0x00001 Process may hold a POSIX advisory lock" .It Dv "P_CONTROLT" Ta No "0x00002 Has a controlling terminal" ==== //depot/projects/s390/bin/sh/arith.h#3 (text+ko) ==== @@ -31,9 +31,9 @@ * SUCH DAMAGE. * * @(#)arith.h 1.1 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/arith.h,v 1.7 2003/08/30 12:31:44 schweikh Exp $ + * $FreeBSD: src/bin/sh/arith.h,v 1.8 2003/09/04 18:28:42 schweikh Exp $ */ +int arith(char *); int arith_assign(char *, arith_t); -int arith(char *); -int expcmd(int , char **); +int expcmd(int, char **); ==== //depot/projects/s390/bin/sh/arith.y#4 (text+ko) ==== @@ -35,13 +35,14 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static char sccsid[] = "@(#)arith.y 8.3 (Berkeley) 5/4/95"; #endif #endif /* not lint */ + #include -__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.15 2003/08/30 12:31:44 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.17 2003/09/07 10:14:56 schweikh Exp $"); #include #include "shell.h" @@ -73,152 +74,187 @@ %left ARITH_UNARYMINUS ARITH_UNARYPLUS ARITH_NOT ARITH_BNOT %% -exp: expr = { - return ($1); - } +exp: + expr + { return ($1); } ; -expr: ARITH_LPAREN expr ARITH_RPAREN = { $$ = $2; } - | expr ARITH_OR expr = { $$ = $1 ? $1 : $3 ? $3 : 0; } - | expr ARITH_AND expr = { $$ = $1 ? ( $3 ? $3 : 0 ) : 0; } - | expr ARITH_BOR expr = { $$ = $1 | $3; } - | expr ARITH_BXOR expr = { $$ = $1 ^ $3; } - | expr ARITH_BAND expr = { $$ = $1 & $3; } - | expr ARITH_EQ expr = { $$ = $1 == $3; } - | expr ARITH_GT expr = { $$ = $1 > $3; } - | expr ARITH_GE expr = { $$ = $1 >= $3; } - | expr ARITH_LT expr = { $$ = $1 < $3; } - | expr ARITH_LE expr = { $$ = $1 <= $3; } - | expr ARITH_NE expr = { $$ = $1 != $3; } - | expr ARITH_LSHIFT expr = { $$ = $1 << $3; } - | expr ARITH_RSHIFT expr = { $$ = $1 >> $3; } - | expr ARITH_ADD expr = { $$ = $1 + $3; } - | expr ARITH_SUB expr = { $$ = $1 - $3; } - | expr ARITH_MUL expr = { $$ = $1 * $3; } - | expr ARITH_DIV expr = { - if ($3 == 0) - yyerror("division by zero"); - $$ = $1 / $3; - } - | expr ARITH_REM expr = { - if ($3 == 0) - yyerror("division by zero"); - $$ = $1 % $3; - } - | ARITH_NOT expr = { $$ = !($2); } - | ARITH_BNOT expr = { $$ = ~($2); } - | ARITH_SUB expr %prec ARITH_UNARYMINUS = { $$ = -($2); } - | ARITH_ADD expr %prec ARITH_UNARYPLUS = { $$ = $2; } - | ARITH_NUM - | ARITH_VAR { - char *p; - arith_t arith_val; - char *str_val; +expr: + ARITH_LPAREN expr ARITH_RPAREN + { $$ = $2; } | + expr ARITH_OR expr + { $$ = $1 ? $1 : $3 ? $3 : 0; } | + expr ARITH_AND expr + { $$ = $1 ? ( $3 ? $3 : 0 ) : 0; } | + expr ARITH_BOR expr + { $$ = $1 | $3; } | + expr ARITH_BXOR expr + { $$ = $1 ^ $3; } | + expr ARITH_BAND expr + { $$ = $1 & $3; } | + expr ARITH_EQ expr + { $$ = $1 == $3; } | + expr ARITH_GT expr + { $$ = $1 > $3; } | + expr ARITH_GE expr + { $$ = $1 >= $3; } | + expr ARITH_LT expr + { $$ = $1 < $3; } | + expr ARITH_LE expr + { $$ = $1 <= $3; } | + expr ARITH_NE expr + { $$ = $1 != $3; } | + expr ARITH_LSHIFT expr + { $$ = $1 << $3; } | + expr ARITH_RSHIFT expr + { $$ = $1 >> $3; } | + expr ARITH_ADD expr + { $$ = $1 + $3; } | + expr ARITH_SUB expr + { $$ = $1 - $3; } | + expr ARITH_MUL expr + { $$ = $1 * $3; } | + expr ARITH_DIV expr + { + if ($3 == 0) + yyerror("division by zero"); + $$ = $1 / $3; + } | + expr ARITH_REM expr + { + if ($3 == 0) + yyerror("division by zero"); + $$ = $1 % $3; + } | + ARITH_NOT expr + { $$ = !($2); } | + ARITH_BNOT expr + { $$ = ~($2); } | + ARITH_SUB expr %prec ARITH_UNARYMINUS + { $$ = -($2); } | + ARITH_ADD expr %prec ARITH_UNARYPLUS + { $$ = $2; } | + ARITH_NUM | + ARITH_VAR + { + char *p; + arith_t arith_val; + char *str_val; - if (lookupvar($1) == NULL) - setvarsafe($1, "0", 0); - str_val = lookupvar($1); - arith_val = strtoarith_t(str_val, &p, 0); - /* - * Conversion is successful only in case - * we've converted _all_ characters. - */ - if (*p != '\0') - yyerror("variable conversion error"); - $$ = arith_val; - } - | ARITH_VAR ARITH_ASSIGN expr { - if (arith_assign($1, $3) != 1) - yyerror("variable assignment error"); - $$ = $3; - } - | ARITH_VAR ARITH_ADDASSIGN expr { - arith_t value; + if (lookupvar($1) == NULL) + setvarsafe($1, "0", 0); + str_val = lookupvar($1); + arith_val = strtoarith_t(str_val, &p, 0); + /* + * Conversion is successful only in case + * we've converted _all_ characters. + */ + if (*p != '\0') + yyerror("variable conversion error"); + $$ = arith_val; + } | + ARITH_VAR ARITH_ASSIGN expr + { + if (arith_assign($1, $3) != 0) + yyerror("variable assignment error"); + $$ = $3; + } | + ARITH_VAR ARITH_ADDASSIGN expr + { + arith_t value; - value = atoarith_t(lookupvar($1)) + $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_SUBASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) + $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_SUBASSIGN expr + { + arith_t value; - value = atoarith_t(lookupvar($1)) - $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_MULASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) - $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_MULASSIGN expr + { + arith_t value; - value = atoarith_t(lookupvar($1)) * $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_DIVASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) * $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_DIVASSIGN expr + { + arith_t value; - if ($3 == 0) - yyerror("division by zero"); + if ($3 == 0) + yyerror("division by zero"); - value = atoarith_t(lookupvar($1)) / $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_REMASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) / $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_REMASSIGN expr + { + arith_t value; - if ($3 == 0) - yyerror("division by zero"); + if ($3 == 0) + yyerror("division by zero"); - value = atoarith_t(lookupvar($1)) % $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_RSHASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) % $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_RSHASSIGN expr + { + arith_t value; - value = atoarith_t(lookupvar($1)) >> $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_LSHASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) >> $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_LSHASSIGN expr + { + arith_t value; - value = atoarith_t(lookupvar($1)) << $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_BANDASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) << $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_BANDASSIGN expr + { + arith_t value; - value = atoarith_t(lookupvar($1)) & $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_BXORASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) & $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_BXORASSIGN expr + { + arith_t value; - value = atoarith_t(lookupvar($1)) ^ $3; - if (arith_assign($1, value) != 0) - yyerror("variable assignment error"); - $$ = value; - } - | ARITH_VAR ARITH_BORASSIGN expr { - arith_t value; + value = atoarith_t(lookupvar($1)) ^ $3; + if (arith_assign($1, value) != 0) + yyerror("variable assignment error"); + $$ = value; + } | + ARITH_VAR ARITH_BORASSIGN expr + { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 11 11:57:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B45916A4C1; Thu, 11 Sep 2003 11:57:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C6EB616A4BF for ; Thu, 11 Sep 2003 11:57:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5375343FF2 for ; Thu, 11 Sep 2003 11:57:41 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BIvf0U023802 for ; Thu, 11 Sep 2003 11:57:41 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BIvBfH023799 for perforce@freebsd.org; Thu, 11 Sep 2003 11:57:11 -0700 (PDT) Date: Thu, 11 Sep 2003 11:57:11 -0700 (PDT) Message-Id: <200309111857.h8BIvBfH023799@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37926 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 18:57:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=37926 Change 37926 by peter@peter_overcee on 2003/09/11 11:56:39 IFC @37924 Affected files ... .. //depot/projects/hammer/MAINTAINERS#13 integrate .. //depot/projects/hammer/Makefile#12 integrate .. //depot/projects/hammer/Makefile.inc1#27 integrate .. //depot/projects/hammer/UPDATING#15 integrate .. //depot/projects/hammer/bin/Makefile.inc#3 integrate .. //depot/projects/hammer/bin/ls/ls.1#8 integrate .. //depot/projects/hammer/bin/ls/util.c#4 integrate .. //depot/projects/hammer/bin/ps/extern.h#7 integrate .. //depot/projects/hammer/bin/ps/keyword.c#8 integrate .. //depot/projects/hammer/bin/ps/print.c#8 integrate .. //depot/projects/hammer/bin/ps/ps.1#8 integrate .. //depot/projects/hammer/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/hammer/bin/setfacl/setfacl.c#4 integrate .. //depot/projects/hammer/bin/sh/arith.h#2 integrate .. //depot/projects/hammer/bin/sh/arith.y#3 integrate .. //depot/projects/hammer/bin/sh/arith_lex.l#3 integrate .. //depot/projects/hammer/bin/sh/expand.c#8 integrate .. //depot/projects/hammer/bin/sh/sh.1#7 integrate .. //depot/projects/hammer/bin/sh/shell.h#2 integrate .. //depot/projects/hammer/bin/test/Makefile#2 integrate .. //depot/projects/hammer/contrib/amd/AUTHORS#2 integrate .. //depot/projects/hammer/contrib/amd/BUGS#2 integrate .. //depot/projects/hammer/contrib/amd/COPYING#2 integrate .. //depot/projects/hammer/contrib/amd/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/amd/INSTALL#2 integrate .. //depot/projects/hammer/contrib/amd/MIRRORS#2 integrate .. //depot/projects/hammer/contrib/amd/NEWS#2 integrate .. //depot/projects/hammer/contrib/amd/README#2 integrate .. //depot/projects/hammer/contrib/amd/README.ldap#2 integrate .. //depot/projects/hammer/contrib/amd/amd/am_ops.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amd.8#3 integrate .. //depot/projects/hammer/contrib/amd/amd/amd.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amd.h#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amfs_auto.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amfs_direct.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amfs_error.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amfs_host.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amfs_inherit.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amfs_link.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amfs_linkx.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amfs_nfsl.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amfs_nfsx.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amfs_program.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amfs_root.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amfs_toplvl.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amfs_union.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amq_subr.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/amq_svc.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/autil.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/clock.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/conf.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/conf_parse.y#2 integrate .. //depot/projects/hammer/contrib/amd/amd/conf_tok.l#2 integrate .. //depot/projects/hammer/contrib/amd/amd/get_args.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/info_file.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/info_hesiod.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/info_ldap.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/info_ndbm.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/info_nis.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/info_nisplus.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/info_passwd.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/info_union.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/map.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/mapc.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/mntfs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/nfs_prot_svc.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/nfs_start.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/nfs_subr.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_TEMPLATE.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_autofs.c#2 delete .. //depot/projects/hammer/contrib/amd/amd/ops_cachefs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_cdfs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_efs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_lofs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_mfs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_nfs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_nfs3.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_nullfs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_pcfs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_tfs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_tmpfs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_ufs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_umapfs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_unionfs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/ops_xfs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/opts.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/restart.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/rpc_fwd.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/sched.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/srvr_amfs_auto.c#2 integrate .. //depot/projects/hammer/contrib/amd/amd/srvr_nfs.c#2 integrate .. //depot/projects/hammer/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/hammer/contrib/amd/amq/amq.c#2 integrate .. //depot/projects/hammer/contrib/amd/amq/amq.h#2 integrate .. //depot/projects/hammer/contrib/amd/amq/amq_clnt.c#2 integrate .. //depot/projects/hammer/contrib/amd/amq/amq_xdr.c#2 integrate .. //depot/projects/hammer/contrib/amd/amq/pawd.1#2 integrate .. //depot/projects/hammer/contrib/amd/amq/pawd.c#2 integrate .. //depot/projects/hammer/contrib/amd/aux_conf.h.in#2 integrate .. //depot/projects/hammer/contrib/amd/bootstrap#1 branch .. //depot/projects/hammer/contrib/amd/commit#1 branch .. //depot/projects/hammer/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate .. //depot/projects/hammer/contrib/amd/conf/mount/mount_default.c#1 branch .. //depot/projects/hammer/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate .. //depot/projects/hammer/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#1 branch .. //depot/projects/hammer/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#2 integrate .. //depot/projects/hammer/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate .. //depot/projects/hammer/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate .. //depot/projects/hammer/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#1 branch .. //depot/projects/hammer/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#1 branch .. //depot/projects/hammer/contrib/amd/conf/transp/transp_sockets.c#3 integrate .. //depot/projects/hammer/contrib/amd/conf/umount/umount_bsd44.c#2 integrate .. //depot/projects/hammer/contrib/amd/config.guess#1 branch .. //depot/projects/hammer/contrib/amd/config.guess.long#1 branch .. //depot/projects/hammer/contrib/amd/config.sub#1 branch .. //depot/projects/hammer/contrib/amd/configure.in#1 branch .. //depot/projects/hammer/contrib/amd/cvs-server.txt#1 branch .. //depot/projects/hammer/contrib/amd/depcomp#1 branch .. //depot/projects/hammer/contrib/amd/doc/am-utils.texi#2 integrate .. //depot/projects/hammer/contrib/amd/doc/mdate-sh#1 branch .. //depot/projects/hammer/contrib/amd/doc/stamp-vti#2 delete .. //depot/projects/hammer/contrib/amd/doc/texinfo.tex#2 integrate .. //depot/projects/hammer/contrib/amd/fixmount/fixmount.8#3 integrate .. //depot/projects/hammer/contrib/amd/fixmount/fixmount.c#2 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/fsi_analyze.c#2 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/fsi_data.h#2 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/fsi_dict.c#2 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/fsi_gram.y#2 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/fsi_lex.l#2 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/fsi_util.c#2 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.8#3 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.c#2 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.h#2 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/wr_atab.c#2 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/wr_bparam.c#2 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/wr_dumpset.c#2 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/wr_exportfs.c#2 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/wr_fstab.c#2 integrate .. //depot/projects/hammer/contrib/amd/hlfsd/hlfsd.8#3 integrate .. //depot/projects/hammer/contrib/amd/hlfsd/hlfsd.c#2 integrate .. //depot/projects/hammer/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/hammer/contrib/amd/hlfsd/homedir.c#2 integrate .. //depot/projects/hammer/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate .. //depot/projects/hammer/contrib/amd/hlfsd/stubs.c#2 integrate .. //depot/projects/hammer/contrib/amd/include/am_compat.h#2 integrate .. //depot/projects/hammer/contrib/amd/include/am_defs.h#2 integrate .. //depot/projects/hammer/contrib/amd/include/am_utils.h#2 integrate .. //depot/projects/hammer/contrib/amd/include/am_xdr_func.h#2 integrate .. //depot/projects/hammer/contrib/amd/include/amq_defs.h#2 integrate .. //depot/projects/hammer/contrib/amd/include/mount_headers1.h#2 integrate .. //depot/projects/hammer/contrib/amd/install-sh#1 branch .. //depot/projects/hammer/contrib/amd/libamu/amu.h#2 integrate .. //depot/projects/hammer/contrib/amd/libamu/hasmntopt.c#2 integrate .. //depot/projects/hammer/contrib/amd/libamu/misc_rpc.c#2 integrate .. //depot/projects/hammer/contrib/amd/libamu/mount_fs.c#2 integrate .. //depot/projects/hammer/contrib/amd/libamu/mtab.c#2 integrate .. //depot/projects/hammer/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate .. //depot/projects/hammer/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/hammer/contrib/amd/libamu/util.c#2 integrate .. //depot/projects/hammer/contrib/amd/libamu/wire.c#2 integrate .. //depot/projects/hammer/contrib/amd/libamu/xdr_func.c#2 integrate .. //depot/projects/hammer/contrib/amd/libamu/xutil.c#2 integrate .. //depot/projects/hammer/contrib/amd/ltmain.sh#1 branch .. //depot/projects/hammer/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/hammer/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/hammer/contrib/amd/m4/amindent#1 branch .. //depot/projects/hammer/contrib/amd/m4/autopat#1 branch .. //depot/projects/hammer/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/hammer/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/c_void_p.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/cache_check_dynamic.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_amu_fs.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_checkmount_style.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_extern.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_fhandle.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_field.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_fs_headers.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_fs_mntent.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_gnu_getopt.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_hide_mount_type.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_lib2.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_map_funcs.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_mnttab_file_name.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_mnttab_location.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_mnttab_opt.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_mnttab_style.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_mnttab_type.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_mount_style.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_mount_trap.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_mount_type.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_mtype_printf_type.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_mtype_type.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_network_transport_type.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_nfs_fh_dref.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_nfs_hn_dref.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_nfs_prot_headers.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_nfs_sa_dref.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_nfs_socket_connection.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_os_libs.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_restartable_signal_handler.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_umount_style.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_unmount_args.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/check_unmount_call.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/expand_cpp_hex.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/expand_cpp_int.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/expand_cpp_string.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/expand_run_string.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/extern_optarg.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/extern_sys_errlist.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/func_bad_memcmp.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/func_bad_yp_all.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/header_templates.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/host_macros.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/linux_headers.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/localconfig.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/mount_headers.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/name_package.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/name_version.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/opt_amu_cflags.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/opt_cppflags.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/opt_debug.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/opt_ldflags.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/opt_libs.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/os_cflags.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/os_cppflags.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/os_ldflags.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/package_bugreport.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/package_name.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/package_version.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/save_state.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/struct_field_nfs_fh.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/struct_mntent.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/struct_mnttab.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/struct_nfs_args.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/struct_nfs_fh.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/struct_nfs_fh3.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/try_compile_anyfs.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/try_compile_nfs.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/try_compile_rpc.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_auth_create_gidlist.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_cachefs_args.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_cdfs_args.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_efs_args.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_lofs_args.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_mfs_args.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_pcfs_args.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_rfs_args.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_svc_in_arg.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_time_t.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_tmpfs_args.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_ufs_args.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_xdrproc_t.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_xfs_args.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/type_yp_order_outorder.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/macros/with_addon.m4#1 branch .. //depot/projects/hammer/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/hammer/contrib/amd/m4/mkconf#1 branch .. //depot/projects/hammer/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/hammer/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/hammer/contrib/amd/missing#1 branch .. //depot/projects/hammer/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate .. //depot/projects/hammer/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate .. //depot/projects/hammer/contrib/amd/mkinstalldirs#1 branch .. //depot/projects/hammer/contrib/amd/scripts/amd.conf-sample#2 integrate .. //depot/projects/hammer/contrib/amd/scripts/amd.conf.5#3 integrate .. //depot/projects/hammer/contrib/amd/scripts/automount2amd.8#2 integrate .. //depot/projects/hammer/contrib/amd/scripts/ctl-amd.in#2 integrate .. //depot/projects/hammer/contrib/amd/scripts/ctl-hlfsd.in#2 integrate .. //depot/projects/hammer/contrib/amd/scripts/expn.1#2 integrate .. //depot/projects/hammer/contrib/amd/scripts/expn.in#2 integrate .. //depot/projects/hammer/contrib/amd/scripts/lostaltmail.in#2 integrate .. //depot/projects/hammer/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/hammer/contrib/amd/tasks#2 integrate .. //depot/projects/hammer/contrib/amd/wire-test/wire-test.8#2 integrate .. //depot/projects/hammer/contrib/amd/wire-test/wire-test.c#2 integrate .. //depot/projects/hammer/contrib/gcc/ChangeLog#7 integrate .. //depot/projects/hammer/contrib/gcc/Makefile.in#7 integrate .. //depot/projects/hammer/contrib/gcc/c-decl.c#6 integrate .. //depot/projects/hammer/contrib/gcc/c-lex.c#4 integrate .. //depot/projects/hammer/contrib/gcc/c-pragma.c#4 integrate .. //depot/projects/hammer/contrib/gcc/c-typeck.c#5 integrate .. //depot/projects/hammer/contrib/gcc/calls.c#6 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/freebsd.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/darwin.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/freebsd-spec.h#6 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h#9 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd64.h#4 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/gthr-win32.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/winnt.c#4 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/ia64.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/ia64.md#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000.c#6 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/freebsd.h#6 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sparc.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cp/ChangeLog#7 integrate .. //depot/projects/hammer/contrib/gcc/cp/call.c#4 integrate .. //depot/projects/hammer/contrib/gcc/cp/class.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cp/cp-tree.h#6 integrate .. //depot/projects/hammer/contrib/gcc/cp/decl.c#7 integrate .. //depot/projects/hammer/contrib/gcc/cp/init.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cp/method.c#4 integrate .. //depot/projects/hammer/contrib/gcc/cp/parse.y#5 integrate .. //depot/projects/hammer/contrib/gcc/cp/pt.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cp/search.c#5 integrate .. //depot/projects/hammer/contrib/gcc/cppexp.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cppinit.c#5 integrate .. //depot/projects/hammer/contrib/gcc/dbxout.c#5 integrate .. //depot/projects/hammer/contrib/gcc/doc/c-tree.texi#4 integrate .. //depot/projects/hammer/contrib/gcc/doc/collect2.texi#3 integrate .. //depot/projects/hammer/contrib/gcc/doc/cpp.texi#5 integrate .. //depot/projects/hammer/contrib/gcc/doc/cppopts.texi#4 integrate .. //depot/projects/hammer/contrib/gcc/doc/extend.texi#5 integrate .. //depot/projects/hammer/contrib/gcc/doc/fragments.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/headerdirs.texi#3 integrate .. //depot/projects/hammer/contrib/gcc/doc/include/texinfo.tex#3 integrate .. //depot/projects/hammer/contrib/gcc/doc/invoke.texi#7 integrate .. //depot/projects/hammer/contrib/gcc/doc/md.texi#4 integrate .. //depot/projects/hammer/contrib/gcc/doc/portability.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/rtl.texi#4 integrate .. //depot/projects/hammer/contrib/gcc/doc/sourcebuild.texi#4 integrate .. //depot/projects/hammer/contrib/gcc/doc/trouble.texi#4 integrate .. //depot/projects/hammer/contrib/gcc/dwarf2out.c#4 integrate .. //depot/projects/hammer/contrib/gcc/expr.c#6 integrate .. //depot/projects/hammer/contrib/gcc/f/ChangeLog#6 integrate .. //depot/projects/hammer/contrib/gcc/flow.c#5 integrate .. //depot/projects/hammer/contrib/gcc/gcse.c#3 integrate .. //depot/projects/hammer/contrib/gcc/integrate.c#4 integrate .. //depot/projects/hammer/contrib/gcc/libgcc-std.ver#3 integrate .. //depot/projects/hammer/contrib/gcc/loop.c#7 integrate .. //depot/projects/hammer/contrib/gcc/optabs.c#6 integrate .. //depot/projects/hammer/contrib/gcc/sched-deps.c#6 integrate .. //depot/projects/hammer/contrib/gcc/sched-ebb.c#3 integrate .. //depot/projects/hammer/contrib/gcc/sched-int.h#4 integrate .. //depot/projects/hammer/contrib/gcc/sched-rgn.c#3 integrate .. //depot/projects/hammer/contrib/gcc/toplev.c#7 integrate .. //depot/projects/hammer/contrib/gcc/tree-inline.c#5 integrate .. //depot/projects/hammer/contrib/gcc/unroll.c#6 integrate .. //depot/projects/hammer/contrib/gcc/unwind-c.c#2 integrate .. //depot/projects/hammer/contrib/gcc/varasm.c#6 integrate .. //depot/projects/hammer/contrib/gcc/version.c#7 integrate .. //depot/projects/hammer/contrib/gnu-sort/ABOUT-NLS#2 integrate .. //depot/projects/hammer/contrib/gnu-sort/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/gnu-sort/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/gnu-sort/NEWS#2 integrate .. //depot/projects/hammer/contrib/gnu-sort/README#2 integrate .. //depot/projects/hammer/contrib/gnu-sort/README-alpha#2 delete .. //depot/projects/hammer/contrib/gnu-sort/THANKS#2 integrate .. //depot/projects/hammer/contrib/gnu-sort/lib/getopt.c#2 integrate .. //depot/projects/hammer/contrib/gnu-sort/lib/getopt.h#2 integrate .. //depot/projects/hammer/contrib/gnu-sort/lib/getopt1.c#2 integrate .. //depot/projects/hammer/contrib/gnu-sort/lib/gettext.h#1 branch .. //depot/projects/hammer/contrib/gnu-sort/lib/hard-locale.c#2 integrate .. //depot/projects/hammer/contrib/gnu-sort/lib/xmalloc.c#2 integrate .. //depot/projects/hammer/contrib/gnu-sort/man/sort.1#2 integrate .. //depot/projects/hammer/contrib/gnu-sort/src/sort.c#2 integrate .. //depot/projects/hammer/contrib/gnu-sort/src/sys2.h#2 integrate .. //depot/projects/hammer/contrib/gnu-sort/src/system.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grotty/grotty.man#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/eqnrc#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/troffrc#5 integrate .. //depot/projects/hammer/contrib/groff/tmac/tty-char.tmac#5 integrate .. //depot/projects/hammer/contrib/groff/tmac/tty.tmac#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/FREEBSD-upgrade#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/README#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/RELNOTES#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/clparse.c#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.8#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.c#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.conf.5#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/scripts/freebsd#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/dhcp-options.5#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/discover.c#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/dispatch.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/options.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/parse.c#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/print.c#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/tables.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/dhcpd.h#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/version.h#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_mkupdate.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/result.c#2 integrate .. //depot/projects/hammer/contrib/libf2c/ChangeLog#6 integrate .. //depot/projects/hammer/contrib/libobjc/ChangeLog#6 integrate .. //depot/projects/hammer/contrib/libreadline/CHANGELOG#2 integrate .. //depot/projects/hammer/contrib/libreadline/CHANGES#2 integrate .. //depot/projects/hammer/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/libreadline/INSTALL#2 integrate .. //depot/projects/hammer/contrib/libreadline/MANIFEST#2 integrate .. //depot/projects/hammer/contrib/libreadline/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/libreadline/README#2 integrate .. //depot/projects/hammer/contrib/libreadline/aclocal.m4#2 integrate .. //depot/projects/hammer/contrib/libreadline/ansi_stdlib.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/bind.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/callback.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/chardefs.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/compat.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/complete.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/config.h.in#2 integrate .. //depot/projects/hammer/contrib/libreadline/configure#2 integrate .. //depot/projects/hammer/contrib/libreadline/configure.in#2 integrate .. //depot/projects/hammer/contrib/libreadline/display.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/hist.texinfo#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/history.3#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/hstech.texinfo#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/hsuser.texinfo#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/manvers.texinfo#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/readline.3#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/rlman.texinfo#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/rltech.texinfo#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/rluser.texinfo#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/rluserman.texinfo#2 integrate .. //depot/projects/hammer/contrib/libreadline/emacs_keymap.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/examples/Inputrc#2 integrate .. //depot/projects/hammer/contrib/libreadline/examples/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/libreadline/examples/fileman.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/examples/histexamp.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/examples/manexamp.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/examples/readlinebuf.h#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/rl.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/examples/rlcat.c#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/rltest.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/examples/rlversion.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/funmap.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/histexpand.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/histfile.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/histlib.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/history.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/history.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/histsearch.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/input.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/isearch.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/keymaps.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/kill.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/macro.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/mbutil.c#1 branch .. //depot/projects/hammer/contrib/libreadline/misc.c#1 branch .. //depot/projects/hammer/contrib/libreadline/nls.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/parens.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/posixdir.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/readline.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/readline.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/rlconf.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/rldefs.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/rlmbutil.h#1 branch .. //depot/projects/hammer/contrib/libreadline/rlprivate.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/rlshell.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/rlstdc.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/rltty.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/rltypedefs.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/search.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/shell.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/shlib/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/libreadline/signals.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/support/config.guess#2 integrate .. //depot/projects/hammer/contrib/libreadline/support/config.sub#2 integrate .. //depot/projects/hammer/contrib/libreadline/support/install.sh#2 integrate .. //depot/projects/hammer/contrib/libreadline/support/mkdirs#2 integrate .. //depot/projects/hammer/contrib/libreadline/support/mkdist#2 integrate .. //depot/projects/hammer/contrib/libreadline/support/shlib-install#2 integrate .. //depot/projects/hammer/contrib/libreadline/support/shobj-conf#2 integrate .. //depot/projects/hammer/contrib/libreadline/support/wcwidth.c#1 branch .. //depot/projects/hammer/contrib/libreadline/terminal.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/text.c#1 branch .. //depot/projects/hammer/contrib/libreadline/tilde.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/tilde.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/undo.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/util.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/vi_keymap.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/vi_mode.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/xmalloc.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/xmalloc.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/ChangeLog#7 integrate .. //depot/projects/hammer/contrib/libstdc++/config/abi/hppa-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/abi/mips-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/abi/sparc-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/abi/x86_64-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/hammer/contrib/libstdc++/configure#6 integrate .. //depot/projects/hammer/contrib/libstdc++/configure.in#5 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/c++config#7 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/locale_facets.tcc#7 integrate .. //depot/projects/hammer/contrib/one-true-awk/FIXES#4 integrate .. //depot/projects/hammer/contrib/one-true-awk/FREEBSD-upgrade#4 integrate .. //depot/projects/hammer/contrib/one-true-awk/b.c#4 integrate .. //depot/projects/hammer/contrib/one-true-awk/lex.c#3 integrate .. //depot/projects/hammer/contrib/one-true-awk/main.c#4 integrate .. //depot/projects/hammer/contrib/one-true-awk/run.c#4 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/ctx.c#3 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/kiconv.c#3 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/rap.c#3 integrate .. //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.8#2 integrate .. //depot/projects/hammer/contrib/smbfs/smbutil/common.h#3 integrate .. //depot/projects/hammer/contrib/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/hammer/contrib/top/top.X#2 integrate .. //depot/projects/hammer/etc/Makefile#15 integrate .. //depot/projects/hammer/etc/auth.conf#2 integrate .. //depot/projects/hammer/etc/defaults/Makefile#2 integrate .. //depot/projects/hammer/etc/defaults/devfs.rules#1 branch .. //depot/projects/hammer/etc/defaults/pccard.conf#10 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#14 integrate .. //depot/projects/hammer/etc/devd.conf#5 integrate .. //depot/projects/hammer/etc/etc.ia64/ttys#2 integrate .. //depot/projects/hammer/etc/etc.sparc64/ttys#3 integrate .. //depot/projects/hammer/etc/gettytab#2 integrate .. //depot/projects/hammer/etc/isdn/Makefile#2 integrate .. //depot/projects/hammer/etc/mtree/BSD.local.dist#9 integrate .. //depot/projects/hammer/etc/mtree/BSD.root.dist#4 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#9 integrate .. //depot/projects/hammer/etc/network.subr#4 integrate .. //depot/projects/hammer/etc/newsyslog.conf#7 integrate .. //depot/projects/hammer/etc/pccard_ether#6 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#12 integrate .. //depot/projects/hammer/etc/rc.d/atm1#4 integrate .. //depot/projects/hammer/etc/rc.d/atm2#1 branch .. //depot/projects/hammer/etc/rc.d/atm2.sh#5 delete .. //depot/projects/hammer/etc/rc.d/atm3#1 branch .. //depot/projects/hammer/etc/rc.d/atm3.sh#2 delete .. //depot/projects/hammer/etc/rc.d/devfs#6 integrate .. //depot/projects/hammer/etc/rc.d/dhclient#5 integrate .. //depot/projects/hammer/etc/rc.d/hostname#3 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#7 integrate .. //depot/projects/hammer/etc/rc.d/ipfilter#9 integrate .. //depot/projects/hammer/etc/rc.d/ipfw#5 integrate .. //depot/projects/hammer/etc/rc.d/ipsec#4 integrate .. //depot/projects/hammer/etc/rc.d/jail#3 integrate .. //depot/projects/hammer/etc/rc.d/ldconfig#7 integrate .. //depot/projects/hammer/etc/rc.d/localdaemons#3 delete .. //depot/projects/hammer/etc/rc.d/localpkg#1 branch .. //depot/projects/hammer/etc/rc.d/netif#3 integrate .. //depot/projects/hammer/etc/rc.d/netoptions#3 integrate .. //depot/projects/hammer/etc/rc.d/network1#7 delete .. //depot/projects/hammer/etc/rc.d/network2#4 delete .. //depot/projects/hammer/etc/rc.d/network3#5 delete .. //depot/projects/hammer/etc/rc.d/routing#3 integrate .. //depot/projects/hammer/etc/rc.d/ttys#3 integrate .. //depot/projects/hammer/etc/rc.subr#9 integrate .. //depot/projects/hammer/etc/sendmail/Makefile#4 integrate .. //depot/projects/hammer/etc/services#5 integrate .. //depot/projects/hammer/games/fortune/datfiles/Makefile#4 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2#6 integrate .. //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#6 integrate .. //depot/projects/hammer/games/fortune/datfiles/startrek#5 integrate .. //depot/projects/hammer/games/fortune/strfile/strfile.c#3 integrate .. //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#4 integrate .. //depot/projects/hammer/gnu/lib/libreadline/config.h#2 integrate .. //depot/projects/hammer/gnu/lib/libreadline/readline/Makefile#2 integrate .. //depot/projects/hammer/gnu/lib/libregex/regex.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/amd64-freebsd/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/i386-freebsd/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.alpha#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.amd64#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.i386#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.ia64#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.powerpc#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.sparc64#3 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_int/Makefile#7 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/cvsbug/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/lib/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/Makefile.inc#4 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/font/devkoi8-r/R.proto#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/fr.ISO8859-1#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/koi8-r.tmac#1 branch .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#8 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/ru.KOI8-R#2 integrate .. //depot/projects/hammer/gnu/usr.bin/man/man/glob.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/man/manpath/manpath.config#3 integrate .. //depot/projects/hammer/gnu/usr.bin/patch/backupfile.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/send-pr/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/send-pr/send-pr.sh#3 integrate .. //depot/projects/hammer/gnu/usr.bin/sort/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/sort/config.h#3 integrate .. //depot/projects/hammer/gnu/usr.bin/sort/libintl.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/tar/config.h#3 integrate .. //depot/projects/hammer/include/Makefile#15 integrate .. //depot/projects/hammer/include/pthread.h#4 integrate .. //depot/projects/hammer/include/unistd.h#10 integrate .. //depot/projects/hammer/include/varargs.h#1 branch .. //depot/projects/hammer/kerberos5/lib/libasn1/Makefile#6 integrate .. //depot/projects/hammer/kerberos5/lib/libhdb/Makefile#7 integrate .. //depot/projects/hammer/lib/Makefile#24 integrate .. //depot/projects/hammer/lib/libalias/Makefile#4 integrate .. //depot/projects/hammer/lib/libalias/alias_db.c#3 integrate .. //depot/projects/hammer/lib/libalias/libalias.3#4 integrate .. //depot/projects/hammer/lib/libatm/Makefile#4 integrate .. //depot/projects/hammer/lib/libatm/atm_addr.c#4 integrate .. //depot/projects/hammer/lib/libatm/cache_key.c#3 integrate .. //depot/projects/hammer/lib/libatm/ioctl_subr.c#4 integrate .. //depot/projects/hammer/lib/libatm/ip_addr.c#4 integrate .. //depot/projects/hammer/lib/libatm/ip_checksum.c#3 integrate .. //depot/projects/hammer/lib/libatm/libatm.h#3 integrate .. //depot/projects/hammer/lib/libc/Makefile#8 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/makecontext.c#3 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/signalcontext.c#1 branch .. //depot/projects/hammer/lib/libc/alpha/sys/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/alpha/sys/Ovfork.S#3 integrate .. //depot/projects/hammer/lib/libc/alpha/sys/fork.S#3 integrate .. //depot/projects/hammer/lib/libc/alpha/sys/pipe.S#3 integrate .. //depot/projects/hammer/lib/libc/alpha/sys/setlogin.S#3 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/signalcontext.c#4 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/getcontext.S#1 branch .. //depot/projects/hammer/lib/libc/amd64/sys/vfork.S#6 integrate .. //depot/projects/hammer/lib/libc/compat-43/sigvec.2#3 integrate .. //depot/projects/hammer/lib/libc/db/man/btree.3#3 integrate .. //depot/projects/hammer/lib/libc/db/man/dbm.3#3 integrate .. //depot/projects/hammer/lib/libc/db/man/dbopen.3#4 integrate .. //depot/projects/hammer/lib/libc/db/man/hash.3#3 integrate .. //depot/projects/hammer/lib/libc/db/man/recno.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#9 integrate .. //depot/projects/hammer/lib/libc/gen/arc4random.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/confstr.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/ctermid.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/dlinfo.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/exec.3#6 integrate .. //depot/projects/hammer/lib/libc/gen/fnmatch.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/fts.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/getcwd.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/getdomainname.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/getfsent.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/getgrent.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/gethostname.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/gethostname.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/getpwent.3#6 integrate .. //depot/projects/hammer/lib/libc/gen/glob.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/msgctl.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/pmadvise.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/signal.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/sysconf.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/tcsetattr.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/uname.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/wordexp.3#4 integrate .. //depot/projects/hammer/lib/libc/i386/sys/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/i386/sys/getcontext.S#1 branch .. //depot/projects/hammer/lib/libc/i386/sys/i386_get_ldt.2#4 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/_setjmp.S#5 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/fpgetmask.c#2 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/fpsetmask.c#2 integrate .. //depot/projects/hammer/lib/libc/ia64/sys/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/ia64/sys/Ovfork.S#3 integrate .. //depot/projects/hammer/lib/libc/ia64/sys/fork.S#3 integrate .. //depot/projects/hammer/lib/libc/ia64/sys/getcontext.S#1 branch .. //depot/projects/hammer/lib/libc/ia64/sys/setlogin.S#3 integrate .. //depot/projects/hammer/lib/libc/ia64/sys/swapcontext.S#1 branch .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#10 integrate .. //depot/projects/hammer/lib/libc/locale/big5.5#1 branch .. //depot/projects/hammer/lib/libc/locale/btowc.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/collcmp.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/ctype.3#3 integrate .. //depot/projects/hammer/lib/libc/locale/gb18030.5#1 branch .. //depot/projects/hammer/lib/libc/locale/gb18030.c#1 branch .. //depot/projects/hammer/lib/libc/locale/gbk.5#1 branch .. //depot/projects/hammer/lib/libc/locale/mblen.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/mbstowcs.c#4 integrate .. //depot/projects/hammer/lib/libc/locale/mbtowc.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/mskanji.5#1 branch .. //depot/projects/hammer/lib/libc/locale/multibyte.3#5 integrate .. //depot/projects/hammer/lib/libc/locale/nl_langinfo.3#2 integrate .. //depot/projects/hammer/lib/libc/locale/rune.3#5 integrate .. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#6 integrate .. //depot/projects/hammer/lib/libc/locale/table.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/wcstombs.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/wctob.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/wctomb.c#3 integrate .. //depot/projects/hammer/lib/libc/net/addr2ascii.3#3 integrate .. //depot/projects/hammer/lib/libc/net/ethers.3#3 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.3#3 integrate .. //depot/projects/hammer/lib/libc/net/getifaddrs.3#2 integrate .. //depot/projects/hammer/lib/libc/net/getnameinfo.3#3 integrate .. //depot/projects/hammer/lib/libc/net/if_indextoname.3#2 integrate .. //depot/projects/hammer/lib/libc/net/inet6_option_space.3#3 integrate .. //depot/projects/hammer/lib/libc/net/inet6_rthdr_space.3#3 integrate .. //depot/projects/hammer/lib/libc/net/resolver.3#3 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac.c#4 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac_free.3#4 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac_get.3#3 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac_is_present_np.3#3 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac_prepare.3#3 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac_set.3#3 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac_text.3#5 integrate .. //depot/projects/hammer/lib/libc/powerpc/sys/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/regex/regex.3#4 integrate .. //depot/projects/hammer/lib/libc/rpc/publickey.5#2 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc.3#3 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_svc_calls.3#3 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_svc_create.3#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/signalcontext.c#1 branch .. //depot/projects/hammer/lib/libc/sparc64/sys/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/stdio/funopen.3#2 integrate .. //depot/projects/hammer/lib/libc/stdio/tmpnam.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/abort.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/getopt.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/hcreate.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#8 integrate .. //depot/projects/hammer/lib/libc/stdlib/rand.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/random.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/random.c#3 integrate .. //depot/projects/hammer/lib/libc/stdtime/ctime.3#3 integrate .. //depot/projects/hammer/lib/libc/string/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/string/bcmp.3#3 integrate .. //depot/projects/hammer/lib/libc/string/bcopy.3#3 integrate .. //depot/projects/hammer/lib/libc/string/bzero.3#3 integrate .. //depot/projects/hammer/lib/libc/string/ffs.3#3 integrate .. //depot/projects/hammer/lib/libc/string/index.3#4 integrate .. //depot/projects/hammer/lib/libc/string/rindex.3#4 delete .. //depot/projects/hammer/lib/libc/string/strcasecmp.3#3 integrate .. //depot/projects/hammer/lib/libc/string/strchr.3#3 integrate .. //depot/projects/hammer/lib/libc/string/strrchr.3#2 delete .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#8 integrate .. //depot/projects/hammer/lib/libc/sys/accept.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/acct.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/chmod.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/clock_gettime.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/connect.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/getitimer.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/getlogin.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/getsockopt.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/gettimeofday.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/intro.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/ioctl.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/kqueue.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/ktrace.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/madvise.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/mincore.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/mlockall.2#1 branch .. //depot/projects/hammer/lib/libc/sys/mount.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/open.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/poll.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/ptrace.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/quotactl.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/read.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/reboot.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/recv.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/select.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/send.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/setgroups.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/sigaction.2#9 integrate .. //depot/projects/hammer/lib/libc/sys/sigprocmask.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/socket.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/stat.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/sysarch.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/syscall.2#3 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid.3#3 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid_compare.c#2 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid_create.c#2 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid_create_nil.c#2 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid_equal.c#2 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid_from_string.c#2 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid_hash.c#2 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid_is_nil.c#2 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid_to_string.c#2 integrate .. //depot/projects/hammer/lib/libc_r/man/pthread_once.3#3 integrate .. //depot/projects/hammer/lib/libcalendar/calendar.3#2 integrate .. //depot/projects/hammer/lib/libcam/Makefile#3 integrate .. //depot/projects/hammer/lib/libcam/cam_cdbparse.3#3 integrate .. //depot/projects/hammer/lib/libcompat/4.1/ftime.3#2 integrate .. //depot/projects/hammer/lib/libcompat/4.4/cuserid.3#3 integrate .. //depot/projects/hammer/lib/libcrypt/Makefile#4 integrate .. //depot/projects/hammer/lib/libdevinfo/devinfo.3#4 integrate .. //depot/projects/hammer/lib/libdevstat/Makefile#5 integrate .. //depot/projects/hammer/lib/libdevstat/devstat.3#5 integrate .. //depot/projects/hammer/lib/libdevstat/devstat.c#5 integrate .. //depot/projects/hammer/lib/libdisk/disk.c#14 integrate .. //depot/projects/hammer/lib/libedit/Makefile#3 integrate .. //depot/projects/hammer/lib/libedit/editline.3#4 integrate .. //depot/projects/hammer/lib/libedit/makelist#2 integrate .. //depot/projects/hammer/lib/libexpat/Makefile#3 integrate .. //depot/projects/hammer/lib/libfetch/fetch.3#6 integrate .. //depot/projects/hammer/lib/libfetch/ftp.c#6 integrate .. //depot/projects/hammer/lib/libgeom/Makefile#5 integrate .. //depot/projects/hammer/lib/libipsec/Makefile#3 integrate .. //depot/projects/hammer/lib/libipsec/ipsec_strerror.3#3 integrate .. //depot/projects/hammer/lib/libipx/Makefile#2 integrate .. //depot/projects/hammer/lib/libkvm/Makefile#2 integrate .. //depot/projects/hammer/lib/libkvm/kvm.c#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm.h#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_file.c#2 integrate .. //depot/projects/hammer/lib/libkvm/kvm_getswapinfo.c#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#13 integrate .. //depot/projects/hammer/lib/libmd/Makefile#3 integrate .. //depot/projects/hammer/lib/libmp/libmp.3#2 integrate .. //depot/projects/hammer/lib/libncp/ncpl_conn.c#4 integrate .. //depot/projects/hammer/lib/libncp/ncpl_subr.c#5 integrate .. //depot/projects/hammer/lib/libncurses/Makefile#12 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#12 integrate .. //depot/projects/hammer/lib/libpthread/arch/alpha/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/alpha/alpha/context.S#1 branch .. //depot/projects/hammer/lib/libpthread/arch/alpha/alpha/enter_uts.S#1 branch .. //depot/projects/hammer/lib/libpthread/arch/alpha/alpha/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libpthread/arch/alpha/include/atomic_ops.h#1 branch .. //depot/projects/hammer/lib/libpthread/arch/alpha/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libpthread/arch/amd64/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/context.S#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/enter_uts.S#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libpthread/arch/amd64/include/atomic_ops.h#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/amd64/include/ksd.h#2 delete .. //depot/projects/hammer/lib/libpthread/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/_atomic_lock.S#2 delete .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/ksd.c#4 delete .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/thr_enter_uts.S#5 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/thr_getcontext.S#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/thr_switch.S#5 delete .. //depot/projects/hammer/lib/libpthread/arch/i386/include/atomic_ops.h#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/include/ksd.h#5 delete .. //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#4 integrate .. //depot/projects/hammer/lib/libpthread/arch/ia64/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libpthread/arch/ia64/ia64/context.S#3 integrate .. //depot/projects/hammer/lib/libpthread/arch/ia64/ia64/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libpthread/arch/ia64/include/ksd.h#2 delete .. //depot/projects/hammer/lib/libpthread/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/hammer/lib/libpthread/man/pthread_once.3#2 integrate .. //depot/projects/hammer/lib/libpthread/pthread.map#4 integrate .. //depot/projects/hammer/lib/libpthread/support/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libpthread/sys/lock.c#5 integrate .. //depot/projects/hammer/lib/libpthread/sys/lock.h#5 integrate .. //depot/projects/hammer/lib/libpthread/test/Makefile#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_barrier.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_barrierattr.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#12 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_concurrency.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#14 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_creat.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#10 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_exit.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_fork.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#12 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#19 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#9 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_nanosleep.c#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_once.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_pause.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_printf.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#15 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_pspinlock.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_rtld.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_rwlock.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#17 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigaction.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigmask.c#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigpending.c#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigprocmask.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#9 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#9 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sleep.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_spec.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_system.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_tcdrain.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_wait.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_wait4.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_waitpid.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_yield.c#6 integrate .. //depot/projects/hammer/lib/libradius/libradius.3#2 integrate .. //depot/projects/hammer/lib/libsbuf/Makefile#2 integrate .. //depot/projects/hammer/lib/libstand/libstand.3#4 integrate .. //depot/projects/hammer/lib/libtacplus/libtacplus.3#4 integrate .. //depot/projects/hammer/lib/libufs/Makefile#5 integrate .. //depot/projects/hammer/lib/libusbhid/usbhid.3#4 integrate .. //depot/projects/hammer/lib/libutil/Makefile#3 integrate .. //depot/projects/hammer/lib/libutil/realhostname.3#3 integrate .. //depot/projects/hammer/lib/libutil/realhostname_sa.3#4 integrate .. //depot/projects/hammer/lib/libz/Makefile#2 integrate .. //depot/projects/hammer/lib/msun/Makefile#5 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.8#7 integrate .. //depot/projects/hammer/libexec/ftpd/popen.c#2 integrate .. //depot/projects/hammer/libexec/lukemftpd/Makefile#7 integrate .. //depot/projects/hammer/libexec/lukemftpd/nbsd2fbsd.h#2 integrate .. //depot/projects/hammer/libexec/rpc.rquotad/rquotad.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/Makefile#6 integrate .. //depot/projects/hammer/libexec/rtld-elf/malloc.c#5 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#11 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.h#5 integrate .. //depot/projects/hammer/libexec/talkd/talkd.8#2 integrate .. //depot/projects/hammer/release/Makefile#35 integrate .. //depot/projects/hammer/release/Makefile.inc.docports#5 integrate .. //depot/projects/hammer/release/alpha/dokern.sh#9 delete .. //depot/projects/hammer/release/alpha/drivers.conf#12 delete .. //depot/projects/hammer/release/alpha/fixit_crunch.conf#5 delete .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#7 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#8 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#27 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/readme/article.sgml#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#38 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/errata/article.sgml#8 integrate .. //depot/projects/hammer/release/ia64/doFS.sh#5 delete .. //depot/projects/hammer/release/ia64/dokern.sh#2 delete .. //depot/projects/hammer/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/hammer/release/pc98/dokern.sh#11 integrate .. //depot/projects/hammer/release/scripts/doFS.sh#11 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#9 integrate .. //depot/projects/hammer/release/sparc64/dokern.sh#2 delete .. //depot/projects/hammer/release/sparc64/mkisoimages.sh#3 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#6 integrate .. //depot/projects/hammer/sbin/Makefile#15 integrate .. //depot/projects/hammer/sbin/Makefile.inc#2 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#7 integrate .. //depot/projects/hammer/sbin/atm/Makefile#2 integrate .. //depot/projects/hammer/sbin/atm/Makefile.inc#2 integrate .. //depot/projects/hammer/sbin/atm/atm/Makefile#2 integrate .. //depot/projects/hammer/sbin/atm/atm/atm.8#3 integrate .. //depot/projects/hammer/sbin/atm/atm/atm.c#2 integrate .. //depot/projects/hammer/sbin/atm/atm/atm.h#3 integrate .. //depot/projects/hammer/sbin/atm/atm/atm_eni.c#2 integrate .. //depot/projects/hammer/sbin/atm/atm/atm_fore200.c#2 integrate .. //depot/projects/hammer/sbin/atm/atm/atm_inet.c#2 integrate .. //depot/projects/hammer/sbin/atm/atm/atm_print.c#2 integrate .. //depot/projects/hammer/sbin/atm/atm/atm_set.c#2 integrate .. //depot/projects/hammer/sbin/atm/atm/atm_show.c#3 integrate .. //depot/projects/hammer/sbin/atm/atm/atm_subr.c#2 integrate .. //depot/projects/hammer/sbin/atm/atmconfig/Makefile#1 branch .. //depot/projects/hammer/sbin/atm/atmconfig/atmconfig.8#1 branch .. //depot/projects/hammer/sbin/atm/atmconfig/atmconfig.h#1 branch .. //depot/projects/hammer/sbin/atm/atmconfig/atmconfig.help#1 branch .. //depot/projects/hammer/sbin/atm/atmconfig/diag.c#1 branch .. //depot/projects/hammer/sbin/atm/atmconfig/diag.h#1 branch .. //depot/projects/hammer/sbin/atm/atmconfig/main.c#1 branch .. //depot/projects/hammer/sbin/atm/atmconfig/natm.c#1 branch .. //depot/projects/hammer/sbin/atm/atmconfig/private.h#1 branch .. //depot/projects/hammer/sbin/atm/fore_dnld/Makefile#2 integrate .. //depot/projects/hammer/sbin/atm/fore_dnld/fore_dnld.8#2 integrate .. //depot/projects/hammer/sbin/atm/fore_dnld/fore_dnld.c#3 integrate .. //depot/projects/hammer/sbin/atm/fore_dnld/pca200e.c#2 integrate .. //depot/projects/hammer/sbin/atm/ilmid/Makefile#4 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.5#2 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.8#4 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#11 integrate .. //depot/projects/hammer/sbin/camcontrol/Makefile#5 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.c#5 integrate .. //depot/projects/hammer/sbin/camcontrol/modeedit.c#5 integrate .. //depot/projects/hammer/sbin/camcontrol/util.c#4 integrate .. //depot/projects/hammer/sbin/ccdconfig/Makefile#4 integrate .. //depot/projects/hammer/sbin/ccdconfig/ccdconfig.c#6 integrate .. //depot/projects/hammer/sbin/comcontrol/Makefile#3 integrate .. //depot/projects/hammer/sbin/comcontrol/comcontrol.c#3 integrate .. //depot/projects/hammer/sbin/devd/Makefile#5 integrate .. //depot/projects/hammer/sbin/devfs/devfs.8#5 integrate .. //depot/projects/hammer/sbin/dhclient/Makefile.inc#3 integrate .. //depot/projects/hammer/sbin/disklabel/disklabel.5#4 integrate .. //depot/projects/hammer/sbin/disklabel/disklabel.8#8 integrate .. //depot/projects/hammer/sbin/ffsinfo/Makefile#3 integrate .. //depot/projects/hammer/sbin/ffsinfo/ffsinfo.8#3 integrate .. //depot/projects/hammer/sbin/ffsinfo/ffsinfo.c#3 integrate .. //depot/projects/hammer/sbin/fsck/fsck.8#4 integrate .. //depot/projects/hammer/sbin/fsck/fsck.c#7 integrate .. //depot/projects/hammer/sbin/fsck_ffs/fsutil.c#6 integrate .. //depot/projects/hammer/sbin/fsck_ffs/main.c#4 integrate .. //depot/projects/hammer/sbin/fsck_ffs/setup.c#7 integrate .. //depot/projects/hammer/sbin/fsdb/fsdb.8#3 integrate .. //depot/projects/hammer/sbin/growfs/debug.c#4 integrate .. //depot/projects/hammer/sbin/growfs/debug.h#2 integrate .. //depot/projects/hammer/sbin/ip6fw/ip6fw.8#4 integrate .. //depot/projects/hammer/sbin/ip6fw/ip6fw.c#4 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#12 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#14 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.8#8 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.c#8 integrate .. //depot/projects/hammer/sbin/mksnap_ffs/mksnap_ffs.8#3 integrate .. //depot/projects/hammer/sbin/mount/mount.c#7 integrate .. //depot/projects/hammer/sbin/mount_hpfs/mount_hpfs.c#2 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.8#3 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.8#7 integrate .. //depot/projects/hammer/sbin/natd/natd.8#5 integrate .. //depot/projects/hammer/sbin/natd/natd.c#4 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#10 integrate .. //depot/projects/hammer/sbin/newfs/newfs.8#5 integrate .. //depot/projects/hammer/sbin/nfsiod/nfsiod.8#3 integrate .. //depot/projects/hammer/sbin/ping/ping.8#6 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 11 12:06:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1AAF16A4C1; Thu, 11 Sep 2003 12:06:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9CA3A16A4BF for ; Thu, 11 Sep 2003 12:06:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B53243F75 for ; Thu, 11 Sep 2003 12:06:53 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BJ6q0U025440 for ; Thu, 11 Sep 2003 12:06:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BJ6qqu025437 for perforce@freebsd.org; Thu, 11 Sep 2003 12:06:52 -0700 (PDT) Date: Thu, 11 Sep 2003 12:06:52 -0700 (PDT) Message-Id: <200309111906.h8BJ6qqu025437@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 19:06:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=37927 Change 37927 by peter@peter_overcee on 2003/09/11 12:06:17 begin assimilating jhb's smp cleanup for hammer Affected files ... .. //depot/projects/hammer/sys/jhb_notes#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Sep 11 12:19:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E107016A4C1; Thu, 11 Sep 2003 12:19:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B601816A4BF for ; Thu, 11 Sep 2003 12:19:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BED9E43FAF for ; Thu, 11 Sep 2003 12:19:08 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BJJ80U026184 for ; Thu, 11 Sep 2003 12:19:08 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BJJ8P3026181 for perforce@freebsd.org; Thu, 11 Sep 2003 12:19:08 -0700 (PDT) Date: Thu, 11 Sep 2003 12:19:08 -0700 (PDT) Message-Id: <200309111919.h8BJJ8P3026181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37928 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 19:19:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=37928 Change 37928 by peter@peter_overcee on 2003/09/11 12:19:01 track/translate from jhb's acpipci branch Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#1 branch .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/hammer/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/hammer/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/hammer/sys/amd64/include/mptable.h#1 branch .. //depot/projects/hammer/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.s#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Sep 11 12:29:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6069C16A4C1; Thu, 11 Sep 2003 12:29:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B59416A4BF for ; Thu, 11 Sep 2003 12:29:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ADE3E43FAF for ; Thu, 11 Sep 2003 12:29:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BJTL0U027056 for ; Thu, 11 Sep 2003 12:29:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BJTLso027053 for perforce@freebsd.org; Thu, 11 Sep 2003 12:29:21 -0700 (PDT) Date: Thu, 11 Sep 2003 12:29:21 -0700 (PDT) Message-Id: <200309111929.h8BJTLso027053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37929 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 19:29:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=37929 Change 37929 by peter@peter_overcee on 2003/09/11 12:28:26 suck in jhb's acpi/pci/smp cleanup Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Sep 11 12:38:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AF9216A4C1; Thu, 11 Sep 2003 12:38:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2CF6216A4BF for ; Thu, 11 Sep 2003 12:38:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F57143FE1 for ; Thu, 11 Sep 2003 12:38:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BJcY0U027761 for ; Thu, 11 Sep 2003 12:38:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BJcYc2027758 for perforce@freebsd.org; Thu, 11 Sep 2003 12:38:34 -0700 (PDT) Date: Thu, 11 Sep 2003 12:38:34 -0700 (PDT) Message-Id: <200309111938.h8BJcYc2027758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37931 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 19:38:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=37931 Change 37931 by peter@peter_overcee on 2003/09/11 12:37:57 initial sweep of merge/sync of i386 smp support Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_clock.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/include/smp.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/smptests.h#1 branch .. //depot/projects/hammer/sys/i386/i386/mpapic.c#7 delete .. //depot/projects/hammer/sys/i386/isa/apic_ipl.s#2 delete .. //depot/projects/hammer/sys/i386/isa/apic_vector.s#7 delete .. //depot/projects/hammer/sys/i386/isa/icu_ipl.s#2 delete .. //depot/projects/hammer/sys/i386/isa/icu_vector.s#2 delete .. //depot/projects/hammer/sys/i386/isa/intr_machdep.c#6 delete .. //depot/projects/hammer/sys/i386/isa/intr_machdep.h#3 delete .. //depot/projects/hammer/sys/i386/isa/ithread.c#3 delete .. //depot/projects/hammer/sys/i386/isa/vector.s#2 delete Differences ... ==== //depot/projects/hammer/sys/amd64/include/smp.h#6 (text+ko) ==== @@ -6,11 +6,85 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.77 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/i386/include/smp.h,v 1.76 2003/04/02 23:53:29 peter Exp $ * */ #ifndef _MACHINE_SMP_H_ #define _MACHINE_SMP_H_ +#ifdef _KERNEL + +#ifdef SMP + +#ifndef LOCORE + +/* + * For sending values to POST displays. + * XXX FIXME: where does this really belong, isa.h/isa.c perhaps? + */ +extern int current_postcode; /** XXX currently in mp_machdep.c */ +#define POSTCODE(X) current_postcode = (X), \ + outb(0x80, current_postcode) +#define POSTCODE_LO(X) current_postcode &= 0xf0, \ + current_postcode |= ((X) & 0x0f), \ + outb(0x80, current_postcode) +#define POSTCODE_HI(X) current_postcode &= 0x0f, \ + current_postcode |= (((X) << 4) & 0xf0), \ + outb(0x80, current_postcode) + +#include +#include +#include +#include + +/* global data in mpboot.s */ +extern int bootMP_size; + +/* functions in mpboot.s */ +void bootMP(void); + +/* global data in mp_machdep.c */ +extern int mp_naps; +extern int boot_cpu_id; +extern struct pcb stoppcbs[]; +extern struct mtx smp_tlb_mtx; + +/* IPI handlers */ +inthand_t + IDTVEC(invltlb), /* TLB shootdowns - global */ + IDTVEC(invlpg), /* TLB shootdowns - 1 page */ + IDTVEC(invlrng), /* TLB shootdowns - page range */ + IDTVEC(hardclock), /* Forward hardclock() */ + IDTVEC(statclock), /* Forward statclock() */ + IDTVEC(cpuast), /* Additional software trap on other cpu */ + IDTVEC(cpustop), /* CPU stops & waits to be restarted */ + IDTVEC(rendezvous), /* handle CPU rendezvous */ + IDTVEC(lazypmap); /* handle lazy pmap release */ + +/* functions in mp_machdep.c */ +void cpu_add(u_int apic_id, char boot_cpu); +void init_secondary(void); +void ipi_selected(u_int cpus, u_int ipi); +void ipi_all(u_int ipi); +void ipi_all_but_self(u_int ipi); +void ipi_self(u_int ipi); +void forward_statclock(void); +void forwarded_statclock(struct clockframe frame); +void forward_hardclock(void); +void forwarded_hardclock(struct clockframe frame); +u_int mp_bootaddress(u_int); +int mp_grab_cpu_hlt(void); +void smp_invlpg(vm_offset_t addr); +void smp_masked_invlpg(u_int mask, vm_offset_t addr); +void smp_invlpg_range(vm_offset_t startva, vm_offset_t endva); +void smp_masked_invlpg_range(u_int mask, vm_offset_t startva, + vm_offset_t endva); +void smp_invltlb(void); +void smp_masked_invltlb(u_int mask); + +#endif /* !LOCORE */ +#endif /* SMP */ + +#endif /* _KERNEL */ #endif /* _MACHINE_SMP_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Sep 11 12:42:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E260C16A4C1; Thu, 11 Sep 2003 12:42:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BD4AF16A4BF for ; Thu, 11 Sep 2003 12:42:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AC0943FFB for ; Thu, 11 Sep 2003 12:42:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BJge0U028316 for ; Thu, 11 Sep 2003 12:42:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BJgdho028313 for perforce@freebsd.org; Thu, 11 Sep 2003 12:42:39 -0700 (PDT) Date: Thu, 11 Sep 2003 12:42:39 -0700 (PDT) Message-Id: <200309111942.h8BJgdho028313@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37932 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 19:42:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=37932 Change 37932 by peter@peter_overcee on 2003/09/11 12:42:32 pull in boot and apic code Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mpapic.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/mpboot.s#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Sep 11 14:03:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9137416A4C1; Thu, 11 Sep 2003 14:03:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F64916A4BF for ; Thu, 11 Sep 2003 14:03:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF61A43FF2 for ; Thu, 11 Sep 2003 14:03:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BL3H0U041408 for ; Thu, 11 Sep 2003 14:03:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BL3Hh7041405 for perforce@freebsd.org; Thu, 11 Sep 2003 14:03:17 -0700 (PDT) Date: Thu, 11 Sep 2003 14:03:17 -0700 (PDT) Message-Id: <200309112103.h8BL3Hh7041405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37933 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 21:03:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=37933 Change 37933 by peter@peter_work on 2003/09/11 14:02:29 add smp files (not finished) Affected files ... .. //depot/projects/hammer/sys/conf/files.amd64#22 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.amd64#22 (text+ko) ==== @@ -48,8 +48,11 @@ amd64/acpica/OsdEnvironment.c optional acpi amd64/acpica/acpi_machdep.c optional acpi amd64/acpica/acpi_wakeup.c optional acpi +amd64/acpica/madt.c optional acpi amd64/amd64/amd64-gdbstub.c optional ddb amd64/amd64/amd64_mem.c standard +amd64/amd64/apic_vector.s standard +amd64/amd64/atomic.c standard amd64/amd64/autoconf.c standard amd64/amd64/busdma_machdep.c standard amd64/amd64/cpu_switch.S standard @@ -62,10 +65,18 @@ amd64/amd64/exception.S standard amd64/amd64/identcpu.c standard amd64/amd64/initcpu.c standard +amd64/amd64/intr_machdep.c standard +amd64/amd64/io_apic.c standard amd64/amd64/legacy.c standard +amd64/amd64/local_apic.c standard amd64/amd64/locore.S standard no-obj amd64/amd64/machdep.c standard amd64/amd64/mem.c standard +amd64/amd64/mp_clock.c optional smp +amd64/amd64/mp_machdep.c optional smp +amd64/amd64/mpboot.s optional smp +amd64/amd64/mptable.c standard +amd64/amd64/mptable_pci.c optional pci amd64/amd64/nexus.c standard amd64/amd64/pmap.c standard amd64/amd64/sigtramp.S standard @@ -76,11 +87,11 @@ amd64/amd64/vm_machdep.c standard amd64/amd64/in_cksum.c optional inet +amd64/isa/atpic.c standard +amd64/isa/atpic_vector.s standard amd64/isa/clock.c standard -amd64/isa/intr_machdep.c standard amd64/isa/isa.c standard amd64/isa/isa_dma.c standard -amd64/isa/ithread.c standard amd64/isa/npx.c standard amd64/pci/pci_cfgreg.c optional pci From owner-p4-projects@FreeBSD.ORG Thu Sep 11 14:19:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E92A816A4C1; Thu, 11 Sep 2003 14:19:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD8C016A4BF for ; Thu, 11 Sep 2003 14:19:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CA6F43FE9 for ; Thu, 11 Sep 2003 14:19:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BLJT0U042370 for ; Thu, 11 Sep 2003 14:19:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BLJSlt042367 for perforce@freebsd.org; Thu, 11 Sep 2003 14:19:28 -0700 (PDT) Date: Thu, 11 Sep 2003 14:19:28 -0700 (PDT) Message-Id: <200309112119.h8BLJSlt042367@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37935 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 21:19:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=37935 Change 37935 by peter@peter_work on 2003/09/11 14:19:13 oops. mp_clock.c is actually a misnamed PIIX4 driver. re-nuke. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_clock.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Sep 11 14:45:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64B7E16A4C1; Thu, 11 Sep 2003 14:45:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3FD7316A4BF for ; Thu, 11 Sep 2003 14:45:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CE6443FD7 for ; Thu, 11 Sep 2003 14:45:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BLj10U045096 for ; Thu, 11 Sep 2003 14:45:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BLj0OR045093 for perforce@freebsd.org; Thu, 11 Sep 2003 14:45:00 -0700 (PDT) Date: Thu, 11 Sep 2003 14:45:00 -0700 (PDT) Message-Id: <200309112145.h8BLj0OR045093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37937 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 21:45:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=37937 Change 37937 by peter@peter_work on 2003/09/11 14:44:11 initial sweep over jhb's diffs that affect files for the smp cleanup. Note that the core smp code isn't all there yet. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#7 edit .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#9 edit .. //depot/projects/hammer/sys/amd64/amd64/exception.S#17 edit .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#21 edit .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#49 edit .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#11 edit .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#31 edit .. //depot/projects/hammer/sys/amd64/amd64/support.S#10 edit .. //depot/projects/hammer/sys/amd64/amd64/trap.c#26 edit .. //depot/projects/hammer/sys/amd64/include/asmacros.h#6 edit .. //depot/projects/hammer/sys/amd64/include/pcpu.h#8 edit .. //depot/projects/hammer/sys/amd64/isa/clock.c#7 edit .. //depot/projects/hammer/sys/amd64/isa/icu.h#6 edit .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#7 edit .. //depot/projects/hammer/sys/dev/pci/pci.c#13 edit .. //depot/projects/hammer/sys/dev/sio/sio.c#19 edit .. //depot/projects/hammer/sys/kern/kern_intr.c#13 edit .. //depot/projects/hammer/sys/kern/subr_smp.c#7 edit .. //depot/projects/hammer/sys/kern/subr_witness.c#17 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/autoconf.c#7 (text+ko) ==== @@ -76,7 +76,6 @@ #include #include -#include #ifdef DEV_ISA #include @@ -109,23 +108,11 @@ { /* - * Activate the ICU's. Note that we are explicitly at splhigh() - * at present as we have no way to disable stray PCI level triggered - * interrupts until the devices have had a driver attached. This - * is particularly a problem when the interrupts are shared. For - * example, if IRQ 10 is shared between a disk and network device - * and the disk device generates an interrupt, if we "activate" - * IRQ 10 when the network driver is set up, then we will get - * recursive interrupt 10's as nothing will know how to turn off - * the disk device's interrupt. - * - * Having the ICU's active means we can probe interrupt routing to - * see if a device causes the corresponding pending bit to be set. - * - * This is all rather inconvenient. + * Enable interrupts on the processor. The interrupts are still + * disabled in the interrupt controllers until interrupt handlers + * are registered. */ enable_intr(); - INTREN(IRQ_SLAVE); /* nexus0 is the top of the i386 device tree */ device_add_child(root_bus, "nexus", 0); @@ -141,12 +128,6 @@ if (isa_bus_device) isa_probe_children(isa_bus_device); #endif - - /* - * Now we're ready to handle (pending) interrupts. - * XXX this is slightly misplaced. - */ - spl0(); } static void ==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#9 (text+ko) ==== @@ -245,8 +245,9 @@ if (strcmp(name, "calltrap") == 0 || strcmp(name, "fork_trampoline") == 0) frame_type = TRAP; - else if (strncmp(name, "Xintr", 5) == 0 || - strncmp(name, "Xfastintr", 9) == 0) + else if (strncmp(name, "Xatpic_intr", 11) == 0 || + strncmp(name, "Xatpic_fastintr", 15) == 0) + strncmp(name, "Xapic_isr", 9) == 0) frame_type = INTERRUPT; else if (strcmp(name, "Xfast_syscall") == 0) frame_type = SYSCALL; ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#17 (text+ko) ==== @@ -35,7 +35,6 @@ */ #include -#include #include #include @@ -72,8 +71,6 @@ * %ss segment registers, but does not mess with %ds, %es, or %fs. Thus we * must load them with appropriate values for supervisor mode operation. */ -#define IDTVEC(name) ALIGN_TEXT; .globl __CONCAT(X,name); \ - .type __CONCAT(X,name),@function; __CONCAT(X,name): MCOUNT_LABEL(user) MCOUNT_LABEL(btrap) @@ -301,14 +298,6 @@ MEXITCOUNT jmp doreti /* Handle any ASTs */ - -/* - * Include what was once config+isa-dependent code. - * XXX it should be in a stand-alone file. It's still icu-dependent and - * belongs in i386/isa. - */ -#include "amd64/isa/vector.S" - .data ALIGN_DATA @@ -413,5 +402,3 @@ movq $T_PROTFLT,TF_TRAPNO(%rsp) movq $0,TF_ERR(%rsp) /* XXX should be the error code */ jmp alltraps_with_regs_pushed - -#include "amd64/isa/icu_ipl.S" ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#21 (text+ko) ==== @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -181,6 +182,7 @@ ASSYM(ENOENT, ENOENT); ASSYM(EFAULT, EFAULT); ASSYM(ENAMETOOLONG, ENAMETOOLONG); +ASSYM(MAXCOMLEN, MAXCOMLEN); ASSYM(MAXPATHLEN, MAXPATHLEN); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); ASSYM(PC_PRVSPACE, offsetof(struct pcpu, pc_prvspace)); @@ -190,6 +192,15 @@ ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); ASSYM(PC_SCRATCH_RSP, offsetof(struct pcpu, pc_scratch_rsp)); +ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); + +ASSYM(LA_VER, offsetof(struct LAPIC, version)); +ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); +ASSYM(LA_EOI, offsetof(struct LAPIC, eoi)); +ASSYM(LA_SVR, offsetof(struct LAPIC, svr)); +ASSYM(LA_ICR_LO, offsetof(struct LAPIC, icr_lo)); +ASSYM(LA_ICR_HI, offsetof(struct LAPIC, icr_hi)); +ASSYM(LA_ISR, offsetof(struct LAPIC, isr0)); ASSYM(KCSEL, GSEL(GCODE_SEL, SEL_KPL)); ASSYM(KDSEL, GSEL(GDATA_SEL, SEL_KPL)); ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#49 (text+ko) ==== @@ -100,6 +100,7 @@ #include #include #include +#include #include #include #include @@ -108,8 +109,6 @@ #endif #include -#include -#include #include #include #include @@ -195,7 +194,6 @@ bufinit(); vm_pager_bufferinit(); - /* For SMP, we delay the cpu_setregs() until after SMP startup. */ cpu_setregs(); } @@ -1203,7 +1201,7 @@ cninit(); #ifdef DEV_ISA - isa_defaultirq(); + atpic_startup(); #endif #ifdef DDB ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#11 (text+ko) ==== @@ -46,10 +46,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include @@ -64,8 +66,6 @@ #include #include #endif -#include -#include #include static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device"); @@ -156,14 +156,11 @@ * multi-ISA-bus systems. PCI interrupts are routed to the ISA * component, so in a way, PCI can be a partial child of an ISA bus(!). * APIC interrupts are global though. - * - * XXX We depend on the AT PIC driver correctly claiming IRQ 2 - * to prevent its reuse elsewhere. */ irq_rman.rm_start = 0; irq_rman.rm_type = RMAN_ARRAY; irq_rman.rm_descr = "Interrupt request lines"; - irq_rman.rm_end = 15; + irq_rman.rm_end = NUM_IO_INTS - 1; if (rman_init(&irq_rman) || rman_manage_region(&irq_rman, irq_rman.rm_start, irq_rman.rm_end)) @@ -429,7 +426,7 @@ if (error) return (error); - error = inthand_add(device_get_nameunit(child), irq->r_start, + error = intr_ad_handler(device_get_nameunit(child), irq->r_start, ihand, arg, flags, cookiep); return (error); @@ -438,7 +435,7 @@ static int nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih) { - return (inthand_remove(ih)); + return (intr_remove_handler(ih)); } static int ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#31 (text+ko) ==== @@ -133,6 +133,9 @@ #include #include #include +#ifdef SMP +#include +#endif #define PMAP_KEEP_PDIRS #ifndef PMAP_SHPGPERPROC @@ -675,6 +678,8 @@ return 0; } +XXXX SMP VERSIONS + /* * Normal invalidation functions. * We inline these within pmap.c for speed. ==== //depot/projects/hammer/sys/amd64/amd64/support.S#10 (text+ko) ==== @@ -36,10 +36,21 @@ #include "opt_ddb.h" #include +#include #include #include "assym.s" + ALIGN_DATA + .globl intrcnt, eintrcnt +intrcnt: + .space INTRCNT_COUNT * 4 +eintrcnt: + + .globl intrnames, eintrnames +intrnames: + .space INTRCNT_COUNT * (MAXCOMLEN + 1) +eintrnames: .text ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#26 (text+ko) ==== @@ -79,13 +79,11 @@ #include #include +#include #include #include #include -#include -#include - #include #include ==== //depot/projects/hammer/sys/amd64/include/asmacros.h#6 (text+ko) ==== @@ -138,4 +138,13 @@ #define MEXITCOUNT #endif /* GPROF */ +#ifdef LOCORE +/* + * Convenience macros for declaring interrupt entry points. + */ +#define IDTVEC(name) ALIGN_TEXT; .globl __CONCAT(X,name); \ + .type __CONCAT(X,name),@function; __CONCAT(X,name): + +#endif /* LOCORE */ + #endif /* !_MACHINE_ASMACROS_H_ */ ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#8 (text+ko) ==== @@ -41,6 +41,8 @@ #define PCPU_MD_FIELDS \ struct pcpu *pc_prvspace; /* Self-reference */ \ register_t pc_scratch_rsp; /* User %rsp in syscall */ + XXXX add rest here + u_int pc_apic_id; #if defined(lint) ==== //depot/projects/hammer/sys/amd64/isa/clock.c#7 (text+ko) ==== @@ -69,8 +69,12 @@ #include #include +#include #include #include +#ifdef SMP +#include +#endif #include #include @@ -81,8 +85,6 @@ #endif #include -#include - /* * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we * can use a simple formula for leap years. @@ -128,6 +130,7 @@ static u_int32_t i8254_lastcount; static u_int32_t i8254_offset; static int i8254_ticked; +static struct intsrc *i8254_intsrc; /* * XXX new_function and timer_func should not handle clockframes, but * timer_func currently needs to hold hardclock to handle the @@ -162,7 +165,7 @@ }; static void -clkintr(struct clockframe frame) +clkintr(struct clockframe *frame) { if (timecounter->tc_get_timecount == i8254_get_timecount) { @@ -176,7 +179,7 @@ clkintr_pending = 0; mtx_unlock_spin(&clock_lock); } - timer_func(&frame); + timer_func(frame); switch (timer0_state) { case RELEASED: @@ -186,7 +189,7 @@ if ((timer0_prescaler_count += timer0_max_count) >= hardclock_max_count) { timer0_prescaler_count -= hardclock_max_count; - hardclock(&frame); + hardclock(frame); } break; @@ -218,7 +221,7 @@ timer0_prescaler_count = 0; timer_func = hardclock; timer0_state = RELEASED; - hardclock(&frame); + hardclock(frame); } break; } @@ -333,16 +336,16 @@ * in the statistics, but the stat clock will no longer stop. */ static void -rtcintr(struct clockframe frame) +rtcintr(struct clockframe *frame) { while (rtcin(RTC_INTR) & RTCIR_PERIOD) { if (profprocs != 0) { if (--pscnt == 0) pscnt = psdiv; - profclock(&frame); + profclock(frame); } if (pscnt == psdiv) - statclock(&frame); + statclock(frame); } } @@ -845,12 +848,7 @@ profhz = RTC_PROFRATE; } - /* Finish initializing 8253 timer 0. */ - /* - * XXX Check the priority of this interrupt handler. I - * couldn't find anything suitable in the BSD/OS code (grog, - * 19 July 2000). - */ + /* Finish initializing 8254 timer 0. */ inthand_add("clk", 0, (driver_intr_t *)clkintr, NULL, INTR_TYPE_CLK | INTR_FAST, NULL); crit = intr_disable(); @@ -870,8 +868,9 @@ if (diag != 0) printf("RTC BIOS diagnostic error %b\n", diag, RTCDG_BITS); - inthand_add("rtc", 8, (driver_intr_t *)rtcintr, NULL, + intr_add_handler("rtc", 8, (driver_intr_t *)rtcintr, NULL, INTR_TYPE_CLK | INTR_FAST, NULL); + i8254_intsrc = intr_lookup_source(8); crit = intr_disable(); mtx_lock_spin(&icu_lock); @@ -943,8 +942,8 @@ if (count < i8254_lastcount || (!i8254_ticked && (clkintr_pending || ((count < 20 || (!(rflags & PSL_I) && count < timer0_max_count / 2u)) && - (inb(IO_ICU1) & 1))) - )) { + i8254_intsrc != NULL && + i8254_intsrc->is_pic->pic_source_pending(i8254_intsrc))))) { i8254_ticked = 1; i8254_offset += timer0_max_count; } ==== //depot/projects/hammer/sys/amd64/isa/icu.h#6 (text+ko) ==== @@ -45,24 +45,6 @@ #ifndef _I386_ISA_ICU_H_ #define _I386_ISA_ICU_H_ -#ifndef LOCORE - -/* - * Note: - * Most of the SMP equivilants of the icu macros are coded - * elsewhere in an MP-safe fashion. - * In particular note that the 'imen' variable is opaque. - * DO NOT access imen directly, use INTREN()/INTRDIS(). - */ - -void INTREN(u_int); -void INTRDIS(u_int); - -extern unsigned imen; /* interrupt mask enable */ - -#endif /* LOCORE */ - - /* * Interrupt enable bits - in normal order of priority (which we change) */ ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#7 (text+ko) ==== @@ -426,7 +426,7 @@ if (pci_cfgregopen() == 0) return ENXIO; - return 0; + return -100; } static int ==== //depot/projects/hammer/sys/dev/pci/pci.c#13 (text+ko) ==== @@ -800,7 +800,7 @@ } if (cfg->intpin > 0 && PCI_INTERRUPT_VALID(cfg->intline)) { -#if defined(__ia64__) || (defined(__i386__) && !defined(SMP)) +#if defined(__ia64__) || (defined(__i386__) && !defined(SMP)) || defined(__amd64__) /* * Try to re-route interrupts. Sometimes the BIOS or * firmware may leave bogus values in these registers. ==== //depot/projects/hammer/sys/dev/sio/sio.c#19 (text+ko) ==== @@ -1153,6 +1153,9 @@ rid = 0; com->irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0ul, ~0ul, 1, RF_ACTIVE); + if (com->irqres == NULL) + com->irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0ul, + ~0ul, 1, RF_ACTIVE | RF_SHAREABLE); if (com->irqres) { ret = BUS_SETUP_INTR(device_get_parent(dev), dev, com->irqres, INTR_TYPE_TTY | INTR_FAST, ==== //depot/projects/hammer/sys/kern/kern_intr.c#13 (text+ko) ==== @@ -244,8 +244,6 @@ if (ithread == NULL || name == NULL || handler == NULL) return (EINVAL); - if ((flags & INTR_FAST) !=0) - flags |= INTR_EXCL; ih = malloc(sizeof(struct intrhand), M_ITHREAD, M_WAITOK | M_ZERO); ih->ih_handler = handler; @@ -254,7 +252,7 @@ ih->ih_ithread = ithread; ih->ih_pri = pri; if (flags & INTR_FAST) - ih->ih_flags = IH_FAST | IH_EXCLUSIVE; + ih->ih_flags = IH_FAST; else if (flags & INTR_EXCL) ih->ih_flags = IH_EXCLUSIVE; if (flags & INTR_MPSAFE) @@ -263,11 +261,24 @@ ih->ih_flags |= IH_ENTROPY; mtx_lock(&ithread->it_lock); - if ((flags & INTR_EXCL) !=0 && !TAILQ_EMPTY(&ithread->it_handlers)) + if ((flags & INTR_EXCL) != 0 && !TAILQ_EMPTY(&ithread->it_handlers)) goto fail; - if (!TAILQ_EMPTY(&ithread->it_handlers) && - (TAILQ_FIRST(&ithread->it_handlers)->ih_flags & IH_EXCLUSIVE) != 0) - goto fail; + if (!TAILQ_EMPTY(&ithread->it_handlers)) { + temp_ih = TAILQ_FIRST(&ithread->it_handlers); + if (temp_ih->ih_flags & IH_EXCLUSIVE) + goto fail; + if (flags & INTR_FAST) + printf("request for fast interrupt on %s\n", + ithread->it_name); + if ((ih->ih_flags & IH_FAST) && !(temp_ih->ih_flags & IH_FAST)) + goto fail; + if (flags & INTR_FAST) + printf("passed first mismatch test\n"); + if (!(ih->ih_flags & IH_FAST) && (temp_ih->ih_flags & IH_FAST)) + goto fail; + if (flags & INTR_FAST) + printf("passed second mismatch test\n"); + } TAILQ_FOREACH(temp_ih, &ithread->it_handlers, ih_next) if (temp_ih->ih_pri > ih->ih_pri) ==== //depot/projects/hammer/sys/kern/subr_smp.c#7 (text+ko) ==== @@ -112,8 +112,10 @@ { /* Probe for MP hardware. */ - if (mp_probe_status == 0 || smp_disabled != 0) + if (mp_probe_status == 0 || smp_disabled != 0) { + mp_ncpus = 1; return; + } mtx_init(&smp_rv_mtx, "smp rendezvous", NULL, MTX_SPIN); cpu_mp_start(); ==== //depot/projects/hammer/sys/kern/subr_witness.c#17 (text+ko) ==== @@ -285,6 +285,7 @@ { "ng_node", &lock_class_mtx_spin }, { "ng_worklist", &lock_class_mtx_spin }, { "taskqueue_fast", &lock_class_mtx_spin }, + { "intr table", &lock_class_mtx_spin }, { "ithread table lock", &lock_class_mtx_spin }, { "sched lock", &lock_class_mtx_spin }, { "callout", &lock_class_mtx_spin }, @@ -296,10 +297,8 @@ { "icu", &lock_class_mtx_spin }, #ifdef SMP { "smp rendezvous", &lock_class_mtx_spin }, -#if defined(__i386__) && defined(APIC_IO) +#if defined(__i386__) || defined(__amd64__) { "tlb", &lock_class_mtx_spin }, -#endif -#ifdef __i386__ { "lazypmap", &lock_class_mtx_spin }, #endif #ifdef __sparc64__ From owner-p4-projects@FreeBSD.ORG Thu Sep 11 15:22:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F9AD16A4C1; Thu, 11 Sep 2003 15:22:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 22B8916A4BF for ; Thu, 11 Sep 2003 15:22:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8119143FD7 for ; Thu, 11 Sep 2003 15:22:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BMMl0U049034 for ; Thu, 11 Sep 2003 15:22:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BMMlFc049031 for perforce@freebsd.org; Thu, 11 Sep 2003 15:22:47 -0700 (PDT) Date: Thu, 11 Sep 2003 15:22:47 -0700 (PDT) Message-Id: <200309112222.h8BMMlFc049031@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 22:22:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=37938 Change 37938 by peter@peter_work on 2003/09/11 15:22:44 another SMP sweep Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#8 edit .. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#9 edit .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#50 edit .. //depot/projects/hammer/sys/amd64/amd64/mem.c#10 edit .. //depot/projects/hammer/sys/amd64/amd64/support.S#11 edit .. //depot/projects/hammer/sys/amd64/amd64/trap.c#27 edit .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#7 edit .. //depot/projects/hammer/sys/amd64/include/pmap.h#18 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#8 (text+ko) ==== @@ -65,6 +65,9 @@ /* release bit from old pm_active */ movq TD_PROC(%rdi), %rdx /* oldtd->td_proc */ movq P_VMSPACE(%rdx), %rdx /* proc->p_vmspace */ +#ifdef SMP + lock +#endif btrq %rax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */ 1: movq TD_PCB(%rsi),%rdx /* newtd->td_proc */ @@ -73,6 +76,9 @@ /* set bit in new pm_active */ movq TD_PROC(%rsi),%rdx movq P_VMSPACE(%rdx), %rdx +#ifdef SMP + lock +#endif btsq %rax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */ jmp sw1 @@ -152,11 +158,17 @@ /* Release bit from old pmap->pm_active */ movq TD_PROC(%rdi), %rdx /* oldproc */ movq P_VMSPACE(%rdx), %rdx +#ifdef SMP + lock +#endif btrq %rax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */ /* Set bit in new pmap->pm_active */ movq TD_PROC(%rsi),%rdx /* newproc */ movq P_VMSPACE(%rdx), %rdx +#ifdef SMP + lock +#endif btsq %rax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */ sw1: ==== //depot/projects/hammer/sys/amd64/amd64/db_interface.c#9 (text+ko) ==== @@ -98,6 +98,24 @@ ef = read_rflags(); disable_intr(); +#ifdef SMP +#ifdef CPUSTOP_ON_DDBBREAK + +#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) + db_printf("\nCPU%d stopping CPUs: 0x%08x...", PCPU_GET(cpuid), + PCPU_GET(other_cpus)); +#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ + + /* We stop all CPUs except ourselves (obviously) */ + stop_cpus(PCPU_GET(other_cpus)); + +#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) + db_printf(" stopped.\n"); +#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ + +#endif /* CPUSTOP_ON_DDBBREAK */ +#endif /* SMP */ + switch (type) { case T_BPTFLT: /* breakpoint */ case T_TRCTRAP: /* debug exception */ @@ -192,6 +210,28 @@ regs->tf_ds = ddb_regs.tf_ds & 0xffff; #endif +#ifdef SMP +#ifdef CPUSTOP_ON_DDBBREAK + +#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) + db_printf("\nCPU%d restarting CPUs: 0x%08x...", PCPU_GET(cpuid), + stopped_cpus); +#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ + + /* Restart all the CPUs we previously stopped */ + if (stopped_cpus != PCPU_GET(other_cpus) && smp_started != 0) { + db_printf("whoa, other_cpus: 0x%08x, stopped_cpus: 0x%08x\n", + PCPU_GET(other_cpus), stopped_cpus); + panic("stop_cpus() failed"); + } + restart_cpus(stopped_cpus); + +#if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) + db_printf(" restarted.\n"); +#endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ + +#endif /* CPUSTOP_ON_DDBBREAK */ +#endif /* SMP */ write_rflags(ef); return (1); ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#50 (text+ko) ==== @@ -144,7 +144,7 @@ struct kva_md_info kmi; static struct trapframe proc0_tf; -static struct pcpu __pcpu; +static struct pcpu __pcpu; /* BSP pcpu data space */ struct mtx icu_lock; @@ -463,6 +463,11 @@ cpu_idle(void) { +#ifdef SMP + if (mp_grab_cpu_hlt()) + return; +#endif + if (cpu_idle_hlt) { disable_intr(); if (sched_runnable()) { ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#10 (text+ko) ==== @@ -323,6 +323,15 @@ return (mem_range_softc.mr_op->set(&mem_range_softc, mrd, arg)); } +#ifdef SMP +void +mem_range_AP_init(void) +{ + if (mem_range_softc.mr_op && mem_range_softc.mr_op->initAP) + (mem_range_softc.mr_op->initAP(&mem_range_softc)); +} +#endif + static int mem_modevent(module_t mod, int type, void *data) { ==== //depot/projects/hammer/sys/amd64/amd64/support.S#11 (text+ko) ==== @@ -340,6 +340,9 @@ ja fusufault movq %rsi, %rax /* old */ +#ifdef SMP + lock +#endif cmpxchgq %rdx, (%rdi) /* new = %rdx */ /* ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#27 (text+ko) ==== @@ -82,6 +82,9 @@ #include #include #include +#ifdef SMP +#include +#endif #include #include @@ -569,6 +572,11 @@ printf("\n\nFatal trap %d: %s while in %s mode\n", type, trap_msg[type], ISPL(frame->tf_cs) == SEL_UPL ? "user" : "kernel"); +#ifdef SMP + /* two separate prints in case of a trap on an unmapped page */ + printf("cpuid = %d; ", PCPU_GET(cpuid)); + printf("apic id = %02x\n", PCPU_GET(apic_id)); +#endif if (type == T_PAGEFLT) { printf("fault virtual address = 0x%lx\n", eva); printf("fault code = %s %s, %s\n", @@ -636,6 +644,11 @@ dblfault_handler() { printf("\nFatal double fault\n"); +#ifdef SMP + /* two separate prints in case of a trap on an unmapped page */ + printf("cpuid = %d; ", PCPU_GET(cpuid)); + printf("apic id = %02x\n", PCPU_GET(apic_id)); +#endif panic("double fault"); } ==== //depot/projects/hammer/sys/amd64/amd64/tsc.c#7 (text+ko) ==== @@ -43,7 +43,6 @@ uint64_t tsc_freq; int tsc_is_broken; -u_int tsc_present = 1; #ifdef SMP static int smp_tsc; @@ -59,7 +58,8 @@ 0, /* no poll_pps */ ~0u, /* counter_mask */ 0, /* frequency */ - "TSC" /* name */ + "TSC", /* name */ + 800, /* quality (adjusted in code) */ }; void @@ -77,13 +77,30 @@ tsc_freq = tscval[1] - tscval[0]; if (bootverbose) printf("TSC clock: %lu Hz\n", tsc_freq); +} + +void +init_TSC_tc(void) +{ + +#ifdef SMP + /* + * We can not use the TSC in SMP mode unless the TSCs on all CPUs + * are somehow synchronized. Some hardware configurations do + * this, but we have no way of determining whether this is the + * case, so we do not use the TSC in multi-processor systems + * unless the user indicated (by setting kern.timecounter.smp_tsc + * to 1) that he believes that his TSCs are synchronized. + */ + if (mp_ncpus > 1 && !smp_tsc) + tsc_timecounter.tc_quality = -100; +#endif + if (tsc_freq != 0 && !tsc_is_broken) { tsc_timecounter.tc_frequency = tsc_freq; tc_init(&tsc_timecounter); } - - return; } static int ==== //depot/projects/hammer/sys/amd64/include/pmap.h#18 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Sep 11 16:15:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E10D216A4C1; Thu, 11 Sep 2003 16:15:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BCA9816A4BF for ; Thu, 11 Sep 2003 16:15:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A59943FCB for ; Thu, 11 Sep 2003 16:15:53 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BNFr0U053720 for ; Thu, 11 Sep 2003 16:15:53 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BNFqCF053717 for perforce@freebsd.org; Thu, 11 Sep 2003 16:15:52 -0700 (PDT) Date: Thu, 11 Sep 2003 16:15:52 -0700 (PDT) Message-Id: <200309112315.h8BNFqCF053717@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37940 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 23:15:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=37940 Change 37940 by peter@peter_work on 2003/09/11 16:15:02 hmm. seem to be OBE. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mpapic.c#2 delete .. //depot/projects/hammer/sys/amd64/isa/intr_machdep.c#9 delete .. //depot/projects/hammer/sys/amd64/isa/intr_machdep.h#6 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Sep 11 16:16:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACCA616A4C1; Thu, 11 Sep 2003 16:16:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 868DA16A4BF for ; Thu, 11 Sep 2003 16:16:56 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83CE143FB1 for ; Thu, 11 Sep 2003 16:16:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BNGt0U053785 for ; Thu, 11 Sep 2003 16:16:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BNGt13053782 for perforce@freebsd.org; Thu, 11 Sep 2003 16:16:55 -0700 (PDT) Date: Thu, 11 Sep 2003 16:16:55 -0700 (PDT) Message-Id: <200309112316.h8BNGt13053782@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37942 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 23:16:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=37942 Change 37942 by peter@peter_work on 2003/09/11 16:16:30 alt.cruft.die.die.die Affected files ... .. //depot/projects/hammer/sys/amd64/include/smptests.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Sep 11 16:16:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E9F616A4D6; Thu, 11 Sep 2003 16:16:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D0EA716A4E7 for ; Thu, 11 Sep 2003 16:16:56 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1602043F85 for ; Thu, 11 Sep 2003 16:16:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BNGt0U053779 for ; Thu, 11 Sep 2003 16:16:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BNGs7A053776 for perforce@freebsd.org; Thu, 11 Sep 2003 16:16:54 -0700 (PDT) Date: Thu, 11 Sep 2003 16:16:54 -0700 (PDT) Message-Id: <200309112316.h8BNGs7A053776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37941 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 23:16:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=37941 Change 37941 by peter@peter_work on 2003/09/11 16:16:06 another smp pass (not finished still) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#2 edit .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#2 edit .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#2 edit .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#32 edit .. //depot/projects/hammer/sys/amd64/include/smp.h#7 edit .. //depot/projects/hammer/sys/amd64/include/smptests.h#2 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#2 (text+ko) ==== @@ -35,15 +35,9 @@ #error How did you get here? #endif -#if defined(I386_CPU) && !defined(COMPILING_LINT) -#error SMP not supported with I386_CPU -#endif #ifndef DEV_APIC #error The apic device is required for SMP, add "device apic" to your config file. #endif -#if defined(CPU_DISABLE_CMPXCHG) && !defined(COMPILING_LINT) -#error SMP not supported with CPU_DISABLE_CMPXCHG -#endif #endif /* not lint */ #include @@ -63,41 +57,19 @@ #include #include #include -#if 0 -#include -#endif #include #include #include #include #include -#if 0 -#include -#endif #include -#if 0 -#include -#endif #include -#if 0 -#include -#include -#endif #include #include -#if 0 -#include -#include -#endif #include -#include /** COUNT_XINVLTLB_HITS, USE_COMLOCK */ -#if 0 -#include -#endif #include -#include #define WARMBOOT_TARGET 0 #define WARMBOOT_OFF (KERNBASE + 0x0467) @@ -109,43 +81,6 @@ #define BIOS_WARM (0x0a) /* - * this code MUST be enabled here and in mpboot.s. - * it follows the very early stages of AP boot by placing values in CMOS ram. - * it NORMALLY will never be needed and thus the primitive method for enabling. - * -#define CHECK_POINTS - */ - -#if defined(CHECK_POINTS) && !defined(PC98) -#define CHECK_READ(A) (outb(CMOS_REG, (A)), inb(CMOS_DATA)) -#define CHECK_WRITE(A,D) (outb(CMOS_REG, (A)), outb(CMOS_DATA, (D))) - -#define CHECK_INIT(D); \ - CHECK_WRITE(0x34, (D)); \ - CHECK_WRITE(0x35, (D)); \ - CHECK_WRITE(0x36, (D)); \ - CHECK_WRITE(0x37, (D)); \ - CHECK_WRITE(0x38, (D)); \ - CHECK_WRITE(0x39, (D)); - -#define CHECK_PRINT(S); \ - printf("%s: %d, %d, %d, %d, %d, %d\n", \ - (S), \ - CHECK_READ(0x34), \ - CHECK_READ(0x35), \ - CHECK_READ(0x36), \ - CHECK_READ(0x37), \ - CHECK_READ(0x38), \ - CHECK_READ(0x39)); - -#else /* CHECK_POINTS */ - -#define CHECK_INIT(D) -#define CHECK_PRINT(S) - -#endif /* CHECK_POINTS */ - -/* * Values to send to the POST hardware. */ #define MP_BOOTADDRESS_POST 0x10 @@ -165,11 +100,6 @@ /* lock region used by kernel profiling */ int mcount_lock; -#ifdef USE_COMLOCK -/* locks com (tty) data/hardware accesses: a FASTINTR() */ -struct mtx com_mtx; -#endif - /** XXX FIXME: where does this really belong, isa.h/isa.c perhaps? */ int current_postcode; @@ -247,7 +177,6 @@ u_int mp_bootaddress(u_int basemem) { - POSTCODE(MP_BOOTADDRESS_POST); boot_address = basemem & ~0xfff; /* round down to 4k boundary */ if ((basemem - boot_address) < bootMP_size) @@ -321,8 +250,6 @@ cpu_mp_start(void) { - POSTCODE(MP_START_POST); - /* Install an inter-CPU IPI for TLB invalidation */ setidt(IPI_INVLTLB, IDTVEC(invltlb), SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); @@ -355,9 +282,6 @@ setidt(IPI_STOP, IDTVEC(cpustop), SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); -#ifdef USE_COMLOCK - mtx_init(&com_mtx, "com", NULL, MTX_SPIN); -#endif mtx_init(&smp_tlb_mtx, "tlb", NULL, MTX_SPIN); /* Setup BSP apic ID */ @@ -389,8 +313,6 @@ { int i, x; - POSTCODE(MP_ANNOUNCE_POST); - /* List CPUs */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); for (i = 1, x = 0; x < MAXCPU; x++) { @@ -502,8 +424,6 @@ uintptr_t kptbase; int i, pg, apic_id, cpu; - POSTCODE(START_ALL_APS_POST); - mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN); /* install the AP 1st level boot code */ @@ -563,16 +483,13 @@ bootAP = cpu; /* attempt to start the Application Processor */ - CHECK_INIT(99); /* setup checkpoints */ if (!start_ap(apic_id, boot_addr)) { printf("AP #%d (PHY# %d) failed!\n", cpu, apic_id); - CHECK_PRINT("trace"); /* show checkpoints */ /* better panic as the AP may be running loose */ printf("panic y/n? [y] "); if (cngetc() != 'n') panic("bye-bye"); } - CHECK_PRINT("trace"); /* show checkpoints */ all_cpus |= (1 << cpu); /* record AP in CPU map */ } @@ -632,8 +549,6 @@ u_int16_t *dst16; u_int32_t *dst32; - POSTCODE(INSTALL_AP_TRAMP_POST); - for (x = 0; x < size; ++x) *dst++ = *src++; @@ -680,8 +595,6 @@ int vector, ms; int cpus; - POSTCODE(START_AP_POST); - /* calculate the vector */ vector = (boot_addr >> 12) & 0xff; ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#2 (text+ko) ==== @@ -225,10 +225,6 @@ u_long segment; u_int32_t target; -#if 0 - POSTCODE(MP_PROBE_POST); -#endif - /* see if EBDA exists */ if ((segment = (u_long) * (u_short *) (KERNBASE + 0x40e)) != 0) { /* search first 1K of EBDA */ ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#32 (text+ko) ==== @@ -116,6 +116,9 @@ #include #include #include +#ifdef SMP +#include +#endif #include #include @@ -165,6 +168,9 @@ LIST_HEAD(pmaplist, pmap); static struct pmaplist allpmaps; static struct mtx allpmaps_lock; +#ifdef SMP +static struct mtx lazypmap_lock; +#endif vm_paddr_t avail_start; /* PA of first available physical page */ vm_paddr_t avail_end; /* PA of last available physical page */ @@ -479,6 +485,9 @@ kernel_pmap->pm_active = -1; /* don't allow deactivation */ TAILQ_INIT(&kernel_pmap->pm_pvlist); LIST_INIT(&allpmaps); +#ifdef SMP + mtx_init(&lazypmap_lock, "lazypmap", NULL, MTX_SPIN); +#endif mtx_init(&allpmaps_lock, "allpmaps", NULL, MTX_SPIN); mtx_lock_spin(&allpmaps_lock); LIST_INSERT_HEAD(&allpmaps, kernel_pmap, pm_list); @@ -678,10 +687,121 @@ return 0; } -XXXX SMP VERSIONS +#ifdef SMP +/* + * For SMP, these functions have to use the IPI mechanism for coherence. + */ +void +pmap_invalidate_page(pmap_t pmap, vm_offset_t va) +{ + u_int cpumask; + u_int other_cpus; + + if (smp_started) { + if (!(read_eflags() & PSL_I)) + panic("%s: interrupts disabled", __func__); + mtx_lock_spin(&smp_tlb_mtx); + } else + critical_enter(); + /* + * We need to disable interrupt preemption but MUST NOT have + * interrupts disabled here. + * XXX we may need to hold schedlock to get a coherent pm_active + * XXX critical sections disable interrupts again + */ + if (pmap->pm_active == -1 || pmap->pm_active == all_cpus) { + invlpg(va); + smp_invlpg(va); + } else { + cpumask = PCPU_GET(cpumask); + other_cpus = PCPU_GET(other_cpus); + if (pmap->pm_active & cpumask) + invlpg(va); + if (pmap->pm_active & other_cpus) + smp_masked_invlpg(pmap->pm_active & other_cpus, va); + } + if (smp_started) + mtx_unlock_spin(&smp_tlb_mtx); + else + critical_exit(); +} + +void +pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +{ + u_int cpumask; + u_int other_cpus; + vm_offset_t addr; + + if (smp_started) { + if (!(read_eflags() & PSL_I)) + panic("%s: interrupts disabled", __func__); + mtx_lock_spin(&smp_tlb_mtx); + } else + critical_enter(); + /* + * We need to disable interrupt preemption but MUST NOT have + * interrupts disabled here. + * XXX we may need to hold schedlock to get a coherent pm_active + * XXX critical sections disable interrupts again + */ + if (pmap->pm_active == -1 || pmap->pm_active == all_cpus) { + for (addr = sva; addr < eva; addr += PAGE_SIZE) + invlpg(addr); + smp_invlpg_range(sva, eva); + } else { + cpumask = PCPU_GET(cpumask); + other_cpus = PCPU_GET(other_cpus); + if (pmap->pm_active & cpumask) + for (addr = sva; addr < eva; addr += PAGE_SIZE) + invlpg(addr); + if (pmap->pm_active & other_cpus) + smp_masked_invlpg_range(pmap->pm_active & other_cpus, + sva, eva); + } + if (smp_started) + mtx_unlock_spin(&smp_tlb_mtx); + else + critical_exit(); +} + +void +pmap_invalidate_all(pmap_t pmap) +{ + u_int cpumask; + u_int other_cpus; + if (smp_started) { + if (!(read_eflags() & PSL_I)) + panic("%s: interrupts disabled", __func__); + mtx_lock_spin(&smp_tlb_mtx); + } else + critical_enter(); + /* + * We need to disable interrupt preemption but MUST NOT have + * interrupts disabled here. + * XXX we may need to hold schedlock to get a coherent pm_active + * XXX critical sections disable interrupts again + */ + if (pmap->pm_active == -1 || pmap->pm_active == all_cpus) { + invltlb(); + smp_invltlb(); + } else { + cpumask = PCPU_GET(cpumask); + other_cpus = PCPU_GET(other_cpus); + if (pmap->pm_active & cpumask) + invltlb(); + if (pmap->pm_active & other_cpus) + smp_masked_invltlb(pmap->pm_active & other_cpus); + } + if (smp_started) + mtx_unlock_spin(&smp_tlb_mtx); + else + critical_exit(); +} +#else /* !SMP */ /* - * Normal invalidation functions. + * Normal, non-SMP, invalidation functions. * We inline these within pmap.c for speed. */ PMAP_INLINE void @@ -709,6 +829,7 @@ if (pmap == kernel_pmap || pmap->pm_active) invltlb(); } +#endif /* !SMP */ /* * Are we current address space or kernel? @@ -1241,6 +1362,95 @@ * Pmap allocation/deallocation routines. ***************************************************/ +#ifdef SMP +/* + * Deal with a SMP shootdown of other users of the pmap that we are + * trying to dispose of. This can be a bit hairy. + */ +static u_int *lazymask; +static u_int lazyptd; +static volatile u_int lazywait; + +void pmap_lazyfix_action(void); + +void +pmap_lazyfix_action(void) +{ + u_int mymask = PCPU_GET(cpumask); + + if (rcr3() == lazyptd) + load_cr3(PCPU_GET(curpcb)->pcb_cr3); + atomic_clear_int(lazymask, mymask); + atomic_store_rel_int(&lazywait, 1); +} + +static void +pmap_lazyfix_self(u_int mymask) +{ + + if (rcr3() == lazyptd) + load_cr3(PCPU_GET(curpcb)->pcb_cr3); + atomic_clear_int(lazymask, mymask); +} + + +static void +pmap_lazyfix(pmap_t pmap) +{ + u_int mymask = PCPU_GET(cpumask); + u_int mask; + register u_int spins; + + while ((mask = pmap->pm_active) != 0) { + spins = 50000000; + mask = mask & -mask; /* Find least significant set bit */ + mtx_lock_spin(&lazypmap_lock); +#ifdef PAE + lazyptd = vtophys(pmap->pm_pdpt); +#else + lazyptd = vtophys(pmap->pm_pdir); +#endif + if (mask == mymask) { + lazymask = &pmap->pm_active; + pmap_lazyfix_self(mymask); + } else { + atomic_store_rel_int((u_int *)&lazymask, + (u_int)&pmap->pm_active); + atomic_store_rel_int(&lazywait, 0); + ipi_selected(mask, IPI_LAZYPMAP); + while (lazywait == 0) { + ia32_pause(); + if (--spins == 0) + break; + } + } + mtx_unlock_spin(&lazypmap_lock); + if (spins == 0) + printf("pmap_lazyfix: spun for 50000000\n"); + } +} + +#else /* SMP */ + +/* + * Cleaning up on uniprocessor is easy. For various reasons, we're + * unlikely to have to even execute this code, including the fact + * that the cleanup is deferred until the parent does a wait(2), which + * means that another userland process has run. + */ +static void +pmap_lazyfix(pmap_t pmap) +{ + u_int cr3; + + cr3 = vtophys(pmap->pm_pdir); + if (cr3 == rcr3()) { + load_cr3(PCPU_GET(curpcb)->pcb_cr3); + pmap->pm_active &= ~(PCPU_GET(cpumask)); + } +} +#endif /* SMP */ + /* * Release any resources held by the given physical map. * Called when a pmap initialized by pmap_pinit is being released. @@ -1261,6 +1471,7 @@ ("pmap_release: pmap resident count %ld != 0", pmap->pm_stats.resident_count)); + pmap_lazyfix(pmap); mtx_lock_spin(&allpmaps_lock); LIST_REMOVE(pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); @@ -2899,12 +3110,19 @@ pmap_activate(struct thread *td) { struct proc *p = td->td_proc; - pmap_t pmap; + pmap_t pmap, oldpmap; u_int64_t cr3; critical_enter(); pmap = vmspace_pmap(td->td_proc->p_vmspace); + oldpmap = PCPU_GET(curpmap); +#ifdef SMP + atomic_clear_long(&oldpmap->pm_active, PCPU_GET(cpumask)); + atomic_set_long(&pmap->pm_active, PCPU_GET(cpumask)); +#else + oldpmap->pm_active &= ~PCPU_GET(cpumask); pmap->pm_active |= PCPU_GET(cpumask); +#endif cr3 = vtophys(pmap->pm_pml4); /* XXXKSE this is wrong. * pmap_activate is for the current thread on the current cpu ==== //depot/projects/hammer/sys/amd64/include/smp.h#7 (text+ko) ==== @@ -19,20 +19,6 @@ #ifndef LOCORE -/* - * For sending values to POST displays. - * XXX FIXME: where does this really belong, isa.h/isa.c perhaps? - */ -extern int current_postcode; /** XXX currently in mp_machdep.c */ -#define POSTCODE(X) current_postcode = (X), \ - outb(0x80, current_postcode) -#define POSTCODE_LO(X) current_postcode &= 0xf0, \ - current_postcode |= ((X) & 0x0f), \ - outb(0x80, current_postcode) -#define POSTCODE_HI(X) current_postcode &= 0x0f, \ - current_postcode |= (((X) << 4) & 0xf0), \ - outb(0x80, current_postcode) - #include #include #include ==== //depot/projects/hammer/sys/amd64/include/smptests.h#2 (text+ko) ==== @@ -24,99 +24,3 @@ * * $FreeBSD: src/sys/i386/include/smptests.h,v 1.44 2003/01/23 01:04:27 peter Exp $ */ - -#ifndef _MACHINE_SMPTESTS_H_ -#define _MACHINE_SMPTESTS_H_ - - -/* - * Various 'tests in progress' and configuration parameters. - */ - -/* - * These defines enable critical region locking of areas that were - * protected via cli/sti in the UP kernel. - * - * COMLOCK protects the sio/cy drivers. - * known to be incomplete: - * joystick lkm - * ? - */ -#define USE_COMLOCK - - -/* - * Send CPUSTOP IPI for stop/restart of other CPUs on DDB break. -#define VERBOSE_CPUSTOP_ON_DDBBREAK - */ -#define CPUSTOP_ON_DDBBREAK - -/* - * Misc. counters. - * -#define COUNT_XINVLTLB_HITS - */ - -/* - * Address of POST hardware port. - * Defining this enables POSTCODE macros. - * -#define POST_ADDR 0x80 - */ - - -/* - * POST hardware macros. - */ -#ifdef POST_ADDR -#define ASMPOSTCODE_INC \ - pushl %eax ; \ - movl _current_postcode, %eax ; \ - incl %eax ; \ - andl $0xff, %eax ; \ - movl %eax, _current_postcode ; \ - outb %al, $POST_ADDR ; \ - popl %eax - -/* - * Overwrite the current_postcode value. - */ -#define ASMPOSTCODE(X) \ - pushl %eax ; \ - movl $X, %eax ; \ - movl %eax, _current_postcode ; \ - outb %al, $POST_ADDR ; \ - popl %eax - -/* - * Overwrite the current_postcode low nibble. - */ -#define ASMPOSTCODE_LO(X) \ - pushl %eax ; \ - movl _current_postcode, %eax ; \ - andl $0xf0, %eax ; \ - orl $X, %eax ; \ - movl %eax, _current_postcode ; \ - outb %al, $POST_ADDR ; \ - popl %eax - -/* - * Overwrite the current_postcode high nibble. - */ -#define ASMPOSTCODE_HI(X) \ - pushl %eax ; \ - movl _current_postcode, %eax ; \ - andl $0x0f, %eax ; \ - orl $(X<<4), %eax ; \ - movl %eax, _current_postcode ; \ - outb %al, $POST_ADDR ; \ - popl %eax -#else -#define ASMPOSTCODE_INC -#define ASMPOSTCODE(X) -#define ASMPOSTCODE_LO(X) -#define ASMPOSTCODE_HI(X) -#endif /* POST_ADDR */ - - -#endif /* _MACHINE_SMPTESTS_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Sep 11 16:18:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4323416A4C1; Thu, 11 Sep 2003 16:18:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E39416A4BF for ; Thu, 11 Sep 2003 16:18:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A339543F85 for ; Thu, 11 Sep 2003 16:18:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BNIw0U053832 for ; Thu, 11 Sep 2003 16:18:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BNIwRa053829 for perforce@freebsd.org; Thu, 11 Sep 2003 16:18:58 -0700 (PDT) Date: Thu, 11 Sep 2003 16:18:58 -0700 (PDT) Message-Id: <200309112318.h8BNIwRa053829@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37943 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 23:18:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=37943 Change 37943 by peter@peter_work on 2003/09/11 16:18:31 alt.unifdef.-DCPUSTOP_ON_DDBBREAK.die.die.die Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#10 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/db_interface.c#10 (text+ko) ==== @@ -99,7 +99,6 @@ disable_intr(); #ifdef SMP -#ifdef CPUSTOP_ON_DDBBREAK #if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) db_printf("\nCPU%d stopping CPUs: 0x%08x...", PCPU_GET(cpuid), @@ -113,7 +112,6 @@ db_printf(" stopped.\n"); #endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ -#endif /* CPUSTOP_ON_DDBBREAK */ #endif /* SMP */ switch (type) { @@ -211,7 +209,6 @@ #endif #ifdef SMP -#ifdef CPUSTOP_ON_DDBBREAK #if defined(VERBOSE_CPUSTOP_ON_DDBBREAK) db_printf("\nCPU%d restarting CPUs: 0x%08x...", PCPU_GET(cpuid), @@ -230,8 +227,8 @@ db_printf(" restarted.\n"); #endif /* VERBOSE_CPUSTOP_ON_DDBBREAK */ -#endif /* CPUSTOP_ON_DDBBREAK */ #endif /* SMP */ + write_rflags(ef); return (1); From owner-p4-projects@FreeBSD.ORG Thu Sep 11 16:22:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B793116A4C1; Thu, 11 Sep 2003 16:22:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8AECA16A4BF for ; Thu, 11 Sep 2003 16:22:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C54B43FEC for ; Thu, 11 Sep 2003 16:22:03 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BNM20U054390 for ; Thu, 11 Sep 2003 16:22:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BNM2QA054387 for perforce@freebsd.org; Thu, 11 Sep 2003 16:22:02 -0700 (PDT) Date: Thu, 11 Sep 2003 16:22:02 -0700 (PDT) Message-Id: <200309112322.h8BNM2QA054387@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37944 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 23:22:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=37944 Change 37944 by peter@peter_work on 2003/09/11 16:21:28 smp checklist. note that I dont allocate pcpu area yet Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/todo#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Sep 11 16:23:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67D6716A4C1; Thu, 11 Sep 2003 16:23:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4253B16A4BF for ; Thu, 11 Sep 2003 16:23:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A18443FFB for ; Thu, 11 Sep 2003 16:23:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BNN40U054461 for ; Thu, 11 Sep 2003 16:23:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BNN4Td054458 for perforce@freebsd.org; Thu, 11 Sep 2003 16:23:04 -0700 (PDT) Date: Thu, 11 Sep 2003 16:23:04 -0700 (PDT) Message-Id: <200309112323.h8BNN4Td054458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37945 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 23:23:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=37945 Change 37945 by peter@peter_work on 2003/09/11 16:22:47 express evil intentions about mpboot.s Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/todo#2 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/todo#2 (text+ko) ==== @@ -1,3 +1,6 @@ #! /bin/cat -allocate pcpu area. Allocating a massive pcpu area is overkill. +* allocate pcpu area. Allocating a massive pcpu area is overkill. + +* take mpboot out behind he (bike)shed and shoot it and rewrite it using +the AMD suggested boot sequence to long mode. From owner-p4-projects@FreeBSD.ORG Thu Sep 11 16:35:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC29816A4C1; Thu, 11 Sep 2003 16:35:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B229F16A4BF for ; Thu, 11 Sep 2003 16:35:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F65C43FDD for ; Thu, 11 Sep 2003 16:35:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BNZL0U055407 for ; Thu, 11 Sep 2003 16:35:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BNZLHp055404 for perforce@freebsd.org; Thu, 11 Sep 2003 16:35:21 -0700 (PDT) Date: Thu, 11 Sep 2003 16:35:21 -0700 (PDT) Message-Id: <200309112335.h8BNZLHp055404@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37947 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 23:35:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=37947 Change 37947 by peter@peter_work on 2003/09/11 16:34:53 tidy up some bits Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#2 edit .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/mpboot.s#2 edit .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#3 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#2 (text+ko) ==== @@ -133,15 +133,6 @@ movl $KDSEL, %eax /* Kernel data selector */ mov %ax, %ds -#ifdef COUNT_XINVLTLB_HITS - pushl %fs - movl $KPSEL, %eax /* Private space selector */ - mov %ax, %fs - movl PCPU(CPUID), %eax - popl %fs - incl xhits_gbl(,%eax,4) -#endif /* COUNT_XINVLTLB_HITS */ - movl %cr3, %eax /* invalidate the TLB */ movl %eax, %cr3 @@ -166,15 +157,6 @@ movl $KDSEL, %eax /* Kernel data selector */ mov %ax, %ds -#ifdef COUNT_XINVLTLB_HITS - pushl %fs - movl $KPSEL, %eax /* Private space selector */ - mov %ax, %fs - movl PCPU(CPUID), %eax - popl %fs - incl xhits_pg(,%eax,4) -#endif /* COUNT_XINVLTLB_HITS */ - movl smp_tlb_addr1, %eax invlpg (%eax) /* invalidate single page */ @@ -200,15 +182,6 @@ movl $KDSEL, %eax /* Kernel data selector */ mov %ax, %ds -#ifdef COUNT_XINVLTLB_HITS - pushl %fs - movl $KPSEL, %eax /* Private space selector */ - mov %ax, %fs - movl PCPU(CPUID), %eax - popl %fs - incl xhits_rng(,%eax,4) -#endif /* COUNT_XINVLTLB_HITS */ - movl smp_tlb_addr1, %edx movl smp_tlb_addr2, %eax 1: invlpg (%edx) /* invalidate single page */ ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#3 (text+ko) ==== @@ -415,9 +415,7 @@ static int start_all_aps(u_int boot_addr) { -#ifndef PC98 u_char mpbiosreason; -#endif u_long mpbioswarmvec; struct pcpu *pc; char *stack; @@ -431,10 +429,8 @@ /* save the current value of the warm-start vector */ mpbioswarmvec = *((u_long *) WARMBOOT_OFF); -#ifndef PC98 outb(CMOS_REG, BIOS_RESET); mpbiosreason = inb(CMOS_DATA); -#endif /* set up temporary P==V mapping for AP boot */ /* XXX this is a hack, we should boot the AP on its own stack/PTD */ @@ -473,10 +469,8 @@ /* setup a vector to our boot code */ *((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET; *((volatile u_short *) WARMBOOT_SEG) = (boot_addr >> 4); -#ifndef PC98 outb(CMOS_REG, BIOS_RESET); outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ -#endif bootSTK = &SMP_prvspace[apic_id].idlekstack[KSTACK_PAGES * PAGE_SIZE]; @@ -499,10 +493,9 @@ /* restore the warmstart vector */ *(u_long *) WARMBOOT_OFF = mpbioswarmvec; -#ifndef PC98 + outb(CMOS_REG, BIOS_RESET); outb(CMOS_DATA, mpbiosreason); -#endif /* * Set up the idle context for the BSP. Similar to above except @@ -661,42 +654,6 @@ return 0; /* return FAILURE */ } -#ifdef COUNT_XINVLTLB_HITS -u_int xhits_gbl[MAXCPU]; -u_int xhits_pg[MAXCPU]; -u_int xhits_rng[MAXCPU]; -SYSCTL_NODE(_debug, OID_AUTO, xhits, CTLFLAG_RW, 0, ""); -SYSCTL_OPAQUE(_debug_xhits, OID_AUTO, global, CTLFLAG_RW, &xhits_gbl, - sizeof(xhits_gbl), "IU", ""); -SYSCTL_OPAQUE(_debug_xhits, OID_AUTO, page, CTLFLAG_RW, &xhits_pg, - sizeof(xhits_pg), "IU", ""); -SYSCTL_OPAQUE(_debug_xhits, OID_AUTO, range, CTLFLAG_RW, &xhits_rng, - sizeof(xhits_rng), "IU", ""); - -u_int ipi_global; -u_int ipi_page; -u_int ipi_range; -u_int ipi_range_size; -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_global, CTLFLAG_RW, &ipi_global, 0, ""); -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_page, CTLFLAG_RW, &ipi_page, 0, ""); -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_range, CTLFLAG_RW, &ipi_range, 0, ""); -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_range_size, CTLFLAG_RW, &ipi_range_size, - 0, ""); - -u_int ipi_masked_global; -u_int ipi_masked_page; -u_int ipi_masked_range; -u_int ipi_masked_range_size; -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_global, CTLFLAG_RW, - &ipi_masked_global, 0, ""); -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_page, CTLFLAG_RW, - &ipi_masked_page, 0, ""); -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_range, CTLFLAG_RW, - &ipi_masked_range, 0, ""); -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_range_size, CTLFLAG_RW, - &ipi_masked_range_size, 0, ""); -#endif /* COUNT_XINVLTLB_HITS */ - /* * Flush the TLB on all other CPU's */ @@ -803,69 +760,49 @@ void smp_invltlb(void) { - if (smp_started) { + + if (smp_started) smp_tlb_shootdown(IPI_INVLTLB, 0, 0); -#ifdef COUNT_XINVLTLB_HITS - ipi_global++; -#endif - } } void smp_invlpg(vm_offset_t addr) { - if (smp_started) { + + if (smp_started) smp_tlb_shootdown(IPI_INVLPG, addr, 0); -#ifdef COUNT_XINVLTLB_HITS - ipi_page++; -#endif - } } void smp_invlpg_range(vm_offset_t addr1, vm_offset_t addr2) { - if (smp_started) { + + if (smp_started) smp_tlb_shootdown(IPI_INVLRNG, addr1, addr2); -#ifdef COUNT_XINVLTLB_HITS - ipi_range++; - ipi_range_size += (addr2 - addr1) / PAGE_SIZE; -#endif - } } void smp_masked_invltlb(u_int mask) { - if (smp_started) { + + if (smp_started) smp_targeted_tlb_shootdown(mask, IPI_INVLTLB, 0, 0); -#ifdef COUNT_XINVLTLB_HITS - ipi_masked_global++; -#endif - } } void smp_masked_invlpg(u_int mask, vm_offset_t addr) { - if (smp_started) { + + if (smp_started) smp_targeted_tlb_shootdown(mask, IPI_INVLPG, addr, 0); -#ifdef COUNT_XINVLTLB_HITS - ipi_masked_page++; -#endif - } } void smp_masked_invlpg_range(u_int mask, vm_offset_t addr1, vm_offset_t addr2) { - if (smp_started) { + + if (smp_started) smp_targeted_tlb_shootdown(mask, IPI_INVLRNG, addr1, addr2); -#ifdef COUNT_XINVLTLB_HITS - ipi_masked_range++; - ipi_masked_range_size += (addr2 - addr1) / PAGE_SIZE; -#endif - } } @@ -884,10 +821,6 @@ /* BSP may have changed PTD while we were waiting */ invltlb(); -#if defined(I586_CPU) && !defined(NO_F00F_HACK) - lidt(&r_idt); -#endif - /* set up CPU registers and state */ cpu_setregs(); @@ -902,7 +835,6 @@ printf("SMP: cpuid = %d\n", PCPU_GET(cpuid)); printf("SMP: actual apic_id = %d\n", lapic_id()); printf("SMP: correct apic_id = %d\n", PCPU_GET(apic_id)); - printf("PTD[MPPTDI] = %#jx\n", (uintmax_t)PTD[MPPTDI]); panic("cpuid mismatch! boom!!"); } ==== //depot/projects/hammer/sys/amd64/amd64/mpboot.s#2 (text+ko) ==== @@ -45,38 +45,11 @@ #define R(x) ((x)-KERNBASE) /* - * this code MUST be enabled here and in mp_machdep.c - * it follows the very early stages of AP boot by placing values in CMOS ram. - * it NORMALLY will never be needed and thus the primitive method for enabling. - * -#define CHECK_POINTS - */ - -#if defined(CHECK_POINTS) && !defined(PC98) - -#define CMOS_REG (0x70) -#define CMOS_DATA (0x71) - -#define CHECKPOINT(A,D) \ - movb $(A),%al ; \ - outb %al,$CMOS_REG ; \ - movb $(D),%al ; \ - outb %al,$CMOS_DATA - -#else - -#define CHECKPOINT(A,D) - -#endif /* CHECK_POINTS */ - - -/* * the APs enter here from their trampoline code (bootMP, below) */ .p2align 4 NON_GPROF_ENTRY(MPentry) - CHECKPOINT(0x36, 3) /* * Enable features on this processor. We don't support SMP on * CPUs older than a Pentium, so we know that we can use the cpuid @@ -85,35 +58,14 @@ movl $1,%eax cpuid /* Retrieve features */ movl %cr4,%eax -#ifndef DISABLE_PSE - testl $CPUID_PSE,%edx - jz 1f orl $CR4_PSE,%eax /* Enable PSE */ -1: -#endif -#ifndef DISABLE_PG_G - testl $CPUID_PGE,%edx - jz 1f orl $CR4_PGE,%eax /* Enable PGE */ -1: -#endif - testl $CPUID_VME,%edx - jz 1f - orl $CR4_VME,%eax /* Enable VME */ -1: + orl $CR4_PAE, %eax movl %eax,%cr4 /* Now enable paging mode */ -#ifdef PAE movl R(IdlePDPT), %eax movl %eax, %cr3 - movl %cr4, %eax - orl $CR4_PAE, %eax - movl %eax, %cr4 -#else - movl R(IdlePTD), %eax - movl %eax,%cr3 -#endif movl %cr0,%eax orl $CR0_PE|CR0_PG,%eax /* enable paging */ movl %eax,%cr0 /* let the games begin! */ @@ -126,9 +78,7 @@ * Wait for the booting CPU to signal startup */ mp_begin: /* now running relocated at KERNBASE */ - CHECKPOINT(0x37, 4) call init_secondary /* load i386 tables */ - CHECKPOINT(0x38, 5) /* disable the APIC, just to be SURE */ movl lapic, %edx @@ -139,8 +89,6 @@ /* signal our startup to the BSP */ incl mp_naps /* signal BSP */ - CHECKPOINT(0x39, 6) - /* Now, let's prepare for some REAL WORK :-) This doesn't return. */ call ap_init @@ -161,7 +109,6 @@ NON_GPROF_ENTRY(bootMP) .code16 cli - CHECKPOINT(0x34, 1) /* First guarantee a 'clean slate' */ xorl %eax, %eax movl %eax, %ebx @@ -197,7 +144,6 @@ .code32 protmode: - CHECKPOINT(0x35, 2) /* * we are NOW running for the first time with %eip ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#3 (text+ko) ==== @@ -55,13 +55,8 @@ #define NAPICID 16 /* Max number of I/O APIC's */ -#ifdef PC98 -#define BIOS_BASE (0xe8000) -#define BIOS_SIZE (0x18000) -#else #define BIOS_BASE (0xf0000) #define BIOS_SIZE (0x10000) -#endif #define BIOS_COUNT (BIOS_SIZE/4) typedef void mptable_entry_handler(u_char *entry, void *arg); From owner-p4-projects@FreeBSD.ORG Thu Sep 11 16:53:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32A6C16A4C1; Thu, 11 Sep 2003 16:53:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 01E0716A4BF for ; Thu, 11 Sep 2003 16:53:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CAAE43FE3 for ; Thu, 11 Sep 2003 16:53:45 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8BNrj0U062270 for ; Thu, 11 Sep 2003 16:53:45 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8BNri64062266 for perforce@freebsd.org; Thu, 11 Sep 2003 16:53:44 -0700 (PDT) Date: Thu, 11 Sep 2003 16:53:44 -0700 (PDT) Message-Id: <200309112353.h8BNri64062266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37948 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2003 23:53:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=37948 Change 37948 by peter@peter_work on 2003/09/11 16:53:27 change pmap->pm_active to an int. the MI cpumask is an int and having it a long just makes more work in things like cpu_switch and messes up the lazy shootdown stuff. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#9 edit .. //depot/projects/hammer/sys/amd64/amd64/mpboot.s#3 edit .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#33 edit .. //depot/projects/hammer/sys/amd64/include/pcpu.h#9 edit .. //depot/projects/hammer/sys/amd64/include/pmap.h#19 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#9 (text+ko) ==== @@ -58,7 +58,6 @@ * %rsi = newtd */ ENTRY(cpu_throw) - xorq %rax, %rax movl PCPU(CPUID), %eax testq %rdi,%rdi /* no thread? */ jz 1f @@ -68,7 +67,7 @@ #ifdef SMP lock #endif - btrq %rax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */ + btrl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */ 1: movq TD_PCB(%rsi),%rdx /* newtd->td_proc */ movq PCB_CR3(%rdx),%rdx @@ -79,7 +78,7 @@ #ifdef SMP lock #endif - btsq %rax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */ + btsl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */ jmp sw1 /* @@ -148,7 +147,6 @@ jz badsw3 /* no, panic */ #endif movq TD_PCB(%rsi),%r8 - xorq %rax, %rax movl PCPU(CPUID), %eax /* switch address space */ @@ -161,7 +159,7 @@ #ifdef SMP lock #endif - btrq %rax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */ + btrl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */ /* Set bit in new pmap->pm_active */ movq TD_PROC(%rsi),%rdx /* newproc */ @@ -169,7 +167,7 @@ #ifdef SMP lock #endif - btsq %rax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */ + btsl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */ sw1: /* ==== //depot/projects/hammer/sys/amd64/amd64/mpboot.s#3 (text+ko) ==== @@ -42,8 +42,6 @@ #include "assym.s" -#define R(x) ((x)-KERNBASE) - /* * the APs enter here from their trampoline code (bootMP, below) */ ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#33 (text+ko) ==== @@ -698,7 +698,7 @@ u_int other_cpus; if (smp_started) { - if (!(read_eflags() & PSL_I)) + if (!(read_rflags() & PSL_I)) panic("%s: interrupts disabled", __func__); mtx_lock_spin(&smp_tlb_mtx); } else @@ -734,7 +734,7 @@ vm_offset_t addr; if (smp_started) { - if (!(read_eflags() & PSL_I)) + if (!(read_rflags() & PSL_I)) panic("%s: interrupts disabled", __func__); mtx_lock_spin(&smp_tlb_mtx); } else @@ -772,7 +772,7 @@ u_int other_cpus; if (smp_started) { - if (!(read_eflags() & PSL_I)) + if (!(read_rflags() & PSL_I)) panic("%s: interrupts disabled", __func__); mtx_lock_spin(&smp_tlb_mtx); } else @@ -1368,7 +1368,7 @@ * trying to dispose of. This can be a bit hairy. */ static u_int *lazymask; -static u_int lazyptd; +static register_t lazyptd; static volatile u_int lazywait; void pmap_lazyfix_action(void); @@ -1405,11 +1405,7 @@ spins = 50000000; mask = mask & -mask; /* Find least significant set bit */ mtx_lock_spin(&lazypmap_lock); -#ifdef PAE - lazyptd = vtophys(pmap->pm_pdpt); -#else - lazyptd = vtophys(pmap->pm_pdir); -#endif + lazyptd = vtophys(pmap->pm_pml4); if (mask == mymask) { lazymask = &pmap->pm_active; pmap_lazyfix_self(mymask); @@ -1441,9 +1437,9 @@ static void pmap_lazyfix(pmap_t pmap) { - u_int cr3; + u_long cr3; - cr3 = vtophys(pmap->pm_pdir); + cr3 = vtophys(pmap->pm_pml4); if (cr3 == rcr3()) { load_cr3(PCPU_GET(curpcb)->pcb_cr3); pmap->pm_active &= ~(PCPU_GET(cpumask)); @@ -3117,8 +3113,8 @@ pmap = vmspace_pmap(td->td_proc->p_vmspace); oldpmap = PCPU_GET(curpmap); #ifdef SMP - atomic_clear_long(&oldpmap->pm_active, PCPU_GET(cpumask)); - atomic_set_long(&pmap->pm_active, PCPU_GET(cpumask)); + atomic_clear_int(&oldpmap->pm_active, PCPU_GET(cpumask)); + atomic_set_int(&pmap->pm_active, PCPU_GET(cpumask)); #else oldpmap->pm_active &= ~PCPU_GET(cpumask); pmap->pm_active |= PCPU_GET(cpumask); ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#9 (text+ko) ==== @@ -41,7 +41,6 @@ #define PCPU_MD_FIELDS \ struct pcpu *pc_prvspace; /* Self-reference */ \ register_t pc_scratch_rsp; /* User %rsp in syscall */ - XXXX add rest here u_int pc_apic_id; #if defined(lint) ==== //depot/projects/hammer/sys/amd64/include/pmap.h#19 (text+ko) ==== @@ -221,7 +221,8 @@ pml4_entry_t *pm_pml4; /* KVA of level 4 page table */ vm_object_t pm_pteobj; /* Container for pte's */ TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ - u_long pm_active; /* active on cpus */ + u_int pm_active; /* active on cpus */ + /* spare u_int here due to padding */ struct pmap_statistics pm_stats; /* pmap statistics */ LIST_ENTRY(pmap) pm_list; /* List of all pmaps */ }; From owner-p4-projects@FreeBSD.ORG Fri Sep 12 10:26:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CD2A16A4C1; Fri, 12 Sep 2003 10:26:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B17A16A4BF for ; Fri, 12 Sep 2003 10:26:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DE9943FFD for ; Fri, 12 Sep 2003 10:26:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8CHQT0U075786 for ; Fri, 12 Sep 2003 10:26:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8CHQSTE075783 for perforce@freebsd.org; Fri, 12 Sep 2003 10:26:28 -0700 (PDT) Date: Fri, 12 Sep 2003 10:26:28 -0700 (PDT) Message-Id: <200309121726.h8CHQSTE075783@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2003 17:26:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=37962 Change 37962 by peter@peter_hammer on 2003/09/12 10:25:51 Tweaks to survive 'make depend' Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#13 edit .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/mpboot.s#4 edit .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#12 edit .. //depot/projects/hammer/sys/amd64/include/pcpu.h#10 edit .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.s#2 edit .. //depot/projects/hammer/sys/amd64/isa/npx.c#7 edit .. //depot/projects/hammer/sys/conf/files.amd64#23 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#13 (text+ko) ==== @@ -60,7 +60,7 @@ #include #include -#include +#include /* XXX - should be in header file: */ void printcpuinfo(void); ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -26,7 +26,6 @@ #include __FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.216 2003/09/10 01:36:48 jhb Exp $"); -#include "opt_apic.h" #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -34,10 +33,6 @@ #if !defined(SMP) #error How did you get here? #endif - -#ifndef DEV_APIC -#error The apic device is required for SMP, add "device apic" to your config file. -#endif #endif /* not lint */ #include ==== //depot/projects/hammer/sys/amd64/amd64/mpboot.s#4 (text+ko) ==== @@ -34,8 +34,6 @@ * $FreeBSD: src/sys/i386/i386/mpboot.s,v 1.20 2003/03/30 05:24:52 jake Exp $ */ -#include "opt_pmap.h" - #include /* miscellaneous asm macros */ #include #include ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#12 (text+ko) ==== @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#10 (text+ko) ==== @@ -40,7 +40,8 @@ */ #define PCPU_MD_FIELDS \ struct pcpu *pc_prvspace; /* Self-reference */ \ - register_t pc_scratch_rsp; /* User %rsp in syscall */ + struct pmap *pc_curpmap; \ + register_t pc_scratch_rsp; /* User %rsp in syscall */ \ u_int pc_apic_id; #if defined(lint) ==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.s#2 (text+ko) ==== @@ -40,8 +40,6 @@ * master and slave interrupt controllers. */ -#include "opt_auto_eoi.h" - #include #include #ifdef PC98 ==== //depot/projects/hammer/sys/amd64/isa/npx.c#7 (text+ko) ==== @@ -69,7 +69,7 @@ #include #include -#include +#include #ifdef DEV_ISA #include #endif ==== //depot/projects/hammer/sys/conf/files.amd64#23 (text+ko) ==== @@ -8,13 +8,13 @@ # dependency lines other than the first are silently ignored. # -ia32_genassym.o optional ia32 \ +ia32_genassym.o standard \ dependency "$S/compat/ia32/ia32_genassym.c" \ compile-with "${CC} ${CFLAGS:N-fno-common} -c ${.IMPSRC}" \ no-obj no-implicit-rule \ clean "ia32_genassym.o" # -ia32_assym.h optional ia32 \ +ia32_assym.h standard \ dependency "$S/kern/genassym.sh ia32_genassym.o" \ compile-with "env NM=${NM} sh $S/kern/genassym.sh ia32_genassym.o > ${.TARGET}" \ no-obj no-implicit-rule before-depend \ @@ -65,14 +65,12 @@ amd64/amd64/exception.S standard amd64/amd64/identcpu.c standard amd64/amd64/initcpu.c standard -amd64/amd64/intr_machdep.c standard amd64/amd64/io_apic.c standard amd64/amd64/legacy.c standard amd64/amd64/local_apic.c standard amd64/amd64/locore.S standard no-obj amd64/amd64/machdep.c standard amd64/amd64/mem.c standard -amd64/amd64/mp_clock.c optional smp amd64/amd64/mp_machdep.c optional smp amd64/amd64/mpboot.s optional smp amd64/amd64/mptable.c standard From owner-p4-projects@FreeBSD.ORG Fri Sep 12 10:35:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E0E916A4C1; Fri, 12 Sep 2003 10:35:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1806D16A4BF for ; Fri, 12 Sep 2003 10:35:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AEA2643FA3 for ; Fri, 12 Sep 2003 10:35:06 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8CHZ60U076529 for ; Fri, 12 Sep 2003 10:35:06 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8CHZ1L5076488 for perforce@freebsd.org; Fri, 12 Sep 2003 10:35:01 -0700 (PDT) Date: Fri, 12 Sep 2003 10:35:01 -0700 (PDT) Message-Id: <200309121735.h8CHZ1L5076488@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 37963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2003 17:35:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=37963 Change 37963 by jhb@jhb_laptop on 2003/09/12 10:34:25 Create a new project for working ond device power management. Just branch the kernel for now. Affected files ... .. //depot/projects/power/sys/Makefile#1 branch .. //depot/projects/power/sys/alpha/Makefile#1 branch .. //depot/projects/power/sys/alpha/alpha/alpha-gdbstub.c#1 branch .. //depot/projects/power/sys/alpha/alpha/api_up1000.c#1 branch .. //depot/projects/power/sys/alpha/alpha/atomic.s#1 branch .. //depot/projects/power/sys/alpha/alpha/autoconf.c#1 branch .. //depot/projects/power/sys/alpha/alpha/busdma_machdep.c#1 branch .. //depot/projects/power/sys/alpha/alpha/busspace.c#1 branch .. //depot/projects/power/sys/alpha/alpha/clock.c#1 branch .. //depot/projects/power/sys/alpha/alpha/clock_if.m#1 branch .. //depot/projects/power/sys/alpha/alpha/cpuconf.c#1 branch .. //depot/projects/power/sys/alpha/alpha/critical.c#1 branch .. //depot/projects/power/sys/alpha/alpha/db_disasm.c#1 branch .. //depot/projects/power/sys/alpha/alpha/db_instruction.h#1 branch .. //depot/projects/power/sys/alpha/alpha/db_interface.c#1 branch .. //depot/projects/power/sys/alpha/alpha/db_trace.c#1 branch .. //depot/projects/power/sys/alpha/alpha/dec_1000a.c#1 branch .. //depot/projects/power/sys/alpha/alpha/dec_2100_a50.c#1 branch .. //depot/projects/power/sys/alpha/alpha/dec_2100_a500.c#1 branch .. //depot/projects/power/sys/alpha/alpha/dec_3000_300.c#1 branch .. //depot/projects/power/sys/alpha/alpha/dec_3000_500.c#1 branch .. //depot/projects/power/sys/alpha/alpha/dec_axppci_33.c#1 branch .. //depot/projects/power/sys/alpha/alpha/dec_eb164.c#1 branch .. //depot/projects/power/sys/alpha/alpha/dec_eb64plus.c#1 branch .. //depot/projects/power/sys/alpha/alpha/dec_kn20aa.c#1 branch .. //depot/projects/power/sys/alpha/alpha/dec_kn300.c#1 branch .. //depot/projects/power/sys/alpha/alpha/dec_kn8ae.c#1 branch .. //depot/projects/power/sys/alpha/alpha/dec_st550.c#1 branch .. //depot/projects/power/sys/alpha/alpha/dec_st6600.c#1 branch .. //depot/projects/power/sys/alpha/alpha/divrem.m4#1 branch .. //depot/projects/power/sys/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/power/sys/alpha/alpha/elf_machdep.c#1 branch .. //depot/projects/power/sys/alpha/alpha/exception.s#1 branch .. //depot/projects/power/sys/alpha/alpha/fp_emulate.c#1 branch .. //depot/projects/power/sys/alpha/alpha/genassym.c#1 branch .. //depot/projects/power/sys/alpha/alpha/ieee_float.c#1 branch .. //depot/projects/power/sys/alpha/alpha/ieee_float.h#1 branch .. //depot/projects/power/sys/alpha/alpha/in_cksum.c#1 branch .. //depot/projects/power/sys/alpha/alpha/interrupt.c#1 branch .. //depot/projects/power/sys/alpha/alpha/locore.s#1 branch .. //depot/projects/power/sys/alpha/alpha/machdep.c#1 branch .. //depot/projects/power/sys/alpha/alpha/mem.c#1 branch .. //depot/projects/power/sys/alpha/alpha/mp_machdep.c#1 branch .. //depot/projects/power/sys/alpha/alpha/pal.s#1 branch .. //depot/projects/power/sys/alpha/alpha/pmap.c#1 branch .. //depot/projects/power/sys/alpha/alpha/prom.c#1 branch .. //depot/projects/power/sys/alpha/alpha/prom_disp.s#1 branch .. //depot/projects/power/sys/alpha/alpha/promcons.c#1 branch .. //depot/projects/power/sys/alpha/alpha/sgmap.c#1 branch .. //depot/projects/power/sys/alpha/alpha/support.s#1 branch .. //depot/projects/power/sys/alpha/alpha/swtch.s#1 branch .. //depot/projects/power/sys/alpha/alpha/sys_machdep.c#1 branch .. //depot/projects/power/sys/alpha/alpha/timerreg.h#1 branch .. //depot/projects/power/sys/alpha/alpha/trap.c#1 branch .. //depot/projects/power/sys/alpha/alpha/vm_machdep.c#1 branch .. //depot/projects/power/sys/alpha/compile/.cvsignore#1 branch .. //depot/projects/power/sys/alpha/conf/GENERIC#1 branch .. //depot/projects/power/sys/alpha/conf/GENERIC.hints#1 branch .. //depot/projects/power/sys/alpha/conf/Makefile#1 branch .. //depot/projects/power/sys/alpha/conf/NOTES#1 branch .. //depot/projects/power/sys/alpha/conf/gethints.awk#1 branch .. //depot/projects/power/sys/alpha/include/_inttypes.h#1 branch .. //depot/projects/power/sys/alpha/include/_limits.h#1 branch .. //depot/projects/power/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/power/sys/alpha/include/_types.h#1 branch .. //depot/projects/power/sys/alpha/include/alpha_cpu.h#1 branch .. //depot/projects/power/sys/alpha/include/asm.h#1 branch .. //depot/projects/power/sys/alpha/include/atomic.h#1 branch .. //depot/projects/power/sys/alpha/include/bootinfo.h#1 branch .. //depot/projects/power/sys/alpha/include/bus.h#1 branch .. //depot/projects/power/sys/alpha/include/bus_memio.h#1 branch .. //depot/projects/power/sys/alpha/include/bus_pio.h#1 branch .. //depot/projects/power/sys/alpha/include/bwx.h#1 branch .. //depot/projects/power/sys/alpha/include/chipset.h#1 branch .. //depot/projects/power/sys/alpha/include/clock.h#1 branch .. //depot/projects/power/sys/alpha/include/clockvar.h#1 branch .. //depot/projects/power/sys/alpha/include/cpu.h#1 branch .. //depot/projects/power/sys/alpha/include/cpuconf.h#1 branch .. //depot/projects/power/sys/alpha/include/cpufunc.h#1 branch .. //depot/projects/power/sys/alpha/include/critical.h#1 branch .. //depot/projects/power/sys/alpha/include/db_machdep.h#1 branch .. //depot/projects/power/sys/alpha/include/elf.h#1 branch .. //depot/projects/power/sys/alpha/include/endian.h#1 branch .. //depot/projects/power/sys/alpha/include/exec.h#1 branch .. //depot/projects/power/sys/alpha/include/float.h#1 branch .. //depot/projects/power/sys/alpha/include/floatingpoint.h#1 branch .. //depot/projects/power/sys/alpha/include/fpu.h#1 branch .. //depot/projects/power/sys/alpha/include/frame.h#1 branch .. //depot/projects/power/sys/alpha/include/ieee.h#1 branch .. //depot/projects/power/sys/alpha/include/ieeefp.h#1 branch .. //depot/projects/power/sys/alpha/include/in_cksum.h#1 branch .. //depot/projects/power/sys/alpha/include/inst.h#1 branch .. //depot/projects/power/sys/alpha/include/intr.h#1 branch .. //depot/projects/power/sys/alpha/include/intrcnt.h#1 branch .. //depot/projects/power/sys/alpha/include/ioctl_bt848.h#1 branch .. //depot/projects/power/sys/alpha/include/ioctl_meteor.h#1 branch .. //depot/projects/power/sys/alpha/include/kse.h#1 branch .. //depot/projects/power/sys/alpha/include/limits.h#1 branch .. //depot/projects/power/sys/alpha/include/md_var.h#1 branch .. //depot/projects/power/sys/alpha/include/mutex.h#1 branch .. //depot/projects/power/sys/alpha/include/pal.h#1 branch .. //depot/projects/power/sys/alpha/include/param.h#1 branch .. //depot/projects/power/sys/alpha/include/pc/bios.h#1 branch .. //depot/projects/power/sys/alpha/include/pc/display.h#1 branch .. //depot/projects/power/sys/alpha/include/pc/msdos.h#1 branch .. //depot/projects/power/sys/alpha/include/pc/vesa.h#1 branch .. //depot/projects/power/sys/alpha/include/pcb.h#1 branch .. //depot/projects/power/sys/alpha/include/pcpu.h#1 branch .. //depot/projects/power/sys/alpha/include/pmap.h#1 branch .. //depot/projects/power/sys/alpha/include/proc.h#1 branch .. //depot/projects/power/sys/alpha/include/profile.h#1 branch .. //depot/projects/power/sys/alpha/include/prom.h#1 branch .. //depot/projects/power/sys/alpha/include/pte.h#1 branch .. //depot/projects/power/sys/alpha/include/ptrace.h#1 branch .. //depot/projects/power/sys/alpha/include/reg.h#1 branch .. //depot/projects/power/sys/alpha/include/reloc.h#1 branch .. //depot/projects/power/sys/alpha/include/resource.h#1 branch .. //depot/projects/power/sys/alpha/include/rpb.h#1 branch .. //depot/projects/power/sys/alpha/include/runq.h#1 branch .. //depot/projects/power/sys/alpha/include/setjmp.h#1 branch .. //depot/projects/power/sys/alpha/include/sgmap.h#1 branch .. //depot/projects/power/sys/alpha/include/sigframe.h#1 branch .. //depot/projects/power/sys/alpha/include/signal.h#1 branch .. //depot/projects/power/sys/alpha/include/smp.h#1 branch .. //depot/projects/power/sys/alpha/include/stdarg.h#1 branch .. //depot/projects/power/sys/alpha/include/swiz.h#1 branch .. //depot/projects/power/sys/alpha/include/sysarch.h#1 branch .. //depot/projects/power/sys/alpha/include/ucontext.h#1 branch .. //depot/projects/power/sys/alpha/include/varargs.h#1 branch .. //depot/projects/power/sys/alpha/include/vmparam.h#1 branch .. //depot/projects/power/sys/alpha/isa/isa.c#1 branch .. //depot/projects/power/sys/alpha/isa/isa_dma.c#1 branch .. //depot/projects/power/sys/alpha/isa/isavar.h#1 branch .. //depot/projects/power/sys/alpha/isa/mcclock_isa.c#1 branch .. //depot/projects/power/sys/alpha/linux/Makefile#1 branch .. //depot/projects/power/sys/alpha/linux/linux.h#1 branch .. //depot/projects/power/sys/alpha/linux/linux_dummy.c#1 branch .. //depot/projects/power/sys/alpha/linux/linux_genassym.c#1 branch .. //depot/projects/power/sys/alpha/linux/linux_ipc64.h#1 branch .. //depot/projects/power/sys/alpha/linux/linux_locore.s#1 branch .. //depot/projects/power/sys/alpha/linux/linux_machdep.c#1 branch .. //depot/projects/power/sys/alpha/linux/linux_proto.h#1 branch .. //depot/projects/power/sys/alpha/linux/linux_syscall.h#1 branch .. //depot/projects/power/sys/alpha/linux/linux_sysent.c#1 branch .. //depot/projects/power/sys/alpha/linux/linux_sysvec.c#1 branch .. //depot/projects/power/sys/alpha/linux/syscalls.conf#1 branch .. //depot/projects/power/sys/alpha/linux/syscalls.master#1 branch .. //depot/projects/power/sys/alpha/mcbus/mcbus.c#1 branch .. //depot/projects/power/sys/alpha/mcbus/mcbusreg.h#1 branch .. //depot/projects/power/sys/alpha/mcbus/mcbusvar.h#1 branch .. //depot/projects/power/sys/alpha/mcbus/mcmem.c#1 branch .. //depot/projects/power/sys/alpha/mcbus/mcpcia.c#1 branch .. //depot/projects/power/sys/alpha/mcbus/mcpciareg.h#1 branch .. //depot/projects/power/sys/alpha/mcbus/mcpciavar.h#1 branch .. //depot/projects/power/sys/alpha/osf1/Makefile#1 branch .. //depot/projects/power/sys/alpha/osf1/README.mach-traps#1 branch .. //depot/projects/power/sys/alpha/osf1/exec_ecoff.h#1 branch .. //depot/projects/power/sys/alpha/osf1/imgact_osf1.c#1 branch .. //depot/projects/power/sys/alpha/osf1/osf1.h#1 branch .. //depot/projects/power/sys/alpha/osf1/osf1_ioctl.c#1 branch .. //depot/projects/power/sys/alpha/osf1/osf1_misc.c#1 branch .. //depot/projects/power/sys/alpha/osf1/osf1_mount.c#1 branch .. //depot/projects/power/sys/alpha/osf1/osf1_proto.h#1 branch .. //depot/projects/power/sys/alpha/osf1/osf1_signal.c#1 branch .. //depot/projects/power/sys/alpha/osf1/osf1_signal.h#1 branch .. //depot/projects/power/sys/alpha/osf1/osf1_syscall.h#1 branch .. //depot/projects/power/sys/alpha/osf1/osf1_sysent.c#1 branch .. //depot/projects/power/sys/alpha/osf1/osf1_sysvec.c#1 branch .. //depot/projects/power/sys/alpha/osf1/osf1_util.h#1 branch .. //depot/projects/power/sys/alpha/osf1/syscalls.conf#1 branch .. //depot/projects/power/sys/alpha/osf1/syscalls.master#1 branch .. //depot/projects/power/sys/alpha/pci/alphapci_if.m#1 branch .. //depot/projects/power/sys/alpha/pci/apecs.c#1 branch .. //depot/projects/power/sys/alpha/pci/apecs_pci.c#1 branch .. //depot/projects/power/sys/alpha/pci/apecsreg.h#1 branch .. //depot/projects/power/sys/alpha/pci/apecsvar.h#1 branch .. //depot/projects/power/sys/alpha/pci/bwx.c#1 branch .. //depot/projects/power/sys/alpha/pci/cia.c#1 branch .. //depot/projects/power/sys/alpha/pci/cia_pci.c#1 branch .. //depot/projects/power/sys/alpha/pci/ciareg.h#1 branch .. //depot/projects/power/sys/alpha/pci/ciavar.h#1 branch .. //depot/projects/power/sys/alpha/pci/irongate.c#1 branch .. //depot/projects/power/sys/alpha/pci/irongate_pci.c#1 branch .. //depot/projects/power/sys/alpha/pci/irongatereg.h#1 branch .. //depot/projects/power/sys/alpha/pci/irongatevar.h#1 branch .. //depot/projects/power/sys/alpha/pci/lca.c#1 branch .. //depot/projects/power/sys/alpha/pci/lca_pci.c#1 branch .. //depot/projects/power/sys/alpha/pci/lcareg.h#1 branch .. //depot/projects/power/sys/alpha/pci/lcavar.h#1 branch .. //depot/projects/power/sys/alpha/pci/pci_eb164_intr.s#1 branch .. //depot/projects/power/sys/alpha/pci/pci_eb64plus_intr.s#1 branch .. //depot/projects/power/sys/alpha/pci/pcibus.c#1 branch .. //depot/projects/power/sys/alpha/pci/pcibus.h#1 branch .. //depot/projects/power/sys/alpha/pci/swiz.c#1 branch .. //depot/projects/power/sys/alpha/pci/t2.c#1 branch .. //depot/projects/power/sys/alpha/pci/t2_pci.c#1 branch .. //depot/projects/power/sys/alpha/pci/t2reg.h#1 branch .. //depot/projects/power/sys/alpha/pci/t2var.h#1 branch .. //depot/projects/power/sys/alpha/pci/tsunami.c#1 branch .. //depot/projects/power/sys/alpha/pci/tsunami_pci.c#1 branch .. //depot/projects/power/sys/alpha/pci/tsunamireg.h#1 branch .. //depot/projects/power/sys/alpha/pci/tsunamivar.h#1 branch .. //depot/projects/power/sys/alpha/tlsb/dwlpx.c#1 branch .. //depot/projects/power/sys/alpha/tlsb/dwlpxreg.h#1 branch .. //depot/projects/power/sys/alpha/tlsb/dwlpxvar.h#1 branch .. //depot/projects/power/sys/alpha/tlsb/gbus.c#1 branch .. //depot/projects/power/sys/alpha/tlsb/gbusreg.h#1 branch .. //depot/projects/power/sys/alpha/tlsb/gbusvar.h#1 branch .. //depot/projects/power/sys/alpha/tlsb/kftxx.c#1 branch .. //depot/projects/power/sys/alpha/tlsb/kftxxreg.h#1 branch .. //depot/projects/power/sys/alpha/tlsb/kftxxvar.h#1 branch .. //depot/projects/power/sys/alpha/tlsb/mcclock_tlsb.c#1 branch .. //depot/projects/power/sys/alpha/tlsb/tlsb.c#1 branch .. //depot/projects/power/sys/alpha/tlsb/tlsbcpu.c#1 branch .. //depot/projects/power/sys/alpha/tlsb/tlsbmem.c#1 branch .. //depot/projects/power/sys/alpha/tlsb/tlsbreg.h#1 branch .. //depot/projects/power/sys/alpha/tlsb/tlsbvar.h#1 branch .. //depot/projects/power/sys/alpha/tlsb/zs_tlsb.c#1 branch .. //depot/projects/power/sys/alpha/tlsb/zsreg.h#1 branch .. //depot/projects/power/sys/alpha/tlsb/zsvar.h#1 branch .. //depot/projects/power/sys/amd64/Makefile#1 branch .. //depot/projects/power/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/power/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/power/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/power/sys/amd64/amd64/amd64-gdbstub.c#1 branch .. //depot/projects/power/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/power/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/power/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/power/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/power/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/power/sys/amd64/amd64/critical.c#1 branch .. //depot/projects/power/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/power/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/power/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/power/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/power/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/power/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/power/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/power/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/power/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/power/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/power/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/power/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/power/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/power/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/power/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/power/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/power/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/power/sys/amd64/amd64/support.S#1 branch .. //depot/projects/power/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/power/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/power/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/power/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/power/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/power/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/power/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/power/sys/amd64/conf/Makefile#1 branch .. //depot/projects/power/sys/amd64/conf/gethints.awk#1 branch .. //depot/projects/power/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/power/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/power/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/power/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/power/sys/amd64/include/_limits.h#1 branch .. //depot/projects/power/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/power/sys/amd64/include/_types.h#1 branch .. //depot/projects/power/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/power/sys/amd64/include/asm.h#1 branch .. //depot/projects/power/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/power/sys/amd64/include/atomic.h#1 branch .. //depot/projects/power/sys/amd64/include/bus.h#1 branch .. //depot/projects/power/sys/amd64/include/bus_amd64.h#1 branch .. //depot/projects/power/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/power/sys/amd64/include/bus_memio.h#1 branch .. //depot/projects/power/sys/amd64/include/bus_pio.h#1 branch .. //depot/projects/power/sys/amd64/include/clock.h#1 branch .. //depot/projects/power/sys/amd64/include/cpu.h#1 branch .. //depot/projects/power/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/power/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/power/sys/amd64/include/critical.h#1 branch .. //depot/projects/power/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/power/sys/amd64/include/elf.h#1 branch .. //depot/projects/power/sys/amd64/include/endian.h#1 branch .. //depot/projects/power/sys/amd64/include/exec.h#1 branch .. //depot/projects/power/sys/amd64/include/float.h#1 branch .. //depot/projects/power/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/power/sys/amd64/include/frame.h#1 branch .. //depot/projects/power/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/power/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/power/sys/amd64/include/kse.h#1 branch .. //depot/projects/power/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/power/sys/amd64/include/limits.h#1 branch .. //depot/projects/power/sys/amd64/include/md_var.h#1 branch .. //depot/projects/power/sys/amd64/include/metadata.h#1 branch .. //depot/projects/power/sys/amd64/include/mutex.h#1 branch .. //depot/projects/power/sys/amd64/include/npx.h#1 branch .. //depot/projects/power/sys/amd64/include/param.h#1 branch .. //depot/projects/power/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/power/sys/amd64/include/pcb.h#1 branch .. //depot/projects/power/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/power/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/power/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/power/sys/amd64/include/pmap.h#1 branch .. //depot/projects/power/sys/amd64/include/proc.h#1 branch .. //depot/projects/power/sys/amd64/include/profile.h#1 branch .. //depot/projects/power/sys/amd64/include/psl.h#1 branch .. //depot/projects/power/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/power/sys/amd64/include/reg.h#1 branch .. //depot/projects/power/sys/amd64/include/reloc.h#1 branch .. //depot/projects/power/sys/amd64/include/resource.h#1 branch .. //depot/projects/power/sys/amd64/include/runq.h#1 branch .. //depot/projects/power/sys/amd64/include/segments.h#1 branch .. //depot/projects/power/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/power/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/power/sys/amd64/include/signal.h#1 branch .. //depot/projects/power/sys/amd64/include/smp.h#1 branch .. //depot/projects/power/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/power/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/power/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/power/sys/amd64/include/trap.h#1 branch .. //depot/projects/power/sys/amd64/include/tss.h#1 branch .. //depot/projects/power/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/power/sys/amd64/include/varargs.h#1 branch .. //depot/projects/power/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/power/sys/amd64/isa/clock.c#1 branch .. //depot/projects/power/sys/amd64/isa/icu.h#1 branch .. //depot/projects/power/sys/amd64/isa/icu_ipl.S#1 branch .. //depot/projects/power/sys/amd64/isa/icu_vector.S#1 branch .. //depot/projects/power/sys/amd64/isa/intr_machdep.c#1 branch .. //depot/projects/power/sys/amd64/isa/intr_machdep.h#1 branch .. //depot/projects/power/sys/amd64/isa/isa.c#1 branch .. //depot/projects/power/sys/amd64/isa/isa.h#1 branch .. //depot/projects/power/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/power/sys/amd64/isa/isa_dma.h#1 branch .. //depot/projects/power/sys/amd64/isa/ithread.c#1 branch .. //depot/projects/power/sys/amd64/isa/npx.c#1 branch .. //depot/projects/power/sys/amd64/isa/timerreg.h#1 branch .. //depot/projects/power/sys/amd64/isa/vector.S#1 branch .. //depot/projects/power/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/power/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/power/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/power/sys/arm/include/_limits.h#1 branch .. //depot/projects/power/sys/arm/include/_stdint.h#1 branch .. //depot/projects/power/sys/arm/include/_types.h#1 branch .. //depot/projects/power/sys/arm/include/elf.h#1 branch .. //depot/projects/power/sys/arm/include/endian.h#1 branch .. //depot/projects/power/sys/arm/include/exec.h#1 branch .. //depot/projects/power/sys/arm/include/limits.h#1 branch .. //depot/projects/power/sys/arm/include/param.h#1 branch .. //depot/projects/power/sys/arm/include/signal.h#1 branch .. //depot/projects/power/sys/arm/include/ucontext.h#1 branch .. //depot/projects/power/sys/boot/Makefile#1 branch .. //depot/projects/power/sys/boot/README#1 branch .. //depot/projects/power/sys/boot/alpha/Makefile#1 branch .. //depot/projects/power/sys/boot/alpha/Makefile.inc#1 branch .. //depot/projects/power/sys/boot/alpha/boot1/Makefile#1 branch .. //depot/projects/power/sys/boot/alpha/boot1/boot1.c#1 branch .. //depot/projects/power/sys/boot/alpha/cdboot/Makefile#1 branch .. //depot/projects/power/sys/boot/alpha/cdboot/version#1 branch .. //depot/projects/power/sys/boot/alpha/common/Makefile.common#1 branch .. //depot/projects/power/sys/boot/alpha/common/conf.c#1 branch .. //depot/projects/power/sys/boot/alpha/common/help.alpha#1 branch .. //depot/projects/power/sys/boot/alpha/common/main.c#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/Makefile#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/OSFpal.c#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/alpha_copy.c#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/alpha_module.c#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/bbinfo.h#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/bootinfo.c#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/common.h#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/delay.c#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/devicename.c#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/elf_freebsd.c#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/getsecs.c#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/libalpha.h#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/pal.S#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/prom.c#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/prom_disp.S#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/prom_swpal.S#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/reboot.c#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/srmdisk.c#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/srmnet.c#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/start.S#1 branch .. //depot/projects/power/sys/boot/alpha/libalpha/time.c#1 branch .. //depot/projects/power/sys/boot/alpha/loader/Makefile#1 branch .. //depot/projects/power/sys/boot/alpha/loader/version#1 branch .. //depot/projects/power/sys/boot/alpha/netboot/Makefile#1 branch .. //depot/projects/power/sys/boot/alpha/netboot/version#1 branch .. //depot/projects/power/sys/boot/arc/Makefile#1 branch .. //depot/projects/power/sys/boot/arc/Makefile.inc#1 branch .. //depot/projects/power/sys/boot/arc/include/arcfuncs.h#1 branch .. //depot/projects/power/sys/boot/arc/include/arctypes.h#1 branch .. //depot/projects/power/sys/boot/arc/include/libarc.h#1 branch .. //depot/projects/power/sys/boot/arc/lib/Makefile#1 branch .. //depot/projects/power/sys/boot/arc/lib/abort.c#1 branch .. //depot/projects/power/sys/boot/arc/lib/arcconsole.c#1 branch .. //depot/projects/power/sys/boot/arc/lib/arcdisk.c#1 branch .. //depot/projects/power/sys/boot/arc/lib/arch/alpha/copy.c#1 branch .. //depot/projects/power/sys/boot/arc/lib/arch/alpha/rpb.c#1 branch .. //depot/projects/power/sys/boot/arc/lib/arch/alpha/setjmp.S#1 branch .. //depot/projects/power/sys/boot/arc/lib/arch/alpha/start.S#1 branch .. //depot/projects/power/sys/boot/arc/lib/bootinfo.c#1 branch .. //depot/projects/power/sys/boot/arc/lib/delay.c#1 branch .. //depot/projects/power/sys/boot/arc/lib/devicename.c#1 branch .. //depot/projects/power/sys/boot/arc/lib/elf_freebsd.c#1 branch .. //depot/projects/power/sys/boot/arc/lib/module.c#1 branch .. //depot/projects/power/sys/boot/arc/lib/prom.c#1 branch .. //depot/projects/power/sys/boot/arc/lib/setjmperr.c#1 branch .. //depot/projects/power/sys/boot/arc/lib/time.c#1 branch .. //depot/projects/power/sys/boot/arc/loader/Makefile#1 branch .. //depot/projects/power/sys/boot/arc/loader/conf.c#1 branch .. //depot/projects/power/sys/boot/arc/loader/help.alpha#1 branch .. //depot/projects/power/sys/boot/arc/loader/main.c#1 branch .. //depot/projects/power/sys/boot/arc/loader/version#1 branch .. //depot/projects/power/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/power/sys/boot/common/bcache.c#1 branch .. //depot/projects/power/sys/boot/common/boot.c#1 branch .. //depot/projects/power/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/power/sys/boot/common/commands.c#1 branch .. //depot/projects/power/sys/boot/common/console.c#1 branch .. //depot/projects/power/sys/boot/common/dev_net.c#1 branch .. //depot/projects/power/sys/boot/common/dev_net.h#1 branch .. //depot/projects/power/sys/boot/common/devopen.c#1 branch .. //depot/projects/power/sys/boot/common/help.common#1 branch .. //depot/projects/power/sys/boot/common/interp.c#1 branch .. //depot/projects/power/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/power/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/power/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/power/sys/boot/common/isapnp.c#1 branch .. //depot/projects/power/sys/boot/common/isapnp.h#1 branch .. //depot/projects/power/sys/boot/common/load.c#1 branch .. //depot/projects/power/sys/boot/common/load_elf.c#1 branch .. //depot/projects/power/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/power/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/power/sys/boot/common/loader.8#1 branch .. //depot/projects/power/sys/boot/common/ls.c#1 branch .. //depot/projects/power/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/power/sys/boot/common/misc.c#1 branch .. //depot/projects/power/sys/boot/common/module.c#1 branch .. //depot/projects/power/sys/boot/common/newvers.sh#1 branch .. //depot/projects/power/sys/boot/common/panic.c#1 branch .. //depot/projects/power/sys/boot/common/pnp.c#1 branch .. //depot/projects/power/sys/boot/common/pnpdata#1 branch .. //depot/projects/power/sys/boot/common/ufsread.c#1 branch .. //depot/projects/power/sys/boot/efi/Makefile#1 branch .. //depot/projects/power/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/power/sys/boot/efi/include/README#1 branch .. //depot/projects/power/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/power/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/power/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/power/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/power/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/power/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/power/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/power/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/power/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/power/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/power/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/power/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/power/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/power/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/power/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/power/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/power/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/power/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/power/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/power/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/power/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/power/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/power/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#1 branch .. //depot/projects/power/sys/boot/efi/libefi/arch/ia64/start.S#1 branch .. //depot/projects/power/sys/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/power/sys/boot/efi/libefi/copy.c#1 branch .. //depot/projects/power/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/power/sys/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/power/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/power/sys/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/power/sys/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/power/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/power/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/power/sys/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/power/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/power/sys/boot/efi/libefi/module.c#1 branch .. //depot/projects/power/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/power/sys/boot/efi/loader/Makefile#1 branch .. //depot/projects/power/sys/boot/efi/loader/conf.c#1 branch .. //depot/projects/power/sys/boot/efi/loader/main.c#1 branch .. //depot/projects/power/sys/boot/efi/loader/version#1 branch .. //depot/projects/power/sys/boot/ficl/Makefile#1 branch .. //depot/projects/power/sys/boot/ficl/alpha/sysdep.c#1 branch .. //depot/projects/power/sys/boot/ficl/alpha/sysdep.h#1 branch .. //depot/projects/power/sys/boot/ficl/dict.c#1 branch .. //depot/projects/power/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/power/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/power/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/power/sys/boot/ficl/float.c#1 branch .. //depot/projects/power/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/power/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/power/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/power/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/power/sys/boot/ficl/loader.c#1 branch .. //depot/projects/power/sys/boot/ficl/math64.c#1 branch .. //depot/projects/power/sys/boot/ficl/math64.h#1 branch .. //depot/projects/power/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/power/sys/boot/ficl/search.c#1 branch .. //depot/projects/power/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/power/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/power/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/power/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/power/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/power/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/power/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/power/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/power/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/power/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/power/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/power/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/power/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/power/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/power/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/power/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/power/sys/boot/ficl/stack.c#1 branch .. //depot/projects/power/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/power/sys/boot/ficl/tools.c#1 branch .. //depot/projects/power/sys/boot/ficl/unix.c#1 branch .. //depot/projects/power/sys/boot/ficl/vm.c#1 branch .. //depot/projects/power/sys/boot/ficl/words.c#1 branch .. //depot/projects/power/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/power/sys/boot/forth/frames.4th#1 branch .. //depot/projects/power/sys/boot/forth/loader.4th#1 branch .. //depot/projects/power/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/power/sys/boot/forth/loader.conf#1 branch .. //depot/projects/power/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/power/sys/boot/forth/loader.rc#1 branch .. //depot/projects/power/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/power/sys/boot/forth/screen.4th#1 branch .. //depot/projects/power/sys/boot/forth/support.4th#1 branch .. //depot/projects/power/sys/boot/i386/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/power/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/boot0/boot0.s#1 branch .. //depot/projects/power/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/boot2/boot1.s#1 branch .. //depot/projects/power/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/power/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/power/sys/boot/i386/boot2/sio.s#1 branch .. //depot/projects/power/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/power/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/btx/btx/btx.s#1 branch .. //depot/projects/power/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/btx/btxldr/btxldr.s#1 branch .. //depot/projects/power/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/power/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/power/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/power/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/power/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/power/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/power/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/power/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/power/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/power/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/power/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/power/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/power/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/gatea20.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/power/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/power/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/power/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/power/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/power/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/power/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/power/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/power/sys/boot/i386/loader/version#1 branch .. //depot/projects/power/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/power/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/power/sys/boot/i386/pxeldr/pxeldr.s#1 branch .. //depot/projects/power/sys/boot/ia64/Makefile#1 branch .. //depot/projects/power/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/power/sys/boot/ia64/libski/Makefile#1 branch .. //depot/projects/power/sys/boot/ia64/libski/acpi_stub.c#1 branch .. //depot/projects/power/sys/boot/ia64/libski/bootinfo.c#1 branch .. //depot/projects/power/sys/boot/ia64/libski/copy.c#1 branch .. //depot/projects/power/sys/boot/ia64/libski/delay.c#1 branch .. //depot/projects/power/sys/boot/ia64/libski/devicename.c#1 branch .. //depot/projects/power/sys/boot/ia64/libski/efi_stub.c#1 branch .. //depot/projects/power/sys/boot/ia64/libski/elf_freebsd.c#1 branch .. //depot/projects/power/sys/boot/ia64/libski/exit.c#1 branch .. //depot/projects/power/sys/boot/ia64/libski/libski.h#1 branch .. //depot/projects/power/sys/boot/ia64/libski/module.c#1 branch .. //depot/projects/power/sys/boot/ia64/libski/pal_stub.S#1 branch .. //depot/projects/power/sys/boot/ia64/libski/sal_stub.c#1 branch .. //depot/projects/power/sys/boot/ia64/libski/skiconsole.c#1 branch .. //depot/projects/power/sys/boot/ia64/libski/skifs.c#1 branch .. //depot/projects/power/sys/boot/ia64/libski/ssc.c#1 branch .. //depot/projects/power/sys/boot/ia64/libski/time.c#1 branch .. //depot/projects/power/sys/boot/ia64/skiload/Makefile#1 branch .. //depot/projects/power/sys/boot/ia64/skiload/conf.c#1 branch .. //depot/projects/power/sys/boot/ia64/skiload/ldscript.ia64#1 branch .. //depot/projects/power/sys/boot/ia64/skiload/main.c#1 branch .. //depot/projects/power/sys/boot/ia64/skiload/skiload.cmd#1 branch .. //depot/projects/power/sys/boot/ia64/skiload/start.S#1 branch .. //depot/projects/power/sys/boot/ia64/skiload/version#1 branch .. //depot/projects/power/sys/boot/ofw/Makefile#1 branch .. //depot/projects/power/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/power/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/power/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/power/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/power/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/power/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/power/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/power/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/power/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/power/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/power/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/power/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/power/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/power/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/power/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/power/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/power/sys/boot/pc98/Makefile#1 branch .. //depot/projects/power/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/power/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/power/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/power/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/power/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/power/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/power/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/power/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/power/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/power/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/power/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/power/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/power/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/power/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/power/sys/boot/pc98/btx/btx/btx.s#1 branch .. //depot/projects/power/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/power/sys/boot/pc98/btx/btxldr/btxldr.s#1 branch .. //depot/projects/power/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/power/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/power/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/power/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/power/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/power/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/power/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/power/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/power/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/power/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/power/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/power/sys/boot/pc98/libpc98/gatea20.c#1 branch .. //depot/projects/power/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/power/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/power/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/power/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/power/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/power/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/power/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/power/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/power/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/power/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/power/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/power/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/power/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/power/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/power/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/power/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/power/sys/boot/sparc64/boot1/_start.S#1 branch .. //depot/projects/power/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/power/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/power/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/power/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/power/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/power/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/power/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/power/sys/cam/cam.c#1 branch .. //depot/projects/power/sys/cam/cam.h#1 branch .. //depot/projects/power/sys/cam/cam_ccb.h#1 branch .. //depot/projects/power/sys/cam/cam_debug.h#1 branch .. //depot/projects/power/sys/cam/cam_periph.c#1 branch .. //depot/projects/power/sys/cam/cam_periph.h#1 branch .. //depot/projects/power/sys/cam/cam_queue.c#1 branch .. //depot/projects/power/sys/cam/cam_queue.h#1 branch .. //depot/projects/power/sys/cam/cam_sim.c#1 branch .. //depot/projects/power/sys/cam/cam_sim.h#1 branch .. //depot/projects/power/sys/cam/cam_xpt.c#1 branch .. //depot/projects/power/sys/cam/cam_xpt.h#1 branch .. //depot/projects/power/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/power/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/power/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/power/sys/coda/00READ#1 branch .. //depot/projects/power/sys/coda/README#1 branch .. //depot/projects/power/sys/coda/TODO#1 branch .. //depot/projects/power/sys/coda/cnode.h#1 branch .. //depot/projects/power/sys/coda/coda.h#1 branch .. //depot/projects/power/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/power/sys/coda/coda_io.h#1 branch .. //depot/projects/power/sys/coda/coda_kernel.h#1 branch .. //depot/projects/power/sys/coda/coda_namecache.c#1 branch .. //depot/projects/power/sys/coda/coda_namecache.h#1 branch .. //depot/projects/power/sys/coda/coda_opstats.h#1 branch .. //depot/projects/power/sys/coda/coda_pioctl.h#1 branch .. //depot/projects/power/sys/coda/coda_psdev.c#1 branch .. //depot/projects/power/sys/coda/coda_psdev.h#1 branch .. //depot/projects/power/sys/coda/coda_subr.c#1 branch .. //depot/projects/power/sys/coda/coda_subr.h#1 branch .. //depot/projects/power/sys/coda/coda_venus.c#1 branch .. //depot/projects/power/sys/coda/coda_venus.h#1 branch .. //depot/projects/power/sys/coda/coda_vfsops.c#1 branch .. //depot/projects/power/sys/coda/coda_vfsops.h#1 branch .. //depot/projects/power/sys/coda/coda_vnops.c#1 branch .. //depot/projects/power/sys/coda/coda_vnops.h#1 branch .. //depot/projects/power/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/power/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/power/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/power/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/power/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/power/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/power/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/power/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/power/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/power/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/power/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/power/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/power/sys/compat/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/power/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/power/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/power/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/power/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/power/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/power/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/power/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/power/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/power/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/power/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/power/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/power/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/power/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/power/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/power/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/power/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/power/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/power/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/power/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/power/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/power/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/power/sys/compat/pecoff/imgact_pecoff.c#1 branch .. //depot/projects/power/sys/compat/pecoff/imgact_pecoff.h#1 branch .. //depot/projects/power/sys/compat/svr4/Makefile#1 branch .. //depot/projects/power/sys/compat/svr4/imgact_svr4.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_acl.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_dirent.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_errno.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_exec.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_fcntl.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_fcntl.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_filio.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_filio.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_fuser.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_hrt.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_ioctl.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_ioctl.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_ipc.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_ipc.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_misc.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_mman.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_proto.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_resource.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_resource.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_siginfo.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_signal.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_signal.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_socket.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_socket.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_sockio.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_sockio.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_sockmod.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_stat.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_stat.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_statvfs.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_stream.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_stropts.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_syscall.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_syscallnames.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_sysconfig.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_sysent.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_systeminfo.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_sysvec.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_termios.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_termios.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_time.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_timod.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_ttold.c#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_ttold.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_types.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_ucontext.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_ulimit.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_ustat.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_util.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_utsname.h#1 branch .. //depot/projects/power/sys/compat/svr4/svr4_wait.h#1 branch .. //depot/projects/power/sys/compat/svr4/syscalls.conf#1 branch .. //depot/projects/power/sys/compat/svr4/syscalls.master#1 branch .. //depot/projects/power/sys/conf/Makefile.alpha#1 branch .. //depot/projects/power/sys/conf/Makefile.amd64#1 branch .. //depot/projects/power/sys/conf/Makefile.i386#1 branch .. //depot/projects/power/sys/conf/Makefile.ia64#1 branch .. //depot/projects/power/sys/conf/Makefile.pc98#1 branch .. //depot/projects/power/sys/conf/Makefile.powerpc#1 branch .. //depot/projects/power/sys/conf/Makefile.sparc64#1 branch .. //depot/projects/power/sys/conf/NOTES#1 branch .. //depot/projects/power/sys/conf/defines#1 branch .. //depot/projects/power/sys/conf/files#1 branch .. //depot/projects/power/sys/conf/files.alpha#1 branch .. //depot/projects/power/sys/conf/files.amd64#1 branch .. //depot/projects/power/sys/conf/files.i386#1 branch .. //depot/projects/power/sys/conf/files.ia64#1 branch .. //depot/projects/power/sys/conf/files.pc98#1 branch .. //depot/projects/power/sys/conf/files.powerpc#1 branch .. //depot/projects/power/sys/conf/files.sparc64#1 branch .. //depot/projects/power/sys/conf/kern.mk#1 branch .. //depot/projects/power/sys/conf/kern.post.mk#1 branch .. //depot/projects/power/sys/conf/kern.pre.mk#1 branch .. //depot/projects/power/sys/conf/kmod.mk#1 branch .. //depot/projects/power/sys/conf/kmod_syms.awk#1 branch .. //depot/projects/power/sys/conf/ldscript.alpha#1 branch .. //depot/projects/power/sys/conf/ldscript.amd64#1 branch .. //depot/projects/power/sys/conf/ldscript.i386#1 branch .. //depot/projects/power/sys/conf/ldscript.ia64#1 branch .. //depot/projects/power/sys/conf/ldscript.powerpc#1 branch .. //depot/projects/power/sys/conf/ldscript.sparc64#1 branch .. //depot/projects/power/sys/conf/majors#1 branch .. //depot/projects/power/sys/conf/majors.awk#1 branch .. //depot/projects/power/sys/conf/makeLINT.mk#1 branch .. //depot/projects/power/sys/conf/makeLINT.sed#1 branch .. //depot/projects/power/sys/conf/newvers.sh#1 branch .. //depot/projects/power/sys/conf/options#1 branch .. //depot/projects/power/sys/conf/options.alpha#1 branch .. //depot/projects/power/sys/conf/options.amd64#1 branch .. //depot/projects/power/sys/conf/options.i386#1 branch .. //depot/projects/power/sys/conf/options.ia64#1 branch .. //depot/projects/power/sys/conf/options.pc98#1 branch .. //depot/projects/power/sys/conf/options.powerpc#1 branch .. //depot/projects/power/sys/conf/options.sparc64#1 branch .. //depot/projects/power/sys/conf/systags.sh#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/CHANGES.txt#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acapps.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acconfig.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acdebug.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acdisasm.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acdispat.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acefi.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acenv.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acevents.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acexcep.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acfreebsd.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acgcc.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acglobal.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/achware.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acinterp.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/aclocal.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acmacros.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acnamesp.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acobject.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acoutput.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acparser.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acpi.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acpica_prep.sh#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acpiosxf.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acpixf.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acresrc.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acstruct.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/actables.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/actbl.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/actbl1.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/actbl2.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/actypes.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/acutils.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/amlcode.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/amlresrc.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/common/adisasm.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/common/getopt.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslanalyze.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslcodegen.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslcompile.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslcompiler.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslcompiler.l#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslcompiler.y#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslerror.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslfiles.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslfold.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslglobal.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/asllength.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/asllisting.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslload.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/asllookup.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslmain.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslmap.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslopcodes.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/asloperands.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslopt.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslresource.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslrestype1.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslrestype2.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslstubs.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/asltransform.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/asltree.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/asltypes.h#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslutils.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/dbcmds.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/dbdisply.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/dbexec.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/dbfileio.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/dbhistry.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/dbinput.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/dbstats.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/dbutils.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/dbxface.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/dmbuffer.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/dmnames.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/dmobject.c#1 branch .. //depot/projects/power/sys/contrib/dev/acpica/dmopcode.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 12 11:16:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EB9016A4C1; Fri, 12 Sep 2003 11:16:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 543B016A4BF for ; Fri, 12 Sep 2003 11:16:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C759043FEC for ; Fri, 12 Sep 2003 11:16:58 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8CIGw0U080372 for ; Fri, 12 Sep 2003 11:16:58 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8CIGwkY080369 for perforce@freebsd.org; Fri, 12 Sep 2003 11:16:58 -0700 (PDT) Date: Fri, 12 Sep 2003 11:16:58 -0700 (PDT) Message-Id: <200309121816.h8CIGwkY080369@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 37965 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2003 18:17:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=37965 Change 37965 by jhb@jhb_laptop on 2003/09/12 11:16:04 Add a notes file. Warner, feel free to hack on this for working out the plan of action. Affected files ... .. //depot/projects/power/notes#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Sep 12 12:05:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A358816A4C1; Fri, 12 Sep 2003 12:05:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 75E3C16A4BF for ; Fri, 12 Sep 2003 12:05:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBF7143FAF for ; Fri, 12 Sep 2003 12:05:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8CJ520U084781 for ; Fri, 12 Sep 2003 12:05:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8CJ52WJ084778 for perforce@freebsd.org; Fri, 12 Sep 2003 12:05:02 -0700 (PDT) Date: Fri, 12 Sep 2003 12:05:02 -0700 (PDT) Message-Id: <200309121905.h8CJ52WJ084778@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37967 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2003 19:05:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=37967 Change 37967 by peter@peter_hammer on 2003/09/12 12:04:10 tidy up some loose ends Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#2 edit .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#51 edit .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#13 edit .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#34 edit .. //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#6 edit .. //depot/projects/hammer/sys/amd64/include/apicvar.h#2 edit .. //depot/projects/hammer/sys/amd64/include/clock.h#6 edit .. //depot/projects/hammer/sys/amd64/include/md_var.h#13 edit .. //depot/projects/hammer/sys/amd64/isa/clock.c#8 edit .. //depot/projects/hammer/sys/amd64/isa/icu.h#7 edit Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#2 (text+ko) ==== @@ -321,8 +321,8 @@ madt = pmap_mapdev(madt_physaddr, madt_length); lapic_init((uintptr_t)madt->LocalApicAddress); printf("ACPI APIC Table: <%.*s %.*s>\n", - sizeof(madt->Header.OemId), madt->Header.OemId, - sizeof(madt->Header.OemTableId), madt->Header.OemTableId); + (int)sizeof(madt->Header.OemId), madt->Header.OemId, + (int)sizeof(madt->Header.OemTableId), madt->Header.OemTableId); /* * We ignore 64-bit local APIC override entries. Should we @@ -450,7 +450,7 @@ ioapics[apic->IoApicId].io_vector = apic->Vector; /* XXXTEST */ printf("MADT: Found IO APIC ID %d, Vector %d at %p\n", - apic->IoApicId, apic->Vector, (void *)apic->IoApicAddress); + apic->IoApicId, apic->Vector, (void *)(uintptr_t)apic->IoApicAddress); break; default: break; ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#51 (text+ko) ==== @@ -463,11 +463,6 @@ cpu_idle(void) { -#ifdef SMP - if (mp_grab_cpu_hlt()) - return; -#endif - if (cpu_idle_hlt) { disable_intr(); if (sched_runnable()) { ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#4 (text+ko) ==== @@ -312,8 +312,8 @@ printf("Preset Config %d", mpfps->config_type); } else { lapic_init((uintptr_t)mpct->apic_address); - printf("%.*s %.*s", sizeof(mpct->oem_id), mpct->oem_id, - sizeof(mpct->product_id), mpct->product_id); + printf("%.*s %.*s", (int)sizeof(mpct->oem_id), mpct->oem_id, + (int)sizeof(mpct->product_id), mpct->product_id); } printf(">\n"); return (0); ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#13 (text+ko) ==== @@ -426,7 +426,7 @@ if (error) return (error); - error = intr_ad_handler(device_get_nameunit(child), irq->r_start, + error = intr_add_handler(device_get_nameunit(child), irq->r_start, ihand, arg, flags, cookiep); return (error); ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#34 (text+ko) ==== @@ -1410,8 +1410,8 @@ lazymask = &pmap->pm_active; pmap_lazyfix_self(mymask); } else { - atomic_store_rel_int((u_int *)&lazymask, - (u_int)&pmap->pm_active); + atomic_store_rel_long((u_long *)&lazymask, + (u_long)&pmap->pm_active); atomic_store_rel_int(&lazywait, 0); ipi_selected(mask, IPI_LAZYPMAP); while (lazywait == 0) { ==== //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#6 (text+ko) ==== @@ -103,4 +103,6 @@ #define COMPILER_DEPENDENT_INT64 long #define COMPILER_DEPENDENT_UINT64 unsigned long +void acpi_SetDefaultIntrModel(int model); + #endif /* __ACPICA_MACHDEP_H__ */ ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#2 (text+ko) ==== @@ -32,6 +32,8 @@ #ifndef _MACHINE_APICVAR_H_ #define _MACHINE_APICVAR_H_ +#include + /* * Local && I/O APIC variable definitions. */ ==== //depot/projects/hammer/sys/amd64/include/clock.h#6 (text+ko) ==== @@ -37,6 +37,7 @@ int rtcin(int val); int sysbeep(int pitch, int period); void init_TSC(void); +void init_TSC_tc(void); #endif /* _KERNEL */ ==== //depot/projects/hammer/sys/amd64/include/md_var.h#13 (text+ko) ==== @@ -38,6 +38,7 @@ extern long Maxmem; extern u_long atdevbase; /* offset in virtual memory of ISA io mem */ +extern u_int basemem; extern int busdma_swi_pending; extern u_int cpu_exthigh; extern u_int cpu_feature; ==== //depot/projects/hammer/sys/amd64/isa/clock.c#8 (text+ko) ==== @@ -832,7 +832,6 @@ cpu_initclocks() { int diag; - register_t crit; if (statclock_disable) { /* @@ -849,13 +848,8 @@ } /* Finish initializing 8254 timer 0. */ - inthand_add("clk", 0, (driver_intr_t *)clkintr, NULL, + intr_add_handler("clk", 0, (driver_intr_t *)clkintr, NULL, INTR_TYPE_CLK | INTR_FAST, NULL); - crit = intr_disable(); - mtx_lock_spin(&icu_lock); - INTREN(IRQ0); - mtx_unlock_spin(&icu_lock); - intr_restore(crit); /* Initialize RTC. */ writertc(RTC_STATUSA, rtc_statusa); @@ -872,12 +866,6 @@ INTR_TYPE_CLK | INTR_FAST, NULL); i8254_intsrc = intr_lookup_source(8); - crit = intr_disable(); - mtx_lock_spin(&icu_lock); - INTREN(IRQ8); - mtx_unlock_spin(&icu_lock); - intr_restore(crit); - writertc(RTC_STATUSB, rtc_statusb); } ==== //depot/projects/hammer/sys/amd64/isa/icu.h#7 (text+ko) ==== @@ -129,6 +129,4 @@ #define ICU_EOI (OCW2_EOI) /* non-specific EOI */ #define ICU_SETPRI (OCW2_R | OCW2_SL) /* set rotation priority */ -#define INTRCNT_COUNT (1 + ICU_LEN + 2 * ICU_LEN) - #endif /* !_I386_ISA_ICU_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Sep 12 12:06:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BA3B16A4C1; Fri, 12 Sep 2003 12:06:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3404516A4BF for ; Fri, 12 Sep 2003 12:06:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEA1D44003 for ; Fri, 12 Sep 2003 12:06:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8CJ640U084904 for ; Fri, 12 Sep 2003 12:06:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8CJ647W084901 for perforce@freebsd.org; Fri, 12 Sep 2003 12:06:04 -0700 (PDT) Date: Fri, 12 Sep 2003 12:06:04 -0700 (PDT) Message-Id: <200309121906.h8CJ647W084901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37968 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2003 19:06:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=37968 Change 37968 by peter@peter_hammer on 2003/09/12 12:06:03 bad jhb! no cookie! Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#2 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#2 (text+ko) ==== @@ -681,7 +681,7 @@ } static int -mixedpic_vector(struct intsrc *isrc); +mixedpic_vector(struct intsrc *isrc) { struct mixedpic_intsrc *mpsrc; From owner-p4-projects@FreeBSD.ORG Fri Sep 12 12:12:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63E5516A4C1; Fri, 12 Sep 2003 12:12:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2686E16A4BF for ; Fri, 12 Sep 2003 12:12:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD89943FA3 for ; Fri, 12 Sep 2003 12:12:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8CJCC0U085458 for ; Fri, 12 Sep 2003 12:12:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8CJCCnC085455 for perforce@freebsd.org; Fri, 12 Sep 2003 12:12:12 -0700 (PDT) Date: Fri, 12 Sep 2003 12:12:12 -0700 (PDT) Message-Id: <200309121912.h8CJCCnC085455@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2003 19:12:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=37969 Change 37969 by peter@peter_hammer on 2003/09/12 12:11:36 tweak a few more syntax errors Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#3 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#3 (text+ko) ==== @@ -691,7 +691,7 @@ } static int -mixedpic_source_pending(struct intsrc *isrc); +mixedpic_source_pending(struct intsrc *isrc) { struct mixedpic_intsrc *mpsrc; @@ -723,7 +723,7 @@ mpsrc = malloc(sizeof(struct mixedpic_intsrc), M_IOAPIC, M_WAITOK); mpsrc->mp_intsrc.is_pic = &mixedpic; mpsrc->mp_apicpin = (struct intsrc *)intpin; - vector = intpin->io_intsrc.is_pic->pic_vector(&intpin->io_intsrc) + vector = intpin->io_intsrc.is_pic->pic_vector(&intpin->io_intsrc); mpsrc->mp_atpicsrc = atpic_lookup_source(vector); return (&mpsrc->mp_intsrc); } From owner-p4-projects@FreeBSD.ORG Fri Sep 12 12:13:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4820A16A4C1; Fri, 12 Sep 2003 12:13:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C0B016A4BF for ; Fri, 12 Sep 2003 12:13:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9ED0943FA3 for ; Fri, 12 Sep 2003 12:13:14 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8CJDE0U085499 for ; Fri, 12 Sep 2003 12:13:14 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8CJDE9D085496 for perforce@freebsd.org; Fri, 12 Sep 2003 12:13:14 -0700 (PDT) Date: Fri, 12 Sep 2003 12:13:14 -0700 (PDT) Message-Id: <200309121913.h8CJDE9D085496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 37970 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2003 19:13:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=37970 Change 37970 by peter@peter_hammer on 2003/09/12 12:12:51 add IDT_* constants. I'm not sure if this was something jhb added or something that I accidently deleted, or something that I just missed. Affected files ... .. //depot/projects/hammer/sys/amd64/include/segments.h#9 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/segments.h#9 (text+ko) ==== @@ -170,6 +170,30 @@ #define NRSVIDT 32 /* reserved entries for cpu exceptions */ /* + * Entries in the Interrupt Descriptor Table (IDT) + */ +#define IDT_DE 0 /* #DE: Divide Error */ +#define IDT_DB 1 /* #DB: Debug */ +#define IDT_NMI 2 /* Nonmaskable External Interrupt */ +#define IDT_BP 3 /* #BP: Breakpoint */ +#define IDT_OF 4 /* #OF: Overflow */ +#define IDT_BR 5 /* #BR: Bound Range Exceeded */ +#define IDT_UD 6 /* #UD: Undefined/Invalid Opcode */ +#define IDT_NM 7 /* #NM: No Math Coprocessor */ +#define IDT_DF 8 /* #DF: Double Fault */ +#define IDT_FPUGP 9 /* Coprocessor Segment Overrun */ +#define IDT_TS 10 /* #TS: Invalid TSS */ +#define IDT_NP 11 /* #NP: Segment Not Present */ +#define IDT_SS 12 /* #SS: Stack Segment Fault */ +#define IDT_GP 13 /* #GP: General Protection Fault */ +#define IDT_PF 14 /* #PF: Page Fault */ +#define IDT_MF 16 /* #MF: FPU Floating-Point Error */ +#define IDT_AC 17 /* #AC: Alignment Check */ +#define IDT_MC 18 /* #MC: Machine Check */ +#define IDT_XF 19 /* #XF: SIMD Floating-Point Exception */ +#define IDT_SYSCALL 0x80 /* System Call Interrupt Vector */ + +/* * Entries in the Global Descriptor Table (GDT) */ #define GNULL_SEL 0 /* Null Descriptor */ From owner-p4-projects@FreeBSD.ORG Fri Sep 12 15:39:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6F9216A4C4; Fri, 12 Sep 2003 15:39:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E58916A4C3 for ; Fri, 12 Sep 2003 15:39:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E56643FE9 for ; Fri, 12 Sep 2003 15:39:26 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8CMdQ0U008663 for ; Fri, 12 Sep 2003 15:39:26 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8CMdPXa008660 for perforce@freebsd.org; Fri, 12 Sep 2003 15:39:25 -0700 (PDT) Date: Fri, 12 Sep 2003 15:39:25 -0700 (PDT) Message-Id: <200309122239.h8CMdPXa008660@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37976 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2003 22:39:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=37976 Change 37976 by marcel@marcel_nfs on 2003/09/12 15:38:37 IFC @37975 Affected files ... .. //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#11 integrate .. //depot/projects/ia64/etc/etc.sparc64/ttys#5 integrate .. //depot/projects/ia64/libexec/lukemftpd/nbsd2fbsd.h#2 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#67 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#122 integrate .. //depot/projects/ia64/release/i386/drivers.conf#22 integrate .. //depot/projects/ia64/share/examples/cvsup/cvs-supfile#5 integrate .. //depot/projects/ia64/share/examples/cvsup/gnats-supfile#3 integrate .. //depot/projects/ia64/share/examples/cvsup/ports-supfile#4 integrate .. //depot/projects/ia64/share/examples/cvsup/refuse#5 integrate .. //depot/projects/ia64/share/examples/cvsup/refuse.README#6 integrate .. //depot/projects/ia64/share/man/man4/ng_atm.4#2 integrate .. //depot/projects/ia64/share/man/man9/physio.9#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#43 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#23 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#20 integrate .. //depot/projects/ia64/sys/conf/NOTES#68 integrate .. //depot/projects/ia64/sys/conf/files#101 integrate .. //depot/projects/ia64/sys/conf/options#67 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#13 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cam.c#16 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#29 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.h#11 integrate .. //depot/projects/ia64/sys/dev/ips/ips.h#4 integrate .. //depot/projects/ia64/sys/dev/ips/ips_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/mii/miidevs#10 integrate .. //depot/projects/ia64/sys/dev/mii/rgephy.c#1 branch .. //depot/projects/ia64/sys/dev/mii/rgephyreg.h#1 branch .. //depot/projects/ia64/sys/dev/re/if_re.c#3 integrate .. //depot/projects/ia64/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/ia64/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu_pc98.c#3 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu_sparc64.c#3 integrate .. //depot/projects/ia64/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#29 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#62 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#76 integrate .. //depot/projects/ia64/sys/isa/fd.c#21 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#42 integrate .. //depot/projects/ia64/sys/modules/mii/Makefile#7 integrate .. //depot/projects/ia64/sys/net/raw_usrreq.c#9 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#33 integrate .. //depot/projects/ia64/sys/netinet6/in6_pcb.c#15 integrate .. //depot/projects/ia64/sys/netipx/ipx_input.c#8 integrate .. //depot/projects/ia64/sys/netipx/spx_usrreq.c#9 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_node.c#10 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_subs.c#9 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#27 integrate .. //depot/projects/ia64/sys/nfsclient/nfsnode.h#3 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#11 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#40 integrate .. //depot/projects/ia64/sys/pc98/pc98/clock.c#20 integrate .. //depot/projects/ia64/sys/pc98/pc98/fd.c#21 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#47 integrate .. //depot/projects/ia64/sys/pci/if_rlreg.h#17 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/ofw_machdep.c#5 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#45 integrate .. //depot/projects/ia64/sys/vm/pmap.h#21 integrate .. //depot/projects/ia64/usr.bin/Makefile#54 integrate .. //depot/projects/ia64/usr.bin/symorder/Makefile#2 delete .. //depot/projects/ia64/usr.bin/symorder/symorder.1#5 delete .. //depot/projects/ia64/usr.bin/symorder/symorder.c#4 delete .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#20 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpidump.h#13 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/extern.h#1 branch .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#23 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/ptimes.c#1 branch .. //depot/projects/ia64/usr.sbin/sysinstall/config.c#15 integrate Differences ... ==== //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#11 (text+ko) ==== @@ -18,7 +18,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.12 2003/09/03 15:44:34 deischen Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.13 2003/09/12 19:19:10 obrien Exp $ */ /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify @@ -80,7 +80,7 @@ #ifdef FREEBSD_NATIVE #define FBSD_NATIVE_TARGET_OS_CPP_BUILTINS() \ do { \ - builtin_define_std ("__FreeBSD_cc_version=500006"); \ + builtin_define_std ("__FreeBSD_cc_version=510002"); \ } while (0) #else #define FBSD_NATIVE_TARGET_OS_CPP_BUILTINS() \ ==== //depot/projects/ia64/etc/etc.sparc64/ttys#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.4 2003/01/27 04:42:16 jake Exp $ +# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.5 2003/09/11 00:14:17 jake Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -48,10 +48,10 @@ #ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyd0 "/usr/libexec/getty std.9600" dialup off secure -ttyd1 "/usr/libexec/getty std.9600" dialup off secure -ttyd2 "/usr/libexec/getty std.9600" dialup off secure -ttyd3 "/usr/libexec/getty std.9600" dialup off secure +ttyu0 "/usr/libexec/getty std.9600" vt100 on secure +ttyu1 "/usr/libexec/getty std.9600" vt100 on secure +ttyu2 "/usr/libexec/getty std.9600" vt100 off secure +ttyu3 "/usr/libexec/getty std.9600" vt100 off secure # Pseudo terminals ttyp0 none network ttyp1 none network ==== //depot/projects/ia64/libexec/lukemftpd/nbsd2fbsd.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/libexec/lukemftpd/nbsd2fbsd.h,v 1.3 2003/01/06 04:42:20 obrien Exp $ */ +/* $FreeBSD: src/libexec/lukemftpd/nbsd2fbsd.h,v 1.4 2003/09/11 03:28:21 obrien Exp $ */ /* XXX: Depend on our system headers protecting against multiple includes. */ #include @@ -15,3 +15,10 @@ #endif long long strsuftollx(const char *, const char *, long long, long long, char *, size_t); + +/* + * IEEE Std 1003.1c-95, adopted in X/Open CAE Specification Issue 5 Version 2 + */ +#if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 500 +#define LOGIN_NAME_MAX MAXLOGNAME /* max login name length (incl. NUL) */ +#endif ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#67 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.180 2003/09/06 20:03:09 simon Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.181 2003/09/11 16:03:46 bmah Exp $ Supported Devices @@ -1580,17 +1580,16 @@ Sun GEM (Gigabit Ethernet) and ERI (Fast Ethernet) NICs (&man.gem.4; driver) - Myson Ethernet NICs (my driver) - - - Myson MTD80X Based Fast Ethernet Card - - - Myson MTD89X Based Gigabit Ethernet Card - - + Myson Ethernet NICs (&man.my.4; driver) + Broadcom BCM4401 based Fast Ethernet adapters + (&man.bfe.4; driver) + + RealTek RTL8139C+, RTL8169, RTL8169S and + RTL8110S based PCI Fast Ethernet and Gigabit Ethernet + controllers (&man.re.4; driver) + ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#122 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.620 2003/09/06 18:15:11 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.621 2003/09/11 16:00:51 bmah Exp $ 2000 @@ -211,6 +211,9 @@ support for 802.11a/b/g devices based on the AR5210, AR5211, and AR5212 chips. + The &man.bfe.4; driver has been added to support Broadcom + BCM4401 based Fast Ethernet adapters. + &man.bge.4; now supports Broadcom 5705 based Gigabit Ethernet NICs. &merged; @@ -233,9 +236,9 @@ The &man.patm.4; driver has been added to support IDT77252 based ATM interfaces. - The &man.rl.4; driver now has support for the RealTek - 8139C+ Fast Ethernet chip and the RealTek 8169 Gigabit - Ethernet chip. &merged; + The &man.re.4; driver has been added. It provides support + for the RealTek RTL8139C+, RTL8169, RTL8169S and RTL8110S PCI + Fast Ethernet and Gigabit Ethernet controllers. The suspend/resume support for the &man.wi.4; driver now works correctly when the device is configured down. ==== //depot/projects/ia64/release/i386/drivers.conf#22 (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/i386/drivers.conf,v 1.29 2003/07/25 00:10:33 scottl Exp $ +# $FreeBSD: src/release/i386/drivers.conf,v 1.30 2003/09/12 08:20:47 kuriyama Exp $ # # drv: driver name in kernel config file @@ -39,6 +39,7 @@ #drv filename floppy type description aue if_aue 2 network "ADMtek USB ethernet adapter" bge if_bge 2 network "Broadcom BCM570xx Gigabit Ethernet" +bfe if_bfe 2 network "Broadcom BCM440x PCI ethernet card" cue if_cue 2 network "CATC USB ethernet adapter" dc if_dc 2 network "DEC/Intel 21143 (and clones) PCI fast ethernet card" ed if_ed 2 network "NE[12]000, SMC Ultra, 3c503, DS8390 ISA ethernet cards" @@ -49,6 +50,7 @@ lnc if_lnc 2 network "NE2100, NE32-VL Lance Ethernet cards" miibus miibus 2 network "MII bus support" pcn if_pcn 2 network "AMD Am79c79x PCI ethernet card" +re if_re 2 network "RealTek 8139C+/8169/8169S/8110S PCI ethernet card" rl if_rl 2 network "RealTek 8129/8139 PCI ethernet card" sf if_sf 2 network "Adaptec AIC-6915 PCI ethernet card" sis if_sis 2 network "SiS 900/SiS 7016 PCI ethernet card" ==== //depot/projects/ia64/share/examples/cvsup/cvs-supfile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.36 2003/03/04 19:02:27 peter Exp $ +# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.37 2003/09/12 09:09:49 ceri Exp $ # # This file contains all of the "CVSup collections" that make up the # CVS development tree of the FreeBSD system. @@ -118,6 +118,7 @@ #ports-databases #ports-deskutils #ports-devel +#ports-dns #ports-editors #ports-emulators #ports-finance @@ -142,6 +143,7 @@ #ports-news #ports-palm #ports-picobsd +#ports-polish #ports-portuguese #ports-print #ports-russian ==== //depot/projects/ia64/share/examples/cvsup/gnats-supfile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/cvsup/gnats-supfile,v 1.4 2002/07/30 14:08:16 blackend Exp $ +# $FreeBSD: src/share/examples/cvsup/gnats-supfile,v 1.5 2003/09/12 19:02:34 ceri Exp $ # # This file contains all of the "CVSup collections" that make up the # FreeBSD GNATS bug report database. @@ -41,7 +41,7 @@ # prefix=/usr # This specifies where to place the requested files. A # setting of "/usr" will place all of the files requested -# in "/usr/ports" (e.g., "/usr/ports/devel", "/usr/ports/lang"). +# in "/usr/gnats". # The prefix directory must exist in order to run CVSup. # Defaults that apply to all the collections ==== //depot/projects/ia64/share/examples/cvsup/ports-supfile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/cvsup/ports-supfile,v 1.26 2002/12/09 01:02:42 lioux Exp $ +# $FreeBSD: src/share/examples/cvsup/ports-supfile,v 1.27 2003/09/12 09:09:49 ceri Exp $ # # This file contains all of the "CVSup collections" that make up the # FreeBSD-current ports collection. @@ -84,6 +84,7 @@ #ports-databases #ports-deskutils #ports-devel +#ports-dns #ports-editors #ports-emulators #ports-finance @@ -108,6 +109,7 @@ #ports-news #ports-palm #ports-picobsd +#ports-polish #ports-portuguese #ports-print #ports-russian ==== //depot/projects/ia64/share/examples/cvsup/refuse#5 (text+ko) ==== @@ -21,6 +21,7 @@ ports/japanese ports/korean ports/portuguese +ports/polish ports/russian ports/ukrainian ports/vietnamese ==== //depot/projects/ia64/share/examples/cvsup/refuse.README#6 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/share/examples/cvsup/refuse.README,v 1.8 2003/03/26 01:25:39 keramida Exp $ +$FreeBSD: src/share/examples/cvsup/refuse.README,v 1.9 2003/09/12 09:09:49 ceri Exp $ This describes the "refuse" file found in this directory. The explanation cannot be put inside the file itself because: @@ -46,6 +46,7 @@ ports/hungarian ports/japanese ports/korean + ports/polish ports/portuguese ports/russian ports/ukrainian ==== //depot/projects/ia64/share/man/man4/ng_atm.4#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" .\" Author: Hartmut Brandt .\" -.\" $FreeBSD: src/share/man/man4/ng_atm.4,v 1.1 2003/06/25 13:21:55 harti Exp $ +.\" $FreeBSD: src/share/man/man4/ng_atm.4,v 1.2 2003/09/11 13:45:29 naddy Exp $ .\" .\" ng_atm(4) man page .\" @@ -279,6 +279,7 @@ char name[NG_HOOKLEN + 1]; }; .Ed +.El .Sh MANAGEMENT MESSAGES If the .Dv manage ==== //depot/projects/ia64/share/man/man9/physio.9#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/physio.9,v 1.13 2002/03/18 10:59:58 ru Exp $ +.\" $FreeBSD: src/share/man/man9/physio.9,v 1.14 2003/09/12 19:20:05 hmp Exp $ .\" .Dd June 15, 1996 .Dt PHYSIO 9 @@ -121,4 +121,4 @@ The .Nm call has been completely re-written for providing higher -I/O performance, and better paging performance. +I/O and paging performance. ==== //depot/projects/ia64/sys/alpha/alpha/pmap.c#43 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.137 2003/09/08 02:45:01 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.138 2003/09/12 07:07:47 alc Exp $"); #include #include @@ -815,10 +815,11 @@ * Routine: pmap_extract_and_hold * Function: * Atomically extract and hold the physical page - * with the given pmap and virtual address. + * with the given pmap and virtual address pair + * if that mapping permits the given protection. */ vm_page_t -pmap_extract_and_hold(pmap_t pmap, vm_offset_t va) +pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { vm_paddr_t pa; vm_page_t m; ==== //depot/projects/ia64/sys/amd64/amd64/pmap.c#23 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.435 2003/09/08 02:45:02 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.436 2003/09/12 07:07:48 alc Exp $"); /* * Manages physical address maps. @@ -753,10 +753,11 @@ * Routine: pmap_extract_and_hold * Function: * Atomically extract and hold the physical page - * with the given pmap and virtual address. + * with the given pmap and virtual address pair + * if that mapping permits the given protection. */ vm_page_t -pmap_extract_and_hold(pmap_t pmap, vm_offset_t va) +pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { vm_paddr_t pa; vm_page_t m; ==== //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#20 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.82 2003/09/05 10:40:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.83 2003/09/11 19:27:24 phk Exp $"); #include "opt_cd.h" @@ -152,7 +152,7 @@ int bufs_left; struct cam_periph *periph; dev_t dev; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 eventhandler_tag clonetag; #endif int minimum_command_size; @@ -343,7 +343,7 @@ static STAILQ_HEAD(changerlist, cdchanger) changerq; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 static void cdclone(void *arg, char *name, int namelen, dev_t *dev) { @@ -535,7 +535,7 @@ } devstat_remove_entry(softc->device_stats); destroy_dev(softc->dev); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 EVENTHANDLER_DEREGISTER(dev_clone, softc->clonetag); #endif free(softc, M_DEVBUF); @@ -782,7 +782,7 @@ softc->dev = make_dev(&cd_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0640, "cd%d", periph->unit_number); softc->dev->si_drv1 = periph; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 softc->clonetag = EVENTHANDLER_REGISTER(dev_clone, cdclone, softc, 1000); #endif ==== //depot/projects/ia64/sys/conf/NOTES#68 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1174 2003/09/07 19:19:49 marcel Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1175 2003/09/11 23:06:41 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1465,6 +1465,10 @@ # device uart +# Options for uart(4) +options UART_PPS_ON_CTS # Do time pulse capturing using CTS + # instead of DCD. + # The following hint should only be used for pure ISA devices. It is not # needed otherwise. Use of hints is strongly discouraged. hint.uart.0.at="isa" ==== //depot/projects/ia64/sys/conf/files#101 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.823 2003/09/09 18:17:23 wpaul Exp $ +# $FreeBSD: src/sys/conf/files,v 1.824 2003/09/11 03:53:46 wpaul Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -518,6 +518,7 @@ dev/mii/nsgphy.c optional miibus dev/mii/pnphy.c optional miibus dev/mii/pnaphy.c optional miibus +dev/mii/rgephy.c optional miibus dev/mii/rlphy.c optional miibus dev/mii/ruephy.c optional miibus dev/mii/tdkphy.c optional miibus ==== //depot/projects/ia64/sys/conf/options#67 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.413 2003/09/07 07:43:09 tjr Exp $ +# $FreeBSD: src/sys/conf/options,v 1.414 2003/09/11 23:06:41 marcel Exp $ # # On the handling of kernel options # @@ -538,6 +538,9 @@ BREAK_TO_DEBUGGER opt_comconsole.h ALT_BREAK_TO_DEBUGGER opt_comconsole.h +# Options to support PPS +UART_PPS_ON_CTS opt_uart.h + # options for bus/device framework BUS_DEBUG opt_bus.h ==== //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.22 2003/08/15 02:18:15 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.23 2003/09/11 03:17:33 njl Exp $ */ #include "opt_acpi.h" @@ -296,9 +296,11 @@ return; switch (notify) { + case ACPI_NOTIFY_DEVICE_CHECK: case ACPI_BATTERY_BST_CHANGE: timespecclear(&sc->bst_lastupdated); break; + case ACPI_NOTIFY_BUS_CHECK: case ACPI_BATTERY_BIF_CHANGE: timespecclear(&sc->bif_lastupdated); AcpiOsQueueForExecution(OSD_PRIORITY_LO, acpi_cmbat_get_bif, dev); @@ -331,6 +333,13 @@ return (ENXIO); handle = acpi_get_handle(dev); + + /* + * Install a system notify handler in addition to the device notify. + * Toshiba notebook uses this alternate notify for its battery. + */ + AcpiInstallNotifyHandler(handle, ACPI_SYSTEM_NOTIFY, + acpi_cmbat_notify_handler, dev); AcpiInstallNotifyHandler(handle, ACPI_DEVICE_NOTIFY, acpi_cmbat_notify_handler, dev); ==== //depot/projects/ia64/sys/dev/ata/atapi-cam.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.21 2003/08/28 03:56:04 thomas Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.22 2003/09/11 17:34:47 thomas Exp $"); #include #include @@ -277,7 +277,9 @@ strncpy(cpi->dev_name, cam_sim_name(sim), sizeof cpi->dev_name); cpi->unit_number = cam_sim_unit(sim); cpi->bus_id = cam_sim_bus(sim); - if (softc->ata_ch && ccb_h->target_id >= 0) { + cpi->base_transfer_speed = 3300; + + if (softc->ata_ch && ccb_h->target_id != CAM_TARGET_WILDCARD) { switch (softc->ata_ch->device[ccb_h->target_id].mode) { case ATA_PIO1: cpi->base_transfer_speed = 5200; @@ -305,7 +307,8 @@ case ATA_UDMA6: cpi->base_transfer_speed = 133000; break; - default: cpi->base_transfer_speed = 3300; + default: + break; } } ccb->ccb_h.status = CAM_REQ_CMP; ==== //depot/projects/ia64/sys/dev/ata/atapi-cd.c#29 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.142 2003/09/05 10:40:16 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.144 2003/09/11 19:27:24 phk Exp $"); #include "opt_ata.h" #include @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -242,7 +243,7 @@ free(entry, M_ACD); } destroy_dev(cdp->dev); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 EVENTHANDLER_DEREGISTER(dev_clone, cdp->clone_evh); #endif devstat_remove_entry(cdp->stats); @@ -275,7 +276,7 @@ return cdp; } -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 static void acd_clone(void *arg, char *name, int namelen, dev_t *dev) { @@ -304,7 +305,7 @@ dev->si_drv1 = cdp; cdp->dev = dev; cdp->device->flags |= ATA_D_MEDIA_CHANGED; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 cdp->clone_evh = EVENTHANDLER_REGISTER(dev_clone, acd_clone, cdp, 1000); #endif acd_set_ioparm(cdp); @@ -1032,6 +1033,14 @@ error = EINVAL; break; + case DIOCGMEDIASIZE: + *(off_t *)addr = cdp->disk_size * cdp->block_size; + break; + + case DIOCGSECTORSIZE: + *(u_int *)addr = cdp->block_size; + break; + default: error = ENOTTY; } ==== //depot/projects/ia64/sys/dev/ata/atapi-cd.h#11 (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/atapi-cd.h,v 1.37 2003/09/05 11:08:55 phk Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cd.h,v 1.39 2003/09/11 19:27:24 phk Exp $ */ /* CDROM Table Of Contents */ @@ -318,11 +318,11 @@ struct acd_softc **driver; /* softc's of changer slots */ int slot; /* this instance slot number */ time_t timestamp; /* this instance timestamp */ - int disk_size; /* size of current media */ - int block_size; /* blocksize currently used */ + u_int disk_size; /* size of current media */ + u_int block_size; /* blocksize currently used */ struct devstat *stats; /* devstat entry */ dev_t dev; /* device place holders */ -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 eventhandler_tag clone_evh; #endif }; ==== //depot/projects/ia64/sys/dev/ips/ips.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ips/ips.h,v 1.3 2003/08/22 06:00:27 imp Exp $ + * $FreeBSD: src/sys/dev/ips/ips.h,v 1.4 2003/09/11 23:30:28 ps Exp $ */ @@ -343,6 +343,7 @@ typedef struct ips_softc{ struct resource * iores; struct resource * irqres; + struct intr_config_hook ips_ich; int configured; int state; int iotype; ==== //depot/projects/ia64/sys/dev/ips/ips_pci.c#7 (text+ko) ==== @@ -27,11 +27,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.6 2003/09/02 17:30:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.7 2003/09/11 23:30:28 ps Exp $"); #include static int ips_pci_free(ips_softc_t *sc); +static void ips_intrhook(void *arg); static int ips_pci_probe(device_t dev) { @@ -132,15 +133,30 @@ printf("IPS can't alloc dma tag\n"); goto error; } - if(ips_adapter_init(sc)) + sc->ips_ich.ich_func = ips_intrhook; + sc->ips_ich.ich_arg = sc; + if (config_intrhook_establish(&sc->ips_ich) != 0) { + printf("IPS can't establish configuration hook\n"); goto error; - sc->configured = 1; + } return 0; error: ips_pci_free(sc); return (ENXIO); } +static void +ips_intrhook(void *arg) +{ + struct ips_softc *sc = (struct ips_softc *)arg; + + config_intrhook_disestablish(&sc->ips_ich); + if (ips_adapter_init(sc)) + ips_pci_free(sc); + else + sc->configured = 1; +} + static int ips_pci_free(ips_softc_t *sc) { if(sc->adapter_dmatag) ==== //depot/projects/ia64/sys/dev/mii/miidevs#10 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/mii/miidevs,v 1.25 2003/09/09 18:17:23 wpaul Exp $ +$FreeBSD: src/sys/dev/mii/miidevs,v 1.26 2003/09/11 03:53:46 wpaul Exp $ /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/ /*- @@ -91,6 +91,8 @@ /* Don't know what's going on here. */ oui xxDAVICOM 0x006040 Davicom Semiconductor +/* This is the OUI of the gigE PHY in the RealTek 8169S/8110S chips */ +oui xxREALTEK 0x000732 /* * List of known models. Grouped by oui. @@ -149,6 +151,7 @@ /* RealTek Semiconductor PHYs */ model REALTEK RTL8201L 0x0020 RTL8201L 10/100 media interface +model xxREALTEK RTL8169S 0x0011 RTL8169S/8110S media interface /* Seeq PHYs */ model xxSEEQ 80220 0x0003 Seeq 80220 10/100 media interface ==== //depot/projects/ia64/sys/dev/re/if_re.c#3 (text+ko) ==== @@ -106,7 +106,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.3 2003/09/10 15:14:46 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.6 2003/09/11 07:54:16 wpaul Exp $"); #include #include @@ -393,6 +393,13 @@ sc = device_get_softc(dev); + /* Let the rgephy driver read the GMEDIASTAT register */ + + if (reg == RL_GMEDIASTAT) { + rval = CSR_READ_1(sc, RL_GMEDIASTAT); + return(rval); + } + CSR_WRITE_4(sc, RL_PHYAR, reg << 16); DELAY(1000); @@ -423,7 +430,7 @@ sc = device_get_softc(dev); CSR_WRITE_4(sc, RL_PHYAR, (reg << 16) | - (data | RL_PHYAR_PHYDATA) | RL_PHYAR_BUSY); + (data & RL_PHYAR_PHYDATA) | RL_PHYAR_BUSY); DELAY(1000); for (i = 0; i < RL_TIMEOUT; i++) { @@ -721,6 +728,9 @@ ifp->if_flags |= IFF_PROMISC; sc->rl_testmode = 1; re_init(sc); + re_stop(sc); + DELAY(100000); + re_init(sc); /* Put some data in the mbuf */ @@ -733,14 +743,17 @@ /* Queue the packet, start transmission */ IF_HANDOFF(&ifp->if_snd, m0, ifp); + CSR_WRITE_2(sc, RL_ISR, 0xFFFF); re_start(ifp); m0 = NULL; /* Wait for it to propagate through the chip */ + DELAY(100000); for (i = 0; i < RL_TIMEOUT; i++) { status = CSR_READ_2(sc, RL_ISR); - if (status & RL_ISR_RX_OK) + if ((status & (RL_ISR_TIMEOUT_EXPIRED|RL_ISR_RX_OK)) == + (RL_ISR_TIMEOUT_EXPIRED|RL_ISR_RX_OK)) break; DELAY(10); } @@ -1148,18 +1161,55 @@ /* Reset the adapter. */ re_reset(sc); - sc->rl_eecmd_read = RL_EECMD_READ_6BIT; - re_read_eeprom(sc, (caddr_t)&re_did, 0, 1, 0); - if (re_did != 0x8129) - sc->rl_eecmd_read = RL_EECMD_READ_8BIT; + + hw_rev = re_hwrevs; + hwrev = CSR_READ_4(sc, RL_TXCFG) & RL_TXCFG_HWREV; + while (hw_rev->rl_desc != NULL) { + if (hw_rev->rl_rev == hwrev) { + sc->rl_type = hw_rev->rl_type; + break; + } + hw_rev++; + } + + if (sc->rl_type == RL_8169) { + + /* Set RX length mask */ + + sc->rl_rxlenmask = RL_RDESC_STAT_GFRAGLEN; + + /* Force station address autoload from the EEPROM */ + + CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_AUTOLOAD); + for (i = 0; i < RL_TIMEOUT; i++) { + if (!(CSR_READ_1(sc, RL_EECMD) & RL_EEMODE_AUTOLOAD)) + break; + DELAY(100); + } + if (i == RL_TIMEOUT) + printf ("re%d: eeprom autoload timed out\n", unit); + + for (i = 0; i < ETHER_ADDR_LEN; i++) + eaddr[i] = CSR_READ_1(sc, RL_IDR0 + i); + } else { + + /* Set RX length mask */ + + sc->rl_rxlenmask = RL_RDESC_STAT_FRAGLEN; + + sc->rl_eecmd_read = RL_EECMD_READ_6BIT; + re_read_eeprom(sc, (caddr_t)&re_did, 0, 1, 0); + if (re_did != 0x8129) + sc->rl_eecmd_read = RL_EECMD_READ_8BIT; - /* - * Get station address from the EEPROM. - */ - re_read_eeprom(sc, (caddr_t)as, RL_EE_EADDR, 3, 0); - for (i = 0; i < 3; i++) { - eaddr[(i * 2) + 0] = as[i] & 0xff; - eaddr[(i * 2) + 1] = as[i] >> 8; + /* + * Get station address from the EEPROM. + */ + re_read_eeprom(sc, (caddr_t)as, RL_EE_EADDR, 3, 0); + for (i = 0; i < 3; i++) { + eaddr[(i * 2) + 0] = as[i] & 0xff; + eaddr[(i * 2) + 1] = as[i] >> 8; + } } /* @@ -1170,16 +1220,6 @@ sc->rl_unit = unit; bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); - hw_rev = re_hwrevs; - hwrev = CSR_READ_4(sc, RL_TXCFG) & RL_TXCFG_HWREV; - while (hw_rev->rl_desc != NULL) { - if (hw_rev->rl_rev == hwrev) { - sc->rl_type = hw_rev->rl_type; - break; - } - hw_rev++; - } - /* * Allocate the parent bus DMA tag appropriate for PCI. */ @@ -1780,6 +1820,11 @@ RL_LOCK(sc); ifp = &sc->arpcom.ac_if; + if (!(ifp->if_flags & IFF_UP)) { + RL_UNLOCK(sc); + return; + } + #ifdef DEVICE_POLLING if (ifp->if_flags & IFF_POLLING) goto done; @@ -2056,9 +2101,14 @@ /* * Set the initial TX and RX configuration. */ - if (sc->rl_testmode) - CSR_WRITE_4(sc, RL_TXCFG, RL_TXCFG_CONFIG|RL_LOOPTEST_ON); - else + if (sc->rl_testmode) { + if (sc->rl_type == RL_8169) + CSR_WRITE_4(sc, RL_TXCFG, + RL_TXCFG_CONFIG|RL_LOOPTEST_ON); + else + CSR_WRITE_4(sc, RL_TXCFG, + RL_TXCFG_CONFIG|RL_LOOPTEST_ON_CPLUS); + } else CSR_WRITE_4(sc, RL_TXCFG, RL_TXCFG_CONFIG); CSR_WRITE_4(sc, RL_RXCFG, RL_RXCFG_CONFIG); ==== //depot/projects/ia64/sys/dev/uart/uart_bus.h#2 (text+ko) ==== @@ -23,12 +23,18 @@ * (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/uart/uart_bus.h,v 1.1 2003/09/06 23:13:47 marcel Exp $ + * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.2 2003/09/11 23:06:42 marcel Exp $ */ #ifndef _DEV_UART_BUS_H_ #define _DEV_UART_BUS_H_ +#ifndef KLD_MODULE +#include "opt_uart.h" +#endif + +#include + /* Drain and flush targets. */ #define UART_DRAIN_RECEIVER 0x0001 #define UART_DRAIN_TRANSMITTER 0x0002 @@ -75,6 +81,14 @@ #define UART_SIGMASK_STATE 0x003f #define UART_SIGMASK_DELTA 0x3f00 +#ifdef UART_PPS_ON_CTS +#define UART_SIG_DPPS UART_SIG_DCTS +#define UART_SIG_PPS UART_SIG_CTS +#else +#define UART_SIG_DPPS UART_SIG_DDCD >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 12 15:53:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DD7B16A4C1; Fri, 12 Sep 2003 15:53:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E3B4016A4BF for ; Fri, 12 Sep 2003 15:53:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6BE843F85 for ; Fri, 12 Sep 2003 15:53:45 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8CMrj0U010762 for ; Fri, 12 Sep 2003 15:53:45 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8CMriQd010759 for perforce@freebsd.org; Fri, 12 Sep 2003 15:53:44 -0700 (PDT) Date: Fri, 12 Sep 2003 15:53:44 -0700 (PDT) Message-Id: <200309122253.h8CMriQd010759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 37978 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2003 22:53:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=37978 Change 37978 by marcel@marcel_nfs on 2003/09/12 15:53:04 IFC @37975 Affected files ... .. //depot/projects/uart/alpha/alpha/pmap.c#12 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#15 integrate .. //depot/projects/uart/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/uart/conf/NOTES#13 integrate .. //depot/projects/uart/conf/options#12 integrate .. //depot/projects/uart/dev/ata/atapi-cam.c#5 integrate .. //depot/projects/uart/dev/ata/atapi-cd.c#6 integrate .. //depot/projects/uart/dev/ata/atapi-cd.h#4 integrate .. //depot/projects/uart/dev/ips/ips.h#3 integrate .. //depot/projects/uart/dev/ips/ips_pci.c#6 integrate .. //depot/projects/uart/dev/mii/rgephy.c#2 integrate .. //depot/projects/uart/dev/re/if_re.c#2 integrate .. //depot/projects/uart/dev/uart/uart_bus.h#28 integrate .. //depot/projects/uart/dev/uart/uart_core.c#28 integrate .. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#13 integrate .. //depot/projects/uart/dev/uart/uart_tty.c#16 integrate .. //depot/projects/uart/i386/i386/pmap.c#16 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#10 integrate .. //depot/projects/uart/isa/fd.c#4 integrate .. //depot/projects/uart/kern/sys_pipe.c#9 integrate .. //depot/projects/uart/net/raw_usrreq.c#2 integrate .. //depot/projects/uart/netinet/tcp_subr.c#3 integrate .. //depot/projects/uart/netinet6/in6_pcb.c#2 integrate .. //depot/projects/uart/netipx/ipx_input.c#2 integrate .. //depot/projects/uart/netipx/spx_usrreq.c#2 integrate .. //depot/projects/uart/nfsclient/nfs_node.c#2 integrate .. //depot/projects/uart/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/uart/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/uart/nfsclient/nfsnode.h#2 integrate .. //depot/projects/uart/pc98/conf/NOTES#4 integrate .. //depot/projects/uart/pc98/i386/machdep.c#4 integrate .. //depot/projects/uart/pc98/pc98/clock.c#5 integrate .. //depot/projects/uart/pc98/pc98/fd.c#3 integrate .. //depot/projects/uart/pci/if_rlreg.h#7 integrate .. //depot/projects/uart/sparc64/sparc64/ofw_machdep.c#8 integrate .. //depot/projects/uart/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/uart/vm/pmap.h#5 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/pmap.c#12 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.137 2003/09/08 02:45:01 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.138 2003/09/12 07:07:47 alc Exp $"); #include #include @@ -815,10 +815,11 @@ * Routine: pmap_extract_and_hold * Function: * Atomically extract and hold the physical page - * with the given pmap and virtual address. + * with the given pmap and virtual address pair + * if that mapping permits the given protection. */ vm_page_t -pmap_extract_and_hold(pmap_t pmap, vm_offset_t va) +pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { vm_paddr_t pa; vm_page_t m; ==== //depot/projects/uart/amd64/amd64/pmap.c#15 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.435 2003/09/08 02:45:02 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.436 2003/09/12 07:07:48 alc Exp $"); /* * Manages physical address maps. @@ -753,10 +753,11 @@ * Routine: pmap_extract_and_hold * Function: * Atomically extract and hold the physical page - * with the given pmap and virtual address. + * with the given pmap and virtual address pair + * if that mapping permits the given protection. */ vm_page_t -pmap_extract_and_hold(pmap_t pmap, vm_offset_t va) +pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { vm_paddr_t pa; vm_page_t m; ==== //depot/projects/uart/cam/scsi/scsi_cd.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.82 2003/09/05 10:40:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.83 2003/09/11 19:27:24 phk Exp $"); #include "opt_cd.h" @@ -152,7 +152,7 @@ int bufs_left; struct cam_periph *periph; dev_t dev; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 eventhandler_tag clonetag; #endif int minimum_command_size; @@ -343,7 +343,7 @@ static STAILQ_HEAD(changerlist, cdchanger) changerq; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 static void cdclone(void *arg, char *name, int namelen, dev_t *dev) { @@ -535,7 +535,7 @@ } devstat_remove_entry(softc->device_stats); destroy_dev(softc->dev); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 EVENTHANDLER_DEREGISTER(dev_clone, softc->clonetag); #endif free(softc, M_DEVBUF); @@ -782,7 +782,7 @@ softc->dev = make_dev(&cd_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0640, "cd%d", periph->unit_number); softc->dev->si_drv1 = periph; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 softc->clonetag = EVENTHANDLER_REGISTER(dev_clone, cdclone, softc, 1000); #endif ==== //depot/projects/uart/conf/NOTES#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1174 2003/09/07 19:19:49 marcel Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1175 2003/09/11 23:06:41 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1465,6 +1465,10 @@ # device uart +# Options for uart(4) +options UART_PPS_ON_CTS # Do time pulse capturing using CTS + # instead of DCD. + # The following hint should only be used for pure ISA devices. It is not # needed otherwise. Use of hints is strongly discouraged. hint.uart.0.at="isa" ==== //depot/projects/uart/conf/options#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.413 2003/09/07 07:43:09 tjr Exp $ +# $FreeBSD: src/sys/conf/options,v 1.414 2003/09/11 23:06:41 marcel Exp $ # # On the handling of kernel options # @@ -537,6 +537,9 @@ BREAK_TO_DEBUGGER opt_comconsole.h ALT_BREAK_TO_DEBUGGER opt_comconsole.h +# Options to support PPS +UART_PPS_ON_CTS opt_uart.h + # options for bus/device framework BUS_DEBUG opt_bus.h ==== //depot/projects/uart/dev/ata/atapi-cam.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.21 2003/08/28 03:56:04 thomas Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.22 2003/09/11 17:34:47 thomas Exp $"); #include #include @@ -277,7 +277,9 @@ strncpy(cpi->dev_name, cam_sim_name(sim), sizeof cpi->dev_name); cpi->unit_number = cam_sim_unit(sim); cpi->bus_id = cam_sim_bus(sim); - if (softc->ata_ch && ccb_h->target_id >= 0) { + cpi->base_transfer_speed = 3300; + + if (softc->ata_ch && ccb_h->target_id != CAM_TARGET_WILDCARD) { switch (softc->ata_ch->device[ccb_h->target_id].mode) { case ATA_PIO1: cpi->base_transfer_speed = 5200; @@ -305,7 +307,8 @@ case ATA_UDMA6: cpi->base_transfer_speed = 133000; break; - default: cpi->base_transfer_speed = 3300; + default: + break; } } ccb->ccb_h.status = CAM_REQ_CMP; ==== //depot/projects/uart/dev/ata/atapi-cd.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.142 2003/09/05 10:40:16 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.144 2003/09/11 19:27:24 phk Exp $"); #include "opt_ata.h" #include @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -242,7 +243,7 @@ free(entry, M_ACD); } destroy_dev(cdp->dev); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 EVENTHANDLER_DEREGISTER(dev_clone, cdp->clone_evh); #endif devstat_remove_entry(cdp->stats); @@ -275,7 +276,7 @@ return cdp; } -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 static void acd_clone(void *arg, char *name, int namelen, dev_t *dev) { @@ -304,7 +305,7 @@ dev->si_drv1 = cdp; cdp->dev = dev; cdp->device->flags |= ATA_D_MEDIA_CHANGED; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 cdp->clone_evh = EVENTHANDLER_REGISTER(dev_clone, acd_clone, cdp, 1000); #endif acd_set_ioparm(cdp); @@ -1032,6 +1033,14 @@ error = EINVAL; break; + case DIOCGMEDIASIZE: + *(off_t *)addr = cdp->disk_size * cdp->block_size; + break; + + case DIOCGSECTORSIZE: + *(u_int *)addr = cdp->block_size; + break; + default: error = ENOTTY; } ==== //depot/projects/uart/dev/ata/atapi-cd.h#4 (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/atapi-cd.h,v 1.37 2003/09/05 11:08:55 phk Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cd.h,v 1.39 2003/09/11 19:27:24 phk Exp $ */ /* CDROM Table Of Contents */ @@ -318,11 +318,11 @@ struct acd_softc **driver; /* softc's of changer slots */ int slot; /* this instance slot number */ time_t timestamp; /* this instance timestamp */ - int disk_size; /* size of current media */ - int block_size; /* blocksize currently used */ + u_int disk_size; /* size of current media */ + u_int block_size; /* blocksize currently used */ struct devstat *stats; /* devstat entry */ dev_t dev; /* device place holders */ -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 eventhandler_tag clone_evh; #endif }; ==== //depot/projects/uart/dev/ips/ips.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ips/ips.h,v 1.3 2003/08/22 06:00:27 imp Exp $ + * $FreeBSD: src/sys/dev/ips/ips.h,v 1.4 2003/09/11 23:30:28 ps Exp $ */ @@ -343,6 +343,7 @@ typedef struct ips_softc{ struct resource * iores; struct resource * irqres; + struct intr_config_hook ips_ich; int configured; int state; int iotype; ==== //depot/projects/uart/dev/ips/ips_pci.c#6 (text+ko) ==== @@ -27,11 +27,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.6 2003/09/02 17:30:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.7 2003/09/11 23:30:28 ps Exp $"); #include static int ips_pci_free(ips_softc_t *sc); +static void ips_intrhook(void *arg); static int ips_pci_probe(device_t dev) { @@ -132,15 +133,30 @@ printf("IPS can't alloc dma tag\n"); goto error; } - if(ips_adapter_init(sc)) + sc->ips_ich.ich_func = ips_intrhook; + sc->ips_ich.ich_arg = sc; + if (config_intrhook_establish(&sc->ips_ich) != 0) { + printf("IPS can't establish configuration hook\n"); goto error; - sc->configured = 1; + } return 0; error: ips_pci_free(sc); return (ENXIO); } +static void +ips_intrhook(void *arg) +{ + struct ips_softc *sc = (struct ips_softc *)arg; + + config_intrhook_disestablish(&sc->ips_ich); + if (ips_adapter_init(sc)) + ips_pci_free(sc); + else + sc->configured = 1; +} + static int ips_pci_free(ips_softc_t *sc) { if(sc->adapter_dmatag) ==== //depot/projects/uart/dev/mii/rgephy.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/rgephy.c,v 1.1 2003/09/11 03:53:46 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/rgephy.c,v 1.2 2003/09/11 08:28:38 wpaul Exp $"); #include #include @@ -311,7 +311,7 @@ /* * Callback if something changed. Note that we need to poke - * the DSP on the Broadcom PHYs if the media changes. + * the DSP on the RealTek PHYs if the media changes. * */ if (sc->mii_media_active != mii->mii_media_active || @@ -328,7 +328,7 @@ struct mii_softc *sc; { struct mii_data *mii = sc->mii_pdata; - int bmsr, bmcr/*, anlpar*/; + int bmsr, bmcr; mii->mii_media_status = IFM_AVALID; mii->mii_media_active = IFM_ETHER; @@ -350,18 +350,6 @@ mii->mii_media_active |= IFM_NONE; return; } -/* - anlpar = PHY_READ(sc, RL_GMEDIASTAT); - if (anlpar & RL_GMEDIASTAT_10MBPS) - mii->mii_media_active |= IFM_10_T; - if (anlpar & RL_GMEDIASTAT_100MBPS) - mii->mii_media_active |= IFM_100_TX; - if (anlpar & RL_GMEDIASTAT_1000MBPS) - mii->mii_media_active |= IFM_1000_T; - if (anlpar & RL_GMEDIASTAT_FDX) - mii->mii_media_active |= IFM_FDX; - return; -*/ } bmsr = PHY_READ(sc, RL_GMEDIASTAT); @@ -423,7 +411,12 @@ #define PHY_CLRBIT(x, y, z) \ PHY_WRITE(x, y, (PHY_READ(x, y) & ~(z))) -/* Initialize RealTek PHY per datasheet */ +/* + * Initialize RealTek PHY per the datasheet. The DSP in the PHYs of + * existing revisions of the 8169S/8110S chips need to be tuned in + * order to reliably negotiate a 1000Mbps link. Later revs of the + * chips may not require this software tuning. + */ static void rgephy_load_dspcode(struct mii_softc *sc) { ==== //depot/projects/uart/dev/re/if_re.c#2 (text+ko) ==== @@ -106,7 +106,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.4 2003/09/11 03:53:46 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.6 2003/09/11 07:54:16 wpaul Exp $"); #include #include @@ -728,6 +728,9 @@ ifp->if_flags |= IFF_PROMISC; sc->rl_testmode = 1; re_init(sc); + re_stop(sc); + DELAY(100000); + re_init(sc); /* Put some data in the mbuf */ @@ -740,14 +743,17 @@ /* Queue the packet, start transmission */ IF_HANDOFF(&ifp->if_snd, m0, ifp); + CSR_WRITE_2(sc, RL_ISR, 0xFFFF); re_start(ifp); m0 = NULL; /* Wait for it to propagate through the chip */ + DELAY(100000); for (i = 0; i < RL_TIMEOUT; i++) { status = CSR_READ_2(sc, RL_ISR); - if (status & RL_ISR_RX_OK) + if ((status & (RL_ISR_TIMEOUT_EXPIRED|RL_ISR_RX_OK)) == + (RL_ISR_TIMEOUT_EXPIRED|RL_ISR_RX_OK)) break; DELAY(10); } @@ -1155,22 +1161,56 @@ /* Reset the adapter. */ re_reset(sc); - CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_PROGRAM); - sc->rl_eecmd_read = RL_EECMD_READ_6BIT; - re_read_eeprom(sc, (caddr_t)&re_did, 0, 1, 0); - if (re_did != 0x8129) - sc->rl_eecmd_read = RL_EECMD_READ_8BIT; - /* - * Get station address from the EEPROM. - */ - re_read_eeprom(sc, (caddr_t)as, RL_EE_EADDR, 3, 0); - for (i = 0; i < 3; i++) { - eaddr[(i * 2) + 0] = as[i] & 0xff; - eaddr[(i * 2) + 1] = as[i] >> 8; + hw_rev = re_hwrevs; + hwrev = CSR_READ_4(sc, RL_TXCFG) & RL_TXCFG_HWREV; + while (hw_rev->rl_desc != NULL) { + if (hw_rev->rl_rev == hwrev) { + sc->rl_type = hw_rev->rl_type; + break; + } + hw_rev++; } - CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF); + if (sc->rl_type == RL_8169) { + + /* Set RX length mask */ + + sc->rl_rxlenmask = RL_RDESC_STAT_GFRAGLEN; + + /* Force station address autoload from the EEPROM */ + + CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_AUTOLOAD); + for (i = 0; i < RL_TIMEOUT; i++) { + if (!(CSR_READ_1(sc, RL_EECMD) & RL_EEMODE_AUTOLOAD)) + break; + DELAY(100); + } + if (i == RL_TIMEOUT) + printf ("re%d: eeprom autoload timed out\n", unit); + + for (i = 0; i < ETHER_ADDR_LEN; i++) + eaddr[i] = CSR_READ_1(sc, RL_IDR0 + i); + } else { + + /* Set RX length mask */ + + sc->rl_rxlenmask = RL_RDESC_STAT_FRAGLEN; + + sc->rl_eecmd_read = RL_EECMD_READ_6BIT; + re_read_eeprom(sc, (caddr_t)&re_did, 0, 1, 0); + if (re_did != 0x8129) + sc->rl_eecmd_read = RL_EECMD_READ_8BIT; + + /* + * Get station address from the EEPROM. + */ + re_read_eeprom(sc, (caddr_t)as, RL_EE_EADDR, 3, 0); + for (i = 0; i < 3; i++) { + eaddr[(i * 2) + 0] = as[i] & 0xff; + eaddr[(i * 2) + 1] = as[i] >> 8; + } + } /* * A RealTek chip was detected. Inform the world. @@ -1180,16 +1220,6 @@ sc->rl_unit = unit; bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); - hw_rev = re_hwrevs; - hwrev = CSR_READ_4(sc, RL_TXCFG) & RL_TXCFG_HWREV; - while (hw_rev->rl_desc != NULL) { - if (hw_rev->rl_rev == hwrev) { - sc->rl_type = hw_rev->rl_type; - break; - } - hw_rev++; - } - /* * Allocate the parent bus DMA tag appropriate for PCI. */ @@ -2071,9 +2101,14 @@ /* * Set the initial TX and RX configuration. */ - if (sc->rl_testmode) - CSR_WRITE_4(sc, RL_TXCFG, RL_TXCFG_CONFIG|RL_LOOPTEST_ON); - else + if (sc->rl_testmode) { + if (sc->rl_type == RL_8169) + CSR_WRITE_4(sc, RL_TXCFG, + RL_TXCFG_CONFIG|RL_LOOPTEST_ON); + else + CSR_WRITE_4(sc, RL_TXCFG, + RL_TXCFG_CONFIG|RL_LOOPTEST_ON_CPLUS); + } else CSR_WRITE_4(sc, RL_TXCFG, RL_TXCFG_CONFIG); CSR_WRITE_4(sc, RL_RXCFG, RL_RXCFG_CONFIG); ==== //depot/projects/uart/dev/uart/uart_bus.h#28 (text+ko) ==== @@ -23,12 +23,18 @@ * (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$ + * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.2 2003/09/11 23:06:42 marcel Exp $ */ #ifndef _DEV_UART_BUS_H_ #define _DEV_UART_BUS_H_ +#ifndef KLD_MODULE +#include "opt_uart.h" +#endif + +#include + /* Drain and flush targets. */ #define UART_DRAIN_RECEIVER 0x0001 #define UART_DRAIN_TRANSMITTER 0x0002 @@ -75,6 +81,14 @@ #define UART_SIGMASK_STATE 0x003f #define UART_SIGMASK_DELTA 0x3f00 +#ifdef UART_PPS_ON_CTS +#define UART_SIG_DPPS UART_SIG_DCTS +#define UART_SIG_PPS UART_SIG_CTS +#else +#define UART_SIG_DPPS UART_SIG_DDCD +#define UART_SIG_PPS UART_SIG_DCD +#endif + /* UART_IOCTL() requests */ #define UART_IOCTL_BREAK 1 #define UART_IOCTL_IFLOW 2 @@ -133,6 +147,9 @@ int sc_txdatasz; int sc_txfifosz; /* Size of TX FIFO and buffer. */ + /* Pulse capturing support (PPS). */ + struct pps_state sc_pps; + /* Upper layer data. */ void *sc_softih; uint32_t sc_ttypend; ==== //depot/projects/uart/dev/uart/uart_core.c#28 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.2 2003/09/11 23:06:42 marcel Exp $"); #ifndef KLD_MODULE #include "opt_comconsole.h" @@ -162,6 +162,15 @@ int new, old, sig; sig = UART_GETSIG(sc); + + if (sc->sc_pps.ppsparam.mode & PPS_CAPTUREBOTH) { + if (sig & UART_SIG_DPPS) { + pps_capture(&sc->sc_pps); + pps_event(&sc->sc_pps, (sig & UART_SIG_PPS) ? + PPS_CAPTUREASSERT : PPS_CAPTURECLEAR); + } + } + do { old = sc->sc_ttypend; new = old & ~UART_SIGMASK_STATE; @@ -393,6 +402,9 @@ sc->sc_sysdev->stopbits); } + sc->sc_pps.ppscap = PPS_CAPTUREBOTH; + pps_init(&sc->sc_pps); + error = (sc->sc_sysdev != NULL && sc->sc_sysdev->attach != NULL) ? (*sc->sc_sysdev->attach)(sc) : uart_tty_attach(sc); if (error) ==== //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.2 2003/09/07 21:51:03 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.3 2003/09/12 20:13:23 tmm Exp $"); #include #include @@ -75,7 +75,7 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - char buf[32], dev[32]; + char buf[32], dev[32], compat[32]; phandle_t input, options, output; bus_addr_t addr; int baud, bits, ch, error, space, stop; @@ -124,6 +124,8 @@ /* Get the device class. */ if (OF_getprop(input, "name", buf, sizeof(buf)) == -1) return (ENXIO); + if (OF_getprop(input, "compatible", compat, sizeof(compat)) == -1) + compat[0] = '\0'; di->bas.regshft = 0; di->bas.rclk = 0; if (!strcmp(buf, "se")) { @@ -134,7 +136,8 @@ di->bas.regshft = 1; ch = uart_cpu_channel(dev); addr += 4 - 4 * ch; - } else if (!strcmp(buf, "su") || !strcmp(buf, "su_pnp")) + } else if (!strcmp(buf, "su") || !strcmp(buf, "su_pnp") || + !strcmp(compat, "su") || !strcmp(compat, "su16550")) di->ops = uart_ns8250_ops; else return (ENXIO); ==== //depot/projects/uart/dev/uart/uart_tty.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.2 2003/09/11 23:06:42 marcel Exp $"); #include #include @@ -476,6 +476,9 @@ if (sc->sc_sysdev == NULL) UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DRTS); + /* Disable pulse capturing. */ + sc->sc_pps.ppsparam.mode = 0; + (*linesw[tp->t_line].l_close)(tp, flags); ttyclose(tp); wakeup(sc); @@ -505,6 +508,7 @@ if (error != ENOIOCTL) return (error); + error = 0; switch (cmd) { case TIOCSBRK: UART_IOCTL(sc, UART_IOCTL_BREAK, 1); @@ -563,7 +567,10 @@ *(int*)data = bits; break; default: - return (ENOTTY); + error = pps_ioctl(cmd, data, &sc->sc_pps); + if (error == ENODEV) + error = ENOTTY; + break; } - return (0); + return (error); } ==== //depot/projects/uart/i386/i386/pmap.c#16 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.431 2003/09/08 02:45:02 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.432 2003/09/12 07:07:48 alc Exp $"); /* * Manages physical address maps. @@ -865,10 +865,11 @@ * Routine: pmap_extract_and_hold * Function: * Atomically extract and hold the physical page - * with the given pmap and virtual address. + * with the given pmap and virtual address pair + * if that mapping permits the given protection. */ vm_page_t -pmap_extract_and_hold(pmap_t pmap, vm_offset_t va) +pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { vm_paddr_t pa; vm_page_t m; ==== //depot/projects/uart/ia64/ia64/pmap.c#10 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.121 2003/09/09 05:59:09 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.122 2003/09/12 07:07:48 alc Exp $ */ /* @@ -1106,10 +1106,11 @@ * Routine: pmap_extract_and_hold * Function: * Atomically extract and hold the physical page - * with the given pmap and virtual address. + * with the given pmap and virtual address pair + * if that mapping permits the given protection. */ vm_page_t -pmap_extract_and_hold(pmap_t pmap, vm_offset_t va) +pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { vm_paddr_t pa; vm_page_t m; ==== //depot/projects/uart/isa/fd.c#4 (text+ko) ==== @@ -53,7 +53,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/isa/fd.c,v 1.257 2003/09/05 10:40:16 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/isa/fd.c,v 1.258 2003/09/11 19:27:24 phk Exp $"); #include "opt_fdc.h" #include "card.h" @@ -317,7 +317,7 @@ struct callout_handle tohandle; struct devstat *device_stats; dev_t masterdev; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 eventhandler_tag clonetag; dev_t clonedevs[NUMDENS - 1]; #endif @@ -388,7 +388,7 @@ static void fdc_add_child(device_t, const char *, int); static int fdc_attach(device_t); static int fdc_print_child(device_t, device_t); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 static void fd_clone (void *, char *, int, dev_t *); #endif static int fd_probe(device_t); @@ -1121,7 +1121,7 @@ #endif /* NCARD > 0 */ -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 /* * Create a clone device upon request by devfs. */ @@ -1331,12 +1331,12 @@ struct fd_data *fd; fd = device_get_softc(dev); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 fd->clonetag = EVENTHANDLER_REGISTER(dev_clone, fd_clone, fd, 1000); #endif fd->masterdev = make_dev(&fd_cdevsw, fd->fdu << 6, UID_ROOT, GID_OPERATOR, 0640, "fd%d", fd->fdu); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 { int i; for (i = 0; i < NUMDENS - 1; i++) @@ -1359,7 +1359,7 @@ untimeout(fd_turnoff, fd, fd->toffhandle); devstat_remove_entry(fd->device_stats); destroy_dev(fd->masterdev); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 { int i; for (i = 0; i < NUMDENS - 1; i++) ==== //depot/projects/uart/kern/sys_pipe.c#9 (text+ko) ==== @@ -66,7 +66,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sys_pipe.c,v 1.150 2003/09/08 04:58:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sys_pipe.c,v 1.151 2003/09/12 07:13:15 alc Exp $"); #include "opt_mac.h" @@ -668,7 +668,8 @@ vm_page_unlock_queues(); return (EFAULT); } - wpipe->pipe_map.ms[i] = pmap_extract_and_hold(pmap, addr); + wpipe->pipe_map.ms[i] = pmap_extract_and_hold(pmap, addr, + VM_PROT_READ); if (wpipe->pipe_map.ms[i] == NULL) goto race; } ==== //depot/projects/uart/net/raw_usrreq.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)raw_usrreq.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.28 2002/12/28 02:29:19 kbyanc Exp $ + * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.29 2003/09/11 21:40:20 ru Exp $ */ #include @@ -129,7 +129,7 @@ void *dummy; { - if (cmd < 0 || cmd > PRC_NCMDS) + if (cmd < 0 || cmd >= PRC_NCMDS) return; /* INCOMPLETE */ } ==== //depot/projects/uart/netinet/tcp_subr.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.161 2003/08/21 18:39:16 rwatson Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.162 2003/09/11 21:40:20 ru Exp $ */ #include "opt_compat.h" @@ -1138,7 +1138,7 @@ notify = in_rtchange; } else if (cmd == PRC_HOSTDEAD) ip = 0; - else if ((unsigned)cmd > PRC_NCMDS || inetctlerrmap[cmd] == 0) + else if ((unsigned)cmd >= PRC_NCMDS || inetctlerrmap[cmd] == 0) return; if (ip) { s = splnet(); @@ -1204,7 +1204,7 @@ else if (cmd == PRC_MSGSIZE) notify = tcp_mtudisc; else if (!PRC_IS_REDIRECT(cmd) && - ((unsigned)cmd > PRC_NCMDS || inet6ctlerrmap[cmd] == 0)) + ((unsigned)cmd >= PRC_NCMDS || inet6ctlerrmap[cmd] == 0)) return; /* if the parameter is from icmp6, decode it. */ ==== //depot/projects/uart/netinet6/in6_pcb.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.37 2003/06/17 00:31:30 cognet Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.38 2003/09/11 21:40:20 ru Exp $ */ /* $KAME: in6_pcb.c,v 1.31 2001/05/21 05:45:10 jinmei Exp $ */ /* @@ -824,7 +824,7 @@ u_int32_t flowinfo; int errno, s; - if ((unsigned)cmd > PRC_NCMDS || dst->sa_family != AF_INET6) + if ((unsigned)cmd >= PRC_NCMDS || dst->sa_family != AF_INET6) return; sa6_dst = (struct sockaddr_in6 *)dst; ==== //depot/projects/uart/netipx/ipx_input.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/ipx_input.c,v 1.32 2003/06/11 05:25:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/ipx_input.c,v 1.33 2003/09/11 21:40:21 ru Exp $"); #include #include @@ -279,7 +279,7 @@ caddr_t arg = (/* XXX */ caddr_t)arg_as_sa; struct ipx_addr *ipx; - if (cmd < 0 || cmd > PRC_NCMDS) + if (cmd < 0 || cmd >= PRC_NCMDS) return; switch (cmd) { struct sockaddr_ipx *sipx; ==== //depot/projects/uart/netipx/spx_usrreq.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.38 2003/06/11 05:25:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.39 2003/09/11 21:40:21 ru Exp $"); #include #include @@ -638,7 +638,7 @@ struct ipx_addr *na; struct sockaddr_ipx *sipx; - if (cmd < 0 || cmd > PRC_NCMDS) + if (cmd < 0 || cmd >= PRC_NCMDS) return; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 12 18:33:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D07E16A4C1; Fri, 12 Sep 2003 18:33:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 011AA16A4BF for ; Fri, 12 Sep 2003 18:33:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 837C343FBD for ; Fri, 12 Sep 2003 18:33:01 -0700 (PDT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8D1X10U031169 for ; Fri, 12 Sep 2003 18:33:01 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8D1X1WT031166 for perforce@freebsd.org; Fri, 12 Sep 2003 18:33:01 -0700 (PDT) Date: Fri, 12 Sep 2003 18:33:01 -0700 (PDT) Message-Id: <200309130133.h8D1X1WT031166@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 37983 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Sep 2003 01:33:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=37983 Change 37983 by imp@imp_koguchi on 2003/09/12 18:32:18 tweak-o-matic Affected files ... .. //depot/projects/power/notes#2 edit Differences ... ==== //depot/projects/power/notes#2 (text+ko) ==== @@ -2,9 +2,10 @@ For example, being able to power down devices that aren't in use and power them on when they are needed. -The first stage will be to implement a simple 'power' command that can be -used by the user to power individual devices on and off. E.g., -'power off fdc0' or 'power off pci0:4:0'. +The first stage will be to implement a simple 'power' command that can +be used by the user to power individual devices on and off. E.g., +'power off fdc0' or 'power off pci0:4:0'. It is unclear how best to +describe the path to an unconnected device on a bus. Milestones: - support PCI devices by detaching driver and going into D3 for off and @@ -17,4 +18,4 @@ The second stage will be to make the powering off of devices more automated. This is still in early design stage. It may involve a powerd, it may -involve intelligence in the kernel.+involve intelligence in the kernel. From owner-p4-projects@FreeBSD.ORG Sat Sep 13 14:25:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED26F16A4C1; Sat, 13 Sep 2003 14:25:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF07716A4BF for ; Sat, 13 Sep 2003 14:25:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C09143FBF for ; Sat, 13 Sep 2003 14:25:16 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8DLPG0U066074 for ; Sat, 13 Sep 2003 14:25:16 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8DLPF4k066067 for perforce@freebsd.org; Sat, 13 Sep 2003 14:25:15 -0700 (PDT) Date: Sat, 13 Sep 2003 14:25:15 -0700 (PDT) Message-Id: <200309132125.h8DLPF4k066067@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 38011 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Sep 2003 21:25:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=38011 Change 38011 by marcel@marcel_nfs on 2003/09/13 14:24:21 IFC @38008 Affected files ... .. //depot/projects/ia64/bin/sh/mkbuiltins#4 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes-o.real#5 integrate .. //depot/projects/ia64/lib/libc/gen/devname.3#6 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac_get.3#6 integrate .. //depot/projects/ia64/lib/libc/sys/ntp_gettime.2#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#68 integrate .. //depot/projects/ia64/share/man/man4/mac_mls.4#13 integrate .. //depot/projects/ia64/share/man/man4/natm.4#7 integrate .. //depot/projects/ia64/share/man/man4/puc.4#4 integrate .. //depot/projects/ia64/share/man/man7/hier.7#22 integrate .. //depot/projects/ia64/share/man/man7/ports.7#9 integrate .. //depot/projects/ia64/share/man/man9/VOP_GETEXTATTR.9#10 integrate .. //depot/projects/ia64/share/man/man9/VOP_SETEXTATTR.9#8 integrate .. //depot/projects/ia64/sys/boot/forth/beastie.4th#4 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#17 integrate .. //depot/projects/ia64/sys/coda/coda_vfsops.c#11 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#14 integrate .. //depot/projects/ia64/sys/dev/acpica/acpiio.h#5 integrate .. //depot/projects/ia64/sys/dev/isp/isp.c#20 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#16 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#15 integrate .. //depot/projects/ia64/sys/dev/isp/isp_inline.h#9 integrate .. //depot/projects/ia64/sys/dev/isp/isp_target.c#9 integrate .. //depot/projects/ia64/sys/dev/isp/isp_target.h#6 integrate .. //depot/projects/ia64/sys/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/ia64/sys/dev/isp/ispvar.h#12 integrate .. //depot/projects/ia64/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/ia64/sys/kern/kern_xxx.c#6 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#59 integrate .. //depot/projects/ia64/sys/pc98/pc98/fd.c#22 integrate .. //depot/projects/ia64/sys/posix4/ksched.c#10 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#65 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpiconf/acpiconf.8#6 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpiconf/acpiconf.c#6 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#21 integrate Differences ... ==== //depot/projects/ia64/bin/sh/mkbuiltins#4 (text+ko) ==== @@ -35,11 +35,11 @@ # SUCH DAMAGE. # # @(#)mkbuiltins 8.2 (Berkeley) 5/4/95 -# $FreeBSD: src/bin/sh/mkbuiltins,v 1.11 2002/10/18 10:33:32 tjr Exp $ +# $FreeBSD: src/bin/sh/mkbuiltins,v 1.12 2003/09/13 06:59:22 schweikh Exp $ temp=`/usr/bin/mktemp -t ka` havejobs=0 -if grep '^#define JOBS[ ]*1' shell.h > /dev/null +if grep '^#define[ ]*JOBS[ ]*1' shell.h > /dev/null then havejobs=1 fi havehist=1 ==== //depot/projects/ia64/games/fortune/datfiles/fortunes-o.real#5 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.16 2003/03/19 18:14:47 eivind Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.17 2003/09/13 15:46:35 eivind Exp $ My Favorite Drugs [Sung to My Favorite Things] Reefers and roach clips and papers and rollers Cocaine and procaine for twenty year molars @@ -770,8 +770,8 @@ Haggis is a kind of stuff black pudding eaten by the Scots and considered by them to be not only a delicacy but fit for human consumption. The minced heart, liver and lungs of a sheep, calf or -other animal's inner organs are mixed with oatmeal, sealed and boiled -in maw in the sheep's intestinal stomach-bag and ... Excuse me a minute.... +other animal are mixed with oatmeal, sealed and boiled in maw in the sheep's +intestinal stomach-bag and ... Excuse me a minute.... % Hardly a pure science, history is closer to animal husbandry than it is to mathematics, in that it involves selective breeding. The principal @@ -1350,9 +1350,6 @@ do with the other. -- Jules Feiffer % -Republicans consume three-fourths of the rutabaga produced in this -country. The remainder is thrown out. -% Republicans raise dahlias, Dalmatians and eyebrows. Democrats raise Airedales, kids and taxes. @@ -1663,7 +1660,7 @@ the Catholic Church, and the National Rifle Association % -Sure eating yogurt will improve your sex life. People know that if +Sure eating yoghurt will improve your sex life. People know that if you'll eat that stuff, you'll eat anything. % Sure, Reagan has promised to take senility tests. But what if he ==== //depot/projects/ia64/lib/libc/gen/devname.3#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)devname.3 8.2 (Berkeley) 4/29/95 -.\" $FreeBSD: src/lib/libc/gen/devname.3,v 1.16 2003/06/20 09:52:27 phk Exp $ +.\" $FreeBSD: src/lib/libc/gen/devname.3,v 1.17 2003/09/12 21:54:10 ru Exp $ .\" .Dd July 18, 1999 .Dt DEVNAME 3 @@ -79,7 +79,7 @@ .Fn devname_r takes a buffer and length as argument to avoid this problem. .Sh SEE ALSO -.Xr stat 2 , +.Xr stat 2 .Sh HISTORY The .Fn devname ==== //depot/projects/ia64/lib/libc/posix1e/mac_get.3#6 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac_get.3,v 1.6 2003/08/22 18:01:03 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac_get.3,v 1.7 2003/09/12 21:54:10 ru Exp $ .\" .Dd December 21, 2001 .Dt MAC_GET 3 @@ -110,9 +110,9 @@ .Sh SEE ALSO .Xr mac 3 , .Xr mac_free 3 , -.Xr mac_text 3 , .Xr mac_prepare 3 , .Xr mac_set 3 , +.Xr mac_text 3 , .Xr mac 4 , .Xr mac 9 .Sh STANDARDS ==== //depot/projects/ia64/lib/libc/sys/ntp_gettime.2#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/ntp_gettime.2,v 1.2 2003/06/21 20:27:54 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/ntp_gettime.2,v 1.3 2003/09/12 21:54:10 ru Exp $ .\" .Dd June 21, 2003 .Dt NTP_GETTIME 2 @@ -105,10 +105,12 @@ .El .Sh SEE ALSO .Xr ntp_adjtime 2 , -.Xr ntpd 8 , -.Dq Li http://www.bipm.fr/enus/5_Scientific/c_time/time_1.html , -.Dq Li http://www.boulder.nist.gov/timefreq/general/faq.htm , -.Dq Li ftp://time.nist.gov/pub/leap-seconds.list +.Xr ntpd 8 +.Bl -tag -width indent +.It Pa http://www.bipm.fr/enus/5_Scientific/c_time/time_1.html +.It Pa http://www.boulder.nist.gov/timefreq/general/faq.htm +.It Pa ftp://time.nist.gov/pub/leap-seconds.list +.El .Sh AUTHORS This manual page was written by .An Tom Rhodes Aq trhodes@FreeBSD.org . ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#68 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.181 2003/09/11 16:03:46 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.182 2003/09/13 12:51:12 nyan Exp $ Supported Devices @@ -1586,7 +1586,7 @@ Broadcom BCM4401 based Fast Ethernet adapters (&man.bfe.4; driver) - RealTek RTL8139C+, RTL8169, RTL8169S and + RealTek RTL8139C+, RTL8169, RTL8169S and RTL8110S based PCI Fast Ethernet and Gigabit Ethernet controllers (&man.re.4; driver) ==== //depot/projects/ia64/share/man/man4/mac_mls.4#13 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_mls.4,v 1.15 2003/06/01 21:52:59 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mac_mls.4,v 1.16 2003/09/12 21:54:10 ru Exp $ .\" .Dd December 1, 2002 .Os @@ -217,7 +217,7 @@ .Xr mac_partition 4 , .Xr mac_portacl 4 , .Xr mac_seeotheruids 4 , -.Xr mac_test 4 +.Xr mac_test 4 , .Xr maclabel 7 , .Xr mac 9 .Sh HISTORY ==== //depot/projects/ia64/share/man/man4/natm.4#7 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man4/natm.4,v 1.15 2003/07/15 12:07:45 harti Exp $ +.\" $FreeBSD: src/share/man/man4/natm.4,v 1.16 2003/09/12 21:54:10 ru Exp $ .\" .Dd December 29, 1997 .Dt NATM 4 @@ -92,8 +92,8 @@ .Xr en 4 , .Xr fatm 4 , .Xr hatm 4 , -.Xr patm 4 , -.Xr natmip 4 +.Xr natmip 4 , +.Xr patm 4 .Sh AUTHORS .An Chuck Cranor of Washington University implemented the NATM protocol layer ==== //depot/projects/ia64/share/man/man4/puc.4#4 (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/man4/puc.4,v 1.3 2003/08/01 02:25:31 ambrisko Exp $ +.\" $FreeBSD: src/share/man/man4/puc.4,v 1.4 2003/09/12 21:54:11 ru Exp $ .\" .Dd February 7, 2002 .Dt PUC 4 @@ -59,8 +59,8 @@ errors. It cannot be used if the interrupt is shared. .Sh SEE ALSO +.Xr ppc 4 , .Xr sio 4 -.Xr ppc 4 .Sh HISTORY This driver took the idea from the .Nx ==== //depot/projects/ia64/share/man/man7/hier.7#22 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.86 2003/08/08 11:15:57 simon Exp $ +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.87 2003/09/13 16:23:49 eivind Exp $ .\" .Dd June 5, 1993 .Dt HIER 7 @@ -683,9 +683,10 @@ .It Pa db/ misc. automatically generated system-specific database files .It Pa empty/ -empty directory used by +empty directory for use by programs that need a specifically empty directory. +Used for instance by .Xr sshd 8 -for privilege separation +for privilege separation. .It Pa games/ misc. game status and score files .It Pa heimdal/ ==== //depot/projects/ia64/share/man/man7/ports.7#9 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/ports.7,v 1.37 2003/06/23 20:01:58 ru Exp $ +.\" $FreeBSD: src/share/man/man7/ports.7,v 1.38 2003/09/13 16:16:31 eivind Exp $ .\" .Dd January 25, 1998 .Dt PORTS 7 @@ -360,9 +360,6 @@ .An -nosplit This man page was originated by .An David O'Brien . -The ports collection is maintained by -.An Satoshi Asami -and the Awesome Ports Team. .Sh HISTORY The Ports Collection appeared in ==== //depot/projects/ia64/share/man/man9/VOP_GETEXTATTR.9#10 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_GETEXTATTR.9,v 1.19 2003/06/05 14:20:48 rwatson Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_GETEXTATTR.9,v 1.20 2003/09/12 21:54:11 ru Exp $ .\" .Dd December 23, 1999 .Os @@ -123,7 +123,7 @@ .Sh SEE ALSO .Xr extattr 9 , .Xr vnode 9 , -.Xr VOP_LISTEXTATTR 9 +.Xr VOP_LISTEXTATTR 9 , .Xr VOP_SETEXTATTR 9 .Sh BUGS By passing in the empty string as the attribute name, some file systems ==== //depot/projects/ia64/share/man/man9/VOP_SETEXTATTR.9#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_SETEXTATTR.9,v 1.17 2003/06/08 13:27:57 charnier Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_SETEXTATTR.9,v 1.18 2003/09/12 21:54:11 ru Exp $ .\" .Dd December 23, 1999 .Os @@ -112,7 +112,7 @@ .Sh SEE ALSO .Xr extattr 9 , .Xr vnode 9 , -.Xr VOP_GETEXTATTR 9 +.Xr VOP_GETEXTATTR 9 , .Xr VOP_LISTEXTATTR 9 .Sh AUTHORS This man page was written by ==== //depot/projects/ia64/sys/boot/forth/beastie.4th#4 (text+ko) ==== @@ -1,4 +1,5 @@ \ Copyright (c) 2003 Scott Long +\ Copyright (c) 2003 Aleksander Fafula \ All rights reserved. \ \ Redistribution and use in source and binary forms, with or without @@ -22,7 +23,7 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.4 2003/06/10 22:04:09 scottl Exp $ +\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.5 2003/09/13 18:35:01 scottl Exp $ marker task-beastie.4th @@ -48,7 +49,29 @@ 46 constant dot \ The BSD Daemon. He is 19 rows high and 34 columns wide -: print-beastie ( x y -- ) +: technicolor-beastie ( x y -- ) +2dup at-xy ." , ," 1+ +2dup at-xy ." /( )`" 1+ +2dup at-xy ." \ \___ / |" 1+ +2dup at-xy ." /- _ `-/ '" 1+ +2dup at-xy ." (/\/ \ \ /\" 1+ +2dup at-xy ." / / | ` \" 1+ +2dup at-xy ." O O ) / |" 1+ +2dup at-xy ." `-^--'`< '" 1+ +2dup at-xy ." (_.) _ ) /" 1+ +2dup at-xy ." `.___/` / " 1+ +2dup at-xy ." `-----' /" 1+ +2dup at-xy ." <----. __ / __ \" 1+ +2dup at-xy ." <----|====O)))==) \) /====|" 1+ +2dup at-xy ." <----' `--' `.__,' \" 1+ +2dup at-xy ." | |" 1+ +2dup at-xy ." \ / /\" 1+ +2dup at-xy ." ______( (_ / \______/" 1+ +2dup at-xy ." ,' ,-----' |" 1+ +at-xy ." `--{__________) " 1+ +; + +: boring-beastie ( x y -- ) 2dup at-xy ." , ," 1+ 2dup at-xy ." /( )`" 1+ 2dup at-xy ." \ \___ / |" 1+ @@ -70,6 +93,20 @@ at-xy ." `--{__________)" ; +: print-beastie ( x y -- ) + s" loader_color" getenv + dup -1 = if + drop + boring-beastie + exit + then + s" YES" compare-insensitive 0<> if + boring-beastie + exit + then + technicolor-beastie +; + : acpienabled? ( -- flag ) s" acpi_load" getenv dup -1 = if ==== //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.96 2003/06/10 18:14:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.97 2003/09/13 02:01:56 mjacob Exp $"); #include #include @@ -2765,8 +2765,10 @@ /* set the speed to the current value */ mode_hdr->dev_spec = current_speed; - /* set single-initiator buffering mode */ - mode_hdr->dev_spec |= SMH_SA_BUF_MODE_SIBUF; + /* if set, set single-initiator buffering mode */ + if (softc->buffer_mode == SMH_SA_BUF_MODE_SIBUF) { + mode_hdr->dev_spec |= SMH_SA_BUF_MODE_SIBUF; + } if (mode_blk) mode_hdr->blk_desc_len = sizeof(struct scsi_mode_blk_desc); ==== //depot/projects/ia64/sys/coda/coda_vfsops.c#11 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.46 2003/09/07 07:43:09 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.47 2003/09/13 01:13:56 tjr Exp $"); #include @@ -253,7 +253,9 @@ ASSERT_VOP_LOCKED(mi->mi_rootvp, "coda_unmount"); mi->mi_rootvp->v_vflag &= ~VV_ROOT; error = vflush(mi->mi_vfsp, 0, FORCECLOSE); +#ifdef CODA_VERBOSE printf("coda_unmount: active = %d, vflush active %d\n", active, error); +#endif error = 0; /* I'm going to take this out to allow lookups to go through. I'm * not sure it's important anyway. -- DCS 2/2/94 ==== //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.23 2003/09/11 03:17:33 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.24 2003/09/13 20:13:01 njl Exp $ */ #include "opt_acpi.h" @@ -264,7 +264,7 @@ goto end; } - PKG_GETINT(res, tmp, 0, sc->bif.unit, end); + PKG_GETINT(res, tmp, 0, sc->bif.units, end); PKG_GETINT(res, tmp, 1, sc->bif.dcap, end); PKG_GETINT(res, tmp, 2, sc->bif.lfcap, end); PKG_GETINT(res, tmp, 3, sc->bif.btech, end); @@ -404,7 +404,7 @@ case ACPIIO_CMBAT_GET_BIF: acpi_cmbat_get_bif(dev); bifp = &ioctl_arg->bif; - bifp->unit = sc->bif.unit; + bifp->units = sc->bif.units; bifp->dcap = sc->bif.dcap; bifp->lfcap = sc->bif.lfcap; bifp->btech = sc->bif.btech; ==== //depot/projects/ia64/sys/dev/acpica/acpiio.h#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/sys/dev/acpica/acpiio.h,v 1.8 2003/08/28 16:06:30 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.9 2003/09/13 20:13:01 njl Exp $ */ /* @@ -50,10 +50,10 @@ #define ACPI_CMBAT_MAXSTRLEN 32 struct acpi_bif { - u_int32_t unit; /* 0 for mWh, 1 for mAh */ + u_int32_t units; /* 0 for mWh, 1 for mAh */ u_int32_t dcap; /* Design Capacity */ u_int32_t lfcap; /* Last Full capacity */ - u_int32_t btech; /* Battery Technorogy */ + u_int32_t btech; /* Battery Technology */ u_int32_t dvol; /* Design voltage (mV) */ u_int32_t wcap; /* WARN capacity */ u_int32_t lcap; /* Low capacity */ ==== //depot/projects/ia64/sys/dev/isp/isp.c#20 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.107 2003/08/25 17:58:23 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.108 2003/09/13 01:55:44 mjacob Exp $ */ /* * Machine and OS Independent (well, as best as possible) * code for the Qlogic ISP SCSI adapters. @@ -1249,6 +1249,17 @@ icbp->icb_retry_delay = fcp->isp_retry_delay; icbp->icb_retry_count = fcp->isp_retry_count; icbp->icb_hardaddr = loopid; + if (icbp->icb_hardaddr >= 125) { + /* + * We end up with a Loop ID of 255 for F-Port topologies + */ + if (icbp->icb_hardaddr != 255) { + isp_prt(isp, ISP_LOGERR, + "bad hard address %u- resetting to zero", + icbp->icb_hardaddr); + } + icbp->icb_hardaddr = 0; + } /* * Right now we just set extended options to prefer point-to-point * over loop based upon some soft config options. @@ -1371,7 +1382,13 @@ icbp->icb_fwoptions &= ~(ICBOPT_BOTH_WWNS|ICBOPT_FULL_LOGIN); } icbp->icb_rqstqlen = RQUEST_QUEUE_LEN(isp); + if (icbp->icb_rqstqlen < 1) { + isp_prt(isp, ISP_LOGERR, "bad request queue length"); + } icbp->icb_rsltqlen = RESULT_QUEUE_LEN(isp); + if (icbp->icb_rsltqlen < 1) { + isp_prt(isp, ISP_LOGERR, "bad result queue length"); + } icbp->icb_rqstaddr[RQRSP_ADDR0015] = DMA_WD0(isp->isp_rquest_dma); icbp->icb_rqstaddr[RQRSP_ADDR1631] = DMA_WD1(isp->isp_rquest_dma); icbp->icb_rqstaddr[RQRSP_ADDR3247] = DMA_WD2(isp->isp_rquest_dma); @@ -3859,7 +3876,7 @@ } /* - * Free any dma resources. As a side effect, this may + * Free any DMA resources. As a side effect, this may * also do any cache flushing necessary for data coherence. */ if (XS_XFRLEN(xs)) { ISP_DMAFREE(isp, xs, sp->req_handle); ==== //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#16 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.91 2003/08/24 17:49:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.92 2003/09/13 01:56:24 mjacob Exp $"); #include #include @@ -399,8 +399,10 @@ hba->fc_scsi_supported = 1; hba->fc_topology = FCPARAM(isp)->isp_topo + 1; hba->fc_loopid = FCPARAM(isp)->isp_loopid; - hba->active_node_wwn = FCPARAM(isp)->isp_nodewwn; - hba->active_port_wwn = FCPARAM(isp)->isp_portwwn; + hba->nvram_node_wwn = FCPARAM(isp)->isp_nodewwn; + hba->nvram_port_wwn = FCPARAM(isp)->isp_portwwn; + hba->active_node_wwn = ISP_NODEWWN(isp); + hba->active_port_wwn = ISP_PORTWWN(isp); ISP_UNLOCK(isp); retval = 0; break; ==== //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.71 2002/09/23 05:00:14 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.72 2003/09/13 01:56:45 mjacob Exp $ */ /* * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob @@ -76,8 +76,7 @@ #endif #define HANDLE_LOOPSTATE_IN_OUTER_LAYERS 1 -/* turn this off for now */ -/* #define ISP_SMPLOCK 1 */ +#define ISP_SMPLOCK 1 #ifdef ISP_SMPLOCK #define ISP_IFLAGS INTR_TYPE_CAM | INTR_ENTROPY | INTR_MPSAFE ==== //depot/projects/ia64/sys/dev/isp/isp_inline.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_inline.h,v 1.28 2002/09/23 05:00:37 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_inline.h,v 1.29 2003/09/13 01:57:31 mjacob Exp $ */ /* * Qlogic Host Adapter Inline Functions * @@ -975,7 +975,7 @@ ISP_IOXPUT_16(isp, atsrc->at_rxid, &atdst->at_rxid); ISP_IOXPUT_16(isp, atsrc->at_flags, &atdst->at_flags); ISP_IOXPUT_16(isp, atsrc->at_status, &atdst->at_status); - ISP_IOXPUT_8(isp, atsrc->at_reserved1, &atdst->at_reserved1); + ISP_IOXPUT_8(isp, atsrc->at_crn, &atdst->at_crn); ISP_IOXPUT_8(isp, atsrc->at_taskcodes, &atdst->at_taskcodes); ISP_IOXPUT_8(isp, atsrc->at_taskflags, &atdst->at_taskflags); ISP_IOXPUT_8(isp, atsrc->at_execodes, &atdst->at_execodes); @@ -1005,7 +1005,7 @@ ISP_IOXGET_16(isp, &atsrc->at_rxid, atdst->at_rxid); ISP_IOXGET_16(isp, &atsrc->at_flags, atdst->at_flags); ISP_IOXGET_16(isp, &atsrc->at_status, atdst->at_status); - ISP_IOXGET_8(isp, &atsrc->at_reserved1, atdst->at_reserved1); + ISP_IOXGET_8(isp, &atsrc->at_crn, atdst->at_crn); ISP_IOXGET_8(isp, &atsrc->at_taskcodes, atdst->at_taskcodes); ISP_IOXGET_8(isp, &atsrc->at_taskflags, atdst->at_taskflags); ISP_IOXGET_8(isp, &atsrc->at_execodes, atdst->at_execodes); @@ -1193,7 +1193,6 @@ static INLINE void isp_get_ctio2(struct ispsoftc *isp, ct2_entry_t *ctsrc, ct2_entry_t *ctdst) { - int i; isp_copy_in_hdr(isp, &ctsrc->ct_header, &ctdst->ct_header); ISP_IOXGET_16(isp, &ctsrc->ct_reserved, ctdst->ct_reserved); ISP_IOXGET_16(isp, &ctsrc->ct_fwhandle, ctdst->ct_fwhandle); @@ -1206,16 +1205,6 @@ ISP_IOXGET_16(isp, &ctsrc->ct_seg_count, ctdst->ct_seg_count); ISP_IOXGET_32(isp, &ctsrc->ct_reloff, ctdst->ct_reloff); ISP_IOXGET_32(isp, &ctsrc->ct_resid, ctdst->ct_resid); - for (i = 0; i < 4; i++) { - ISP_IOXGET_32(isp, &ctsrc->rsp.fw._reserved[i], - ctdst->rsp.fw._reserved[i]); - } - ISP_IOXGET_16(isp, &ctsrc->rsp.fw.ct_scsi_status, - ctdst->rsp.fw.ct_scsi_status); - for (i = 0; i < QLTM_SENSELEN; i++) { - ISP_IOXGET_8(isp, &ctsrc->rsp.fw.ct_sense[i], - ctdst->rsp.fw.ct_sense[i]); - } } static INLINE void ==== //depot/projects/ia64/sys/dev/isp/isp_target.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_target.c,v 1.26 2003/05/31 19:49:49 phk Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_target.c,v 1.27 2003/09/13 01:58:26 mjacob Exp $ */ /* * Machine and OS Independent Target Mode Code for the Qlogic SCSI/FC adapters. * @@ -363,7 +363,7 @@ return (-1); } - ISP_TDQE(isp, "isp_target_put_entry", (int) optr, ap);; + ISP_TDQE(isp, "isp_target_put_entry", (int) optr, ap); ISP_ADD_REQUEST(isp, nxti); return (0); } @@ -539,6 +539,11 @@ msg.nt_msg[0] = MSG_BUS_DEV_RESET; (void) isp_async(isp, ISPASYNC_TARGET_MESSAGE, &msg); break; + case ASYNC_CTIO_DONE: + evt.ev_bus = bus; + evt.ev_event = event; + (void) isp_async(isp, ISPASYNC_TARGET_EVENT, &evt); + return (0); default: isp_prt(isp, ISP_LOGERR, "isp_target_async: unknown event 0x%x", event); @@ -611,14 +616,18 @@ msg.nt_tagval = inp->in_seqid; msg.nt_lun = lun; - if (inp->in_task_flags & TASK_FLAGS_ABORT_TASK) { - isp_prt(isp, ISP_LOGINFO, f1, "ABORT TASK", + if (inp->in_task_flags & TASK_FLAGS_ABORT_TASK_SET) { + isp_prt(isp, ISP_LOGINFO, f1, "ABORT TASK SET", inp->in_iid, lun, inp->in_seqid); - msg.nt_msg[0] = MSG_ABORT_TAG; + msg.nt_msg[0] = MSG_ABORT; } else if (inp->in_task_flags & TASK_FLAGS_CLEAR_TASK_SET) { isp_prt(isp, ISP_LOGINFO, f1, "CLEAR TASK SET", inp->in_iid, lun, inp->in_seqid); msg.nt_msg[0] = MSG_CLEAR_QUEUE; + } else if (inp->in_task_flags & TASK_FLAGS_LUN_RESET) { + isp_prt(isp, ISP_LOGINFO, f1, "LUN RESET", + inp->in_iid, lun, inp->in_seqid); + msg.nt_msg[0] = MSG_LUN_RESET; } else if (inp->in_task_flags & TASK_FLAGS_TARGET_RESET) { isp_prt(isp, ISP_LOGINFO, f1, "TARGET RESET", inp->in_iid, lun, inp->in_seqid); @@ -626,12 +635,7 @@ } else if (inp->in_task_flags & TASK_FLAGS_CLEAR_ACA) { isp_prt(isp, ISP_LOGINFO, f1, "CLEAR ACA", inp->in_iid, lun, inp->in_seqid); - /* ???? */ msg.nt_msg[0] = MSG_REL_RECOVERY; - } else if (inp->in_task_flags & TASK_FLAGS_TERMINATE_TASK) { - isp_prt(isp, ISP_LOGINFO, f1, "TERMINATE TASK", - inp->in_iid, lun, inp->in_seqid); - msg.nt_msg[0] = MSG_TERM_IO_PROC; } else { isp_prt(isp, ISP_LOGWARN, f2, "task flag", inp->in_status, lun, inp->in_iid, @@ -1091,7 +1095,7 @@ /* * CTIO rejected by the firmware - invalid data direction. */ - isp_prt(isp, ISP_LOGERR, "CTIO2 had wrong data directiond"); + isp_prt(isp, ISP_LOGERR, "CTIO2 had wrong data direction"); break; case CT_RSELTMO: ==== //depot/projects/ia64/sys/dev/isp/isp_target.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_target.h,v 1.20 2002/06/16 04:54:46 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_target.h,v 1.21 2003/09/13 01:58:26 mjacob Exp $ */ /* * Qlogic Target Mode Structure and Flag Definitions * @@ -36,11 +36,8 @@ #ifndef _ISP_TARGET_H #define _ISP_TARGET_H -/* - * Defines for all entry types - */ +#define QLTM_SENSELEN 18 /* non-FC cards only */ #define QLTM_SVALID 0x80 -#define QLTM_SENSELEN 18 /* * Structure for Enable Lun and Modify Lun queue entries @@ -141,28 +138,33 @@ /* * Values for the in_task_flags field- should only get one at a time! */ -#define TASK_FLAGS_ABORT_TASK (1<<9) +#define TASK_FLAGS_CLEAR_ACA (1<<14) +#define TASK_FLAGS_TARGET_RESET (1<<13) +#define TASK_FLAGS_LUN_RESET (1<<12) #define TASK_FLAGS_CLEAR_TASK_SET (1<<10) -#define TASK_FLAGS_TARGET_RESET (1<<13) -#define TASK_FLAGS_CLEAR_ACA (1<<14) -#define TASK_FLAGS_TERMINATE_TASK (1<<15) +#define TASK_FLAGS_ABORT_TASK_SET (1<<9) +#ifndef MSG_ABORT +#define MSG_ABORT 0x06 +#endif +#ifndef MSG_BUS_DEV_RESET +#define MSG_BUS_DEV_RESET 0x0c +#endif #ifndef MSG_ABORT_TAG -#define MSG_ABORT_TAG 0x06 +#define MSG_ABORT_TAG 0x0d #endif #ifndef MSG_CLEAR_QUEUE #define MSG_CLEAR_QUEUE 0x0e #endif -#ifndef MSG_BUS_DEV_RESET -#define MSG_BUS_DEV_RESET 0x0b -#endif #ifndef MSG_REL_RECOVERY #define MSG_REL_RECOVERY 0x10 #endif #ifndef MSG_TERM_IO_PROC #define MSG_TERM_IO_PROC 0x11 #endif - +#ifndef MSG_LUN_RESET +#define MSG_LUN_RESET 0x17 +#endif /* * Notify Acknowledge Entry structure @@ -274,7 +276,7 @@ u_int16_t at_rxid; /* response ID */ u_int16_t at_flags; u_int16_t at_status; /* firmware status */ - u_int8_t at_reserved1; + u_int8_t at_crn; /* command reference number */ u_int8_t at_taskcodes; u_int8_t at_taskflags; u_int8_t at_execodes; @@ -296,6 +298,9 @@ #define ATIO2_TC_ATTR_ACAQ 4 #define ATIO2_TC_ATTR_UNTAGGED 5 +#define ATIO2_EX_WRITE 0x1 +#define ATIO2_EX_READ 0x2 + /* * Continue Target I/O Entry structure * Request from driver. The response from the @@ -461,14 +466,6 @@ u_int32_t ct_datalen; ispds_t ct_fcp_rsp_iudata; } m2; - /* - * CTIO2 returned from F/W... - */ - struct { - u_int32_t _reserved[4]; - u_int16_t ct_scsi_status; - u_int8_t ct_sense[QLTM_SENSELEN]; - } fw; } rsp; } ct2_entry_t; @@ -485,6 +482,7 @@ #define CT2_DATAMASK CT_DATAMASK #define CT2_CCINCR 0x0100 #define CT2_FASTPOST 0x0200 +#define CT2_TERMINATE 0x4000 #define CT2_SENDSTATUS 0x8000 /* ==== //depot/projects/ia64/sys/dev/isp/isp_tpublic.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_tpublic.h,v 1.8 2002/12/30 21:18:07 schweikh Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_tpublic.h,v 1.9 2003/09/13 01:58:51 mjacob Exp $ */ /* * Qlogic ISP Host Adapter Public Target Interface Structures && Routines *--------------------------------------- @@ -46,16 +46,16 @@ u_int64_t nt_iid; /* inititator id */ u_int64_t nt_tgt; /* target id */ u_int64_t nt_lun; /* logical unit */ + u_int32_t nt_tagval; /* tag value */ u_int8_t nt_bus; /* bus */ u_int8_t nt_tagtype; /* tag type */ - u_int16_t nt_tagval; /* tag value */ u_int8_t nt_msg[IN_MSGLEN]; /* message content */ } tmd_msg_t; typedef struct { void * ev_hba; /* HBA tag */ - u_int16_t ev_bus; /* bus */ - u_int16_t ev_event; /* type of async event */ + u_int32_t ev_bus; /* bus */ + u_int32_t ev_event; /* type of async event */ } tmd_event_t; /* @@ -177,68 +177,89 @@ * The tag cd_error is to communicate between the MD layer and outer software * the current error conditions. * - * The tag cd_reserved pads out the structure to 128 bytes. The first - * half of the pad area is reserved to the MD layer, and the second half - * may be used by outer layers, for scratch purposes. + * The tag cd_lreserved, cd_hreserved are scratch areas for use for the MD + * and outer layers respectively. + * */ -#ifndef _LP64 -#if defined(__alpha__) || defined(__sparcv9cpu) || defined(__sparc_v9__) ||\ - defined(__ia64__) -#define _LP64 +#ifndef TMD_CDBLEN +#define TMD_CDBLEN 16 +#endif +#ifndef TMD_SENSELEN +#define TMD_SENSELEN 24 #endif +#ifndef QCDS +#define QCDS 8 #endif -#ifndef _TMD_PAD_LEN -#ifdef _LP64 -#define _TMD_PAD_LEN 12 -#else -#define _TMD_PAD_LEN 24 -#endif -#endif -#ifndef ATIO_CDBLEN -#define ATIO_CDBLEN 26 -#endif -#ifndef QLTM_SENSELEN -#define QLTM_SENSELEN 18 -#endif typedef struct tmd_cmd { - void * cd_private; /* layer private data */ + void * cd_private; /* private data pointer */ void * cd_hba; /* HBA tag */ void * cd_data; /* 'pointer' to data */ u_int64_t cd_iid; /* initiator ID */ u_int64_t cd_tgt; /* target id */ u_int64_t cd_lun; /* logical unit */ - u_int8_t cd_bus; /* bus */ - u_int8_t cd_tagtype; /* tag type */ u_int32_t cd_tagval; /* tag value */ - u_int8_t cd_cdb[ATIO_CDBLEN]; /* Command */ - u_int8_t cd_lflags; /* flags lower level sets */ - u_int8_t cd_hflags; /* flags higher level sets */ + u_int32_t cd_lflags; /* flags lower level sets */ + u_int32_t cd_hflags; /* flags higher level sets */ u_int32_t cd_totlen; /* total data requirement */ u_int32_t cd_resid; /* total data residual */ u_int32_t cd_xfrlen; /* current data requirement */ int32_t cd_error; /* current error */ - u_int8_t cd_sense[QLTM_SENSELEN]; - u_int16_t cd_scsi_status; /* closing SCSI status */ - u_int8_t cd_reserved[_TMD_PAD_LEN]; + u_int32_t + cd_scsi_status : 16, /* closing SCSI status */ + : 7, + cd_chan : 1, /* channel on card */ + : 2, + cd_tagtype : 6; /* tag type */ + u_int8_t cd_senselen; + u_int8_t cd_cdblen; + u_int8_t cd_sense[TMD_SENSELEN]; + u_int8_t cd_cdb[TMD_CDBLEN]; /* Command */ + union { + void * ptrs[QCDS / sizeof (void *)]; + u_int64_t llongs[QCDS / sizeof (u_int64_t)]; + u_int32_t longs[QCDS / sizeof (u_int32_t)]; + u_int16_t shorts[QCDS / sizeof (u_int16_t)]; + u_int8_t bytes[QCDS]; + } cd_lreserved[2], cd_hreserved[2]; } tmd_cmd_t; -#define CDFL_SNSVALID 0x01 /* sense data (from f/w) valid */ -#define CDFL_NODISC 0x02 /* disconnects disabled */ -#define CDFL_SENTSENSE 0x04 /* last action sent sense data */ -#define CDFL_SENTSTATUS 0x08 /* last action sent status */ +#ifndef TMD_SIZE +#define TMD_SIZE (sizeof (tmd_cmd_t)) +#endif + +/* + * Note that NODISC (obviously) doesn't apply to non-SPI transport. + * + * Note that knowing the data direction and lengh at the time of receipt of + * a command from the initiator is a feature only of Fibre Channel. + * + * The CDFL_BIDIR is in anticipation of the adoption of some newer + * features required by OSD. + * + * The principle selector for MD layer to know whether data is to + * be transferred in any QOUT_TMD_CONT call is cd_xfrlen- the + * flags CDFH_DATA_IN and CDFH_DATA_OUT define which direction. + */ +#define CDFL_SNSVALID 0x01 /* sense data (from f/w) good */ +#define CDFL_SENTSTATUS 0x02 /* last action sent status */ +#define CDFL_DATA_IN 0x04 /* target (us) -> initiator (them) */ +#define CDFL_DATA_OUT 0x08 /* initiator (them) -> target (us) */ +#define CDFL_BIDIR 0x0C /* bidirectional data */ #define CDFL_ERROR 0x10 /* last action ended in error */ -#define CDFL_BUSY 0x40 /* this command is not on a free list */ -#define CDFL_PRIVATE_0 0x80 /* private layer flags */ +#define CDFL_NODISC 0x20 /* disconnects disabled */ +#define CDFL_SENTSENSE 0x40 /* last action sent sense data */ +#define CDFL_BUSY 0x80 /* this command is not on a free list */ +#define CDFL_PRIVATE 0xFF000000 /* private layer flags */ -#define CDFH_SNSVALID 0x01 /* sense data valid */ +#define CDFH_SNSVALID 0x01 /* sense data (from outer layer) good */ #define CDFH_STSVALID 0x02 /* status valid */ -#define CDFH_NODATA 0x00 /* no data transfer expected */ #define CDFH_DATA_IN 0x04 /* target (us) -> initiator (them) */ #define CDFH_DATA_OUT 0x08 /* initiator (them) -> target (us) */ #define CDFH_DATA_MASK 0x0C /* mask to cover data direction */ -#define CDFH_PRIVATE_0 0x80 /* private layer flags */ +#define CDFH_PRIVATE 0xFF000000 /* private layer flags */ + /* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 13 14:34:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B5BA16A4C2; Sat, 13 Sep 2003 14:34:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3FCC916A4BF for ; Sat, 13 Sep 2003 14:34:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04BFB43FEA for ; Sat, 13 Sep 2003 14:34:28 -0700 (PDT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8DLYR0U067169 for ; Sat, 13 Sep 2003 14:34:27 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8DLYRM3067166 for perforce@freebsd.org; Sat, 13 Sep 2003 14:34:27 -0700 (PDT) Date: Sat, 13 Sep 2003 14:34:27 -0700 (PDT) Message-Id: <200309132134.h8DLYRM3067166@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 38012 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Sep 2003 21:34:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=38012 Change 38012 by imp@imp_koguchi on 2003/09/13 14:34:06 Integrate these from newcard. This is the basis for much of power management stuff that I've added to the pci bus. Extra files integrated because I'm too lame to revert them. Affected files ... .. //depot/projects/power/sys/dev/pci/eisa_pci.c#2 integrate .. //depot/projects/power/sys/dev/pci/fixup_pci.c#2 integrate .. //depot/projects/power/sys/dev/pci/ignore_pci.c#2 integrate .. //depot/projects/power/sys/dev/pci/isa_pci.c#2 integrate .. //depot/projects/power/sys/dev/pci/pci.c#2 integrate .. //depot/projects/power/sys/dev/pci/pci_if.m#2 integrate .. //depot/projects/power/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/power/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/power/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/power/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/power/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/power/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/power/sys/dev/pci/pcivar.h#2 integrate Differences ... ==== //depot/projects/power/sys/dev/pci/eisa_pci.c#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/pci/fixup_pci.c#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/pci/ignore_pci.c#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/pci/isa_pci.c#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/pci/pci.c#2 (text+ko) ==== @@ -68,35 +68,39 @@ static int pci_porten(device_t pcib, int b, int s, int f); static int pci_memen(device_t pcib, int b, int s, int f); -static int pci_add_map(device_t pcib, int b, int s, int f, int reg, - struct resource_list *rl); +static int pci_add_map(device_t pcib, int b, int s, int f, + int reg, struct resource_list *rl); static void pci_add_resources(device_t pcib, device_t bus, - device_t dev); + device_t dev); static int pci_probe(device_t dev); static int pci_attach(device_t dev); +static int pci_suspend(device_t dev); +static int pci_resume(device_t dev); static void pci_load_vendor_data(void); static int pci_describe_parse_line(char **ptr, int *vendor, - int *device, char **desc); + int *device, char **desc); static char *pci_describe_device(device_t dev); static int pci_modevent(module_t mod, int what, void *arg); static void pci_hdrtypedata(device_t pcib, int b, int s, int f, - pcicfgregs *cfg); + pcicfgregs *cfg); static void pci_read_extcap(device_t pcib, pcicfgregs *cfg); +static void pci_cfg_restore(device_t, struct pci_devinfo *); +static void pci_cfg_save(device_t, struct pci_devinfo *, int); static device_method_t pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, pci_probe), DEVMETHOD(device_attach, pci_attach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), + DEVMETHOD(device_suspend, pci_suspend), + DEVMETHOD(device_resume, pci_resume), /* Bus interface */ DEVMETHOD(bus_print_child, pci_print_child), DEVMETHOD(bus_probe_nomatch, pci_probe_nomatch), DEVMETHOD(bus_read_ivar, pci_read_ivar), DEVMETHOD(bus_write_ivar, pci_write_ivar), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), + DEVMETHOD(bus_driver_added, pci_driver_added), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), @@ -716,20 +720,31 @@ map = PCIB_READ_CONFIG(pcib, b, s, f, reg, 4); - if (map == 0 || map == 0xffffffff) - return (1); /* skip invalid entry */ - PCIB_WRITE_CONFIG(pcib, b, s, f, reg, 0xffffffff, 4); testval = PCIB_READ_CONFIG(pcib, b, s, f, reg, 4); PCIB_WRITE_CONFIG(pcib, b, s, f, reg, map, 4); - base = pci_mapbase(map); if (pci_maptype(map) & PCI_MAPMEM) type = SYS_RES_MEMORY; else type = SYS_RES_IOPORT; ln2size = pci_mapsize(testval); ln2range = pci_maprange(testval); + base = pci_mapbase(map); + + /* + * For I/O registers, if bottom bit is set, and the next bit up + * isn't clear, we know we have a BAR that doesn't conform to the + * spec, so ignore it. Also, sanity check the size of the data + * areas to the type of memory involved. + */ + if ((testval & 0x1) == 0x1 && + (testval & 0x2) != 0) + return (1); + if ((type == SYS_RES_MEMORY && ln2size < 5) || + (type == SYS_RES_IOPORT && ln2size < 3)) + return (1); + if (ln2range == 64) { /* Read the other half of a 64bit map register */ base |= (uint64_t) PCIB_READ_CONFIG(pcib, b, s, f, reg + 4, 4) << 32; @@ -771,6 +786,12 @@ if (type == SYS_RES_MEMORY && !pci_memen(pcib, b, s, f)) return (1); } + /* + * If base is 0, then we have problems. It is best to ignore + * such entires for the moment. XXX + */ + if (base == 0) + return 1; resource_list_add(rl, type, reg, base, base + (1 << ln2size) - 1, (1 << ln2size)); @@ -857,6 +878,7 @@ pcib = device_get_parent(bus); dinfo->cfg.dev = device_add_child(bus, NULL, -1); device_set_ivars(dinfo->cfg.dev, dinfo); + pci_cfg_restore(dinfo->cfg.dev, dinfo); pci_add_resources(pcib, bus, dinfo->cfg.dev); pci_print_verbose(dinfo); } @@ -891,6 +913,52 @@ return (bus_generic_attach(dev)); } +static int +pci_suspend(device_t dev) +{ + int numdevs; + device_t *devlist; + device_t child; + struct pci_devinfo *dinfo; + int i; + + /* + * Save the pci configuration space for each child. We don't need + * to do this, unless the BIOS suspend code powers down the bus and + * the devices on the bus. + */ + device_get_children(dev, &devlist, &numdevs); + for (i = 0; i < numdevs; i++) { + child = devlist[i]; + dinfo = (struct pci_devinfo *) device_get_ivars(child); + pci_cfg_save(child, dinfo, 0); + } + free(devlist, M_TEMP); + return (bus_generic_suspend(dev)); +} + +static int +pci_resume(device_t dev) +{ + int numdevs; + device_t *devlist; + device_t child; + struct pci_devinfo *dinfo; + int i; + + /* + * Restore the pci configuration space for each child. + */ + device_get_children(dev, &devlist, &numdevs); + for (i = 0; i < numdevs; i++) { + child = devlist[i]; + dinfo = (struct pci_devinfo *) device_get_ivars(child); + pci_cfg_restore(child, dinfo); + } + free(devlist, M_TEMP); + return (bus_generic_resume(dev)); +} + static void pci_load_vendor_data(void) { @@ -906,6 +974,34 @@ } } +void +pci_driver_added(device_t dev, driver_t *driver) +{ + int numdevs; + device_t *devlist; + device_t child; + struct pci_devinfo *dinfo; + int i; + + device_printf(dev, "driver added\n"); + DEVICE_IDENTIFY(driver, dev); + device_get_children(dev, &devlist, &numdevs); + for (i = 0; i < numdevs; i++) { + child = devlist[i]; + if (device_get_state(child) != DS_NOTPRESENT) + continue; + dinfo = device_get_ivars(child); + pci_print_verbose(dinfo); +/*XXX???*/ /* resource_list_init(&dinfo->cfg.resources); */ + printf("pci%d:%d:%d: reprobing on driver added\n", + dinfo->cfg.bus, dinfo->cfg.slot, dinfo->cfg.func); + pci_cfg_restore(child, dinfo); + if (device_probe_and_attach(child) != 0) + pci_cfg_save(child, dinfo, 1); + } + free(devlist, M_TEMP); +} + int pci_print_child(device_t dev, device_t child) { @@ -1031,6 +1127,7 @@ } printf(" at device %d.%d (no driver attached)\n", pci_get_slot(child), pci_get_function(child)); + pci_cfg_save(child, (struct pci_devinfo *) device_get_ivars(child), 1); return; } @@ -1431,7 +1528,7 @@ } int -pci_child_location_str_method(device_t cbdev, device_t child, char *buf, +pci_child_location_str_method(device_t dev, device_t child, char *buf, size_t buflen) { struct pci_devinfo *dinfo; @@ -1443,7 +1540,7 @@ } int -pci_child_pnpinfo_str_method(device_t cbdev, device_t child, char *buf, +pci_child_pnpinfo_str_method(device_t dev, device_t child, char *buf, size_t buflen) { struct pci_devinfo *dinfo; @@ -1489,3 +1586,40 @@ return (0); } + +static void +pci_cfg_restore(device_t dev, struct pci_devinfo *dinfo) +{ +#define NBAR 7 + int i; + uint32_t bar[NBAR]; + + if (dinfo->cfg.hdrtype != 0) + return; + for (i = 0; i < NBAR; i++) + bar[i] = pci_read_config(dev, PCIR_MAPS + i * 4, 4); + printf("pci%d:%d:%d: setting power state D0\n", dinfo->cfg.bus, + dinfo->cfg.slot, dinfo->cfg.func); + pci_set_powerstate(dev, PCI_POWERSTATE_D0); + for (i = 0; i < NBAR; i++) + pci_write_config(dev, PCIR_MAPS + i * 4, bar[i], 4); + pci_write_config(dev, PCIR_INTLINE, dinfo->cfg.intline, 1); + pci_write_config(dev, PCIR_INTPIN, dinfo->cfg.intpin, 1); + pci_write_config(dev, PCIR_MINGNT, dinfo->cfg.mingnt, 1); + pci_write_config(dev, PCIR_MAXLAT, dinfo->cfg.maxlat, 1); +} + +static void +pci_cfg_save(device_t dev, struct pci_devinfo *dinfo, int setstate) +{ + uint32_t cls; + + if (dinfo->cfg.hdrtype != 0) + return; + cls = pci_get_class(dev); + if (setstate && cls != PCIC_DISPLAY && cls != PCIC_MEMORY) { + pci_set_powerstate(dev, PCI_POWERSTATE_D3); + printf("pci%d:%d:%d: setting power state D3\n", dinfo->cfg.bus, + dinfo->cfg.slot, dinfo->cfg.func); + } +} ==== //depot/projects/power/sys/dev/pci/pci_if.m#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/pci/pci_pci.c#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/pci/pci_private.h#2 (text+ko) ==== @@ -41,6 +41,7 @@ void pci_add_children(device_t dev, int busno, size_t dinfo_size); void pci_add_child(device_t bus, struct pci_devinfo *dinfo); +void pci_driver_added(device_t dev, driver_t *driver); int pci_print_child(device_t dev, device_t child); void pci_probe_nomatch(device_t dev, device_t child); int pci_read_ivar(device_t dev, device_t child, int which, ==== //depot/projects/power/sys/dev/pci/pci_user.c#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/pci/pcib_if.m#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/pci/pcib_private.h#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/pci/pcireg.h#2 (text+ko) ==== ==== //depot/projects/power/sys/dev/pci/pcivar.h#2 (text+ko) ==== @@ -51,8 +51,13 @@ typedef uint32_t pci_addr_t; /* uint64_t for system with 64bit addresses */ #endif +/* Additional data saved on power events */ +struct pci_save +{ + uint32_t bar[7]; /* 7 bars to save */ +}; + /* config header information common to all header types */ - typedef struct pcicfg { struct device *dev; /* device which owns this */