From owner-p4-projects@FreeBSD.ORG Sun Dec 7 11:48:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49E7516A4D0; Sun, 7 Dec 2003 11:48:55 -0800 (PST) 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 1B92016A4CE for ; Sun, 7 Dec 2003 11:48:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1943B43F3F for ; Sun, 7 Dec 2003 11:48:35 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB7JmYXJ089509 for ; Sun, 7 Dec 2003 11:48:34 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB7JmRt1089506 for perforce@freebsd.org; Sun, 7 Dec 2003 11:48:27 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 7 Dec 2003 11:48:27 -0800 (PST) Message-Id: <200312071948.hB7JmRt1089506@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 43569 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 Dec 2003 19:48:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=43569 Change 43569 by marcel@marcel_nfs on 2003/12/07 11:48:05 IFC @43568 Affected files ... .. //depot/projects/ia64/games/fortune/datfiles/fortunes#34 integrate .. //depot/projects/ia64/games/fortune/strfile/Makefile#2 integrate .. //depot/projects/ia64/games/fortune/strfile/strfile.c#6 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#20 integrate .. //depot/projects/ia64/include/resolv.h#4 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/Makefile#8 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/libc.so.4.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/libc_r.so.4.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/libdevstat.so.2.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat4x.alpha/libedit.so.3.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/libmp.so.3.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat4x.alpha/libpam.so.1.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/libperl.so.3.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/libposix1e.so.2.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat4x.alpha/libskey.so.2.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat4x.alpha/libstdc++.so.3.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/libusbhid.so.0.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat4x.alpha/pam_cleartext_pass_ok.so.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/pam_deny.so.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/pam_opie.so.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/pam_opieaccess.so.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat4x.alpha/pam_permit.so.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/pam_radius.so.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/pam_skey.so.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/pam_ssh.so.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/pam_tacplus.so.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/pam_unix.so.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/Makefile#10 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/pam_cleartext_pass_ok.so.bz2.uu#3 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/pam_deny.so.bz2.uu#3 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/pam_opie.so.bz2.uu#3 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/pam_opieaccess.so.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat4x.i386/pam_permit.so.bz2.uu#3 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/pam_radius.so.bz2.uu#3 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/pam_skey.so.bz2.uu#3 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/pam_ssh.so.bz2.uu#3 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/pam_tacplus.so.bz2.uu#3 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/pam_unix.so.bz2.uu#3 integrate .. //depot/projects/ia64/lib/libc/locale/Makefile.inc#17 integrate .. //depot/projects/ia64/lib/libc/locale/localeconv.3#1 branch .. //depot/projects/ia64/lib/libc/locale/mblen.3#1 branch .. //depot/projects/ia64/lib/libc/locale/mbstowcs.3#1 branch .. //depot/projects/ia64/lib/libc/locale/mbtowc.3#1 branch .. //depot/projects/ia64/lib/libc/locale/multibyte.3#10 integrate .. //depot/projects/ia64/lib/libc/locale/setlocale.3#8 integrate .. //depot/projects/ia64/lib/libc/locale/wcstombs.3#1 branch .. //depot/projects/ia64/lib/libc/locale/wctomb.3#1 branch .. //depot/projects/ia64/lib/libc/net/res_init.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/getc.3#7 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#74 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#134 integrate .. //depot/projects/ia64/release/doc/share/sgml/release.ent#12 integrate .. //depot/projects/ia64/sbin/atm/atm/Makefile#6 integrate .. //depot/projects/ia64/sbin/atm/atm/atm_eni.c#4 delete .. //depot/projects/ia64/sbin/atm/atm/atm_show.c#5 integrate .. //depot/projects/ia64/sbin/atm/ilmid/ilmid.c#10 integrate .. //depot/projects/ia64/sbin/dumpfs/dumpfs.c#18 integrate .. //depot/projects/ia64/sbin/mount/mount.c#13 integrate .. //depot/projects/ia64/sbin/route/route.c#11 integrate .. //depot/projects/ia64/share/man/man4/Makefile#64 integrate .. //depot/projects/ia64/share/man/man4/lmc.4#3 delete .. //depot/projects/ia64/share/man/man4/man4.i386/Makefile#15 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/dgb.4#3 delete .. //depot/projects/ia64/share/man/man4/man4.i386/meteor.4#2 delete .. //depot/projects/ia64/share/man/man5/resolver.5#2 integrate .. //depot/projects/ia64/sys/alpha/include/ioctl_meteor.h#2 integrate .. //depot/projects/ia64/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/ia64/sys/amd64/amd64/amd64-gdbstub.c#4 integrate .. //depot/projects/ia64/sys/amd64/amd64/amd64_mem.c#5 integrate .. //depot/projects/ia64/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/critical.c#5 integrate .. //depot/projects/ia64/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#18 integrate .. //depot/projects/ia64/sys/amd64/amd64/mem.c#6 integrate .. //depot/projects/ia64/sys/amd64/amd64/nexus.c#8 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#31 integrate .. //depot/projects/ia64/sys/amd64/include/cpufunc.h#4 integrate .. //depot/projects/ia64/sys/amd64/include/critical.h#4 integrate .. //depot/projects/ia64/sys/amd64/include/mutex.h#2 integrate .. //depot/projects/ia64/sys/amd64/include/runq.h#2 integrate .. //depot/projects/ia64/sys/amd64/include/vmparam.h#6 integrate .. //depot/projects/ia64/sys/amd64/pci/pci_bus.c#7 integrate .. //depot/projects/ia64/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#27 integrate .. //depot/projects/ia64/sys/conf/NOTES#73 integrate .. //depot/projects/ia64/sys/conf/files#109 integrate .. //depot/projects/ia64/sys/conf/files.i386#49 integrate .. //depot/projects/ia64/sys/conf/files.pc98#41 integrate .. //depot/projects/ia64/sys/conf/kern.mk#9 integrate .. //depot/projects/ia64/sys/conf/majors#31 integrate .. //depot/projects/ia64/sys/conf/newvers.sh#9 integrate .. //depot/projects/ia64/sys/conf/options#70 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/ah.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#6 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/version.h#5 integrate .. //depot/projects/ia64/sys/dev/dgb/dgb.c#11 delete .. //depot/projects/ia64/sys/dev/dgb/dgbios.h#2 delete .. //depot/projects/ia64/sys/dev/dgb/dgfep.h#2 delete .. //depot/projects/ia64/sys/dev/dgb/dgreg.h#3 delete .. //depot/projects/ia64/sys/dev/em/if_em.c#31 integrate .. //depot/projects/ia64/sys/dev/hea/eni.c#7 delete .. //depot/projects/ia64/sys/dev/hea/eni.h#8 delete .. //depot/projects/ia64/sys/dev/hea/eni_buffer.c#10 delete .. //depot/projects/ia64/sys/dev/hea/eni_globals.c#4 delete .. //depot/projects/ia64/sys/dev/hea/eni_if.c#4 delete .. //depot/projects/ia64/sys/dev/hea/eni_init.c#4 delete .. //depot/projects/ia64/sys/dev/hea/eni_intr.c#4 delete .. //depot/projects/ia64/sys/dev/hea/eni_receive.c#7 delete .. //depot/projects/ia64/sys/dev/hea/eni_stats.h#2 delete .. //depot/projects/ia64/sys/dev/hea/eni_suni.h#2 delete .. //depot/projects/ia64/sys/dev/hea/eni_transmit.c#7 delete .. //depot/projects/ia64/sys/dev/hea/eni_var.h#4 delete .. //depot/projects/ia64/sys/dev/hea/eni_vcm.c#7 delete .. //depot/projects/ia64/sys/dev/hea/hea_freebsd.c#5 delete .. //depot/projects/ia64/sys/dev/hea/hea_freebsd.h#2 delete .. //depot/projects/ia64/sys/dev/hea/hea_pci.c#7 delete .. //depot/projects/ia64/sys/dev/lmc/if_lmc.c#10 delete .. //depot/projects/ia64/sys/dev/lmc/if_lmc_common.c#4 delete .. //depot/projects/ia64/sys/dev/lmc/if_lmc_fbsd3.c#4 delete .. //depot/projects/ia64/sys/dev/lmc/if_lmc_media.c#4 delete .. //depot/projects/ia64/sys/dev/lmc/if_lmcioctl.h#3 delete .. //depot/projects/ia64/sys/dev/lmc/if_lmcvar.h#3 delete .. //depot/projects/ia64/sys/dev/sym/sym_hipd.c#17 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_vfsops.c#12 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs.c#7 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_ctl.c#15 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_ioctl.c#9 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_map.c#8 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_rlimit.c#3 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_status.c#13 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_type.c#3 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs.c#11 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs.h#13 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vfsops.c#20 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vnops.c#22 integrate .. //depot/projects/ia64/sys/geom/geom.h#38 integrate .. //depot/projects/ia64/sys/geom/geom_dump.c#23 integrate .. //depot/projects/ia64/sys/geom/geom_event.c#25 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#27 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#50 integrate .. //depot/projects/ia64/sys/i386/include/ioctl_meteor.h#2 integrate .. //depot/projects/ia64/sys/i386/isa/loran.c#11 delete .. //depot/projects/ia64/sys/ia64/include/ioctl_meteor.h#2 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#33 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#70 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#29 integrate .. //depot/projects/ia64/sys/kern/subr_prf.c#29 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#34 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#35 integrate .. //depot/projects/ia64/sys/modules/Makefile#67 integrate .. //depot/projects/ia64/sys/modules/hea/Makefile#2 delete .. //depot/projects/ia64/sys/net/if_var.h#19 integrate .. //depot/projects/ia64/sys/netkey/key.c#17 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#14 integrate .. //depot/projects/ia64/sys/pci/meteor.c#13 delete .. //depot/projects/ia64/sys/pci/meteor_reg.h#2 delete .. //depot/projects/ia64/sys/sys/ioctl_meteor.h#2 integrate .. //depot/projects/ia64/sys/sys/kse.h#16 integrate .. //depot/projects/ia64/sys/sys/param.h#51 integrate .. //depot/projects/ia64/sys/sys/syscall.h#33 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#33 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#36 integrate .. //depot/projects/ia64/sys/sys/systm.h#31 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#40 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#21 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.history#14 integrate .. //depot/projects/ia64/usr.bin/kdump/kdump.1#3 integrate .. //depot/projects/ia64/usr.bin/kdump/kdump.c#6 integrate .. //depot/projects/ia64/usr.bin/vmstat/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/vmstat/vmstat.8#5 integrate .. //depot/projects/ia64/usr.bin/vmstat/vmstat.c#16 integrate .. //depot/projects/ia64/usr.sbin/pppctl/pppctl.c#3 integrate Differences ... ==== //depot/projects/ia64/games/fortune/datfiles/fortunes#34 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.120 2003/11/12 20:08:47 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.121 2003/12/07 10:03:20 phk Exp $ % -- Gifts for Children -- @@ -11997,6 +11997,10 @@ is not necessarily science. -- Henri Poincair'e % +Science is like sex: sometimes something useful comes +out, but that is not the reason we are doing it + -- Richard Feynman +% Science is what happens when preconception meets verification. % Scientists are people who build the Brooklyn Bridge and then buy it. ==== //depot/projects/ia64/games/fortune/strfile/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/fortune/strfile/Makefile,v 1.4 2001/03/26 14:20:56 ru Exp $ +# $FreeBSD: src/games/fortune/strfile/Makefile,v 1.5 2003/12/07 17:34:52 des Exp $ PROG= strfile MAN= strfile.8 MLINKS= strfile.8 unstr.8 -CFLAGS+= -Wall +WARNS?= 2 .include ==== //depot/projects/ia64/games/fortune/strfile/strfile.c#6 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.23 2003/08/03 19:44:36 ache Exp $"); +__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.25 2003/12/07 17:35:41 des Exp $"); # include # include @@ -105,37 +105,37 @@ #endif typedef struct { - char first; + int first; long pos; } STR; -char *Infile = NULL, /* input file name */ - Outfile[MAXPATHLEN] = "", /* output file name */ - Delimch = '%'; /* delimiting character */ +static char *Infile = NULL, /* input file name */ + Outfile[MAXPATHLEN] = "", /* output file name */ + Delimch = '%'; /* delimiting character */ -int Cflag = FALSE; /* embedded comments */ -int Sflag = FALSE; /* silent run flag */ -int Oflag = FALSE; /* ordering flag */ -int Iflag = FALSE; /* ignore case flag */ -int Rflag = FALSE; /* randomize order flag */ -int Xflag = FALSE; /* set rotated bit */ -long Num_pts = 0; /* number of pointers/strings */ +static int Cflag = FALSE; /* embedded comments */ +static int Sflag = FALSE; /* silent run flag */ +static int Oflag = FALSE; /* ordering flag */ +static int Iflag = FALSE; /* ignore case flag */ +static int Rflag = FALSE; /* randomize order flag */ +static int Xflag = FALSE; /* set rotated bit */ +static long Num_pts = 0; /* number of pointers/strings */ -long *Seekpts; +static long *Seekpts; -FILE *Sort_1, *Sort_2; /* pointers for sorting */ +static FILE *Sort_1, *Sort_2; /* pointers for sorting */ -STRFILE Tbl; /* statistics table */ +static STRFILE Tbl; /* statistics table */ -STR *Firstch; /* first chars of each string */ +static STR *Firstch; /* first chars of each string */ -void add_offset(FILE *, long); -int cmp_str(const void *, const void *); +static void add_offset(FILE *, long); +static int cmp_str(const void *, const void *); static int stable_collate_range_cmp(int, int); -void do_order(void); -void getargs(int, char **); -void randomize(void); -void usage(void); +static void do_order(void); +static void getargs(int, char **); +static void randomize(void); +static void usage(void); /* * main: ==== //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#20 (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/mdoc.local,v 1.32 2003/10/02 20:49:34 deischen Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.33 2003/12/07 15:46:50 ru Exp $ .\" .\" %beginstrip% . @@ -55,7 +55,7 @@ .ds doc-str-Lb-libvgl Video Graphics Library (libvgl, \-lvgl) . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~5.1 +.ds doc-default-operating-system FreeBSD\~5.2 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-4.9 4.9 ==== //depot/projects/ia64/include/resolv.h#4 (text+ko) ==== @@ -51,7 +51,7 @@ /* * @(#)resolv.h 8.1 (Berkeley) 6/2/93 * From Id: resolv.h,v 8.12 1998/04/28 19:36:46 halley Exp $ - * $FreeBSD: src/include/resolv.h,v 1.22 2003/02/27 13:40:00 nectar Exp $ + * $FreeBSD: src/include/resolv.h,v 1.23 2003/12/07 12:32:23 murray Exp $ */ #ifndef _RESOLV_H_ @@ -94,6 +94,8 @@ #define RES_TIMEOUT 5 /* min. seconds between retries */ #define MAXRESOLVSORT 10 /* number of net to sort on */ #define RES_MAXNDOTS 15 /* should reflect bit field size */ +#define RES_MAXRETRANS 30 /* only for resolv.conf/RES_OPTIONS */ +#define RES_MAXRETRY 5 /* only for resolv.conf/RES_OPTIONS */ struct __res_state { int retrans; /* retransmition time interval */ ==== //depot/projects/ia64/lib/compat/compat4x.alpha/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/compat/compat4x.alpha/Makefile,v 1.15 2003/02/17 13:45:12 nectar Exp $ +# $FreeBSD: src/lib/compat/compat4x.alpha/Makefile,v 1.16 2003/12/07 02:11:18 obrien Exp $ DISTRIBUTION= compat4x @@ -7,18 +7,24 @@ libc_r.so.4 \ libcrypto.so.1 \ libcrypto.so.2 \ + libdevstat.so.2 \ libedit.so.3 \ libfetch.so.2 \ libgmp.so.3 \ + libmp.so.3 \ libpam.so.1 \ libperl.so.3 \ + libposix1e.so.2 \ + libskey.so.2 \ libssl.so.1 \ libssl.so.2 \ libstdc++.so.3 \ libusb.so.0 \ + libusbhid.so.0 \ pam_cleartext_pass_ok.so \ pam_deny.so \ pam_opie.so \ + pam_opieaccess.so \ pam_permit.so \ pam_radius.so \ pam_skey.so \ ==== //depot/projects/ia64/lib/compat/compat4x.alpha/libc.so.4.bz2.uu#2 (text+ko) ==== @@ -1,4918 +1,4784 @@ -$FreeBSD: src/lib/compat/compat4x.alpha/libc.so.4.bz2.uu,v 1.1 2002/06/25 04:59:45 obrien Exp $ +$FreeBSD: src/lib/compat/compat4x.alpha/libc.so.4.bz2.uu,v 1.2 2003/12/07 02:11:18 obrien Exp $ -begin-base64 444 libc.so.4.bz2 -QlpoOTFBWSZTWYZuWMkE2kF/////////////////////////////////////////////5EtHdKVe -2ioUoUKqlAlQFKBVAAAAAcAD0FADz4AYfHwd4HvXXVqnbo6LphFABgVG8uX3llfGAAAA3X03wN4Y -2mV71zowze5gWUba2Eu5z1wJW7V5QC9bdQKCq5p3Q7jWU9sAAAAAAAAlQAAAAUAAAA18D0omzHia -hDzpXiy021mqPgem9dwXl4Ab3nWtmy3c3br2PN6Ad3Phtvd89X3Jc99KJ1oBEgFKqBawBSkPpoBo -Aeez1ENAu+IVVsC1YGy5tS+BoejxPPYKHFnrbWYle3b3JVrLp2wD7wAProSAH2y77dd3BrqlNEM7 -MYTrvgcCFR977ezonlroeXrO1fAvbe7dpu7ffd11W7NAe57j1QHxncfXb53Tp9cLKB33wePt3yd9 -fAAPVAdAADLiNe7PTDN9HCq6bZqg8vdgr6gAAAAAAAAAAAAAAAAAAAAAAH33b1Wn3cHvgAABh9fA -AA+gAAAKFAAAN9tnjd9qPr49vu92zXgABm+PJdtuiIp3ZwO8c8ADox4512vnvve+h48B9zltj53O -ud7m8cNjw29bpnvY6E8B9bsMWMp9NhsfTcAAGe+V8c5hp6bgMyust9ldC+33c6c958b4dfdr7aqf -a264AC57zvlPbende9zz77W+3n0vPc9XrnK+zvr1YAB3u3y24Bl97uLs3jfenn1ubsCx5G9xze+7 -ED097vn3wd83XxA7261pHwgNUOlm1kurQZtQDbCt93LrNtseuEA00ASAMeL3NDLQAN84gBE+devT -mfd3XbV8u8M3vPOvHpVeAAvlLl7dOvm+mi2jb31W+97uV97mzDUI6+fM522itSoBR97AfebRvgNT -vewG32Ppu32wA9gwusNvm+96WzTQreHfHfUcs3y7E+ninHvDwkAJ74733c3k3zvXx9G8+ABHvveK -BTk8u1zA8AAQAAAAAAAeVQAT3ONXt53t77Dz3zfNvCYdfc68j18wNKEh4ENTtQCpB0DEKpQF4zIP -vtbu4+tOjfcwvSKAHre7pdg9eXce0AFzE8+7vncHoj73yHs9fcz7t90pb73zvBWi2D77u7d8fLH3 -vu3qzcvvQWy8e0JKBORvlz777211pfe52+76e8N66ut3egOfXgyFZ964AAAAAAAAAAABQAA+a16H -eAPSLuyql57773xvsd1s2zHuxsy33ue8ZKsvcO3eteVa8SKAdsApbHtzpfbnwH0KdtSr33j7Pvs7 -7fFn3D32OT72o4ve5tzcVfecfb731zhu1fXror4Ur07AXc5ZQ0uPcbzvue7fXRQQ+3ddtcYvrrb6 -R1jyCvHXu+L6lLwfY+5K8FABQACgAAKAAZz1SA2PrqbvR18feDQHHrnvvt9gPfOW+Pm+PPi7V5cZ -XOg9Vewd6uHb6feb7NxB72++W2DKT7Cd14Nschtw9V9ndr73dPfducNu2Yjj65xurhnedXlhcxuz -uzel2cy1ddvbudcjnKpu55e+afd73L7PXfParnvsN6FHbAD6HnXy7dlAAAB6U8PnewDQUAKqjhc+ -tkCRsa6wxuaPgNKDR0dy2gVWkQW2gDbAa0H00AB0UFB7m99Fvlfb3Xs4+3ud9988HnkqncD3272A -0FBoDvEBj30z7W1re+m8hXl773pBrey9Me7nB5tl60gIGtZ3wHeuLz4OKW89AKje1Vp3YaHn0Hfe -+873c+z77b6aKdNW42m3d97QrgrfN7MdQn29c+N9abcF98jvvbve93jiUKr6aF7Yr13brcL6+9ye -82sBqAEfWOr4fSF8fNesPdndulALZUrL3dADiEgChQABoAD0hlgPnY9AAUVoA7YAAesGrtZkKj12 -ZwK+csaB7zRCTrJSjkCPcSzs8E8nUdYa+94+Xj24g4+bndT7nh5TF5WG+s77d9rVh0GmjJodM3RT -Q7u9nIept3d72BswJC5vcNG7c82AAO+7K61sT3g75fc+89gAB4AAAAAAAAAAAAAAAAAAI+itsMBD -3ZgA+vrQV731vvUGtud3wJ9uhVjeQB996q+h9cvt5hzvrfPvXzye4PlG+3h933r52cX1uINLe+9u -xe52hodWc6r6I2nJz7PXR699vfWZ6+bwJK995tfeY6O7Ps2vd4ADvlKQaano3Hvu15cUN7sn0Pl9 -vd9jT7dYxnsxrvDpq971x7zd09Mbb2xM9r3cNbx33uXeFanbnYuuOFD10Lzuz5vVQhDnq31hDcb6 -BT6Ivvt97ams5OuNin0y2zWS7efd3TPa5bZts9M7Laee8E9jj3KiHvOupiq89vuXi+3o8gJOWSc2 -fAZ3Np497z3vd577uAD777gFmgAAAB0AUAAAAAAEqAAoADd7H2PoNtz77qvvC28HbgB1PmtvsdMd -n2uz1QvV6+e6bx7dt3HHXu3j7fPOPTz11nvK77sOD3Hx6eG3t29zV9tOs33zcT3uG+8177nvs+2k -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 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 7 13:21:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 277B816A4D0; Sun, 7 Dec 2003 13:21:32 -0800 (PST) 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 E06B016A4CE for ; Sun, 7 Dec 2003 13:21:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BA1B43F85 for ; Sun, 7 Dec 2003 13:21:30 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB7LLUXJ001921 for ; Sun, 7 Dec 2003 13:21:30 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB7LLU0l001918 for perforce@freebsd.org; Sun, 7 Dec 2003 13:21:30 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 7 Dec 2003 13:21:30 -0800 (PST) Message-Id: <200312072121.hB7LLU0l001918@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 43573 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 Dec 2003 21:21:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=43573 Change 43573 by marcel@marcel_nfs on 2003/12/07 13:21:12 IFC @43572 Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#102 integrate .. //depot/projects/ia64/sys/ia64/include/ucontext.h#7 integrate .. //depot/projects/ia64/sys/kern/kern_timeout.c#11 integrate .. //depot/projects/ia64/sys/sys/_null.h#2 integrate .. //depot/projects/ia64/sys/sys/param.h#52 integrate .. //depot/projects/ia64/sys/sys/stddef.h#5 integrate Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#102 (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/ia64/ia64/machdep.c,v 1.172 2003/11/20 16:42:39 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.173 2003/12/07 20:47:32 marcel Exp $ */ #include "opt_compat.h" ==== //depot/projects/ia64/sys/ia64/include/ucontext.h#7 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/ucontext.h,v 1.6 2003/11/09 22:17:36 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/ucontext.h,v 1.7 2003/12/07 20:47:33 marcel Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -48,7 +48,7 @@ * The second variation is for synchronous contexts. When the kernel creates * a synchronous context if needs to preserve the scratch registers, because * the syscall argument and return values are stored there in the trapframe - * and they need to be preserved in other to restart a syscall or return the + * and they need to be preserved in order to restart a syscall or return the * proper return values. Also, the IIP and CFM fields need to be preserved * as they point to the syscall stub, which the kernel saves as a favor to * userland (it keeps the stubs small and simple). @@ -79,7 +79,7 @@ unsigned long mc_flags; #define _MC_FLAGS_ASYNC_CONTEXT 0x0001 #define _MC_FLAGS_HIGHFP_VALID 0x0002 -#define _MC_FLAGS_KSE_SET_MBOX 0x0004 /* undocumented. Has to go. */ +#define _MC_FLAGS_KSE_SET_MBOX 0x0004 /* Undocumented. Has to go. */ #define _MC_FLAGS_SYSCALL_CONTEXT 0x0008 unsigned long _reserved_; struct _special mc_special; ==== //depot/projects/ia64/sys/kern/kern_timeout.c#11 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_timeout.c,v 1.83 2003/11/15 18:33:54 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_timeout.c,v 1.84 2003/12/07 20:03:28 phk Exp $"); #include #include @@ -158,6 +158,7 @@ struct bintime bt1, bt2; struct timespec ts2; static uint64_t maxdt = 36893488147419102LL; /* 2 msec */ + static timeout_t *lastfunc; #endif #ifndef MAX_SOFTCLOCK_STEPS @@ -228,12 +229,17 @@ binuptime(&bt2); bintime_sub(&bt2, &bt1); if (bt2.frac > maxdt) { + if (lastfunc != c_func || + bt2.frac > maxdt * 2) { + bintime2timespec(&bt2, &ts2); + printf( + "Expensive timeout(9) function: %p(%p) %jd.%09ld s\n", + c_func, c_arg, + (intmax_t)ts2.tv_sec, + ts2.tv_nsec); + } maxdt = bt2.frac; - bintime2timespec(&bt2, &ts2); - printf( - "Expensive timeout(9) function: %p(%p) %ld.%09ld s\n", - c_func, c_arg, - (long)ts2.tv_sec, ts2.tv_nsec); + lastfunc = c_func; } #endif if (!(c_flags & CALLOUT_MPSAFE)) ==== //depot/projects/ia64/sys/sys/_null.h#2 (text+ko) ==== ==== //depot/projects/ia64/sys/sys/param.h#52 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.175 2003/12/07 03:56:54 scottl Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.176 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _SYS_PARAM_H_ ==== //depot/projects/ia64/sys/sys/stddef.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/stddef.h,v 1.1 2002/11/13 15:14:57 mux Exp $ + * $FreeBSD: src/sys/sys/stddef.h,v 1.2 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _SYS_STDDEF_H_ From owner-p4-projects@FreeBSD.ORG Sun Dec 7 13:33:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3083116A4D0; Sun, 7 Dec 2003 13:33:47 -0800 (PST) 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 09F5516A4CE for ; Sun, 7 Dec 2003 13:33:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1630943FDF for ; Sun, 7 Dec 2003 13:33:46 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB7LXjXJ002603 for ; Sun, 7 Dec 2003 13:33:45 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB7LXjiE002600 for perforce@freebsd.org; Sun, 7 Dec 2003 13:33:45 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 7 Dec 2003 13:33:45 -0800 (PST) Message-Id: <200312072133.hB7LXjiE002600@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 43574 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 Dec 2003 21:33:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=43574 Change 43574 by marcel@marcel_nfs on 2003/12/07 13:32:55 Diff reduction ($FreeBSD$). Affected files ... .. //depot/projects/ia64/lib/libpam/libpam/Makefile#24 integrate .. //depot/projects/ia64/lib/libpam/libpam/pam_debug_log.c#6 integrate .. //depot/projects/ia64/lib/libpam/libpam/pam_std_option.c#5 integrate .. //depot/projects/ia64/lib/libpam/libpam/security/pam_mod_misc.h#6 integrate .. //depot/projects/ia64/sys/alpha/include/ioctl_meteor.h#3 integrate .. //depot/projects/ia64/sys/i386/include/ioctl_meteor.h#3 integrate .. //depot/projects/ia64/sys/ia64/include/ioctl_meteor.h#3 integrate .. //depot/projects/ia64/sys/sys/_null.h#3 integrate .. //depot/projects/ia64/sys/sys/ioctl_meteor.h#3 integrate Differences ... ==== //depot/projects/ia64/lib/libpam/libpam/Makefile#24 (text+ko) ==== ==== //depot/projects/ia64/lib/libpam/libpam/pam_debug_log.c#6 (text+ko) ==== ==== //depot/projects/ia64/lib/libpam/libpam/pam_std_option.c#5 (text+ko) ==== ==== //depot/projects/ia64/lib/libpam/libpam/security/pam_mod_misc.h#6 (text+ko) ==== ==== //depot/projects/ia64/sys/alpha/include/ioctl_meteor.h#3 (text+ko) ==== ==== //depot/projects/ia64/sys/i386/include/ioctl_meteor.h#3 (text+ko) ==== ==== //depot/projects/ia64/sys/ia64/include/ioctl_meteor.h#3 (text+ko) ==== ==== //depot/projects/ia64/sys/sys/_null.h#3 (text+ko) ==== ==== //depot/projects/ia64/sys/sys/ioctl_meteor.h#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Dec 7 13:50:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11F2116A4D2; Sun, 7 Dec 2003 13:50:10 -0800 (PST) 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 C8CEA16A4CE for ; Sun, 7 Dec 2003 13:50:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C10FB43FDF for ; Sun, 7 Dec 2003 13:50:07 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB7Lo7XJ003624 for ; Sun, 7 Dec 2003 13:50:07 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB7Lo7xo003621 for perforce@freebsd.org; Sun, 7 Dec 2003 13:50:07 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 7 Dec 2003 13:50:07 -0800 (PST) Message-Id: <200312072150.hB7Lo7xo003621@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 43577 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 Dec 2003 21:50:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=43577 Change 43577 by marcel@marcel_nfs on 2003/12/07 13:49:10 IFC @43575 + diff reduction that didn't happen in the previous submission. Affected files ... .. //depot/projects/ia64/include/dirent.h#8 integrate .. //depot/projects/ia64/include/locale.h#7 integrate .. //depot/projects/ia64/include/rpc/types.h#5 integrate .. //depot/projects/ia64/include/stddef.h#8 integrate .. //depot/projects/ia64/include/stdio.h#16 integrate .. //depot/projects/ia64/include/stdlib.h#24 integrate .. //depot/projects/ia64/include/string.h#13 integrate .. //depot/projects/ia64/include/time.h#13 integrate .. //depot/projects/ia64/include/unistd.h#23 integrate .. //depot/projects/ia64/include/wchar.h#17 integrate .. //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#9 integrate .. //depot/projects/ia64/share/man/man9/Makefile#36 integrate .. //depot/projects/ia64/share/man/man9/hexdump.9#1 branch .. //depot/projects/ia64/sys/alpha/include/ioctl_meteor.h#4 edit .. //depot/projects/ia64/sys/i386/include/ioctl_meteor.h#4 edit .. //depot/projects/ia64/sys/ia64/include/ioctl_meteor.h#4 edit .. //depot/projects/ia64/sys/sys/_null.h#4 edit .. //depot/projects/ia64/sys/sys/ioctl_meteor.h#4 edit .. //depot/projects/ia64/usr.bin/uuidgen/Makefile#4 integrate Differences ... ==== //depot/projects/ia64/include/dirent.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dirent.h 8.2 (Berkeley) 7/28/94 - * $FreeBSD: src/include/dirent.h,v 1.13 2002/09/10 18:12:16 mike Exp $ + * $FreeBSD: src/include/dirent.h,v 1.14 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _DIRENT_H_ ==== //depot/projects/ia64/include/locale.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)locale.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/locale.h,v 1.7 2002/10/09 09:19:27 tjr Exp $ + * $FreeBSD: src/include/locale.h,v 1.8 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _LOCALE_H_ ==== //depot/projects/ia64/include/rpc/types.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * * from: @(#)types.h 1.18 87/07/24 SMI * from: @(#)types.h 2.3 88/08/15 4.0 RPCSRC - * $FreeBSD: src/include/rpc/types.h,v 1.10 2001/03/19 12:49:47 alfred Exp $ + * $FreeBSD: src/include/rpc/types.h,v 1.11 2003/12/07 21:10:06 marcel Exp $ */ /* ==== //depot/projects/ia64/include/stddef.h#8 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)stddef.h 8.1 (Berkeley) 6/2/93 * - * $FreeBSD: src/include/stddef.h,v 1.9 2002/09/01 17:57:20 mike Exp $ + * $FreeBSD: src/include/stddef.h,v 1.10 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _STDDEF_H_ ==== //depot/projects/ia64/include/stdio.h#16 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.51 2003/01/13 08:41:47 tjr Exp $ + * $FreeBSD: src/include/stdio.h,v 1.52 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _STDIO_H_ ==== //depot/projects/ia64/include/stdlib.h#24 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.54 2003/06/25 19:06:40 obrien Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.55 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _STDLIB_H_ ==== //depot/projects/ia64/include/string.h#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.18 2002/10/14 20:38:40 mike Exp $ + * $FreeBSD: src/include/string.h,v 1.19 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _STRING_H_ ==== //depot/projects/ia64/include/time.h#13 (text+ko) ==== @@ -39,7 +39,7 @@ */ /* - * $FreeBSD: src/include/time.h,v 1.30 2002/09/06 11:23:32 tjr Exp $ + * $FreeBSD: src/include/time.h,v 1.31 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _TIME_H_ ==== //depot/projects/ia64/include/unistd.h#23 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.69 2003/08/19 20:39:49 wollman Exp $ + * $FreeBSD: src/include/unistd.h,v 1.70 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _UNISTD_H_ ==== //depot/projects/ia64/include/wchar.h#17 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.35 2003/04/28 22:40:05 kan Exp $ + * $FreeBSD: src/include/wchar.h,v 1.36 2003/12/07 21:10:06 marcel Exp $ */ /*- ==== //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#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/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.11 2003/09/19 23:28:13 marcel Exp $ + * $FreeBSD: src/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.12 2003/12/07 20:47:33 marcel Exp $ */ #ifndef _PTHREAD_MD_H_ @@ -237,7 +237,7 @@ kse_switchin(mc, (long)&tcb->tcb_tmbx, (long *)&kcb->kcb_kmbx.km_curthread); else - kse_switchin(mc, 0, NULL); + kse_switchin(mc, 0L, NULL); } else { if (setmbox) _ia64_restore_context(mc, (intptr_t)&tcb->tcb_tmbx, ==== //depot/projects/ia64/share/man/man9/Makefile#36 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.209 2003/11/10 22:45:09 hmp Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.210 2003/12/07 20:48:00 scottl Exp $ MAN= BUF_LOCK.9 BUF_LOCKFREE.9 BUF_LOCKINIT.9 BUF_REFCNT.9 \ BUF_TIMELOCK.9 BUF_UNLOCK.9 BUS_CONFIG_INTR.9 BUS_PRINT_CHILD.9 \ @@ -49,6 +49,7 @@ get_cyclecount.9 \ getnewvnode.9 \ groupmember.9 \ + hexdump.9 \ ifnet.9 inittodr.9 intro.9 ithread.9 \ jumbo.9 \ kernacc.9 kobj.9 kthread.9 ktr.9 \ ==== //depot/projects/ia64/sys/alpha/include/ioctl_meteor.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.1 2000/04/15 08:07:56 roger Exp $ + * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.3 2003/12/07 06:37:31 imp Exp $ */ /* * ioctl constants for Matrox Meteor Capture card. ==== //depot/projects/ia64/sys/i386/include/ioctl_meteor.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/ioctl_meteor.h,v 1.11 1999/12/29 04:33:02 peter Exp $ + * $FreeBSD: src/sys/i386/include/ioctl_meteor.h,v 1.13 2003/12/07 06:37:32 imp Exp $ */ /* * ioctl constants for Matrox Meteor Capture card. ==== //depot/projects/ia64/sys/ia64/include/ioctl_meteor.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/ioctl_meteor.h,v 1.1 2000/09/29 13:46:05 dfr Exp $ + * $FreeBSD: src/sys/ia64/include/ioctl_meteor.h,v 1.3 2003/12/07 06:37:32 imp Exp $ */ /* * ioctl constants for Matrox Meteor Capture card. ==== //depot/projects/ia64/sys/sys/_null.h#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$ + * $FreeBSD: src/sys/sys/_null.h,v 1.1 2003/12/07 21:10:06 marcel Exp $ */ #ifndef NULL ==== //depot/projects/ia64/sys/sys/ioctl_meteor.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/ioctl_meteor.h,v 1.11 1999/12/29 04:33:02 peter Exp $ + * $FreeBSD: src/sys/sys/ioctl_meteor.h,v 1.13 2003/12/07 06:37:31 imp Exp $ */ /* * ioctl constants for Matrox Meteor Capture card. ==== //depot/projects/ia64/usr.bin/uuidgen/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/usr.bin/uuidgen/Makefile,v 1.1 2002/05/28 06:16:08 marcel Exp $ +# $FreeBSD: src/usr.bin/uuidgen/Makefile,v 1.2 2003/12/07 21:34:56 mux Exp $ PROG= uuidgen -WARNS?= 4 +WARNS?= 6 .include From owner-p4-projects@FreeBSD.ORG Sun Dec 7 15:56:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5551116A4D0; Sun, 7 Dec 2003 15:56:54 -0800 (PST) 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 30F2C16A4CE for ; Sun, 7 Dec 2003 15:56:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A07D043FE5 for ; Sun, 7 Dec 2003 15:56:52 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB7NuqXJ011487 for ; Sun, 7 Dec 2003 15:56:52 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB7NuqQi011484 for perforce@freebsd.org; Sun, 7 Dec 2003 15:56:52 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sun, 7 Dec 2003 15:56:52 -0800 (PST) Message-Id: <200312072356.hB7NuqQi011484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43592 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 Dec 2003 23:56:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=43592 Change 43592 by sam@sam_ebb on 2003/12/07 15:56:45 micro-optimization from bde: use c99 local struct initializations instead of bzero calls Affected files ... .. //depot/projects/netperf/sys/netinet/ip_icmp.c#12 edit Differences ... ==== //depot/projects/netperf/sys/netinet/ip_icmp.c#12 (text+ko) ==== @@ -248,7 +248,6 @@ struct icmp *icp; struct in_ifaddr *ia; struct ip *ip = mtod(m, struct ip *); - struct sockaddr_in icmpsrc, icmpdst, icmpgw; int hlen = off; int icmplen = ip->ip_len; int i, code; @@ -311,17 +310,6 @@ if (icp->icmp_type > ICMP_MAXTYPE) goto raw; - /* Initialize */ - bzero(&icmpsrc, sizeof(icmpsrc)); - icmpsrc.sin_len = sizeof(struct sockaddr_in); - icmpsrc.sin_family = AF_INET; - bzero(&icmpdst, sizeof(icmpdst)); - icmpdst.sin_len = sizeof(struct sockaddr_in); - icmpdst.sin_family = AF_INET; - bzero(&icmpgw, sizeof(icmpgw)); - icmpgw.sin_len = sizeof(struct sockaddr_in); - icmpgw.sin_family = AF_INET; - icmpstat.icps_inhist[icp->icmp_type]++; code = icp->icmp_code; switch (icp->icmp_type) { @@ -381,7 +369,10 @@ if (code) goto badcode; code = PRC_QUENCH; - deliver: + deliver: { + struct sockaddr_in icmpsrc = + { sizeof(struct sockaddr_in), AF_INET }; + /* * Problem with datagram; advise higher level routines. */ @@ -449,6 +440,7 @@ (*ctlfunc)(code, (struct sockaddr *)&icmpsrc, (void *)&icp->icmp_ip); break; + } badcode: icmpstat.icps_badcode++; @@ -484,7 +476,10 @@ else goto reflect; - case ICMP_MASKREQ: + case ICMP_MASKREQ: { + struct sockaddr_in icmpdst = + { sizeof(struct sockaddr_in), AF_INET }; + if (icmpmaskrepl == 0) break; /* @@ -526,8 +521,16 @@ icmpstat.icps_outhist[icp->icmp_type]++; icmp_reflect(m); return; + } - case ICMP_REDIRECT: + case ICMP_REDIRECT: { + struct sockaddr_in icmpsrc = + { sizeof(struct sockaddr_in), AF_INET }; + struct sockaddr_in icmpdst = + { sizeof(struct sockaddr_in), AF_INET }; + struct sockaddr_in icmpgw = + { sizeof(struct sockaddr_in), AF_INET }; + if (log_redirect) { u_long src, dst, gw; @@ -580,6 +583,7 @@ key_sa_routechange((struct sockaddr *)&icmpsrc); #endif break; + } /* * No kernel processing for the following; From owner-p4-projects@FreeBSD.ORG Sun Dec 7 15:56:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E98EE16A4D6; Sun, 7 Dec 2003 15:56:54 -0800 (PST) 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 76A6316A4E7 for ; Sun, 7 Dec 2003 15:56:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28E4443F3F for ; Sun, 7 Dec 2003 15:56:52 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB7NuqXJ011481 for ; Sun, 7 Dec 2003 15:56:52 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB7NupSc011478 for perforce@freebsd.org; Sun, 7 Dec 2003 15:56:51 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sun, 7 Dec 2003 15:56:51 -0800 (PST) Message-Id: <200312072356.hB7NupSc011478@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43591 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 Dec 2003 23:56:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=43591 Change 43591 by sam@sam_ebb on 2003/12/07 15:55:58 call ath_reset instead of ath_init on ioctl calls to avoid stirring the 802.11 state machine; this is unfinished, we need to get the 802.11 code to inform us when a rescan is needed (or have it start it itself) Affected files ... .. //depot/projects/netperf/sys/dev/ath/if_ath.c#46 edit Differences ... ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#46 (text+ko) ==== @@ -95,7 +95,7 @@ static void ath_init(void *); static void ath_stop(struct ifnet *); static void ath_start(struct ifnet *); -static void ath_reset(struct ath_softc *); +static void ath_reset(struct ath_softc *, int); static int ath_media_change(struct ifnet *); static void ath_watchdog(struct ifnet *); static int ath_ioctl(struct ifnet *, u_long, caddr_t); @@ -471,7 +471,7 @@ struct ath_softc *sc = arg; device_printf(sc->sc_dev, "hardware error; resetting\n"); - ath_reset(sc); + ath_reset(sc, 0); } static void @@ -480,7 +480,7 @@ struct ath_softc *sc = arg; device_printf(sc->sc_dev, "rx FIFO overrun; resetting\n"); - ath_reset(sc); + ath_reset(sc, 0); } static void @@ -647,7 +647,7 @@ * and to reset the hardware when rf gain settings must be reset. */ static void -ath_reset(struct ath_softc *sc) +ath_reset(struct ath_softc *sc, int full) { struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = &ic->ic_if; @@ -671,6 +671,9 @@ if (!ath_hal_reset(ah, ic->ic_opmode, &hchan, AH_TRUE, &status)) if_printf(ifp, "%s: unable to reset hardware; hal status %u\n", __func__, status); + /* NB: only needed when called from ath_ioctl */ + if (full && (ic->ic_flags & IEEE80211_F_WEPON)) + ath_initkeytable(sc); ath_hal_intrset(ah, sc->sc_imask); if (ath_startrecv(sc) != 0) /* restart recv */ if_printf(ifp, "%s: unable to start recv logic\n", __func__); @@ -822,7 +825,7 @@ if (ath_debug) ath_hal_dumpstate(sc->sc_ah); #endif /* AR_DEBUG */ - ath_init(ifp); /* XXX ath_reset??? */ + ath_reset(sc, 0); ifp->if_oerrors++; sc->sc_stats.ast_watchdog++; return; @@ -845,6 +848,8 @@ static int ath_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { +#define UP_RUNNING(_ifp) \ + (((_ifp)->if_flags & (IFF_UP|IFF_RUNNING)) == (IFF_UP|IFF_RUNNING)) struct ath_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; int error = 0; @@ -852,29 +857,31 @@ ATH_LOCK(sc); switch (cmd) { case SIOCSIFFLAGS: - if (ifp->if_flags & IFF_UP) { - if (ifp->if_flags & IFF_RUNNING) { - /* - * To avoid rescanning another access point, - * do not call ath_init() here. Instead, - * only reflect promisc mode settings. - */ - ath_mode_init(sc); - } else { - /* - * Beware of being called during detach to - * reset promiscuous mode. In that case we - * will still be marked UP but not RUNNING. - * However trying to re-init the interface - * is the wrong thing to do as we've already - * torn down much of our state. There's - * probably a better way to deal with this. - */ - if (!sc->sc_invalid) - ath_init(ifp); /* XXX lose error */ - } - } else + if (UP_RUNNING(ifp)) { + /* + * To avoid rescanning another access point, + * do not call ath_init() here. Instead, + * only reflect promisc mode settings. + */ + ath_mode_init(sc); + } else if (ifp->if_flags & IFF_UP) { + /* + * Beware of being called during detach to + * reset promiscuous mode. In that case we + * will still be marked UP but not RUNNING. + * However trying to re-init the interface + * is the wrong thing to do as we've already + * torn down much of our state. There's + * probably a better way to deal with this. + */ + if (!sc->sc_invalid) + ath_init(ifp); /* XXX lose error */ + } else { + /* + * Interface marked down; clear the hardware. + */ ath_stop(ifp); + } break; case SIOCADDMULTI: case SIOCDELMULTI: @@ -908,9 +915,20 @@ default: error = ieee80211_ioctl(ifp, cmd, data); if (error == ENETRESET) { - if ((ifp->if_flags & (IFF_RUNNING|IFF_UP)) == - (IFF_RUNNING|IFF_UP)) - ath_init(ifp); /* XXX lose error */ + /* + * If the interface is up and running then we + * want the parameter changes to take effect + * immediately, so reset hardware state to + * reflect parameter change(s). We don't try to + * intuit exactly what changed here; we just + * bludgeon state which can have unfortunate + * side effects. + * + * XXX doesn't recognize when a rescan is needed; + * e.g. for ssid or channel change + */ + if (UP_RUNNING(ifp)) + ath_reset(sc, 1); error = 0; } break; @@ -2448,7 +2466,7 @@ * to load new gain values. */ sc->sc_stats.ast_per_rfgain++; - ath_reset(sc); + ath_reset(sc, 0); } if (!ath_hal_calibrate(ah, &hchan)) { DPRINTF(("%s: calibration of channel %u failed\n", From owner-p4-projects@FreeBSD.ORG Sun Dec 7 21:41:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9275C16A4D0; Sun, 7 Dec 2003 21:41:02 -0800 (PST) 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 6D18116A4CE for ; Sun, 7 Dec 2003 21:41:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E19EF43FFB for ; Sun, 7 Dec 2003 21:40:56 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB85euXJ041291 for ; Sun, 7 Dec 2003 21:40:56 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB85euGk041288 for perforce@freebsd.org; Sun, 7 Dec 2003 21:40:56 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sun, 7 Dec 2003 21:40:56 -0800 (PST) Message-Id: <200312080540.hB85euGk041288@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43607 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 Dec 2003 05:41:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=43607 Change 43607 by sam@sam_ebb on 2003/12/07 21:40:38 try 2 stage stepdown w/o resorting to the lowest rate Affected files ... .. //depot/projects/netperf/sys/dev/ath/if_ath.c#47 edit Differences ... ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#47 (text+ko) ==== @@ -2729,6 +2729,9 @@ /* XXX management/control frames always go at the lowest speed */ an->an_tx_mgtrate = rt->info[0].rateCode; an->an_tx_mgtratesp = an->an_tx_mgtrate | rt->info[0].shortPreamble; + /* + * Setup two step-down retry rates. + */ if (--rate >= 0) { rix = sc->sc_rixmap[ ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL]; @@ -2737,7 +2740,6 @@ rt->info[rix].shortPreamble; } else an->an_tx_rate1 = 0; -#if 0 if (--rate >= 0) { rix = sc->sc_rixmap[ ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL]; @@ -2746,6 +2748,7 @@ rt->info[rix].shortPreamble; } else an->an_tx_rate2 = 0; +#if 0 if (--rate >= 0) { rix = sc->sc_rixmap[ ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL]; @@ -2754,9 +2757,9 @@ rt->info[rix].shortPreamble; } else an->an_tx_rate3 = 0; -#else an->an_tx_rate2 = an->an_tx_mgtrate; an->an_tx_rate2sp = an->an_tx_mgtratesp; +#else an->an_tx_rate3 = an->an_tx_rate3sp = 0; #endif an->an_tx_ok = an->an_tx_err = an->an_tx_retr = an->an_tx_upper = 0; From owner-p4-projects@FreeBSD.ORG Mon Dec 8 10:41:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FC9A16A4D0; Mon, 8 Dec 2003 10:41:01 -0800 (PST) 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 C7FED16A4CE for ; Mon, 8 Dec 2003 10:41:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E05A843F3F for ; Mon, 8 Dec 2003 10:40:59 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB8IexXJ001530 for ; Mon, 8 Dec 2003 10:40:59 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB8Iex7X001527 for perforce@freebsd.org; Mon, 8 Dec 2003 10:40:59 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 8 Dec 2003 10:40:59 -0800 (PST) Message-Id: <200312081840.hB8Iex7X001527@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43629 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 Dec 2003 18:41:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=43629 Change 43629 by sam@sam_ebb on 2003/12/08 10:40:07 check copyout return for SIOCG80211STATS Affected files ... .. //depot/projects/netperf/sys/net80211/ieee80211_ioctl.c#10 edit Differences ... ==== //depot/projects/netperf/sys/net80211/ieee80211_ioctl.c#10 (text+ko) ==== @@ -1016,7 +1016,8 @@ break; case SIOCG80211STATS: ifr = (struct ifreq *)data; - copyout(&ic->ic_stats, ifr->ifr_data, sizeof (ic->ic_stats)); + error = copyout(&ic->ic_stats, ifr->ifr_data, + sizeof (ic->ic_stats)); break; default: error = ether_ioctl(ifp, cmd, data); From owner-p4-projects@FreeBSD.ORG Mon Dec 8 12:13:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F023916A4D0; Mon, 8 Dec 2003 12:13:37 -0800 (PST) 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 B3E0916A4CE for ; Mon, 8 Dec 2003 12:13:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0A6D43D20 for ; Mon, 8 Dec 2003 12:12:55 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB8KCtXJ007064 for ; Mon, 8 Dec 2003 12:12:55 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB8KCqrv007061 for perforce@freebsd.org; Mon, 8 Dec 2003 12:12:52 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 8 Dec 2003 12:12:52 -0800 (PST) Message-Id: <200312082012.hB8KCqrv007061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43633 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 Dec 2003 20:13:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=43633 Change 43633 by sam@sam_ebb on 2003/12/08 12:12:32 IFC Affected files ... .. //depot/projects/netperf/sys/alpha/alpha/db_trace.c#3 integrate .. //depot/projects/netperf/sys/alpha/alpha/mp_machdep.c#6 integrate .. //depot/projects/netperf/sys/alpha/conf/GENERIC#4 integrate .. //depot/projects/netperf/sys/alpha/conf/GENERIC.hints#2 integrate .. //depot/projects/netperf/sys/alpha/include/ioctl_meteor.h#2 integrate .. //depot/projects/netperf/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/amd64-gdbstub.c#3 integrate .. //depot/projects/netperf/sys/amd64/amd64/amd64_mem.c#5 integrate .. //depot/projects/netperf/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/critical.c#5 integrate .. //depot/projects/netperf/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/netperf/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/machdep.c#11 integrate .. //depot/projects/netperf/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/netperf/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/netperf/sys/amd64/amd64/nexus.c#6 integrate .. //depot/projects/netperf/sys/amd64/amd64/pmap.c#18 integrate .. //depot/projects/netperf/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/netperf/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/netperf/sys/amd64/include/critical.h#4 integrate .. //depot/projects/netperf/sys/amd64/include/mutex.h#2 integrate .. //depot/projects/netperf/sys/amd64/include/runq.h#2 integrate .. //depot/projects/netperf/sys/amd64/include/vmparam.h#5 integrate .. //depot/projects/netperf/sys/amd64/pci/pci_bus.c#7 integrate .. //depot/projects/netperf/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_da.c#12 integrate .. //depot/projects/netperf/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/netperf/sys/conf/NOTES#21 integrate .. //depot/projects/netperf/sys/conf/files#29 integrate .. //depot/projects/netperf/sys/conf/files.i386#8 integrate .. //depot/projects/netperf/sys/conf/files.pc98#7 integrate .. //depot/projects/netperf/sys/conf/kern.mk#3 integrate .. //depot/projects/netperf/sys/conf/ldscript.i386#3 integrate .. //depot/projects/netperf/sys/conf/majors#8 integrate .. //depot/projects/netperf/sys/conf/newvers.sh#4 integrate .. //depot/projects/netperf/sys/conf/options#20 integrate .. //depot/projects/netperf/sys/conf/options.i386#7 integrate .. //depot/projects/netperf/sys/contrib/dev/ath/ah.h#6 integrate .. //depot/projects/netperf/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#7 integrate .. //depot/projects/netperf/sys/contrib/dev/ath/version.h#6 integrate .. //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/netperf/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/netperf/sys/dev/ata/ata-all.c#11 integrate .. //depot/projects/netperf/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/netperf/sys/dev/ata/ata-isa.c#4 integrate .. //depot/projects/netperf/sys/dev/ata/ata-lowlevel.c#12 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-cam.c#10 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-cd.c#16 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_core.c#8 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_os.c#6 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_os.h#2 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_reg.h#3 integrate .. //depot/projects/netperf/sys/dev/bktr/ioctl_bt848.h#1 branch .. //depot/projects/netperf/sys/dev/bktr/ioctl_meteor.h#1 branch .. //depot/projects/netperf/sys/dev/cx/cronyxfw.h#1 branch .. //depot/projects/netperf/sys/dev/cx/csigma.c#1 branch .. //depot/projects/netperf/sys/dev/cx/csigmafw.h#1 branch .. //depot/projects/netperf/sys/dev/cx/cxddk.c#1 branch .. //depot/projects/netperf/sys/dev/cx/cxddk.h#1 branch .. //depot/projects/netperf/sys/dev/cx/cxreg.h#1 branch .. //depot/projects/netperf/sys/dev/cx/if_cx.c#1 branch .. //depot/projects/netperf/sys/dev/cx/machdep.h#1 branch .. //depot/projects/netperf/sys/dev/cx/ng_cx.h#1 branch .. //depot/projects/netperf/sys/dev/dgb/dgb.c#3 delete .. //depot/projects/netperf/sys/dev/dgb/dgbios.h#2 delete .. //depot/projects/netperf/sys/dev/dgb/dgfep.h#2 delete .. //depot/projects/netperf/sys/dev/dgb/dgreg.h#3 delete .. //depot/projects/netperf/sys/dev/em/if_em.c#11 integrate .. //depot/projects/netperf/sys/dev/hea/eni.c#3 delete .. //depot/projects/netperf/sys/dev/hea/eni.h#3 delete .. //depot/projects/netperf/sys/dev/hea/eni_buffer.c#3 delete .. //depot/projects/netperf/sys/dev/hea/eni_globals.c#3 delete .. //depot/projects/netperf/sys/dev/hea/eni_if.c#3 delete .. //depot/projects/netperf/sys/dev/hea/eni_init.c#3 delete .. //depot/projects/netperf/sys/dev/hea/eni_intr.c#3 delete .. //depot/projects/netperf/sys/dev/hea/eni_receive.c#3 delete .. //depot/projects/netperf/sys/dev/hea/eni_stats.h#2 delete .. //depot/projects/netperf/sys/dev/hea/eni_suni.h#2 delete .. //depot/projects/netperf/sys/dev/hea/eni_transmit.c#3 delete .. //depot/projects/netperf/sys/dev/hea/eni_var.h#2 delete .. //depot/projects/netperf/sys/dev/hea/eni_vcm.c#3 delete .. //depot/projects/netperf/sys/dev/hea/hea_freebsd.c#3 delete .. //depot/projects/netperf/sys/dev/hea/hea_freebsd.h#2 delete .. //depot/projects/netperf/sys/dev/hea/hea_pci.c#4 delete .. //depot/projects/netperf/sys/dev/led/led.c#4 integrate .. //depot/projects/netperf/sys/dev/lmc/if_lmc.c#4 delete .. //depot/projects/netperf/sys/dev/lmc/if_lmc_common.c#3 delete .. //depot/projects/netperf/sys/dev/lmc/if_lmc_fbsd3.c#3 delete .. //depot/projects/netperf/sys/dev/lmc/if_lmc_media.c#3 delete .. //depot/projects/netperf/sys/dev/lmc/if_lmcioctl.h#2 delete .. //depot/projects/netperf/sys/dev/lmc/if_lmcvar.h#2 delete .. //depot/projects/netperf/sys/dev/sound/pcm/channel.c#6 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/netperf/sys/dev/sym/sym_hipd.c#5 integrate .. //depot/projects/netperf/sys/dev/twe/twe.c#5 integrate .. //depot/projects/netperf/sys/dev/twe/twe_compat.h#5 integrate .. //depot/projects/netperf/sys/dev/twe/twe_freebsd.c#4 integrate .. //depot/projects/netperf/sys/dev/twe/twe_tables.h#3 integrate .. //depot/projects/netperf/sys/dev/twe/tweio.h#3 integrate .. //depot/projects/netperf/sys/dev/twe/twereg.h#4 integrate .. //depot/projects/netperf/sys/dev/twe/twevar.h#4 integrate .. //depot/projects/netperf/sys/dev/wi/if_wi.c#19 integrate .. //depot/projects/netperf/sys/fs/nwfs/nwfs_vfsops.c#3 integrate .. //depot/projects/netperf/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/netperf/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/netperf/sys/fs/procfs/procfs_ioctl.c#2 integrate .. //depot/projects/netperf/sys/fs/procfs/procfs_map.c#5 integrate .. //depot/projects/netperf/sys/fs/procfs/procfs_rlimit.c#2 integrate .. //depot/projects/netperf/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/netperf/sys/fs/procfs/procfs_type.c#2 integrate .. //depot/projects/netperf/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/netperf/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/netperf/sys/fs/smbfs/smbfs_vfsops.c#5 integrate .. //depot/projects/netperf/sys/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/netperf/sys/geom/geom.h#4 integrate .. //depot/projects/netperf/sys/geom/geom_disk.c#6 integrate .. //depot/projects/netperf/sys/geom/geom_dump.c#2 integrate .. //depot/projects/netperf/sys/geom/geom_event.c#4 integrate .. //depot/projects/netperf/sys/geom/geom_io.c#8 integrate .. //depot/projects/netperf/sys/geom/geom_pc98.c#3 integrate .. //depot/projects/netperf/sys/i386/acpica/madt.c#7 integrate .. //depot/projects/netperf/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/netperf/sys/i386/conf/NOTES#11 integrate .. //depot/projects/netperf/sys/i386/i386/apic_vector.s#5 integrate .. //depot/projects/netperf/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/machdep.c#14 integrate .. //depot/projects/netperf/sys/i386/i386/mp_machdep.c#16 integrate .. //depot/projects/netperf/sys/i386/i386/mptable.c#7 integrate .. //depot/projects/netperf/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/netperf/sys/i386/include/cronyx.h#2 delete .. //depot/projects/netperf/sys/i386/include/cserial.h#1 branch .. //depot/projects/netperf/sys/i386/include/ioctl_meteor.h#2 integrate .. //depot/projects/netperf/sys/i386/include/sf_buf.h#2 integrate .. //depot/projects/netperf/sys/i386/isa/cronyx.c#2 delete .. //depot/projects/netperf/sys/i386/isa/cx.c#4 delete .. //depot/projects/netperf/sys/i386/isa/cxreg.h#3 delete .. //depot/projects/netperf/sys/i386/isa/cy.c#4 integrate .. //depot/projects/netperf/sys/i386/isa/if_cx.c#3 delete .. //depot/projects/netperf/sys/i386/isa/loran.c#2 delete .. //depot/projects/netperf/sys/ia64/ia64/machdep.c#21 integrate .. //depot/projects/netperf/sys/ia64/include/ioctl_meteor.h#2 integrate .. //depot/projects/netperf/sys/ia64/include/ucontext.h#5 integrate .. //depot/projects/netperf/sys/kern/init_sysent.c#8 integrate .. //depot/projects/netperf/sys/kern/kern_prot.c#5 integrate .. //depot/projects/netperf/sys/kern/kern_sig.c#9 integrate .. //depot/projects/netperf/sys/kern/kern_thread.c#8 integrate .. //depot/projects/netperf/sys/kern/kern_timeout.c#6 integrate .. //depot/projects/netperf/sys/kern/sched_ule.c#19 integrate .. //depot/projects/netperf/sys/kern/subr_mbpool.c#2 integrate .. //depot/projects/netperf/sys/kern/subr_mbuf.c#8 integrate .. //depot/projects/netperf/sys/kern/subr_prf.c#2 integrate .. //depot/projects/netperf/sys/kern/subr_smp.c#5 integrate .. //depot/projects/netperf/sys/kern/syscalls.c#8 integrate .. //depot/projects/netperf/sys/kern/syscalls.master#8 integrate .. //depot/projects/netperf/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/netperf/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/netperf/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/netperf/sys/modules/Makefile#12 integrate .. //depot/projects/netperf/sys/modules/acpi/Makefile#5 integrate .. //depot/projects/netperf/sys/modules/cx/Makefile#1 branch .. //depot/projects/netperf/sys/modules/hea/Makefile#2 delete .. //depot/projects/netperf/sys/net/if_var.h#6 integrate .. //depot/projects/netperf/sys/net/route.c#31 integrate .. //depot/projects/netperf/sys/netgraph/atm/ngatmbase.c#2 integrate .. //depot/projects/netperf/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/netperf/sys/netinet/ip_dummynet.c#20 integrate .. //depot/projects/netperf/sys/netinet/ip_fw2.c#21 integrate .. //depot/projects/netperf/sys/netinet/tcp_hostcache.c#5 integrate .. //depot/projects/netperf/sys/netkey/key.c#10 integrate .. //depot/projects/netperf/sys/pc98/conf/NOTES#8 integrate .. //depot/projects/netperf/sys/pci/cy_pci.c#2 integrate .. //depot/projects/netperf/sys/pci/if_dc.c#16 integrate .. //depot/projects/netperf/sys/pci/if_dcreg.h#5 integrate .. //depot/projects/netperf/sys/pci/if_sk.c#10 integrate .. //depot/projects/netperf/sys/pci/meteor.c#6 delete .. //depot/projects/netperf/sys/pci/meteor_reg.h#2 delete .. //depot/projects/netperf/sys/security/mac/mac_process.c#5 integrate .. //depot/projects/netperf/sys/security/mac_biba/mac_biba.c#7 integrate .. //depot/projects/netperf/sys/security/mac_lomac/mac_lomac.c#8 integrate .. //depot/projects/netperf/sys/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/netperf/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/netperf/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/netperf/sys/security/mac_test/mac_test.c#6 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/mp_machdep.c#5 integrate .. //depot/projects/netperf/sys/sys/_null.h#1 branch .. //depot/projects/netperf/sys/sys/ioctl_meteor.h#2 integrate .. //depot/projects/netperf/sys/sys/kse.h#3 integrate .. //depot/projects/netperf/sys/sys/mac.h#8 integrate .. //depot/projects/netperf/sys/sys/mac_policy.h#4 integrate .. //depot/projects/netperf/sys/sys/param.h#12 integrate .. //depot/projects/netperf/sys/sys/smp.h#3 integrate .. //depot/projects/netperf/sys/sys/stddef.h#2 integrate .. //depot/projects/netperf/sys/sys/syscall.h#8 integrate .. //depot/projects/netperf/sys/sys/syscall.mk#8 integrate .. //depot/projects/netperf/sys/sys/sysproto.h#8 integrate .. //depot/projects/netperf/sys/sys/systm.h#4 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_vfsops.c#9 integrate .. //depot/projects/netperf/sys/vm/uma_core.c#9 integrate .. //depot/projects/netperf/sys/vm/vm_mmap.c#9 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/alpha/db_trace.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.15 2003/08/17 06:42:07 marcel Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.16 2003/11/29 11:57:02 jeff Exp $ */ /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */ /*- @@ -112,7 +112,7 @@ * Decode the function prologue for the function we're in, and note * which registers are stored where, and how large the stack frame is. */ -static void +static int decode_prologue(db_addr_t callpc, db_addr_t func, struct prologue_info *pi) { @@ -127,6 +127,7 @@ do { \ if (pi->pi_frame_size != 0) { \ db_printf("frame size botch: adjust register offsets?\n"); \ + return (1); \ } \ } while (0) @@ -143,9 +144,11 @@ */ signed_immediate = (long)ins.mem_format.displacement; #if 1 - if (signed_immediate > 0) + if (signed_immediate > 0) { db_printf("prologue botch: displacement %ld\n", signed_immediate); + return (1); + } #endif CHECK_FRAMESIZE; pi->pi_frame_size += -signed_immediate; @@ -169,6 +172,7 @@ pi->pi_reg_offset[ins.mem_format.rd] = signed_immediate; } } + return (0); } static int @@ -363,7 +367,8 @@ * * XXX How does this interact w/ alloca()?! */ - decode_prologue(callpc, symval, &pi); + if (decode_prologue(callpc, symval, &pi)) + return; if ((pi.pi_regmask & (1 << 26)) == 0) { /* * No saved RA found. We might have RA from ==== //depot/projects/netperf/sys/alpha/alpha/mp_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.49 2003/11/21 22:23:25 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.51 2003/12/03 14:57:25 jhb Exp $"); #include "opt_kstack_pages.h" @@ -332,13 +332,11 @@ int i; mp_maxid = 0; - for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { + for (i = 0; i < hwrpb->rpb_pcs_cnt && i < MAXCPU; i++) { if (i == PCPU_GET(cpuid)) continue; if (!smp_cpu_enabled(LOCATE_PCS(hwrpb, i))) continue; - if (i > MAXCPU) - continue; mp_maxid = i; } } ==== //depot/projects/netperf/sys/alpha/conf/GENERIC#4 (text+ko) ==== @@ -12,13 +12,13 @@ # latest information. # # An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.164 2003/11/13 02:04:34 jeff Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.165 2003/12/08 05:20:34 obrien Exp $ machine alpha cpu EV4 @@ -62,7 +62,7 @@ options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 #Compatible with FreeBSD4 -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues @@ -111,8 +111,10 @@ device pass # Passthrough device (direct SCSI access) device ses # SCSI Environmental Services (and SAF-TE) +# RAID controllers interfaced to the SCSI subsystem +device amr # AMI MegaRAID + # RAID controllers -device amr # AMI MegaRAID device mlx # Mylex DAC960 family # atkbdc0 controls both the keyboard and the PS/2 mouse @@ -139,12 +141,12 @@ device lpt # Printer device ppi # Parallel port interface device #device vpo # Requires scbus and da - + # If you've got a "dumb" serial or parallel PCI card that is # supported by the puc(4) glue driver, uncomment the following # line to enable it (connects to the sio and/or ppc drivers): #device puc - + # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') device txp # 3Com 3cR990 (``Typhoon'') ==== //depot/projects/netperf/sys/alpha/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.6 2002/11/14 14:59:27 jhb Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.7 2003/12/05 00:57:11 des Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" hint.fdc.0.drq="2" hint.fd.0.at="fdc0" hint.fd.0.drive="0" +hint.fd.0.flags="4" hint.ata.0.at="isa" hint.ata.0.port="0x1F0" hint.ata.0.irq="14" ==== //depot/projects/netperf/sys/alpha/include/ioctl_meteor.h#2 (text+ko) ==== ==== //depot/projects/netperf/sys/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.7 2003/11/14 22:26:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.9 2003/12/06 23:14:44 peter Exp $"); #include #include ==== //depot/projects/netperf/sys/amd64/amd64/amd64-gdbstub.c#3 (text+ko) ==== @@ -12,6 +12,9 @@ ****************************************************************************/ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.26 2003/12/06 23:19:46 peter Exp $"); + /**************************************************************************** * Header: remcom.c,v 1.34 91/03/09 12:29:49 glenne Exp $ * @@ -92,9 +95,6 @@ * ****************************************************************************/ -#include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.25 2003/07/25 21:15:44 obrien Exp $"); - #include #include #include ==== //depot/projects/netperf/sys/amd64/amd64/amd64_mem.c#5 (text+ko) ==== @@ -22,11 +22,10 @@ * 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/amd64/amd64/amd64_mem.c,v 1.23 2003/11/22 01:11:07 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.24 2003/12/06 23:19:46 peter Exp $"); #include #include ==== //depot/projects/netperf/sys/amd64/amd64/apic_vector.S#2 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.95 2003/11/17 08:58:12 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.96 2003/12/06 23:19:47 peter Exp $ */ /* @@ -104,13 +104,13 @@ SUPERALIGN_TEXT ; \ IDTVEC(vec_name) ; \ PUSH_FRAME ; \ + FAKE_MCOUNT(13*4(%esp)) ; /* XXX avoid double count */ \ movq lapic, %rdx ; /* pointer to local APIC */ \ movl LA_ISR + 16 * (index)(%rdx), %eax ; /* load ISR */ \ bsrl %eax, %eax ; /* index of highset set bit in ISR */ \ jz 2f ; \ addl $(32 * index),%eax ; \ 1: ; \ - FAKE_MCOUNT(13*4(%esp)) ; /* XXX avoid double count */ \ movq %rax, %rdi ; /* pass the IRQ */ \ call lapic_handle_intr ; \ MEXITCOUNT ; \ ==== //depot/projects/netperf/sys/amd64/amd64/critical.c#5 (text+ko) ==== @@ -26,19 +26,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.12 2003/08/12 23:24:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.13 2003/12/06 23:13:22 peter Exp $"); #include #include -#include -#include -#include -#include -#include #include -#include -#include -#include #include /* @@ -47,8 +39,6 @@ void cpu_critical_fork_exit(void) { - struct thread *td; - td = curthread; - td->td_md.md_savecrit = read_rflags() | PSL_I; + curthread->td_md.md_savecrit = read_rflags() | PSL_I; } ==== //depot/projects/netperf/sys/amd64/amd64/fpu.c#3 (text+ko) ==== @@ -31,11 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)npx.c 7.2 (Berkeley) 5/12/91 + * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.146 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.147 2003/12/06 23:19:47 peter Exp $"); #include #include ==== //depot/projects/netperf/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.4 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.5 2003/12/06 23:14:44 peter Exp $"); #include #include @@ -551,6 +551,10 @@ if (!(cpu_feature & CPUID_APIC)) return; + /* Don't probe if APIC mode is disabled. */ + if (resource_disabled("apic", 0)) + return; + /* First, probe all the enumerators to find the best match. */ best_enum = NULL; best = 0; ==== //depot/projects/netperf/sys/amd64/amd64/machdep.c#11 (text+ko) ==== @@ -35,11 +35,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)machdep.c 7.4 (Berkeley) 6/3/91 + * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.600 2003/11/20 22:54:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.601 2003/12/06 23:19:47 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" ==== //depot/projects/netperf/sys/amd64/amd64/mem.c#4 (text+ko) ==== @@ -36,12 +36,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Utah $Hdr: mem.c 1.13 89/10/08$ - * @(#)mem.c 7.2 (Berkeley) 5/9/91 + * from: Utah $Hdr: mem.c 1.13 89/10/08$ + * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.111 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.112 2003/12/06 23:19:47 peter Exp $"); /* * Memory special file @@ -175,6 +175,7 @@ } c = iov->iov_len; + /* * Make sure that all of the pages are currently resident so * that we don't create any zero-fill pages. ==== //depot/projects/netperf/sys/amd64/amd64/mp_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.228 2003/11/21 22:23:25 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.230 2003/12/03 14:57:25 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" ==== //depot/projects/netperf/sys/amd64/amd64/nexus.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.57 2003/11/21 03:00:05 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.58 2003/12/06 23:19:47 peter Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -174,7 +174,7 @@ if (last == -1) last = irq; } else if (last != -1) { - if (rman_manage_region(&irq_rman, last, irq - 1) != 0) + if (rman_manage_region(&irq_rman, last, irq - 1) != 0) panic("nexus_probe irq_rman add"); last = -1; } ==== //depot/projects/netperf/sys/amd64/amd64/pmap.c#18 (text+ko) ==== @@ -40,7 +40,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 + * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.447 2003/11/21 03:01:59 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.448 2003/12/06 23:18:42 peter Exp $"); /* * Manages physical address maps. @@ -158,13 +158,6 @@ #define PMAP_INLINE #endif -/* - * Given a map and a machine independent protection code, - * convert to a vax protection code. - */ -#define pte_prot(m, p) (protection_codes[p]) -static pt_entry_t protection_codes[8]; - struct pmap kernel_pmap_store; LIST_HEAD(pmaplist, pmap); static struct pmaplist allpmaps; @@ -219,7 +212,6 @@ static PMAP_INLINE void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); -static void amd64_protection_init(void); static void pmap_clear_ptes(vm_page_t m, int bit) __always_inline; @@ -477,11 +469,6 @@ load_cr3(KPML4phys); /* - * Initialize protection array. - */ - amd64_protection_init(); - - /* * Initialize the kernel pmap (which is statically allocated). */ kernel_pmap->pm_pml4 = (pdp_entry_t *) (KERNBASE + KPML4phys); @@ -2095,8 +2082,13 @@ /* * Now validate mapping with desired protection/wiring. */ - newpte = (pt_entry_t)(pa | pte_prot(pmap, prot) | PG_V); - + newpte = (pt_entry_t)(pa | PG_V); + if ((prot & VM_PROT_WRITE) != 0) + newpte |= PG_RW; +#ifdef PG_NX + if ((prot & VM_PROT_EXECUTE) == 0) + newpte |= PG_NX; +#endif if (wired) newpte |= PG_W; if (va < VM_MAXUSER_ADDRESS) @@ -2845,40 +2837,6 @@ * Miscellaneous support routines follow */ -static void -amd64_protection_init() -{ - register long *kp, prot; - -#if 0 -#define PG_NX (1ul << 63) -#else -#define PG_NX 0 -#endif - - kp = protection_codes; - for (prot = 0; prot < 8; prot++) { - switch (prot) { - case VM_PROT_NONE | VM_PROT_NONE | VM_PROT_NONE: - case VM_PROT_READ | VM_PROT_NONE | VM_PROT_NONE: - *kp++ = PG_NX; - break; - case VM_PROT_READ | VM_PROT_NONE | VM_PROT_EXECUTE: - case VM_PROT_NONE | VM_PROT_NONE | VM_PROT_EXECUTE: - *kp++ = 0; - break; - case VM_PROT_NONE | VM_PROT_WRITE | VM_PROT_NONE: - case VM_PROT_READ | VM_PROT_WRITE | VM_PROT_NONE: - *kp++ = PG_RW | PG_NX; - break; - case VM_PROT_NONE | VM_PROT_WRITE | VM_PROT_EXECUTE: - case VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE: - *kp++ = PG_RW; - break; - } - } -} - /* * Map a set of physical memory pages into the kernel virtual * address space. Return a pointer to where it is mapped. This ==== //depot/projects/netperf/sys/amd64/ia32/ia32_signal.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.6 2003/11/08 07:43:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.7 2003/12/03 07:00:30 peter Exp $"); #include "opt_compat.h" @@ -187,6 +187,7 @@ p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); psp = p->p_sigacts; + mtx_assert(&psp->ps_mtx, MA_OWNED); regs = td->td_frame; oonstack = sigonstack(regs->tf_rsp); @@ -250,6 +251,7 @@ sf.sf_addr = regs->tf_addr; sf.sf_ah = (u_int32_t)(uintptr_t)catcher; } + mtx_unlock(&psp->ps_mtx); PROC_UNLOCK(p); /* @@ -274,6 +276,7 @@ td->td_pcb->pcb_es = _udatasel; /* leave user %fs and %gs untouched */ PROC_LOCK(p); + mtx_lock(&psp->ps_mtx); } #endif /* COMPAT_FREEBSD4 */ @@ -298,6 +301,7 @@ return; } #endif + mtx_assert(&psp->ps_mtx, MA_OWNED); regs = td->td_frame; oonstack = sigonstack(regs->tf_rsp); @@ -366,6 +370,7 @@ sf.sf_addr = regs->tf_addr; sf.sf_ah = (u_int32_t)(uintptr_t)catcher; } + mtx_unlock(&psp->ps_mtx); PROC_UNLOCK(p); /* @@ -390,6 +395,7 @@ td->td_pcb->pcb_es = _udatasel; /* leave user %fs and %gs untouched */ PROC_LOCK(p); + mtx_lock(&psp->ps_mtx); } /* ==== //depot/projects/netperf/sys/amd64/include/cpufunc.h#3 (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/include/cpufunc.h,v 1.137 2003/11/08 04:39:22 peter Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.138 2003/12/06 23:22:43 peter Exp $ */ /* @@ -77,6 +77,15 @@ return (result); } +static __inline u_long +bsfq(u_long mask) +{ + u_long result; + + __asm __volatile("bsfq %1,%0" : "=r" (result) : "rm" (mask)); + return (result); +} + static __inline u_int bsrl(u_int mask) { @@ -86,6 +95,15 @@ return (result); } +static __inline u_long +bsrq(u_long mask) +{ + u_long result; + + __asm __volatile("bsrq %1,%0" : "=r" (result) : "rm" (mask)); + return (result); +} + static __inline void disable_intr(void) { @@ -111,13 +129,26 @@ static __inline int ffs(int mask) { +#if 0 /* * Note that gcc-2's builtin ffs would be used if we didn't declare * this inline or turn off the builtin. The builtin is faster but * broken in gcc-2.4.5 and slower but working in gcc-2.5 and later * versions. */ - return (mask == 0 ? mask : (int)bsfl((u_int)mask) + 1); + return (mask == 0 ? mask : (int)bsfl((u_int)mask) + 1); +#else + /* Actually, the above is way out of date. The builtins use cmov etc */ + return (__builtin_ffs(mask)); +#endif +} + +#define HAVE_INLINE_FFSL + +static __inline int +ffsl(long mask) +{ + return (mask == 0 ? mask : (int)bsfq((u_long)mask) + 1); } #define HAVE_INLINE_FLS @@ -128,6 +159,14 @@ return (mask == 0 ? mask : (int)bsrl((u_int)mask) + 1); } +#define HAVE_INLINE_FLSL + +static __inline int +flsl(long mask) +{ + return (mask == 0 ? mask : (int)bsrq((u_long)mask) + 1); +} + static __inline void halt(void) { ==== //depot/projects/netperf/sys/amd64/include/critical.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * related support functions residing * in //critical.c - prototyped * - * $FreeBSD: src/sys/amd64/include/critical.h,v 1.5 2003/08/12 23:24:04 imp Exp $ + * $FreeBSD: src/sys/amd64/include/critical.h,v 1.6 2003/12/06 23:13:22 peter Exp $ */ #ifndef _MACHINE_CRITICAL_H_ @@ -57,10 +57,7 @@ static __inline void cpu_critical_enter(void) { - struct thread *td; - - td = curthread; - td->td_md.md_savecrit = intr_disable(); + curthread->td_md.md_savecrit = intr_disable(); } /* @@ -73,10 +70,7 @@ static __inline void cpu_critical_exit(void) { - struct thread *td; - - td = curthread; - intr_restore(td->td_md.md_savecrit); + intr_restore(curthread->td_md.md_savecrit); } #else /* !__GNUC__ */ ==== //depot/projects/netperf/sys/amd64/include/mutex.h#2 (text+ko) ==== @@ -26,14 +26,13 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: src/sys/amd64/include/mutex.h,v 1.37 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/mutex.h,v 1.38 2003/12/06 23:17:18 peter Exp $ */ #ifndef _MACHINE_MUTEX_H_ #define _MACHINE_MUTEX_H_ #ifndef LOCORE - #ifdef _KERNEL /* Global locks */ @@ -41,35 +40,5 @@ #endif /* _KERNEL */ -#else /* !LOCORE */ - -/* - * Simple assembly macros to get and release mutexes. - * - * Note: All of these macros accept a "flags" argument and are analoguous - * to the mtx_lock_flags and mtx_unlock_flags general macros. If one - * desires to not pass a flag, the value 0 may be passed as second - * argument. - * - * XXX: We only have MTX_LOCK_SPIN and MTX_UNLOCK_SPIN for now, since that's - * all we use right now. We should add MTX_LOCK and MTX_UNLOCK (for sleep - * locks) in the near future, however. - */ -#define MTX_LOCK_SPIN(lck, flags) \ - pushq $0 ; \ - pushq $0 ; \ - pushq $flags ; \ - pushq $lck ; \ - call _mtx_lock_spin_flags ; \ - addq $0x20, %rsp ; \ - -#define MTX_UNLOCK_SPIN(lck) \ - pushq $0 ; \ - pushq $0 ; \ - pushq $0 ; \ - pushq $lck ; \ - call _mtx_unlock_spin_flags ; \ - addq $0x20, %rsp ; \ - #endif /* !LOCORE */ #endif /* __MACHINE_MUTEX_H */ ==== //depot/projects/netperf/sys/amd64/include/runq.h#2 (text+ko) ==== @@ -23,24 +23,24 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/runq.h,v 1.2 2002/06/20 06:21:20 peter Exp $ + * $FreeBSD: src/sys/amd64/include/runq.h,v 1.3 2003/12/06 23:24:18 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ #define _MACHINE_RUNQ_H_ -#define RQB_LEN (2) /* Number of priority status words. */ -#define RQB_L2BPW (5) /* Log2(sizeof(rqb_word_t) * NBBY)). */ +#define RQB_LEN (1) /* Number of priority status words. */ +#define RQB_L2BPW (6) /* Log2(sizeof(rqb_word_t) * NBBY)). */ #define RQB_BPW (1<> RQB_L2BPW) -#define RQB_FFS(word) (ffs(word) - 1) +#define RQB_FFS(word) (bsfq(word)) /* * Type of run queue status word. */ -typedef u_int32_t rqb_word_t; +typedef u_int64_t rqb_word_t; #endif ==== //depot/projects/netperf/sys/amd64/include/vmparam.h#5 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.43 2003/11/08 04:39:22 peter Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.44 2003/12/07 04:51:04 alc Exp $ */ @@ -133,7 +133,7 @@ * Ceiling on amount of kmem_map kva space. */ #ifndef VM_KMEM_SIZE_MAX -#define VM_KMEM_SIZE_MAX (200 * 1024 * 1024) +#define VM_KMEM_SIZE_MAX (400 * 1024 * 1024) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 8 12:54:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 983E316A4D0; Mon, 8 Dec 2003 12:54:00 -0800 (PST) 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 7034016A4CE for ; Mon, 8 Dec 2003 12:54:00 -0800 (PST) Received: from mail6.speakeasy.net (mail6.speakeasy.net [216.254.0.206]) by mx1.FreeBSD.org (Postfix) with ESMTP id 937F343D33 for ; Mon, 8 Dec 2003 12:53:24 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 22067 invoked from network); 8 Dec 2003 20:52:30 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 8 Dec 2003 20:52:30 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.9/8.12.9) with ESMTP id hB8KqQie052546; Mon, 8 Dec 2003 15:52:26 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200312052223.hB5MN2uC060978@repoman.freebsd.org> Date: Mon, 08 Dec 2003 15:52:28 -0500 (EST) From: John Baldwin To: Peter Wemm X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: Perforce Change Reviews Subject: RE: PERFORCE change 43467 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 Dec 2003 20:54:01 -0000 On 05-Dec-2003 Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=43467 > > Change 43467 by peter@peter_daintree on 2003/12/05 14:22:30 > > Integ -b i386_hammer -I. This catches up with jhb's changes. > One change isn't relevant because there is no way to compile out > the apic code on amd64, so we dont need the apic stubs. Umm you don't want all this. You want mp_maxid to be right, and if you change this this is going to break mp_maxid for amd64. :( > Affected files ... > > .. //depot/projects/hammer/sys/amd64/acpica/madt.c#23 integrate > .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#26 integrate > .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#74 integrate > .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#18 integrate > .. //depot/projects/hammer/sys/amd64/conf/GENERIC#27 integrate > > Differences ... > > ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#23 (text+ko) ==== > > @@ -190,7 +190,7 @@ > XSDT_DESCRIPTOR *xsdt; > int i, count; > > - if (resource_disabled("acpi", 0) || resource_disabled("apic", 0)) > + if (resource_disabled("acpi", 0)) > return (ENXIO); > > /* > @@ -351,8 +351,7 @@ > > apic_register_enumerator(&madt_enumerator); > } > -SYSINIT(madt_register, SI_SUB_TUNABLES - 1, SI_ORDER_FIRST, > - madt_register, NULL) > +SYSINIT(madt_register, SI_SUB_CPU - 1, SI_ORDER_FIRST, madt_register, NULL) > > /* > * Call the handler routine for each entry in the MADT table. > @@ -644,7 +643,7 @@ > > if (madt == NULL) > return; > - for (i = 0; i < MAXCPU; i++) { > + for (i = 0; i <= mp_maxid; i++) { > if (CPU_ABSENT(i)) > continue; > pc = pcpu_find(i); > > ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#26 (text+ko) ==== > > @@ -542,9 +542,8 @@ > } > > /* > - * We have to look for CPU's very, very early because certain subsystems > - * want to know how many CPU's we have extremely early on in the boot > - * process. > + * Probe the APIC enumerators, enumerate CPUs, and initialize the > + * local APIC. > */ > static void > apic_init(void *dummy __unused) > @@ -556,6 +555,10 @@ > if (!(cpu_feature & CPUID_APIC)) > return; > > + /* Don't probe if APIC mode is disabled. */ > + if (resource_disabled("apic", 0)) > + return; > + > /* First, probe all the enumerators to find the best match. */ > best_enum = NULL; > best = 0; > @@ -583,26 +586,14 @@ > if (retval != 0) > printf("%s: Failed to probe CPUs: returned %d\n", > best_enum->apic_name, retval); > -} > -SYSINIT(apic_init, SI_SUB_TUNABLES - 1, SI_ORDER_SECOND, apic_init, NULL) > > -/* > - * Setup the local APIC. We have to do this prior to starting up the APs > - * in the SMP case. > - */ > -static void > -apic_setup_local(void *dummy __unused) > -{ > - int retval; > - > - if (best_enum == NULL) > - return; > + /* Third, initialize the local APIC. */ > retval = best_enum->apic_setup_local(); > if (retval != 0) > printf("%s: Failed to setup the local APIC: returned %d\n", > best_enum->apic_name, retval); > } > -SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL) > +SYSINIT(apic_init, SI_SUB_CPU, SI_ORDER_FIRST, apic_init, NULL) > > /* > * Setup the I/O APICs. > > ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#74 (text+ko) ==== > > > ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#18 (text+ko) ==== > > @@ -370,8 +370,8 @@ > > apic_register_enumerator(&mptable_enumerator); > } > -SYSINIT(mptable_register, SI_SUB_TUNABLES - 1, SI_ORDER_FIRST, > - mptable_register, NULL) > +SYSINIT(mptable_register, SI_SUB_CPU - 1, SI_ORDER_FIRST, mptable_register, > + NULL) > > /* > * Call the handler routine for each entry in the MP config table. > > ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#27 (text+ko) ==== > -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Mon Dec 8 12:54:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60C6B16A4D0; Mon, 8 Dec 2003 12:54:02 -0800 (PST) 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 3914416A4CE for ; Mon, 8 Dec 2003 12:54:02 -0800 (PST) Received: from mail1.speakeasy.net (mail1.speakeasy.net [216.254.0.201]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1129D43D32 for ; Mon, 8 Dec 2003 12:54:01 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 15900 invoked from network); 8 Dec 2003 20:52:48 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 8 Dec 2003 20:52:48 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.9/8.12.9) with ESMTP id hB8Kqjie052551; Mon, 8 Dec 2003 15:52:45 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20031205152304.D27817@root.org> Date: Mon, 08 Dec 2003 15:52:47 -0500 (EST) From: John Baldwin To: Nate Lawson X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: Perforce Change Reviews Subject: Re: PERFORCE change 43464 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 Dec 2003 20:54:02 -0000 On 05-Dec-2003 Nate Lawson wrote: > On Fri, 5 Dec 2003, John Baldwin wrote: >> Change 43464 by jhb@jhb_blue on 2003/12/05 12:59:01 >> >> More updates. Closer to working than I thought. In theory >> PCI devices should all just work now. > > This handles PCI. Are you ok with me adding the call to > acpi_pwr_switch_consumer() for non-PCI devices like the embedded > controller? I think we need to do this at the top \\_SB level. I'm a bit > confused as to the handoff between the general tree walk and the ACPI-PCI > driver though. It won't hurt to switch a device on twice. It should be ok to do a top-level tree walk of all device objects and turn them on before probing child devices I think. ACPI shouldn't turn off devices that don't probe like PCI does though because ACPI has duplicate objects of things like the entire PCI device tree. :-/ Feel free to submit changes to the power tree btw. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Mon Dec 8 13:40:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C938316A4D0; Mon, 8 Dec 2003 13:40:36 -0800 (PST) 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 A10FD16A4CE; Mon, 8 Dec 2003 13:40:36 -0800 (PST) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30B6C43D39; Mon, 8 Dec 2003 13:40:31 -0800 (PST) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 1FC762A7EA; Mon, 8 Dec 2003 13:40:31 -0800 (PST) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.6.3 04/04/2003 with nmh-1.0.4 To: John Baldwin In-Reply-To: Date: Mon, 08 Dec 2003 13:40:31 -0800 From: Peter Wemm Message-Id: <20031208214031.1FC762A7EA@canning.wemm.org> cc: Perforce Change Reviews Subject: Re: PERFORCE change 43467 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 Dec 2003 21:40:37 -0000 John Baldwin wrote: > > On 05-Dec-2003 Peter Wemm wrote: > > http://perforce.freebsd.org/chv.cgi?CH=43467 > > > > Change 43467 by peter@peter_daintree on 2003/12/05 14:22:30 > > > > Integ -b i386_hammer -I. This catches up with jhb's changes. > > One change isn't relevant because there is no way to compile out > > the apic code on amd64, so we dont need the apic stubs. > > Umm you don't want all this. You want mp_maxid to be right, and if > you change this this is going to break mp_maxid for amd64. :( Indeed. See change 43515... Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 From owner-p4-projects@FreeBSD.ORG Mon Dec 8 13:40:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D56816A4D0; Mon, 8 Dec 2003 13:40:42 -0800 (PST) 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 D269D16A4CE for ; Mon, 8 Dec 2003 13:40:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B9F243D33 for ; Mon, 8 Dec 2003 13:39:12 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB8LcfXJ016699 for ; Mon, 8 Dec 2003 13:38:41 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB8Lcenc016696 for perforce@freebsd.org; Mon, 8 Dec 2003 13:38:40 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 8 Dec 2003 13:38:40 -0800 (PST) Message-Id: <200312082138.hB8Lcenc016696@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43637 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 Dec 2003 21:40:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=43637 Change 43637 by sam@sam_ebb on 2003/12/08 13:37:57 IFC Affected files ... .. //depot/projects/netperf/sys/alpha/include/ioctl_bt848.h#2 integrate .. //depot/projects/netperf/sys/alpha/include/ioctl_meteor.h#3 integrate .. //depot/projects/netperf/sys/boot/i386/Makefile#2 integrate .. //depot/projects/netperf/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/netperf/sys/boot/i386/boot0/boot0sio.s#1 branch .. //depot/projects/netperf/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_da.c#13 integrate .. //depot/projects/netperf/sys/dev/ata/ata-chipset.c#13 integrate .. //depot/projects/netperf/sys/dev/bge/if_bge.c#15 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_audio.c#5 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_card.c#4 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_core.c#9 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_i2c.c#4 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_os.c#7 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_tuner.c#4 integrate .. //depot/projects/netperf/sys/dev/bktr/ioctl_bt848.h#2 integrate .. //depot/projects/netperf/sys/dev/bktr/ioctl_meteor.h#2 integrate .. //depot/projects/netperf/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/netperf/sys/dev/ciss/ciss.c#7 integrate .. //depot/projects/netperf/sys/dev/ciss/cissreg.h#2 integrate .. //depot/projects/netperf/sys/dev/ed/if_ed.c#8 integrate .. //depot/projects/netperf/sys/dev/fe/if_fe.c#5 integrate .. //depot/projects/netperf/sys/dev/lge/if_lge.c#7 integrate .. //depot/projects/netperf/sys/dev/lnc/if_lnc.c#6 integrate .. //depot/projects/netperf/sys/dev/my/if_my.c#8 integrate .. //depot/projects/netperf/sys/dev/nge/if_nge.c#7 integrate .. //depot/projects/netperf/sys/dev/re/if_re.c#9 integrate .. //depot/projects/netperf/sys/dev/sn/if_sn.c#8 integrate .. //depot/projects/netperf/sys/dev/tx/if_tx.c#8 integrate .. //depot/projects/netperf/sys/dev/usb/if_aue.c#8 integrate .. //depot/projects/netperf/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/netperf/sys/dev/usb/if_cue.c#8 integrate .. //depot/projects/netperf/sys/dev/usb/if_rue.c#6 integrate .. //depot/projects/netperf/sys/dev/xe/if_xe.c#9 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/netperf/sys/i386/include/ioctl_bt848.h#2 integrate .. //depot/projects/netperf/sys/i386/include/ioctl_meteor.h#3 integrate .. //depot/projects/netperf/sys/ia64/include/ioctl_bt848.h#2 delete .. //depot/projects/netperf/sys/ia64/include/ioctl_meteor.h#3 delete .. //depot/projects/netperf/sys/libkern/iconv_xlat16.c#2 integrate .. //depot/projects/netperf/sys/netinet6/nd6.c#17 integrate .. //depot/projects/netperf/sys/pci/if_pcn.c#7 integrate .. //depot/projects/netperf/sys/pci/if_rl.c#15 integrate .. //depot/projects/netperf/sys/pci/if_sf.c#7 integrate .. //depot/projects/netperf/sys/pci/if_sis.c#18 integrate .. //depot/projects/netperf/sys/pci/if_sk.c#11 integrate .. //depot/projects/netperf/sys/pci/if_ste.c#7 integrate .. //depot/projects/netperf/sys/pci/if_tl.c#7 integrate .. //depot/projects/netperf/sys/pci/if_vr.c#7 integrate .. //depot/projects/netperf/sys/pci/if_wb.c#7 integrate .. //depot/projects/netperf/sys/pci/if_xl.c#14 integrate .. //depot/projects/netperf/sys/sys/iconv.h#4 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/include/ioctl_bt848.h#2 (text+ko) ==== @@ -1,298 +1,38 @@ -/* - * extensions to ioctl_meteor.h for the bt848 cards +/*- + * Copyright (c) 2003 David O'Brien + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY 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/alpha/include/ioctl_bt848.h,v 1.2 2000/10/27 07:07:24 roger Exp $ + * $FreeBSD: src/sys/alpha/include/ioctl_bt848.h,v 1.3 2003/12/08 07:22:41 obrien Exp $ */ -#ifndef _MACHINE_IOCTL_BT848_H_ -#define _MACHINE_IOCTL_BT848_H_ +#ifndef _MACHINE_IOCTL_BT848_H_ +#define _MACHINE_IOCTL_BT848_H_ -/* - * frequency sets - */ -#define CHNLSET_NABCST 1 -#define CHNLSET_CABLEIRC 2 -#define CHNLSET_CABLEHRC 3 -#define CHNLSET_WEUROPE 4 -#define CHNLSET_JPNBCST 5 -#define CHNLSET_JPNCABLE 6 -#define CHNLSET_XUSSR 7 -#define CHNLSET_AUSTRALIA 8 -#define CHNLSET_FRANCE 9 -#define CHNLSET_MIN CHNLSET_NABCST -#define CHNLSET_MAX CHNLSET_FRANCE +#ifdef __GNUC__ +#warning Include dev/bktr/ioctl_bt848.h instead of this header. +#endif - -/* - * constants for various tuner registers - */ -#define BT848_HUEMIN (-90) -#define BT848_HUEMAX 90 -#define BT848_HUECENTER 0 -#define BT848_HUERANGE 179.3 -#define BT848_HUEREGMIN (-128) -#define BT848_HUEREGMAX 127 -#define BT848_HUESTEPS 256 - -#define BT848_BRIGHTMIN (-50) -#define BT848_BRIGHTMAX 50 -#define BT848_BRIGHTCENTER 0 -#define BT848_BRIGHTRANGE 99.6 -#define BT848_BRIGHTREGMIN (-128) -#define BT848_BRIGHTREGMAX 127 -#define BT848_BRIGHTSTEPS 256 - -#define BT848_CONTRASTMIN 0 -#define BT848_CONTRASTMAX 237 -#define BT848_CONTRASTCENTER 100 -#define BT848_CONTRASTRANGE 236.57 -#define BT848_CONTRASTREGMIN 0 -#define BT848_CONTRASTREGMAX 511 -#define BT848_CONTRASTSTEPS 512 - -#define BT848_CHROMAMIN 0 -#define BT848_CHROMAMAX 284 -#define BT848_CHROMACENTER 100 -#define BT848_CHROMARANGE 283.89 -#define BT848_CHROMAREGMIN 0 -#define BT848_CHROMAREGMAX 511 -#define BT848_CHROMASTEPS 512 - -#define BT848_SATUMIN 0 -#define BT848_SATUMAX 202 -#define BT848_SATUCENTER 100 -#define BT848_SATURANGE 201.18 -#define BT848_SATUREGMIN 0 -#define BT848_SATUREGMAX 511 -#define BT848_SATUSTEPS 512 - -#define BT848_SATVMIN 0 -#define BT848_SATVMAX 284 -#define BT848_SATVCENTER 100 -#define BT848_SATVRANGE 283.89 -#define BT848_SATVREGMIN 0 -#define BT848_SATVREGMAX 511 -#define BT848_SATVSTEPS 512 - - -/* - * audio stuff - */ -#define AUDIO_TUNER 0x00 /* command for the audio routine */ -#define AUDIO_EXTERN 0x01 /* don't confuse them with bit */ -#define AUDIO_INTERN 0x02 /* settings */ -#define AUDIO_MUTE 0x80 -#define AUDIO_UNMUTE 0x81 - - -/* - * EEProm stuff - */ -struct eeProm { - short offset; - short count; - u_char bytes[ 256 ]; -}; - - -/* - * XXX: this is a hack, should be in ioctl_meteor.h - * here to avoid touching that file for now... - */ -#define TVTUNER_SETCHNL _IOW('x', 32, unsigned int) /* set channel */ -#define TVTUNER_GETCHNL _IOR('x', 32, unsigned int) /* get channel */ -#define TVTUNER_SETTYPE _IOW('x', 33, unsigned int) /* set tuner type */ -#define TVTUNER_GETTYPE _IOR('x', 33, unsigned int) /* get tuner type */ -#define TVTUNER_GETSTATUS _IOR('x', 34, unsigned int) /* get tuner status */ -#define TVTUNER_SETFREQ _IOW('x', 35, unsigned int) /* set frequency */ -#define TVTUNER_GETFREQ _IOR('x', 36, unsigned int) /* get frequency */ - - -#define BT848_SHUE _IOW('x', 37, int) /* set hue */ -#define BT848_GHUE _IOR('x', 37, int) /* get hue */ -#define BT848_SBRIG _IOW('x', 38, int) /* set brightness */ -#define BT848_GBRIG _IOR('x', 38, int) /* get brightness */ -#define BT848_SCSAT _IOW('x', 39, int) /* set chroma sat */ -#define BT848_GCSAT _IOR('x', 39, int) /* get UV saturation */ -#define BT848_SCONT _IOW('x', 40, int) /* set contrast */ -#define BT848_GCONT _IOR('x', 40, int) /* get contrast */ -#define BT848_SVSAT _IOW('x', 41, int) /* set chroma V sat */ -#define BT848_GVSAT _IOR('x', 41, int) /* get V saturation */ -#define BT848_SUSAT _IOW('x', 42, int) /* set chroma U sat */ -#define BT848_GUSAT _IOR('x', 42, int) /* get U saturation */ - -#define BT848_SCBARS _IOR('x', 43, int) /* set colorbar */ -#define BT848_CCBARS _IOR('x', 44, int) /* clear colorbar */ - - -#define BT848_SAUDIO _IOW('x', 46, int) /* set audio channel */ -#define BT848_GAUDIO _IOR('x', 47, int) /* get audio channel */ -#define BT848_SBTSC _IOW('x', 48, int) /* set audio channel */ - -#define BT848_GSTATUS _IOR('x', 49, unsigned int) /* reap status */ - -#define BT848_WEEPROM _IOWR('x', 50, struct eeProm) /* write to EEProm */ -#define BT848_REEPROM _IOWR('x', 51, struct eeProm) /* read from EEProm */ +#include -#define BT848_SIGNATURE _IOWR('x', 52, struct eeProm) /* read card sig */ - -#define TVTUNER_SETAFC _IOW('x', 53, int) /* turn AFC on/off */ -#define TVTUNER_GETAFC _IOR('x', 54, int) /* query AFC on/off */ -#define BT848_SLNOTCH _IOW('x', 55, int) /* set luma notch */ -#define BT848_GLNOTCH _IOR('x', 56, int) /* get luma notch */ - -/* Read/Write the BT848's I2C bus directly - * b7-b0: data (read/write) - * b15-b8: internal peripheral register (write) - * b23-b16: i2c addr (write) - * b31-b24: 1 = write, 0 = read - */ -#define BT848_I2CWR _IOWR('x', 57, u_long) /* i2c read-write */ - -struct bktr_msp_control { - unsigned char function; - unsigned int address; - unsigned int data; -}; - -#define BT848_MSP_RESET _IO('x', 76) /* MSP chip reset */ -#define BT848_MSP_READ _IOWR('x', 77, struct bktr_msp_control) /* MSP chip reset */ -#define BT848_MSP_WRITE _IOWR('x', 78, struct bktr_msp_control) /* MSP chip reset */ - -/* Support for radio tuner */ -#define RADIO_SETMODE _IOW('x', 58, unsigned int) /* set radio modes */ -#define RADIO_GETMODE _IOR('x', 58, unsigned char) /* get radio modes */ -#define RADIO_AFC 0x01 /* These modes will probably not */ -#define RADIO_MONO 0x02 /* work on the FRxxxx. It does */ -#define RADIO_MUTE 0x08 /* work on the FMxxxx. */ -#define RADIO_SETFREQ _IOW('x', 59, unsigned int) /* set frequency */ -#define RADIO_GETFREQ _IOR('x', 59, unsigned int) /* set frequency */ - /* Argument is frequency*100MHz */ - -/* - * XXX: more bad magic, - * we need to fix the METEORGINPUT to return something public - * duplicate them here for now... - */ -#define METEOR_DEV0 0x00001000 -#define METEOR_DEV1 0x00002000 -#define METEOR_DEV2 0x00004000 -#define METEOR_DEV3 0x00008000 -#define METEOR_DEV_SVIDEO 0x00006000 -/* - * right now I don't know were to put these, but as they are suppose to be - * a part of a common video capture interface, these should be relocated to - * another place. Probably most of the METEOR_xxx defines need to be - * renamed and moved to a common header - */ - -typedef enum { METEOR_PIXTYPE_RGB, METEOR_PIXTYPE_YUV, - METEOR_PIXTYPE_YUV_PACKED, - METEOR_PIXTYPE_YUV_12 } METEOR_PIXTYPE; - - -struct meteor_pixfmt { - u_int index; /* Index in supported pixfmt list */ - METEOR_PIXTYPE type; /* What's the board gonna feed us */ - u_int Bpp; /* Bytes per pixel */ - u_long masks[3]; /* R,G,B or Y,U,V masks, respectively */ - unsigned swap_bytes :1; /* Bytes swapped within shorts */ - unsigned swap_shorts:1; /* Shorts swapped within longs */ -}; - - -struct bktr_clip { - int x_min; - int x_max; - int y_min; - int y_max; -}; - -#define BT848_MAX_CLIP_NODE 100 -struct _bktr_clip { - struct bktr_clip x[BT848_MAX_CLIP_NODE]; -}; - -/* - * I'm using METEOR_xxx just because that will be common to other interface - * and less of a surprise - */ -#define METEORSACTPIXFMT _IOW('x', 64, int ) -#define METEORGACTPIXFMT _IOR('x', 64, int ) -#define METEORGSUPPIXFMT _IOWR('x', 65, struct meteor_pixfmt) - -/* set clip list */ -#define BT848SCLIP _IOW('x', 66, struct _bktr_clip ) -#define BT848GCLIP _IOR('x', 66, struct _bktr_clip ) - - -/* set input format */ -#define BT848SFMT _IOW('x', 67, unsigned long ) -#define BT848GFMT _IOR('x', 67, unsigned long ) - -/* set clear-buffer-on-start */ -#define BT848SCBUF _IOW('x', 68, int) -#define BT848GCBUF _IOR('x', 68, int) - -/* set capture area */ -/* The capture area is the area of the video image which is grabbed */ -/* Usually the capture area is 640x480 (768x576 PAL) pixels */ -/* This area is then scaled to the dimensions the user requires */ -/* using the METEORGEO ioctl */ -/* However, the capture area could be 400x300 pixels from the top right */ -/* corner of the video image */ -struct bktr_capture_area { - int x_offset; - int y_offset; - int x_size; - int y_size; -}; -#define BT848_SCAPAREA _IOW('x', 69, struct bktr_capture_area) -#define BT848_GCAPAREA _IOR('x', 69, struct bktr_capture_area) - - -/* Get channel Set */ -#define BT848_MAX_CHNLSET_NAME_LEN 16 -struct bktr_chnlset { - short index; - short max_channel; - char name[BT848_MAX_CHNLSET_NAME_LEN]; -}; -#define TVTUNER_GETCHNLSET _IOWR('x', 70, struct bktr_chnlset) - - - -/* Infra Red Remote Control */ -struct bktr_remote { - unsigned char data[3]; -}; -#define REMOTE_GETKEY _IOR('x', 71, struct bktr_remote)/*read the remote */ - /*control receiver*/ - /*returns raw data*/ - - -/* - * Direct access to GPIO pins. You must add BKTR_GPIO_ACCESS to your kernel - * configuration file to use these - */ -#define BT848_GPIO_SET_EN _IOW('x', 72, int) /* set gpio_out_en */ -#define BT848_GPIO_GET_EN _IOR('x', 73, int) /* get gpio_out_en */ -#define BT848_GPIO_SET_DATA _IOW('x', 74, int) /* set gpio_data */ -#define BT848_GPIO_GET_DATA _IOR('x', 75, int) /* get gpio_data */ - - - -/* XXX - Copied from /sys/pci/brktree_reg.h */ -#define BT848_IFORM_FORMAT (0x7<<0) -# define BT848_IFORM_F_RSVD (0x7) -# define BT848_IFORM_F_SECAM (0x6) -# define BT848_IFORM_F_PALN (0x5) -# define BT848_IFORM_F_PALM (0x4) -# define BT848_IFORM_F_PALBDGHI (0x3) -# define BT848_IFORM_F_NTSCJ (0x2) -# define BT848_IFORM_F_NTSCM (0x1) -# define BT848_IFORM_F_AUTO (0x0) - - #endif /* _MACHINE_IOCTL_BT848_H_ */ - ==== //depot/projects/netperf/sys/alpha/include/ioctl_meteor.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ -/* - * Copyright (c) 1995 Mark Tinguely and Jim Lowe +/*- + * Copyright (c) 2003 David O'Brien * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,11 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Mark Tinguely and Jim Lowe - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -28,160 +23,16 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.1 2000/04/15 08:07:56 roger Exp $ + * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.4 2003/12/08 07:22:41 obrien Exp $ */ -/* - * ioctl constants for Matrox Meteor Capture card. - */ #ifndef _MACHINE_IOCTL_METEOR_H_ #define _MACHINE_IOCTL_METEOR_H_ -#ifndef _KERNEL -#include +#ifdef __GNUC__ +#warning Include dev/bktr/ioctl_meteor.h instead of this header. #endif -#include -struct meteor_capframe { - short command; /* see below for valid METEORCAPFRM commands */ - short lowat; /* start transfer if < this number */ - short hiwat; /* stop transfer if > this number */ -} ; +#include -/* structure for METEOR[GS]ETGEO - get/set geometry */ -struct meteor_geomet { - u_short rows; - u_short columns; - u_short frames; - u_long oformat; -} ; - -/* structure for METEORGCOUNT-get count of frames, fifo errors and dma errors */ -struct meteor_counts { - u_long fifo_errors; /* count of fifo errors since open */ - u_long dma_errors; /* count of dma errors since open */ - u_long frames_captured; /* count of frames captured since open */ - u_long even_fields_captured; /* count of even fields captured */ - u_long odd_fields_captured; /* count of odd fields captured */ -} ; - -/* structure for getting and setting direct transfers to vram */ -struct meteor_video { - u_long addr; /* Address of location to dma to */ - u_long width; /* Width of memory area */ - u_long banksize; /* Size of Vram bank */ - u_long ramsize; /* Size of Vram */ -}; - -#define METEORCAPTUR _IOW('x', 1, int) /* capture a frame */ -#define METEORCAPFRM _IOW('x', 2, struct meteor_capframe) /* sync capture */ -#define METEORSETGEO _IOW('x', 3, struct meteor_geomet) /* set geometry */ -#define METEORGETGEO _IOR('x', 4, struct meteor_geomet) /* get geometry */ -#define METEORSTATUS _IOR('x', 5, unsigned short) /* get status */ -#define METEORSHUE _IOW('x', 6, signed char) /* set hue */ -#define METEORGHUE _IOR('x', 6, signed char) /* get hue */ -#define METEORSFMT _IOW('x', 7, unsigned long) /* set format */ -#define METEORGFMT _IOR('x', 7, unsigned long) /* get format */ -#define METEORSINPUT _IOW('x', 8, unsigned long) /* set input dev */ -#define METEORGINPUT _IOR('x', 8, unsigned long) /* get input dev */ -#define METEORSCHCV _IOW('x', 9, unsigned char) /* set uv gain */ -#define METEORGCHCV _IOR('x', 9, unsigned char) /* get uv gain */ -#define METEORSCOUNT _IOW('x',10, struct meteor_counts) -#define METEORGCOUNT _IOR('x',10, struct meteor_counts) -#define METEORSFPS _IOW('x',11, unsigned short) /* set fps */ -#define METEORGFPS _IOR('x',11, unsigned short) /* get fps */ -#define METEORSSIGNAL _IOW('x', 12, unsigned int) /* set signal */ -#define METEORGSIGNAL _IOR('x', 12, unsigned int) /* get signal */ -#define METEORSVIDEO _IOW('x', 13, struct meteor_video) /* set video */ -#define METEORGVIDEO _IOR('x', 13, struct meteor_video) /* get video */ -#define METEORSBRIG _IOW('x', 14, unsigned char) /* set brightness */ -#define METEORGBRIG _IOR('x', 14, unsigned char) /* get brightness */ -#define METEORSCSAT _IOW('x', 15, unsigned char) /* set chroma sat */ -#define METEORGCSAT _IOR('x', 15, unsigned char) /* get uv saturation */ -#define METEORSCONT _IOW('x', 16, unsigned char) /* set contrast */ -#define METEORGCONT _IOR('x', 16, unsigned char) /* get contrast */ -#define METEORSBT254 _IOW('x', 17, unsigned short) /* set Bt254 reg */ -#define METEORGBT254 _IOR('x', 17, unsigned short) /* get Bt254 reg */ -#define METEORSHWS _IOW('x', 18, unsigned char) /* set hor start reg */ -#define METEORGHWS _IOR('x', 18, unsigned char) /* get hor start reg */ -#define METEORSVWS _IOW('x', 19, unsigned char) /* set vert start reg */ -#define METEORGVWS _IOR('x', 19, unsigned char) /* get vert start reg */ -#define METEORSTS _IOW('x', 20, unsigned char) /* set time stamp */ -#define METEORGTS _IOR('x', 20, unsigned char) /* get time stamp */ - -#define METEOR_STATUS_ID_MASK 0xf000 /* ID of 7196 */ -#define METEOR_STATUS_DIR 0x0800 /* Direction of Expansion port YUV */ -#define METEOR_STATUS_OEF 0x0200 /* Field detected: Even/Odd */ -#define METEOR_STATUS_SVP 0x0100 /* State of VRAM Port:inactive/active */ -#define METEOR_STATUS_STTC 0x0080 /* Time Constant: TV/VCR */ -#define METEOR_STATUS_HCLK 0x0040 /* Horiz PLL: locked/unlocked */ -#define METEOR_STATUS_FIDT 0x0020 /* Field detect: 50/60hz */ -#define METEOR_STATUS_ALTD 0x0002 /* Line alt: no line alt/line alt */ -#define METEOR_STATUS_CODE 0x0001 /* Colour info: no colour/colour */ - - /* METEORCAPTUR capture options */ -#define METEOR_CAP_SINGLE 0x0001 /* capture one frame */ -#define METEOR_CAP_CONTINOUS 0x0002 /* continuously capture */ -#define METEOR_CAP_STOP_CONT 0x0004 /* stop the continuous capture */ - - /* METEORCAPFRM capture commands */ -#define METEOR_CAP_N_FRAMES 0x0001 /* capture N frames */ -#define METEOR_CAP_STOP_FRAMES 0x0002 /* stop capture N frames */ -#define METEOR_HALT_N_FRAMES 0x0003 /* halt of capture N frames */ -#define METEOR_CONT_N_FRAMES 0x0004 /* continue after above halt */ - - /* valid video input formats: */ -#define METEOR_FMT_NTSC 0x00100 /* NTSC -- initialized default */ -#define METEOR_FMT_PAL 0x00200 /* PAL */ -#define METEOR_FMT_SECAM 0x00400 /* SECAM */ -#define METEOR_FMT_AUTOMODE 0x00800 /* auto-mode */ -#define METEOR_INPUT_DEV0 0x01000 /* camera input 0 -- default */ -#define METEOR_INPUT_DEV_RCA METEOR_INPUT_DEV0 -#define METEOR_INPUT_DEV1 0x02000 /* camera input 1 */ -#define METEOR_INPUT_DEV2 0x04000 /* camera input 2 */ -#define METEOR_INPUT_DEV3 0x08000 /* camera input 3 */ -#define METEOR_INPUT_DEV_RGB 0x0a000 /* for rgb version of meteor */ -#define METEOR_INPUT_DEV_SVIDEO 0x06000 /* S-video input port */ - - /* valid video output formats: */ -#define METEOR_GEO_RGB16 0x0010000 /* packed -- initialized default */ -#define METEOR_GEO_RGB24 0x0020000 /* RBG 24 bits packed */ - /* internally stored in 32 bits */ -#define METEOR_GEO_YUV_PACKED 0x0040000 /* 4-2-2 YUV 16 bits packed */ -#define METEOR_GEO_YUV_PLANAR 0x0080000 /* 4-2-2 YUV 16 bits planer */ -#define METEOR_GEO_YUV_PLANER METEOR_GEO_YUV_PLANAR -#define METEOR_GEO_UNSIGNED 0x0400000 /* unsigned uv outputs */ -#define METEOR_GEO_EVEN_ONLY 0x1000000 /* set for even only field capture */ -#define METEOR_GEO_ODD_ONLY 0x2000000 /* set for odd only field capture */ -#define METEOR_GEO_FIELD_MASK 0x3000000 -#define METEOR_GEO_YUV_422 0x4000000 /* 4-2-2 YUV in Y-U-V combined */ -#define METEOR_GEO_OUTPUT_MASK 0x40f0000 -#define METEOR_GEO_YUV_12 0x10000000 /* YUV 12 format */ -#define METEOR_GEO_YUV_9 0x40000000 /* YUV 9 format */ - -#define METEOR_FIELD_MODE 0x80000000 /* Field cap or Frame cap */ - -#define METEOR_SIG_MODE_MASK 0xffff0000 -#define METEOR_SIG_FRAME 0x00000000 /* signal every frame */ -#define METEOR_SIG_FIELD 0x00010000 /* signal every field */ - - /* following structure is used to coordinate the synchronous */ - -struct meteor_mem { - /* kernel write only */ - int frame_size; /* row*columns*depth */ - unsigned num_bufs; /* number of frames in buffer (1-32) */ - /* user and kernel change these */ - int lowat; /* kernel starts capture if < this number */ - int hiwat; /* kernel stops capture if > this number. - hiwat <= numbufs */ - unsigned active; /* bit mask of active frame buffers - kernel sets, user clears */ - int num_active_bufs; /* count of active frame buffer - kernel increments, user decrements */ - - /* reference to mmapped data */ - caddr_t buf; /* The real space (virtual addr) */ -} ; - -#endif /* !_MACHINE_IOCTL_METEOR_H_ */ +#endif /* _MACHINE_IOCTL_METEOR_H_ */ ==== //depot/projects/netperf/sys/boot/i386/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.19 2002/12/31 02:29:03 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.20 2003/12/08 19:02:06 obrien Exp $ -SUBDIR= mbr boot0 btx boot2 cdboot kgzldr libi386 loader +SUBDIR= mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr ==== //depot/projects/netperf/sys/boot/i386/boot0/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.17 2002/09/17 01:48:54 peter Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.19 2003/12/08 19:02:06 obrien Exp $ -PROG= boot0 +PROG?= boot0 NOMAN= STRIP= BINDIR?= /boot @@ -23,14 +23,14 @@ # unless you are glutton for punishment. BOOT_BOOT0_ORG?= 0x600 -boot0: boot0.o - ${LD} -N -e start -Ttext ${BOOT_BOOT0_ORG} -o boot0.out boot0.o - objcopy -S -O binary boot0.out ${.TARGET} +${PROG}: ${PROG}.o + ${LD} -N -e start -Ttext ${BOOT_BOOT0_ORG} -o ${PROG}.out ${PROG}.o + objcopy -S -O binary ${PROG}.out ${.TARGET} -boot0.o: boot0.s +${PROG}.o: ${PROG}.s ${AS} ${AFLAGS} --defsym FLAGS=${BOOT_BOOT0_FLAGS} \ --defsym TICKS=${BOOT_BOOT0_TICKS} ${.IMPSRC} -o ${.TARGET} -CLEANFILES+= boot0.out boot0.o +CLEANFILES+= ${PROG}.out ${PROG}.o .include ==== //depot/projects/netperf/sys/cam/scsi/scsi_da.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.161 2003/12/08 05:14:13 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.162 2003/12/08 06:29:38 ps Exp $"); #ifdef _KERNEL #include "opt_da.h" @@ -231,6 +231,13 @@ {T_DIRECT, SIP_MEDIA_FIXED, quantum, "VIKING 2*", "*"}, /*quirks*/ DA_Q_NO_6_BYTE }, + { + /* + * The CISS RAID controllers do not support SYNC_CACHE + */ + {T_DIRECT, SIP_MEDIA_FIXED, "COMPAQ", "RAID*", "*"}, + /*quirks*/ DA_Q_NO_SYNC_CACHE + }, #ifdef DA_OLD_QUIRKS /* USB floppy devices supported by umass(4) */ { @@ -376,14 +383,6 @@ {T_DIRECT, SIP_MEDIA_REMOVABLE, "CREATIVE", "NOMAD_MUVO", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE|DA_Q_NO_PREVENT }, - { - /* - * The CISS RAID driver drives dont like the cache to be - * sync'd (esp since write cache is turned off). - */ - {T_DIRECT, SIP_MEDIA_FIXED, "COMPAQ", "RAID*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, }; static disk_strategy_t dastrategy; ==== //depot/projects/netperf/sys/dev/ata/ata-chipset.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.48 2003/11/28 19:01:28 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.50 2003/12/08 09:22:20 sos Exp $"); #include "opt_ata.h" #include @@ -171,7 +171,13 @@ static void ata_sata_setmode(struct ata_device *atadev, int mode) { - mode = ata_limit_mode(atadev, mode, ATA_DMA_MAX); + /* + * we limit the transfer mode to UDMA5/ATA100 as some chips/drive + * comboes that use the Marvell SATA->PATA converters has trouble + * with UDMA6/ATA133. This doesn't really matter as real SATA + * devices doesn't use this anyway. + */ + mode = ata_limit_mode(atadev, mode, ATA_UDMA5); if (!ata_controlcmd(atadev, ATA_SETFEATURES, ATA_SF_SETXFER, 0, mode)) atadev->mode = mode; } @@ -1633,9 +1639,21 @@ /* enable interrupt as BIOS might not */ pci_write_config(dev, 0x8a, (pci_read_config(dev, 0x8a, 1) & 0x3f), 1); + /* setup chipset defaults as BIOS might not */ + pci_write_config(dev, 0xa2, 0x328a, 2); + pci_write_config(dev, 0xa4, 0x328a328a, 4); + pci_write_config(dev, 0xa8, 0x22082208, 4); + pci_write_config(dev, 0xac, 0x40094009, 4); + pci_write_config(dev, 0xe2, 0x328a, 2); + pci_write_config(dev, 0xe4, 0x328a328a, 4); + pci_write_config(dev, 0xe8, 0x22082208, 4); + pci_write_config(dev, 0xec, 0x40094009, 4); + ctlr->allocate = ata_sii_mio_allocate; - if (ctlr->chip->max_dma >= ATA_SA150) + if (ctlr->chip->max_dma >= ATA_SA150) { ctlr->setmode = ata_sata_setmode; + ctlr->locking = ata_serialize; + } else ctlr->setmode = ata_sii_setmode; } ==== //depot/projects/netperf/sys/dev/bge/if_bge.c#15 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.60 2003/11/14 17:16:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.61 2003/12/08 07:54:12 obrien Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -206,7 +206,7 @@ static u_int8_t bge_eeprom_getbyte (struct bge_softc *, int, u_int8_t *); static int bge_read_eeprom (struct bge_softc *, caddr_t, int, int); -static u_int32_t bge_mchash (caddr_t); +static uint32_t bge_mchash (const uint8_t *); static void bge_setmulti (struct bge_softc *); static void bge_handle_events (struct bge_softc *); @@ -1130,13 +1130,13 @@ #define BGE_POLY 0xEDB88320 -static u_int32_t +static uint32_t bge_mchash(addr) - caddr_t addr; + const uint8_t *addr; { - u_int32_t crc; + uint32_t crc; int idx, bit; - u_int8_t data; + uint8_t data; /* Compute CRC for the address value. */ crc = 0xFFFFFFFF; /* initial value */ ==== //depot/projects/netperf/sys/dev/bktr/bktr_audio.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.12 2003/08/24 17:46:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.13 2003/12/08 07:59:18 obrien Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -80,8 +80,8 @@ #include #include #else -#include /* Traditional location of .h files */ -#include /* extensions to ioctl_meteor.h */ +#include +#include /* extensions to ioctl_meteor.h */ #include #include #include ==== //depot/projects/netperf/sys/dev/bktr/bktr_card.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.22 2003/08/24 17:46:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.23 2003/12/08 07:59:18 obrien Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -77,8 +77,8 @@ #include #include #else -#include /* Traditional location for .h files */ -#include /* extensions to ioctl_meteor.h */ +#include +#include /* extensions to ioctl_meteor.h */ #include #include #include ==== //depot/projects/netperf/sys/dev/bktr/bktr_core.c#9 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.132 2003/12/01 19:03:50 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.133 2003/12/08 07:59:18 obrien Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -138,8 +138,8 @@ #include #endif -#include -#include /* extensions to ioctl_meteor.h */ +#include +#include /* extensions to ioctl_meteor.h */ #include #include #include ==== //depot/projects/netperf/sys/dev/bktr/bktr_i2c.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.24 2003/08/24 17:46:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.25 2003/12/08 07:59:18 obrien Exp $"); /* * I2C support for the bti2c chipset. @@ -43,10 +43,10 @@ #include #include -#if __FreeBSD_version >= 500014 +#if __FreeBSD_version < 500014 +#include +#else #include -#else -#include #endif #if (__FreeBSD_version < 500000) @@ -58,15 +58,14 @@ #include #endif -#if (__FreeBSD_version >=300000) +#if (__FreeBSD_version >= 300000) #include /* for bus space */ #include #include #endif -#include -#include /* extensions to ioctl_meteor.h */ - +#include +#include /* extensions to ioctl_meteor.h */ #include #include ==== //depot/projects/netperf/sys/dev/bktr/bktr_os.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.40 2003/12/01 19:03:50 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.41 2003/12/08 07:59:18 obrien Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -185,8 +185,8 @@ #include #include #else /* Traditional location for .h files */ -#include -#include /* extensions to ioctl_meteor.h */ +#include +#include /* extensions to ioctl_meteor.h */ #include #include #include ==== //depot/projects/netperf/sys/dev/bktr/bktr_tuner.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.11 2003/08/24 17:46:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.12 2003/12/08 07:59:18 obrien Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -73,8 +73,8 @@ #include #include #else -#include /* Traditional .h file location */ -#include /* extensions to ioctl_meteor.h */ +#include +#include /* extensions to ioctl_meteor.h */ #include #include #include ==== //depot/projects/netperf/sys/dev/bktr/ioctl_bt848.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* * extensions to ioctl_meteor.h for the bt848 cards * - * $FreeBSD: src/sys/dev/bktr/ioctl_bt848.h,v 1.28 2000/10/31 14:30:29 roger Exp $ + * $FreeBSD: src/sys/dev/bktr/ioctl_bt848.h,v 1.29 2003/12/08 06:38:22 obrien Exp $ */ #ifndef _MACHINE_IOCTL_BT848_H_ ==== //depot/projects/netperf/sys/dev/bktr/ioctl_meteor.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bktr/ioctl_meteor.h,v 1.13 2003/12/07 06:37:32 imp Exp $ + * $FreeBSD: src/sys/dev/bktr/ioctl_meteor.h,v 1.14 2003/12/08 06:38:22 obrien Exp $ */ /* * ioctl constants for Matrox Meteor Capture card. ==== //depot/projects/netperf/sys/dev/bktr/msp34xx.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bktr/msp34xx.c,v 1.1 2003/08/12 09:45:34 alex Exp $ + * $FreeBSD: src/sys/dev/bktr/msp34xx.c,v 1.2 2003/12/08 07:59:18 obrien Exp $ */ /* @@ -87,8 +87,8 @@ #include /* required by bktr_reg.h */ -#include -#include /* extensions to ioctl_meteor.h */ +#include +#include /* extensions to ioctl_meteor.h */ #include #include #include ==== //depot/projects/netperf/sys/dev/ciss/ciss.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.31 2003/11/07 03:01:48 ps Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.32 2003/12/08 16:07:35 ps Exp $ */ /* @@ -3380,6 +3380,10 @@ return("RAID 4"); case CISS_LDRIVE_RAID5: return("RAID 5"); + case CISS_LDRIVE_RAID51: + return("RAID 5+1"); + case CISS_LDRIVE_RAIDADG: + return("RAID ADG"); } return("unkown"); } ==== //depot/projects/netperf/sys/dev/ciss/cissreg.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/cissreg.h,v 1.3 2003/02/05 08:43:46 ps Exp $ + * $FreeBSD: src/sys/dev/ciss/cissreg.h,v 1.4 2003/12/08 16:07:35 ps Exp $ */ /* @@ -494,6 +494,8 @@ #define CISS_LDRIVE_RAID4 1 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 8 16:55:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1E3916A4D0; Mon, 8 Dec 2003 16:55:08 -0800 (PST) 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 83C4416A4CE; Mon, 8 Dec 2003 16:55:08 -0800 (PST) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4493D43D21; Mon, 8 Dec 2003 16:55:07 -0800 (PST) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.10/8.12.9) with ESMTP id hB90t60u014502; Mon, 8 Dec 2003 17:55:06 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Mon, 08 Dec 2003 17:55:00 -0700 (MST) Message-Id: <20031208.175500.36934037.imp@bsdimp.com> To: jhb@freebsd.org From: "M. Warner Losh" In-Reply-To: References: <20031205152304.D27817@root.org> X-Mailer: Mew version 2.1 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@freebsd.org cc: nate@root.org Subject: Re: PERFORCE change 43464 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 Dec 2003 00:55:09 -0000 In message: John Baldwin writes: : : On 05-Dec-2003 Nate Lawson wrote: : > On Fri, 5 Dec 2003, John Baldwin wrote: : >> Change 43464 by jhb@jhb_blue on 2003/12/05 12:59:01 : >> : >> More updates. Closer to working than I thought. In theory : >> PCI devices should all just work now. : > : > This handles PCI. Are you ok with me adding the call to : > acpi_pwr_switch_consumer() for non-PCI devices like the embedded : > controller? I think we need to do this at the top \\_SB level. I'm a bit : > confused as to the handoff between the general tree walk and the ACPI-PCI : > driver though. : : It won't hurt to switch a device on twice. It should be ok to : do a top-level tree walk of all device objects and turn them on : before probing child devices I think. ACPI shouldn't turn off : devices that don't probe like PCI does though because ACPI has : duplicate objects of things like the entire PCI device tree. :-/ Actually, there can be times when you don't want to turn on devices at all. Walking the whole tree turning them on might be the wrong to do... Sometimes I think that things in the newbus tree should have a pointer to the acpi power methods that are used in coordination with the bus code that is 'activating' the device before the 'probe' and 'attach' happens. Warner From owner-p4-projects@FreeBSD.ORG Mon Dec 8 17:59:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4468416A4D0; Mon, 8 Dec 2003 17:59:29 -0800 (PST) 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 1C9FC16A4CE for ; Mon, 8 Dec 2003 17:59:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F285B43D28 for ; Mon, 8 Dec 2003 17:59:07 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB91x7XJ036724 for ; Mon, 8 Dec 2003 17:59:07 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB91wxNK036717 for perforce@freebsd.org; Mon, 8 Dec 2003 17:58:59 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 8 Dec 2003 17:58:59 -0800 (PST) Message-Id: <200312090158.hB91wxNK036717@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 43646 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 Dec 2003 01:59:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=43646 Change 43646 by peter@peter_daintree on 2003/12/08 17:58:38 IFC @43645 Affected files ... .. //depot/projects/hammer/Makefile.inc1#34 integrate .. //depot/projects/hammer/contrib/libreadline/readline.h#3 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#15 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#15 integrate .. //depot/projects/hammer/games/fortune/strfile/Makefile#2 integrate .. //depot/projects/hammer/games/fortune/strfile/strfile.c#4 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#12 integrate .. //depot/projects/hammer/include/Makefile#18 integrate .. //depot/projects/hammer/include/dirent.h#4 integrate .. //depot/projects/hammer/include/locale.h#3 integrate .. //depot/projects/hammer/include/resolv.h#3 integrate .. //depot/projects/hammer/include/rpc/types.h#2 integrate .. //depot/projects/hammer/include/stddef.h#3 integrate .. //depot/projects/hammer/include/stdio.h#5 integrate .. //depot/projects/hammer/include/stdlib.h#9 integrate .. //depot/projects/hammer/include/string.h#5 integrate .. //depot/projects/hammer/include/time.h#3 integrate .. //depot/projects/hammer/include/unistd.h#11 integrate .. //depot/projects/hammer/include/wchar.h#12 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/Makefile#3 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/libc.so.4.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/libc_r.so.4.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/libdevstat.so.2.bz2.uu#1 branch .. //depot/projects/hammer/lib/compat/compat4x.alpha/libedit.so.3.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/libmp.so.3.bz2.uu#1 branch .. //depot/projects/hammer/lib/compat/compat4x.alpha/libpam.so.1.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/libperl.so.3.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/libposix1e.so.2.bz2.uu#1 branch .. //depot/projects/hammer/lib/compat/compat4x.alpha/libskey.so.2.bz2.uu#1 branch .. //depot/projects/hammer/lib/compat/compat4x.alpha/libstdc++.so.3.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/libusbhid.so.0.bz2.uu#1 branch .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_cleartext_pass_ok.so.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_deny.so.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_opie.so.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_opieaccess.so.bz2.uu#1 branch .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_permit.so.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_radius.so.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_skey.so.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_ssh.so.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_tacplus.so.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.alpha/pam_unix.so.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/Makefile#4 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_cleartext_pass_ok.so.bz2.uu#3 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_deny.so.bz2.uu#3 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_opie.so.bz2.uu#3 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_opieaccess.so.bz2.uu#1 branch .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_permit.so.bz2.uu#3 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_radius.so.bz2.uu#3 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_skey.so.bz2.uu#3 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_ssh.so.bz2.uu#3 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_tacplus.so.bz2.uu#3 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/pam_unix.so.bz2.uu#3 integrate .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#15 integrate .. //depot/projects/hammer/lib/libc/locale/localeconv.3#1 branch .. //depot/projects/hammer/lib/libc/locale/mblen.3#1 branch .. //depot/projects/hammer/lib/libc/locale/mbstowcs.3#1 branch .. //depot/projects/hammer/lib/libc/locale/mbtowc.3#1 branch .. //depot/projects/hammer/lib/libc/locale/multibyte.3#8 integrate .. //depot/projects/hammer/lib/libc/locale/setlocale.3#6 integrate .. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#9 integrate .. //depot/projects/hammer/lib/libc/locale/wcstombs.3#1 branch .. //depot/projects/hammer/lib/libc/locale/wctomb.3#1 branch .. //depot/projects/hammer/lib/libc/net/res_init.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/getc.3#4 integrate .. //depot/projects/hammer/lib/libkiconv/Makefile#2 integrate .. //depot/projects/hammer/lib/libkiconv/kiconv.3#3 integrate .. //depot/projects/hammer/lib/libkiconv/xlat16_iconv.c#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/ia64/include/pthread_md.h#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#12 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_spinlock.c#9 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#11 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#44 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#52 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.ent#9 integrate .. //depot/projects/hammer/sbin/atm/atm/Makefile#3 integrate .. //depot/projects/hammer/sbin/atm/atm/atm_eni.c#3 delete .. //depot/projects/hammer/sbin/atm/atm/atm_show.c#4 integrate .. //depot/projects/hammer/sbin/atm/ilmid/ilmid.c#9 integrate .. //depot/projects/hammer/sbin/ccdconfig/ccdconfig.8#4 integrate .. //depot/projects/hammer/sbin/dumpfs/dumpfs.c#11 integrate .. //depot/projects/hammer/sbin/mount/getmntopts.c#3 integrate .. //depot/projects/hammer/sbin/mount/mount.c#9 integrate .. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.c#6 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#5 integrate .. //depot/projects/hammer/sbin/mount_ntfs/mount_ntfs.c#3 integrate .. //depot/projects/hammer/sbin/mount_udf/mount_udf.c#5 integrate .. //depot/projects/hammer/sbin/route/route.c#4 integrate .. //depot/projects/hammer/share/examples/meteor/rgb16.c#2 integrate .. //depot/projects/hammer/share/examples/meteor/rgb24.c#2 integrate .. //depot/projects/hammer/share/examples/meteor/test-n.c#2 integrate .. //depot/projects/hammer/share/examples/meteor/yuvpk.c#2 integrate .. //depot/projects/hammer/share/examples/meteor/yuvpl.c#2 integrate .. //depot/projects/hammer/share/man/man4/Makefile#30 integrate .. //depot/projects/hammer/share/man/man4/aha.4#5 integrate .. //depot/projects/hammer/share/man/man4/digi.4#1 branch .. //depot/projects/hammer/share/man/man4/lmc.4#2 delete .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#11 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/dgb.4#3 delete .. //depot/projects/hammer/share/man/man4/man4.i386/meteor.4#2 delete .. //depot/projects/hammer/share/man/man4/meteor.4#1 branch .. //depot/projects/hammer/share/man/man5/resolver.5#2 integrate .. //depot/projects/hammer/share/man/man9/Makefile#22 integrate .. //depot/projects/hammer/share/man/man9/hexdump.9#1 branch .. //depot/projects/hammer/sys/alpha/conf/GENERIC#14 integrate .. //depot/projects/hammer/sys/alpha/include/ioctl_bt848.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/ioctl_meteor.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#18 integrate .. //depot/projects/hammer/sys/boot/i386/Makefile#5 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/boot0sio.s#1 branch .. //depot/projects/hammer/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#19 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#17 integrate .. //depot/projects/hammer/sys/conf/NOTES#32 integrate .. //depot/projects/hammer/sys/conf/files#42 integrate .. //depot/projects/hammer/sys/conf/files.i386#19 integrate .. //depot/projects/hammer/sys/conf/files.pc98#20 integrate .. //depot/projects/hammer/sys/conf/kern.mk#14 integrate .. //depot/projects/hammer/sys/conf/majors#18 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#8 integrate .. //depot/projects/hammer/sys/conf/options#30 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/ah.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#6 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/version.h#5 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#21 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#15 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#25 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_audio.c#4 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_card.c#5 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_core.c#9 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_i2c.c#3 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#8 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_tuner.c#3 integrate .. //depot/projects/hammer/sys/dev/bktr/ioctl_bt848.h#1 branch .. //depot/projects/hammer/sys/dev/bktr/ioctl_meteor.h#1 branch .. //depot/projects/hammer/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#15 integrate .. //depot/projects/hammer/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/hammer/sys/dev/dgb/dgb.c#5 delete .. //depot/projects/hammer/sys/dev/dgb/dgbios.h#2 delete .. //depot/projects/hammer/sys/dev/dgb/dgfep.h#2 delete .. //depot/projects/hammer/sys/dev/dgb/dgreg.h#3 delete .. //depot/projects/hammer/sys/dev/ed/if_ed.c#12 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#21 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#8 integrate .. //depot/projects/hammer/sys/dev/hea/eni.c#3 delete .. //depot/projects/hammer/sys/dev/hea/eni.h#5 delete .. //depot/projects/hammer/sys/dev/hea/eni_buffer.c#6 delete .. //depot/projects/hammer/sys/dev/hea/eni_globals.c#3 delete .. //depot/projects/hammer/sys/dev/hea/eni_if.c#3 delete .. //depot/projects/hammer/sys/dev/hea/eni_init.c#4 delete .. //depot/projects/hammer/sys/dev/hea/eni_intr.c#3 delete .. //depot/projects/hammer/sys/dev/hea/eni_receive.c#5 delete .. //depot/projects/hammer/sys/dev/hea/eni_stats.h#2 delete .. //depot/projects/hammer/sys/dev/hea/eni_suni.h#2 delete .. //depot/projects/hammer/sys/dev/hea/eni_transmit.c#5 delete .. //depot/projects/hammer/sys/dev/hea/eni_var.h#2 delete .. //depot/projects/hammer/sys/dev/hea/eni_vcm.c#5 delete .. //depot/projects/hammer/sys/dev/hea/hea_freebsd.c#4 delete .. //depot/projects/hammer/sys/dev/hea/hea_freebsd.h#2 delete .. //depot/projects/hammer/sys/dev/hea/hea_pci.c#5 delete .. //depot/projects/hammer/sys/dev/led/led.c#4 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#12 integrate .. //depot/projects/hammer/sys/dev/lmc/if_lmc.c#4 delete .. //depot/projects/hammer/sys/dev/lmc/if_lmc_common.c#3 delete .. //depot/projects/hammer/sys/dev/lmc/if_lmc_fbsd3.c#3 delete .. //depot/projects/hammer/sys/dev/lmc/if_lmc_media.c#3 delete .. //depot/projects/hammer/sys/dev/lmc/if_lmcioctl.h#2 delete .. //depot/projects/hammer/sys/dev/lmc/if_lmcvar.h#2 delete .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#10 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#11 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#12 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#9 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sndstat.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#6 integrate .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#10 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#7 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#12 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_conv.c#5 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vfsops.c#7 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs.c#4 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_ctl.c#7 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_ioctl.c#5 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_map.c#5 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_rlimit.c#2 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_status.c#7 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_type.c#2 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs.c#4 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs.h#5 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#9 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#13 integrate .. //depot/projects/hammer/sys/geom/geom.h#22 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#20 integrate .. //depot/projects/hammer/sys/geom/geom_dump.c#15 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#14 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#18 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#18 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#25 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#18 integrate .. //depot/projects/hammer/sys/i386/include/ioctl_bt848.h#2 integrate .. //depot/projects/hammer/sys/i386/include/ioctl_meteor.h#2 integrate .. //depot/projects/hammer/sys/i386/include/sf_buf.h#3 integrate .. //depot/projects/hammer/sys/i386/isa/loran.c#5 delete .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#31 integrate .. //depot/projects/hammer/sys/ia64/include/ioctl_bt848.h#2 delete .. //depot/projects/hammer/sys/ia64/include/ioctl_meteor.h#2 delete .. //depot/projects/hammer/sys/ia64/include/ucontext.h#5 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#27 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_timeout.c#10 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#22 integrate .. //depot/projects/hammer/sys/kern/subr_mbpool.c#2 integrate .. //depot/projects/hammer/sys/kern/subr_mbuf.c#18 integrate .. //depot/projects/hammer/sys/kern/subr_prf.c#13 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#21 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#21 integrate .. //depot/projects/hammer/sys/libkern/iconv_xlat16.c#2 integrate .. //depot/projects/hammer/sys/modules/Makefile#32 integrate .. //depot/projects/hammer/sys/modules/hea/Makefile#2 delete .. //depot/projects/hammer/sys/net/if_var.h#10 integrate .. //depot/projects/hammer/sys/net/route.c#11 integrate .. //depot/projects/hammer/sys/netgraph/atm/ngatmbase.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#10 integrate .. //depot/projects/hammer/sys/netkey/key.c#12 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#13 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#14 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#24 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#15 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#19 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#18 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#15 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#13 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#14 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#14 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#29 integrate .. //depot/projects/hammer/sys/pci/meteor.c#6 delete .. //depot/projects/hammer/sys/pci/meteor_reg.h#2 delete .. //depot/projects/hammer/sys/sys/_null.h#1 branch .. //depot/projects/hammer/sys/sys/iconv.h#4 integrate .. //depot/projects/hammer/sys/sys/ioctl_meteor.h#2 integrate .. //depot/projects/hammer/sys/sys/kse.h#14 integrate .. //depot/projects/hammer/sys/sys/param.h#24 integrate .. //depot/projects/hammer/sys/sys/stddef.h#2 integrate .. //depot/projects/hammer/sys/sys/syscall.h#21 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#21 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#21 integrate .. //depot/projects/hammer/sys/sys/systm.h#12 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#17 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#15 integrate .. //depot/projects/hammer/tools/test/ppsapi/Makefile#1 branch .. //depot/projects/hammer/tools/test/ppsapi/README#1 branch .. //depot/projects/hammer/tools/test/ppsapi/ppsapitest.c#1 branch .. //depot/projects/hammer/tools/tools/ath/80211stats.c#2 integrate .. //depot/projects/hammer/tools/tools/ath/Makefile#3 integrate .. //depot/projects/hammer/tools/tools/ath/athstats.c#4 integrate .. //depot/projects/hammer/tools/tools/crypto/Makefile#4 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#15 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.1#5 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#8 integrate .. //depot/projects/hammer/usr.bin/uuidgen/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/vmstat/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.8#3 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#8 integrate .. //depot/projects/hammer/usr.sbin/pppctl/pppctl.c#3 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#34 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.397 2003/11/16 21:17:43 gordon Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.398 2003/12/09 00:42:44 gad Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -46,19 +46,16 @@ .if exists(${.CURDIR}/include) SUBDIR+= include .endif + +# We must do lib and libexec before bin, because if installworld +# installs a new /bin/sh, the 'make' command will *immediately* +# use that new version. And the new (dynamically-linked) /bin/sh +# will expect to find appropriate libraries in /lib and /libexec. .if exists(${.CURDIR}/lib) SUBDIR+= lib .endif - -# When upgrading to a dynamically linked root, install the runtime -# linker early into its new location before make(1) has a chance -# to run the dynamically linked /bin/sh. -.if !defined(NO_DYNAMICROOT) && !defined(NOPIC) && \ - (!defined(TARGET_ARCH) || ${TARGET_ARCH} == ${MACHINE_ARCH}) && \ - !defined(DISTDIR) && \ - (!defined(DESTDIR) || empty(DESTDIR) || ${DESTDIR} == "/") && \ - !exists(/libexec/ld-elf.so.1) -SUBDIR+= libexec/rtld-elf +.if exists(${.CURDIR}/libexec) +SUBDIR+= libexec .endif .if exists(${.CURDIR}/bin) @@ -74,9 +71,6 @@ !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) SUBDIR+= kerberos5 .endif -.if exists(${.CURDIR}/libexec) -SUBDIR+= libexec -.endif .if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) SUBDIR+= rescue .endif ==== //depot/projects/hammer/contrib/libreadline/readline.h#3 (text+ko) ==== @@ -19,7 +19,8 @@ is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -/* $FreeBSD: src/contrib/libreadline/readline.h,v 1.13 2003/08/31 18:29:38 ache Exp $ */ + +/* $FreeBSD: src/contrib/libreadline/readline.h,v 1.14 2003/12/08 01:52:09 obrien Exp $ */ #if !defined (_READLINE_H_) #define _READLINE_H_ ==== //depot/projects/hammer/etc/mtree/BSD.include.dist#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.77 2003/11/29 18:22:01 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.78 2003/12/08 07:22:41 obrien Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -28,6 +28,8 @@ dev an .. + bktr + .. firewire .. ic ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#15 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.120 2003/11/12 20:08:47 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.121 2003/12/07 10:03:20 phk Exp $ % -- Gifts for Children -- @@ -11997,6 +11997,10 @@ is not necessarily science. -- Henri Poincair'e % +Science is like sex: sometimes something useful comes +out, but that is not the reason we are doing it + -- Richard Feynman +% Science is what happens when preconception meets verification. % Scientists are people who build the Brooklyn Bridge and then buy it. ==== //depot/projects/hammer/games/fortune/strfile/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/fortune/strfile/Makefile,v 1.4 2001/03/26 14:20:56 ru Exp $ +# $FreeBSD: src/games/fortune/strfile/Makefile,v 1.5 2003/12/07 17:34:52 des Exp $ PROG= strfile MAN= strfile.8 MLINKS= strfile.8 unstr.8 -CFLAGS+= -Wall +WARNS?= 2 .include ==== //depot/projects/hammer/games/fortune/strfile/strfile.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.23 2003/08/03 19:44:36 ache Exp $"); +__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.25 2003/12/07 17:35:41 des Exp $"); # include # include @@ -105,37 +105,37 @@ #endif typedef struct { - char first; + int first; long pos; } STR; -char *Infile = NULL, /* input file name */ - Outfile[MAXPATHLEN] = "", /* output file name */ - Delimch = '%'; /* delimiting character */ +static char *Infile = NULL, /* input file name */ + Outfile[MAXPATHLEN] = "", /* output file name */ + Delimch = '%'; /* delimiting character */ -int Cflag = FALSE; /* embedded comments */ -int Sflag = FALSE; /* silent run flag */ -int Oflag = FALSE; /* ordering flag */ -int Iflag = FALSE; /* ignore case flag */ -int Rflag = FALSE; /* randomize order flag */ -int Xflag = FALSE; /* set rotated bit */ -long Num_pts = 0; /* number of pointers/strings */ +static int Cflag = FALSE; /* embedded comments */ +static int Sflag = FALSE; /* silent run flag */ +static int Oflag = FALSE; /* ordering flag */ +static int Iflag = FALSE; /* ignore case flag */ +static int Rflag = FALSE; /* randomize order flag */ +static int Xflag = FALSE; /* set rotated bit */ +static long Num_pts = 0; /* number of pointers/strings */ -long *Seekpts; +static long *Seekpts; -FILE *Sort_1, *Sort_2; /* pointers for sorting */ +static FILE *Sort_1, *Sort_2; /* pointers for sorting */ -STRFILE Tbl; /* statistics table */ +static STRFILE Tbl; /* statistics table */ -STR *Firstch; /* first chars of each string */ +static STR *Firstch; /* first chars of each string */ -void add_offset(FILE *, long); -int cmp_str(const void *, const void *); +static void add_offset(FILE *, long); +static int cmp_str(const void *, const void *); static int stable_collate_range_cmp(int, int); -void do_order(void); -void getargs(int, char **); -void randomize(void); -void usage(void); +static void do_order(void); +static void getargs(int, char **); +static void randomize(void); +static void usage(void); /* * main: ==== //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#12 (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/mdoc.local,v 1.32 2003/10/02 20:49:34 deischen Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.33 2003/12/07 15:46:50 ru Exp $ .\" .\" %beginstrip% . @@ -55,7 +55,7 @@ .ds doc-str-Lb-libvgl Video Graphics Library (libvgl, \-lvgl) . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~5.1 +.ds doc-default-operating-system FreeBSD\~5.2 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-4.9 4.9 ==== //depot/projects/hammer/include/Makefile#18 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.207 2003/11/22 06:08:59 scottl Exp $ +# $FreeBSD: src/include/Makefile,v 1.209 2003/12/08 07:22:41 obrien Exp $ # # Doing a "make install" builds /usr/include. @@ -31,8 +31,8 @@ netipsec netipx netkey netnatm netncp netsmb nfs nfsclient nfsserver \ pccard posix4 sys vm -LSUBDIRS= cam/scsi dev/an dev/ic dev/iicbus dev/firewire dev/ofw \ - dev/ppbus dev/smbus dev/usb dev/wi dev/utopia fs/devfs \ +LSUBDIRS= cam/scsi dev/an dev/bktr dev/firewire dev/ic dev/iicbus \ + dev/ofw dev/ppbus dev/smbus dev/usb dev/wi dev/utopia fs/devfs \ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/udf fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ @@ -100,11 +100,14 @@ done .endif .endfor -.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} +.for i in ${LDIRS} ${LSUBDIRS:Ndev/bktr} ${LSUBSUBDIRS} cd ${.CURDIR}/../sys; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \ ${DESTDIR}${INCLUDEDIR}/$i .endfor + cd ${.CURDIR}/../sys/dev/bktr; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ioctl_*.h \ + ${DESTDIR}${INCLUDEDIR}/dev/bktr cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/netinet ==== //depot/projects/hammer/include/dirent.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dirent.h 8.2 (Berkeley) 7/28/94 - * $FreeBSD: src/include/dirent.h,v 1.13 2002/09/10 18:12:16 mike Exp $ + * $FreeBSD: src/include/dirent.h,v 1.14 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _DIRENT_H_ @@ -54,6 +54,8 @@ #if __BSD_VISIBLE +#include + /* definitions for library routines operating on directories. */ #define DIRBLKSIZ 1024 @@ -81,10 +83,6 @@ #define DTF_REWIND 0x0004 /* rewind after reading union stack */ #define __DTF_READALL 0x0008 /* everything has been read */ -#ifndef NULL -#define NULL 0 -#endif - #else /* !__BSD_VISIBLE */ typedef void * DIR; ==== //depot/projects/hammer/include/locale.h#3 (text+ko) ==== @@ -31,12 +31,14 @@ * SUCH DAMAGE. * * @(#)locale.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/locale.h,v 1.7 2002/10/09 09:19:27 tjr Exp $ + * $FreeBSD: src/include/locale.h,v 1.8 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _LOCALE_H_ #define _LOCALE_H_ +#include + struct lconv { char *decimal_point; char *thousands_sep; @@ -64,10 +66,6 @@ char int_n_sign_posn; }; -#ifndef NULL -#define NULL 0 -#endif - #define LC_ALL 0 #define LC_COLLATE 1 #define LC_CTYPE 2 ==== //depot/projects/hammer/include/resolv.h#3 (text+ko) ==== @@ -51,7 +51,7 @@ /* * @(#)resolv.h 8.1 (Berkeley) 6/2/93 * From Id: resolv.h,v 8.12 1998/04/28 19:36:46 halley Exp $ - * $FreeBSD: src/include/resolv.h,v 1.22 2003/02/27 13:40:00 nectar Exp $ + * $FreeBSD: src/include/resolv.h,v 1.23 2003/12/07 12:32:23 murray Exp $ */ #ifndef _RESOLV_H_ @@ -94,6 +94,8 @@ #define RES_TIMEOUT 5 /* min. seconds between retries */ #define MAXRESOLVSORT 10 /* number of net to sort on */ #define RES_MAXNDOTS 15 /* should reflect bit field size */ +#define RES_MAXRETRANS 30 /* only for resolv.conf/RES_OPTIONS */ +#define RES_MAXRETRY 5 /* only for resolv.conf/RES_OPTIONS */ struct __res_state { int retrans; /* retransmition time interval */ ==== //depot/projects/hammer/include/rpc/types.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * * from: @(#)types.h 1.18 87/07/24 SMI * from: @(#)types.h 2.3 88/08/15 4.0 RPCSRC - * $FreeBSD: src/include/rpc/types.h,v 1.10 2001/03/19 12:49:47 alfred Exp $ + * $FreeBSD: src/include/rpc/types.h,v 1.11 2003/12/07 21:10:06 marcel Exp $ */ /* @@ -40,6 +40,7 @@ #define _RPC_TYPES_H #include +#include typedef int32_t bool_t; typedef int32_t enum_t; @@ -59,9 +60,6 @@ #ifndef TRUE # define TRUE (1) #endif -#ifndef NULL -# define NULL 0 -#endif #define mem_alloc(bsize) calloc(1, bsize) #define mem_free(ptr, bsize) free(ptr) ==== //depot/projects/hammer/include/stddef.h#3 (text+ko) ==== @@ -32,13 +32,14 @@ * * @(#)stddef.h 8.1 (Berkeley) 6/2/93 * - * $FreeBSD: src/include/stddef.h,v 1.9 2002/09/01 17:57:20 mike Exp $ + * $FreeBSD: src/include/stddef.h,v 1.10 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _STDDEF_H_ #define _STDDEF_H_ #include +#include #include typedef __ptrdiff_t ptrdiff_t; @@ -62,10 +63,6 @@ #endif #endif -#ifndef NULL -#define NULL 0 -#endif - #define offsetof(type, member) __offsetof(type, member) #endif /* _STDDEF_H_ */ ==== //depot/projects/hammer/include/stdio.h#5 (text+ko) ==== @@ -34,13 +34,14 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.51 2003/01/13 08:41:47 tjr Exp $ + * $FreeBSD: src/include/stdio.h,v 1.52 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _STDIO_H_ #define _STDIO_H_ #include +#include #include typedef __off_t fpos_t; @@ -57,10 +58,6 @@ #endif #endif -#ifndef NULL -#define NULL 0 -#endif - #define _FSTDIO /* Define for new stdio with functions. */ /* ==== //depot/projects/hammer/include/stdlib.h#9 (text+ko) ==== @@ -31,13 +31,14 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.54 2003/06/25 19:06:40 obrien Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.55 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _STDLIB_H_ #define _STDLIB_H_ #include +#include #include #if __BSD_VISIBLE @@ -69,10 +70,6 @@ long rem; } ldiv_t; -#ifndef NULL -#define NULL 0 -#endif - #define EXIT_FAILURE 1 #define EXIT_SUCCESS 0 ==== //depot/projects/hammer/include/string.h#5 (text+ko) ==== @@ -31,13 +31,14 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.18 2002/10/14 20:38:40 mike Exp $ + * $FreeBSD: src/include/string.h,v 1.19 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _STRING_H_ #define _STRING_H_ #include +#include #include /* @@ -53,10 +54,6 @@ #define _SIZE_T_DECLARED #endif -#ifndef NULL -#define NULL 0 -#endif - __BEGIN_DECLS #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE void *memccpy(void * __restrict, const void * __restrict, int, size_t); ==== //depot/projects/hammer/include/time.h#3 (text+ko) ==== @@ -39,13 +39,14 @@ */ /* - * $FreeBSD: src/include/time.h,v 1.30 2002/09/06 11:23:32 tjr Exp $ + * $FreeBSD: src/include/time.h,v 1.31 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _TIME_H_ #define _TIME_H_ #include +#include #include #if __POSIX_VISIBLE > 0 && __POSIX_VISIBLE < 200112 || __BSD_VISIBLE @@ -59,10 +60,6 @@ /* Frequency of the clock ticks reported by clock(). */ #define CLOCKS_PER_SEC 128 -#ifndef NULL -#define NULL 0 -#endif - #ifndef _CLOCK_T_DECLARED typedef __clock_t clock_t; #define _CLOCK_T_DECLARED ==== //depot/projects/hammer/include/unistd.h#11 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.69 2003/08/19 20:39:49 wollman Exp $ + * $FreeBSD: src/include/unistd.h,v 1.70 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _UNISTD_H_ @@ -40,6 +40,7 @@ #include #include /* XXX adds too much pollution. */ #include +#include #include #ifndef _GID_T_DECLARED @@ -81,10 +82,6 @@ #define STDOUT_FILENO 1 /* standard output file descriptor */ #define STDERR_FILENO 2 /* standard error file descriptor */ -#ifndef NULL -#define NULL 0 /* null pointer constant */ -#endif - #if __XSI_VISIBLE || __POSIX_VISIBLE >= 200112 #define F_ULOCK 0 /* unlock locked section */ #define F_LOCK 1 /* lock a section for exclusive use */ ==== //depot/projects/hammer/include/wchar.h#12 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.35 2003/04/28 22:40:05 kan Exp $ + * $FreeBSD: src/include/wchar.h,v 1.36 2003/12/07 21:10:06 marcel Exp $ */ /*- @@ -68,13 +68,10 @@ #define _WCHAR_H_ #include +#include #include #include -#ifndef NULL -#define NULL 0 -#endif - #ifndef _MBSTATE_T_DECLARED typedef __mbstate_t mbstate_t; #define _MBSTATE_T_DECLARED ==== //depot/projects/hammer/lib/compat/compat4x.alpha/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/compat/compat4x.alpha/Makefile,v 1.15 2003/02/17 13:45:12 nectar Exp $ +# $FreeBSD: src/lib/compat/compat4x.alpha/Makefile,v 1.16 2003/12/07 02:11:18 obrien Exp $ DISTRIBUTION= compat4x @@ -7,18 +7,24 @@ libc_r.so.4 \ libcrypto.so.1 \ libcrypto.so.2 \ + libdevstat.so.2 \ libedit.so.3 \ libfetch.so.2 \ libgmp.so.3 \ + libmp.so.3 \ libpam.so.1 \ libperl.so.3 \ + libposix1e.so.2 \ + libskey.so.2 \ libssl.so.1 \ libssl.so.2 \ libstdc++.so.3 \ libusb.so.0 \ + libusbhid.so.0 \ pam_cleartext_pass_ok.so \ pam_deny.so \ pam_opie.so \ + pam_opieaccess.so \ pam_permit.so \ pam_radius.so \ pam_skey.so \ ==== //depot/projects/hammer/lib/compat/compat4x.alpha/libc.so.4.bz2.uu#2 (text+ko) ==== @@ -1,4918 +1,4784 @@ -$FreeBSD: src/lib/compat/compat4x.alpha/libc.so.4.bz2.uu,v 1.1 2002/06/25 04:59:45 obrien Exp $ +$FreeBSD: src/lib/compat/compat4x.alpha/libc.so.4.bz2.uu,v 1.2 2003/12/07 02:11:18 obrien Exp $ -begin-base64 444 libc.so.4.bz2 -QlpoOTFBWSZTWYZuWMkE2kF/////////////////////////////////////////////5EtHdKVe -2ioUoUKqlAlQFKBVAAAAAcAD0FADz4AYfHwd4HvXXVqnbo6LphFABgVG8uX3llfGAAAA3X03wN4Y -2mV71zowze5gWUba2Eu5z1wJW7V5QC9bdQKCq5p3Q7jWU9sAAAAAAAAlQAAAAUAAAA18D0omzHia -hDzpXiy021mqPgem9dwXl4Ab3nWtmy3c3br2PN6Ad3Phtvd89X3Jc99KJ1oBEgFKqBawBSkPpoBo -Aeez1ENAu+IVVsC1YGy5tS+BoejxPPYKHFnrbWYle3b3JVrLp2wD7wAProSAH2y77dd3BrqlNEM7 -MYTrvgcCFR977ezonlroeXrO1fAvbe7dpu7ffd11W7NAe57j1QHxncfXb53Tp9cLKB33wePt3yd9 -fAAPVAdAADLiNe7PTDN9HCq6bZqg8vdgr6gAAAAAAAAAAAAAAAAAAAAAAH33b1Wn3cHvgAABh9fA -AA+gAAAKFAAAN9tnjd9qPr49vu92zXgABm+PJdtuiIp3ZwO8c8ADox4512vnvve+h48B9zltj53O -ud7m8cNjw29bpnvY6E8B9bsMWMp9NhsfTcAAGe+V8c5hp6bgMyust9ldC+33c6c958b4dfdr7aqf -a264AC57zvlPbende9zz77W+3n0vPc9XrnK+zvr1YAB3u3y24Bl97uLs3jfenn1ubsCx5G9xze+7 -ED097vn3wd83XxA7261pHwgNUOlm1kurQZtQDbCt93LrNtseuEA00ASAMeL3NDLQAN84gBE+devT -mfd3XbV8u8M3vPOvHpVeAAvlLl7dOvm+mi2jb31W+97uV97mzDUI6+fM522itSoBR97AfebRvgNT -vewG32Ppu32wA9gwusNvm+96WzTQreHfHfUcs3y7E+ninHvDwkAJ74733c3k3zvXx9G8+ABHvveK -BTk8u1zA8AAQAAAAAAAeVQAT3ONXt53t77Dz3zfNvCYdfc68j18wNKEh4ENTtQCpB0DEKpQF4zIP -vtbu4+tOjfcwvSKAHre7pdg9eXce0AFzE8+7vncHoj73yHs9fcz7t90pb73zvBWi2D77u7d8fLH3 -vu3qzcvvQWy8e0JKBORvlz777211pfe52+76e8N66ut3egOfXgyFZ964AAAAAAAAAAABQAA+a16H -eAPSLuyql57773xvsd1s2zHuxsy33ue8ZKsvcO3eteVa8SKAdsApbHtzpfbnwH0KdtSr33j7Pvs7 -7fFn3D32OT72o4ve5tzcVfecfb731zhu1fXror4Ur07AXc5ZQ0uPcbzvue7fXRQQ+3ddtcYvrrb6 -R1jyCvHXu+L6lLwfY+5K8FABQACgAAKAAZz1SA2PrqbvR18feDQHHrnvvt9gPfOW+Pm+PPi7V5cZ -XOg9Vewd6uHb6feb7NxB72++W2DKT7Cd14Nschtw9V9ndr73dPfducNu2Yjj65xurhnedXlhcxuz -uzel2cy1ddvbudcjnKpu55e+afd73L7PXfParnvsN6FHbAD6HnXy7dlAAAB6U8PnewDQUAKqjhc+ -tkCRsa6wxuaPgNKDR0dy2gVWkQW2gDbAa0H00AB0UFB7m99Fvlfb3Xs4+3ud9988HnkqncD3272A -0FBoDvEBj30z7W1re+m8hXl773pBrey9Me7nB5tl60gIGtZ3wHeuLz4OKW89AKje1Vp3YaHn0Hfe -+873c+z77b6aKdNW42m3d97QrgrfN7MdQn29c+N9abcF98jvvbve93jiUKr6aF7Yr13brcL6+9ye -82sBqAEfWOr4fSF8fNesPdndulALZUrL3dADiEgChQABoAD0hlgPnY9AAUVoA7YAAesGrtZkKj12 -ZwK+csaB7zRCTrJSjkCPcSzs8E8nUdYa+94+Xj24g4+bndT7nh5TF5WG+s77d9rVh0GmjJodM3RT -Q7u9nIept3d72BswJC5vcNG7c82AAO+7K61sT3g75fc+89gAB4AAAAAAAAAAAAAAAAAAI+itsMBD -3ZgA+vrQV731vvUGtud3wJ9uhVjeQB996q+h9cvt5hzvrfPvXzye4PlG+3h933r52cX1uINLe+9u -xe52hodWc6r6I2nJz7PXR699vfWZ6+bwJK995tfeY6O7Ps2vd4ADvlKQaano3Hvu15cUN7sn0Pl9 -vd9jT7dYxnsxrvDpq971x7zd09Mbb2xM9r3cNbx33uXeFanbnYuuOFD10Lzuz5vVQhDnq31hDcb6 -BT6Ivvt97ams5OuNin0y2zWS7efd3TPa5bZts9M7Laee8E9jj3KiHvOupiq89vuXi+3o8gJOWSc2 -fAZ3Np497z3vd577uAD777gFmgAAAB0AUAAAAAAEqAAoADd7H2PoNtz77qvvC28HbgB1PmtvsdMd -n2uz1QvV6+e6bx7dt3HHXu3j7fPOPTz11nvK77sOD3Hx6eG3t29zV9tOs33zcT3uG+8177nvs+2k -3gH0e5fZ4XfevEDu8+vib51u3ze9d687nOzbbPXvJa23vndxn19l5777z3kLnx4Qyvd7ebIkQi29 -TbujJMgfHgdzu73vgGFjdLlZWgobsOjmhmie9jjQ0Veah3B5c7PeWIMvWdzd1vNwr3e87093ffOf -e7siX23t4ne871xHG272d7FLe+JbLTXorJgHtl6ZTvt30x6YgNjBozyC2bd2p99g93unhvs4ynB9 -A4WnPU9aOZ29apRK9O3uHrj7X0egaMNbe9Pvjvt9djFNsPoADRdvnatAdcnQBkDvMHTr7cAHTZbD -7Y6KBI1nYDoA3YoHw6B755G+76OpWw6csLd933zF6fS4p87Y093ue4DoB2yAAAADxAAAAAAAAAAA -AAAAAAAAAb3ly3OXY3bz1db0uOihvdkb7fcd3t8KCX1vrAe+7u96zz3entY9sIt775gZ7n29Hbdf -Q52egFjNz2+Pe5nr6PAKAcu73b03ZezVZbhfeU95sqI+7vvB54AAmW8evbofBS8+8AFKAb6zt7zy -0968AegAFdAAAafQA++x6eavm6dOY+vW6NZM8uNd72Tfd73uzi47L1623YbHdfOfZbL7s+7fbRTw -Bo+iQ6ADq7DRbIhWbGx326pzdfbb7u5cvWz3exZ225p933u273t56+zfeDkCzHEOfbXQyAfawFue -eOvm9wfHc3AD1EGfWB3zbu59bE7AfURc67hABvmR8AamkEAAJoaAAAAAGmgAACZDTIBoAAAAAAAA -AAAAmAjTEYmAmTRhAaNBoGmSemmCMmoNTIBAACAAQAACAJo0AAmATJhDQ0AABMmTCGhoBMA0yACZ -NGjJoDQaaAyaRtABqnhDTRphNNNNQaYhCCCCCAgAEwjTTE0ZGgJgmmTJtKeQMQ00in+jQjTJPIxG -VP2hJtTyU/ITBR+KmzVPE02mRNT9RjVPSfpR7JPVP0p6g0ZGG1T1PU0HqPU9TICTSSEEEAQCYEaA -CZMgGmTUwGRoAmEyYmmg1G1No01NDEnk0yNFPwlNtU/aU8VNpgeip6ngnqemJT2VP1R+hPU/UJqa -bQj0j9SD2qeoxqNGbVARJIhMImmEaGQAAjEaDQAJkwJgJgJkBpMGQTJgEwIyZMFMZGQ0000ZMmhp -oAABPJPRpNqG0BppPQKfqT2lPTAoJEQggEAEAABBkaAAmAEZNGmTIDQAABMAABGRggAAEwTBMEDT -TU1T800DQJ6DRPUwT0TATTInpT2mV3fQPSK8iw7Hjqq9NwRh57ycdbo4CYwmATBmFvPnCA0JV5DE -YK9oAd6xOHD0cQ2EYW2J+ZUz8yqtrz3m3v+K9U565hcwVi+xO103jYrxFy0uQORM+Rr1M+p+ru4p -xQGzikAzbUuJRH5VM1oEER85IBGAjMhRJEJSkHLH0B743hP6FfQqUvX5Z9Xzxejzp0e5DrGM2d6U -xjTWrqIdKFDEpsHB2FMVFidG9nFDhnanJDN9+fbZeaGje1RzrBGxx0cMJRZjYhVA5LJggXGEpHVr -1rZUdFOTUcvR69nQe4tu/CdOoYw0nIeyzd571YYoUvXKJhVnVrxzs4fD0azBBxW3JTIeNXR0mc7q -ASSAEARDsFpRB7O0epnbtnYZt1dw5ThDq2YsRSQSYPSZ4rV8jhUilxtgRrVgkhjlQSAGBGQtVKol -UyUiKhTis1LIiKskIQlC6bzp05cdNcoLBOERFFIgy5une1U8YlSrFTeFjps+TRpNFM6RQwCBaChy -BeHpxTrsbME0orIquhMM7iTmydE3Q6oQNkJRkxkMSbbXEnJhCsIsAFkDXZXfpxrY2269erzsDdo6 -oSAUQiAYMXsqet4zewnam+brbRndIuASBsMOqsVcaFNWU6JTlnZk4h2idb25XtIubwa1dHCa1uwY -gYAUER+YQ2owNtIdJWa4nhWLNLjimU0Tg3vOanU75wh1WIMDqQDwgwCDFGAQYQQUccDNweJnjl8S -SMnBrbm9Z33I2OIiTDHBkwCQCZ0Rl5Y44p7ts74TuuNzdu2NyPPoHZ2HFMygpMEHAYJbLCBjOQNt -64udi2p3Iwp4zJk6brO0bwGRokBkAwQDBG21O2sbS5pm5RM1JMl4w66rgbG9vTt08a6Kw0r1Bk9t -C9hR7e4313dbztqkRKAIBBggKCUEiOdcoXiUxW1B7WuNTON84OL3CORAwCiYUEgwYGto1vsN9yc0 -ktU+r3LIHBEPjoQGKKCIBASCIrHPLlTxxxLVPm8vIYzxWlsNhuIG4YgkGI30dHfW0UaB3zpl628c -+xE46wwcTohUuqiaa0lUIIGc61spnJourN8Otw8YvQGthEkaiSCgQjuQVFZsLZ7qNqbUnfbbGUTG -x2pEBkRtIRMEmY4QQIJGBhHSxJO4lUamauMiNiJsIzBgExFjEVmVO80WWynxd1vZqnnGLLjS8cXO -pTkw2YYurd9866aD2XfZiltGE7DbOz24vErOK3cb79SI32Eug0UYGd9b7yhRHbtp1v2v5/Zzek7H -sqYwbZyEE0xjDwOslk788SUX1fR87sa4MDaANzvARhghqEE9BnXWleXLkV6M5cysFJzEtoygiw5C -nIjYxoiTkyeitojYoGd3VTpncjeANoUEFJmM5jgs7EWNkBwNHAXXZQSMaGnMxrnbEgE3bH5GSwRh -rqu+c+3bu7s5dXdOqJDlLGCCK21p9DgdC+NmLOxBEWoGxxuNjakkFqyyAdkOmERngMIiCQihqCTG -8ZyeMNyZmxgQME6YJCZUEhlCxyUNY1TdTLzwryJwkNaQgff9nUgIgkhEAkb7bHru+lSTxkZGh+9M -mIcwYg9uic111wG4oPh0qnsUSnmMkEkEgc7KAcrYEAk0DBBHTO3QMLbjiTfAK0BtymzGTqImrSXm -1Q0dj02auDNq8s7M5M5o2aQO3OgYIm0Glygc+OfO9eide3pDqZIAXBG8EEZonbfclb753vG8gkHG -yHII3HCJ1cY8Z25rOP45DlxSQCa6PZxeO1xRtqJgGIMGK1fIGz6anAwreNnJvnngAZjgDZBQCI1r -O2GZXHCHHStb7nQQIZBIHB5IhwSSTIgwQTDIVbHcb8IcZnUmI41AWwBUW93EsKMHfcI78lKtYyjG -mFnyQETUsEkVKAQMEh8RtlA8O5IoQLCgwCUlHSd8rEyxT6c9NthIKIFjlsgZBZAkgFTCjgw3LAvb -gtYk7al5gZgDBKHJbhAggEDfOFrYi285yRUF55gdAezCyHaiZ2XnoDY5FlJfNTt5nDEk6NwMRAsK -AYE5N3diLG7HQxFAyCOiycSQosoHauNp3lqkdsRoAI4DB0QoKN55zvrkdjObE59A5IGODBNRBC0b -Kd3Pq7Ak6MbtAxhIAlAsY5uTJ4tYQJFbPaVFESYAq6CBJK33GM7TznQG5AGzBAMEwDnZZLuuEhhw -qL0WdjGCYNGMGDwoJFC0ilJ3JYkkQkBZBgiuN6OmKmjexyBGrD2QRJd4A222afOb3QzuhsjuoEYK -DCBJGzqBMswwYBg8ccEY2N5ACxGRKIMWeKW9UCGcA6tYjwh2p39KcCu9vPLhQRj2dh3Xi9msuJOI -EkdDkCQYIJyKyRgVQxy3kQN2hHNq5QXaMClFGTi8d3PXZrbu7XbJzkOcWxqghAKOsZnpsOpb344Y -et/Ofm/r/8/Ejx2a/nvdzXSWWpFVX/81L5xiPM3R+5Kf91ZlTf7rcVZq/0ENjHm1VUELkghAySZO -PHmpF35TI9OtSLFZY8bF17RdILYVmp5M2qK6NgxADOEiE0UsMOZAy6kmv1BUO6KgiTJl5DkypQRo -MyUnK/ag/rnNSg4x1mTPGg2RhREAkAYtT+vNWaeSJmVakLEqU6pvq3IvEyyMYKLmCS4tk9yLd3Jl -uTad/HV1+Pmc1kIwu7xUE021fnU4v4DCd00HinIY6lXVSi7VOapOkqTTp0RNUwy5bkooL3jujNYp -YsO7qHRQkyyJpzKqXIr0WA2JqVJd3XsTgYkWSGeweXeeMib6kN6Qeveqj95W2N0a6H815eMbP10r -p0bqdCQqM3bAu20aKDYVFCkGHFOkxMw0kKMtUxS87uRIoWnL/xmLv35DwUVjDJZRAYbkhtuZl0HC -vrj0mSKysmTGIoiakISkimVQcSqdAyg3TSUEpV1qqsEUJO7qiDwKvKu7bmSSpVKRImy5MWaEwnNn -eRdpI0gViZOMRADmZtC1Mi6VA21KVW2YpFRQJDtXIqhPljE3U4wxfGMYoUCHigoD7Nus3IouSETV -KjUlJioTKbLTc4dCYpI1Jkll4pSpBqbU0VRqpFFmaQQZYDMmmJcwWSpMzMKqTmm18N1SVB3LBkGJ -RmbKaClTTCYcy6dMA1KrypmbCXW6qtXFGZHJmCJCsMEEDQtRVSac0clSFNAmwgZsJuUHW6o/7FIW -TYzcKiqqjMNVQqiwzTOaCm3UyTBk5wrIptClcqJDEtB02wmyg0ynKCZqWmkX6G5N/hlWRi1K5wLp -Kbdwz/Y88UQRVE3KOGKpFTLZIqSd6m5CnwV4upiZPpeBlUiEDg2ywiYCJhBe5sZxVYISeKqiSmY4 -YouH5qZQNC0cF0j/LpmJSN0ExLkOUmDKMkuZcym5Lf8P4w1iQdgfmvyEQDGMbu5/3+3m/ixLAwCs -gAFplj4zJfaP2GQnSR9uTd9nEwK1eJDHrl+eZ/+6j3McnZZ7W8iQkVPzN8F8Cfo0s+zgVb9plyGZ -/Ts9pFxdpCnn+5JJ0mGqkBfIuM9USkIhjrPEiuIztJ4Vpj6eBWSAX/Aw5TfBYyyZQ607xuXmI476 -/I5NqqcOKF/s3qJKYU50lcbAZt9a+KIroGCVmG3tLg3/mKUwymYmlNZbaf0oxybwpLRPAOHO3iFs -KltVrFYqh8GoqJ86hu7uEVkon/FQj32EbAKne6xSHGlHxCqLz6A8kVwkya3i279oipL/oE94m4U8 -yeMmAxkaXSIeKZfpXlV/G9qb9XV/AoGSE2witael4f2xCKqhXNpZmmLkUHFzCE2sqpdGeb3tijm6 -xc8RR0uSyQrkYzzUvxyKUbhaC5RiTvM12SRjpJ3c7StTpIXDP7O7eauutk1gmT86VsHYranNlFT6 -TFXBxrfFxsF0lW2fV05IpM6F9kGTwuwlJLrLdSvkErb0LJvJo/CjPYcyqW0CTAkHt3mqi4ejowao -WZQJYuBendGHu8XFzXfsoV5Wzh4h3mn3tumUkxh26tqHZDboPr7DXCNSCuqX1rCXQjyYpHroeaeM -W48KUC/zVgiFOxgpiVtzF3jJB3aEk4vbvAv6ilUrnbu3tQ9rn9dA3vzqEwi4bIPZW2016Bmd/PH2 -rZCAgHe7w3YTGoilEajAE8PK1kiK94vuqRkoc/0dqZOWzWkVsKlaofnL9WtXkP8X+hqbkjmeN8k9 -rg7hni07Xd9/BZs7zO41KYtkndE3lvXg9vUfY3h6qBiIGKuiVHcUdE9Kmy1ajFopOeCncfhzq6ui -PZv2SX/rdDKIpmzdS1ChziGCJS7sq5G7SKGiEA9r5N2iC0x4SMTXUFvhUGhQkTc20zbtWpyYVW5P -8G+GWqeKfiUdk8/RJr3NvqFstfUYFp9t1coTtO5utWuWsY5jBNsUuqYJYpnyavtRUrKN2r2eOd2s -HEs/HApVpRbCRXuMl1jx79x2knBP34v6hUoYhW8vqBtg8Ua+BVrFEFinZ/CFdAhOkZyR5FENStIa -9RbwzZqGMTcqFXvF3w5fkvSx1J/ST3ZeJkhKe8vi6D6NYxZ4zUjFqT9je/mYRgxxVOoojpm45Zd6 -eOtqqccukTve4ZSytmrFfP7lAfIpqItRBcNZOPTFNZHEH6NUqHhKdnlzev+Ra8u8xBuyT5CUDBNa -8t0UVaqH6KUGJZl5p15eXeik/sd4d6m429PmKeHZs8PFig4uS1CemH+SlEoi8ycEleYeL6LCHglo -ZWa99lySWPEU8BktoIVTOtVjy/SLaHZv7780DCP0nDPbNsyikBukFSBfs0homPER96mB+F/QCyL/ -Tg3B6WTi5jB0RO02vjsvMoRTQ8KXz/dH06O8hT3CNivS0aWrtfFQcN4Cw+jk2LdWqEZMvarGyb6m >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 9 07:36:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C6C716A4D0; Tue, 9 Dec 2003 07:36:57 -0800 (PST) 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 66D1C16A4CE for ; Tue, 9 Dec 2003 07:36:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E5B743D2A for ; Tue, 9 Dec 2003 07:36:56 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9FauXJ099009 for ; Tue, 9 Dec 2003 07:36:56 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9Fatru099006 for perforce@freebsd.org; Tue, 9 Dec 2003 07:36:55 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 9 Dec 2003 07:36:55 -0800 (PST) Message-Id: <200312091536.hB9Fatru099006@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 43675 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 Dec 2003 15:36:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=43675 Change 43675 by cvance@cvance_korben on 2003/12/09 07:36:09 Remove precondition check Fix bug in sebsd_check_vnode_relabel Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#28 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#28 (text+ko) ==== @@ -75,12 +75,6 @@ MALLOC_DEFINE(M_SEBSD, "sebsd", "Security Enhanced BSD"); -extern int ss_initialized; -static __inline int ss_precondition(void) -{ - return ss_initialized; -} - static void sebsd_init(struct mac_policy_conf *mpc) { @@ -520,10 +514,6 @@ int rc; struct task_security_struct *parent, *task; - rc = ss_precondition(); - if (rc <= 0) - return; - parent = SLOT(cred_parent->cr_label); task = SLOT(cred_child->cr_label); @@ -880,10 +870,6 @@ } } -/* - * Initialize the SEBSD security server after the root partition has - * been mounted; policy is located on root partition. - */ static void sebsd_create_root_mount(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel) @@ -1624,7 +1610,7 @@ task = SLOT(cred->cr_label); old = SLOT(oldlabel); - new = SLOT(oldlabel); + new = SLOT(newlabel); AVC_AUDIT_DATA_INIT(&ad, FS); ad.u.fs.vp = vp; From owner-p4-projects@FreeBSD.ORG Tue Dec 9 07:52:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABE1C16A4D0; Tue, 9 Dec 2003 07:52:18 -0800 (PST) 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 7DBE816A4CE for ; Tue, 9 Dec 2003 07:52:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DCA643D2D for ; Tue, 9 Dec 2003 07:52:17 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9FqGXJ099664 for ; Tue, 9 Dec 2003 07:52:17 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9FqG4R099661 for perforce@freebsd.org; Tue, 9 Dec 2003 07:52:16 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 9 Dec 2003 07:52:16 -0800 (PST) Message-Id: <200312091552.hB9FqG4R099661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 43676 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 Dec 2003 15:52:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=43676 Change 43676 by cvance@cvance_sony on 2003/12/09 07:51:31 Cache privilege decision; use cap_check instead of suser Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/netinet6/in6.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/netinet6/in6.c#7 (text+ko) ==== @@ -79,7 +79,6 @@ #include #include #include -#include #include #include @@ -335,8 +334,11 @@ struct in6_ifreq *ifr = (struct in6_ifreq *)data; struct in6_ifaddr *ia = NULL; struct in6_aliasreq *ifra = (struct in6_aliasreq *)data; + int privileged; - /* XXX: This function considers the caller privileged if td is NULL */ + privileged = 0; + if (td == NULL || !cap_check(td, CAP_NET_ADMIN)) + privileged++; switch (cmd) { case SIOCGETSGCNT_IN6: @@ -361,9 +363,9 @@ case SIOCSRTRFLUSH_IN6: case SIOCSDEFIFACE_IN6: case SIOCSIFINFO_FLAGS: - if (td != NULL && cap_check (td, CAP_NET_ADMIN)) + if (!privileged) return (EPERM); - /* fall through */ + /* FALLTHROUGH */ case OSIOCGIFINFO_IN6: case SIOCGIFINFO_IN6: case SIOCGDRLST_IN6: @@ -388,8 +390,8 @@ switch (cmd) { case SIOCSSCOPE6: - if (td != NULL && cap_check (td, CAP_NET_ADMIN)) - return(EPERM); + if (!privileged) + return (EPERM); return (scope6_set(ifp, (struct scope6_id *)ifr->ifr_ifru.ifru_scope_id)); case SIOCGSCOPE6: @@ -403,7 +405,7 @@ switch (cmd) { case SIOCALIFADDR: case SIOCDLIFADDR: - if (td != NULL && cap_check (td, CAP_NET_ADMIN)) + if (!privileged) return (EPERM); /* FALLTHROUGH */ case SIOCGLIFADDR: @@ -467,7 +469,7 @@ if (ifra->ifra_addr.sin6_family != AF_INET6 || ifra->ifra_addr.sin6_len != sizeof(struct sockaddr_in6)) return (EAFNOSUPPORT); - if (td != NULL && cap_check(td, CAP_NET_ADMIN)) + if (!privileged) return (EPERM); break; @@ -487,7 +489,7 @@ { struct in6_addrlifetime *lt; - if (td != NULL && cap_check(td, CAP_NET_ADMIN)) + if (!privileged) return (EPERM); if (ia == NULL) return (EADDRNOTAVAIL); From owner-p4-projects@FreeBSD.ORG Tue Dec 9 08:04:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCB4F16A4D0; Tue, 9 Dec 2003 08:04:35 -0800 (PST) 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 B3A4F16A4CE for ; Tue, 9 Dec 2003 08:04:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAAFE43D28 for ; Tue, 9 Dec 2003 08:04:34 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9G4YXJ001065 for ; Tue, 9 Dec 2003 08:04:34 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9G4Yq3001061 for perforce@freebsd.org; Tue, 9 Dec 2003 08:04:34 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 9 Dec 2003 08:04:34 -0800 (PST) Message-Id: <200312091604.hB9G4Yq3001061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 43678 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 Dec 2003 16:04:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=43678 Change 43678 by cvance@cvance_sony on 2003/12/09 08:03:43 Patch up sebsd kernel, just a small collection of miss-merges from the MAC branch. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_mount.c#8 edit .. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_vfs.c#9 edit .. //depot/projects/trustedbsd/sebsd/sys/security/mac_test/mac_test.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/vfs_mount.c#8 (text+ko) ==== @@ -107,8 +107,8 @@ static int vfs_mount_alloc(struct vnode *, struct vfsconf *, const char *, struct thread *, struct label *, struct mount **); -static int vfs_domount(struct thread *, struct label *mntlabel, - const char *, char *, int fsflags, void *fsdata, +static int vfs_domount(struct thread *, const char *, char *, + int fsflags, void *fsdata, struct label *mntlabel, int compat); static void gets(char *cp); @@ -640,7 +640,7 @@ * into userspace. */ int -vfs_mount(td, fstype, fspath, fsflags, fsdata) +vfs_mount(td, fstype, fspath, fsflags, fsdata, mntlabel) struct thread *td; const char *fstype; char *fspath; ==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_vfs.c#9 (text+ko) ==== @@ -248,7 +248,7 @@ { int error; - MAC_EXTERNALIZE(mount_label, label, elements, outbuf, outbuflen); + MAC_EXTERNALIZE(mount, label, elements, outbuf, outbuflen); return (error); } @@ -269,7 +269,7 @@ { int error; - MAC_INTERNALIZE(mount_label, label, string); + MAC_INTERNALIZE(mount, label, string); return (error); } ==== //depot/projects/trustedbsd/sebsd/sys/security/mac_test/mac_test.c#10 (text+ko) ==== @@ -840,7 +840,7 @@ } static void -mac_test_create_devfs_device(struct mount *mp, dev_t dev, +mac_test_create_devfs_device(struct ucred *cr, struct mount *mp, dev_t dev, struct devfs_dirent *devfs_dirent, struct label *label, const char *fullpath) { @@ -883,7 +883,7 @@ static void mac_test_create_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) + struct label *mntlabel, struct label *fslabel, struct label *mount_arg) { ASSERT_CRED_LABEL(cred->cr_label); @@ -1367,7 +1367,7 @@ static int mac_test_check_cap(struct ucred *cred, cap_value_t capv) { - ASSERT_CRED_LABEL(&cred->cr_label); + ASSERT_CRED_LABEL(cred->cr_label); return 0; } From owner-p4-projects@FreeBSD.ORG Tue Dec 9 10:16:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E553A16A4D0; Tue, 9 Dec 2003 10:16:43 -0800 (PST) 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 B41AD16A4CE for ; Tue, 9 Dec 2003 10:16:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5B8743D13 for ; Tue, 9 Dec 2003 10:16:31 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9IGVXJ013267 for ; Tue, 9 Dec 2003 10:16:31 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9IGEdF013264 for perforce@freebsd.org; Tue, 9 Dec 2003 10:16:14 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 10:16:14 -0800 (PST) Message-Id: <200312091816.hB9IGEdF013264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43681 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 Dec 2003 18:16:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=43681 Change 43681 by sam@sam_ebb on 2003/12/09 10:16:11 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/alpha/db_trace.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/alpha/interrupt.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/alpha/mp_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/alpha/vm_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/conf/GENERIC.hints#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/include/bus.h#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/include/intr.h#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/include/ioctl_bt848.h#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/include/ioctl_meteor.h#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/include/sf_buf.h#1 branch .. //depot/projects/netperf+sockets/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/osf1/osf1_ioctl.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/osf1/osf1_mount.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/osf1/osf1_proto.h#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/osf1/osf1_syscall.h#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/osf1/osf1_sysent.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/osf1/syscalls.master#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/pci/apecs.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/netperf+sockets/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/netperf+sockets/sys/amd64/amd64/amd64-gdbstub.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/netperf+sockets/sys/amd64/amd64/autoconf.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/critical.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/netperf+sockets/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/netperf+sockets/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/netperf+sockets/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/netperf+sockets/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/netperf+sockets/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/netperf+sockets/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/netperf+sockets/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/netperf+sockets/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/conf/gethints.awk#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/_stdint.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/netperf+sockets/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/netperf+sockets/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/bus_dma.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/clock.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/critical.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/fpu.h#1 branch .. //depot/projects/netperf+sockets/sys/amd64/include/frame.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/netperf+sockets/sys/amd64/include/limits.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/mptable.h#1 branch .. //depot/projects/netperf+sockets/sys/amd64/include/mutex.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/npx.h#2 delete .. //depot/projects/netperf+sockets/sys/amd64/include/param.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/proc.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/reg.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/runq.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/segments.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/netperf+sockets/sys/amd64/include/signal.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/smp.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/tss.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/netperf+sockets/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/netperf+sockets/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/isa/icu_ipl.S#2 delete .. //depot/projects/netperf+sockets/sys/amd64/isa/icu_vector.S#2 delete .. //depot/projects/netperf+sockets/sys/amd64/isa/intr_machdep.c#2 delete .. //depot/projects/netperf+sockets/sys/amd64/isa/intr_machdep.h#2 delete .. //depot/projects/netperf+sockets/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/isa/ithread.c#2 delete .. //depot/projects/netperf+sockets/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/netperf+sockets/sys/amd64/isa/npx.c#2 delete .. //depot/projects/netperf+sockets/sys/amd64/isa/vector.S#2 delete .. //depot/projects/netperf+sockets/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/forth/beastie.4th#3 integrate .. //depot/projects/netperf+sockets/sys/boot/i386/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/boot/i386/boot0/boot0.s#2 integrate .. //depot/projects/netperf+sockets/sys/boot/i386/boot0/boot0sio.s#1 branch .. //depot/projects/netperf+sockets/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/netperf+sockets/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/i386/btx/btx/btx.s#2 integrate .. //depot/projects/netperf+sockets/sys/boot/i386/btx/btxldr/btxldr.s#2 integrate .. //depot/projects/netperf+sockets/sys/boot/i386/loader/loader.rc#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ia64/libski/pal_stub.S#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ia64/skiload/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/boot/pc98/btx/btxldr/btxldr.s#2 integrate .. //depot/projects/netperf+sockets/sys/boot/sparc64/loader/metadata.c#2 integrate .. //depot/projects/netperf+sockets/sys/cam/cam_periph.c#3 integrate .. //depot/projects/netperf+sockets/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/netperf+sockets/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/netperf+sockets/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/netperf+sockets/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/netperf+sockets/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/netperf+sockets/sys/coda/coda_subr.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/netperf+sockets/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/netperf+sockets/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/netperf+sockets/sys/conf/NOTES#3 integrate .. //depot/projects/netperf+sockets/sys/conf/files#3 integrate .. //depot/projects/netperf+sockets/sys/conf/files.amd64#2 integrate .. //depot/projects/netperf+sockets/sys/conf/files.i386#2 integrate .. //depot/projects/netperf+sockets/sys/conf/files.pc98#2 integrate .. //depot/projects/netperf+sockets/sys/conf/files.sparc64#2 integrate .. //depot/projects/netperf+sockets/sys/conf/kern.mk#2 integrate .. //depot/projects/netperf+sockets/sys/conf/kern.post.mk#2 integrate .. //depot/projects/netperf+sockets/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/netperf+sockets/sys/conf/kmod.mk#2 integrate .. //depot/projects/netperf+sockets/sys/conf/ldscript.i386#2 integrate .. //depot/projects/netperf+sockets/sys/conf/majors#2 integrate .. //depot/projects/netperf+sockets/sys/conf/newvers.sh#2 integrate .. //depot/projects/netperf+sockets/sys/conf/options#3 integrate .. //depot/projects/netperf+sockets/sys/conf/options.amd64#2 integrate .. //depot/projects/netperf+sockets/sys/conf/options.i386#2 integrate .. //depot/projects/netperf+sockets/sys/conf/options.pc98#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/test/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/test/dump_context.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/test/dumpmyself.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ia64/libuwx/test/primeregs.s#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ipfilter/netinet/ip_fil.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ngatm/FREEBSD-upgrade#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/addr.h#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/genfiles#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/misc/straddr.c#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/geniec.awk#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/genieh.awk#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/genmsgc.awk#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/genmsgh.awk#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/ie.def#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/msg.def#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/parseie.awk#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/parsemsg.awk#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/priv.h#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/privmsg.c#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/traffic.c#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/uni_config.h#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/uni_hdr.h#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/uni_ie.c#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/uni_ie.h#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/uni_ietab.h#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/uni_msg.c#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/uni_msg.h#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/unimsglib.h#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/uniprint.h#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/msg/unistruct.h#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/sig_call.c#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/sig_coord.c#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/sig_party.c#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/sig_print.c#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/sig_reset.c#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/sig_uni.c#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/sig_verify.c#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/uni.h#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/unidef.h#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/unimkmsg.h#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/unimsgcpy.h#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/unipriv.h#1 branch .. //depot/projects/netperf+sockets/sys/contrib/ngatm/netnatm/sig/unisig.h#1 branch .. //depot/projects/netperf+sockets/sys/crypto/rijndael/rijndael-alg-fst.c#2 integrate .. //depot/projects/netperf+sockets/sys/crypto/rijndael/rijndael-alg-fst.h#2 integrate .. //depot/projects/netperf+sockets/sys/crypto/rijndael/rijndael-api-fst.c#2 integrate .. //depot/projects/netperf+sockets/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate .. //depot/projects/netperf+sockets/sys/crypto/rijndael/rijndael-api.c#1 branch .. //depot/projects/netperf+sockets/sys/crypto/rijndael/rijndael.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aac/aac.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_package.c#1 branch .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/aha/aha.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aha/ahareg.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/an/if_an.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/bktr/bktr_audio.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/bktr/bktr_card.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/bktr/bktr_os.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/bktr/bktr_reg.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/bktr/bktr_tuner.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/bktr/ioctl_bt848.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/bktr/ioctl_meteor.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ciss/cissreg.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/cm/if_cm_isa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/cs/if_cs_isa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/cs/if_csreg.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/cx/cronyxfw.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/cx/csigma.c#1 branch .. //depot/projects/netperf+sockets/sys/dev/cx/csigmafw.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/cx/cxddk.c#1 branch .. //depot/projects/netperf+sockets/sys/dev/cx/cxddk.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/cx/cxreg.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/cx/if_cx.c#1 branch .. //depot/projects/netperf+sockets/sys/dev/cx/machdep.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/cx/ng_cx.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/dgb/dgb.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/dgb/dgbios.h#2 delete .. //depot/projects/netperf+sockets/sys/dev/dgb/dgfep.h#2 delete .. //depot/projects/netperf+sockets/sys/dev/dgb/dgreg.h#2 delete .. //depot/projects/netperf+sockets/sys/dev/drm/drm.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/drm_bufs.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/drm_drv.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/drm_fops.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/drm_ioctl.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/drm_irq.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/drm_os_freebsd.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/radeon.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/em/if_em.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/em/if_em.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/en/midway.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ep/if_ep_pccard.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ep/if_epreg.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/fb/creator.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/fe/if_fevar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwdev.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/sbp.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/sbp_targ.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/gx/if_gx.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/harp/if_harp.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/hatm/if_hatm.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/hatm/if_hatm_intr.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/hatm/if_hatm_rx.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/hatm/if_hatm_tx.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/hatm/if_hatmvar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/hea/eni.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/hea/eni.h#2 delete .. //depot/projects/netperf+sockets/sys/dev/hea/eni_buffer.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/hea/eni_globals.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/hea/eni_if.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/hea/eni_init.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/hea/eni_intr.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/hea/eni_receive.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/hea/eni_stats.h#2 delete .. //depot/projects/netperf+sockets/sys/dev/hea/eni_suni.h#2 delete .. //depot/projects/netperf+sockets/sys/dev/hea/eni_transmit.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/hea/eni_var.h#2 delete .. //depot/projects/netperf+sockets/sys/dev/hea/eni_vcm.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/hea/hea_freebsd.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/hea/hea_freebsd.h#2 delete .. //depot/projects/netperf+sockets/sys/dev/hea/hea_pci.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/idt/idt.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ie/if_ie.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ips/ips.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ips/ips.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ips/ips_commands.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/led/led.c#1 branch .. //depot/projects/netperf+sockets/sys/dev/led/led.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/lmc/if_lmc.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/lmc/if_lmc_common.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/lmc/if_lmc_fbsd3.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/lmc/if_lmc_media.c#2 delete .. //depot/projects/netperf+sockets/sys/dev/lmc/if_lmcioctl.h#2 delete .. //depot/projects/netperf+sockets/sys/dev/lmc/if_lmcvar.h#2 delete .. //depot/projects/netperf+sockets/sys/dev/lnc/if_lnc.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/md/md.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/my/if_my.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/null/null.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/owi/if_owi.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/owi/if_wivar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/netperf+sockets/sys/dev/pccard/pccarddevs.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/pccard/pccardvar.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/pci/pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/pdq/if_fea.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/pdq/if_fpa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/pdq/pdq_freebsd.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/pdq/pdqvar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/random/harvest.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/random/hash.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/random/randomdev.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/re/if_re.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sab/sab.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sbni/if_sbni_isa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sio/sio.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/sn/if_sn_isa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/snp/snp.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/isa/mpu.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/midi/midibuf.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/twe/twe.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/twe/twe_compat.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/twe/twe_tables.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/twe/tweio.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/twe/twereg.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/twe/twevar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/uart/uart_kbd_sun.c#1 branch .. //depot/projects/netperf+sockets/sys/dev/uart/uart_kbd_sun.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/uart/uart_kbd_sun_tables.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/umct.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/ums.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usb.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usb_ethersubr.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs_data.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/vinum/vinuminterrupt.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/vinum/vinumio.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/vinum/vinumrequest.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/vx/if_vx.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/vx/if_vx_eisa.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/vx/if_vx_pci.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/vx/if_vxvar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/xe/if_xe.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/xe/if_xe_pccard.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/zs/zs.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/netperf+sockets/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/procfs/procfs_ioctl.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/procfs/procfs_rlimit.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/procfs/procfs_type.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/netperf+sockets/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/specfs/spec_vnops.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/udf/osta.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/udf/osta.h#2 integrate .. //depot/projects/netperf+sockets/sys/fs/udf/udf.h#2 integrate .. //depot/projects/netperf+sockets/sys/fs/udf/udf_iconv.c#1 branch .. //depot/projects/netperf+sockets/sys/fs/udf/udf_mount.h#1 branch .. //depot/projects/netperf+sockets/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/netperf+sockets/sys/geom/geom.h#2 integrate .. //depot/projects/netperf+sockets/sys/geom/geom_ccd.c#3 integrate .. //depot/projects/netperf+sockets/sys/geom/geom_disk.c#2 integrate .. //depot/projects/netperf+sockets/sys/geom/geom_dump.c#2 integrate .. //depot/projects/netperf+sockets/sys/geom/geom_event.c#2 integrate .. //depot/projects/netperf+sockets/sys/geom/geom_io.c#2 integrate .. //depot/projects/netperf+sockets/sys/geom/geom_pc98.c#2 integrate .. //depot/projects/netperf+sockets/sys/geom/geom_subr.c#2 integrate .. //depot/projects/netperf+sockets/sys/gnu/ext2fs/alpha-bitops.h#2 delete .. //depot/projects/netperf+sockets/sys/gnu/ext2fs/ext2_linux_balloc.c#2 integrate .. //depot/projects/netperf+sockets/sys/gnu/ext2fs/ext2_linux_ialloc.c#2 integrate .. //depot/projects/netperf+sockets/sys/gnu/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/acpica/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/acpica/acpi_wakecode.S#3 integrate .. //depot/projects/netperf+sockets/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/acpica/madt.c#1 branch .. //depot/projects/netperf+sockets/sys/i386/bios/apm.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/netperf+sockets/sys/i386/conf/NOTES#3 integrate .. //depot/projects/netperf+sockets/sys/i386/conf/PAE#2 integrate .. //depot/projects/netperf+sockets/sys/i386/conf/SMP#2 delete .. //depot/projects/netperf+sockets/sys/i386/i386/apic_vector.s#1 branch .. //depot/projects/netperf+sockets/sys/i386/i386/autoconf.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/bios.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/critical.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/db_interface.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/exception.s#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/intr_machdep.c#1 branch .. //depot/projects/netperf+sockets/sys/i386/i386/io_apic.c#1 branch .. //depot/projects/netperf+sockets/sys/i386/i386/local_apic.c#1 branch .. //depot/projects/netperf+sockets/sys/i386/i386/locore.s#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/mpapic.c#2 delete .. //depot/projects/netperf+sockets/sys/i386/i386/mpboot.s#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/mptable.c#1 branch .. //depot/projects/netperf+sockets/sys/i386/i386/mptable_pci.c#1 branch .. //depot/projects/netperf+sockets/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/support.s#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/trap.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/apic.h#2 delete .. //depot/projects/netperf+sockets/sys/i386/include/apicreg.h#1 branch .. //depot/projects/netperf+sockets/sys/i386/include/apicvar.h#1 branch .. //depot/projects/netperf+sockets/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/atomic.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/bus_dma.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/clock.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/critical.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/cronyx.h#2 delete .. //depot/projects/netperf+sockets/sys/i386/include/cserial.h#1 branch .. //depot/projects/netperf+sockets/sys/i386/include/intr_machdep.h#1 branch .. //depot/projects/netperf+sockets/sys/i386/include/ioctl_bt848.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/ioctl_meteor.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/md_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/mptable.h#1 branch .. //depot/projects/netperf+sockets/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/pmap.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/proc.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/segments.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/sf_buf.h#1 branch .. //depot/projects/netperf+sockets/sys/i386/include/smp.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/smptests.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/apic_ipl.s#2 delete .. //depot/projects/netperf+sockets/sys/i386/isa/apic_vector.s#2 delete .. //depot/projects/netperf+sockets/sys/i386/isa/asc.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/atpic.c#1 branch .. //depot/projects/netperf+sockets/sys/i386/isa/atpic_vector.s#1 branch .. //depot/projects/netperf+sockets/sys/i386/isa/bs/bsif.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/clock.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/cronyx.c#2 delete .. //depot/projects/netperf+sockets/sys/i386/isa/cx.c#2 delete .. //depot/projects/netperf+sockets/sys/i386/isa/cxreg.h#2 delete .. //depot/projects/netperf+sockets/sys/i386/isa/cy.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/icu.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/icu_ipl.s#2 delete .. //depot/projects/netperf+sockets/sys/i386/isa/icu_vector.s#2 delete .. //depot/projects/netperf+sockets/sys/i386/isa/if_cx.c#2 delete .. //depot/projects/netperf+sockets/sys/i386/isa/if_el.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/if_le.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/if_rdp.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/intr_machdep.c#2 delete .. //depot/projects/netperf+sockets/sys/i386/isa/intr_machdep.h#2 delete .. //depot/projects/netperf+sockets/sys/i386/isa/isa_compat.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/istallion.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/ithread.c#2 delete .. //depot/projects/netperf+sockets/sys/i386/isa/loran.c#2 delete .. //depot/projects/netperf+sockets/sys/i386/isa/mse.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/nmi.c#1 branch .. //depot/projects/netperf+sockets/sys/i386/isa/npx.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/spic.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/stallion.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/isa/vector.s#2 delete .. //depot/projects/netperf+sockets/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/netperf+sockets/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/netperf+sockets/sys/i4b/driver/i4b_ipr.c#2 integrate .. //depot/projects/netperf+sockets/sys/i4b/driver/i4b_isppp.c#2 integrate .. //depot/projects/netperf+sockets/sys/i4b/driver/i4b_rbch.c#2 integrate .. //depot/projects/netperf+sockets/sys/i4b/driver/i4b_tel.c#2 integrate .. //depot/projects/netperf+sockets/sys/i4b/driver/i4b_trace.c#2 integrate .. //depot/projects/netperf+sockets/sys/i4b/include/i4b_global.h#2 integrate .. //depot/projects/netperf+sockets/sys/i4b/layer4/i4b_i4bdrv.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/conf/GENERIC.hints#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia32/ia32_proto.h#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia32/ia32_syscall.h#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia32/ia32_sysent.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia32/syscalls.master#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/ptrace_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/sys_machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/syscall.S#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/unaligned.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/vm_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/include/_types.h#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/include/bus.h#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/include/ioctl_bt848.h#2 delete .. //depot/projects/netperf+sockets/sys/ia64/include/ioctl_meteor.h#2 delete .. //depot/projects/netperf+sockets/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/include/pc/bios.h#2 delete .. //depot/projects/netperf+sockets/sys/ia64/include/pc/msdos.h#2 delete .. //depot/projects/netperf+sockets/sys/ia64/include/pc/vesa.h#2 delete .. //depot/projects/netperf+sockets/sys/ia64/include/pcpu.h#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/include/sf_buf.h#1 branch .. //depot/projects/netperf+sockets/sys/ia64/include/sysarch.h#3 integrate .. //depot/projects/netperf+sockets/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/netperf+sockets/sys/isa/psm.c#2 integrate .. //depot/projects/netperf+sockets/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/init_sysent.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_context.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_event.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_exec.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_exit.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_fork.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_intr.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_mac.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_physio.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_poll.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_prot.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_sig.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_switch.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_synch.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_tc.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_thread.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/sched_ule.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/subr_bus.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/subr_log.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/subr_mbpool.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/subr_mbuf.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/subr_prf.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/subr_smp.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/subr_turnstile.c#1 branch .. //depot/projects/netperf+sockets/sys/kern/subr_witness.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/sys_generic.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/syscalls.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/syscalls.master#2 integrate .. //depot/projects/netperf+sockets/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/tty.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/tty_pty.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/netperf+sockets/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/vfs_default.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/netperf+sockets/sys/libkern/iconv_xlat16.c#2 integrate .. //depot/projects/netperf+sockets/sys/modules/Makefile#3 integrate .. //depot/projects/netperf+sockets/sys/modules/acpi/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/cs/Makefile#1 branch .. //depot/projects/netperf+sockets/sys/modules/cx/Makefile#1 branch .. //depot/projects/netperf+sockets/sys/modules/hea/Makefile#2 delete .. //depot/projects/netperf+sockets/sys/modules/if_gre/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/linux/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/mac_stub/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/netgraph/atm/Makefile#3 integrate .. //depot/projects/netperf+sockets/sys/modules/netgraph/atm/atmbase/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/netgraph/atm/uni/Makefile#1 branch .. //depot/projects/netperf+sockets/sys/modules/netgraph/etf/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/nfs4client/Makefile#1 branch .. //depot/projects/netperf+sockets/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/null/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/nwfs/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/ppbus/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/ppi/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/pps/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/smbfs/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/streams/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/udf/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/modules/udf_iconv/Makefile#1 branch .. //depot/projects/netperf+sockets/sys/modules/uplcom/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/net/bpf.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/bpf.h#2 integrate .. //depot/projects/netperf+sockets/sys/net/bpfdesc.h#2 integrate .. //depot/projects/netperf+sockets/sys/net/bridge.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/ethernet.h#2 integrate .. //depot/projects/netperf+sockets/sys/net/if.c#3 integrate .. //depot/projects/netperf+sockets/sys/net/if.h#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_arcsubr.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_disc.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_ef.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_faith.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_gif.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_gre.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_loop.c#3 integrate .. //depot/projects/netperf+sockets/sys/net/if_media.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_media.h#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_mib.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_ppp.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_sl.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_stf.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_tap.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_tun.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_var.h#3 integrate .. //depot/projects/netperf+sockets/sys/net/if_vlan.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/net_osdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/net_osdep.h#2 integrate .. //depot/projects/netperf+sockets/sys/net/netisr.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/netisr.h#2 integrate .. //depot/projects/netperf+sockets/sys/net/pfkeyv2.h#2 integrate .. //depot/projects/netperf+sockets/sys/net/ppp_tty.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/route.c#3 integrate .. //depot/projects/netperf+sockets/sys/net/route.h#3 integrate .. //depot/projects/netperf+sockets/sys/net/rtsock.c#2 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_compat.c#1 branch .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_compat.h#1 branch .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/netatalk/aarp.c#2 integrate .. //depot/projects/netperf+sockets/sys/netatalk/at_control.c#2 integrate .. //depot/projects/netperf+sockets/sys/netatalk/at_rmx.c#2 integrate .. //depot/projects/netperf+sockets/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/netperf+sockets/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/netperf+sockets/sys/netatm/atm_aal5.c#2 integrate .. //depot/projects/netperf+sockets/sys/netatm/atm_if.c#2 integrate .. //depot/projects/netperf+sockets/sys/netatm/atm_if.h#2 integrate .. //depot/projects/netperf+sockets/sys/netatm/atm_subr.c#2 integrate .. //depot/projects/netperf+sockets/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/netperf+sockets/sys/netatm/atm_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/netatm/ipatm/ipatm_usrreq.c#2 integrate .. //depot/projects/netperf+sockets/sys/netatm/ipatm/ipatm_vcm.c#2 integrate .. //depot/projects/netperf+sockets/sys/netatm/spans/spans_arp.c#2 integrate .. //depot/projects/netperf+sockets/sys/netatm/uni/uniarp.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/atm/ng_atm.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/atm/ng_sscop.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/atm/ng_uni.h#1 branch .. //depot/projects/netperf+sockets/sys/netgraph/atm/ngatmbase.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/atm/ngatmbase.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/atm/uni/ng_uni.c#1 branch .. //depot/projects/netperf+sockets/sys/netgraph/atm/uni/ng_uni_cust.h#1 branch .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/hci/ng_hci_cmds.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/hci/ng_hci_evnt.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/hci/ng_hci_misc.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/hci/ng_hci_prse.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/hci/ng_hci_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/include/ng_bluetooth.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/include/ng_btsocket.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/include/ng_h4.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/include/ng_hci.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_UI.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_async.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_bpf.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_cisco.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_device.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_echo.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_eiface.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_etf.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_etf.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_fec.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_frame_relay.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_gif.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_hole.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_iface.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_ip_input.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_ksocket.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_l2tp.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_lmi.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_mppc.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_parse.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_ppp.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_pptpgre.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_rfc1490.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_sample.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_socket.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_socketvar.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_source.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_split.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_tee.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_tty.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_vjc.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/if_atm.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/if_ether.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/in.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/in_gif.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/in_pcb.c#2 edit .. //depot/projects/netperf+sockets/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/netperf+sockets/sys/netinet/in_proto.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/in_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_divert.h#1 branch .. //depot/projects/netperf+sockets/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_ecn.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_ecn.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_fastfwd.c#1 branch .. //depot/projects/netperf+sockets/sys/netinet/ip_flow.c#2 delete .. //depot/projects/netperf+sockets/sys/netinet/ip_flow.h#2 delete .. //depot/projects/netperf+sockets/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_id.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_input.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_output.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/tcp_hostcache.c#1 branch .. //depot/projects/netperf+sockets/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/tcp_subr.c#3 edit .. //depot/projects/netperf+sockets/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ah.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ah_core.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ah_input.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/esp_core.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/esp_input.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/esp_output.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/esp_rijndael.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/esp_rijndael.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/frag6.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet6/in6.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/in6.h#3 integrate .. //depot/projects/netperf+sockets/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/in6_ifattach.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/in6_pcb.c#3 edit .. //depot/projects/netperf+sockets/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet6/in6_rmx.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_fw.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_fw.h#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ipsec.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 9 10:19:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 036C016A4D1; Tue, 9 Dec 2003 10:19:37 -0800 (PST) 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 D36C616A4CF for ; Tue, 9 Dec 2003 10:19:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 09EAF43D1D for ; Tue, 9 Dec 2003 10:19:36 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9IJZXJ013382 for ; Tue, 9 Dec 2003 10:19:35 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9IJZmq013379 for perforce@freebsd.org; Tue, 9 Dec 2003 10:19:35 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 10:19:35 -0800 (PST) Message-Id: <200312091819.hB9IJZmq013379@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43682 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 Dec 2003 18:19:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=43682 Change 43682 by sam@sam_ebb on 2003/12/09 10:18:42 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/kern/uipc_syscalls.c#3 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/kern/uipc_syscalls.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.157 2003/10/19 20:41:07 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.159 2003/12/01 22:12:50 dg Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -60,6 +60,7 @@ #include #include #include +#include #include #include #include @@ -1868,7 +1869,7 @@ MGETHDR(m, M_TRYWAIT, MT_DATA); if (m == NULL) { error = ENOBUFS; - sf_buf_free((void *)sf->kva, sf); + sf_buf_free((void *)sf_buf_kva(sf), sf); SOCKBUF_LOCK(&so->so_snd); sbunlock(&so->so_snd); SOCKBUF_UNLOCK(&so->so_snd); @@ -1877,9 +1878,9 @@ /* * Setup external storage for mbuf. */ - MEXTADD(m, sf->kva, PAGE_SIZE, sf_buf_free, sf, M_RDONLY, + MEXTADD(m, sf_buf_kva(sf), PAGE_SIZE, sf_buf_free, sf, M_RDONLY, EXT_SFBUF); - m->m_data = (char *) sf->kva + pgoff; + m->m_data = (char *)sf_buf_kva(sf) + pgoff; m->m_pkthdr.len = m->m_len = xfsize; /* * Add the buffer to the socket buffer chain. @@ -1987,5 +1988,7 @@ vrele(vp); if (so) fputsock(so); + if (error == ERESTART) + error = EINTR; return (error); } From owner-p4-projects@FreeBSD.ORG Tue Dec 9 10:20:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09B5816A4D0; Tue, 9 Dec 2003 10:20:41 -0800 (PST) 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 D838216A4CE for ; Tue, 9 Dec 2003 10:20:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5767B43D33 for ; Tue, 9 Dec 2003 10:20:39 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9IKdXJ013540 for ; Tue, 9 Dec 2003 10:20:39 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9IKcIS013537 for perforce@freebsd.org; Tue, 9 Dec 2003 10:20:38 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 10:20:38 -0800 (PST) Message-Id: <200312091820.hB9IKcIS013537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43684 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 Dec 2003 18:20:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=43684 Change 43684 by sam@sam_ebb on 2003/12/09 10:20:23 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.155 2003/10/21 18:28:35 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.159 2003/11/16 18:25:20 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -1457,10 +1457,8 @@ sizeof extmac); if (error) goto bad; - - error = mac_setsockopt_label_set( - sopt->sopt_td->td_ucred, so, &extmac); - + error = mac_setsockopt_label(sopt->sopt_td->td_ucred, + so, &extmac); #else error = EOPNOTSUPP; #endif @@ -1604,8 +1602,12 @@ break; case SO_LABEL: #ifdef MAC - error = mac_getsockopt_label_get( - sopt->sopt_td->td_ucred, so, &extmac); + error = sooptcopyin(sopt, &extmac, sizeof(extmac), + sizeof(extmac)); + if (error) + return (error); + error = mac_getsockopt_label(sopt->sopt_td->td_ucred, + so, &extmac); if (error) return (error); error = sooptcopyout(sopt, &extmac, sizeof extmac); @@ -1615,7 +1617,11 @@ break; case SO_PEERLABEL: #ifdef MAC - error = mac_getsockopt_peerlabel_get( + error = sooptcopyin(sopt, &extmac, sizeof(extmac), + sizeof(extmac)); + if (error) + return (error); + error = mac_getsockopt_peerlabel( sopt->sopt_td->td_ucred, so, &extmac); if (error) return (error); @@ -1749,7 +1755,7 @@ { if (so->so_sigio != NULL) pgsigio(&so->so_sigio, SIGURG, 0); - selwakeup(&so->so_rcv.sb_sel); + selwakeuppri(&so->so_rcv.sb_sel, PSOCK); } int From owner-p4-projects@FreeBSD.ORG Tue Dec 9 10:22:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5257E16A4D0; Tue, 9 Dec 2003 10:22:44 -0800 (PST) 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 2686116A4CE for ; Tue, 9 Dec 2003 10:22:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FD2743D2F for ; Tue, 9 Dec 2003 10:22:42 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9IMgXJ013586 for ; Tue, 9 Dec 2003 10:22:42 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9IMg7R013583 for perforce@freebsd.org; Tue, 9 Dec 2003 10:22:42 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 10:22:42 -0800 (PST) Message-Id: <200312091822.hB9IMg7R013583@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43685 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 Dec 2003 18:22:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=43685 Change 43685 by sam@sam_ebb on 2003/12/09 10:22:04 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/kern/uipc_socket2.c#3 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/kern/uipc_socket2.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.115 2003/10/21 18:28:35 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.118 2003/11/18 00:39:03 rwatson Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -363,7 +363,7 @@ { SOCKBUF_LOCK_ASSERT(sb); - selwakeup(&sb->sb_sel); + selwakeuppri(&sb->sb_sel, PSOCK); sb->sb_flags &= ~SB_SEL; if (sb->sb_flags & SB_WAIT) { sb->sb_flags &= ~SB_WAIT; @@ -1285,6 +1285,16 @@ } /* + * For protocol types that don't keep cached copies of labels in their + * pcbs, provide a null sosetlabel that does a NOOP. + */ +void +pru_sosetlabel_null(struct socket *so) +{ + +} + +/* * Make a copy of a sockaddr in a malloced buffer of type M_SONAME. */ struct sockaddr * From owner-p4-projects@FreeBSD.ORG Tue Dec 9 10:23:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AB4C16A4D0; Tue, 9 Dec 2003 10:23:45 -0800 (PST) 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 7505616A4CE for ; Tue, 9 Dec 2003 10:23:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 805F443D2A for ; Tue, 9 Dec 2003 10:23:44 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9INiXJ013615 for ; Tue, 9 Dec 2003 10:23:44 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9INh9p013612 for perforce@freebsd.org; Tue, 9 Dec 2003 10:23:43 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 10:23:43 -0800 (PST) Message-Id: <200312091823.hB9INh9p013612@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43686 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 Dec 2003 18:23:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=43686 Change 43686 by sam@sam_ebb on 2003/12/09 10:23:41 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/netatalk/ddp_usrreq.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/netatalk/ddp_usrreq.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.30 2003/03/04 23:19:51 jlemon Exp $ + * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.33 2003/11/18 00:39:03 rwatson Exp $ */ #include @@ -459,7 +459,7 @@ } if ( ddp->ddp_route.ro_rt ) { - rtfree( ddp->ddp_route.ro_rt ); + RTFREE( ddp->ddp_route.ro_rt ); } if ( ddp->ddp_prev ) { @@ -553,9 +553,9 @@ mtx_init(&atintrq1.ifq_mtx, "at1_inq", NULL, MTX_DEF); mtx_init(&atintrq2.ifq_mtx, "at2_inq", NULL, MTX_DEF); mtx_init(&aarpintrq.ifq_mtx, "aarp_inq", NULL, MTX_DEF); - netisr_register(NETISR_ATALK1, at1intr, &atintrq1); - netisr_register(NETISR_ATALK2, at2intr, &atintrq2); - netisr_register(NETISR_AARP, aarpintr, &aarpintrq); + netisr_register(NETISR_ATALK1, at1intr, &atintrq1, 0); + netisr_register(NETISR_ATALK2, at2intr, &atintrq2, 0); + netisr_register(NETISR_AARP, aarpintr, &aarpintrq, 0); } #if 0 @@ -590,5 +590,6 @@ at_setsockaddr, sosend, soreceive, - sopoll + sopoll, + pru_sosetlabel_null }; From owner-p4-projects@FreeBSD.ORG Tue Dec 9 10:25:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2A5E16A52D; Tue, 9 Dec 2003 10:25:48 -0800 (PST) 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 8C50916A528 for ; Tue, 9 Dec 2003 10:25:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC47B43D2A for ; Tue, 9 Dec 2003 10:25:47 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9IPlXJ013764 for ; Tue, 9 Dec 2003 10:25:47 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9IPlni013761 for perforce@freebsd.org; Tue, 9 Dec 2003 10:25:47 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 10:25:47 -0800 (PST) Message-Id: <200312091825.hB9IPlni013761@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43687 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 Dec 2003 18:25:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=43687 Change 43687 by sam@sam_ebb on 2003/12/09 10:24:54 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/netatm/atm_socket.c#2 edit Differences ... ==== //depot/projects/netperf+sockets/sys/netatm/atm_socket.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netatm/atm_socket.c,v 1.18 2003/07/25 08:35:25 harti Exp $"); +__FBSDID("$FreeBSD: src/sys/netatm/atm_socket.c,v 1.19 2003/10/31 18:32:10 brooks Exp $"); #include #include @@ -1218,7 +1218,7 @@ ifp = &ap->nif->nif_if; (void) snprintf(netif.net_intf, sizeof(netif.net_intf), - "%s%d", ifp->if_name, ifp->if_unit); + "%s", ifp->if_xname); return (sooptcopyout(sopt, &netif, sizeof netif)); } else { From owner-p4-projects@FreeBSD.ORG Tue Dec 9 10:26:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB70D16A4D0; Tue, 9 Dec 2003 10:26:51 -0800 (PST) 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 C088516A4CE for ; Tue, 9 Dec 2003 10:26:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 96D2443D2F for ; Tue, 9 Dec 2003 10:26:49 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9IQnXJ013804 for ; Tue, 9 Dec 2003 10:26:49 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9IQnww013801 for perforce@freebsd.org; Tue, 9 Dec 2003 10:26:49 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 10:26:49 -0800 (PST) Message-Id: <200312091826.hB9IQnww013801@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43688 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 Dec 2003 18:26:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=43688 Change 43688 by sam@sam_ebb on 2003/12/09 10:26:46 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/sys/socketvar.h#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/sys/socketvar.h#3 (text+ko) ==== @@ -31,13 +31,12 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.3 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/socketvar.h,v 1.105 2003/08/05 00:27:54 hsu Exp $ + * $FreeBSD: src/sys/sys/socketvar.h,v 1.108 2003/11/16 06:11:26 alc Exp $ */ #ifndef _SYS_SOCKETVAR_H_ #define _SYS_SOCKETVAR_H_ -#include /* for struct label */ #include /* for TAILQ macros */ #include /* for struct selinfo */ @@ -116,8 +115,8 @@ void (*so_upcall)(struct socket *, void *, int); void *so_upcallarg; struct ucred *so_cred; /* user credentials */ - struct label so_label; /* MAC label for socket */ - struct label so_peerlabel; /* cached MAC label for socket peer */ + struct label *so_label; /* MAC label for socket */ + struct label *so_peerlabel; /* cached MAC label for socket peer */ /* NB: generation count must not be first; easiest to make it last. */ so_gen_t so_gencnt; /* generation count */ void *so_emuldata; /* private data for emulators */ @@ -335,12 +334,6 @@ struct thread *sopt_td; /* calling thread or null if kernel */ }; -struct sf_buf { - SLIST_ENTRY(sf_buf) free_list; /* list of free buffer slots */ - struct vm_page *m; /* currently mapped page */ - vm_offset_t kva; /* va of mapping */ -}; - struct accept_filter { char accf_name[16]; void (*accf_callback) @@ -401,9 +394,6 @@ struct thread *td); void sbtoxsockbuf(struct sockbuf *sb, struct xsockbuf *xsb); int sbwait(struct sockbuf *sb); -struct sf_buf * - sf_buf_alloc(struct vm_page *m); -void sf_buf_free(void *addr, void *args); int sb_lock(struct sockbuf *sb); int soabort(struct socket *so); int soaccept(struct socket *so, struct sockaddr **nam); From owner-p4-projects@FreeBSD.ORG Tue Dec 9 10:44:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B368E16A4D0; Tue, 9 Dec 2003 10:44:31 -0800 (PST) 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 8BE9416A4CE for ; Tue, 9 Dec 2003 10:44:31 -0800 (PST) Received: from mail1.speakeasy.net (mail1.speakeasy.net [216.254.0.201]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CA3443D21 for ; Tue, 9 Dec 2003 10:44:30 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 3022 invoked from network); 9 Dec 2003 18:44:28 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 9 Dec 2003 18:44:28 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.9/8.12.9) with ESMTP id hB9IiPie069349; Tue, 9 Dec 2003 13:44:25 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20031208.175500.36934037.imp@bsdimp.com> Date: Tue, 09 Dec 2003 13:44:26 -0500 (EST) From: John Baldwin To: "M. Warner Losh" X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: perforce@freebsd.org cc: nate@root.org Subject: Re: PERFORCE change 43464 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 Dec 2003 18:44:32 -0000 On 09-Dec-2003 M. Warner Losh wrote: > In message: > John Baldwin writes: >: >: On 05-Dec-2003 Nate Lawson wrote: >: > On Fri, 5 Dec 2003, John Baldwin wrote: >: >> Change 43464 by jhb@jhb_blue on 2003/12/05 12:59:01 >: >> >: >> More updates. Closer to working than I thought. In theory >: >> PCI devices should all just work now. >: > >: > This handles PCI. Are you ok with me adding the call to >: > acpi_pwr_switch_consumer() for non-PCI devices like the embedded >: > controller? I think we need to do this at the top \\_SB level. I'm a bit >: > confused as to the handoff between the general tree walk and the ACPI-PCI >: > driver though. >: >: It won't hurt to switch a device on twice. It should be ok to >: do a top-level tree walk of all device objects and turn them on >: before probing child devices I think. ACPI shouldn't turn off >: devices that don't probe like PCI does though because ACPI has >: duplicate objects of things like the entire PCI device tree. :-/ > > Actually, there can be times when you don't want to turn on devices at > all. Walking the whole tree turning them on might be the wrong to > do... > > Sometimes I think that things in the newbus tree should have a pointer > to the acpi power methods that are used in coordination with the bus > code that is 'activating' the device before the 'probe' and 'attach' > happens. I think having a 'bus_set_power_state()' method in the bus layer and having device_probe_and_attach() do 'bus_set_power_state(child, ON)' would be sufficient. ACPI busses would then perform the correct hooks via their bus_set_power_state() methods. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Tue Dec 9 11:21:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47EBE16A4D0; Tue, 9 Dec 2003 11:21:58 -0800 (PST) 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 2313716A4CE for ; Tue, 9 Dec 2003 11:21:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EB0443D2E for ; Tue, 9 Dec 2003 11:21:57 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9JLuXJ016623 for ; Tue, 9 Dec 2003 11:21:56 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9JLu1B016620 for perforce@freebsd.org; Tue, 9 Dec 2003 11:21:56 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 11:21:56 -0800 (PST) Message-Id: <200312091921.hB9JLu1B016620@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43690 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 Dec 2003 19:21:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=43690 Change 43690 by sam@sam_ebb on 2003/12/09 11:21:53 remove Giant bandaids not needed with socket locking Affected files ... .. //depot/projects/netperf+sockets/sys/netinet/ip_divert.c#3 edit .. //depot/projects/netperf+sockets/sys/netinet/ip_dummynet.c#4 edit .. //depot/projects/netperf+sockets/sys/netinet/ip_input.c#3 edit .. //depot/projects/netperf+sockets/sys/netinet/ip_mroute.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/netinet/ip_divert.c#3 (text+ko) ==== @@ -223,20 +223,6 @@ sizeof(divsrc.sin_zero)); } - /* - * XXX sbappendaddr must be protected by Giant until - * we have locking at the socket layer. When entered - * from below we come in w/o Giant and must take it - * here. Unfortunately we cannot tell whether we're - * entering from above (already holding Giant), - * below (potentially without Giant), or otherwise - * (e.g. from tcp_syncache through a timeout) so we - * have to grab it regardless. This causes a LOR with - * the tcp lock, at least, and possibly others. For - * the moment we're ignoring this. Once sockets are - * locked this cruft can be removed. - */ - mtx_lock(&Giant); /* Put packet on socket queue, if any */ sa = NULL; nport = htons((u_int16_t)divert_info(mtag)); @@ -258,7 +244,6 @@ INP_UNLOCK(inp); } INP_INFO_RUNLOCK(&divcbinfo); - mtx_unlock(&Giant); if (sa == NULL) { m_freem(m); ipstat.ips_noproto++; ==== //depot/projects/netperf+sockets/sys/netinet/ip_dummynet.c#4 (text+ko) ==== ==== //depot/projects/netperf+sockets/sys/netinet/ip_input.c#3 (text+ko) ==== @@ -925,21 +925,18 @@ * Switch out to protocol's input routine. */ ipstat.ips_delivered++; - NET_PICKUP_GIANT(); if (args.next_hop && ip->ip_p == IPPROTO_TCP) { /* attach next hop info for TCP */ mtag = m_tag_get(PACKET_TAG_IPFORWARD, sizeof(struct sockaddr_in *), M_NOWAIT); if (mtag == NULL) { /* XXX statistic */ - NET_DROP_GIANT(); goto bad; } *(struct sockaddr_in **)(mtag+1) = args.next_hop; m_tag_prepend(m, mtag); } (*inetsw[ip_protox[ip->ip_p]].pr_input)(m, hlen); - NET_DROP_GIANT(); return; bad: m_freem(m); ==== //depot/projects/netperf+sockets/sys/netinet/ip_mroute.c#3 (text+ko) ==== @@ -1289,13 +1289,10 @@ socket_send(struct socket *s, struct mbuf *mm, struct sockaddr_in *src) { if (s) { - mtx_lock(&Giant); /* XXX until sockets are locked */ if (sbappendaddr(&s->so_rcv, (struct sockaddr *)src, mm, NULL) != 0) { sorwakeup(s); - mtx_unlock(&Giant); return 0; } - mtx_unlock(&Giant); } m_freem(mm); return -1; From owner-p4-projects@FreeBSD.ORG Tue Dec 9 14:59:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFD4D16A4D0; Tue, 9 Dec 2003 14:59:20 -0800 (PST) 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 B228516A4CE for ; Tue, 9 Dec 2003 14:59:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0D2143D28 for ; Tue, 9 Dec 2003 14:59:19 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9MxJXJ033105 for ; Tue, 9 Dec 2003 14:59:19 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9MxJFW033102 for perforce@freebsd.org; Tue, 9 Dec 2003 14:59:19 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 14:59:19 -0800 (PST) Message-Id: <200312092259.hB9MxJFW033102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43693 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 Dec 2003 22:59:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=43693 Change 43693 by sam@sam_ebb on 2003/12/09 14:58:43 remove Giant bandaid Affected files ... .. //depot/projects/netperf+sockets/sys/netinet/tcp_syncache.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/netinet/tcp_syncache.c#3 (text+ko) ==== @@ -541,7 +541,6 @@ struct socket *so; struct tcpcb *tp; - GIANT_REQUIRED; /* XXX until socket locking */ INP_INFO_WLOCK_ASSERT(&tcbinfo); /* From owner-p4-projects@FreeBSD.ORG Tue Dec 9 15:01:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB8ED16A4D0; Tue, 9 Dec 2003 15:01:24 -0800 (PST) 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 C6D4D16A4CE for ; Tue, 9 Dec 2003 15:01:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE34443D28 for ; Tue, 9 Dec 2003 15:01:23 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9N1NXJ033253 for ; Tue, 9 Dec 2003 15:01:23 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9N1N6n033250 for perforce@freebsd.org; Tue, 9 Dec 2003 15:01:23 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 15:01:23 -0800 (PST) Message-Id: <200312092301.hB9N1N6n033250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43695 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 Dec 2003 23:01:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=43695 Change 43695 by sam@sam_ebb on 2003/12/09 15:00:38 o remove Giant assertions Affected files ... .. //depot/projects/netperf+sockets/sys/nfsserver/nfs_srvsock.c#3 edit .. //depot/projects/netperf+sockets/sys/nfsserver/nfs_syscalls.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/nfsserver/nfs_srvsock.c#3 (text+ko) ==== @@ -425,8 +425,6 @@ goto dorecs; } #endif - GIANT_REQUIRED; /* XXX until socket locking is done */ - auio.uio_td = NULL; if (so->so_type == SOCK_STREAM) { /* @@ -727,8 +725,6 @@ struct sockaddr *sendnam; int error, soflags, flags; - GIANT_REQUIRED; /* XXX until socket locking is done */ - soflags = so->so_proto->pr_flags; if ((soflags & PR_CONNREQUIRED) || (so->so_state & SS_ISCONNECTED)) sendnam = NULL; ==== //depot/projects/netperf+sockets/sys/nfsserver/nfs_syscalls.c#3 (text+ko) ==== @@ -199,8 +199,6 @@ struct socket *so; int error, s; - GIANT_REQUIRED; /* XXX until socket locking done */ - so = fp->f_data; #if 0 tslp = NULL; From owner-p4-projects@FreeBSD.ORG Tue Dec 9 15:01:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 883F616A4D9; Tue, 9 Dec 2003 15:01:25 -0800 (PST) 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 1B27A16A4D1 for ; Tue, 9 Dec 2003 15:01:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3831743D1F for ; Tue, 9 Dec 2003 15:01:23 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9N1NXJ033247 for ; Tue, 9 Dec 2003 15:01:23 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9N1MSk033244 for perforce@freebsd.org; Tue, 9 Dec 2003 15:01:22 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 15:01:22 -0800 (PST) Message-Id: <200312092301.hB9N1MSk033244@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43694 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 Dec 2003 23:01:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=43694 Change 43694 by sam@sam_ebb on 2003/12/09 15:00:21 o remove Giant assertions o lock snd sockbuf so we can preserve assertions; not necessary unless we decide to do fine-grained locking of nfs Affected files ... .. //depot/projects/netperf+sockets/sys/nfsclient/bootp_subr.c#3 edit .. //depot/projects/netperf+sockets/sys/nfsclient/krpc_subr.c#3 edit .. //depot/projects/netperf+sockets/sys/nfsclient/nfs_bio.c#3 edit .. //depot/projects/netperf+sockets/sys/nfsclient/nfs_socket.c#3 edit .. //depot/projects/netperf+sockets/sys/nfsclient/nfs_subs.c#3 edit .. //depot/projects/netperf+sockets/sys/nfsclient/nfs_vfsops.c#4 edit Differences ... ==== //depot/projects/netperf+sockets/sys/nfsclient/bootp_subr.c#3 (text+ko) ==== @@ -589,8 +589,6 @@ int retry; const char *s; - GIANT_REQUIRED; /* XXX until socket locking done */ - /* * Create socket and set its recieve timeout. */ @@ -981,8 +979,6 @@ struct ifaddr *ifa; struct sockaddr_dl *sdl; - GIANT_REQUIRED; /* XXX until socket locking done */ - error = socreate(AF_INET, &ifctx->so, SOCK_DGRAM, 0, td->td_ucred, td); if (error != 0) panic("nfs_boot: socreate, error=%d", error); ==== //depot/projects/netperf+sockets/sys/nfsclient/krpc_subr.c#3 (text+ko) ==== @@ -215,8 +215,6 @@ nam = mhead = NULL; from = NULL; - GIANT_REQUIRED; /* XXX until socket locking done */ - /* * Create socket and set its recieve timeout. */ ==== //depot/projects/netperf+sockets/sys/nfsclient/nfs_bio.c#3 (text+ko) ==== ==== //depot/projects/netperf+sockets/sys/nfsclient/nfs_socket.c#3 (text+ko) ==== @@ -165,8 +165,6 @@ struct sockaddr *saddr; struct thread *td = &thread0; /* only used for socreate and sobind */ - GIANT_REQUIRED; /* XXX until socket locking done */ - nmp->nm_so = NULL; saddr = nmp->nm_nam; error = socreate(saddr->sa_family, &nmp->nm_so, nmp->nm_sotype, @@ -383,8 +381,6 @@ { struct socket *so; - GIANT_REQUIRED; /* XXX until socket locking done */ - if (nmp->nm_so) { so = nmp->nm_so; nmp->nm_so = NULL; @@ -419,8 +415,6 @@ struct sockaddr *sendnam; int error, soflags, flags; - GIANT_REQUIRED; /* XXX until socket locking done */ - KASSERT(rep, ("nfs_send: called with rep == NULL")); if (rep->r_flags & R_SOFTTERM) { @@ -494,8 +488,6 @@ int error, sotype, rcvflg; struct thread *td = curthread; /* XXX */ - GIANT_REQUIRED; /* XXX until socket locking done */ - /* * Set up arguments for soreceive() */ @@ -1139,6 +1131,7 @@ * Set r_rtt to -1 in case we fail to send it now. */ rep->r_rtt = -1; + SOCKBUF_LOCK(&so->so_snd); if (sbspace(&so->so_snd) >= rep->r_mreq->m_pkthdr.len && ((nmp->nm_flag & NFSMNT_DUMBTIMR) || (rep->r_flags & R_SENT) || @@ -1174,6 +1167,7 @@ rep->r_rtt = 0; } } + SOCKBUF_UNLOCK(&so->so_snd); } splx(s); nfs_timer_handle = timeout(nfs_timer, NULL, nfs_ticks); ==== //depot/projects/netperf+sockets/sys/nfsclient/nfs_subs.c#3 (text+ko) ==== ==== //depot/projects/netperf+sockets/sys/nfsclient/nfs_vfsops.c#4 (text+ko) ==== @@ -387,8 +387,6 @@ u_long l; char buf[128]; - GIANT_REQUIRED; /* XXX until socket locking done */ - #if defined(BOOTP_NFSROOT) && defined(BOOTP) bootpc_init(); /* use bootp to get nfs_diskless filled in */ #elif defined(NFS_ROOT) From owner-p4-projects@FreeBSD.ORG Tue Dec 9 15:08:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3C6516A4D0; Tue, 9 Dec 2003 15:08:34 -0800 (PST) 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 9DE7C16A4CE for ; Tue, 9 Dec 2003 15:08:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A083743D09 for ; Tue, 9 Dec 2003 15:08:33 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9N8XXJ034333 for ; Tue, 9 Dec 2003 15:08:33 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9N8XoP034330 for perforce@freebsd.org; Tue, 9 Dec 2003 15:08:33 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 15:08:33 -0800 (PST) Message-Id: <200312092308.hB9N8XoP034330@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43697 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 Dec 2003 23:08:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=43697 Change 43697 by sam@sam_ebb on 2003/12/09 15:07:39 o IFC o mark unp mutex DUPOK because we can't distinguish between multiple unp's in connect2 case and so get spurious complaints (need better solution) o add more socket locking o lock unpcb's when emptying ref list on detach to conform to locking rules Affected files ... .. //depot/projects/netperf+sockets/sys/kern/uipc_usrreq.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/kern/uipc_usrreq.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.111 2003/06/11 00:56:58 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.112 2003/11/18 00:39:03 rwatson Exp $"); #include "opt_mac.h" @@ -92,8 +92,9 @@ #define UNP_HEAD_UNLOCK() mtx_unlock(&unp_mtx) #define UNP_HEAD_LOCK_ASSERT() mtx_assert(&unp_mtx, MA_OWNED) +/* NB: DUPOK is to cover the connect2 case XXX */ #define UNP_LOCK_INIT(_unp) \ - mtx_init(&(_unp)->unp_mtx, "unp", NULL, MTX_DEF) + mtx_init(&(_unp)->unp_mtx, "unp", NULL, MTX_DEF | MTX_DUPOK) #define UNP_LOCK_DESTROY(_unp) mtx_destroy(&(_unp)->unp_mtx) #define UNP_LOCK(_unp) mtx_lock(&(_unp)->unp_mtx) #define UNP_UNLOCK(_unp) mtx_unlock(&(_unp)->unp_mtx) @@ -142,6 +143,7 @@ UNP_ENTER(unp); unp_drop(unp, ECONNABORTED); unp_detach(unp); /* NB: unlocks unp + head */ + SOCK_LOCK(so); sotryfree(so); return 0; } @@ -536,7 +538,7 @@ uipc_connect2, pru_control_notsupp, uipc_detach, uipc_disconnect, uipc_listen, uipc_peeraddr, uipc_rcvd, pru_rcvoob_notsupp, uipc_send, uipc_sense, uipc_shutdown, uipc_sockaddr, - sosend, soreceive, sopoll + sosend, soreceive, sopoll, pru_sosetlabel_null }; int @@ -667,8 +669,12 @@ } if (unp->unp_conn) unp_disconnect(unp); - while (!LIST_EMPTY(&unp->unp_refs)) - unp_drop(LIST_FIRST(&unp->unp_refs), ECONNRESET); + while (!LIST_EMPTY(&unp->unp_refs)) { + struct unpcb *ref = LIST_FIRST(&unp->unp_refs); + UNP_LOCK(ref); + unp_drop(ref, ECONNRESET); + UNP_UNLOCK(ref); + } soisdisconnected(unp->unp_socket); unp->unp_socket->so_pcb = 0; if (unp_rights) { From owner-p4-projects@FreeBSD.ORG Tue Dec 9 15:09:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B560316A4D0; Tue, 9 Dec 2003 15:09:36 -0800 (PST) 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 7A3ED16A4CE for ; Tue, 9 Dec 2003 15:09:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B63143D28 for ; Tue, 9 Dec 2003 15:09:35 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9N9ZXJ034369 for ; Tue, 9 Dec 2003 15:09:35 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9N9Zu6034366 for perforce@freebsd.org; Tue, 9 Dec 2003 15:09:35 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 15:09:35 -0800 (PST) Message-Id: <200312092309.hB9N9Zu6034366@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43698 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 Dec 2003 23:09:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=43698 Change 43698 by sam@sam_ebb on 2003/12/09 15:08:41 o remove Giant assertions o lock snd sockbuf to satisfy assertions Affected files ... .. //depot/projects/netperf+sockets/sys/rpc/rpcclnt.c#2 edit Differences ... ==== //depot/projects/netperf+sockets/sys/rpc/rpcclnt.c#2 (text+ko) ==== @@ -362,8 +362,6 @@ RPC_RETURN(EFAULT); } - GIANT_REQUIRED; /* XXX until socket locking done */ - /* create the socket */ rpc->rc_so = NULL; @@ -620,8 +618,6 @@ { struct socket *so; - GIANT_REQUIRED; /* XXX until socket locking done */ - if (rpc->rc_so) { so = rpc->rc_so; rpc->rc_so = NULL; @@ -671,8 +667,6 @@ #endif int error, soflags, flags; - GIANT_REQUIRED; /* XXX until socket locking done */ - if (rep) { if (rep->r_flags & R_SOFTTERM) { m_freem(top); @@ -756,8 +750,6 @@ #endif int error, sotype, rcvflg; - GIANT_REQUIRED; /* XXX until socket locking done */ - /* * Set up arguments for soreceive() */ @@ -1430,6 +1422,7 @@ * Set r_rtt to -1 in case we fail to send it now. */ rep->r_rtt = -1; + SOCKBUF_LOCK(&so->so_snd); if (sbspace(&so->so_snd) >= rep->r_mreq->m_pkthdr.len && ((rpc->rc_flag & RPCCLNT_DUMBTIMR) || (rep->r_flags & R_SENT) || @@ -1464,6 +1457,7 @@ rep->r_rtt = 0; } } + SOCKBUF_UNLOCK(&so->so_snd); } splx(s); From owner-p4-projects@FreeBSD.ORG Tue Dec 9 15:10:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BEED16A4D0; Tue, 9 Dec 2003 15:10:40 -0800 (PST) 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 5601516A4CE for ; Tue, 9 Dec 2003 15:10:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7390A43D2B for ; Tue, 9 Dec 2003 15:10:37 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9NAbXJ034464 for ; Tue, 9 Dec 2003 15:10:37 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9NAboH034461 for perforce@freebsd.org; Tue, 9 Dec 2003 15:10:37 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 15:10:37 -0800 (PST) Message-Id: <200312092310.hB9NAboH034461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43699 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 Dec 2003 23:10:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=43699 Change 43699 by sam@sam_ebb on 2003/12/09 15:10:01 o correct SOCK_ASSERT definition and renmae to SOCK_LOCK_ASSERT for consistency o change sorele and sotryfree to assume(+assert) a held lock and to zero the parameter to insure no use-after-free problems Affected files ... .. //depot/projects/netperf+sockets/sys/sys/socketvar.h#4 edit Differences ... ==== //depot/projects/netperf+sockets/sys/sys/socketvar.h#4 (text+ko) ==== @@ -148,7 +148,7 @@ #define SOCK_LOCK(_so) SOCKBUF_LOCK(&(_so)->so_rcv) #define SOCK_OWNED(_so) SOCKBUF_OWNED(&(_so)->so_rcv) #define SOCK_UNLOCK(_so) SOCKBUF_UNLOCK(&(_so)->so_rcv) -#define SOCK_ASSERT(_so) SOCKBUF_ASSERT(&(_so)->so_rcv) +#define SOCK_LOCK_ASSERT(_so) SOCKBUF_LOCK_ASSERT(&(_so)->so_rcv) /* * Socket state bits. @@ -289,15 +289,24 @@ } while (0) #define sorele(so) do { \ + SOCK_LOCK_ASSERT(so); \ if ((so)->so_count <= 0) \ panic("sorele"); \ if (--(so)->so_count == 0) \ sofree(so); \ + else { \ + SOCK_UNLOCK(so); \ + so = NULL; \ + } \ } while (0) #define sotryfree(so) do { \ + SOCK_LOCK_ASSERT(so); \ if ((so)->so_count == 0) \ sofree(so); \ + else \ + SOCK_UNLOCK(so); \ + so = NULL; \ } while (0) #define sorwakeup(so) do { \ From owner-p4-projects@FreeBSD.ORG Tue Dec 9 15:11:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 279B416A4D0; Tue, 9 Dec 2003 15:11:41 -0800 (PST) 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 020FA16A4CE for ; Tue, 9 Dec 2003 15:11:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DB9C43D31 for ; Tue, 9 Dec 2003 15:11:39 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9NBdXJ034504 for ; Tue, 9 Dec 2003 15:11:39 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9NBc9g034501 for perforce@freebsd.org; Tue, 9 Dec 2003 15:11:38 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 15:11:38 -0800 (PST) Message-Id: <200312092311.hB9NBc9g034501@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43700 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 Dec 2003 23:11:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=43700 Change 43700 by sam@sam_ebb on 2003/12/09 15:11:03 o cleanup potential socket use potential free o IFC Affected files ... .. //depot/projects/netperf+sockets/sys/net/raw_usrreq.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net/raw_usrreq.c#3 (text+ko) ==== @@ -31,13 +31,14 @@ * SUCH DAMAGE. * * @(#)raw_usrreq.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.29 2003/09/11 21:40:20 ru Exp $ + * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.30 2003/11/18 00:39:03 rwatson Exp $ */ #include #include #include #include +#include #include #include #include @@ -143,8 +144,12 @@ if (rp == 0) return EINVAL; raw_disconnect(rp); - sotryfree(so); - soisdisconnected(so); /* XXX huh? called after the sofree()? */ + SOCK_LOCK(so); + if (so->so_count != 0) { + soisdisconnected(so); + SOCK_UNLOCK(so); + } else + sofree(so); return 0; } @@ -296,5 +301,5 @@ pru_connect2_notsupp, pru_control_notsupp, raw_udetach, raw_udisconnect, pru_listen_notsupp, raw_upeeraddr, pru_rcvd_notsupp, pru_rcvoob_notsupp, raw_usend, pru_sense_null, raw_ushutdown, - raw_usockaddr, sosend, soreceive, sopoll + raw_usockaddr, sosend, soreceive, sopoll, pru_sosetlabel_null }; From owner-p4-projects@FreeBSD.ORG Tue Dec 9 15:13:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0625D16A4D0; Tue, 9 Dec 2003 15:13:47 -0800 (PST) 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 D11AF16A4CE for ; Tue, 9 Dec 2003 15:13:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8815043D2B for ; Tue, 9 Dec 2003 15:13:42 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9NDgXJ034605 for ; Tue, 9 Dec 2003 15:13:42 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9NDgwM034602 for perforce@freebsd.org; Tue, 9 Dec 2003 15:13:42 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 15:13:42 -0800 (PST) Message-Id: <200312092313.hB9NDgwM034602@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43701 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 Dec 2003 23:13:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=43701 Change 43701 by sam@sam_ebb on 2003/12/09 15:12:54 redo COMMON_START/COMMON_END stuff to eliminate implicit use of labels and some local variables; add sockbuf lock reordering so satisfy inp head/inp/sockbuf lock ordering requirements Affected files ... .. //depot/projects/netperf+sockets/sys/netinet/tcp_usrreq.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/netinet/tcp_usrreq.c#3 (text+ko) ==== @@ -119,7 +119,6 @@ static int tcp_usr_attach(struct socket *so, int proto, struct thread *td) { - int s = splnet(); int error; struct inpcb *inp; struct tcpcb *tp = 0; @@ -145,11 +144,71 @@ out: TCPDEBUG2(PRU_ATTACH); INP_INFO_WUNLOCK(&tcbinfo); - splx(s); return error; } /* + * Common code to setup and teardown locking. Most + * code begins with a COMMON_START macro and finishes + * with COMMON_END. You indicate whether the inpcb + * and enclosing head are to be locked read or write + * and whether there is an existing sockbuf lock that + * needs to be re-ordered. + */ +#define INI_NOLOCK 0 /* no head lock */ +#define INI_READ 1 /* read head lock */ +#define INI_WRITE 2 /* write head lock */ +#define SBI_NONE 0 /* no sockbuf lock to reorder */ +#define SBI_SND 1 /* reorder so->so_snd lock */ +#define SBI_RCV 2 /* reorder so->so_rcv lock */ + +#define COMMON_START0(_headrw, _sbrw) do { \ + if (_sbrw == SBI_SND) \ + SOCKBUF_UNLOCK(&so->so_snd); \ + else if (_sbrw == SBI_RCV) \ + SOCKBUF_UNLOCK(&so->so_rcv); \ + if (_headrw == INI_READ) \ + INP_INFO_RLOCK(&tcbinfo); \ + else if (_headrw == INI_WRITE) \ + INP_INFO_WLOCK(&tcbinfo); \ + inp = sotoinpcb(so); \ + if (inp == 0) { \ + if (_sbrw == SBI_SND) \ + SOCKBUF_LOCK(&so->so_snd); \ + else if (_sbrw == SBI_RCV) \ + SOCKBUF_LOCK(&so->so_rcv); \ + if (_headrw == INI_READ) \ + INP_INFO_RUNLOCK(&tcbinfo); \ + else if (_headrw == INI_WRITE) \ + INP_INFO_WUNLOCK(&tcbinfo); \ + return EINVAL; \ + } \ + INP_LOCK(inp); \ + if (_sbrw == SBI_SND) \ + SOCKBUF_LOCK(&so->so_snd); \ + else if (_sbrw == SBI_RCV) \ + SOCKBUF_LOCK(&so->so_rcv); \ + if (_headrw == INI_READ) \ + INP_INFO_RUNLOCK(&tcbinfo); \ + tp = intotcpcb(inp); \ + TCPDEBUG1(); \ +} while(0) + +#define COMMON_START(_headrw, _sbrw) do { \ + TCPDEBUG0; \ + COMMON_START0(_headrw, _sbrw); \ +} while (0) + +#define COMMON_END(_headrw, req) \ + TCPDEBUG2(req); \ + do { \ + if (tp) \ + INP_UNLOCK(inp); \ + if (_headrw == INI_WRITE) \ + INP_INFO_WUNLOCK(&tcbinfo); \ + } while(0) + +/* * pru_detach() detaches the TCP protocol from the socket. * If the protocol state is non-embryonic, then can't * do this directly: have to initiate a pru_disconnect(), @@ -159,85 +218,28 @@ static int tcp_usr_detach(struct socket *so) { - int s = splnet(); int error = 0; struct inpcb *inp; struct tcpcb *tp; - TCPDEBUG0; - INP_INFO_WLOCK(&tcbinfo); - inp = sotoinpcb(so); - if (inp == 0) { - INP_INFO_WUNLOCK(&tcbinfo); - splx(s); - return EINVAL; /* XXX */ - } - INP_LOCK(inp); - tp = intotcpcb(inp); - TCPDEBUG1(); + COMMON_START(INI_WRITE, SBI_NONE); tp = tcp_disconnect(tp); - - TCPDEBUG2(PRU_DETACH); - if (tp) - INP_UNLOCK(inp); - INP_INFO_WUNLOCK(&tcbinfo); - splx(s); + COMMON_END(INI_WRITE, PRU_DETACH); return error; } -#define INI_NOLOCK 0 -#define INI_READ 1 -#define INI_WRITE 2 - -#define COMMON_START() \ - TCPDEBUG0; \ - do { \ - if (inirw == INI_READ) \ - INP_INFO_RLOCK(&tcbinfo); \ - else if (inirw == INI_WRITE) \ - INP_INFO_WLOCK(&tcbinfo); \ - inp = sotoinpcb(so); \ - if (inp == 0) { \ - if (inirw == INI_READ) \ - INP_INFO_RUNLOCK(&tcbinfo); \ - else if (inirw == INI_WRITE) \ - INP_INFO_WUNLOCK(&tcbinfo); \ - splx(s); \ - return EINVAL; \ - } \ - INP_LOCK(inp); \ - if (inirw == INI_READ) \ - INP_INFO_RUNLOCK(&tcbinfo); \ - tp = intotcpcb(inp); \ - TCPDEBUG1(); \ -} while(0) - -#define COMMON_END(req) \ -out: TCPDEBUG2(req); \ - do { \ - if (tp) \ - INP_UNLOCK(inp); \ - if (inirw == INI_WRITE) \ - INP_INFO_WUNLOCK(&tcbinfo); \ - splx(s); \ - return error; \ - goto out; \ -} while(0) - /* * Give the socket an address. */ static int tcp_usr_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { - int s = splnet(); int error = 0; struct inpcb *inp; struct tcpcb *tp; struct sockaddr_in *sinp; - const int inirw = INI_WRITE; - COMMON_START(); + COMMON_START(INI_WRITE, SBI_NONE); /* * Must check for multicast addresses and disallow binding @@ -250,23 +252,21 @@ goto out; } error = in_pcbbind(inp, nam, td); - if (error) - goto out; - COMMON_END(PRU_BIND); +out: + COMMON_END(INI_WRITE, PRU_BIND); + return error; } #ifdef INET6 static int tcp6_usr_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { - int s = splnet(); int error = 0; struct inpcb *inp; struct tcpcb *tp; struct sockaddr_in6 *sin6p; - const int inirw = INI_WRITE; - COMMON_START(); + COMMON_START(INI_WRITE, SBI_NONE); /* * Must check for multicast addresses and disallow binding @@ -294,9 +294,9 @@ } } error = in6_pcbbind(inp, nam, td); - if (error) - goto out; - COMMON_END(PRU_BIND); +out: + COMMON_END(INI_WRITE, PRU_BIND); + return error; } #endif /* INET6 */ @@ -306,31 +306,28 @@ static int tcp_usr_listen(struct socket *so, struct thread *td) { - int s = splnet(); int error = 0; struct inpcb *inp; struct tcpcb *tp; - const int inirw = INI_WRITE; - COMMON_START(); + COMMON_START(INI_WRITE, SBI_NONE); if (inp->inp_lport == 0) error = in_pcbbind(inp, (struct sockaddr *)0, td); if (error == 0) tp->t_state = TCPS_LISTEN; - COMMON_END(PRU_LISTEN); + COMMON_END(INI_WRITE, PRU_LISTEN); + return error; } #ifdef INET6 static int tcp6_usr_listen(struct socket *so, struct thread *td) { - int s = splnet(); int error = 0; struct inpcb *inp; struct tcpcb *tp; - const int inirw = INI_WRITE; - COMMON_START(); + COMMON_START(INI_WRITE, SBI_NONE); if (inp->inp_lport == 0) { inp->inp_vflag &= ~INP_IPV4; if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0) @@ -339,7 +336,8 @@ } if (error == 0) tp->t_state = TCPS_LISTEN; - COMMON_END(PRU_LISTEN); + COMMON_END(INI_WRITE, PRU_LISTEN); + return error; } #endif /* INET6 */ @@ -353,14 +351,12 @@ static int tcp_usr_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { - int s = splnet(); int error = 0; struct inpcb *inp; struct tcpcb *tp; struct sockaddr_in *sinp; - const int inirw = INI_WRITE; - COMMON_START(); + COMMON_START(INI_WRITE, SBI_NONE); /* * Must disallow TCP ``connections'' to multicast addresses. @@ -378,21 +374,21 @@ if ((error = tcp_connect(tp, nam, td)) != 0) goto out; error = tcp_output(tp); - COMMON_END(PRU_CONNECT); +out: + COMMON_END(INI_WRITE, PRU_CONNECT); + return error; } #ifdef INET6 static int tcp6_usr_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { - int s = splnet(); int error = 0; struct inpcb *inp; struct tcpcb *tp; struct sockaddr_in6 *sin6p; - const int inirw = INI_WRITE; - COMMON_START(); + COMMON_START(INI_WRITE, SBI_NONE); /* * Must disallow TCP ``connections'' to multicast addresses. @@ -426,7 +422,9 @@ if ((error = tcp6_connect(tp, nam, td)) != 0) goto out; error = tcp_output(tp); - COMMON_END(PRU_CONNECT); +out: + COMMON_END(INI_WRITE, PRU_CONNECT); + return error; } #endif /* INET6 */ @@ -444,15 +442,14 @@ static int tcp_usr_disconnect(struct socket *so) { - int s = splnet(); int error = 0; struct inpcb *inp; struct tcpcb *tp; - const int inirw = INI_WRITE; - COMMON_START(); + COMMON_START(INI_WRITE, SBI_NONE); tp = tcp_disconnect(tp); - COMMON_END(PRU_DISCONNECT); + COMMON_END(INI_WRITE, PRU_DISCONNECT); + return error; } /* @@ -463,7 +460,6 @@ static int tcp_usr_accept(struct socket *so, struct sockaddr **nam) { - int s; int error = 0; struct inpcb *inp = NULL; struct tcpcb *tp = NULL; @@ -473,34 +469,21 @@ if (so->so_state & SS_ISDISCONNECTED) { error = ECONNABORTED; - goto out; + goto out; /* NB: ok 'cuz tp is NULL */ } - s = splnet(); - INP_INFO_RLOCK(&tcbinfo); - inp = sotoinpcb(so); - if (!inp) { - INP_INFO_RUNLOCK(&tcbinfo); - splx(s); - return (EINVAL); - } - INP_LOCK(inp); - INP_INFO_RUNLOCK(&tcbinfo); - tp = intotcpcb(inp); - TCPDEBUG1(); + COMMON_START0(INI_READ, SBI_NONE); /* - * We inline in_setpeeraddr and COMMON_END here, so that we can - * copy the data of interest and defer the malloc until after we - * release the lock. + * We inline in_setpeeraddr so that we can copy the + * data of interest and defer the malloc until after + * we release the lock. */ port = inp->inp_fport; addr = inp->inp_faddr; -out: TCPDEBUG2(PRU_ACCEPT); - if (tp) - INP_UNLOCK(inp); - splx(s); +out: + COMMON_END(INI_READ, PRU_ACCEPT); if (error == 0) *nam = in_sockaddr(port, &addr); return error; @@ -510,7 +493,6 @@ static int tcp6_usr_accept(struct socket *so, struct sockaddr **nam) { - int s; struct inpcb *inp = NULL; int error = 0; struct tcpcb *tp = NULL; @@ -522,25 +504,14 @@ if (so->so_state & SS_ISDISCONNECTED) { error = ECONNABORTED; - goto out; + goto out; /* NB: ok 'cuz tp is NULL */ } - s = splnet(); - INP_INFO_RLOCK(&tcbinfo); - inp = sotoinpcb(so); - if (inp == 0) { - INP_INFO_RUNLOCK(&tcbinfo); - splx(s); - return (EINVAL); - } - INP_LOCK(inp); - INP_INFO_RUNLOCK(&tcbinfo); - tp = intotcpcb(inp); - TCPDEBUG1(); + COMMON_START0(INI_READ, SBI_NONE); /* - * We inline in6_mapped_peeraddr and COMMON_END here, so that we can - * copy the data of interest and defer the malloc until after we - * release the lock. + * We inline in6_mapped_peeraddr so that we can + * copy the data of interest and defer the malloc + * until after we release the lock. */ if (inp->inp_vflag & INP_IPV4) { v4 = 1; @@ -551,10 +522,8 @@ addr6 = inp->in6p_faddr; } -out: TCPDEBUG2(PRU_ACCEPT); - if (tp) - INP_UNLOCK(inp); - splx(s); +out: + COMMON_END(INI_READ, PRU_ACCEPT); if (error == 0) { if (v4) *nam = in6_v4mapsin6_sockaddr(port, &addr); @@ -592,18 +561,17 @@ static int tcp_usr_shutdown(struct socket *so) { - int s = splnet(); int error = 0; struct inpcb *inp; struct tcpcb *tp; - const int inirw = INI_WRITE; - COMMON_START(); + COMMON_START(INI_WRITE, SBI_NONE); socantsendmore(so); tp = tcp_usrclosed(tp); if (tp) error = tcp_output(tp); - COMMON_END(PRU_SHUTDOWN); + COMMON_END(INI_WRITE, PRU_SHUTDOWN); + return error; } /* @@ -612,15 +580,14 @@ static int tcp_usr_rcvd(struct socket *so, int flags) { - int s = splnet(); int error = 0; struct inpcb *inp; struct tcpcb *tp; - const int inirw = INI_READ; - COMMON_START(); + COMMON_START(INI_READ, SBI_RCV); tcp_output(tp); - COMMON_END(PRU_RCVD); + COMMON_END(INI_READ, PRU_RCVD); + return error; } /* @@ -634,11 +601,9 @@ tcp_usr_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, struct mbuf *control, struct thread *td) { - int s = splnet(); int error = 0; struct inpcb *inp; struct tcpcb *tp; - const int inirw = INI_WRITE; #ifdef INET6 int isipv6; #endif @@ -650,9 +615,11 @@ * We really want to have to this function upgrade from read lock * to write lock. XXX */ + SOCKBUF_UNLOCK(&so->so_snd); INP_INFO_WLOCK(&tcbinfo); inp = sotoinpcb(so); if (inp == NULL) { + SOCKBUF_LOCK(&so->so_snd); /* * OOPS! we lost a race, the TCP session got reset after * we checked SS_CANTSENDMORE, eg: while doing uiomove or a @@ -668,6 +635,7 @@ goto out; } INP_LOCK(inp); + SOCKBUF_LOCK(&so->so_snd); #ifdef INET6 isipv6 = nam && nam->sa_family == AF_INET6; #endif /* INET6 */ @@ -758,8 +726,10 @@ error = tcp_output(tp); tp->t_force = 0; } - COMMON_END((flags & PRUS_OOB) ? PRU_SENDOOB : +out: + COMMON_END(INI_WRITE, (flags & PRUS_OOB) ? PRU_SENDOOB : ((flags & PRUS_EOF) ? PRU_SEND_EOF : PRU_SEND)); + return error; } /* @@ -768,15 +738,14 @@ static int tcp_usr_abort(struct socket *so) { - int s = splnet(); int error = 0; struct inpcb *inp; struct tcpcb *tp; - const int inirw = INI_WRITE; - COMMON_START(); + COMMON_START(INI_WRITE, SBI_NONE); tp = tcp_drop(tp, ECONNABORTED); - COMMON_END(PRU_ABORT); + COMMON_END(INI_WRITE, PRU_ABORT); + return error; } /* @@ -785,13 +754,11 @@ static int tcp_usr_rcvoob(struct socket *so, struct mbuf *m, int flags) { - int s = splnet(); int error = 0; struct inpcb *inp; struct tcpcb *tp; - const int inirw = INI_READ; - COMMON_START(); + COMMON_START(INI_READ, SBI_NONE); if ((so->so_oobmark == 0 && (so->so_state & SS_RCVATMARK) == 0) || so->so_options & SO_OOBINLINE || @@ -807,7 +774,9 @@ *mtod(m, caddr_t) = tp->t_iobc; if ((flags & MSG_PEEK) == 0) tp->t_oobflags ^= (TCPOOB_HAVEDATA | TCPOOB_HADDATA); - COMMON_END(PRU_RCVOOB); +out: + COMMON_END(INI_READ, PRU_RCVOOB); + return error; } /* xxx - should be const */ @@ -1026,17 +995,15 @@ struct socket *so; struct sockopt *sopt; { - int error, opt, optval, s; + int error, opt, optval; struct inpcb *inp; struct tcpcb *tp; error = 0; - s = splnet(); /* XXX */ INP_INFO_RLOCK(&tcbinfo); inp = sotoinpcb(so); if (inp == NULL) { INP_INFO_RUNLOCK(&tcbinfo); - splx(s); return (ECONNRESET); } INP_LOCK(inp); @@ -1049,7 +1016,6 @@ #endif /* INET6 */ error = ip_ctloutput(so, sopt); INP_UNLOCK(inp); - splx(s); return (error); } tp = intotcpcb(inp); @@ -1137,7 +1103,6 @@ break; } INP_UNLOCK(inp); - splx(s); return (error); } @@ -1278,4 +1243,3 @@ } return (tp); } - From owner-p4-projects@FreeBSD.ORG Tue Dec 9 15:14:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC30516A4D0; Tue, 9 Dec 2003 15:14:49 -0800 (PST) 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 C7AFD16A4CE for ; Tue, 9 Dec 2003 15:14:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A2E343D31 for ; Tue, 9 Dec 2003 15:14:45 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9NEiXJ034670 for ; Tue, 9 Dec 2003 15:14:44 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9NEig0034667 for perforce@freebsd.org; Tue, 9 Dec 2003 15:14:44 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 15:14:44 -0800 (PST) Message-Id: <200312092314.hB9NEig0034667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43703 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 Dec 2003 23:14:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=43703 Change 43703 by sam@sam_ebb on 2003/12/09 15:14:38 add explicit socket lock now required for sorele+sotryfree Affected files ... .. //depot/projects/netperf+sockets/sys/kern/kern_descrip.c#2 edit .. //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#4 edit .. //depot/projects/netperf+sockets/sys/net/raw_cb.c#2 edit .. //depot/projects/netperf+sockets/sys/netatalk/ddp_usrreq.c#4 edit .. //depot/projects/netperf+sockets/sys/netatm/atm_socket.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/kern/kern_descrip.c#2 (text+ko) ==== @@ -1986,7 +1986,7 @@ void fputsock(struct socket *so) { - + SOCK_LOCK(so); sorele(so); } ==== //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#4 (text+ko) ==== @@ -413,6 +413,7 @@ error = (*so->so_proto->pr_usrreqs->pru_abort)(so); if (error) { + SOCK_LOCK(so); sotryfree(so); /* note: does not decrement the ref count */ return error; } ==== //depot/projects/netperf+sockets/sys/net/raw_cb.c#2 (text+ko) ==== @@ -36,7 +36,9 @@ #include #include +#include #include +#include #include #include #include @@ -97,6 +99,7 @@ { struct socket *so = rp->rcb_socket; + SOCK_LOCK(so); so->so_pcb = 0; sotryfree(so); LIST_REMOVE(rp, list); ==== //depot/projects/netperf+sockets/sys/netatalk/ddp_usrreq.c#4 (text+ko) ==== @@ -441,6 +441,7 @@ static void at_pcbdetach( struct socket *so, struct ddpcb *ddp) { + SOCK_LOCK(so); soisdisconnected( so ); so->so_pcb = 0; sotryfree(so); ==== //depot/projects/netperf+sockets/sys/netatm/atm_socket.c#3 (text+ko) ==== @@ -173,6 +173,7 @@ /* * Break links and free control blocks */ + SOCK_LOCK(so); so->so_pcb = NULL; sotryfree(so); From owner-p4-projects@FreeBSD.ORG Tue Dec 9 15:14:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9E5616A4D0; Tue, 9 Dec 2003 15:14:51 -0800 (PST) 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 C43AE16A4CE for ; Tue, 9 Dec 2003 15:14:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9089B43D2F for ; Tue, 9 Dec 2003 15:14:44 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9NEiXJ034664 for ; Tue, 9 Dec 2003 15:14:44 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9NEhWT034661 for perforce@freebsd.org; Tue, 9 Dec 2003 15:14:44 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2003 15:14:44 -0800 (PST) Message-Id: <200312092314.hB9NEhWT034661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43702 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 Dec 2003 23:14:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=43702 Change 43702 by sam@sam_ebb on 2003/12/09 15:13:49 introduce COMMON_START/COMMON_END mechanism a la tcp to unify lock handling; add socket lock reordering to satisfy output path locking requirements Affected files ... .. //depot/projects/netperf+sockets/sys/netinet/udp_usrreq.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/netinet/udp_usrreq.c#3 (text+ko) ==== @@ -904,24 +904,67 @@ SYSCTL_INT(_net_inet_udp, UDPCTL_RECVSPACE, recvspace, CTLFLAG_RW, &udp_recvspace, 0, "Maximum incoming UDP datagram size"); +/* + * Common code to setup and teardown locking. Most + * code begins with a COMMON_START macro and finishes + * with COMMON_END. You indicate whether the inpcb + * and enclosing head are to be locked read or write + * and whether there is an existing sockbuf lock that + * needs to be re-ordered. + */ +#define INI_NOLOCK 0 /* no head lock */ +#define INI_READ 1 /* read head lock */ +#define INI_WRITE 2 /* write head lock */ +#define SBI_NONE 0 /* no sockbuf lock to reorder */ +#define SBI_SND 1 /* reorder so->so_snd lock */ +#define SBI_RCV 2 /* reorder so->so_rcv lock */ + +#define COMMON_START(_headrw, _sbrw) do { \ + if (_sbrw == SBI_SND) \ + SOCKBUF_UNLOCK(&so->so_snd); \ + else if (_sbrw == SBI_RCV) \ + SOCKBUF_UNLOCK(&so->so_rcv); \ + if (_headrw == INI_READ) \ + INP_INFO_RLOCK(&udbinfo); \ + else if (_headrw == INI_WRITE) \ + INP_INFO_WLOCK(&udbinfo); \ + inp = sotoinpcb(so); \ + if (inp == 0) { \ + if (_sbrw == SBI_SND) \ + SOCKBUF_LOCK(&so->so_snd); \ + else if (_sbrw == SBI_RCV) \ + SOCKBUF_LOCK(&so->so_rcv); \ + if (_headrw == INI_READ) \ + INP_INFO_RUNLOCK(&udbinfo); \ + else if (_headrw == INI_WRITE) \ + INP_INFO_WUNLOCK(&udbinfo); \ + return EINVAL; \ + } \ + INP_LOCK(inp); \ + if (_sbrw == SBI_SND) \ + SOCKBUF_LOCK(&so->so_snd); \ + else if (_sbrw == SBI_RCV) \ + SOCKBUF_LOCK(&so->so_rcv); \ + if (_headrw == INI_READ) \ + INP_INFO_RUNLOCK(&udbinfo); \ +} while(0) + +#define COMMON_END(_headrw) \ + do { \ + INP_UNLOCK(inp); \ + if (_headrw == INI_WRITE) \ + INP_INFO_WUNLOCK(&udbinfo); \ + } while(0) + static int udp_abort(struct socket *so) { struct inpcb *inp; - int s; - INP_INFO_WLOCK(&udbinfo); - inp = sotoinpcb(so); - if (inp == 0) { - INP_INFO_WUNLOCK(&udbinfo); - return EINVAL; /* ??? possible? panic instead? */ - } - INP_LOCK(inp); + COMMON_START(INI_WRITE, SBI_NONE); soisdisconnected(so); - s = splnet(); in_pcbdetach(inp); INP_INFO_WUNLOCK(&udbinfo); - splx(s); return 0; } @@ -963,20 +1006,11 @@ udp_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { struct inpcb *inp; - int s, error; + int error; - INP_INFO_WLOCK(&udbinfo); - inp = sotoinpcb(so); - if (inp == 0) { - INP_INFO_WUNLOCK(&udbinfo); - return EINVAL; - } - INP_LOCK(inp); - s = splnet(); + COMMON_START(INI_WRITE, SBI_NONE); error = in_pcbbind(inp, nam, td); - splx(s); - INP_UNLOCK(inp); - INP_INFO_WUNLOCK(&udbinfo); + COMMON_END(INI_WRITE); return error; } @@ -984,31 +1018,22 @@ udp_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { struct inpcb *inp; - int s, error; + int error; struct sockaddr_in *sin; - INP_INFO_WLOCK(&udbinfo); - inp = sotoinpcb(so); - if (inp == 0) { - INP_INFO_WUNLOCK(&udbinfo); - return EINVAL; - } - INP_LOCK(inp); + COMMON_START(INI_WRITE, SBI_NONE); if (inp->inp_faddr.s_addr != INADDR_ANY) { - INP_UNLOCK(inp); - INP_INFO_WUNLOCK(&udbinfo); - return EISCONN; + error = EISCONN; + goto out; } - s = splnet(); sin = (struct sockaddr_in *)nam; if (td && jailed(td->td_ucred)) prison_remote_ip(td->td_ucred, 0, &sin->sin_addr.s_addr); error = in_pcbconnect(inp, nam, td); - splx(s); if (error == 0) soisconnected(so); - INP_UNLOCK(inp); - INP_INFO_WUNLOCK(&udbinfo); +out: + COMMON_END(INI_WRITE); return error; } @@ -1016,49 +1041,31 @@ udp_detach(struct socket *so) { struct inpcb *inp; - int s; - INP_INFO_WLOCK(&udbinfo); - inp = sotoinpcb(so); - if (inp == 0) { - INP_INFO_WUNLOCK(&udbinfo); - return EINVAL; - } - INP_LOCK(inp); - s = splnet(); + COMMON_START(INI_WRITE, SBI_NONE); in_pcbdetach(inp); INP_INFO_WUNLOCK(&udbinfo); - splx(s); return 0; } static int udp_disconnect(struct socket *so) { + int error = 0; struct inpcb *inp; - int s; - INP_INFO_WLOCK(&udbinfo); - inp = sotoinpcb(so); - if (inp == 0) { - INP_INFO_WUNLOCK(&udbinfo); - return EINVAL; - } - INP_LOCK(inp); + COMMON_START(INI_WRITE, SBI_NONE); if (inp->inp_faddr.s_addr == INADDR_ANY) { - INP_INFO_WUNLOCK(&udbinfo); - INP_UNLOCK(inp); - return ENOTCONN; + error = ENOTCONN; + goto out; } - s = splnet(); in_pcbdisconnect(inp); inp->inp_laddr.s_addr = INADDR_ANY; - INP_UNLOCK(inp); - INP_INFO_WUNLOCK(&udbinfo); - splx(s); + COMMON_END(INI_WRITE); so->so_state &= ~SS_ISCONNECTED; /* XXX */ - return 0; +out: + return error; } static int @@ -1066,20 +1073,23 @@ struct mbuf *control, struct thread *td) { struct inpcb *inp; - int ret; + int error; + SOCKBUF_UNLOCK(&so->so_snd); INP_INFO_WLOCK(&udbinfo); inp = sotoinpcb(so); if (inp == 0) { + SOCKBUF_LOCK(&so->so_snd); INP_INFO_WUNLOCK(&udbinfo); m_freem(m); return EINVAL; } INP_LOCK(inp); - ret = udp_output(inp, m, addr, control, td); + SOCKBUF_LOCK(&so->so_snd); + error = udp_output(inp, m, addr, control, td); INP_UNLOCK(inp); INP_INFO_WUNLOCK(&udbinfo); - return ret; + return error; } int @@ -1087,16 +1097,9 @@ { struct inpcb *inp; - INP_INFO_RLOCK(&udbinfo); - inp = sotoinpcb(so); - if (inp == 0) { - INP_INFO_RUNLOCK(&udbinfo); - return EINVAL; - } - INP_LOCK(inp); - INP_INFO_RUNLOCK(&udbinfo); + COMMON_START(INI_READ, SBI_NONE); socantsendmore(so); - INP_UNLOCK(inp); + COMMON_END(INI_READ); return 0; } From owner-p4-projects@FreeBSD.ORG Tue Dec 9 17:59:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D919016A4D0; Tue, 9 Dec 2003 17:59:13 -0800 (PST) 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 AF6BE16A4CE; Tue, 9 Dec 2003 17:59:13 -0800 (PST) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 622FA43D21; Tue, 9 Dec 2003 17:59:12 -0800 (PST) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.10/8.12.9) with ESMTP id hBA1xBiV013989; Tue, 9 Dec 2003 18:59:11 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Tue, 09 Dec 2003 18:58:59 -0700 (MST) Message-Id: <20031209.185859.00003429.imp@bsdimp.com> To: jhb@FreeBSD.org From: "M. Warner Losh" In-Reply-To: References: <20031208.175500.36934037.imp@bsdimp.com> X-Mailer: Mew version 2.1 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@FreeBSD.org cc: nate@root.org Subject: Re: PERFORCE change 43464 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 Dec 2003 01:59:14 -0000 In message: John Baldwin writes: : : On 09-Dec-2003 M. Warner Losh wrote: : > In message: : > John Baldwin writes: : >: : >: On 05-Dec-2003 Nate Lawson wrote: : >: > On Fri, 5 Dec 2003, John Baldwin wrote: : >: >> Change 43464 by jhb@jhb_blue on 2003/12/05 12:59:01 : >: >> : >: >> More updates. Closer to working than I thought. In theory : >: >> PCI devices should all just work now. : >: > : >: > This handles PCI. Are you ok with me adding the call to : >: > acpi_pwr_switch_consumer() for non-PCI devices like the embedded : >: > controller? I think we need to do this at the top \\_SB level. I'm a bit : >: > confused as to the handoff between the general tree walk and the ACPI-PCI : >: > driver though. : >: : >: It won't hurt to switch a device on twice. It should be ok to : >: do a top-level tree walk of all device objects and turn them on : >: before probing child devices I think. ACPI shouldn't turn off : >: devices that don't probe like PCI does though because ACPI has : >: duplicate objects of things like the entire PCI device tree. :-/ : > : > Actually, there can be times when you don't want to turn on devices at : > all. Walking the whole tree turning them on might be the wrong to : > do... : > : > Sometimes I think that things in the newbus tree should have a pointer : > to the acpi power methods that are used in coordination with the bus : > code that is 'activating' the device before the 'probe' and 'attach' : > happens. : : I think having a 'bus_set_power_state()' method in the bus layer : and having device_probe_and_attach() do 'bus_set_power_state(child, ON)' : would be sufficient. ACPI busses would then perform the correct hooks : via their bus_set_power_state() methods. That is very close to what I had in mind. My only 'debate' was 0/1 or 0,1,2,3 or ???? Warner From owner-p4-projects@FreeBSD.ORG Tue Dec 9 19:07:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F9DA16A4D0; Tue, 9 Dec 2003 19:07:29 -0800 (PST) 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 F25F616A4CE for ; Tue, 9 Dec 2003 19:07:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2574C43D29 for ; Tue, 9 Dec 2003 19:07:28 -0800 (PST) (envelope-from takawata@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBA37RXJ052306 for ; Tue, 9 Dec 2003 19:07:27 -0800 (PST) (envelope-from takawata@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBA37RoX052303 for perforce@freebsd.org; Tue, 9 Dec 2003 19:07:27 -0800 (PST) (envelope-from takawata@freebsd.org) Date: Tue, 9 Dec 2003 19:07:27 -0800 (PST) Message-Id: <200312100307.hBA37RoX052303@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to takawata@freebsd.org using -f From: Takanori Watanabe To: Perforce Change Reviews Subject: PERFORCE change 43707 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 Dec 2003 03:07:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=43707 Change 43707 by takawata@takawata_x31 on 2003/12/09 19:06:29 Add my comment. Affected files ... .. //depot/projects/power/notes#11 edit Differences ... ==== //depot/projects/power/notes#11 (text+ko) ==== @@ -28,6 +28,9 @@ that should be sufficient. - The generic PCI bus driver already does this - Need to turn on all non-PCI devices then when we probe/attach. + > Handle Notify events for every ACPI device object. The Notify events + requests device re-enumration...etc. Parent device driver may + install event handler. - define a bus method for powering up/down devices - bus_set_powerstate(parent, child, state) where state is on or off # actually on/off is insufficient for a power management daemon that @@ -58,11 +61,11 @@ commands like eject, etc. # methods should be unique. Command interfaces to userland should dispatch # the right method. Otherwise we've reinvented ioctl :-) + >Some PCMCIA mechanism should be replaced by this mechanism. - convert to a model of suspending the device via device_suspend()/resume() rather than detach()/attach() for turning devices on/off. - This may require fixes to drivers so that they continue to function appropriately when their hardware has been suspended - 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. From owner-p4-projects@FreeBSD.ORG Tue Dec 9 22:31:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EFD116A4D0; Tue, 9 Dec 2003 22:31:31 -0800 (PST) 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 C4EBF16A4CE for ; Tue, 9 Dec 2003 22:31:30 -0800 (PST) Received: from rootlabs.com (root.org [67.118.192.226]) by mx1.FreeBSD.org (Postfix) with SMTP id 42DA743D28 for ; Tue, 9 Dec 2003 22:31:28 -0800 (PST) (envelope-from nate@rootlabs.com) Received: (qmail 44656 invoked by uid 1000); 10 Dec 2003 06:31:30 -0000 Date: Tue, 9 Dec 2003 22:31:30 -0800 (PST) From: Nate Lawson To: "M. Warner Losh" In-Reply-To: <20031209.185859.00003429.imp@bsdimp.com> Message-ID: <20031209222111.B44633@root.org> References: <20031208.175500.36934037.imp@bsdimp.com> <20031209.185859.00003429.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: perforce@FreeBSD.org cc: jhb@FreeBSD.org Subject: Re: PERFORCE change 43464 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 Dec 2003 06:31:31 -0000 On Tue, 9 Dec 2003, M. Warner Losh wrote: > John Baldwin writes: > : On 09-Dec-2003 M. Warner Losh wrote: > : > John Baldwin writes: > : >: On 05-Dec-2003 Nate Lawson wrote: > : >: > On Fri, 5 Dec 2003, John Baldwin wrote: > : >: >> Change 43464 by jhb@jhb_blue on 2003/12/05 12:59:01 > : >: >> > : >: >> More updates. Closer to working than I thought. In theory > : >: >> PCI devices should all just work now. > : >: > > : >: > This handles PCI. Are you ok with me adding the call to > : >: > acpi_pwr_switch_consumer() for non-PCI devices like the embedded > : >: > controller? I think we need to do this at the top \\_SB level. I'm a bit > : >: > confused as to the handoff between the general tree walk and the ACPI-PCI > : >: > driver though. > : >: > : >: It won't hurt to switch a device on twice. It should be ok to > : >: do a top-level tree walk of all device objects and turn them on > : >: before probing child devices I think. ACPI shouldn't turn off > : >: devices that don't probe like PCI does though because ACPI has > : >: duplicate objects of things like the entire PCI device tree. :-/ > : > > : > Actually, there can be times when you don't want to turn on devices at > : > all. Walking the whole tree turning them on might be the wrong to > : > do... > : > > : > Sometimes I think that things in the newbus tree should have a pointer > : > to the acpi power methods that are used in coordination with the bus > : > code that is 'activating' the device before the 'probe' and 'attach' > : > happens. > : > : I think having a 'bus_set_power_state()' method in the bus layer > : and having device_probe_and_attach() do 'bus_set_power_state(child, ON)' > : would be sufficient. ACPI busses would then perform the correct hooks > : via their bus_set_power_state() methods. > > That is very close to what I had in mind. My only 'debate' was 0/1 or > 0,1,2,3 or ???? It may hurt to switch a device on twice, depending on how state is kept in the AML. In the ACPI case, there are several things that need to happen, noted below. Device (LID) Device (SLPB) Device (PCI0) Device (LPC) Device (SIO) Device (PIC) // i8259 Device (TIMR) Device (KBD) // atkbd0 Device (MOU) // psm0 Device (FDC) // Call _PS0, fdc0 Device (FDD0) Device (UART) // Call _PS0 Device (LPT) // lpt0 Device (ECP) Device (FIR) // ir port Device (EC) // Call _PS0, embedded controller Device (BAT0) Device (BAT1) Device (AC) Device (HKEY) Device (AGP) // agp0 Device (VID) Device (LCD0) Device (CRT0) Device (TV0) Device (PCI1) Device (CBS0) // cardbus0 Device (CBS1) // cardbus1 Device (DOCK) Device (IDE1) Device (PRIM) Device (MSTR) Device (CBS2) // cardbus2 Device (CBS3) So I guess my question is what to do about things like the AGP card or the cardbus slots, especially the ones that are accessible through a dock. I know about all these via acpi. However, we don't want to duplicate calling power methods through both cardbus and acpi, for instance. This tree doesn't exactly map to the devinfo tree: nexus0 npx0 acpi0 acpi_ec0 acpi_timer0 acpi_cpu0 acpi_tz0 acpi_lid0 acpi_button0 pcib0 pci0 hostb0 pcib1 pci1 pcib2 pci2 cbb0 cardbus0 pccard0 cbb1 cardbus1 pccard1 fxp0 miibus0 inphy0 isab0 isa0 pmtimer0 sc0 vga0 orm0 atapci0 ata0 ata1 ichsmb0 smbus0 pcm0 acpi_sysresource0 atpic0 attimer0 atdma0 npxisa0 attimer1 atkbdc0 atkbd0 psm0 psmcpnp0 fdc0 fd0 sio0 ppc0 ppbus0 plip0 lpt0 ppi0 sio1 acpi_cmbat0 acpi_cmbat1 acpi_acad0 Anyway, I'd love to hear how the ACPI AML and devinfo trees map to the fact that we need to call _PSx on all devices, eject uses _EJx, etc. -Nate From owner-p4-projects@FreeBSD.ORG Tue Dec 9 22:32:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79C2C16A4D1; Tue, 9 Dec 2003 22:32:47 -0800 (PST) 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 532EA16A4CE for ; Tue, 9 Dec 2003 22:32:47 -0800 (PST) Received: from rootlabs.com (root.org [67.118.192.226]) by mx1.FreeBSD.org (Postfix) with SMTP id 8CD7643D29 for ; Tue, 9 Dec 2003 22:32:45 -0800 (PST) (envelope-from nate@rootlabs.com) Received: (qmail 44668 invoked by uid 1000); 10 Dec 2003 06:32:47 -0000 Date: Tue, 9 Dec 2003 22:32:47 -0800 (PST) From: Nate Lawson To: "M. Warner Losh" In-Reply-To: <20031209222111.B44633@root.org> Message-ID: <20031209223150.M44633@root.org> References: <20031208.175500.36934037.imp@bsdimp.com> <20031209222111.B44633@root.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: perforce@FreeBSD.org cc: jhb@FreeBSD.org Subject: Re: PERFORCE change 43464 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 Dec 2003 06:32:48 -0000 On Tue, 9 Dec 2003, Nate Lawson wrote: > On Tue, 9 Dec 2003, M. Warner Losh wrote: > > John Baldwin writes: > > : On 09-Dec-2003 M. Warner Losh wrote: > > : > John Baldwin writes: > > : >: On 05-Dec-2003 Nate Lawson wrote: > > : >: > On Fri, 5 Dec 2003, John Baldwin wrote: > > : >: >> Change 43464 by jhb@jhb_blue on 2003/12/05 12:59:01 > > : >: >> > > : >: >> More updates. Closer to working than I thought. In theory > > : >: >> PCI devices should all just work now. > > : >: > > > : >: > This handles PCI. Are you ok with me adding the call to > > : >: > acpi_pwr_switch_consumer() for non-PCI devices like the embedded > > : >: > controller? I think we need to do this at the top \\_SB level. I'm a bit > > : >: > confused as to the handoff between the general tree walk and the ACPI-PCI > > : >: > driver though. > > : >: > > : >: It won't hurt to switch a device on twice. It should be ok to > > : >: do a top-level tree walk of all device objects and turn them on > > : >: before probing child devices I think. ACPI shouldn't turn off > > : >: devices that don't probe like PCI does though because ACPI has > > : >: duplicate objects of things like the entire PCI device tree. :-/ > > : > > > : > Actually, there can be times when you don't want to turn on devices at > > : > all. Walking the whole tree turning them on might be the wrong to > > : > do... > > : > > > : > Sometimes I think that things in the newbus tree should have a pointer > > : > to the acpi power methods that are used in coordination with the bus > > : > code that is 'activating' the device before the 'probe' and 'attach' > > : > happens. > > : > > : I think having a 'bus_set_power_state()' method in the bus layer > > : and having device_probe_and_attach() do 'bus_set_power_state(child, ON)' > > : would be sufficient. ACPI busses would then perform the correct hooks > > : via their bus_set_power_state() methods. > > > > That is very close to what I had in mind. My only 'debate' was 0/1 or > > 0,1,2,3 or ???? Oh, and I like the idea of using 0-3 and having them #defined. This is common to PCI and ACPI D-states. -Nate From owner-p4-projects@FreeBSD.ORG Tue Dec 9 23:25:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E524116A4D0; Tue, 9 Dec 2003 23:25:49 -0800 (PST) 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 A751916A4CE; Tue, 9 Dec 2003 23:25:49 -0800 (PST) Received: from axe-inc.co.jp (axegw.axe-inc.co.jp [61.199.217.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E5E243D09; Tue, 9 Dec 2003 23:25:46 -0800 (PST) (envelope-from takawata@axe-inc.co.jp) Received: from localhost (localhost [127.0.0.1]) by axe-inc.co.jp (8.9.3+3.2W/3.7W) with SMTP id QAA21650; Wed, 10 Dec 2003 16:25:34 +0900 (JST) Message-Id: <200312100725.QAA21650@axe-inc.co.jp> X-Authentication-Warning: axegw.axe-inc.co.jp: localhost [127.0.0.1] didn't use HELO protocol To: Nate Lawson In-reply-to: Your message of "Tue, 09 Dec 2003 22:31:30 PST." <20031209222111.B44633@root.org> Date: Wed, 10 Dec 2003 16:25:34 +0900 From: Takanori Watanabe cc: perforce@freebsd.org cc: jhb@freebsd.org cc: imp@bsdimp.com Subject: Re: PERFORCE change 43464 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 Dec 2003 07:25:50 -0000 In message <20031209222111.B44633@root.org>, Nate Lawson wrote: >It may hurt to switch a device on twice, depending on how state is kept in >the AML. In the ACPI case, there are several things that need to happen, >noted below. > > Device (LID) > Device (SLPB) > Device (PCI0) > Device (LPC) > Device (SIO) > Device (PIC) // i8259 > Device (TIMR) > Device (KBD) // atkbd0 > Device (MOU) // psm0 > Device (FDC) // Call _PS0, fdc0 > Device (FDD0) > Device (UART) // Call _PS0 > Device (LPT) // lpt0 > Device (ECP) > Device (FIR) // ir port > Device (EC) // Call _PS0, embedded controller > Device (BAT0) > Device (BAT1) > Device (AC) > Device (HKEY) > Device (AGP) // agp0 > Device (VID) > Device (LCD0) > Device (CRT0) > Device (TV0) > Device (PCI1) > Device (CBS0) // cardbus0 > Device (CBS1) // cardbus1 > Device (DOCK) > Device (IDE1) > Device (PRIM) > Device (MSTR) > Device (CBS2) // cardbus2 > Device (CBS3) > >So I guess my question is what to do about things like the AGP card or the >cardbus slots, especially the ones that are accessible through a dock. I >know about all these via acpi. However, we don't want to duplicate >calling power methods through both cardbus and acpi, for instance. This >tree doesn't exactly map to the devinfo tree: > >nexus0 > npx0 > acpi0 > acpi_ec0 > acpi_timer0 > acpi_cpu0 > acpi_tz0 > acpi_lid0 > acpi_button0 > pcib0 > pci0 > hostb0 > pcib1 > pci1 > pcib2 > pci2 > cbb0 > cardbus0 > pccard0 > cbb1 > cardbus1 > pccard1 > fxp0 > miibus0 > inphy0 > isab0 > isa0 > pmtimer0 > sc0 > vga0 > orm0 > atapci0 > ata0 > ata1 > ichsmb0 > smbus0 > pcm0 > acpi_sysresource0 > atpic0 > attimer0 > atdma0 > npxisa0 > attimer1 > atkbdc0 > atkbd0 > psm0 > psmcpnp0 > fdc0 > fd0 > sio0 > ppc0 > ppbus0 > plip0 > lpt0 > ppi0 > sio1 > acpi_cmbat0 > acpi_cmbat1 > acpi_acad0 > >Anyway, I'd love to hear how the ACPI AML and devinfo trees map to the >fact that we need to call _PSx on all devices, eject uses _EJx, etc. As far as I know, All PCI devices know ACPI handle, through the ACPI namespace itself is maped into flat structure. This is my 'devinfo -v' output, with the kernel from my perforce tree (//depot/user/takawata/workplace/...) which implement pnpinfo functions. nexus0 legacy0 npx0 acpi0 acpi_ec0 pnpinfo _HID=PNP0C09 _UID=0 at path=\_SB_.PCI0.LPC_.EC__ acpi_timer0 pnpinfo Unknown at magic=unknown acpi_cpu0 pnpinfo _HID=UNKNOWN _UID=0 at path=\_PR_.CPU_ acpi_tz0 pnpinfo _HID=UNKNOWN _UID=0 at path=\_TZ_.THM0 unknown pnpinfo _HID=PNP0C0F _UID=1 at path=\_SB_.LNKA unknown pnpinfo _HID=PNP0C0F _UID=2 at path=\_SB_.LNKB unknown pnpinfo _HID=PNP0C0F _UID=3 at path=\_SB_.LNKC unknown pnpinfo _HID=PNP0C0F _UID=4 at path=\_SB_.LNKD unknown pnpinfo _HID=PNP0C0F _UID=5 at path=\_SB_.LNKE unknown pnpinfo _HID=PNP0C0F _UID=6 at path=\_SB_.LNKF unknown pnpinfo _HID=PNP0C0F _UID=7 at path=\_SB_.LNKG unknown pnpinfo _HID=PNP0C0F _UID=8 at path=\_SB_.LNKH unknown pnpinfo _HID=PNP0C01 _UID=0 at path=\_SB_.MEM_ acpi_lid0 pnpinfo _HID=PNP0C0D _UID=0 at path=\_SB_.LID_ acpi_button0 pnpinfo _HID=PNP0C0E _UID=0 at path=\_SB_.SLPB pcib0 pnpinfo _HID=PNP0A03 _UID=0 at path=\_SB_.PCI0 pci0 agp0 pnpinfo vendor=0x8086 device=0x3340 subvendor=0x1014 subdevice=0x0529 class=0x060000 at slot=0 function=0 pcib1 pnpinfo vendor=0x8086 device=0x3341 subvendor=0x0000 subdevice=0x0000 class=0x060400 at slot=1 function=0 pci1 unknown pnpinfo vendor=0x1002 device=0x4c59 subvendor=0x1014 subdevice=0x052f class=0x030000 at slot=0 function=0 unknown pnpinfo vendor=0x8086 device=0x24c2 subvendor=0x1014 subdevice=0x052d class=0x0c0300 at slot=29 function=0 unknown pnpinfo vendor=0x8086 device=0x24c4 subvendor=0x1014 subdevice=0x052d class=0x0c0300 at slot=29 function=1 unknown pnpinfo vendor=0x8086 device=0x24c7 subvendor=0x1014 subdevice=0x052d class=0x0c0300 at slot=29 function=2 unknown pnpinfo vendor=0x8086 device=0x24cd subvendor=0x1014 subdevice=0x052e class=0x0c0320 at slot=29 function=7 pcib2 pnpinfo vendor=0x8086 device=0x2448 subvendor=0x0000 subdevice=0x0000 class=0x060400 at slot=30 function=0 pci2 unknown pnpinfo vendor=0x1180 device=0x0476 subvendor=0x1014 subdevice=0x0532 class=0x060700 at slot=0 function=0 unknown pnpinfo vendor=0x1180 device=0x0476 subvendor=0x1014 subdevice=0x0532 class=0x060700 at slot=0 function=1 unknown pnpinfo vendor=0x1180 device=0x0552 subvendor=0x1014 subdevice=0x0533 class=0x0c0010 at slot=0 function=2 em0 pnpinfo vendor=0x8086 device=0x101e subvendor=0x1014 subdevice=0x0549 class=0x020000 at slot=1 function=0 unknown pnpinfo vendor=0x168c device=0x0012 subvendor=0x17ab subdevice=0x8310 class=0x020000 at slot=2 function=0 isab0 pnpinfo vendor=0x8086 device=0x24cc subvendor=0x0000 subdevice=0x0000 class=0x060100 at slot=31 function=0 isa0 sc0 orm0 pmtimer0 vga0 atapci0 pnpinfo vendor=0x8086 device=0x24ca subvendor=0x1014 subdevice=0x052d class=0x01018a at slot=31 function=1 ata0 ata1 unknown pnpinfo vendor=0x8086 device=0x24c3 subvendor=0x1014 subdevice=0x052d class=0x0c0500 at slot=31 function=3 unknown pnpinfo vendor=0x8086 device=0x24c5 subvendor=0x1014 subdevice=0x0534 class=0x040100 at slot=31 function=5 unknown pnpinfo vendor=0x8086 device=0x24c6 subvendor=0x1014 subdevice=0x0525 class=0x070300 at slot=31 function=6 unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.LPC_ acpi_sysresource0 pnpinfo _HID=PNP0C02 _UID=0 at path=\_SB_.PCI0.LPC_.SIO_ atpic0 pnpinfo _HID=PNP0000 _UID=0 at path=\_SB_.PCI0.LPC_.PIC_ attimer0 pnpinfo _HID=PNP0100 _UID=0 at path=\_SB_.PCI0.LPC_.TIMR atdma0 pnpinfo _HID=PNP0200 _UID=0 at path=\_SB_.PCI0.LPC_.DMAC unknown pnpinfo _HID=PNP0800 _UID=0 at path=\_SB_.PCI0.LPC_.SPKR npxisa0 pnpinfo _HID=PNP0C04 _UID=0 at path=\_SB_.PCI0.LPC_.FPU_ attimer1 pnpinfo _HID=PNP0B00 _UID=0 at path=\_SB_.PCI0.LPC_.RTC_ atkbdc0 pnpinfo _HID=PNP0303 _UID=0 at path=\_SB_.PCI0.LPC_.KBD_ atkbd0 psm0 psmcpnp0 pnpinfo _HID=IBM3780 _UID=0 at path=\_SB_.PCI0.LPC_.MOU_ unknown pnpinfo _HID=PNP0700 _UID=0 at path=\_SB_.PCI0.LPC_.FDC_ unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.LPC_.FDC_.FDD0 sio0 pnpinfo _HID=PNP0501 _UID=0 at path=\_SB_.PCI0.LPC_.UART ppc0 pnpinfo _HID=PNP0400 _UID=0 at path=\_SB_.PCI0.LPC_.LPT_ ppbus0 plip0 lpt0 ppi0 unknown pnpinfo _HID=PNP0401 _UID=0 at path=\_SB_.PCI0.LPC_.ECP_ sio1 pnpinfo _HID=IBM0071 _UID=0 at path=\_SB_.PCI0.LPC_.FIR_ unknown pnpinfo _HID=PNP0C09 _UID=0 at path=\_SB_.PCI0.LPC_.EC__ unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.LPC_.EC__.PUBS acpi_cmbat0 pnpinfo _HID=PNP0C0A _UID=0 at path=\_SB_.PCI0.LPC_.EC__.BAT0 unknown pnpinfo _HID=PNP0C0A _UID=2 at path=\_SB_.PCI0.LPC_.EC__.BAT1 acpi_cmbat1 pnpinfo _HID=PNP0C0A _UID=1 at path=\_SB_.PCI0.LPC_.EC__.BAT2 acpi_acad0 pnpinfo _HID=ACPI0003 _UID=0 at path=\_SB_.PCI0.LPC_.EC__.AC__ unknown pnpinfo _HID=IBM0068 _UID=0 at path=\_SB_.PCI0.LPC_.EC__.HKEY unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.AGP_ unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.AGP_.VID_ unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.AGP_.VID_.LCD0 unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.AGP_.VID_.CRT0 unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.PCI1 unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.PCI1.CBS0 unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.PCI1.CBS1 unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.PCI1.DOCK unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.PCI1.DOCK.IDE1 unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.PCI1.DOCK.IDE1.PRIM unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.PCI1.DOCK.IDE1.PRIM.MSTR unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.PCI1.DOCK.CBS2 unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.PCI1.DOCK.CBS3 unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.IDE0 unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.IDE0.PRIM unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.IDE0.PRIM.MSTR unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.IDE0.SCND unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.IDE0.SCND.MSTR unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.USB0 unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.USB0.URTH unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.USB0.URTH.UNST unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.USB1 unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.USB2 unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.USB7 unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.USB7.URTH unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.USB7.URTH.UPDK unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.USB7.URTH.UNST unknown pnpinfo _HID=UNKNOWN _UID=0 at path=\_SB_.PCI0.AC9M unknown pnpinfo _HID=IBM0079 _UID=0 at path=\_SB_.GDCK unknown pnpinfo _HID=IBM006A _UID=0 at path=\_SB_.NEST unknown pnpinfo _HID=IBM0069 _UID=0 at path=\_SB_.SWAP Now, ACPI namespace object can hold OS-specified data with AcpiAttachData(); So, we may attach device_t object to ACPI object and PCI devices in ACPI namespace is only attaced to PCI, not under acpi. like... ACPI attach child with 1 depth Found PCI bus on ACPI PCI device found Search ACPI handle->no PCI device found Search ACPI handle->yes Attach device_t in namespace. .... ISAB found.. attach acpi version of ISA bus. attach ISA devices.... End. ACPI attach child with all tree. Attach all stray objects. End From owner-p4-projects@FreeBSD.ORG Wed Dec 10 05:12:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1170416A4D0; Wed, 10 Dec 2003 05:12:49 -0800 (PST) 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 DB24C16A4CE for ; Wed, 10 Dec 2003 05:12:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F185D43D29 for ; Wed, 10 Dec 2003 05:12:44 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBADCiXJ099411 for ; Wed, 10 Dec 2003 05:12:44 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBADCi3Z099408 for perforce@freebsd.org; Wed, 10 Dec 2003 05:12:44 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Wed, 10 Dec 2003 05:12:44 -0800 (PST) Message-Id: <200312101312.hBADCi3Z099408@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 43719 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 Dec 2003 13:12:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=43719 Change 43719 by cvance@cvance_korben on 2003/12/10 05:12:04 When the call to suser was replaced with a capability check, the header include was removed (doh!) Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/netinet6/in6.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/netinet6/in6.c#8 (text+ko) ==== @@ -79,6 +79,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Wed Dec 10 08:11:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 589AF16A4E3; Wed, 10 Dec 2003 08:11:56 -0800 (PST) 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 1345516A4DE for ; Wed, 10 Dec 2003 08:11:56 -0800 (PST) Received: from mail4.speakeasy.net (mail4.speakeasy.net [216.254.0.204]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8102743D2B for ; Wed, 10 Dec 2003 08:11:54 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 4882 invoked from network); 10 Dec 2003 16:11:53 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 10 Dec 2003 16:11:53 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.10/8.12.10) with ESMTP id hBAGBond005292; Wed, 10 Dec 2003 11:11:50 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20031209.185859.00003429.imp@bsdimp.com> Date: Wed, 10 Dec 2003 11:11:50 -0500 (EST) From: John Baldwin To: "M. Warner Losh" X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: perforce@FreeBSD.org cc: nate@root.org Subject: Re: PERFORCE change 43464 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 Dec 2003 16:11:56 -0000 On 10-Dec-2003 M. Warner Losh wrote: > In message: > John Baldwin writes: >: >: On 09-Dec-2003 M. Warner Losh wrote: >: > In message: >: > John Baldwin writes: >: >: >: >: On 05-Dec-2003 Nate Lawson wrote: >: >: > On Fri, 5 Dec 2003, John Baldwin wrote: >: >: >> Change 43464 by jhb@jhb_blue on 2003/12/05 12:59:01 >: >: >> >: >: >> More updates. Closer to working than I thought. In theory >: >: >> PCI devices should all just work now. >: >: > >: >: > This handles PCI. Are you ok with me adding the call to >: >: > acpi_pwr_switch_consumer() for non-PCI devices like the embedded >: >: > controller? I think we need to do this at the top \\_SB level. I'm a bit >: >: > confused as to the handoff between the general tree walk and the ACPI-PCI >: >: > driver though. >: >: >: >: It won't hurt to switch a device on twice. It should be ok to >: >: do a top-level tree walk of all device objects and turn them on >: >: before probing child devices I think. ACPI shouldn't turn off >: >: devices that don't probe like PCI does though because ACPI has >: >: duplicate objects of things like the entire PCI device tree. :-/ >: > >: > Actually, there can be times when you don't want to turn on devices at >: > all. Walking the whole tree turning them on might be the wrong to >: > do... >: > >: > Sometimes I think that things in the newbus tree should have a pointer >: > to the acpi power methods that are used in coordination with the bus >: > code that is 'activating' the device before the 'probe' and 'attach' >: > happens. >: >: I think having a 'bus_set_power_state()' method in the bus layer >: and having device_probe_and_attach() do 'bus_set_power_state(child, ON)' >: would be sufficient. ACPI busses would then perform the correct hooks >: via their bus_set_power_state() methods. > > That is very close to what I had in mind. My only 'debate' was 0/1 or > 0,1,2,3 or ???? POWERSTATE_ON = 0 POWERSTATE_OFF = 10 (or 100) Busses may define meanings for values 1 through 9 (for example, ACPI and PCI would use D1/D2 for 1, and 2), but only ON and OFF are constant across the tree. Also, I was thinking in the shower and would like to have the following: device_check_powerstate(u_int new_state). - Called by the bus on a device when the bus has deteremined that the device supports having its powerstate changed and is about to change it. Gives device a chance to veto device change. Default routine is to not veto. For PCI-PCI bridges, this would perhaps check to see if all child devices support powering down for example. Maybe it would do the powering down of child devices, not sure. It probably shouldn't though. device_set_powerstate(u_int new_state) - Called by the bus just before lowering the state and after raising the state. These would replace device_suspend/device_resume() eventually. For example, when ACPI wants to invoke S1, it would try to send all its devices to D1. This would trickle down to PCI via the ACPI Host to PCI bridges, etc. I've also wondered if it's worth adding a cached powerstate variable to device_t that device_get_powerstate() would return. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Wed Dec 10 08:11:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4A5B16A4D2; Wed, 10 Dec 2003 08:11:59 -0800 (PST) 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 7E9CC16A4D0 for ; Wed, 10 Dec 2003 08:11:59 -0800 (PST) Received: from mail2.speakeasy.net (mail2.speakeasy.net [216.254.0.202]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CDEE43D09 for ; Wed, 10 Dec 2003 08:11:58 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 7727 invoked from network); 10 Dec 2003 16:11:57 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 10 Dec 2003 16:11:57 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.10/8.12.10) with ESMTP id hBAGBsnd005297; Wed, 10 Dec 2003 11:11:54 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20031209222111.B44633@root.org> Date: Wed, 10 Dec 2003 11:11:54 -0500 (EST) From: John Baldwin To: Nate Lawson X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: perforce@FreeBSD.org cc: "M. Warner Losh" Subject: Re: PERFORCE change 43464 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 Dec 2003 16:12:00 -0000 On 10-Dec-2003 Nate Lawson wrote: > On Tue, 9 Dec 2003, M. Warner Losh wrote: >> John Baldwin writes: >> : On 09-Dec-2003 M. Warner Losh wrote: >> : > John Baldwin writes: >> : >: On 05-Dec-2003 Nate Lawson wrote: >> : >: > On Fri, 5 Dec 2003, John Baldwin wrote: >> : >: >> Change 43464 by jhb@jhb_blue on 2003/12/05 12:59:01 >> : >: >> >> : >: >> More updates. Closer to working than I thought. In theory >> : >: >> PCI devices should all just work now. >> : >: > >> : >: > This handles PCI. Are you ok with me adding the call to >> : >: > acpi_pwr_switch_consumer() for non-PCI devices like the embedded >> : >: > controller? I think we need to do this at the top \\_SB level. I'm a bit >> : >: > confused as to the handoff between the general tree walk and the ACPI-PCI >> : >: > driver though. >> : >: >> : >: It won't hurt to switch a device on twice. It should be ok to >> : >: do a top-level tree walk of all device objects and turn them on >> : >: before probing child devices I think. ACPI shouldn't turn off >> : >: devices that don't probe like PCI does though because ACPI has >> : >: duplicate objects of things like the entire PCI device tree. :-/ >> : > >> : > Actually, there can be times when you don't want to turn on devices at >> : > all. Walking the whole tree turning them on might be the wrong to >> : > do... >> : > >> : > Sometimes I think that things in the newbus tree should have a pointer >> : > to the acpi power methods that are used in coordination with the bus >> : > code that is 'activating' the device before the 'probe' and 'attach' >> : > happens. >> : >> : I think having a 'bus_set_power_state()' method in the bus layer >> : and having device_probe_and_attach() do 'bus_set_power_state(child, ON)' >> : would be sufficient. ACPI busses would then perform the correct hooks >> : via their bus_set_power_state() methods. >> >> That is very close to what I had in mind. My only 'debate' was 0/1 or >> 0,1,2,3 or ???? > > It may hurt to switch a device on twice, depending on how state is kept in > the AML. In the ACPI case, there are several things that need to happen, > noted below. Check the ACPI power resource code. It caches the current state, so it would only call the AML twice even if you do a pwr_switch_consumer() twice. One thing we might want to do at some point btw, is have the ACPI PCI bus driver toss all ACPI device_t's for devices that end up being enumerated as PCI devices under an ACPI PCI bus. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Wed Dec 10 08:43:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77F5316A4D0; Wed, 10 Dec 2003 08:43:07 -0800 (PST) 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 5158A16A4CE for ; Wed, 10 Dec 2003 08:43:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F385A43D1D for ; Wed, 10 Dec 2003 08:43:04 -0800 (PST) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBAGh4XJ010256 for ; Wed, 10 Dec 2003 08:43:04 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBAGh4No010250 for perforce@freebsd.org; Wed, 10 Dec 2003 08:43:04 -0800 (PST) (envelope-from des@freebsd.org) Date: Wed, 10 Dec 2003 08:43:04 -0800 (PST) Message-Id: <200312101643.hBAGh4No010250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 43727 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 Dec 2003 16:43:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=43727 Change 43727 by des@des.at.des.thinksec.com on 2003/12/10 08:42:25 I completely bungled the previous commit. Don't know what I was thinking (or smoking) at the time. Really fix it this time. Affected files ... .. //depot/projects/openpam/lib/openpam_ttyconv.c#24 edit Differences ... ==== //depot/projects/openpam/lib/openpam_ttyconv.c#24 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#23 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#24 $ */ #include @@ -119,7 +119,7 @@ } /* trim trailing whitespace */ for (len = strlen(buf); len > 0; --len) - if (!isspace(buf[len - 1])) + if (buf[len - 1] != '\r' && buf[len - 1] != '\n') break; buf[len] = '\0'; retval = strdup(buf); @@ -166,26 +166,27 @@ struct pam_response **resp, void *data) { + struct pam_response *aresp; int i; ENTER(); (void)data; if (n <= 0 || n > PAM_MAX_NUM_MSG) RETURNC(PAM_CONV_ERR); - if ((*resp = calloc(n, sizeof **resp)) == NULL) + if ((aresp = calloc(n, sizeof *aresp)) == NULL) RETURNC(PAM_BUF_ERR); for (i = 0; i < n; ++i) { - resp[i]->resp_retcode = 0; - resp[i]->resp = NULL; + aresp[i].resp_retcode = 0; + aresp[i].resp = NULL; switch (msg[i]->msg_style) { case PAM_PROMPT_ECHO_OFF: - (*resp[i]).resp = prompt_echo_off(msg[i]->msg); - if ((*resp[i]).resp == NULL) + aresp[i].resp = prompt_echo_off(msg[i]->msg); + if (aresp[i].resp == NULL) goto fail; break; case PAM_PROMPT_ECHO_ON: - (*resp[i]).resp = prompt(msg[i]->msg); - if ((*resp[i]).resp == NULL) + aresp[i].resp = prompt(msg[i]->msg); + if (aresp[i].resp == NULL) goto fail; break; case PAM_ERROR_MSG: @@ -204,16 +205,18 @@ goto fail; } } + *resp = aresp; RETURNC(PAM_SUCCESS); fail: for (i = 0; i < n; ++i) { - if ((*resp[i]).resp != NULL) { - memset((*resp[i]).resp, 0, strlen((*resp[i]).resp)); - FREE((*resp[i]).resp); + if (aresp[i].resp != NULL) { + memset(aresp[i].resp, 0, strlen(aresp[i].resp)); + FREE(aresp[i].resp); } } - memset(*resp, 0, n * sizeof **resp); - FREE(*resp); + memset(aresp, 0, n * sizeof *aresp); + FREE(aresp); + *resp = NULL; RETURNC(PAM_CONV_ERR); } From owner-p4-projects@FreeBSD.ORG Wed Dec 10 08:46:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B83C16A51A; Wed, 10 Dec 2003 08:46:44 -0800 (PST) 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 4E83D16A517 for ; Wed, 10 Dec 2003 08:46:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8F1443D29 for ; Wed, 10 Dec 2003 08:46:12 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBAGkCXJ010475 for ; Wed, 10 Dec 2003 08:46:12 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBAGk9G3010472 for perforce@freebsd.org; Wed, 10 Dec 2003 08:46:09 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Wed, 10 Dec 2003 08:46:09 -0800 (PST) Message-Id: <200312101646.hBAGk9G3010472@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 43729 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 Dec 2003 16:46:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=43729 Change 43729 by jhb@jhb_blue on 2003/12/10 08:45:23 IFC @43726. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#25 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#34 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC.hints#4 integrate .. //depot/projects/smpng/sys/alpha/include/ioctl_bt848.h#2 integrate .. //depot/projects/smpng/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/amd64-gdbstub.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/critical.c#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#18 integrate .. //depot/projects/smpng/sys/amd64/amd64/mem.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#18 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#7 integrate .. //depot/projects/smpng/sys/amd64/include/cpufunc.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/critical.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/mutex.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/pcvt_ioctl.h#1 branch .. //depot/projects/smpng/sys/amd64/include/runq.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/vmparam.h#6 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#7 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/smpng/sys/boot/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/ficl/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/ficl/loader.c#7 integrate .. //depot/projects/smpng/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/smpng/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/smpng/sys/boot/i386/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0.s#4 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0sio.s#1 branch .. //depot/projects/smpng/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/smpng/sys/boot/ia64/libski/acpi_stub.c#3 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/conf.c#4 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#47 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#34 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#21 integrate .. //depot/projects/smpng/sys/conf/NOTES#60 integrate .. //depot/projects/smpng/sys/conf/files#97 integrate .. //depot/projects/smpng/sys/conf/files.i386#49 integrate .. //depot/projects/smpng/sys/conf/files.pc98#50 integrate .. //depot/projects/smpng/sys/conf/kern.mk#8 integrate .. //depot/projects/smpng/sys/conf/ldscript.i386#6 integrate .. //depot/projects/smpng/sys/conf/majors#31 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#9 integrate .. //depot/projects/smpng/sys/conf/options#68 integrate .. //depot/projects/smpng/sys/conf/options.i386#36 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acstruct.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl1.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl2.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrc.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcl.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsinit.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswscope.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfield.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg3.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstoren.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwacpi.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsobject.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfname.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsaddr.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscreate.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsdump.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsirq.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rslist.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbrsdt.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utalloc.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ah.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#6 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/version.h#5 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_log.c#8 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#53 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/madt.h#2 delete .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#24 integrate .. //depot/projects/smpng/sys/dev/ata/ata-isa.c#13 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#37 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#16 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#44 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#38 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_audio.c#5 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_card.c#5 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_core.c#14 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_i2c.c#6 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#18 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_tuner.c#3 integrate .. //depot/projects/smpng/sys/dev/bktr/ioctl_bt848.h#1 branch .. //depot/projects/smpng/sys/dev/bktr/ioctl_meteor.h#1 branch .. //depot/projects/smpng/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#24 integrate .. //depot/projects/smpng/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/smpng/sys/dev/cx/cronyxfw.h#1 branch .. //depot/projects/smpng/sys/dev/cx/csigma.c#1 branch .. //depot/projects/smpng/sys/dev/cx/csigmafw.h#1 branch .. //depot/projects/smpng/sys/dev/cx/cxddk.c#1 branch .. //depot/projects/smpng/sys/dev/cx/cxddk.h#1 branch .. //depot/projects/smpng/sys/dev/cx/cxreg.h#1 branch .. //depot/projects/smpng/sys/dev/cx/if_cx.c#1 branch .. //depot/projects/smpng/sys/dev/cx/machdep.h#1 branch .. //depot/projects/smpng/sys/dev/cx/ng_cx.h#1 branch .. //depot/projects/smpng/sys/dev/dgb/dgb.c#14 delete .. //depot/projects/smpng/sys/dev/dgb/dgbios.h#2 delete .. //depot/projects/smpng/sys/dev/dgb/dgfep.h#2 delete .. //depot/projects/smpng/sys/dev/dgb/dgreg.h#3 delete .. //depot/projects/smpng/sys/dev/ed/if_ed.c#17 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#29 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#9 integrate .. //depot/projects/smpng/sys/dev/hea/eni.c#7 delete .. //depot/projects/smpng/sys/dev/hea/eni.h#8 delete .. //depot/projects/smpng/sys/dev/hea/eni_buffer.c#10 delete .. //depot/projects/smpng/sys/dev/hea/eni_globals.c#4 delete .. //depot/projects/smpng/sys/dev/hea/eni_if.c#4 delete .. //depot/projects/smpng/sys/dev/hea/eni_init.c#4 delete .. //depot/projects/smpng/sys/dev/hea/eni_intr.c#4 delete .. //depot/projects/smpng/sys/dev/hea/eni_receive.c#7 delete .. //depot/projects/smpng/sys/dev/hea/eni_stats.h#2 delete .. //depot/projects/smpng/sys/dev/hea/eni_suni.h#2 delete .. //depot/projects/smpng/sys/dev/hea/eni_transmit.c#7 delete .. //depot/projects/smpng/sys/dev/hea/eni_var.h#4 delete .. //depot/projects/smpng/sys/dev/hea/eni_vcm.c#7 delete .. //depot/projects/smpng/sys/dev/hea/hea_freebsd.c#6 delete .. //depot/projects/smpng/sys/dev/hea/hea_freebsd.h#2 delete .. //depot/projects/smpng/sys/dev/hea/hea_pci.c#7 delete .. //depot/projects/smpng/sys/dev/led/led.c#3 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#18 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#9 delete .. //depot/projects/smpng/sys/dev/lmc/if_lmc_common.c#4 delete .. //depot/projects/smpng/sys/dev/lmc/if_lmc_fbsd3.c#4 delete .. //depot/projects/smpng/sys/dev/lmc/if_lmc_media.c#4 delete .. //depot/projects/smpng/sys/dev/lmc/if_lmcioctl.h#3 delete .. //depot/projects/smpng/sys/dev/lmc/if_lmcvar.h#3 delete .. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#11 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#14 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#28 integrate .. //depot/projects/smpng/sys/dev/owi/if_owi.c#4 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#21 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#6 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#24 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#20 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#16 integrate .. //depot/projects/smpng/sys/dev/twe/twe.c#8 integrate .. //depot/projects/smpng/sys/dev/twe/twe_compat.h#8 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#17 integrate .. //depot/projects/smpng/sys/dev/twe/twe_tables.h#4 integrate .. //depot/projects/smpng/sys/dev/twe/tweio.h#3 integrate .. //depot/projects/smpng/sys/dev/twe/twereg.h#6 integrate .. //depot/projects/smpng/sys/dev/twe/twevar.h#5 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#28 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/if_rue.c#7 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#59 integrate .. //depot/projects/smpng/sys/dev/wi/if_wivar.h#17 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#14 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_conv.c#6 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#14 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs.c#9 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#19 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#11 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_map.c#6 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_rlimit.c#3 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_status.c#18 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_type.c#4 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#17 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#19 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#22 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#15 integrate .. //depot/projects/smpng/sys/geom/geom.h#33 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#31 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#25 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#22 integrate .. //depot/projects/smpng/sys/i386/acpica/madt.c#5 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#44 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#70 integrate .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#4 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#70 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#61 integrate .. //depot/projects/smpng/sys/i386/i386/mptable.c#6 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#45 integrate .. //depot/projects/smpng/sys/i386/include/cronyx.h#2 delete .. //depot/projects/smpng/sys/i386/include/cserial.h#1 branch .. //depot/projects/smpng/sys/i386/include/ioctl_bt848.h#2 integrate .. //depot/projects/smpng/sys/i386/include/pcvt_ioctl.h#2 integrate .. //depot/projects/smpng/sys/i386/include/sf_buf.h#2 integrate .. //depot/projects/smpng/sys/i386/isa/cronyx.c#3 delete .. //depot/projects/smpng/sys/i386/isa/cx.c#12 delete .. //depot/projects/smpng/sys/i386/isa/cxreg.h#3 delete .. //depot/projects/smpng/sys/i386/isa/cy.c#21 integrate .. //depot/projects/smpng/sys/i386/isa/if_cx.c#7 delete .. //depot/projects/smpng/sys/i386/isa/loran.c#9 delete .. //depot/projects/smpng/sys/ia64/acpica/madt.c#11 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#75 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#61 integrate .. //depot/projects/smpng/sys/ia64/include/ioctl_bt848.h#2 delete .. //depot/projects/smpng/sys/ia64/include/ioctl_meteor.h#2 delete .. //depot/projects/smpng/sys/ia64/include/ucontext.h#6 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#78 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#79 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#17 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#22 integrate .. //depot/projects/smpng/sys/kern/subr_mbpool.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#39 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#32 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#23 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#5 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#37 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#36 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#41 integrate .. //depot/projects/smpng/sys/libkern/iconv_xlat16.c#2 integrate .. //depot/projects/smpng/sys/modules/Makefile#66 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#17 integrate .. //depot/projects/smpng/sys/modules/cx/Makefile#1 branch .. //depot/projects/smpng/sys/modules/hea/Makefile#2 delete .. //depot/projects/smpng/sys/net/if_gre.c#10 integrate .. //depot/projects/smpng/sys/net/if_var.h#20 integrate .. //depot/projects/smpng/sys/net/route.c#17 integrate .. //depot/projects/smpng/sys/netgraph/atm/ngatmbase.c#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#19 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#25 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#26 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#17 integrate .. //depot/projects/smpng/sys/netkey/key.c#23 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#16 integrate .. //depot/projects/smpng/sys/pci/cy_pci.c#7 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#50 integrate .. //depot/projects/smpng/sys/pci/if_dcreg.h#20 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#22 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#41 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#24 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#35 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#27 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#26 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#19 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#22 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#21 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#40 integrate .. //depot/projects/smpng/sys/pci/meteor.c#11 delete .. //depot/projects/smpng/sys/pci/meteor_reg.h#2 delete .. //depot/projects/smpng/sys/powerpc/include/cpufunc.h#16 integrate .. //depot/projects/smpng/sys/powerpc/include/powerpc.h#4 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_macio.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_interface.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#45 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/ofw_machdep.c#8 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#33 integrate .. //depot/projects/smpng/sys/security/mac/mac_process.c#5 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#22 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#17 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#21 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#6 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#17 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#21 integrate .. //depot/projects/smpng/sys/sys/_null.h#1 branch .. //depot/projects/smpng/sys/sys/iconv.h#7 integrate .. //depot/projects/smpng/sys/sys/kse.h#14 integrate .. //depot/projects/smpng/sys/sys/mac.h#22 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#18 integrate .. //depot/projects/smpng/sys/sys/param.h#52 integrate .. //depot/projects/smpng/sys/sys/smp.h#9 integrate .. //depot/projects/smpng/sys/sys/stddef.h#2 integrate .. //depot/projects/smpng/sys/sys/syscall.h#37 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#37 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#39 integrate .. //depot/projects/smpng/sys/sys/systm.h#45 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#49 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#40 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#37 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#25 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.50 2003/11/30 22:08:24 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.51 2003/12/03 14:57:25 jhb Exp $"); #include "opt_kstack_pages.h" @@ -339,7 +339,6 @@ continue; mp_maxid = i; } - mp_maxid++; } int ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#34 (text+ko) ==== @@ -12,13 +12,13 @@ # latest information. # # An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.164 2003/11/13 02:04:34 jeff Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.165 2003/12/08 05:20:34 obrien Exp $ machine alpha cpu EV4 @@ -62,7 +62,7 @@ options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 #Compatible with FreeBSD4 -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues @@ -111,8 +111,10 @@ device pass # Passthrough device (direct SCSI access) device ses # SCSI Environmental Services (and SAF-TE) +# RAID controllers interfaced to the SCSI subsystem +device amr # AMI MegaRAID + # RAID controllers -device amr # AMI MegaRAID device mlx # Mylex DAC960 family # atkbdc0 controls both the keyboard and the PS/2 mouse @@ -139,12 +141,12 @@ device lpt # Printer device ppi # Parallel port interface device #device vpo # Requires scbus and da - + # If you've got a "dumb" serial or parallel PCI card that is # supported by the puc(4) glue driver, uncomment the following # line to enable it (connects to the sio and/or ppc drivers): #device puc - + # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') device txp # 3Com 3cR990 (``Typhoon'') ==== //depot/projects/smpng/sys/alpha/conf/GENERIC.hints#4 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.6 2002/11/14 14:59:27 jhb Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.7 2003/12/05 00:57:11 des Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" hint.fdc.0.drq="2" hint.fd.0.at="fdc0" hint.fd.0.drive="0" +hint.fd.0.flags="4" hint.ata.0.at="isa" hint.ata.0.port="0x1F0" hint.ata.0.irq="14" ==== //depot/projects/smpng/sys/alpha/include/ioctl_bt848.h#2 (text+ko) ==== @@ -1,298 +1,38 @@ -/* - * extensions to ioctl_meteor.h for the bt848 cards +/*- + * Copyright (c) 2003 David O'Brien + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY 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/alpha/include/ioctl_bt848.h,v 1.2 2000/10/27 07:07:24 roger Exp $ + * $FreeBSD: src/sys/alpha/include/ioctl_bt848.h,v 1.3 2003/12/08 07:22:41 obrien Exp $ */ -#ifndef _MACHINE_IOCTL_BT848_H_ -#define _MACHINE_IOCTL_BT848_H_ +#ifndef _MACHINE_IOCTL_BT848_H_ +#define _MACHINE_IOCTL_BT848_H_ -/* - * frequency sets - */ -#define CHNLSET_NABCST 1 -#define CHNLSET_CABLEIRC 2 -#define CHNLSET_CABLEHRC 3 -#define CHNLSET_WEUROPE 4 -#define CHNLSET_JPNBCST 5 -#define CHNLSET_JPNCABLE 6 -#define CHNLSET_XUSSR 7 -#define CHNLSET_AUSTRALIA 8 -#define CHNLSET_FRANCE 9 -#define CHNLSET_MIN CHNLSET_NABCST -#define CHNLSET_MAX CHNLSET_FRANCE +#ifdef __GNUC__ +#warning Include dev/bktr/ioctl_bt848.h instead of this header. +#endif - -/* - * constants for various tuner registers - */ -#define BT848_HUEMIN (-90) -#define BT848_HUEMAX 90 -#define BT848_HUECENTER 0 -#define BT848_HUERANGE 179.3 -#define BT848_HUEREGMIN (-128) -#define BT848_HUEREGMAX 127 -#define BT848_HUESTEPS 256 - -#define BT848_BRIGHTMIN (-50) -#define BT848_BRIGHTMAX 50 -#define BT848_BRIGHTCENTER 0 -#define BT848_BRIGHTRANGE 99.6 -#define BT848_BRIGHTREGMIN (-128) -#define BT848_BRIGHTREGMAX 127 -#define BT848_BRIGHTSTEPS 256 - -#define BT848_CONTRASTMIN 0 -#define BT848_CONTRASTMAX 237 -#define BT848_CONTRASTCENTER 100 -#define BT848_CONTRASTRANGE 236.57 -#define BT848_CONTRASTREGMIN 0 -#define BT848_CONTRASTREGMAX 511 -#define BT848_CONTRASTSTEPS 512 - -#define BT848_CHROMAMIN 0 -#define BT848_CHROMAMAX 284 -#define BT848_CHROMACENTER 100 -#define BT848_CHROMARANGE 283.89 -#define BT848_CHROMAREGMIN 0 -#define BT848_CHROMAREGMAX 511 -#define BT848_CHROMASTEPS 512 - -#define BT848_SATUMIN 0 -#define BT848_SATUMAX 202 -#define BT848_SATUCENTER 100 -#define BT848_SATURANGE 201.18 -#define BT848_SATUREGMIN 0 -#define BT848_SATUREGMAX 511 -#define BT848_SATUSTEPS 512 - -#define BT848_SATVMIN 0 -#define BT848_SATVMAX 284 -#define BT848_SATVCENTER 100 -#define BT848_SATVRANGE 283.89 -#define BT848_SATVREGMIN 0 -#define BT848_SATVREGMAX 511 -#define BT848_SATVSTEPS 512 - - -/* - * audio stuff - */ -#define AUDIO_TUNER 0x00 /* command for the audio routine */ -#define AUDIO_EXTERN 0x01 /* don't confuse them with bit */ -#define AUDIO_INTERN 0x02 /* settings */ -#define AUDIO_MUTE 0x80 -#define AUDIO_UNMUTE 0x81 - - -/* - * EEProm stuff - */ -struct eeProm { - short offset; - short count; - u_char bytes[ 256 ]; -}; - - -/* - * XXX: this is a hack, should be in ioctl_meteor.h - * here to avoid touching that file for now... - */ -#define TVTUNER_SETCHNL _IOW('x', 32, unsigned int) /* set channel */ -#define TVTUNER_GETCHNL _IOR('x', 32, unsigned int) /* get channel */ -#define TVTUNER_SETTYPE _IOW('x', 33, unsigned int) /* set tuner type */ -#define TVTUNER_GETTYPE _IOR('x', 33, unsigned int) /* get tuner type */ -#define TVTUNER_GETSTATUS _IOR('x', 34, unsigned int) /* get tuner status */ -#define TVTUNER_SETFREQ _IOW('x', 35, unsigned int) /* set frequency */ -#define TVTUNER_GETFREQ _IOR('x', 36, unsigned int) /* get frequency */ - - -#define BT848_SHUE _IOW('x', 37, int) /* set hue */ -#define BT848_GHUE _IOR('x', 37, int) /* get hue */ -#define BT848_SBRIG _IOW('x', 38, int) /* set brightness */ -#define BT848_GBRIG _IOR('x', 38, int) /* get brightness */ -#define BT848_SCSAT _IOW('x', 39, int) /* set chroma sat */ -#define BT848_GCSAT _IOR('x', 39, int) /* get UV saturation */ -#define BT848_SCONT _IOW('x', 40, int) /* set contrast */ -#define BT848_GCONT _IOR('x', 40, int) /* get contrast */ -#define BT848_SVSAT _IOW('x', 41, int) /* set chroma V sat */ -#define BT848_GVSAT _IOR('x', 41, int) /* get V saturation */ -#define BT848_SUSAT _IOW('x', 42, int) /* set chroma U sat */ -#define BT848_GUSAT _IOR('x', 42, int) /* get U saturation */ - -#define BT848_SCBARS _IOR('x', 43, int) /* set colorbar */ -#define BT848_CCBARS _IOR('x', 44, int) /* clear colorbar */ - - -#define BT848_SAUDIO _IOW('x', 46, int) /* set audio channel */ -#define BT848_GAUDIO _IOR('x', 47, int) /* get audio channel */ -#define BT848_SBTSC _IOW('x', 48, int) /* set audio channel */ - -#define BT848_GSTATUS _IOR('x', 49, unsigned int) /* reap status */ - -#define BT848_WEEPROM _IOWR('x', 50, struct eeProm) /* write to EEProm */ -#define BT848_REEPROM _IOWR('x', 51, struct eeProm) /* read from EEProm */ +#include -#define BT848_SIGNATURE _IOWR('x', 52, struct eeProm) /* read card sig */ - -#define TVTUNER_SETAFC _IOW('x', 53, int) /* turn AFC on/off */ -#define TVTUNER_GETAFC _IOR('x', 54, int) /* query AFC on/off */ -#define BT848_SLNOTCH _IOW('x', 55, int) /* set luma notch */ -#define BT848_GLNOTCH _IOR('x', 56, int) /* get luma notch */ - -/* Read/Write the BT848's I2C bus directly - * b7-b0: data (read/write) - * b15-b8: internal peripheral register (write) - * b23-b16: i2c addr (write) - * b31-b24: 1 = write, 0 = read - */ -#define BT848_I2CWR _IOWR('x', 57, u_long) /* i2c read-write */ - -struct bktr_msp_control { - unsigned char function; - unsigned int address; - unsigned int data; -}; - -#define BT848_MSP_RESET _IO('x', 76) /* MSP chip reset */ -#define BT848_MSP_READ _IOWR('x', 77, struct bktr_msp_control) /* MSP chip reset */ -#define BT848_MSP_WRITE _IOWR('x', 78, struct bktr_msp_control) /* MSP chip reset */ - -/* Support for radio tuner */ -#define RADIO_SETMODE _IOW('x', 58, unsigned int) /* set radio modes */ -#define RADIO_GETMODE _IOR('x', 58, unsigned char) /* get radio modes */ -#define RADIO_AFC 0x01 /* These modes will probably not */ -#define RADIO_MONO 0x02 /* work on the FRxxxx. It does */ -#define RADIO_MUTE 0x08 /* work on the FMxxxx. */ -#define RADIO_SETFREQ _IOW('x', 59, unsigned int) /* set frequency */ -#define RADIO_GETFREQ _IOR('x', 59, unsigned int) /* set frequency */ - /* Argument is frequency*100MHz */ - -/* - * XXX: more bad magic, - * we need to fix the METEORGINPUT to return something public - * duplicate them here for now... - */ -#define METEOR_DEV0 0x00001000 -#define METEOR_DEV1 0x00002000 -#define METEOR_DEV2 0x00004000 -#define METEOR_DEV3 0x00008000 -#define METEOR_DEV_SVIDEO 0x00006000 -/* - * right now I don't know were to put these, but as they are suppose to be - * a part of a common video capture interface, these should be relocated to - * another place. Probably most of the METEOR_xxx defines need to be - * renamed and moved to a common header - */ - -typedef enum { METEOR_PIXTYPE_RGB, METEOR_PIXTYPE_YUV, - METEOR_PIXTYPE_YUV_PACKED, - METEOR_PIXTYPE_YUV_12 } METEOR_PIXTYPE; - - -struct meteor_pixfmt { - u_int index; /* Index in supported pixfmt list */ - METEOR_PIXTYPE type; /* What's the board gonna feed us */ - u_int Bpp; /* Bytes per pixel */ - u_long masks[3]; /* R,G,B or Y,U,V masks, respectively */ - unsigned swap_bytes :1; /* Bytes swapped within shorts */ - unsigned swap_shorts:1; /* Shorts swapped within longs */ -}; - - -struct bktr_clip { - int x_min; - int x_max; - int y_min; - int y_max; -}; - -#define BT848_MAX_CLIP_NODE 100 -struct _bktr_clip { - struct bktr_clip x[BT848_MAX_CLIP_NODE]; -}; - -/* - * I'm using METEOR_xxx just because that will be common to other interface - * and less of a surprise - */ -#define METEORSACTPIXFMT _IOW('x', 64, int ) -#define METEORGACTPIXFMT _IOR('x', 64, int ) -#define METEORGSUPPIXFMT _IOWR('x', 65, struct meteor_pixfmt) - -/* set clip list */ -#define BT848SCLIP _IOW('x', 66, struct _bktr_clip ) -#define BT848GCLIP _IOR('x', 66, struct _bktr_clip ) - - -/* set input format */ -#define BT848SFMT _IOW('x', 67, unsigned long ) -#define BT848GFMT _IOR('x', 67, unsigned long ) - -/* set clear-buffer-on-start */ -#define BT848SCBUF _IOW('x', 68, int) -#define BT848GCBUF _IOR('x', 68, int) - -/* set capture area */ -/* The capture area is the area of the video image which is grabbed */ -/* Usually the capture area is 640x480 (768x576 PAL) pixels */ -/* This area is then scaled to the dimensions the user requires */ -/* using the METEORGEO ioctl */ -/* However, the capture area could be 400x300 pixels from the top right */ -/* corner of the video image */ -struct bktr_capture_area { - int x_offset; - int y_offset; - int x_size; - int y_size; -}; -#define BT848_SCAPAREA _IOW('x', 69, struct bktr_capture_area) -#define BT848_GCAPAREA _IOR('x', 69, struct bktr_capture_area) - - -/* Get channel Set */ -#define BT848_MAX_CHNLSET_NAME_LEN 16 -struct bktr_chnlset { - short index; - short max_channel; - char name[BT848_MAX_CHNLSET_NAME_LEN]; -}; -#define TVTUNER_GETCHNLSET _IOWR('x', 70, struct bktr_chnlset) - - - -/* Infra Red Remote Control */ -struct bktr_remote { - unsigned char data[3]; -}; -#define REMOTE_GETKEY _IOR('x', 71, struct bktr_remote)/*read the remote */ - /*control receiver*/ - /*returns raw data*/ - - -/* - * Direct access to GPIO pins. You must add BKTR_GPIO_ACCESS to your kernel - * configuration file to use these - */ -#define BT848_GPIO_SET_EN _IOW('x', 72, int) /* set gpio_out_en */ -#define BT848_GPIO_GET_EN _IOR('x', 73, int) /* get gpio_out_en */ -#define BT848_GPIO_SET_DATA _IOW('x', 74, int) /* set gpio_data */ -#define BT848_GPIO_GET_DATA _IOR('x', 75, int) /* get gpio_data */ - - - -/* XXX - Copied from /sys/pci/brktree_reg.h */ -#define BT848_IFORM_FORMAT (0x7<<0) -# define BT848_IFORM_F_RSVD (0x7) -# define BT848_IFORM_F_SECAM (0x6) -# define BT848_IFORM_F_PALN (0x5) -# define BT848_IFORM_F_PALM (0x4) -# define BT848_IFORM_F_PALBDGHI (0x3) -# define BT848_IFORM_F_NTSCJ (0x2) -# define BT848_IFORM_F_NTSCM (0x1) -# define BT848_IFORM_F_AUTO (0x0) - - #endif /* _MACHINE_IOCTL_BT848_H_ */ - ==== //depot/projects/smpng/sys/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.7 2003/11/14 22:26:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.10 2003/12/09 03:04:19 njl Exp $"); #include #include @@ -50,7 +50,6 @@ #include "acpi.h" #include -#include #include #define NIOAPICS 32 /* Max number of I/O APICs */ @@ -70,7 +69,7 @@ u_int la_apic_id:8; } lapics[NLAPICS + 1]; -static APIC_TABLE *madt; +static MULTIPLE_APIC_TABLE *madt; static vm_paddr_t madt_physaddr; static vm_offset_t madt_length; @@ -83,10 +82,10 @@ static void *madt_map(vm_paddr_t pa, int offset, vm_offset_t length); static void *madt_map_table(vm_paddr_t pa, int offset, const char *sig); static void madt_parse_apics(APIC_HEADER *entry, void *arg); -static void madt_parse_interrupt_override(INTERRUPT_SOURCE_OVERRIDE *intr); +static void madt_parse_interrupt_override(MADT_INTERRUPT_OVERRIDE *intr); static void madt_parse_ints(APIC_HEADER *entry, void *arg __unused); -static void madt_parse_local_nmi(LAPIC_NMI *nmi); -static void madt_parse_nmi(NMI *nmi); +static void madt_parse_local_nmi(MADT_LOCAL_APIC_NMI *nmi); +static void madt_parse_nmi(MADT_NMI_SOURCE *nmi); static int madt_probe(void); static int madt_probe_cpus(void); static void madt_probe_cpus_handler(APIC_HEADER *entry, void *arg __unused); @@ -222,7 +221,7 @@ printf("MADT: Failed to map XSDT\n"); return (ENXIO); } - count = (xsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / + count = (xsdt->Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT64); for (i = 0; i < count; i++) if (madt_probe_table(xsdt->TableOffsetEntry[i])) @@ -235,7 +234,7 @@ printf("MADT: Failed to map RSDT\n"); return (ENXIO); } - count = (rsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / + count = (rsdt->Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT32); for (i = 0; i < count; i++) if (madt_probe_table(rsdt->TableOffsetEntry[i])) @@ -310,8 +309,8 @@ madt = pmap_mapdev(madt_physaddr, madt_length); lapic_init((uintptr_t)madt->LocalApicAddress); printf("ACPI APIC Table: <%.*s %.*s>\n", - (int)sizeof(madt->Header.OemId), madt->Header.OemId, - (int)sizeof(madt->Header.OemTableId), madt->Header.OemTableId); + (int)sizeof(madt->OemId), madt->OemId, + (int)sizeof(madt->OemTableId), madt->OemTableId); /* * We ignore 64-bit local APIC override entries. Should we @@ -363,7 +362,7 @@ APIC_HEADER *entry; u_char *p, *end; - end = (u_char *)(madt) + madt->Header.Length; + end = (u_char *)(madt) + madt->Length; for (p = (u_char *)(madt + 1); p < end; ) { entry = (APIC_HEADER *)p; handler(entry, arg); @@ -374,27 +373,27 @@ static void madt_probe_cpus_handler(APIC_HEADER *entry, void *arg) { - PROCESSOR_APIC *proc; + MADT_PROCESSOR_APIC *proc; struct lapic_info *la; switch (entry->Type) { - case APIC_PROC: + case APIC_PROCESSOR: /* * The MADT does not include a BSP flag, so we have to * let the MP code figure out which CPU is the BSP on * its own. */ - proc = (PROCESSOR_APIC *)entry; + proc = (MADT_PROCESSOR_APIC *)entry; if (bootverbose) printf("MADT: Found CPU APIC ID %d ACPI ID %d: %s\n", - proc->LocalApicId, proc->ProcessorApicId, + proc->LocalApicId, proc->ProcessorId, proc->ProcessorEnabled ? "enabled" : "disabled"); - if (proc->ProcessorApicId > NLAPICS) + if (proc->ProcessorId > NLAPICS) panic("%s: CPU ID %d too high", __func__, - proc->ProcessorApicId); - la = &lapics[proc->ProcessorApicId]; + proc->ProcessorId); + la = &lapics[proc->ProcessorId]; KASSERT(la->la_present == 0, - ("Duplicate local ACPI ID %d", proc->ProcessorApicId)); + ("Duplicate local ACPI ID %d", proc->ProcessorId)); la->la_present = 1; la->la_apic_id = proc->LocalApicId; if (proc->ProcessorEnabled) { @@ -412,16 +411,15 @@ static void madt_parse_apics(APIC_HEADER *entry, void *arg __unused) { - IO_APIC *apic; + MADT_IO_APIC *apic; - switch (entry->Type) { case APIC_IO: - apic = (IO_APIC *)entry; + apic = (MADT_IO_APIC *)entry; if (bootverbose) - printf("MADT: Found IO APIC ID %d, Vector %d at %p\n", - apic->IoApicId, apic->Vector, - (void *)(uintptr_t)apic->IoApicAddress); + printf("MADT: Found IO APIC ID %d, Interrupt %d at %p\n", + apic->IoApicId, apic->Interrupt, + (void *)(uintptr_t)apic->Address); if (apic->IoApicId >= NIOAPICS) panic("%s: I/O APIC ID %d too high", __func__, apic->IoApicId); @@ -429,9 +427,9 @@ panic("%s: Double APIC ID %d", __func__, apic->IoApicId); ioapics[apic->IoApicId].io_apic = ioapic_create( - (uintptr_t)apic->IoApicAddress, apic->IoApicId, - apic->Vector); - ioapics[apic->IoApicId].io_vector = apic->Vector; + (uintptr_t)apic->Address, apic->IoApicId, + apic->Interrupt); + ioapics[apic->IoApicId].io_vector = apic->Interrupt; break; default: break; @@ -448,10 +446,10 @@ { switch (Polarity) { - case APIC_POLARITY_CONFORM: - case APIC_POLARITY_ACTIVEHI: + case POLARITY_CONFORMS: + case POLARITY_ACTIVE_HIGH: return (1); - case APIC_POLARITY_ACTIVELO: + case POLARITY_ACTIVE_LOW: return (0); default: panic("Bogus Interrupt Polarity"); @@ -463,10 +461,10 @@ { switch (TriggerMode) { - case APIC_TRIGGER_CONFORM: - case APIC_TRIGGER_EDGE: + case TRIGGER_CONFORMS: + case TRIGGER_EDGE: return (1); - case APIC_TRIGGER_LEVEL: + case TRIGGER_LEVEL: return (0); default: panic("Bogus Interrupt Trigger Mode"); @@ -521,27 +519,26 @@ * Parse an interrupt source override for an ISA interrupt. */ static void -madt_parse_interrupt_override(INTERRUPT_SOURCE_OVERRIDE *intr) +madt_parse_interrupt_override(MADT_INTERRUPT_OVERRIDE *intr) { void *new_ioapic, *old_ioapic; u_int new_pin, old_pin; if (bootverbose) printf("MADT: intr override: source %u, irq %u\n", - intr->Source, intr->GlobalSystemInterrupt); + intr->Source, intr->Interrupt); KASSERT(intr->Bus == 0, ("bus for interrupt overrides must be zero")); - if (madt_find_interrupt(intr->GlobalSystemInterrupt, &new_ioapic, + if (madt_find_interrupt(intr->Interrupt, &new_ioapic, &new_pin) != 0) { printf("MADT: Could not find APIC for vector %d (IRQ %d)\n", - intr->GlobalSystemInterrupt, intr->Source); + intr->Interrupt, intr->Source); return; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 10 08:50:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FA5316A4D0; Wed, 10 Dec 2003 08:50:54 -0800 (PST) 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 563C516A4CE for ; Wed, 10 Dec 2003 08:50:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3216A43D2B for ; Wed, 10 Dec 2003 08:50:52 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBAGopXJ016550 for ; Wed, 10 Dec 2003 08:50:51 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBAGoofx016547 for perforce@freebsd.org; Wed, 10 Dec 2003 08:50:50 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Wed, 10 Dec 2003 08:50:50 -0800 (PST) Message-Id: <200312101650.hBAGoofx016547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 43731 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 Dec 2003 16:50:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=43731 Change 43731 by cvance@cvance_g4 on 2003/12/10 08:49:49 Fix bug: interpvnodelabel may be NULL. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#127 edit .. //depot/projects/trustedbsd/sebsd/sys/security/mac_test/mac_test.c#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#127 (text+ko) ==== @@ -1250,7 +1250,8 @@ ASSERT_CRED_LABEL(old->cr_label); ASSERT_CRED_LABEL(new->cr_label); ASSERT_VNODE_LABEL(filelabel); - ASSERT_VNODE_LABEL(interpvnodelabel); + if (interpvnodelabel != NULL) + ASSERT_VNODE_LABEL(interpvnodelabel); if (execlabel != NULL) { ASSERT_CRED_LABEL(execlabel); } ==== //depot/projects/trustedbsd/sebsd/sys/security/mac_test/mac_test.c#11 (text+ko) ==== @@ -1250,7 +1250,8 @@ ASSERT_CRED_LABEL(old->cr_label); ASSERT_CRED_LABEL(new->cr_label); ASSERT_VNODE_LABEL(filelabel); - ASSERT_VNODE_LABEL(interpvnodelabel); + if (interpvnodelabel != NULL) + ASSERT_VNODE_LABEL(interpvnodelabel); if (execlabel != NULL) { ASSERT_CRED_LABEL(execlabel); } From owner-p4-projects@FreeBSD.ORG Wed Dec 10 11:10:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8B5416A4D1; Wed, 10 Dec 2003 11:10:36 -0800 (PST) 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 803F716A4CF for ; Wed, 10 Dec 2003 11:10:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 207EE43D50 for ; Wed, 10 Dec 2003 11:08:02 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBAJ82XJ025491 for ; Wed, 10 Dec 2003 11:08:02 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBAJ80bG025479 for perforce@freebsd.org; Wed, 10 Dec 2003 11:08:00 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 10 Dec 2003 11:08:00 -0800 (PST) Message-Id: <200312101908.hBAJ80bG025479@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 43744 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 Dec 2003 19:10:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=43744 Change 43744 by peter@peter_daintree on 2003/12/10 11:07:57 IFC @43736 Affected files ... .. //depot/projects/hammer/Makefile#15 integrate .. //depot/projects/hammer/UPDATING#29 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_ttyconv.c#9 integrate .. //depot/projects/hammer/etc/rc.d/jail#5 integrate .. //depot/projects/hammer/etc/rc.d/mountcritlocal#5 integrate .. //depot/projects/hammer/etc/rc.d/root#5 integrate .. //depot/projects/hammer/etc/rc.d/syscons#3 integrate .. //depot/projects/hammer/etc/rc.subr#10 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/include/Makefile#5 integrate .. //depot/projects/hammer/lib/libc/Makefile#10 integrate .. //depot/projects/hammer/lib/libc/powerpc/_fpmath.h#3 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#10 integrate .. //depot/projects/hammer/lib/libc/sys/kse.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/stat.2#7 integrate .. //depot/projects/hammer/lib/libpthread/pthread.map#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/Makefile.inc#9 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_accept.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_aio_suspend.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#14 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_close.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#16 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_connect.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_creat.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_fcntl.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_fsync.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_join.c#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#27 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_msync.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_nanosleep.c#8 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_open.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_pause.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_poll.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#20 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_pselect.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_read.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_readv.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_select.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sem.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#10 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#10 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sleep.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_spinlock.c#10 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_system.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_tcdrain.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_wait.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_wait4.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_waitpid.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_write.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_writev.c#3 integrate .. //depot/projects/hammer/lib/libstand/Makefile#7 integrate .. //depot/projects/hammer/lib/libstand/gzipfs.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cond.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#9 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_spinlock.c#6 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_subr.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#3 integrate .. //depot/projects/hammer/share/man/man4/ng_iface.4#2 integrate .. //depot/projects/hammer/share/man/man9/BUS_SETUP_INTR.9#6 integrate .. //depot/projects/hammer/share/man/man9/bus_alloc_resource.9#4 integrate .. //depot/projects/hammer/share/man/man9/kobj.9#3 integrate .. //depot/projects/hammer/sys/amd64/acpica/madt.c#26 integrate .. //depot/projects/hammer/sys/amd64/include/pcvt_ioctl.h#1 branch .. //depot/projects/hammer/sys/boot/Makefile#9 integrate .. //depot/projects/hammer/sys/boot/ficl/Makefile#7 integrate .. //depot/projects/hammer/sys/boot/ficl/loader.c#4 integrate .. //depot/projects/hammer/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/hammer/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/hammer/sys/boot/i386/boot0/boot0.s#4 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/boot0sio.s#2 integrate .. //depot/projects/hammer/sys/boot/ia64/libski/acpi_stub.c#3 integrate .. //depot/projects/hammer/sys/boot/powerpc/loader/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/powerpc/loader/conf.c#3 integrate .. //depot/projects/hammer/sys/conf/Makefile.powerpc#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdisasm.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acenv.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acevents.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acexcep.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acglobal.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acmacros.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acobject.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpica_prep.sh#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acstruct.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl1.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl2.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actypes.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acutils.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbdisply.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbexec.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbfileio.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbstats.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbutils.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrc.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrcl.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsfield.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsinit.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmethod.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmthdat.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsopcode.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsutils.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswexec.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswload.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswscope.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswstate.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpeblk.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evmisc.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evregion.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evrgnini.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxfregn.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconfig.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/excreate.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exdump.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exfield.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exfldio.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exmisc.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exmutex.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg1.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg3.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exprep.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exregion.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresnte.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresolv.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresop.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstore.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstoren.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exsystem.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exutils.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwacpi.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwregs.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwsleep.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsaccess.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsalloc.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsdump.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsdumpdv.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsinit.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsobject.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nssearch.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsutils.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfname.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psargs.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psparse.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psxface.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsaddr.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rscalc.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rscreate.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsdump.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsirq.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rslist.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbconvrt.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbget.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbgetall.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbinstal.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbrsdt.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbxface.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbxfroot.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utalloc.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utdebug.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utdelete.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/uteval.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utglobal.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utobject.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#17 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/madt.h#2 delete .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#14 integrate .. //depot/projects/hammer/sys/dev/owi/if_owi.c#4 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#11 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#23 integrate .. //depot/projects/hammer/sys/dev/wi/if_wivar.h#9 integrate .. //depot/projects/hammer/sys/i386/acpica/madt.c#7 integrate .. //depot/projects/hammer/sys/i386/include/pcvt_ioctl.h#2 integrate .. //depot/projects/hammer/sys/ia64/acpica/madt.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/trap.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#38 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/hammer/sys/net/if_gre.c#9 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#8 integrate .. //depot/projects/hammer/sys/netkey/key.c#13 integrate .. //depot/projects/hammer/sys/powerpc/include/cpufunc.h#4 integrate .. //depot/projects/hammer/sys/powerpc/include/powerpc.h#2 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_macio.c#5 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/db_interface.c#3 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#21 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/ofw_machdep.c#5 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#15 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#19 integrate .. //depot/projects/hammer/usr.bin/m4/m4.1#5 integrate .. //depot/projects/hammer/usr.sbin/Makefile#35 integrate Differences ... ==== //depot/projects/hammer/Makefile#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.291 2003/11/07 08:36:55 kris Exp $ +# $FreeBSD: src/Makefile,v 1.292 2003/12/09 02:08:19 peter Exp $ # # The user-driven targets are: # @@ -58,13 +58,17 @@ # Define the user-driven targets. These are listed here in alphabetical # order, but that's not important. # +# Targets that begin with underscore are internal targets intended for +# developer convenience only. They are intentionally not documented and +# completely subject to change without notice. +# TGTS= all all-man buildkernel buildworld checkdpadd clean \ cleandepend cleandir depend distribute distributeworld everything \ hierarchy install installcheck installkernel installkernel.debug\ reinstallkernel reinstallkernel.debug installworld \ libraries lint maninstall \ obj objlink regress rerelease tags update \ - _legacy _bootstrap-tools _cleanobj _obj \ + _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend BITGTS= files includes ==== //depot/projects/hammer/UPDATING#29 (text+ko) ==== @@ -50,6 +50,14 @@ netgraph to boot need to make sure to have world and kernel in sync before rebooting. +20031111: + Hyperthreading logical CPU's are no longer probed by default + when using the MP Table. If ACPI is being used, then logical + CPUs will be probed if hyperthreading is enabled in the BIOS. + If ACPI is not being used and hyperthreading is enabled in the + BIOS, logical CPUs can be enabled by building a custom kernel + with the option MPTABLE_FORCE_HTT enabled. + 20031103: The i386 APIC_IO kernel option has been replaced by 'device apic'. The ACPI module has also been temporarily @@ -1431,4 +1439,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.282 2003/11/17 23:25:16 rwatson Exp $ +$FreeBSD: src/UPDATING,v 1.283 2003/12/10 15:59:20 jhb Exp $ ==== //depot/projects/hammer/contrib/openpam/lib/openpam_ttyconv.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#23 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#24 $ */ #include @@ -119,7 +119,7 @@ } /* trim trailing whitespace */ for (len = strlen(buf); len > 0; --len) - if (!isspace(buf[len - 1])) + if (buf[len - 1] != '\r' && buf[len - 1] != '\n') break; buf[len] = '\0'; retval = strdup(buf); @@ -166,26 +166,27 @@ struct pam_response **resp, void *data) { + struct pam_response *aresp; int i; ENTER(); (void)data; if (n <= 0 || n > PAM_MAX_NUM_MSG) RETURNC(PAM_CONV_ERR); - if ((*resp = calloc(n, sizeof **resp)) == NULL) + if ((aresp = calloc(n, sizeof *aresp)) == NULL) RETURNC(PAM_BUF_ERR); for (i = 0; i < n; ++i) { - resp[i]->resp_retcode = 0; - resp[i]->resp = NULL; + aresp[i].resp_retcode = 0; + aresp[i].resp = NULL; switch (msg[i]->msg_style) { case PAM_PROMPT_ECHO_OFF: - (*resp[i]).resp = prompt_echo_off(msg[i]->msg); - if ((*resp[i]).resp == NULL) + aresp[i].resp = prompt_echo_off(msg[i]->msg); + if (aresp[i].resp == NULL) goto fail; break; case PAM_PROMPT_ECHO_ON: - (*resp[i]).resp = prompt(msg[i]->msg); - if ((*resp[i]).resp == NULL) + aresp[i].resp = prompt(msg[i]->msg); + if (aresp[i].resp == NULL) goto fail; break; case PAM_ERROR_MSG: @@ -204,16 +205,18 @@ goto fail; } } + *resp = aresp; RETURNC(PAM_SUCCESS); fail: for (i = 0; i < n; ++i) { - if ((*resp[i]).resp != NULL) { - memset((*resp[i]).resp, 0, strlen((*resp[i]).resp)); - FREE((*resp[i]).resp); + if (aresp[i].resp != NULL) { + memset(aresp[i].resp, 0, strlen(aresp[i].resp)); + FREE(aresp[i].resp); } } - memset(*resp, 0, n * sizeof **resp); - FREE(*resp); + memset(aresp, 0, n * sizeof *aresp); + FREE(aresp); + *resp = NULL; RETURNC(PAM_CONV_ERR); } ==== //depot/projects/hammer/etc/rc.d/jail#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.7 2003/10/13 08:20:55 dougb Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.10 2003/12/09 08:51:11 mtm Exp $ # # PROVIDE: jail @@ -100,11 +100,19 @@ # Transitional symlink for old binaries if [ ! -L ${jail_devdir}/log ]; then - devfs_link ${jail_devdir} ../var/run/log log + __pwd="`pwd`" + cd "${jail_devdir}" + ln -sf ../var/run/log log + cd "$__pwd" fi + # XXX - It seems symlinks don't work when there + # is a devfs(5) device of the same name. # Jail console output - devfs_link ${jail_devdir} ../var/log/console console + # __pwd="`pwd`" + # cd "${jail_devdir}" + # ln -sf ../var/log/console console + # cd "$__pwd" fi if checkyesno jail_fdescfs; then info "Mounting fdescfs on ${jail_fdescdir}" @@ -116,7 +124,7 @@ mount -t procfs proc "${jail_procdir}" fi fi - jail 1>/dev/null 2>&1 \ + jail 1>${jail_rootdir}/var/log/console.log 2>&1 \ ${jail_rootdir} ${jail_hostname} ${jail_ip} ${jail_exec} [ "$?" -eq 0 ] && echo -n " $jail_hostname" done @@ -138,14 +146,16 @@ for _jail in ${jail_list} do init_variables $_jail + if checkyesno jail_fdescfs; then + if [ -d ${jail_fdescdir} ] ; then + umount -f ${jail_fdescdir} >/dev/null 2>&1 + fi + fi if checkyesno jail_devfs; then if [ -d ${jail_devdir} ] ; then umount -f ${jail_devdir} >/dev/null 2>&1 fi fi - if checkyesno jail_fdescfs; then - umount -f ${jail_fdescdir} >/dev/null 2>&1 - fi if checkyesno jail_procfs; then if [ -d ${jail_procdir} ] ; then umount -f ${jail_procdir} >/dev/null 2>&1 ==== //depot/projects/hammer/etc/rc.d/mountcritlocal#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.5 2003/06/01 01:43:37 gordon Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.6 2003/12/09 08:17:32 mtm Exp $ # # PROVIDE: mountcritlocal @@ -43,7 +43,7 @@ *) echo 'Mounting /etc/fstab filesystems failed,' \ ' startup aborted' - exit 1 + kill -QUIT $$ ;; esac ;; ==== //depot/projects/hammer/etc/rc.d/root#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: root,v 1.2 2000/05/13 08:45:09 lukem Exp $ -# $FreeBSD: src/etc/rc.d/root,v 1.5 2002/10/31 02:06:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.6 2003/12/09 08:17:33 mtm Exp $ # # PROVIDE: root @@ -27,13 +27,12 @@ *) if ! mount -u -o rw /; then echo 'Mounting root filesystem rw failed, startup aborted' - exit 1 + /bin/kill -QUIT $$ fi ;; esac umount -a >/dev/null 2>&1 - mount / # If we booted a special kernel remove the record # so we will boot the default kernel next time. ==== //depot/projects/hammer/etc/rc.d/syscons#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/etc/rc.d/syscons,v 1.9 2002/09/09 22:40:34 gordon Exp $ +# $FreeBSD: src/etc/rc.d/syscons,v 1.10 2003/12/10 15:48:49 peter Exp $ # # PROVIDE: syscons @@ -44,13 +44,15 @@ syscons_precmd() { - if [ -c $kbddev ] && \ - [ -x /usr/sbin/ispcvt ] && \ - ! /usr/sbin/ispcvt + if [ ! -c $kbddev ] + then + return 1 + fi + if [ -x /usr/sbin/ispcvt ] && /usr/sbin/ispcvt then - return 0 + return 1 fi - return 1 + return 0 } syscons_start() ==== //depot/projects/hammer/etc/rc.subr#10 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.16 2003/08/20 06:50:34 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.17 2003/12/09 08:51:11 mtm Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -1038,29 +1038,30 @@ fi } -# devfs_link dir src link -# Make a symbolic link 'link' to src in chroot/dev. -# Returns 0 on sucess. +# make_symlink src link +# Make a symbolic link 'link' to src from basedir. If the +# directory in which link is to be created does not exist +# a warning will be displayed and an error will be returned. +# Returns 0 on sucess, 1 otherwise. # -devfs_link() +make_symlink() { - local dir src link _me - dir="$1" - src="$2" - link="$3" - _me="devfs_link" + local src link linkdir _me + src="$1" + link="$2" + linkdir="`dirname $link`" + _me="make_symlink()" - if [ -z "$dir" -o -z "$src" -o -z "$link" ]; then - warn "devfs_link(): requires three arguments." + if [ -z "$src" -o -z "$link" ]; then + warn "$_me: requires two arguments." return 1 fi - if [ -z "$dir" ]; then - warn "$_me: the directory ($dir) does not exist" + if [ ! -d "$linkdir" ]; then + warn "$_me: the directory $linkdir does not exist" return 1 fi - cd ${chroot}/dev if ! ln -sf $src $link ; then - warn "$_me: unable to link $link --> $src in $dir" + warn "$_me: unable to make a symbolic link from $link to $src" return 1 fi return 0 ==== //depot/projects/hammer/gnu/usr.bin/cc/include/Makefile#5 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/cc/include/Makefile,v 1.5 2003/04/26 20:04:38 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/include/Makefile,v 1.6 2003/12/09 16:31:30 kan Exp $ .include "../Makefile.inc" .PATH: ${GCCDIR}/config/${GCC_CPU} .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" -INCS= mmintrin.h xmmintrin.h +INCS= emmintrin.h mmintrin.h pmmintrin.h xmmintrin.h .elif ${TARGET_ARCH} == "ia64" INCS= ia64intrin.h .endif ==== //depot/projects/hammer/lib/libc/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.45 2003/11/17 04:20:02 nectar Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.46 2003/12/10 16:33:17 mikeh Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -10,6 +10,7 @@ # system call stubs. LIB=c # If you bump SHLIB_MAJOR, remove kluge from gen/gethostname.c. +# If you bump SHLIB_MAJOR, see standards/55112 SHLIB_MAJOR= 5 SHLIBDIR?= /lib WARNS?= 1 ==== //depot/projects/hammer/lib/libc/powerpc/_fpmath.h#3 (text+ko) ==== @@ -23,20 +23,19 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/powerpc/_fpmath.h,v 1.2 2003/04/05 22:10:13 das Exp $ + * $FreeBSD: src/lib/libc/powerpc/_fpmath.h,v 1.3 2003/12/10 13:04:42 grehan Exp $ */ union IEEEl2bits { long double e; struct { - unsigned int sign :1; - unsigned int exp :15; - unsigned long manh :48; - unsigned long manl :64; + unsigned int sign :1; + unsigned int exp :15; + unsigned long long manh :48; + unsigned long long manl :64; } bits; }; -/* XXX does powerpc have a normalization bit? */ #define mask_nbit_l(u) ((void)0) #define LDBL_IMPLICIT_NBIT ==== //depot/projects/hammer/lib/libc/sys/Makefile.inc#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.106 2003/11/01 05:36:14 tjr Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.107 2003/12/10 02:38:51 marcel Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -118,7 +118,7 @@ MLINKS+=jail.2 jail_attach.2 MLINKS+=kqueue.2 kevent.2 MLINKS+=kse.2 kse_create.2 kse.2 kse_exit.2 kse.2 kse_release.2 \ - kse.2 kse_wakeup.2 kse.2 kse_thr_interrupt.2 + kse.2 kse_switchin.2 kse.2 kse_thr_interrupt.2 kse.2 kse_wakeup.2 MLINKS+=madvise.2 posix_madvise.2 MLINKS+=mlock.2 munlock.2 MLINKS+=mlockall.2 munlockall.2 ==== //depot/projects/hammer/lib/libc/sys/kse.2#5 (text+ko) ==== @@ -33,7 +33,7 @@ .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.12 2003/06/17 09:36:47 sobomax Exp $ +.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.13 2003/12/10 02:38:51 marcel Exp $ .\" .Dd September 10, 2002 .Dt KSE 2 @@ -53,9 +53,11 @@ .Ft int .Fn kse_release "struct timespec *timeout" .Ft int -.Fn kse_wakeup "struct kse_mailbox *mbx" +.Fn kse_switchin "mcontext_t *mcp" "long val" "long *loc" .Ft int .Fn kse_thr_interrupt "struct kse_thr_mailbox *tmbx" +.Ft int +.Fn kse_wakeup "struct kse_mailbox *mbx" .Sh DESCRIPTION These system calls implement kernel support for multi-threaded processes. .\" @@ -286,6 +288,16 @@ does not return to the caller. .Pp The +.Fn kse_switchin +system call can be used by the UTS, when it has selected a new thread, +to switch to the context of that thread. +The use of +.Fn kse_switchin +is machine dependent. +Some platforms do not need a system call to switch to a new context, +while others require its use in particular cases. +.Pp +The .Fn kse_wakeup system call is the opposite of ==== //depot/projects/hammer/lib/libc/sys/stat.2#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)stat.2 8.4 (Berkeley) 5/1/95 -.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.35 2003/10/20 13:52:22 dds Exp $ +.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.36 2003/12/10 15:08:41 dds Exp $ .\" .Dd February 15, 2002 .Dt STAT 2 @@ -257,7 +257,8 @@ .Xr chmod 2 , .Xr chown 2 , .Xr utimes 2 , -.Xr symlink 7 +.Xr symlink 7 , +.Xr sticky 8 .Sh BUGS Applying .Fn fstat ==== //depot/projects/hammer/lib/libpthread/pthread.map#6 (text+ko) ==== @@ -1,8 +1,10 @@ -# $FreeBSD: src/lib/libpthread/pthread.map,v 1.7 2003/11/04 20:04:44 deischen Exp $ +# $FreeBSD: src/lib/libpthread/pthread.map,v 1.8 2003/12/09 15:16:27 deischen Exp $ LIBTHREAD_1_0 { global: ___creat; + __accept; __close; + __connect; __error; __fcntl; __fsync; @@ -167,8 +169,10 @@ _vfork; _wait; _waitpid; + accept; aio_suspend; close; + connect; creat; fcntl; fork; ==== //depot/projects/hammer/lib/libpthread/thread/Makefile.inc#9 (text+ko) ==== @@ -1,9 +1,10 @@ -# $FreeBSD: src/lib/libpthread/thread/Makefile.inc,v 1.45 2003/11/04 20:04:44 deischen Exp $ +# $FreeBSD: src/lib/libpthread/thread/Makefile.inc,v 1.46 2003/12/09 15:16:27 deischen Exp $ # thr sources .PATH: ${.CURDIR}/thread SRCS+= \ + thr_accept.c \ thr_aio_suspend.c \ thr_atfork.c \ thr_attr_destroy.c \ @@ -38,6 +39,7 @@ thr_cond.c \ thr_condattr_destroy.c \ thr_condattr_init.c \ + thr_connect.c \ thr_creat.c \ thr_create.c \ thr_detach.c \ ==== //depot/projects/hammer/lib/libpthread/thread/thr_aio_suspend.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_aio_suspend.c,v 1.7 2003/04/18 05:04:15 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_aio_suspend.c,v 1.8 2003/12/09 02:20:56 davidxu Exp $ */ #include @@ -42,9 +42,9 @@ struct pthread *curthread = _get_curthread(); int ret; - _thr_enter_cancellation_point(curthread); + _thr_cancel_enter(curthread); ret = __sys_aio_suspend(iocbs, niocb, timeout); - _thr_leave_cancellation_point(curthread); + _thr_cancel_leave(curthread, 1); return (ret); } ==== //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#14 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.30 2003/10/08 00:30:38 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.31 2003/12/09 02:20:56 davidxu Exp $ */ #include #include @@ -11,8 +11,35 @@ __weak_reference(_pthread_setcanceltype, pthread_setcanceltype); __weak_reference(_pthread_testcancel, pthread_testcancel); -static int checkcancel(struct pthread *curthread); -static void testcancel(struct pthread *curthread); +static inline int +checkcancel(struct pthread *curthread) +{ + if (((curthread->cancelflags & PTHREAD_CANCEL_DISABLE) == 0) && + ((curthread->cancelflags & THR_CANCELLING) != 0)) { + /* + * It is possible for this thread to be swapped out + * while performing cancellation; do not allow it + * to be cancelled again. + */ + curthread->cancelflags &= ~THR_CANCELLING; + return (1); + } + else + return (0); +} + +static inline void +testcancel(struct pthread *curthread) +{ + if (checkcancel(curthread) != 0) { + /* Unlock before exiting: */ + THR_THREAD_UNLOCK(curthread, curthread); + + _thr_exit_cleanup(); + pthread_exit(PTHREAD_CANCELED); + PANIC("cancel"); + } +} int _pthread_cancel(pthread_t pthread) @@ -217,37 +244,6 @@ return (ret); } -static int -checkcancel(struct pthread *curthread) -{ - if (((curthread->cancelflags & PTHREAD_CANCEL_DISABLE) == 0) && - ((curthread->cancelflags & THR_CANCELLING) != 0)) { - /* - * It is possible for this thread to be swapped out - * while performing cancellation; do not allow it - * to be cancelled again. - */ - curthread->cancelflags &= ~THR_CANCELLING; - return (1); - } - else - return (0); -} - -static void -testcancel(struct pthread *curthread) -{ - - if (checkcancel(curthread) != 0) { - /* Unlock before exiting: */ - THR_THREAD_UNLOCK(curthread, curthread); - - _thr_exit_cleanup(); - pthread_exit(PTHREAD_CANCELED); - PANIC("cancel"); - } -} - void _pthread_testcancel(void) { @@ -259,10 +255,8 @@ } void -_thr_enter_cancellation_point(struct pthread *thread) +_thr_cancel_enter(struct pthread *thread) { - if (!_kse_isthreaded()) - return; /* Look for a cancellation before we block: */ THR_THREAD_LOCK(thread, thread); testcancel(thread); @@ -271,14 +265,13 @@ } void -_thr_leave_cancellation_point(struct pthread *thread) +_thr_cancel_leave(struct pthread *thread, int check) { - if (!_kse_isthreaded()) - return; THR_THREAD_LOCK(thread, thread); thread->cancelflags &= ~THR_AT_CANCEL_POINT; /* Look for a cancellation after we unblock: */ - testcancel(thread); + if (check) + testcancel(thread); THR_THREAD_UNLOCK(thread, thread); } ==== //depot/projects/hammer/lib/libpthread/thread/thr_close.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_close.c,v 1.16 2003/04/18 05:04:15 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_close.c,v 1.17 2003/12/09 02:20:56 davidxu Exp $ */ #include #include @@ -47,9 +47,9 @@ struct pthread *curthread = _get_curthread(); int ret; - _thr_enter_cancellation_point(curthread); + _thr_cancel_enter(curthread); ret = __sys_close(fd); - _thr_leave_cancellation_point(curthread); + _thr_cancel_leave(curthread, 1); return (ret); } ==== //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#16 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.50 2003/09/14 22:33:32 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.51 2003/12/09 02:20:56 davidxu Exp $ */ #include #include @@ -365,9 +365,9 @@ struct pthread *curthread = _get_curthread(); int ret; - _thr_enter_cancellation_point(curthread); + _thr_cancel_enter(curthread); ret = _pthread_cond_wait(cond, mutex); - _thr_leave_cancellation_point(curthread); + _thr_cancel_leave(curthread, 1); return (ret); } @@ -571,9 +571,9 @@ struct pthread *curthread = _get_curthread(); int ret; - _thr_enter_cancellation_point(curthread); + _thr_cancel_enter(curthread); ret = _pthread_cond_timedwait(cond, mutex, abstime); - _thr_leave_cancellation_point(curthread); + _thr_cancel_leave(curthread, 1); return (ret); } ==== //depot/projects/hammer/lib/libpthread/thread/thr_creat.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_creat.c,v 1.7 2003/09/03 17:56:26 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_creat.c,v 1.8 2003/12/09 02:20:56 davidxu Exp $ */ #include @@ -43,9 +43,13 @@ struct pthread *curthread = _get_curthread(); int ret; - _thr_enter_cancellation_point(curthread); + _thr_cancel_enter(curthread); ret = __creat(path, mode); - _thr_leave_cancellation_point(curthread); + /* + * To avoid possible file handle leak, + * only check cancellation point if it is failure + */ + _thr_cancel_leave(curthread, (ret == -1)); return ret; } ==== //depot/projects/hammer/lib/libpthread/thread/thr_fcntl.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_fcntl.c,v 1.18 2003/04/18 05:04:15 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_fcntl.c,v 1.19 2003/12/09 02:20:56 davidxu Exp $ */ #include #include "namespace.h" @@ -44,14 +44,21 @@ __fcntl(int fd, int cmd,...) { struct pthread *curthread = _get_curthread(); - int ret; + int ret, check = 1; va_list ap; - _thr_enter_cancellation_point(curthread); + _thr_cancel_enter(curthread); va_start(ap, cmd); switch (cmd) { case F_DUPFD: + ret = __sys_fcntl(fd, cmd, va_arg(ap, int)); + /* + * To avoid possible file handle leak, + * only check cancellation point if it is failure + */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 10 11:14:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAA3516A4CE; Wed, 10 Dec 2003 11:14:12 -0800 (PST) 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 95A7C16A4CE for ; Wed, 10 Dec 2003 11:14:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C456843D21 for ; Wed, 10 Dec 2003 11:14:11 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBAJEBXJ025859 for ; Wed, 10 Dec 2003 11:14:11 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBAJEBFa025856 for perforce@freebsd.org; Wed, 10 Dec 2003 11:14:11 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 10 Dec 2003 11:14:11 -0800 (PST) Message-Id: <200312101914.hBAJEBFa025856@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 43746 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 Dec 2003 19:14:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=43746 Change 43746 by peter@peter_daintree on 2003/12/10 11:14:06 integ -I -b i386_hammer (just to keep it in sync) Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#27 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#23 integrate .. //depot/projects/hammer/sys/amd64/include/sf_buf.h#3 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#27 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#23 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/sf_buf.h#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Dec 10 12:33:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AF7E16A4D0; Wed, 10 Dec 2003 12:33:52 -0800 (PST) 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 3554916A4CE for ; Wed, 10 Dec 2003 12:33:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F85D43D2F for ; Wed, 10 Dec 2003 12:33:51 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBAKXpXJ029982 for ; Wed, 10 Dec 2003 12:33:51 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBAKXoAQ029979 for perforce@freebsd.org; Wed, 10 Dec 2003 12:33:51 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 10 Dec 2003 12:33:51 -0800 (PST) Message-Id: <200312102033.hBAKXoAQ029979@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43752 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 Dec 2003 20:33:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=43752 Change 43752 by sam@sam_ebb on 2003/12/10 12:33:47 correct sorele param zero'ing to do it uniformly Affected files ... .. //depot/projects/netperf+sockets/sys/sys/socketvar.h#5 edit Differences ... ==== //depot/projects/netperf+sockets/sys/sys/socketvar.h#5 (text+ko) ==== @@ -294,10 +294,9 @@ panic("sorele"); \ if (--(so)->so_count == 0) \ sofree(so); \ - else { \ + else \ SOCK_UNLOCK(so); \ - so = NULL; \ - } \ + so = NULL; \ } while (0) #define sotryfree(so) do { \ From owner-p4-projects@FreeBSD.ORG Wed Dec 10 12:35:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E5E216A4D0; Wed, 10 Dec 2003 12:35:56 -0800 (PST) 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 47E9816A4CE for ; Wed, 10 Dec 2003 12:35:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 80F2943D28 for ; Wed, 10 Dec 2003 12:35:55 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBAKZtXJ030119 for ; Wed, 10 Dec 2003 12:35:55 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBAKZshC030116 for perforce@freebsd.org; Wed, 10 Dec 2003 12:35:54 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 10 Dec 2003 12:35:54 -0800 (PST) Message-Id: <200312102035.hBAKZshC030116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43754 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 Dec 2003 20:35:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=43754 Change 43754 by sam@sam_ebb on 2003/12/10 12:35:06 o correctly order so_rcv lock in pru_send+pru_rcvd o corect lock/unlock typo Affected files ... .. //depot/projects/netperf+sockets/sys/kern/uipc_usrreq.c#4 edit Differences ... ==== //depot/projects/netperf+sockets/sys/kern/uipc_usrreq.c#4 (text+ko) ==== @@ -300,6 +300,12 @@ if (unp == 0) return EINVAL; + /* + * Reorder locks to avoid LORs. Note that we + * delay re-locking so_rcv to below so it can + * be done only once. + */ + SOCKBUF_UNLOCK(&so->so_rcv); UNP_ENTER(unp); switch (so->so_type) { case SOCK_DGRAM: @@ -307,11 +313,14 @@ /*NOTREACHED*/ case SOCK_STREAM: - if (unp->unp_conn == 0) + if (unp->unp_conn == 0) { + SOCKBUF_LOCK(&so->so_rcv); break; + } so2 = unp->unp_conn->unp_socket; - /* XXX so_rcv lock */ + /* NB: careful of order here */ SOCKBUF_LOCK(&so2->so_snd); + SOCKBUF_LOCK(&so->so_rcv); /* * Adjust backpressure on sender * and wakeup any waiting to write. @@ -413,7 +422,7 @@ if (nam) { SOCKBUF_UNLOCK(&so->so_snd); error = unp_connect(so, nam, td); - SOCKBUF_UNLOCK(&so->so_snd); + SOCKBUF_LOCK(&so->so_snd); if (error) break; /* XXX */ } else { From owner-p4-projects@FreeBSD.ORG Wed Dec 10 13:16:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AA5816A4D0; Wed, 10 Dec 2003 13:16:58 -0800 (PST) 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 31FAD16A4CF for ; Wed, 10 Dec 2003 13:16:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C53DF43D2F for ; Wed, 10 Dec 2003 13:16:46 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBALGkXJ038394 for ; Wed, 10 Dec 2003 13:16:46 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBALGj14038391 for perforce@freebsd.org; Wed, 10 Dec 2003 13:16:45 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 10 Dec 2003 13:16:45 -0800 (PST) Message-Id: <200312102116.hBALGj14038391@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43756 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 Dec 2003 21:16:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=43756 Change 43756 by sam@sam_ebb on 2003/12/10 13:16:43 IFC @ 43755 Affected files ... .. //depot/projects/netperf/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/netperf/sys/amd64/include/pcvt_ioctl.h#1 branch .. //depot/projects/netperf/sys/boot/Makefile#3 integrate .. //depot/projects/netperf/sys/boot/efi/include/efiapi.h#2 integrate .. //depot/projects/netperf/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/netperf/sys/boot/ficl/loader.c#2 integrate .. //depot/projects/netperf/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/netperf/sys/boot/i386/boot0/boot0.s#3 integrate .. //depot/projects/netperf/sys/boot/i386/boot0/boot0sio.s#2 integrate .. //depot/projects/netperf/sys/boot/ia64/libski/acpi_stub.c#3 integrate .. //depot/projects/netperf/sys/boot/powerpc/loader/Makefile#3 integrate .. //depot/projects/netperf/sys/boot/powerpc/loader/conf.c#2 integrate .. //depot/projects/netperf/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/netperf/sys/conf/options.i386#8 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dbcmds.c#3 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dmresrc.c#3 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dsmthdat.c#3 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exfldio.c#4 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/osunixxf.c#3 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/rsaddr.c#3 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/rsirq.c#3 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/tbconvrt.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/tbget.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/utdelete.c#3 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/netperf/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi.c#14 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_cpu.c#8 integrate .. //depot/projects/netperf/sys/dev/acpica/madt.h#2 delete .. //depot/projects/netperf/sys/dev/ata/ata-pci.c#8 integrate .. //depot/projects/netperf/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/netperf/sys/dev/owi/if_owi.c#5 integrate .. //depot/projects/netperf/sys/dev/puc/pucdata.c#8 integrate .. //depot/projects/netperf/sys/dev/wi/if_wi.c#20 integrate .. //depot/projects/netperf/sys/dev/wi/if_wivar.h#4 integrate .. //depot/projects/netperf/sys/i386/acpica/madt.c#8 integrate .. //depot/projects/netperf/sys/i386/i386/mp_machdep.c#17 integrate .. //depot/projects/netperf/sys/i386/i386/mptable.c#8 integrate .. //depot/projects/netperf/sys/i386/include/pcvt_ioctl.h#2 integrate .. //depot/projects/netperf/sys/ia64/acpica/madt.c#4 integrate .. //depot/projects/netperf/sys/ia64/ia64/trap.c#10 integrate .. //depot/projects/netperf/sys/kern/kern_thread.c#9 integrate .. //depot/projects/netperf/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/netperf/sys/net/if_gre.c#5 integrate .. //depot/projects/netperf/sys/netinet6/ip6_mroute.c#7 integrate .. //depot/projects/netperf/sys/netkey/key.c#11 integrate .. //depot/projects/netperf/sys/pci/if_sis.c#19 edit .. //depot/projects/netperf/sys/powerpc/include/cpufunc.h#2 integrate .. //depot/projects/netperf/sys/powerpc/include/powerpc.h#2 integrate .. //depot/projects/netperf/sys/powerpc/powermac/ata_macio.c#3 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/pmap.c#6 integrate .. //depot/projects/netperf/sys/security/mac_test/mac_test.c#7 integrate .. //depot/projects/netperf/sys/sys/ioctl_bt848.h#2 delete .. //depot/projects/netperf/sys/sys/ioctl_meteor.h#3 delete Differences ... ==== //depot/projects/netperf/sys/amd64/acpica/madt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.9 2003/12/06 23:14:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.10 2003/12/09 03:04:19 njl Exp $"); #include #include @@ -50,7 +50,6 @@ #include "acpi.h" #include -#include #include #define NIOAPICS 32 /* Max number of I/O APICs */ @@ -70,7 +69,7 @@ u_int la_apic_id:8; } lapics[NLAPICS + 1]; -static APIC_TABLE *madt; +static MULTIPLE_APIC_TABLE *madt; static vm_paddr_t madt_physaddr; static vm_offset_t madt_length; @@ -83,10 +82,10 @@ static void *madt_map(vm_paddr_t pa, int offset, vm_offset_t length); static void *madt_map_table(vm_paddr_t pa, int offset, const char *sig); static void madt_parse_apics(APIC_HEADER *entry, void *arg); -static void madt_parse_interrupt_override(INTERRUPT_SOURCE_OVERRIDE *intr); +static void madt_parse_interrupt_override(MADT_INTERRUPT_OVERRIDE *intr); static void madt_parse_ints(APIC_HEADER *entry, void *arg __unused); -static void madt_parse_local_nmi(LAPIC_NMI *nmi); -static void madt_parse_nmi(NMI *nmi); +static void madt_parse_local_nmi(MADT_LOCAL_APIC_NMI *nmi); +static void madt_parse_nmi(MADT_NMI_SOURCE *nmi); static int madt_probe(void); static int madt_probe_cpus(void); static void madt_probe_cpus_handler(APIC_HEADER *entry, void *arg __unused); @@ -222,7 +221,7 @@ printf("MADT: Failed to map XSDT\n"); return (ENXIO); } - count = (xsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / + count = (xsdt->Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT64); for (i = 0; i < count; i++) if (madt_probe_table(xsdt->TableOffsetEntry[i])) @@ -235,7 +234,7 @@ printf("MADT: Failed to map RSDT\n"); return (ENXIO); } - count = (rsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / + count = (rsdt->Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT32); for (i = 0; i < count; i++) if (madt_probe_table(rsdt->TableOffsetEntry[i])) @@ -310,8 +309,8 @@ madt = pmap_mapdev(madt_physaddr, madt_length); lapic_init((uintptr_t)madt->LocalApicAddress); printf("ACPI APIC Table: <%.*s %.*s>\n", - (int)sizeof(madt->Header.OemId), madt->Header.OemId, - (int)sizeof(madt->Header.OemTableId), madt->Header.OemTableId); + (int)sizeof(madt->OemId), madt->OemId, + (int)sizeof(madt->OemTableId), madt->OemTableId); /* * We ignore 64-bit local APIC override entries. Should we @@ -363,7 +362,7 @@ APIC_HEADER *entry; u_char *p, *end; - end = (u_char *)(madt) + madt->Header.Length; + end = (u_char *)(madt) + madt->Length; for (p = (u_char *)(madt + 1); p < end; ) { entry = (APIC_HEADER *)p; handler(entry, arg); @@ -374,27 +373,27 @@ static void madt_probe_cpus_handler(APIC_HEADER *entry, void *arg) { - PROCESSOR_APIC *proc; + MADT_PROCESSOR_APIC *proc; struct lapic_info *la; switch (entry->Type) { - case APIC_PROC: + case APIC_PROCESSOR: /* * The MADT does not include a BSP flag, so we have to * let the MP code figure out which CPU is the BSP on * its own. */ - proc = (PROCESSOR_APIC *)entry; + proc = (MADT_PROCESSOR_APIC *)entry; if (bootverbose) printf("MADT: Found CPU APIC ID %d ACPI ID %d: %s\n", - proc->LocalApicId, proc->ProcessorApicId, + proc->LocalApicId, proc->ProcessorId, proc->ProcessorEnabled ? "enabled" : "disabled"); - if (proc->ProcessorApicId > NLAPICS) + if (proc->ProcessorId > NLAPICS) panic("%s: CPU ID %d too high", __func__, - proc->ProcessorApicId); - la = &lapics[proc->ProcessorApicId]; + proc->ProcessorId); + la = &lapics[proc->ProcessorId]; KASSERT(la->la_present == 0, - ("Duplicate local ACPI ID %d", proc->ProcessorApicId)); + ("Duplicate local ACPI ID %d", proc->ProcessorId)); la->la_present = 1; la->la_apic_id = proc->LocalApicId; if (proc->ProcessorEnabled) { @@ -412,16 +411,15 @@ static void madt_parse_apics(APIC_HEADER *entry, void *arg __unused) { - IO_APIC *apic; + MADT_IO_APIC *apic; - switch (entry->Type) { case APIC_IO: - apic = (IO_APIC *)entry; + apic = (MADT_IO_APIC *)entry; if (bootverbose) - printf("MADT: Found IO APIC ID %d, Vector %d at %p\n", - apic->IoApicId, apic->Vector, - (void *)(uintptr_t)apic->IoApicAddress); + printf("MADT: Found IO APIC ID %d, Interrupt %d at %p\n", + apic->IoApicId, apic->Interrupt, + (void *)(uintptr_t)apic->Address); if (apic->IoApicId >= NIOAPICS) panic("%s: I/O APIC ID %d too high", __func__, apic->IoApicId); @@ -429,9 +427,9 @@ panic("%s: Double APIC ID %d", __func__, apic->IoApicId); ioapics[apic->IoApicId].io_apic = ioapic_create( - (uintptr_t)apic->IoApicAddress, apic->IoApicId, - apic->Vector); - ioapics[apic->IoApicId].io_vector = apic->Vector; + (uintptr_t)apic->Address, apic->IoApicId, + apic->Interrupt); + ioapics[apic->IoApicId].io_vector = apic->Interrupt; break; default: break; @@ -448,10 +446,10 @@ { switch (Polarity) { - case APIC_POLARITY_CONFORM: - case APIC_POLARITY_ACTIVEHI: + case POLARITY_CONFORMS: + case POLARITY_ACTIVE_HIGH: return (1); - case APIC_POLARITY_ACTIVELO: + case POLARITY_ACTIVE_LOW: return (0); default: panic("Bogus Interrupt Polarity"); @@ -463,10 +461,10 @@ { switch (TriggerMode) { - case APIC_TRIGGER_CONFORM: - case APIC_TRIGGER_EDGE: + case TRIGGER_CONFORMS: + case TRIGGER_EDGE: return (1); - case APIC_TRIGGER_LEVEL: + case TRIGGER_LEVEL: return (0); default: panic("Bogus Interrupt Trigger Mode"); @@ -521,27 +519,26 @@ * Parse an interrupt source override for an ISA interrupt. */ static void -madt_parse_interrupt_override(INTERRUPT_SOURCE_OVERRIDE *intr) +madt_parse_interrupt_override(MADT_INTERRUPT_OVERRIDE *intr) { void *new_ioapic, *old_ioapic; u_int new_pin, old_pin; if (bootverbose) printf("MADT: intr override: source %u, irq %u\n", - intr->Source, intr->GlobalSystemInterrupt); + intr->Source, intr->Interrupt); KASSERT(intr->Bus == 0, ("bus for interrupt overrides must be zero")); - if (madt_find_interrupt(intr->GlobalSystemInterrupt, &new_ioapic, + if (madt_find_interrupt(intr->Interrupt, &new_ioapic, &new_pin) != 0) { printf("MADT: Could not find APIC for vector %d (IRQ %d)\n", - intr->GlobalSystemInterrupt, intr->Source); + intr->Interrupt, intr->Source); return; } - if (intr->Source != intr->GlobalSystemInterrupt) { + if (intr->Source != intr->Interrupt) { /* XXX: This assumes that the SCI uses IRQ 9. */ - if (intr->GlobalSystemInterrupt > 15 && intr->Source == 9) - acpi_OverrideInterruptLevel( - intr->GlobalSystemInterrupt); + if (intr->Interrupt > 15 && intr->Source == 9) + acpi_OverrideInterruptLevel(intr->Interrupt); else ioapic_remap_vector(new_ioapic, new_pin, intr->Source); if (madt_find_interrupt(intr->Source, &old_ioapic, @@ -562,23 +559,22 @@ * Parse an entry for an NMI routed to an IO APIC. */ static void -madt_parse_nmi(NMI *nmi) +madt_parse_nmi(MADT_NMI_SOURCE *nmi) { void *ioapic; u_int pin; - if (madt_find_interrupt(nmi->GlobalSystemInterrupt, - &ioapic, &pin) != 0) { + if (madt_find_interrupt(nmi->Interrupt, &ioapic, &pin) != 0) { printf("MADT: Could not find APIC for vector %d\n", - nmi->GlobalSystemInterrupt); + nmi->Interrupt); return; } ioapic_set_nmi(ioapic, pin); - if (nmi->TriggerMode != APIC_TRIGGER_CONFORM) + if (nmi->TriggerMode != TRIGGER_CONFORMS) ioapic_set_triggermode(ioapic, pin, interrupt_trigger(nmi->TriggerMode)); - if (nmi->Polarity != APIC_TRIGGER_CONFORM) + if (nmi->Polarity != TRIGGER_CONFORMS) ioapic_set_polarity(ioapic, pin, interrupt_polarity(nmi->Polarity)); } @@ -587,27 +583,27 @@ * Parse an entry for an NMI routed to a local APIC LVT pin. */ static void -madt_parse_local_nmi(LAPIC_NMI *nmi) +madt_parse_local_nmi(MADT_LOCAL_APIC_NMI *nmi) { u_int apic_id, pin; - if (nmi->ProcessorApicId == 0xff) + if (nmi->ProcessorId == 0xff) apic_id = APIC_ID_ALL; - else if (madt_find_cpu(nmi->ProcessorApicId, &apic_id) != 0) { + else if (madt_find_cpu(nmi->ProcessorId, &apic_id) != 0) { if (bootverbose) printf("MADT: Ignoring local NMI routed to ACPI CPU %u\n", - nmi->ProcessorApicId); + nmi->ProcessorId); return; } - if (nmi->LINTPin == 0) + if (nmi->Lint == 0) pin = LVT_LINT0; else pin = LVT_LINT1; lapic_set_lvt_mode(apic_id, pin, APIC_LVT_DM_NMI); - if (nmi->TriggerMode != APIC_TRIGGER_CONFORM) + if (nmi->TriggerMode != TRIGGER_CONFORMS) lapic_set_lvt_triggermode(apic_id, pin, interrupt_trigger(nmi->TriggerMode)); - if (nmi->Polarity != APIC_POLARITY_CONFORM) + if (nmi->Polarity != POLARITY_CONFORMS) lapic_set_lvt_polarity(apic_id, pin, interrupt_polarity(nmi->Polarity)); } @@ -620,15 +616,15 @@ { switch (entry->Type) { - case APIC_INTERRUPT_SOURCE_OVERRIDE: + case APIC_XRUPT_OVERRIDE: madt_parse_interrupt_override( - (INTERRUPT_SOURCE_OVERRIDE *)entry); + (MADT_INTERRUPT_OVERRIDE *)entry); break; case APIC_NMI: - madt_parse_nmi((NMI *)entry); + madt_parse_nmi((MADT_NMI_SOURCE *)entry); break; - case APIC_LOCAL_APIC_NMI: - madt_parse_local_nmi((LAPIC_NMI *)entry); + case APIC_LOCAL_NMI: + madt_parse_local_nmi((MADT_LOCAL_APIC_NMI *)entry); break; } } ==== //depot/projects/netperf/sys/boot/Makefile#3 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.18 2003/08/16 02:48:20 obrien Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.19 2003/12/10 09:18:42 grehan Exp $ .if ${MACHINE_ARCH} == "amd64" .MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true .endif -.if !defined(NOFORTH) && ${MACHINE_ARCH} != "powerpc" +.if !defined(NOFORTH) # Build the add-in FORTH interpreter SUBDIR+= ficl .endif ==== //depot/projects/netperf/sys/boot/efi/include/efiapi.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.5 2002/12/08 20:47:44 marcel Exp $ */ +/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.6 2003/12/10 19:08:09 jhb Exp $ */ #ifndef _EFI_API_H #define _EFI_API_H @@ -204,7 +204,7 @@ /* - * EFI platform varibles + * EFI platform variables */ #define EFI_GLOBAL_VARIABLE \ ==== //depot/projects/netperf/sys/boot/ficl/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.35 2003/06/30 19:08:49 ru Exp $ +# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.36 2003/12/10 09:10:54 grehan Exp $ # .if ${MACHINE_ARCH} == "amd64" .MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true @@ -17,6 +17,9 @@ .if ${MACHINE_ARCH} == "i386" CFLAGS+= -mpreferred-stack-boundary=2 .endif +.if ${MACHINE_ARCH} == "powerpc" +CFLAGS+= -msoft-float +.endif .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 .endif ==== //depot/projects/netperf/sys/boot/ficl/loader.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.9 2003/06/08 03:11:16 nyan Exp $ + * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.10 2003/12/10 09:09:38 grehan Exp $ */ /******************************************************************* @@ -662,14 +662,22 @@ ficlSetEnv(pSys, "arch-i386", FICL_TRUE); ficlSetEnv(pSys, "arch-alpha", FICL_FALSE); ficlSetEnv(pSys, "arch-ia64", FICL_FALSE); + ficlSetEnv(pSys, "arch-powerpc", FICL_FALSE); #elif defined(__alpha__) ficlSetEnv(pSys, "arch-i386", FICL_FALSE); ficlSetEnv(pSys, "arch-alpha", FICL_TRUE); ficlSetEnv(pSys, "arch-ia64", FICL_FALSE); + ficlSetEnv(pSys, "arch-powerpc", FICL_FALSE); #elif defined(__ia64__) ficlSetEnv(pSys, "arch-i386", FICL_FALSE); ficlSetEnv(pSys, "arch-alpha", FICL_FALSE); ficlSetEnv(pSys, "arch-ia64", FICL_TRUE); + ficlSetEnv(pSys, "arch-powerpc", FICL_FALSE); +#elif defined(__powerpc__) + ficlSetEnv(pSys, "arch-i386", FICL_FALSE); + ficlSetEnv(pSys, "arch-alpha", FICL_FALSE); + ficlSetEnv(pSys, "arch-ia64", FICL_FALSE); + ficlSetEnv(pSys, "arch-powerpc", FICL_TRUE); #endif return; ==== //depot/projects/netperf/sys/boot/i386/boot0/boot0.s#3 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.27 2003/11/20 20:28:18 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.28 2003/12/09 05:40:06 obrien Exp $ # A 512-byte boot manager. @@ -60,7 +60,7 @@ movw %ax,%ds # data movw %ax,%ss # Set up movw $LOAD,%sp # stack - + # # Copy this code to the address it was linked for # @@ -142,13 +142,13 @@ main.4: movb (%di),%cl # Partition addw %cx,%di # description callw putx # Display it -main.5: incw %dx # Next item +main.5: incw %dx # Next item addb $0x10,%bl # Next entry jnc main.3 # Till done # # Passed a 256 byte boundary.. # table is finished. -# Add one to the drive number and check it is valid, +# Add one to the drive number and check it is valid, # popw %ax # Drive number subb $0x80-0x1,%al # Does next @@ -176,7 +176,7 @@ callw putx # item # # Now that we've printed the drive (if we needed to), display a prompt. -# Get ready for the input byt noting the time. +# Get ready for the input byte noting the time. # main.7: movw $prompt,%si # Display callw putstr # prompt @@ -187,7 +187,7 @@ int $0x1a # system time movw %dx,%di # Ticks when addw _TICKS(%bp),%di # timeout -# +# # Busy loop, looking for keystrokes but # keeping one eye on the time. # @@ -206,7 +206,7 @@ # # User's last try was bad, beep in displeasure. # Since nothing was printed, just continue on as if the user -# hadn't done anything. This gives the effect of the user getting a beep +# hadn't done anything. This gives the effect of the user getting a beep # for all bad keystrokes but no action until either the timeout # occurs or the user hits a good key. # @@ -250,7 +250,7 @@ movw $FAKE,%si # Partition for write movb (%si),%dl # Drive number movw %si,%bx # Partition for read - cmpb $0x4,%al # F5 pressed? + cmpb $0x4,%al # F5/#5 pressed? pushf # Save je main.13 # Yes shlb $0x4,%al # Point to @@ -272,10 +272,10 @@ # If going to next drive, replace drive with selected one. # Remember to un-ascii it. Hey 0x80 is already set, cool! # - jne main.15 # If not F5 + jne main.15 # If not F5/#5 movb _NXTDRV(%bp),%dl # Next drive subb $'0',%dl # number -# +# # load selected bootsector to the LOAD location in RAM. # If it fails to read or isn't marked bootable, treat it # as a bad selection. @@ -387,7 +387,7 @@ .byte os_bsd-. # OpenBSD .byte os_bsd-. # NetBSD # -# And here are the strings themselves. 0x80 or'd into a byte indicates +# And here are the strings themselves. 0x80 or'd into a byte indicates # the end of the string. (not so great for Russians but...) # os_misc: .ascii "?"; .byte '?'|0x80 @@ -402,7 +402,7 @@ # # These values are sometimes changed before writing back to the drive -# Be especially careful that nxtdrv: must come after drive:, as it +# Be especially careful that nxtdrv: must come after drive:, as it # is part of the same string. # drive: .ascii "Drive " ==== //depot/projects/netperf/sys/boot/i386/boot0/boot0sio.s#2 (text+ko) ==== @@ -14,9 +14,9 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0sio.s,v 1.1 2003/12/08 17:51:39 bms Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0sio.s,v 1.2 2003/12/09 05:40:06 obrien Exp $ -# A 512-byte boot manager which uses a 9600 baud serial console on COM1. +# A 512-byte boot manager which uses a serial console on COM1. .set NHRDRV,0x475 # Number of hard drives .set ORIGIN,0x600 # Execution address @@ -26,13 +26,14 @@ .set PRT_OFF,0x1be # Partition table .set TBL0SZ,0x3 # Table 0 size - .set TBL1SZ,0xc # Table 1 size + .set TBL1SZ,0xb # Table 1 size .set MAGIC,0xaa55 # Magic: bootable .set B0MAGIC,0xbb66 # Identification .set KEY_ENTER,0x1c # Enter key scan code .set KEY_F1,0x3b # F1 key scan code + .set KEY_1,0x02 # #1 key scan code .set ASCII_BEL,0x07 # ASCII code for .set ASCII_CR,0x0D # ASCII code for @@ -64,7 +65,7 @@ movw %ax,%ds # data movw %ax,%ss # Set up movw $LOAD,%sp # stack - + # # Copy this code to the address it was linked for # @@ -95,6 +96,7 @@ main: pushw %dx # Save xorw %dx,%dx # Port: COM1 movb $0xE3,%al # 9600 8-N-1 + movb $0x00,%ah # BIOS: Set COM Port int $0x14 # Parameters popw %dx # Restore @@ -157,13 +159,13 @@ main.4: movb (%di),%cl # Partition addw %cx,%di # description callw putx # Display it -main.5: incw %dx # Next item +main.5: incw %dx # Next item addb $0x10,%bl # Next entry jnc main.3 # Till done # # Passed a 256 byte boundary.. # table is finished. -# Add one to the drive number and check it is valid, +# Add one to the drive number and check it is valid, # popw %ax # Drive number subb $0x80-0x1,%al # Does next @@ -191,13 +193,13 @@ callw putx # item # # Now that we've printed the drive (if we needed to), display a prompt. +# Get ready for the input byte noting the time. # main.7: movw $prompt,%si # Display callw putstr # prompt movb _OPT(%bp),%dl # Display decw %si # default callw putkey # key - main.7_1: xorb %ah,%ah # BIOS: Get int $0x1a # system time @@ -205,7 +207,8 @@ addw _TICKS(%bp),%si # timeout # -# Check for a character on the serial port. +# Busy loop, checking for a character on the serial port, but +# keeping one eye on the time. # main.8: xorw %dx,%dx # Use COM1 @@ -227,7 +230,7 @@ # # User's last try was bad, beep in displeasure. # Since nothing was printed, just continue on as if the user -# hadn't done anything. This gives the effect of the user getting a beep +# hadn't done anything. This gives the effect of the user getting a beep # for all bad keystrokes but no action until either the timeout # occurs or the user hits a good key. # @@ -236,11 +239,12 @@ jmp main.7_1 # Go back # # Check the character we just got on the serial port. -# If it's CR act as if timed out. # main.11: movb $0x02,%ah # BIOS: Receive int $0x14 # COM Byte - +# +# If it's CR act as if timed out. +# cmpb $ASCII_CR,%al # Enter pressed? je main.9 # Yes # @@ -248,7 +252,7 @@ # If not ask again. # subb $ASCII_1,%al # Less '1' ascii character - cmpb $0x4,%al # 1..5? + cmpb $0x4,%al # #1..#5? ja main.10 # No # # We have a selection. @@ -267,7 +271,7 @@ movw $FAKE,%si # Partition for write movb (%si),%dl # Drive number movw %si,%bx # Partition for read - cmpb $0x4,%al # 5 pressed? + cmpb $0x4,%al # F5/#5 pressed? pushf # Save je main.13 # Yes shlb $0x4,%al # Point to @@ -289,10 +293,10 @@ # If going to next drive, replace drive with selected one. # Remember to un-ascii it. Hey 0x80 is already set, cool! # - jne main.15 # If not 5 + jne main.15 # If not F5/#5 movb _NXTDRV(%bp),%dl # Next drive - subb $'0',%dl # number XXX char val? -# + subb $'0',%dl # number +# # load selected bootsector to the LOAD location in RAM. # If it fails to read or isn't marked bootable, treat it # as a bad selection. @@ -371,7 +375,7 @@ # Menu strings item: .ascii " "; .byte ' '|0x80 -prompt: .ascii "\nDef:"; .byte ' '|0x80 +prompt: .ascii "\nDef:"; .byte ' '|0x80 crlf: .ascii "\r"; .byte '\n'|0x80 # Partition type tables @@ -384,7 +388,7 @@ # # These values indicate bootable types we know the names of # - .byte 0x1, 0x4, 0x6, 0xb, 0xc, 0xe, 0x63, 0x83 + .byte 0x1, 0x4, 0x6, 0xb, 0xc, 0xe, 0x83 .byte 0x9f, 0xa5, 0xa6, 0xa9 # # These are offsets that match the known names above and point to the strings @@ -397,21 +401,19 @@ .byte os_dos-. # Windows .byte os_dos-. # Windows .byte os_dos-. # Windows - .byte os_unix-. # UNIX .byte os_linux-. # Linux .byte os_bsd-. # BSD/OS .byte os_freebsd-. # FreeBSD .byte os_bsd-. # OpenBSD .byte os_bsd-. # NetBSD # -# And here are the strings themselves. 0x80 or'd into a byte indicates +# And here are the strings themselves. 0x80 or'd into a byte indicates # the end of the string. (not so great for Russians but...) # os_misc: .ascii "?"; .byte '?'|0x80 os_dos: .ascii "DO"; .byte 'S'|0x80 -os_unix: .ascii "UNI"; .byte 'X'|0x80 -os_linux: .ascii "Lnu"; .byte 'x'|0x80 -os_freebsd: .ascii "F" +os_linux: .ascii "Linu"; .byte 'x'|0x80 +os_freebsd: .ascii "Free" os_bsd: .ascii "BS"; .byte 'D'|0x80 .org PRT_OFF-0xe,0x90 @@ -420,7 +422,7 @@ # # These values are sometimes changed before writing back to the drive -# Be especially careful that nxtdrv: must come after drive:, as it +# Be especially careful that nxtdrv: must come after drive:, as it # is part of the same string. # drive: .ascii "Drive " ==== //depot/projects/netperf/sys/boot/ia64/libski/acpi_stub.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/acpi_stub.c,v 1.2 2003/09/08 09:11:32 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/acpi_stub.c,v 1.3 2003/12/09 08:35:17 marcel Exp $"); #include @@ -58,34 +58,30 @@ */ struct { - APIC_TABLE Header; - LOCAL_SAPIC cpu0; - LOCAL_SAPIC cpu1; - LOCAL_SAPIC cpu2; - LOCAL_SAPIC cpu3; - IO_SAPIC sapic; + MULTIPLE_APIC_TABLE Header; + MADT_LOCAL_SAPIC cpu0; + MADT_LOCAL_SAPIC cpu1; + MADT_LOCAL_SAPIC cpu2; + MADT_LOCAL_SAPIC cpu3; + MADT_IO_SAPIC sapic; } apic = { /* Header. */ { - { - APIC_SIG, /* Signature. */ - sizeof(apic), /* Length of table. */ - 0, /* ACPI minor revision. */ - 0, /* XXX checksum. */ - "FBSD", /* OEM Id. */ - "SKI", /* OEM table Id. */ - 0, /* OEM revision. */ - "FBSD", /* ASL compiler Id. */ - 0 /* ASL revision. */ - }, + APIC_SIG, /* Signature. */ + sizeof(apic), /* Length of table. */ + 0, /* ACPI minor revision. */ + 0, /* XXX checksum. */ + "FBSD", /* OEM Id. */ + "SKI", /* OEM table Id. */ + 0, /* OEM revision. */ + "FBSD", /* ASL compiler Id. */ + 0, /* ASL revision. */ 0xfee00000, }, /* cpu0. */ { - { - APIC_LOCAL_SAPIC, /* Type. */ - sizeof(apic.cpu0) /* Length. */ - }, + APIC_LOCAL_SAPIC, /* Type. */ + sizeof(apic.cpu0), /* Length. */ 0, /* ACPI processor id */ 0, /* Processor local SAPIC id */ 0, /* Processor local SAPIC eid */ @@ -94,10 +90,8 @@ }, /* cpu1. */ { - { - APIC_LOCAL_SAPIC, /* Type. */ - sizeof(apic.cpu1) /* Length. */ - }, + APIC_LOCAL_SAPIC, /* Type. */ + sizeof(apic.cpu1), /* Length. */ 1, /* ACPI processor id */ 0, /* Processor local SAPIC id */ 1, /* Processor local SAPIC eid */ @@ -106,10 +100,8 @@ }, /* cpu2. */ { - { - APIC_LOCAL_SAPIC, /* Type. */ - sizeof(apic.cpu2) /* Length. */ - }, + APIC_LOCAL_SAPIC, /* Type. */ + sizeof(apic.cpu2), /* Length. */ 2, /* ACPI processor id */ 1, /* Processor local SAPIC id */ 0, /* Processor local SAPIC eid */ @@ -118,10 +110,8 @@ }, /* cpu3. */ { - { - APIC_LOCAL_SAPIC, /* Type. */ - sizeof(apic.cpu3) /* Length. */ - }, + APIC_LOCAL_SAPIC, /* Type. */ + sizeof(apic.cpu3), /* Length. */ 3, /* ACPI processor id */ 1, /* Processor local SAPIC id */ 1, /* Processor local SAPIC eid */ @@ -130,10 +120,8 @@ }, /* sapic. */ { - { - APIC_IO_SAPIC, /* Type. */ - sizeof(apic.sapic) /* Length. */ - }, + APIC_IO_SAPIC, /* Type. */ + sizeof(apic.sapic), /* Length. */ 4, /* IO SAPIC id. */ 0, 16, /* Interrupt base. */ ==== //depot/projects/netperf/sys/boot/powerpc/loader/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.11 2003/08/16 02:48:20 obrien Exp $ +# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.12 2003/12/10 09:16:22 grehan Exp $ BASE= loader PROG= ${BASE} @@ -8,38 +8,57 @@ BINDIR?= /boot INSTALLFLAGS= -b +# architecture-specific loader code +SRCS= conf.c metadata.c vers.c start.c + LOADER_DISK_SUPPORT?= yes +LOADER_UFS_SUPPORT?= yes +LOADER_CD9660_SUPPORT?= yes +LOADER_EXT2FS_SUPPORT?= no LOADER_NET_SUPPORT?= yes - -CFLAGS+= -ffreestanding -# load address -RELOC?= 0x6c0000 -CFLAGS+= -DRELOC=${RELOC} - -# architecture-specific loader code -SRCS= conf.c metadata.c +LOADER_NFS_SUPPORT?= yes +LOADER_TFTP_SUPPORT?= yes +LOADER_GZIP_SUPPORT?= yes +LOADER_BZIP2_SUPPORT?= no -# Pull in common loader code -.PATH: ${.CURDIR}/../../ofw/common -.include <${.CURDIR}/../../ofw/common/Makefile.inc> - .if defined(LOADER_DISK_SUPPORT) CFLAGS+= -DLOADER_DISK_SUPPORT >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 10 13:17:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C246716A4D0; Wed, 10 Dec 2003 13:17:56 -0800 (PST) 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 8344B16A4CE for ; Wed, 10 Dec 2003 13:17:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F07B43D29 for ; Wed, 10 Dec 2003 13:17:49 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBALHnXJ038430 for ; Wed, 10 Dec 2003 13:17:49 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBALHm4J038427 for perforce@freebsd.org; Wed, 10 Dec 2003 13:17:48 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 10 Dec 2003 13:17:48 -0800 (PST) Message-Id: <200312102117.hBALHm4J038427@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 43758 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 Dec 2003 21:17:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=43758 Change 43758 by peter@peter_daintree on 2003/12/10 13:17:34 Checkpoint WIP addition of hardware debug register support. Notable todo: 1) make it compile 2) deal with the 16 vs 8 debug registers 3) finish the cpu switch code Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#15 edit .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#13 edit .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#29 edit .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#76 edit .. //depot/projects/hammer/sys/amd64/amd64/trap.c#36 edit .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#24 edit .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#17 edit .. //depot/projects/hammer/sys/amd64/include/pcb.h#14 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#15 (text+ko) ==== @@ -130,6 +130,27 @@ movl %fs,PCB_FS(%r8) movl %gs,PCB_GS(%r8) +#if 0 + /* Test if debug registers should be saved. */ + testl $PCB_DBREGS,PCB_FLAGS(%edx) + jz 1f /* no, skip over */ + movl %dr7,%eax /* yes, do the save */ + movl %eax,PCB_DR7(%edx) + andl $0x0000fc00, %eax /* disable all watchpoints */ + movl %eax,%dr7 + movl %dr6,%eax + movl %eax,PCB_DR6(%edx) + movl %dr3,%eax + movl %eax,PCB_DR3(%edx) + movl %dr2,%eax + movl %eax,PCB_DR2(%edx) + movl %dr1,%eax + movl %eax,PCB_DR1(%edx) + movl %dr0,%eax + movl %eax,PCB_DR0(%edx) +1: +#endif + /* have we used fp, and need a save? */ cmpq %rdi,PCPU(FPCURTHREAD) jne 1f @@ -223,6 +244,30 @@ movq %r8, PCPU(CURPCB) movq %rsi, PCPU(CURTHREAD) /* into next thread */ +#if 0 + /* + * Restore debug registers. The special code for dr7 is to + * preserve the current values of its reserved bits. + */ + movl PCB_DR6(%edx),%eax + movl %eax,%dr6 + movl PCB_DR3(%edx),%eax + movl %eax,%dr3 + movl PCB_DR2(%edx),%eax + movl %eax,%dr2 + movl PCB_DR1(%edx),%eax + movl %eax,%dr1 + movl PCB_DR0(%edx),%eax + movl %eax,%dr0 + movl %dr7,%eax + andl $0x0000fc00,%eax + movl PCB_DR7(%edx),%ecx + andl $~0x0000fc00,%ecx + orl %ecx,%eax + movl %eax,%dr7 +1: +#endif + ret #ifdef INVARIANTS ==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#13 (text+ko) ==== @@ -46,7 +46,6 @@ #include #include -#if 0 db_varfcn_t db_dr0; db_varfcn_t db_dr1; db_varfcn_t db_dr2; @@ -55,7 +54,6 @@ db_varfcn_t db_dr5; db_varfcn_t db_dr6; db_varfcn_t db_dr7; -#endif /* * Machine register set. @@ -87,7 +85,6 @@ { "r15", &ddb_regs.tf_r15, FCN_NULL }, { "rip", &ddb_regs.tf_rip, FCN_NULL }, { "rflags", &ddb_regs.tf_rflags, FCN_NULL }, -#if 0 { "dr0", NULL, db_dr0 }, { "dr1", NULL, db_dr1 }, { "dr2", NULL, db_dr2 }, @@ -96,7 +93,6 @@ { "dr5", NULL, db_dr5 }, { "dr6", NULL, db_dr6 }, { "dr7", NULL, db_dr7 }, -#endif }; struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); @@ -124,12 +120,10 @@ struct proc *p, struct amd64_frame *frame, db_addr_t callpc); -#if 0 static char * watchtype_str(int type); int amd64_set_watch(int watchnum, unsigned int watchaddr, int size, int access, struct dbreg * d); int amd64_clr_watch(int watchnum, struct dbreg * d); -#endif int db_md_set_watchpoint(db_expr_t addr, db_expr_t size); int db_md_clr_watchpoint(db_expr_t addr, db_expr_t size); void db_md_list_watchpoints(void); @@ -517,7 +511,6 @@ db_stack_trace_cmd(ebp, 1, -1, NULL); } -#if 0 #define DB_DRX_FUNC(reg) \ int \ db_ ## reg (vp, valuep, op) \ @@ -724,26 +717,3 @@ } db_printf("\n"); } - -#else -int -db_md_set_watchpoint(addr, size) - db_expr_t addr; - db_expr_t size; -{ - return (-1); -} - -int -db_md_clr_watchpoint(addr, size) - db_expr_t addr; - db_expr_t size; -{ - return (-1); -} - -void -db_md_list_watchpoints() -{ -} -#endif ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#29 (text+ko) ==== @@ -135,6 +135,13 @@ ASSYM(PCB_ES, offsetof(struct pcb, pcb_es)); ASSYM(PCB_FS, offsetof(struct pcb, pcb_fs)); ASSYM(PCB_GS, offsetof(struct pcb, pcb_gs)); +ASSYM(PCB_DR0, offsetof(struct pcb, pcb_dr0)); +ASSYM(PCB_DR1, offsetof(struct pcb, pcb_dr1)); +ASSYM(PCB_DR2, offsetof(struct pcb, pcb_dr2)); +ASSYM(PCB_DR3, offsetof(struct pcb, pcb_dr3)); +ASSYM(PCB_DR6, offsetof(struct pcb, pcb_dr6)); +ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7)); +ASSYM(PCB_DBREGS, PCB_DBREGS); ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags)); ASSYM(PCB_FULLCTX, PCB_FULLCTX); ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#76 (text+ko) ==== @@ -534,6 +534,28 @@ regs->tf_cs = _ucodesel; /* + * Reset the hardware debug registers if they were in use. + * They won't have any meaning for the newly exec'd process. + */ + if (pcb->pcb_flags & PCB_DBREGS) { + pcb->pcb_dr0 = 0; + pcb->pcb_dr1 = 0; + pcb->pcb_dr2 = 0; + pcb->pcb_dr3 = 0; + pcb->pcb_dr6 = 0; + pcb->pcb_dr7 = 0; + if (pcb == PCPU_GET(curpcb)) { + /* + * Clear the debug registers on the running + * CPU, otherwise they will end up affecting + * the next process we switch to. + */ + reset_dbregs(); + } + pcb->pcb_flags &= ~PCB_DBREGS; + } + + /* * Arrange to trap the next fpu or `fwait' instruction (see fpu.c * for why fwait must be trapped at least if there is an fpu or an * emulator). This is mainly to handle the case where npx0 is not @@ -1559,17 +1581,181 @@ int fill_dbregs(struct thread *td, struct dbreg *dbregs) { + struct pcb *pcb; + if (td == NULL) { + dbregs->dr[0] = rdr0(); + dbregs->dr[1] = rdr1(); + dbregs->dr[2] = rdr2(); + dbregs->dr[3] = rdr3(); + dbregs->dr[4] = rdr4(); + dbregs->dr[5] = rdr5(); + dbregs->dr[6] = rdr6(); + dbregs->dr[7] = rdr7(); + } else { + pcb = td->td_pcb; + dbregs->dr[0] = pcb->pcb_dr0; + dbregs->dr[1] = pcb->pcb_dr1; + dbregs->dr[2] = pcb->pcb_dr2; + dbregs->dr[3] = pcb->pcb_dr3; + dbregs->dr[4] = 0; + dbregs->dr[5] = 0; + dbregs->dr[6] = pcb->pcb_dr6; + dbregs->dr[7] = pcb->pcb_dr7; + } return (0); } int set_dbregs(struct thread *td, struct dbreg *dbregs) { + struct pcb *pcb; + int i; + u_int64_t mask1, mask2; + + if (td == NULL) { + load_dr0(dbregs->dr[0]); + load_dr1(dbregs->dr[1]); + load_dr2(dbregs->dr[2]); + load_dr3(dbregs->dr[3]); + load_dr4(dbregs->dr[4]); + load_dr5(dbregs->dr[5]); + load_dr6(dbregs->dr[6]); + load_dr7(dbregs->dr[7]); + } else { + /* + * Don't let an illegal value for dr7 get set. Specifically, + * check for undefined settings. Setting these bit patterns + * result in undefined behaviour and can lead to an unexpected + * TRCTRAP or a general protection fault right here. + */ + for (i = 0, mask1 = 0x3<<16, mask2 = 0x2<<16; i < 8; + i++, mask1 <<= 2, mask2 <<= 2) + if ((dbregs->dr[7] & mask1) == mask2) + return (EINVAL); + + pcb = td->td_pcb; + + /* + * Don't let a process set a breakpoint that is not within the + * process's address space. If a process could do this, it + * could halt the system by setting a breakpoint in the kernel + * (if ddb was enabled). Thus, we need to check to make sure + * that no breakpoints are being enabled for addresses outside + * process's address space, unless, perhaps, we were called by + * uid 0. + * + * XXX - what about when the watched area of the user's + * address space is written into from within the kernel + * ... wouldn't that still cause a breakpoint to be generated + * from within kernel mode? + */ + + if (suser(td) != 0) { + if (dbregs->dr[7] & 0x3) { + /* dr0 is enabled */ + if (dbregs->dr[0] >= VM_MAXUSER_ADDRESS) + return (EINVAL); + } + if (dbregs->dr[7] & 0x3<<2) { + /* dr1 is enabled */ + if (dbregs->dr[1] >= VM_MAXUSER_ADDRESS) + return (EINVAL); + } + if (dbregs->dr[7] & 0x3<<4) { + /* dr2 is enabled */ + if (dbregs->dr[2] >= VM_MAXUSER_ADDRESS) + return (EINVAL); + } + if (dbregs->dr[7] & 0x3<<6) { + /* dr3 is enabled */ + if (dbregs->dr[3] >= VM_MAXUSER_ADDRESS) + return (EINVAL); + } + } + + pcb->pcb_dr0 = dbregs->dr[0]; + pcb->pcb_dr1 = dbregs->dr[1]; + pcb->pcb_dr2 = dbregs->dr[2]; + pcb->pcb_dr3 = dbregs->dr[3]; + pcb->pcb_dr6 = dbregs->dr[6]; + pcb->pcb_dr7 = dbregs->dr[7]; + + pcb->pcb_flags |= PCB_DBREGS; + } return (0); } +/* + * Return > 0 if a hardware breakpoint has been hit, and the + * breakpoint was in user space. Return 0, otherwise. + */ +int +user_dbreg_trap(void) +{ + u_int64_t dr7, dr6; /* debug registers dr6 and dr7 */ + u_int64_t bp; /* breakpoint bits extracted from dr6 */ + int nbp; /* number of breakpoints that triggered */ + caddr_t addr[4]; /* breakpoint addresses */ + int i; + + dr7 = rdr7(); + if ((dr7 & 0x000000ff) == 0) { + /* + * all GE and LE bits in the dr7 register are zero, + * thus the trap couldn't have been caused by the + * hardware debug registers + */ + return 0; + } + + nbp = 0; + dr6 = rdr6(); + bp = dr6 & 0x0000000f; + + if (!bp) { + /* + * None of the breakpoint bits are set meaning this + * trap was not caused by any of the debug registers + */ + return 0; + } + + /* + * at least one of the breakpoints were hit, check to see + * which ones and if any of them are user space addresses + */ + + if (bp & 0x01) { + addr[nbp++] = (caddr_t)rdr0(); + } + if (bp & 0x02) { + addr[nbp++] = (caddr_t)rdr1(); + } + if (bp & 0x04) { + addr[nbp++] = (caddr_t)rdr2(); + } + if (bp & 0x08) { + addr[nbp++] = (caddr_t)rdr3(); + } + + for (i=0; ipcb_rip = (register_t)fork_trampoline; pcb2->pcb_rflags = td2->td_frame->tf_rflags & ~PSL_I; /* ints disabled */ /*- + * pcb2->pcb_dr*: cloned above. * pcb2->pcb_savefpu: cloned above. * pcb2->pcb_flags: cloned above. * pcb2->pcb_onfault: cloned above (always NULL here?). @@ -202,9 +203,12 @@ void cpu_exit(struct thread *td) { - struct mdproc *mdp; - mdp = &td->td_proc->p_md; + if (pcb->pcb_flags & PCB_DBREGS) { + /* disable all hardware breakpoints */ + reset_dbregs(); + pcb->pcb_flags &= ~PCB_DBREGS; + } } void @@ -213,6 +217,11 @@ if (td == PCPU_GET(fpcurthread)) fpudrop(); + if (pcb->pcb_flags & PCB_DBREGS) { + /* disable all hardware breakpoints */ + reset_dbregs(); + pcb->pcb_flags &= ~PCB_DBREGS; + } } void @@ -296,6 +305,7 @@ pcb2->pcb_rflags = PSL_KERNEL; /* ints disabled */ /* * If we didn't copy the pcb, we'd need to do the following registers: + * pcb2->pcb_dr*: cloned above. * pcb2->pcb_savefpu: cloned above. * pcb2->pcb_rflags: cloned above. * pcb2->pcb_onfault: cloned above (always NULL here?). ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#17 (text+ko) ==== @@ -584,6 +584,118 @@ __asm __volatile("ltr %0" : : "r" (sel)); } +static __inline u_int64_t +rdr0(void) +{ + u_int64_t data; + __asm __volatile("movq %%dr0,%0" : "=r" (data)); + return (data); +} + +static __inline void +load_dr0(u_int64_t dr0) +{ + __asm __volatile("movq %0,%%dr0" : : "r" (dr0)); +} + +static __inline u_int64_t +rdr1(void) +{ + u_int64_t data; + __asm __volatile("movq %%dr1,%0" : "=r" (data)); + return (data); +} + +static __inline void +load_dr1(u_int64_t dr1) +{ + __asm __volatile("movq %0,%%dr1" : : "r" (dr1)); +} + +static __inline u_int64_t +rdr2(void) +{ + u_int64_t data; + __asm __volatile("movq %%dr2,%0" : "=r" (data)); + return (data); +} + +static __inline void +load_dr2(u_int64_t dr2) +{ + __asm __volatile("movq %0,%%dr2" : : "r" (dr2)); +} + +static __inline u_int64_t +rdr3(void) +{ + u_int64_t data; + __asm __volatile("movq %%dr3,%0" : "=r" (data)); + return (data); +} + +static __inline void +load_dr3(u_int64_t dr3) +{ + __asm __volatile("movq %0,%%dr3" : : "r" (dr3)); +} + +static __inline u_int64_t +rdr4(void) +{ + u_int64_t data; + __asm __volatile("movq %%dr4,%0" : "=r" (data)); + return (data); +} + +static __inline void +load_dr4(u_int64_t dr4) +{ + __asm __volatile("movq %0,%%dr4" : : "r" (dr4)); +} + +static __inline u_int64_t +rdr5(void) +{ + u_int64_t data; + __asm __volatile("movq %%dr5,%0" : "=r" (data)); + return (data); +} + +static __inline void +load_dr5(u_int64_t dr5) +{ + __asm __volatile("movq %0,%%dr5" : : "r" (dr5)); +} + +static __inline u_int64_t +rdr6(void) +{ + u_int64_t data; + __asm __volatile("movq %%dr6,%0" : "=r" (data)); + return (data); +} + +static __inline void +load_dr6(u_int64_t dr6) +{ + __asm __volatile("movq %0,%%dr6" : : "r" (dr6)); +} + +static __inline u_int64_t +rdr7(void) +{ + u_int64_t data; + __asm __volatile("movq %%dr7,%0" : "=r" (data)); + return (data); +} + +static __inline void +load_dr7(u_int64_t dr7) +{ + __asm __volatile("movq %0,%%dr7" : : "r" (dr7)); +} + static __inline register_t intr_disable(void) { @@ -650,13 +762,28 @@ void wbinvd(void); void write_rflags(u_int rf); void wrmsr(u_int msr, u_int64_t newval); -void load_dr7(u_int dr7); +u_int64_t rdr0(void); +void load_dr0(u_int64_t dr0); +u_int64_t rdr1(void); +void load_dr1(u_int64_t dr1); +u_int64_t rdr2(void); +void load_dr2(u_int64_t dr2); +u_int64_t rdr3(void); +void load_dr3(u_int64_t dr3); +u_int64_t rdr4(void); +void load_dr4(u_int64_t dr4); +u_int64_t rdr5(void); +void load_dr5(u_int64_t dr5); +u_int64_t rdr6(void); +void load_dr6(u_int64_t dr6); +u_int64_t rdr7(void); +void load_dr7(u_int64_t dr7); register_t intr_disable(void); void intr_restore(register_t rf); #endif /* __GNUC__ */ -void reset_dbregs(void); +void reset_dbregs(void); __END_DECLS ==== //depot/projects/hammer/sys/amd64/include/pcb.h#14 (text+ko) ==== @@ -64,11 +64,18 @@ u_int32_t pcb_es; u_int32_t pcb_fs; u_int32_t pcb_gs; + u_int64_t pcb_dr0; + u_int64_t pcb_dr1; + u_int64_t pcb_dr2; + u_int64_t pcb_dr3; + u_int64_t pcb_dr6; + u_int64_t pcb_dr7; struct savefpu pcb_save; u_long pcb_flags; -#define PCB_FPUINITDONE 0x01 /* fpu state is initialized */ -#define PCB_FULLCTX 0x02 /* full context restore on sysret */ +#define PCB_DBREGS 0x02 /* process using debug registers */ +#define PCB_FPUINITDONE 0x08 /* fpu state is initialized */ +#define PCB_FULLCTX 0x80 /* full context restore on sysret */ caddr_t pcb_onfault; /* copyin/out fault recovery */ }; From owner-p4-projects@FreeBSD.ORG Wed Dec 10 13:32:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 819A716A4D0; Wed, 10 Dec 2003 13:32:17 -0800 (PST) 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 5B37316A4CE for ; Wed, 10 Dec 2003 13:32:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 357B043D09 for ; Wed, 10 Dec 2003 13:32:11 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBALWBXJ039138 for ; Wed, 10 Dec 2003 13:32:11 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBALWAhT039135 for perforce@freebsd.org; Wed, 10 Dec 2003 13:32:10 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 10 Dec 2003 13:32:10 -0800 (PST) Message-Id: <200312102132.hBALWAhT039135@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 43765 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 Dec 2003 21:32:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=43765 Change 43765 by peter@peter_daintree on 2003/12/10 13:31:49 dont do a NOP address space change, in case the TLB flush filter was disabled. Also, add a placeholder for the address space borrowing. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#16 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#16 (text+ko) ==== @@ -169,12 +169,19 @@ jz badsw3 /* no, panic */ #endif movq TD_PCB(%rsi),%r8 - movl PCPU(CPUID), %eax /* switch address space */ movq PCB_CR3(%r8),%rdx +#ifdef LAZY_SWITCH + cmpq %rdx,KPML4phys /* Kernel address space? */ + je sw1 +#endif + movq %cr3,%rax + cmpq %rdx,%rax /* Same address space? */ + je sw1 movq %rdx,%cr3 /* new address space */ + movl PCPU(CPUID), %eax /* Release bit from old pmap->pm_active */ movq TD_PROC(%rdi), %rdx /* oldproc */ movq P_VMSPACE(%rdx), %rdx From owner-p4-projects@FreeBSD.ORG Wed Dec 10 13:37:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2504D16A4D0; Wed, 10 Dec 2003 13:37:23 -0800 (PST) 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 F2DE716A4CE for ; Wed, 10 Dec 2003 13:37:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0266643D21 for ; Wed, 10 Dec 2003 13:37:20 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBALbJXJ039404 for ; Wed, 10 Dec 2003 13:37:19 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBALbJAA039401 for perforce@freebsd.org; Wed, 10 Dec 2003 13:37:19 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 10 Dec 2003 13:37:19 -0800 (PST) Message-Id: <200312102137.hBALbJAA039401@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 43768 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 Dec 2003 21:37:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=43768 Change 43768 by peter@peter_daintree on 2003/12/10 13:36:21 correct the placement of some comments. Affected files ... .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#4 edit Differences ... ==== //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#4 (text+ko) ==== @@ -1,36 +1,5 @@ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp $ -; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 -; from: src/sys/kern/syscalls.master 1.107 -; -; System call name/number master file. -; Processed to created init_sysent.c, syscalls.c and syscall.h. - -; Columns: number [M]type nargs namespc name alt{name,tag,rtyp}/comments -; number system call number, must be in order -; type one of [M]STD, [M]OBSOL, [M]UNIMPL, [M]COMPAT, [M]CPT_NOA, -; [M]LIBCOMPAT, [M]NODEF, [M]NOARGS, [M]NOPROTO, [M]NOIMPL, -; [M]NOSTD -; namespc one of POSIX, BSD, NOHIDE -; name psuedo-prototype of syscall routine -; If one of the following alts is different, then all appear: -; altname name of system call if different -; alttag name of args struct tag if different from [o]`name'"_args" -; altrtyp return type if not int (bogus - syscalls always return int) -; for UNIMPL/OBSOL, name continues with comments -; types: -; [M] e.g. like MSTD -- means the system call is MP-safe. If no -; M prefix is used, the syscall wrapper will obtain the Giant -; lock for the syscall. -; STD always included -; COMPAT included on COMPAT #ifdef -; LIBCOMPAT included on COMPAT #ifdef, and placed in syscall.h -; OBSOL obsolete, not included in system, only specifies name -; UNIMPL not implemented, placeholder only -; NOSTD implemented but as a lkm that can be statically -; compiled in sysent entry will be filled with lkmsys -; so the SYSCALL_MODULE macro works - ; #ifdef's, etc. may be included, and are copied to the output files. #include @@ -52,9 +21,6 @@ 3 MNOPROTO POSIX { ssize_t read(int fd, void *buf, size_t nbyte); } 4 MNOPROTO POSIX { ssize_t write(int fd, const void *buf, size_t nbyte); } 5 STD POSIX { int freebsd32_open(char *path, int flags, int mode); } -; XXX should be { int open(const char *path, int flags, ...); } -; but we're not ready for `const' or varargs. -; XXX man page says `mode_t mode'. 6 MNOPROTO POSIX { int close(int fd); } 7 MSTD BSD { int freebsd32_wait4(int pid, int *status, int options, \ struct rusage32 *rusage); } @@ -74,7 +40,6 @@ 20 MNOPROTO POSIX { pid_t getpid(void); } 21 NOPROTO BSD { int mount(char *type, char *path, int flags, \ caddr_t data); } -; XXX `path' should have type `const char *' but we're not ready for that. 22 NOPROTO BSD { int unmount(char *path, int flags); } 23 MNOPROTO POSIX { int setuid(uid_t uid); } 24 MNOPROTO POSIX { uid_t getuid(void); } @@ -83,6 +48,7 @@ int data); } ; XXX implement 27 UNIMPL BSD recvmsg +; XXX implement - this is wrong, the iovec isn't compatable 28 MNOPROTO BSD { int sendmsg(int s, caddr_t msg, int flags); } 29 MNOPROTO BSD { int recvfrom(int s, caddr_t buf, size_t len, \ int flags, caddr_t from, int *fromlenaddr); } @@ -160,12 +126,9 @@ 90 MNOPROTO POSIX { int dup2(u_int from, u_int to); } 91 UNIMPL BSD getdopt 92 MNOPROTO POSIX { int fcntl(int fd, int cmd, long arg); } -; XXX should be { int fcntl(int fd, int cmd, ...); } -; but we're not ready for varargs. -; XXX man page says `int arg' too. +; XXX need to override for big-endian - little-endian should work fine. 93 STD BSD { int freebsd32_select(int nd, fd_set *in, fd_set *ou, \ fd_set *ex, struct timeval32 *tv); } -; XXX need to override for big-endian - little-endian should work fine. 94 UNIMPL BSD setdopt 95 NOPROTO POSIX { int fsync(int fd); } 96 MNOPROTO BSD { int setpriority(int which, int who, int prio); } @@ -272,6 +235,7 @@ 171 STD BSD { int freebsd32_shmsys(int which, int a2, int a3, \ int a4); } 172 UNIMPL NOHIDE nosys +; XXX note - bigendian is different 173 STD POSIX { ssize_t freebsd32_pread(int fd, void *buf, \ size_t nbyte, int pad, u_int32_t offsetlo, \ u_int32_t offsethi); } @@ -279,7 +243,6 @@ 174 STD POSIX { ssize_t freebsd32_pwrite(int fd, const void *buf, \ size_t nbyte, int pad, u_int32_t offsetlo, \ u_int32_t offsethi); } -; XXX note - bigendian is different 175 UNIMPL NOHIDE nosys 176 MNOPROTO BSD { int ntp_adjtime(struct timex *tp); } 177 UNIMPL NOHIDE sfork (BSD/OS 2.x) From owner-p4-projects@FreeBSD.ORG Wed Dec 10 13:59:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0624916A4D0; Wed, 10 Dec 2003 13:59:51 -0800 (PST) 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 D5A2C16A4CE for ; Wed, 10 Dec 2003 13:59:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 259CE43D2B for ; Wed, 10 Dec 2003 13:59:49 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBALxmXJ040392 for ; Wed, 10 Dec 2003 13:59:48 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBALxmdA040389 for perforce@freebsd.org; Wed, 10 Dec 2003 13:59:48 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 10 Dec 2003 13:59:48 -0800 (PST) Message-Id: <200312102159.hBALxmdA040389@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 43771 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 Dec 2003 21:59:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=43771 Change 43771 by peter@peter_daintree on 2003/12/10 13:59:26 more updates. Affected files ... .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#5 edit Differences ... ==== //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#5 (text+ko) ==== @@ -46,10 +46,10 @@ 25 MNOPROTO POSIX { uid_t geteuid(void); } 26 MNOPROTO BSD { int ptrace(int req, pid_t pid, caddr_t addr, \ int data); } -; XXX implement -27 UNIMPL BSD recvmsg -; XXX implement - this is wrong, the iovec isn't compatable -28 MNOPROTO BSD { int sendmsg(int s, caddr_t msg, int flags); } +27 MSTD BSD { int freebsd32_recvmsg(int s, struct msghdr32 *msg, \ + int flags); } +28 MSTD BSD { int freebsd32_sendmsg(int s, struct msghdr32 *msg, \ + int flags); } 29 MNOPROTO BSD { int recvfrom(int s, caddr_t buf, size_t len, \ int flags, caddr_t from, int *fromlenaddr); } 30 MNOPROTO BSD { int accept(int s, caddr_t name, int *anamelen); } @@ -91,8 +91,7 @@ 62 OBSOL POSIX ofstat 63 OBSOL BSD ogetkerninfo 64 OBSOL BSD ogetpagesize -; XXX implement (not OBSOL at all) -65 OBSOL BSD omsync +65 MNOPROTO BSD { int msync(void *addr, size_t len, int flags); } 66 MNOPROTO BSD { int vfork(void); } 67 OBSOL NOHIDE vread 68 OBSOL NOHIDE vwrite @@ -116,8 +115,7 @@ struct itimerval32 *itv, \ struct itimerval32 *oitv); } 84 OBSOL BSD owait -; XXX implement -85 OBSOL BSD oswapon +85 MNOPROTO BSD { int swapon(char *name); } ; XXX implement 86 OBSOL BSD ogetitimer 87 OBSOL BSD ogethostname @@ -126,7 +124,6 @@ 90 MNOPROTO POSIX { int dup2(u_int from, u_int to); } 91 UNIMPL BSD getdopt 92 MNOPROTO POSIX { int fcntl(int fd, int cmd, long arg); } -; XXX need to override for big-endian - little-endian should work fine. 93 STD BSD { int freebsd32_select(int nd, fd_set *in, fd_set *ou, \ fd_set *ex, struct timeval32 *tv); } 94 UNIMPL BSD setdopt @@ -235,11 +232,9 @@ 171 STD BSD { int freebsd32_shmsys(int which, int a2, int a3, \ int a4); } 172 UNIMPL NOHIDE nosys -; XXX note - bigendian is different 173 STD POSIX { ssize_t freebsd32_pread(int fd, void *buf, \ size_t nbyte, int pad, u_int32_t offsetlo, \ u_int32_t offsethi); } -; XXX note - bigendian is different 174 STD POSIX { ssize_t freebsd32_pwrite(int fd, const void *buf, \ size_t nbyte, int pad, u_int32_t offsetlo, \ u_int32_t offsethi); } @@ -276,14 +271,11 @@ int prot, int flags, int fd, int pad, \ u_int32_t poslo, u_int32_t poshi); } 198 NOPROTO NOHIDE { int nosys(void); } __syscall __syscall_args int -; XXX note - bigendian is different 199 STD POSIX { off_t freebsd32_lseek(int fd, int pad, \ u_int32_t offsetlo, u_int32_t offsethi, \ int whence); } -; XXX note - bigendian is different 200 STD BSD { int freebsd32_truncate(char *path, int pad, \ u_int32_t lengthlo, u_int32_t lengthhi); } -; XXX note - bigendian is different 201 STD BSD { int freebsd32_ftruncate(int fd, int pad, \ u_int32_t lengthlo, u_int32_t lengthhi); } 202 MSTD BSD { int freebsd32_sysctl(int *name, u_int namelen, \ @@ -405,7 +397,6 @@ 294 UNIMPL NOHIDE nosys 295 UNIMPL NOHIDE nosys 296 UNIMPL NOHIDE nosys -; XXX 297 is 300 in NetBSD 297 NOPROTO BSD { int fhstatfs(const struct fhandle *u_fhp, struct statfs *buf); } 298 NOPROTO BSD { int fhopen(const struct fhandle *u_fhp, int flags); } 299 NOPROTO BSD { int fhstat(const struct fhandle *u_fhp, struct stat *sb); } @@ -449,7 +440,6 @@ 333 MNOPROTO POSIX { int sched_get_priority_min (int policy); } 334 MNOPROTO POSIX { int sched_rr_get_interval (pid_t pid, struct timespec *interval); } 335 MNOPROTO BSD { int utrace(const void *addr, size_t len); } -; XXX note - bigendian is different 336 MCOMPAT4 BSD { int freebsd32_sendfile(int fd, int s, \ u_int32_t offsetlo,u_int32_t offsethi, \ size_t nbytes, struct sf_hdtr *hdtr, \ @@ -545,10 +535,11 @@ size_t nbytes, struct sf_hdtr *hdtr, \ off_t *sbytes, int flags); } 394 UNIMPL NOHIDE mac_syscall -395 UNIMPL NOHIDE nosys -396 UNIMPL NOHIDE nosys -397 UNIMPL NOHIDE nosys -398 UNIMPL NOHIDE nosys +; XXX implement! +395 UNIMPL NOHIDE getfsstat +396 UNIMPL NOHIDE statfs +397 UNIMPL NOHIDE fstatfs +398 UNIMPL NOHIDE fhstatfs 399 UNIMPL NOHIDE nosys ; XXX implement these? 400 UNIMPL NOHIDE ksem_close @@ -596,4 +587,7 @@ 434 MNOPROTO BSD { int _umtx_lock(struct umtx *umtx); } 435 MNOPROTO BSD { int _umtx_unlock(struct umtx *umtx); } 436 MNOPROTO BSD { int jail_attach(int jid); } - +437 UNIMPL BSD extattr_list_fd +438 UNIMPL BSD extattr_list_file +439 UNIMPL BSD extattr_list_link +440 UNIMPL BSD kse_switchin From owner-p4-projects@FreeBSD.ORG Wed Dec 10 14:05:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D7B316A4EB; Wed, 10 Dec 2003 14:05:58 -0800 (PST) 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 3766516A4D3 for ; Wed, 10 Dec 2003 14:05:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B87443D1D for ; Wed, 10 Dec 2003 14:05:57 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBAM5vXJ041723 for ; Wed, 10 Dec 2003 14:05:57 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBAM5uuY041720 for perforce@freebsd.org; Wed, 10 Dec 2003 14:05:56 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 10 Dec 2003 14:05:56 -0800 (PST) Message-Id: <200312102205.hBAM5uuY041720@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 43772 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 Dec 2003 22:05:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=43772 Change 43772 by peter@peter_daintree on 2003/12/10 14:05:17 use the correct top-of-table marker or horrible things happen Affected files ... .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#6 edit Differences ... ==== //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#6 (text+ko) ==== @@ -66,6 +66,7 @@ #include #include +#include #include #include #include @@ -93,7 +94,7 @@ SYSCTL_NODE(_compat, OID_AUTO, ia32, CTLFLAG_RW, 0, "ia32 mode"); struct sysentvec ia32_freebsd_sysvec = { - SYS_MAXSYSCALL, + FREEBSD32_SYS_MAXSYSCALL, freebsd32_sysent, 0, 0, From owner-p4-projects@FreeBSD.ORG Wed Dec 10 14:15:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F35C916A58C; Wed, 10 Dec 2003 14:15:10 -0800 (PST) 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 B281016A58A for ; Wed, 10 Dec 2003 14:15:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB18D43D29 for ; Wed, 10 Dec 2003 14:15:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBAMF9XJ042253 for ; Wed, 10 Dec 2003 14:15:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBAMF9J2042250 for perforce@freebsd.org; Wed, 10 Dec 2003 14:15:09 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 10 Dec 2003 14:15:09 -0800 (PST) Message-Id: <200312102215.hBAMF9J2042250@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 43774 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 Dec 2003 22:15:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=43774 Change 43774 by peter@peter_daintree on 2003/12/10 14:14:18 implement getitimer Affected files ... .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#4 edit .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#6 edit Differences ... ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#4 (text+ko) ==== @@ -647,6 +647,34 @@ } int +freebsd32_getitimer(struct thread *td, struct freebsd32_getitimer_args *uap) +{ + int error; + caddr_t sg; + struct itimerval32 *p32, s32; + truct itimerval *p = NULL, s; + + p32 = uap->itv; + if (p32) { + sg = stackgap_init(); + p = stackgap_alloc(&sg, sizeof(struct itimerval)); + uap->itv = (struct itimerval32 *)p; + } + error = getitimer(td, (struct getitimer_args *) uap); + if (error) + return (error); + if (p32) { + error = copyin(op, &s, sizeof(s)); + if (error) + return (error); + TV_CP(s, s32, it_interval); + TV_CP(s, s32, it_value); + error = copyout(&s32, p32, sizeof(s32)); + } + return (error); +} + +int freebsd32_select(struct thread *td, struct freebsd32_select_args *uap) { int error; ==== //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#6 (text+ko) ==== @@ -116,8 +116,8 @@ struct itimerval32 *oitv); } 84 OBSOL BSD owait 85 MNOPROTO BSD { int swapon(char *name); } -; XXX implement -86 OBSOL BSD ogetitimer +86 MNOPROTO BSD { int freebsd32_getitimer(u_int which, \ + struct itimerval32 *itv); } 87 OBSOL BSD ogethostname 88 OBSOL BSD osethostname 89 MNOPROTO BSD { int getdtablesize(void); } From owner-p4-projects@FreeBSD.ORG Wed Dec 10 14:45:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C33016A4D0; Wed, 10 Dec 2003 14:45:58 -0800 (PST) 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 4839A16A4CE for ; Wed, 10 Dec 2003 14:45:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0446E43D21 for ; Wed, 10 Dec 2003 14:45:51 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBAMjoXJ043623 for ; Wed, 10 Dec 2003 14:45:50 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBAMjnQ7043620 for perforce@freebsd.org; Wed, 10 Dec 2003 14:45:49 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 10 Dec 2003 14:45:49 -0800 (PST) Message-Id: <200312102245.hBAMjnQ7043620@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43778 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 Dec 2003 22:45:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=43778 Change 43778 by sam@sam_ebb on 2003/12/10 14:44:54 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/include/pcvt_ioctl.h#1 branch .. //depot/projects/netperf+sockets/sys/boot/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/boot/efi/include/efiapi.h#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ficl/loader.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/netperf+sockets/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/netperf+sockets/sys/boot/i386/boot0/boot0.s#3 integrate .. //depot/projects/netperf+sockets/sys/boot/i386/boot0/boot0sio.s#2 integrate .. //depot/projects/netperf+sockets/sys/boot/ia64/libski/acpi_stub.c#2 integrate .. //depot/projects/netperf+sockets/sys/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/boot/powerpc/loader/conf.c#2 integrate .. //depot/projects/netperf+sockets/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/netperf+sockets/sys/conf/options.i386#3 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dmresrc.c#3 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dsmthdat.c#3 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exfldio.c#3 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/tbconvrt.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/tbget.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/utdelete.c#3 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/madt.h#2 delete .. //depot/projects/netperf+sockets/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/owi/if_owi.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/pcvt_ioctl.h#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/acpica/madt.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_thread.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/netperf+sockets/sys/net/if_gre.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/netperf+sockets/sys/netkey/key.c#3 integrate .. //depot/projects/netperf+sockets/sys/pci/if_sis.c#3 integrate .. //depot/projects/netperf+sockets/sys/powerpc/include/cpufunc.h#2 integrate .. //depot/projects/netperf+sockets/sys/powerpc/include/powerpc.h#2 integrate .. //depot/projects/netperf+sockets/sys/powerpc/powermac/ata_macio.c#2 integrate .. //depot/projects/netperf+sockets/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/netperf+sockets/sys/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/netperf+sockets/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/powerpc/powerpc/pmap.c#2 integrate .. //depot/projects/netperf+sockets/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/netperf+sockets/sys/sys/ioctl_bt848.h#2 delete .. //depot/projects/netperf+sockets/sys/sys/ioctl_meteor.h#3 delete Differences ... ==== //depot/projects/netperf+sockets/sys/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.9 2003/12/06 23:14:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.10 2003/12/09 03:04:19 njl Exp $"); #include #include @@ -50,7 +50,6 @@ #include "acpi.h" #include -#include #include #define NIOAPICS 32 /* Max number of I/O APICs */ @@ -70,7 +69,7 @@ u_int la_apic_id:8; } lapics[NLAPICS + 1]; -static APIC_TABLE *madt; +static MULTIPLE_APIC_TABLE *madt; static vm_paddr_t madt_physaddr; static vm_offset_t madt_length; @@ -83,10 +82,10 @@ static void *madt_map(vm_paddr_t pa, int offset, vm_offset_t length); static void *madt_map_table(vm_paddr_t pa, int offset, const char *sig); static void madt_parse_apics(APIC_HEADER *entry, void *arg); -static void madt_parse_interrupt_override(INTERRUPT_SOURCE_OVERRIDE *intr); +static void madt_parse_interrupt_override(MADT_INTERRUPT_OVERRIDE *intr); static void madt_parse_ints(APIC_HEADER *entry, void *arg __unused); -static void madt_parse_local_nmi(LAPIC_NMI *nmi); -static void madt_parse_nmi(NMI *nmi); +static void madt_parse_local_nmi(MADT_LOCAL_APIC_NMI *nmi); +static void madt_parse_nmi(MADT_NMI_SOURCE *nmi); static int madt_probe(void); static int madt_probe_cpus(void); static void madt_probe_cpus_handler(APIC_HEADER *entry, void *arg __unused); @@ -222,7 +221,7 @@ printf("MADT: Failed to map XSDT\n"); return (ENXIO); } - count = (xsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / + count = (xsdt->Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT64); for (i = 0; i < count; i++) if (madt_probe_table(xsdt->TableOffsetEntry[i])) @@ -235,7 +234,7 @@ printf("MADT: Failed to map RSDT\n"); return (ENXIO); } - count = (rsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / + count = (rsdt->Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT32); for (i = 0; i < count; i++) if (madt_probe_table(rsdt->TableOffsetEntry[i])) @@ -310,8 +309,8 @@ madt = pmap_mapdev(madt_physaddr, madt_length); lapic_init((uintptr_t)madt->LocalApicAddress); printf("ACPI APIC Table: <%.*s %.*s>\n", - (int)sizeof(madt->Header.OemId), madt->Header.OemId, - (int)sizeof(madt->Header.OemTableId), madt->Header.OemTableId); + (int)sizeof(madt->OemId), madt->OemId, + (int)sizeof(madt->OemTableId), madt->OemTableId); /* * We ignore 64-bit local APIC override entries. Should we @@ -363,7 +362,7 @@ APIC_HEADER *entry; u_char *p, *end; - end = (u_char *)(madt) + madt->Header.Length; + end = (u_char *)(madt) + madt->Length; for (p = (u_char *)(madt + 1); p < end; ) { entry = (APIC_HEADER *)p; handler(entry, arg); @@ -374,27 +373,27 @@ static void madt_probe_cpus_handler(APIC_HEADER *entry, void *arg) { - PROCESSOR_APIC *proc; + MADT_PROCESSOR_APIC *proc; struct lapic_info *la; switch (entry->Type) { - case APIC_PROC: + case APIC_PROCESSOR: /* * The MADT does not include a BSP flag, so we have to * let the MP code figure out which CPU is the BSP on * its own. */ - proc = (PROCESSOR_APIC *)entry; + proc = (MADT_PROCESSOR_APIC *)entry; if (bootverbose) printf("MADT: Found CPU APIC ID %d ACPI ID %d: %s\n", - proc->LocalApicId, proc->ProcessorApicId, + proc->LocalApicId, proc->ProcessorId, proc->ProcessorEnabled ? "enabled" : "disabled"); - if (proc->ProcessorApicId > NLAPICS) + if (proc->ProcessorId > NLAPICS) panic("%s: CPU ID %d too high", __func__, - proc->ProcessorApicId); - la = &lapics[proc->ProcessorApicId]; + proc->ProcessorId); + la = &lapics[proc->ProcessorId]; KASSERT(la->la_present == 0, - ("Duplicate local ACPI ID %d", proc->ProcessorApicId)); + ("Duplicate local ACPI ID %d", proc->ProcessorId)); la->la_present = 1; la->la_apic_id = proc->LocalApicId; if (proc->ProcessorEnabled) { @@ -412,16 +411,15 @@ static void madt_parse_apics(APIC_HEADER *entry, void *arg __unused) { - IO_APIC *apic; + MADT_IO_APIC *apic; - switch (entry->Type) { case APIC_IO: - apic = (IO_APIC *)entry; + apic = (MADT_IO_APIC *)entry; if (bootverbose) - printf("MADT: Found IO APIC ID %d, Vector %d at %p\n", - apic->IoApicId, apic->Vector, - (void *)(uintptr_t)apic->IoApicAddress); + printf("MADT: Found IO APIC ID %d, Interrupt %d at %p\n", + apic->IoApicId, apic->Interrupt, + (void *)(uintptr_t)apic->Address); if (apic->IoApicId >= NIOAPICS) panic("%s: I/O APIC ID %d too high", __func__, apic->IoApicId); @@ -429,9 +427,9 @@ panic("%s: Double APIC ID %d", __func__, apic->IoApicId); ioapics[apic->IoApicId].io_apic = ioapic_create( - (uintptr_t)apic->IoApicAddress, apic->IoApicId, - apic->Vector); - ioapics[apic->IoApicId].io_vector = apic->Vector; + (uintptr_t)apic->Address, apic->IoApicId, + apic->Interrupt); + ioapics[apic->IoApicId].io_vector = apic->Interrupt; break; default: break; @@ -448,10 +446,10 @@ { switch (Polarity) { - case APIC_POLARITY_CONFORM: - case APIC_POLARITY_ACTIVEHI: + case POLARITY_CONFORMS: + case POLARITY_ACTIVE_HIGH: return (1); - case APIC_POLARITY_ACTIVELO: + case POLARITY_ACTIVE_LOW: return (0); default: panic("Bogus Interrupt Polarity"); @@ -463,10 +461,10 @@ { switch (TriggerMode) { - case APIC_TRIGGER_CONFORM: - case APIC_TRIGGER_EDGE: + case TRIGGER_CONFORMS: + case TRIGGER_EDGE: return (1); - case APIC_TRIGGER_LEVEL: + case TRIGGER_LEVEL: return (0); default: panic("Bogus Interrupt Trigger Mode"); @@ -521,27 +519,26 @@ * Parse an interrupt source override for an ISA interrupt. */ static void -madt_parse_interrupt_override(INTERRUPT_SOURCE_OVERRIDE *intr) +madt_parse_interrupt_override(MADT_INTERRUPT_OVERRIDE *intr) { void *new_ioapic, *old_ioapic; u_int new_pin, old_pin; if (bootverbose) printf("MADT: intr override: source %u, irq %u\n", - intr->Source, intr->GlobalSystemInterrupt); + intr->Source, intr->Interrupt); KASSERT(intr->Bus == 0, ("bus for interrupt overrides must be zero")); - if (madt_find_interrupt(intr->GlobalSystemInterrupt, &new_ioapic, + if (madt_find_interrupt(intr->Interrupt, &new_ioapic, &new_pin) != 0) { printf("MADT: Could not find APIC for vector %d (IRQ %d)\n", - intr->GlobalSystemInterrupt, intr->Source); + intr->Interrupt, intr->Source); return; } - if (intr->Source != intr->GlobalSystemInterrupt) { + if (intr->Source != intr->Interrupt) { /* XXX: This assumes that the SCI uses IRQ 9. */ - if (intr->GlobalSystemInterrupt > 15 && intr->Source == 9) - acpi_OverrideInterruptLevel( - intr->GlobalSystemInterrupt); + if (intr->Interrupt > 15 && intr->Source == 9) + acpi_OverrideInterruptLevel(intr->Interrupt); else ioapic_remap_vector(new_ioapic, new_pin, intr->Source); if (madt_find_interrupt(intr->Source, &old_ioapic, @@ -562,23 +559,22 @@ * Parse an entry for an NMI routed to an IO APIC. */ static void -madt_parse_nmi(NMI *nmi) +madt_parse_nmi(MADT_NMI_SOURCE *nmi) { void *ioapic; u_int pin; - if (madt_find_interrupt(nmi->GlobalSystemInterrupt, - &ioapic, &pin) != 0) { + if (madt_find_interrupt(nmi->Interrupt, &ioapic, &pin) != 0) { printf("MADT: Could not find APIC for vector %d\n", - nmi->GlobalSystemInterrupt); + nmi->Interrupt); return; } ioapic_set_nmi(ioapic, pin); - if (nmi->TriggerMode != APIC_TRIGGER_CONFORM) + if (nmi->TriggerMode != TRIGGER_CONFORMS) ioapic_set_triggermode(ioapic, pin, interrupt_trigger(nmi->TriggerMode)); - if (nmi->Polarity != APIC_TRIGGER_CONFORM) + if (nmi->Polarity != TRIGGER_CONFORMS) ioapic_set_polarity(ioapic, pin, interrupt_polarity(nmi->Polarity)); } @@ -587,27 +583,27 @@ * Parse an entry for an NMI routed to a local APIC LVT pin. */ static void -madt_parse_local_nmi(LAPIC_NMI *nmi) +madt_parse_local_nmi(MADT_LOCAL_APIC_NMI *nmi) { u_int apic_id, pin; - if (nmi->ProcessorApicId == 0xff) + if (nmi->ProcessorId == 0xff) apic_id = APIC_ID_ALL; - else if (madt_find_cpu(nmi->ProcessorApicId, &apic_id) != 0) { + else if (madt_find_cpu(nmi->ProcessorId, &apic_id) != 0) { if (bootverbose) printf("MADT: Ignoring local NMI routed to ACPI CPU %u\n", - nmi->ProcessorApicId); + nmi->ProcessorId); return; } - if (nmi->LINTPin == 0) + if (nmi->Lint == 0) pin = LVT_LINT0; else pin = LVT_LINT1; lapic_set_lvt_mode(apic_id, pin, APIC_LVT_DM_NMI); - if (nmi->TriggerMode != APIC_TRIGGER_CONFORM) + if (nmi->TriggerMode != TRIGGER_CONFORMS) lapic_set_lvt_triggermode(apic_id, pin, interrupt_trigger(nmi->TriggerMode)); - if (nmi->Polarity != APIC_POLARITY_CONFORM) + if (nmi->Polarity != POLARITY_CONFORMS) lapic_set_lvt_polarity(apic_id, pin, interrupt_polarity(nmi->Polarity)); } @@ -620,15 +616,15 @@ { switch (entry->Type) { - case APIC_INTERRUPT_SOURCE_OVERRIDE: + case APIC_XRUPT_OVERRIDE: madt_parse_interrupt_override( - (INTERRUPT_SOURCE_OVERRIDE *)entry); + (MADT_INTERRUPT_OVERRIDE *)entry); break; case APIC_NMI: - madt_parse_nmi((NMI *)entry); + madt_parse_nmi((MADT_NMI_SOURCE *)entry); break; - case APIC_LOCAL_APIC_NMI: - madt_parse_local_nmi((LAPIC_NMI *)entry); + case APIC_LOCAL_NMI: + madt_parse_local_nmi((MADT_LOCAL_APIC_NMI *)entry); break; } } ==== //depot/projects/netperf+sockets/sys/boot/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.18 2003/08/16 02:48:20 obrien Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.19 2003/12/10 09:18:42 grehan Exp $ .if ${MACHINE_ARCH} == "amd64" .MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true .endif -.if !defined(NOFORTH) && ${MACHINE_ARCH} != "powerpc" +.if !defined(NOFORTH) # Build the add-in FORTH interpreter SUBDIR+= ficl .endif ==== //depot/projects/netperf+sockets/sys/boot/efi/include/efiapi.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.5 2002/12/08 20:47:44 marcel Exp $ */ +/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.6 2003/12/10 19:08:09 jhb Exp $ */ #ifndef _EFI_API_H #define _EFI_API_H @@ -204,7 +204,7 @@ /* - * EFI platform varibles + * EFI platform variables */ #define EFI_GLOBAL_VARIABLE \ ==== //depot/projects/netperf+sockets/sys/boot/ficl/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.35 2003/06/30 19:08:49 ru Exp $ +# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.36 2003/12/10 09:10:54 grehan Exp $ # .if ${MACHINE_ARCH} == "amd64" .MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true @@ -17,6 +17,9 @@ .if ${MACHINE_ARCH} == "i386" CFLAGS+= -mpreferred-stack-boundary=2 .endif +.if ${MACHINE_ARCH} == "powerpc" +CFLAGS+= -msoft-float +.endif .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 .endif ==== //depot/projects/netperf+sockets/sys/boot/ficl/loader.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.9 2003/06/08 03:11:16 nyan Exp $ + * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.10 2003/12/10 09:09:38 grehan Exp $ */ /******************************************************************* @@ -662,14 +662,22 @@ ficlSetEnv(pSys, "arch-i386", FICL_TRUE); ficlSetEnv(pSys, "arch-alpha", FICL_FALSE); ficlSetEnv(pSys, "arch-ia64", FICL_FALSE); + ficlSetEnv(pSys, "arch-powerpc", FICL_FALSE); #elif defined(__alpha__) ficlSetEnv(pSys, "arch-i386", FICL_FALSE); ficlSetEnv(pSys, "arch-alpha", FICL_TRUE); ficlSetEnv(pSys, "arch-ia64", FICL_FALSE); + ficlSetEnv(pSys, "arch-powerpc", FICL_FALSE); #elif defined(__ia64__) ficlSetEnv(pSys, "arch-i386", FICL_FALSE); ficlSetEnv(pSys, "arch-alpha", FICL_FALSE); ficlSetEnv(pSys, "arch-ia64", FICL_TRUE); + ficlSetEnv(pSys, "arch-powerpc", FICL_FALSE); +#elif defined(__powerpc__) + ficlSetEnv(pSys, "arch-i386", FICL_FALSE); + ficlSetEnv(pSys, "arch-alpha", FICL_FALSE); + ficlSetEnv(pSys, "arch-ia64", FICL_FALSE); + ficlSetEnv(pSys, "arch-powerpc", FICL_TRUE); #endif return; ==== //depot/projects/netperf+sockets/sys/boot/i386/boot0/boot0.s#3 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.27 2003/11/20 20:28:18 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.28 2003/12/09 05:40:06 obrien Exp $ # A 512-byte boot manager. @@ -60,7 +60,7 @@ movw %ax,%ds # data movw %ax,%ss # Set up movw $LOAD,%sp # stack - + # # Copy this code to the address it was linked for # @@ -142,13 +142,13 @@ main.4: movb (%di),%cl # Partition addw %cx,%di # description callw putx # Display it -main.5: incw %dx # Next item +main.5: incw %dx # Next item addb $0x10,%bl # Next entry jnc main.3 # Till done # # Passed a 256 byte boundary.. # table is finished. -# Add one to the drive number and check it is valid, +# Add one to the drive number and check it is valid, # popw %ax # Drive number subb $0x80-0x1,%al # Does next @@ -176,7 +176,7 @@ callw putx # item # # Now that we've printed the drive (if we needed to), display a prompt. -# Get ready for the input byt noting the time. +# Get ready for the input byte noting the time. # main.7: movw $prompt,%si # Display callw putstr # prompt @@ -187,7 +187,7 @@ int $0x1a # system time movw %dx,%di # Ticks when addw _TICKS(%bp),%di # timeout -# +# # Busy loop, looking for keystrokes but # keeping one eye on the time. # @@ -206,7 +206,7 @@ # # User's last try was bad, beep in displeasure. # Since nothing was printed, just continue on as if the user -# hadn't done anything. This gives the effect of the user getting a beep +# hadn't done anything. This gives the effect of the user getting a beep # for all bad keystrokes but no action until either the timeout # occurs or the user hits a good key. # @@ -250,7 +250,7 @@ movw $FAKE,%si # Partition for write movb (%si),%dl # Drive number movw %si,%bx # Partition for read - cmpb $0x4,%al # F5 pressed? + cmpb $0x4,%al # F5/#5 pressed? pushf # Save je main.13 # Yes shlb $0x4,%al # Point to @@ -272,10 +272,10 @@ # If going to next drive, replace drive with selected one. # Remember to un-ascii it. Hey 0x80 is already set, cool! # - jne main.15 # If not F5 + jne main.15 # If not F5/#5 movb _NXTDRV(%bp),%dl # Next drive subb $'0',%dl # number -# +# # load selected bootsector to the LOAD location in RAM. # If it fails to read or isn't marked bootable, treat it # as a bad selection. @@ -387,7 +387,7 @@ .byte os_bsd-. # OpenBSD .byte os_bsd-. # NetBSD # -# And here are the strings themselves. 0x80 or'd into a byte indicates +# And here are the strings themselves. 0x80 or'd into a byte indicates # the end of the string. (not so great for Russians but...) # os_misc: .ascii "?"; .byte '?'|0x80 @@ -402,7 +402,7 @@ # # These values are sometimes changed before writing back to the drive -# Be especially careful that nxtdrv: must come after drive:, as it +# Be especially careful that nxtdrv: must come after drive:, as it # is part of the same string. # drive: .ascii "Drive " ==== //depot/projects/netperf+sockets/sys/boot/i386/boot0/boot0sio.s#2 (text+ko) ==== @@ -14,9 +14,9 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0sio.s,v 1.1 2003/12/08 17:51:39 bms Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0sio.s,v 1.2 2003/12/09 05:40:06 obrien Exp $ -# A 512-byte boot manager which uses a 9600 baud serial console on COM1. +# A 512-byte boot manager which uses a serial console on COM1. .set NHRDRV,0x475 # Number of hard drives .set ORIGIN,0x600 # Execution address @@ -26,13 +26,14 @@ .set PRT_OFF,0x1be # Partition table .set TBL0SZ,0x3 # Table 0 size - .set TBL1SZ,0xc # Table 1 size + .set TBL1SZ,0xb # Table 1 size .set MAGIC,0xaa55 # Magic: bootable .set B0MAGIC,0xbb66 # Identification .set KEY_ENTER,0x1c # Enter key scan code .set KEY_F1,0x3b # F1 key scan code + .set KEY_1,0x02 # #1 key scan code .set ASCII_BEL,0x07 # ASCII code for .set ASCII_CR,0x0D # ASCII code for @@ -64,7 +65,7 @@ movw %ax,%ds # data movw %ax,%ss # Set up movw $LOAD,%sp # stack - + # # Copy this code to the address it was linked for # @@ -95,6 +96,7 @@ main: pushw %dx # Save xorw %dx,%dx # Port: COM1 movb $0xE3,%al # 9600 8-N-1 + movb $0x00,%ah # BIOS: Set COM Port int $0x14 # Parameters popw %dx # Restore @@ -157,13 +159,13 @@ main.4: movb (%di),%cl # Partition addw %cx,%di # description callw putx # Display it -main.5: incw %dx # Next item +main.5: incw %dx # Next item addb $0x10,%bl # Next entry jnc main.3 # Till done # # Passed a 256 byte boundary.. # table is finished. -# Add one to the drive number and check it is valid, +# Add one to the drive number and check it is valid, # popw %ax # Drive number subb $0x80-0x1,%al # Does next @@ -191,13 +193,13 @@ callw putx # item # # Now that we've printed the drive (if we needed to), display a prompt. +# Get ready for the input byte noting the time. # main.7: movw $prompt,%si # Display callw putstr # prompt movb _OPT(%bp),%dl # Display decw %si # default callw putkey # key - main.7_1: xorb %ah,%ah # BIOS: Get int $0x1a # system time @@ -205,7 +207,8 @@ addw _TICKS(%bp),%si # timeout # -# Check for a character on the serial port. +# Busy loop, checking for a character on the serial port, but +# keeping one eye on the time. # main.8: xorw %dx,%dx # Use COM1 @@ -227,7 +230,7 @@ # # User's last try was bad, beep in displeasure. # Since nothing was printed, just continue on as if the user -# hadn't done anything. This gives the effect of the user getting a beep +# hadn't done anything. This gives the effect of the user getting a beep # for all bad keystrokes but no action until either the timeout # occurs or the user hits a good key. # @@ -236,11 +239,12 @@ jmp main.7_1 # Go back # # Check the character we just got on the serial port. -# If it's CR act as if timed out. # main.11: movb $0x02,%ah # BIOS: Receive int $0x14 # COM Byte - +# +# If it's CR act as if timed out. +# cmpb $ASCII_CR,%al # Enter pressed? je main.9 # Yes # @@ -248,7 +252,7 @@ # If not ask again. # subb $ASCII_1,%al # Less '1' ascii character - cmpb $0x4,%al # 1..5? + cmpb $0x4,%al # #1..#5? ja main.10 # No # # We have a selection. @@ -267,7 +271,7 @@ movw $FAKE,%si # Partition for write movb (%si),%dl # Drive number movw %si,%bx # Partition for read - cmpb $0x4,%al # 5 pressed? + cmpb $0x4,%al # F5/#5 pressed? pushf # Save je main.13 # Yes shlb $0x4,%al # Point to @@ -289,10 +293,10 @@ # If going to next drive, replace drive with selected one. # Remember to un-ascii it. Hey 0x80 is already set, cool! # - jne main.15 # If not 5 + jne main.15 # If not F5/#5 movb _NXTDRV(%bp),%dl # Next drive - subb $'0',%dl # number XXX char val? -# + subb $'0',%dl # number +# # load selected bootsector to the LOAD location in RAM. # If it fails to read or isn't marked bootable, treat it # as a bad selection. @@ -371,7 +375,7 @@ # Menu strings item: .ascii " "; .byte ' '|0x80 -prompt: .ascii "\nDef:"; .byte ' '|0x80 +prompt: .ascii "\nDef:"; .byte ' '|0x80 crlf: .ascii "\r"; .byte '\n'|0x80 # Partition type tables @@ -384,7 +388,7 @@ # # These values indicate bootable types we know the names of # - .byte 0x1, 0x4, 0x6, 0xb, 0xc, 0xe, 0x63, 0x83 + .byte 0x1, 0x4, 0x6, 0xb, 0xc, 0xe, 0x83 .byte 0x9f, 0xa5, 0xa6, 0xa9 # # These are offsets that match the known names above and point to the strings @@ -397,21 +401,19 @@ .byte os_dos-. # Windows .byte os_dos-. # Windows .byte os_dos-. # Windows - .byte os_unix-. # UNIX .byte os_linux-. # Linux .byte os_bsd-. # BSD/OS .byte os_freebsd-. # FreeBSD .byte os_bsd-. # OpenBSD .byte os_bsd-. # NetBSD # -# And here are the strings themselves. 0x80 or'd into a byte indicates +# And here are the strings themselves. 0x80 or'd into a byte indicates # the end of the string. (not so great for Russians but...) # os_misc: .ascii "?"; .byte '?'|0x80 os_dos: .ascii "DO"; .byte 'S'|0x80 -os_unix: .ascii "UNI"; .byte 'X'|0x80 -os_linux: .ascii "Lnu"; .byte 'x'|0x80 -os_freebsd: .ascii "F" +os_linux: .ascii "Linu"; .byte 'x'|0x80 +os_freebsd: .ascii "Free" os_bsd: .ascii "BS"; .byte 'D'|0x80 .org PRT_OFF-0xe,0x90 @@ -420,7 +422,7 @@ # # These values are sometimes changed before writing back to the drive -# Be especially careful that nxtdrv: must come after drive:, as it +# Be especially careful that nxtdrv: must come after drive:, as it # is part of the same string. # drive: .ascii "Drive " ==== //depot/projects/netperf+sockets/sys/boot/ia64/libski/acpi_stub.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/acpi_stub.c,v 1.2 2003/09/08 09:11:32 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/acpi_stub.c,v 1.3 2003/12/09 08:35:17 marcel Exp $"); #include @@ -58,34 +58,30 @@ */ struct { - APIC_TABLE Header; - LOCAL_SAPIC cpu0; - LOCAL_SAPIC cpu1; - LOCAL_SAPIC cpu2; - LOCAL_SAPIC cpu3; - IO_SAPIC sapic; + MULTIPLE_APIC_TABLE Header; + MADT_LOCAL_SAPIC cpu0; + MADT_LOCAL_SAPIC cpu1; + MADT_LOCAL_SAPIC cpu2; + MADT_LOCAL_SAPIC cpu3; + MADT_IO_SAPIC sapic; } apic = { /* Header. */ { - { - APIC_SIG, /* Signature. */ - sizeof(apic), /* Length of table. */ - 0, /* ACPI minor revision. */ - 0, /* XXX checksum. */ - "FBSD", /* OEM Id. */ - "SKI", /* OEM table Id. */ - 0, /* OEM revision. */ - "FBSD", /* ASL compiler Id. */ - 0 /* ASL revision. */ - }, + APIC_SIG, /* Signature. */ + sizeof(apic), /* Length of table. */ + 0, /* ACPI minor revision. */ + 0, /* XXX checksum. */ + "FBSD", /* OEM Id. */ + "SKI", /* OEM table Id. */ + 0, /* OEM revision. */ + "FBSD", /* ASL compiler Id. */ + 0, /* ASL revision. */ 0xfee00000, }, /* cpu0. */ { - { - APIC_LOCAL_SAPIC, /* Type. */ - sizeof(apic.cpu0) /* Length. */ - }, + APIC_LOCAL_SAPIC, /* Type. */ + sizeof(apic.cpu0), /* Length. */ 0, /* ACPI processor id */ 0, /* Processor local SAPIC id */ 0, /* Processor local SAPIC eid */ @@ -94,10 +90,8 @@ }, /* cpu1. */ { - { - APIC_LOCAL_SAPIC, /* Type. */ - sizeof(apic.cpu1) /* Length. */ - }, + APIC_LOCAL_SAPIC, /* Type. */ + sizeof(apic.cpu1), /* Length. */ 1, /* ACPI processor id */ 0, /* Processor local SAPIC id */ 1, /* Processor local SAPIC eid */ @@ -106,10 +100,8 @@ }, /* cpu2. */ { - { - APIC_LOCAL_SAPIC, /* Type. */ - sizeof(apic.cpu2) /* Length. */ - }, + APIC_LOCAL_SAPIC, /* Type. */ + sizeof(apic.cpu2), /* Length. */ 2, /* ACPI processor id */ 1, /* Processor local SAPIC id */ 0, /* Processor local SAPIC eid */ @@ -118,10 +110,8 @@ }, /* cpu3. */ { - { - APIC_LOCAL_SAPIC, /* Type. */ - sizeof(apic.cpu3) /* Length. */ - }, + APIC_LOCAL_SAPIC, /* Type. */ + sizeof(apic.cpu3), /* Length. */ 3, /* ACPI processor id */ 1, /* Processor local SAPIC id */ 1, /* Processor local SAPIC eid */ @@ -130,10 +120,8 @@ }, /* sapic. */ { - { - APIC_IO_SAPIC, /* Type. */ - sizeof(apic.sapic) /* Length. */ - }, + APIC_IO_SAPIC, /* Type. */ + sizeof(apic.sapic), /* Length. */ 4, /* IO SAPIC id. */ 0, 16, /* Interrupt base. */ ==== //depot/projects/netperf+sockets/sys/boot/powerpc/loader/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.11 2003/08/16 02:48:20 obrien Exp $ +# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.12 2003/12/10 09:16:22 grehan Exp $ BASE= loader PROG= ${BASE} @@ -8,38 +8,57 @@ BINDIR?= /boot INSTALLFLAGS= -b +# architecture-specific loader code +SRCS= conf.c metadata.c vers.c start.c + LOADER_DISK_SUPPORT?= yes +LOADER_UFS_SUPPORT?= yes +LOADER_CD9660_SUPPORT?= yes +LOADER_EXT2FS_SUPPORT?= no LOADER_NET_SUPPORT?= yes - -CFLAGS+= -ffreestanding -# load address -RELOC?= 0x6c0000 -CFLAGS+= -DRELOC=${RELOC} - -# architecture-specific loader code -SRCS= conf.c metadata.c +LOADER_NFS_SUPPORT?= yes +LOADER_TFTP_SUPPORT?= yes +LOADER_GZIP_SUPPORT?= yes +LOADER_BZIP2_SUPPORT?= no -# Pull in common loader code -.PATH: ${.CURDIR}/../../ofw/common -.include <${.CURDIR}/../../ofw/common/Makefile.inc> - .if defined(LOADER_DISK_SUPPORT) CFLAGS+= -DLOADER_DISK_SUPPORT >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 10 16:38:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27ED016A4D0; Wed, 10 Dec 2003 16:38:11 -0800 (PST) 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 F077116A4CE for ; Wed, 10 Dec 2003 16:38:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B11043D21 for ; Wed, 10 Dec 2003 16:38:10 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBB0cAXJ049433 for ; Wed, 10 Dec 2003 16:38:10 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBB0c9LG049429 for perforce@freebsd.org; Wed, 10 Dec 2003 16:38:09 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 10 Dec 2003 16:38:09 -0800 (PST) Message-Id: <200312110038.hBB0c9LG049429@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 43784 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 Dec 2003 00:38:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=43784 Change 43784 by peter@peter_daintree on 2003/12/10 16:37:49 no, I will not build pcvt. Affected files ... .. //depot/projects/hammer/usr.sbin/Makefile#36 edit Differences ... ==== //depot/projects/hammer/usr.sbin/Makefile#36 (text+ko) ==== @@ -233,7 +233,6 @@ mount_nwfs \ mount_smbfs \ mptable \ - pcvt/ispcvt \ sicontrol \ spkrtest \ zzz From owner-p4-projects@FreeBSD.ORG Wed Dec 10 16:39:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 135B116A4D0; Wed, 10 Dec 2003 16:39:13 -0800 (PST) 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 E36A316A4CE for ; Wed, 10 Dec 2003 16:39:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19CC143D2F for ; Wed, 10 Dec 2003 16:39:12 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBB0dBXJ049473 for ; Wed, 10 Dec 2003 16:39:11 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBB0dBgV049470 for perforce@freebsd.org; Wed, 10 Dec 2003 16:39:11 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 10 Dec 2003 16:39:11 -0800 (PST) Message-Id: <200312110039.hBB0dBgV049470@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 43785 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 Dec 2003 00:39:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=43785 Change 43785 by peter@peter_daintree on 2003/12/10 16:38:20 No thank you. Affected files ... .. //depot/projects/hammer/sys/amd64/include/pcvt_ioctl.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Dec 10 18:44:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0BF316A4D0; Wed, 10 Dec 2003 18:44:30 -0800 (PST) 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 79B1416A4CE for ; Wed, 10 Dec 2003 18:44:30 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC0B243D2A for ; Wed, 10 Dec 2003 18:42:46 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBB2gkXJ061530 for ; Wed, 10 Dec 2003 18:42:46 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBB2gksU061527 for perforce@freebsd.org; Wed, 10 Dec 2003 18:42:46 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 10 Dec 2003 18:42:46 -0800 (PST) Message-Id: <200312110242.hBB2gksU061527@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 43791 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 Dec 2003 02:44:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=43791 Change 43791 by peter@peter_daintree on 2003/12/10 18:42:26 IFC @43790 Affected files ... .. //depot/projects/hammer/sys/amd64/ia32/ia32_sigtramp.S#5 branch .. //depot/projects/hammer/sys/boot/efi/include/efiapi.h#3 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sigtramp.S#2 delete .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#7 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_util.h#3 integrate .. //depot/projects/hammer/sys/conf/files.amd64#36 integrate .. //depot/projects/hammer/sys/conf/files.ia64#14 integrate .. //depot/projects/hammer/sys/conf/options.i386#20 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#25 integrate .. //depot/projects/hammer/sys/i386/i386/mptable.c#8 integrate .. //depot/projects/hammer/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/hammer/sys/ia64/ia32/Makefile#2 delete .. //depot/projects/hammer/sys/ia64/ia32/ia32.h#2 delete .. //depot/projects/hammer/sys/ia64/ia32/ia32_misc.c#5 delete .. //depot/projects/hammer/sys/ia64/ia32/ia32_proto.h#9 delete .. //depot/projects/hammer/sys/ia64/ia32/ia32_signal.c#1 branch .. //depot/projects/hammer/sys/ia64/ia32/ia32_sigtramp.c#1 branch .. //depot/projects/hammer/sys/ia64/ia32/ia32_syscall.h#9 delete .. //depot/projects/hammer/sys/ia64/ia32/ia32_sysent.c#10 delete .. //depot/projects/hammer/sys/ia64/ia32/ia32_sysvec.c#6 delete .. //depot/projects/hammer/sys/ia64/ia32/ia32_util.h#4 delete .. //depot/projects/hammer/sys/ia64/ia32/syscalls.conf#2 delete .. //depot/projects/hammer/sys/ia64/ia32/syscalls.master#14 delete .. //depot/projects/hammer/sys/ia64/include/cpufunc.h#6 integrate .. //depot/projects/hammer/sys/ia64/include/runq.h#2 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#22 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#22 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#22 integrate .. //depot/projects/hammer/sys/sys/ioctl_bt848.h#2 delete .. //depot/projects/hammer/sys/sys/ioctl_meteor.h#3 delete .. //depot/projects/hammer/sys/sys/syscall.h#22 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#22 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#22 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.8#4 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#9 integrate Differences ... ==== //depot/projects/hammer/sys/boot/efi/include/efiapi.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.5 2002/12/08 20:47:44 marcel Exp $ */ +/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.6 2003/12/10 19:08:09 jhb Exp $ */ #ifndef _EFI_API_H #define _EFI_API_H @@ -204,7 +204,7 @@ /* - * EFI platform varibles + * EFI platform variables */ #define EFI_GLOBAL_VARIABLE \ ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.15 2003/11/07 21:27:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.16 2003/12/11 02:34:49 peter Exp $"); #include "opt_compat.h" @@ -789,29 +789,21 @@ freebsd32_gettimeofday(struct thread *td, struct freebsd32_gettimeofday_args *uap) { - int error; - caddr_t sg; - struct timeval32 *p32, s32; - struct timeval *p = NULL, s; + struct timeval atv; + struct timeval32 atv32; + struct timezone rtz; + int error = 0; - p32 = uap->tp; - if (p32) { - sg = stackgap_init(); - p = stackgap_alloc(&sg, sizeof(struct timeval)); - uap->tp = (struct timeval32 *)p; + if (uap->tp) { + microtime(&atv); + CP(atv, atv32, tv_sec); + CP(atv, atv32, tv_usec); + error = copyout(&atv32, uap->tp, sizeof (atv32)); } - error = gettimeofday(td, (struct gettimeofday_args *) uap); - if (error) - return (error); - if (p32) { - error = copyin(p, &s, sizeof(s)); - if (error) - return (error); - CP(s, s32, tv_sec); - CP(s, s32, tv_usec); - error = copyout(&s32, p32, sizeof(s32)); - if (error) - return (error); + if (error == 0 && uap->tzp != NULL) { + rtz.tz_minuteswest = tz_minuteswest; + rtz.tz_dsttime = tz_dsttime; + error = copyout(&rtz, uap->tzp, sizeof (rtz)); } return (error); } ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.14 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.16 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.14 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.16 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ #define FREEBSD32_SYS_syscall 0 @@ -53,7 +53,7 @@ #define FREEBSD32_SYS_getlogin 49 #define FREEBSD32_SYS_setlogin 50 #define FREEBSD32_SYS_acct 51 -#define FREEBSD32_SYS_sigpending 52 + /* 52 is obsolete osigpending */ #define FREEBSD32_SYS_freebsd32_sigaltstack 53 #define FREEBSD32_SYS_ioctl 54 #define FREEBSD32_SYS_reboot 55 @@ -98,7 +98,7 @@ #define FREEBSD32_SYS_setpriority 96 #define FREEBSD32_SYS_socket 97 #define FREEBSD32_SYS_connect 98 -#define FREEBSD32_SYS_accept 99 + /* 99 is obsolete oaccept */ #define FREEBSD32_SYS_getpriority 100 /* 101 is obsolete osend */ /* 102 is obsolete orecv */ @@ -123,7 +123,7 @@ #define FREEBSD32_SYS_freebsd32_settimeofday 122 #define FREEBSD32_SYS_fchown 123 #define FREEBSD32_SYS_fchmod 124 -#define FREEBSD32_SYS_recvfrom 125 + /* 125 is obsolete orecvfrom */ #define FREEBSD32_SYS_setreuid 126 #define FREEBSD32_SYS_setregid 127 #define FREEBSD32_SYS_rename 128 @@ -149,7 +149,7 @@ #define FREEBSD32_SYS_quotactl 148 /* 149 is obsolete oquota */ /* 150 is obsolete ogetsockname */ -#define FREEBSD32_SYS_getdirentries 156 + /* 156 is obsolete ogetdirentries */ #define FREEBSD32_SYS_freebsd32_statfs 157 #define FREEBSD32_SYS_freebsd32_fstatfs 158 #define FREEBSD32_SYS_getfh 161 @@ -295,4 +295,4 @@ #define FREEBSD32_SYS__umtx_lock 434 #define FREEBSD32_SYS__umtx_unlock 435 #define FREEBSD32_SYS_jail_attach 436 -#define FREEBSD32_SYS_MAXSYSCALL 437 +#define FREEBSD32_SYS_MAXSYSCALL 441 ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.5 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.7 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ const char *freebsd32_syscallnames[] = { @@ -59,7 +59,7 @@ "getlogin", /* 49 = getlogin */ "setlogin", /* 50 = setlogin */ "acct", /* 51 = acct */ - "sigpending", /* 52 = sigpending */ + "obs_osigpending", /* 52 = obsolete osigpending */ "freebsd32_sigaltstack", /* 53 = freebsd32_sigaltstack */ "ioctl", /* 54 = ioctl */ "reboot", /* 55 = reboot */ @@ -106,7 +106,7 @@ "setpriority", /* 96 = setpriority */ "socket", /* 97 = socket */ "connect", /* 98 = connect */ - "accept", /* 99 = accept */ + "obs_oaccept", /* 99 = obsolete oaccept */ "getpriority", /* 100 = getpriority */ "obs_osend", /* 101 = obsolete osend */ "obs_orecv", /* 102 = obsolete orecv */ @@ -132,7 +132,7 @@ "freebsd32_settimeofday", /* 122 = freebsd32_settimeofday */ "fchown", /* 123 = fchown */ "fchmod", /* 124 = fchmod */ - "recvfrom", /* 125 = recvfrom */ + "obs_orecvfrom", /* 125 = obsolete orecvfrom */ "setreuid", /* 126 = setreuid */ "setregid", /* 127 = setregid */ "rename", /* 128 = rename */ @@ -163,7 +163,7 @@ "#153", /* 153 = asyncdaemon */ "#154", /* 154 = nosys */ "#155", /* 155 = nfssvc */ - "getdirentries", /* 156 = getdirentries */ + "obs_ogetdirentries", /* 156 = obsolete ogetdirentries */ "freebsd32_statfs", /* 157 = freebsd32_statfs */ "freebsd32_fstatfs", /* 158 = freebsd32_fstatfs */ "#159", /* 159 = nosys */ @@ -444,4 +444,8 @@ "_umtx_lock", /* 434 = _umtx_lock */ "_umtx_unlock", /* 435 = _umtx_unlock */ "jail_attach", /* 436 = jail_attach */ + "#437", /* 437 = extattr_list_fd */ + "#438", /* 438 = extattr_list_file */ + "#439", /* 439 = extattr_list_link */ + "#440", /* 440 = kse_switchin */ }; ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.15 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.17 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ #include "opt_compat.h" @@ -77,7 +77,7 @@ { SYF_MPSAFE | AS(getlogin_args), (sy_call_t *)getlogin }, /* 49 = getlogin */ { SYF_MPSAFE | AS(setlogin_args), (sy_call_t *)setlogin }, /* 50 = setlogin */ { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct }, /* 51 = acct */ - { SYF_MPSAFE | 0, (sy_call_t *)sigpending }, /* 52 = sigpending */ + { 0, (sy_call_t *)nosys }, /* 52 = obsolete osigpending */ { SYF_MPSAFE | AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack }, /* 53 = freebsd32_sigaltstack */ { SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl }, /* 54 = ioctl */ { SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot }, /* 55 = reboot */ @@ -124,7 +124,7 @@ { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority }, /* 96 = setpriority */ { SYF_MPSAFE | AS(socket_args), (sy_call_t *)socket }, /* 97 = socket */ { SYF_MPSAFE | AS(connect_args), (sy_call_t *)connect }, /* 98 = connect */ - { SYF_MPSAFE | AS(accept_args), (sy_call_t *)accept }, /* 99 = accept */ + { 0, (sy_call_t *)nosys }, /* 99 = obsolete oaccept */ { SYF_MPSAFE | AS(getpriority_args), (sy_call_t *)getpriority }, /* 100 = getpriority */ { 0, (sy_call_t *)nosys }, /* 101 = obsolete osend */ { 0, (sy_call_t *)nosys }, /* 102 = obsolete orecv */ @@ -141,7 +141,7 @@ { 0, (sy_call_t *)nosys }, /* 113 = obsolete orecvmsg */ { 0, (sy_call_t *)nosys }, /* 114 = obsolete osendmsg */ { 0, (sy_call_t *)nosys }, /* 115 = obsolete vtrace */ - { AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday }, /* 116 = freebsd32_gettimeofday */ + { SYF_MPSAFE | AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday }, /* 116 = freebsd32_gettimeofday */ { AS(freebsd32_getrusage_args), (sy_call_t *)freebsd32_getrusage }, /* 117 = freebsd32_getrusage */ { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys }, /* 119 = resuba */ @@ -150,7 +150,7 @@ { AS(freebsd32_settimeofday_args), (sy_call_t *)freebsd32_settimeofday }, /* 122 = freebsd32_settimeofday */ { AS(fchown_args), (sy_call_t *)fchown }, /* 123 = fchown */ { AS(fchmod_args), (sy_call_t *)fchmod }, /* 124 = fchmod */ - { SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)recvfrom }, /* 125 = recvfrom */ + { 0, (sy_call_t *)nosys }, /* 125 = obsolete orecvfrom */ { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid }, /* 126 = setreuid */ { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid }, /* 127 = setregid */ { AS(rename_args), (sy_call_t *)rename }, /* 128 = rename */ @@ -181,7 +181,7 @@ { 0, (sy_call_t *)nosys }, /* 153 = asyncdaemon */ { 0, (sy_call_t *)nosys }, /* 154 = nosys */ { 0, (sy_call_t *)nosys }, /* 155 = nfssvc */ - { AS(getdirentries_args), (sy_call_t *)getdirentries }, /* 156 = getdirentries */ + { 0, (sy_call_t *)nosys }, /* 156 = obsolete ogetdirentries */ { AS(freebsd32_statfs_args), (sy_call_t *)freebsd32_statfs }, /* 157 = freebsd32_statfs */ { AS(freebsd32_fstatfs_args), (sy_call_t *)freebsd32_fstatfs }, /* 158 = freebsd32_fstatfs */ { 0, (sy_call_t *)nosys }, /* 159 = nosys */ @@ -462,4 +462,8 @@ { SYF_MPSAFE | AS(_umtx_lock_args), (sy_call_t *)_umtx_lock }, /* 434 = _umtx_lock */ { SYF_MPSAFE | AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock }, /* 435 = _umtx_unlock */ { SYF_MPSAFE | AS(jail_attach_args), (sy_call_t *)jail_attach }, /* 436 = jail_attach */ + { 0, (sy_call_t *)nosys }, /* 437 = extattr_list_fd */ + { 0, (sy_call_t *)nosys }, /* 438 = extattr_list_file */ + { 0, (sy_call_t *)nosys }, /* 439 = extattr_list_link */ + { 0, (sy_call_t *)nosys }, /* 440 = kse_switchin */ }; ==== //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#7 (text+ko) ==== @@ -76,7 +76,7 @@ 49 MNOPROTO BSD { int getlogin(char *namebuf, u_int namelen); } 50 MNOPROTO BSD { int setlogin(char *namebuf); } 51 MNOPROTO BSD { int acct(char *path); } -52 MNOPROTO POSIX { int sigpending(void); } +52 OBSOL POSIX osigpending 53 MSTD BSD { int freebsd32_sigaltstack(struct sigaltstack32 *ss, \ struct sigaltstack32 *oss); } 54 MNOPROTO POSIX { int ioctl(int fd, u_long com, caddr_t data); } @@ -131,8 +131,7 @@ 96 MNOPROTO BSD { int setpriority(int which, int who, int prio); } 97 MNOPROTO BSD { int socket(int domain, int type, int protocol); } 98 MNOPROTO BSD { int connect(int s, caddr_t name, int namelen); } -99 MNOPROTO BSD { int accept(int s, caddr_t name, int *anamelen); } \ - accept accept_args int +99 OBSOL BSD oaccept 100 MNOPROTO BSD { int getpriority(int which, int who); } 101 OBSOL BSD osend 102 OBSOL BSD orecv @@ -150,7 +149,7 @@ 113 OBSOL BSD orecvmsg 114 OBSOL BSD osendmsg 115 OBSOL NOHIDE vtrace -116 STD BSD { int freebsd32_gettimeofday(struct timeval32 *tp, \ +116 MSTD BSD { int freebsd32_gettimeofday(struct timeval32 *tp, \ struct timezone *tzp); } 117 STD BSD { int freebsd32_getrusage(int who, \ struct rusage32 *rusage); } @@ -165,9 +164,7 @@ struct timezone *tzp); } 123 NOPROTO BSD { int fchown(int fd, int uid, int gid); } 124 NOPROTO BSD { int fchmod(int fd, int mode); } -125 MNOPROTO BSD { int recvfrom(int s, caddr_t buf, size_t len, \ - int flags, caddr_t from, int *fromlenaddr); } \ - recvfrom recvfrom_args int +125 OBSOL BSD orecvfrom 126 MNOPROTO BSD { int setreuid(int ruid, int euid); } 127 MNOPROTO BSD { int setregid(int rgid, int egid); } 128 NOPROTO POSIX { int rename(char *from, char *to); } @@ -209,8 +206,7 @@ 154 UNIMPL NOHIDE nosys ; 155 is initialized by the NFS code, if present. 155 UNIMPL NOHIDE nfssvc -156 NOPROTO BSD { int getdirentries(int fd, char *buf, u_int count, \ - long *basep); } +156 OBSOL BSD ogetdirentries 157 STD BSD { int freebsd32_statfs(char *path, \ struct statfs32 *buf); } 158 STD BSD { int freebsd32_fstatfs(int fd, struct statfs32 *buf); } ==== //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.12 2003/11/08 07:43:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.14 2003/12/11 01:05:09 peter Exp $"); #include "opt_compat.h" @@ -68,9 +68,15 @@ #include #include #include +#ifdef __amd64__ #include #include #include +#else +#include +#include +#include +#endif #include #include #include @@ -111,7 +117,7 @@ elf32_coredump, NULL, MINSIGSTKSZ, - PAGE_SIZE, + IA32_PAGE_SIZE, 0, FREEBSD32_USRSTACK, FREEBSD32_USRSTACK, ==== //depot/projects/hammer/sys/compat/ia32/ia32_util.h#3 (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/compat/ia32/ia32_util.h,v 1.8 2003/09/25 01:10:23 peter Exp $ + * $FreeBSD: src/sys/compat/ia32/ia32_util.h,v 1.9 2003/12/11 01:05:09 peter Exp $ */ #include @@ -37,8 +37,13 @@ #include #include -#define FREEBSD32_USRSTACK ((1ul << 32) - PAGE_SIZE) +#ifdef __ia64__ +#define FREEBSD32_USRSTACK ((1ul << 32) - IA32_PAGE_SIZE * 2) +#else +#define FREEBSD32_USRSTACK ((1ul << 32) - IA32_PAGE_SIZE) +#endif +#define IA32_PAGE_SIZE 4096 #define IA32_MAXDSIZ (512*1024*1024) /* 512MB */ #define IA32_MAXSSIZ (64*1024*1024) /* 64MB */ #define IA32_MAXVMEM 0 /* Unlimited */ ==== //depot/projects/hammer/sys/conf/files.amd64#36 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.26 2003/11/17 08:58:16 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.27 2003/12/11 01:09:51 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -116,10 +116,10 @@ # amd64/ia32/ia32_exception.S optional ia32 amd64/ia32/ia32_signal.c optional ia32 +amd64/ia32/ia32_sigtramp.S optional ia32 amd64/ia32/ia32_syscall.c optional ia32 compat/freebsd32/freebsd32_misc.c optional ia32 compat/freebsd32/freebsd32_syscalls.c optional ia32 compat/freebsd32/freebsd32_sysent.c optional ia32 -compat/ia32/ia32_sigtramp.S optional ia32 compat/ia32/ia32_sysvec.c optional ia32 kern/imgact_elf32.c optional ia32 ==== //depot/projects/hammer/sys/conf/files.ia64#14 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.61 2003/10/24 06:48:41 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.63 2003/12/11 01:05:09 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -28,6 +28,10 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # +compat/freebsd32/freebsd32_misc.c optional ia32 +compat/freebsd32/freebsd32_syscalls.c optional ia32 +compat/freebsd32/freebsd32_sysent.c optional ia32 +compat/ia32/ia32_sysvec.c optional ia32 contrib/ia64/libuwx/src/uwx_bstream.c standard contrib/ia64/libuwx/src/uwx_context.c standard contrib/ia64/libuwx/src/uwx_env.c standard @@ -83,9 +87,8 @@ ia64/disasm/disasm_decode.c standard ia64/disasm/disasm_extract.c standard ia64/disasm/disasm_format.c standard -ia64/ia32/ia32_misc.c optional ia32 -ia64/ia32/ia32_sysent.c optional ia32 -ia64/ia32/ia32_sysvec.c optional ia32 +ia64/ia32/ia32_signal.c optional ia32 +ia64/ia32/ia32_sigtramp.c optional ia32 ia64/ia64/autoconf.c standard ia64/ia64/busdma_machdep.c standard ia64/ia64/clock.c standard @@ -135,7 +138,6 @@ isa/vga_isa.c optional vga kern/imgact_elf32.c optional ia32 libkern/bcmp.c standard -libkern/ffs.c standard libkern/ia64/__divdi3.S standard libkern/ia64/__divsi3.S standard libkern/ia64/__moddi3.S standard ==== //depot/projects/hammer/sys/conf/options.i386#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.204 2003/12/03 23:06:30 imp Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.205 2003/12/10 19:30:42 jhb Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -148,7 +148,6 @@ IPR_LOG opt_i4b.h # Device options -DEV_ACPI opt_acpi.h DEV_APIC opt_apic.h DEV_NPX opt_npx.h ==== //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.24 2003/12/09 03:01:54 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.25 2003/12/10 19:10:27 jhb Exp $"); #include "opt_acpi.h" #include @@ -93,7 +93,7 @@ (bus_space_write_ ## width(rman_get_bustag((reg)), \ rman_get_bushandle((reg)), 0, (val))) -/* +/* * Speeds are stored in counts, from 1 - CPU_MAX_SPEED, and * reported to the user in tenths of a percent. */ @@ -294,7 +294,7 @@ { struct pcpu *pcpu_data; uint32_t i; - + KASSERT(acpi_id != NULL, ("Null acpi_id")); KASSERT(cpu_id != NULL, ("Null cpu_id")); for (i = 0; i <= mp_maxid; i++) { @@ -320,7 +320,7 @@ return (ESRCH); } - + static int acpi_cpu_shutdown(device_t dev) { @@ -656,7 +656,7 @@ cpu_economy_state = cpu_performance_state / 2; /* 0 is 'reserved' */ - if (cpu_economy_state == 0) + if (cpu_economy_state == 0) cpu_economy_state++; if (TUNABLE_INT_FETCH("hw.acpi.cpu.performance_speed", &cpu_temp_speed) && cpu_temp_speed > 0 && cpu_temp_speed <= cpu_max_state) { @@ -698,7 +698,7 @@ /* Set initial speed */ acpi_cpu_power_profile(NULL); - printf("acpi_cpu: throttling enabled, %d steps (100%% to %d.%d%%), " + printf("acpi_cpu: throttling enabled, %d steps (100%% to %d.%d%%), " "currently %d.%d%%\n", CPU_MAX_SPEED, CPU_SPEED_PRINTABLE(1), CPU_SPEED_PRINTABLE(cpu_current_state)); } @@ -778,7 +778,7 @@ clk_val = CPU_MAX_SPEED << cpu_duty_offset; p_cnt &= ~clk_val; p_cnt |= (speed << cpu_duty_offset); - + /* Write the new P_CNT value and then enable throttling */ CPU_SET_REG(sc->cpu_p_cnt, 4, p_cnt); p_cnt |= CPU_P_CNT_THT_EN; @@ -993,7 +993,7 @@ * Disable throttling control on PIIX4 A and B-step. * See specification changes #13 ("Manual Throttle Duty Cycle") * and #14 ("Enabling and Disabling Manual Throttle"), plus - * erratum #5 ("STPCLK# Deassertion Time") from the January + * erratum #5 ("STPCLK# Deassertion Time") from the January * 2002 PIIX4 specification update. Note that few (if any) * mobile systems ever used this part. */ @@ -1009,7 +1009,7 @@ * but we take the simpler approach of disabling C3 for these * parts. * - * See erratum #18 ("C3 Power State/BMIDE and Type-F DMA + * See erratum #18 ("C3 Power State/BMIDE and Type-F DMA * Livelock") from the January 2002 PIIX4 specification update. * Applies to all PIIX4 models. */ @@ -1043,7 +1043,7 @@ return; ACPI_LOCK; - + switch (state) { case POWER_PROFILE_PERFORMANCE: new = cpu_performance_state; ==== //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.24 2003/12/03 15:32:53 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.25 2003/12/10 23:06:24 sos Exp $"); #include "opt_ata.h" #include @@ -606,10 +606,14 @@ if (mask == 0x02) /* wait for slave only */ if (!(stat1 & ATA_S_BUSY) || (stat1 == 0xff && timeout > 20)) break; - if (mask == 0x03) /* wait for both master & slave */ - if ((!(stat0 & ATA_S_BUSY) || (stat0 == 0xff && timeout > 20)) && - (!(stat1 & ATA_S_BUSY) || (stat1 == 0xff && timeout > 20))) + if (mask == 0x03) { /* wait for both master & slave */ + if (!(stat0 & ATA_S_BUSY) && !(stat1 & ATA_S_BUSY)) break; + if (stat0 == 0xff && timeout > 20) + mask &= ~0x01; + if (stat1 == 0xff && timeout > 20) + mask &= ~0x02; + } DELAY(100000); } ==== //depot/projects/hammer/sys/i386/i386/mp_machdep.c#25 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.227 2003/12/03 14:57:25 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.228 2003/12/10 19:28:37 jhb Exp $"); #include "opt_apic.h" #include "opt_cpu.h" @@ -232,9 +232,9 @@ cpu_add(u_int apic_id, char boot_cpu) { - if (apic_id > MAXCPU) { + if (apic_id >= MAXCPU) { printf("SMP: CPU %d exceeds maximum CPU %d, ignoring\n", - apic_id, MAXCPU); + apic_id, MAXCPU - 1); return; } KASSERT(cpu_info[apic_id].cpu_present == 0, ("CPU %d added twice", ==== //depot/projects/hammer/sys/i386/i386/mptable.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.228 2003/12/03 20:33:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.229 2003/12/10 19:29:39 jhb Exp $"); #include "opt_mptable_force_htt.h" #include @@ -55,7 +55,7 @@ /* string defined by the Intel MP Spec as identifying the MP table */ #define MP_SIG 0x5f504d5f /* _MP_ */ -#define NAPICID 32 /* Max number of I/O APIC's */ +#define NAPICID 32 /* Max number of APIC's */ #ifdef PC98 #define BIOS_BASE (0xe8000) @@ -816,7 +816,7 @@ * physical processor. If any of those ID's are * already in the table, then kill the fixup. */ - for (id = 0; id <= MAXCPU; id++) { + for (id = 0; id < NAPICID; id++) { if ((id_mask & 1 << id) == 0) continue; /* First, make sure we are on a logical_cpus boundary. */ ==== //depot/projects/hammer/sys/i386/include/apicreg.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/apicreg.h,v 1.25 2003/11/03 21:53:38 jhb Exp $ + * $FreeBSD: src/sys/i386/include/apicreg.h,v 1.26 2003/12/10 21:33:07 jhb Exp $ */ #ifndef _MACHINE_APICREG_H_ @@ -342,38 +342,6 @@ #define APIC_TDCR_128 0x0a #define APIC_TDCR_1 0x0b - -/* - * fields in IRR - * ISA INTerrupts are in bits 16-31 of the 1st IRR register. - * these masks DON'T EQUAL the isa IRQs of the same name. - */ -#define APIC_IRQ0 0x00000001 -#define APIC_IRQ1 0x00000002 -#define APIC_IRQ2 0x00000004 -#define APIC_IRQ3 0x00000008 -#define APIC_IRQ4 0x00000010 -#define APIC_IRQ5 0x00000020 -#define APIC_IRQ6 0x00000040 -#define APIC_IRQ7 0x00000080 -#define APIC_IRQ8 0x00000100 -#define APIC_IRQ9 0x00000200 -#define APIC_IRQ10 0x00000400 -#define APIC_IRQ11 0x00000800 -#define APIC_IRQ12 0x00001000 -#define APIC_IRQ13 0x00002000 -#define APIC_IRQ14 0x00004000 -#define APIC_IRQ15 0x00008000 -#define APIC_IRQ16 0x00010000 -#define APIC_IRQ17 0x00020000 -#define APIC_IRQ18 0x00040000 -#define APIC_IRQ19 0x00080000 -#define APIC_IRQ20 0x00100000 -#define APIC_IRQ21 0x00200000 -#define APIC_IRQ22 0x00400000 -#define APIC_IRQ23 0x00800000 - - /****************************************************************************** * I/O APIC defines */ ==== //depot/projects/hammer/sys/ia64/include/cpufunc.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/cpufunc.h,v 1.17 2003/05/24 21:44:24 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/cpufunc.h,v 1.18 2003/12/10 22:51:40 peter Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -45,6 +45,15 @@ __asm __volatile("break 0x80100"); /* XXX use linux value */ } + +#define HAVE_INLINE_FFS + +static __inline int +ffs(int mask) +{ + return (__builtin_ffs(mask)); +} + #endif extern uint64_t ia64_port_base; ==== //depot/projects/hammer/sys/ia64/include/runq.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/runq.h,v 1.2 2002/06/20 06:21:20 peter Exp $ + * $FreeBSD: src/sys/ia64/include/runq.h,v 1.4 2003/12/10 22:59:03 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ @@ -36,23 +36,30 @@ #define RQB_BIT(pri) (1UL << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffs64(word) - 1) +#define RQB_FFS(word) (__ffsl(word) - 1) /* * Type of run queue status word. */ typedef u_int64_t rqb_word_t; -static __inline u_long -ffs64(u_long mask) +static __inline u_int64_t +__popcnt(u_int64_t bits) +{ + u_int64_t result; + + __asm __volatile("popcnt %0=%1" : "=r" (result) : "r" (bits)); + return result; +} + + +static __inline int +__ffsl(u_long mask) { - u_long bit; - if (mask == 0) + if (__predict_false(mask == 0ul)) return (0); - for (bit = 1; (mask & 1UL) == 0; bit++) - mask >>= 1UL; - return (bit); + return (__popcnt(mask ^ (mask - 1))); } #endif ==== //depot/projects/hammer/sys/kern/init_sysent.c#22 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.162 2003/12/07 19:36:15 marcel Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.159 2003/12/07 19:34:28 marcel Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.163 2003/12/10 22:18:53 peter Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.160 2003/12/10 22:08:37 peter Exp */ #include "opt_compat.h" ==== //depot/projects/hammer/sys/kern/syscalls.c#22 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.148 2003/12/07 19:36:15 marcel Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.159 2003/12/07 19:34:28 marcel Exp + * $FreeBSD: src/sys/kern/syscalls.c,v 1.149 2003/12/10 22:18:53 peter Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.160 2003/12/10 22:08:37 peter Exp */ const char *syscallnames[] = { ==== //depot/projects/hammer/sys/kern/syscalls.master#22 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.159 2003/12/07 19:34:28 marcel Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.161 2003/12/10 22:16:42 peter Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -33,7 +33,8 @@ ; ; Please copy any additions and changes to the following compatability tables: ; sys/ia64/ia32/syscalls.master (take a best guess) -; [other 64 bit platforms with an alternate 32 bit syscall table go here too] +; sys/compat/freebsd32/syscalls.master + ; #ifdef's, etc. may be included, and are copied to the output files. #include @@ -82,7 +83,7 @@ 26 STD BSD { int ptrace(int req, pid_t pid, caddr_t addr, \ int data); } 27 MSTD BSD { int recvmsg(int s, struct msghdr *msg, int flags); } -28 MSTD BSD { int sendmsg(int s, caddr_t msg, int flags); } +28 MSTD BSD { int sendmsg(int s, struct msghdr *msg, int flags); } 29 MSTD BSD { int recvfrom(int s, caddr_t buf, size_t len, \ int flags, caddr_t from, int *fromlenaddr); } 30 MSTD BSD { int accept(int s, caddr_t name, int *anamelen); } @@ -644,4 +645,4 @@ ; Please copy any additions and changes to the following compatability tables: ; sys/ia64/ia32/syscalls.master (take a best guess) -; [other 64 bit platforms with an alternate 32 bit syscall table go here too] +; sys/compat/freebsd32/syscalls.master ==== //depot/projects/hammer/sys/sys/syscall.h#22 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.146 2003/12/07 19:36:16 marcel Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.159 2003/12/07 19:34:28 marcel Exp + * $FreeBSD: src/sys/sys/syscall.h,v 1.147 2003/12/10 22:18:54 peter Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.160 2003/12/10 22:08:37 peter Exp */ #define SYS_syscall 0 ==== //depot/projects/hammer/sys/sys/syscall.mk#22 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.101 2003/12/07 19:36:16 marcel Exp $ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.159 2003/12/07 19:34:28 marcel Exp +# $FreeBSD: src/sys/sys/syscall.mk,v 1.102 2003/12/10 22:18:54 peter Exp $ +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.160 2003/12/10 22:08:37 peter Exp MIASM = \ syscall.o \ exit.o \ ==== //depot/projects/hammer/sys/sys/sysproto.h#22 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.142 2003/12/07 19:36:16 marcel Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.159 2003/12/07 19:34:28 marcel Exp + * $FreeBSD: src/sys/sys/sysproto.h,v 1.143 2003/12/10 22:18:54 peter Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.160 2003/12/10 22:08:37 peter Exp */ #ifndef _SYS_SYSPROTO_H_ @@ -130,7 +130,7 @@ }; struct sendmsg_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char msg_l_[PADL_(caddr_t)]; caddr_t msg; char msg_r_[PADR_(caddr_t)]; + char msg_l_[PADL_(struct msghdr *)]; struct msghdr * msg; char msg_r_[PADR_(struct msghdr *)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; struct recvfrom_args { ==== //depot/projects/hammer/usr.bin/vmstat/vmstat.8#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)vmstat.8 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.bin/vmstat/vmstat.8,v 1.26 2003/12/07 17:46:14 des Exp $ +.\" $FreeBSD: src/usr.bin/vmstat/vmstat.8,v 1.27 2003/12/10 22:12:06 des Exp $ .\" .Dd April 14, 2003 .Dt VMSTAT 8 @@ -66,9 +66,6 @@ When used with .Fl i , include statistics about interrupts that have never been generated. -If specified twice, also show interrupts that are not connected to any -device; if specified thrice, also list stray entries for each -interrupt. .It Fl c Repeat the display .Ar count ==== //depot/projects/hammer/usr.bin/vmstat/vmstat.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/usr.bin/vmstat/vmstat.c,v 1.71 2003/12/08 07:57:57 marcel Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/vmstat/vmstat.c,v 1.76 2003/12/10 22:19:19 des Exp $"); #ifndef lint static const char copyright[] = @@ -148,8 +148,8 @@ static void domem(void); static void dointr(void); static void dosum(void); -static void dosysctl(char *); -static void dovmstat(u_int, int); +static void dosysctl(const char *); +static void dovmstat(unsigned int, int); static void dozmem(void); static void kread(int, void *, size_t); static void needhdr(int); @@ -165,7 +165,7 @@ main(int argc, char *argv[]) { int c, todo; - u_int interval; + unsigned int interval; int reps; char *memf, *nlistf; char errbuf[_POSIX2_LINE_MAX]; @@ -429,42 +429,42 @@ GET_VM_STATS(sys, v_soft); /* vm */ - GET_VM_STATS(vm, v_vm_faults); - GET_VM_STATS(vm, v_cow_faults); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 10 18:49:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6205E16A4D0; Wed, 10 Dec 2003 18:49:58 -0800 (PST) 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 3C66916A4CE for ; Wed, 10 Dec 2003 18:49:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E06243D2A for ; Wed, 10 Dec 2003 18:49:56 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBB2ntXJ061840 for ; Wed, 10 Dec 2003 18:49:56 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBB2ntaK061837 for perforce@freebsd.org; Wed, 10 Dec 2003 18:49:55 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 10 Dec 2003 18:49:55 -0800 (PST) Message-Id: <200312110249.hBB2ntaK061837@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 43792 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 Dec 2003 02:49:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=43792 Change 43792 by peter@peter_daintree on 2003/12/10 18:48:58 integ -I -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#50 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#20 integrate .. //depot/projects/hammer/sys/amd64/include/apicreg.h#8 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#50 (text+ko) ==== @@ -163,9 +163,9 @@ cpu_add(u_int apic_id, char boot_cpu) { - if (apic_id > MAXCPU) { + if (apic_id >= MAXCPU) { printf("SMP: CPU %d exceeds maximum CPU %d, ignoring\n", - apic_id, MAXCPU); + apic_id, MAXCPU - 1); return; } KASSERT(cpu_info[apic_id].cpu_present == 0, ("CPU %d added twice", ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#20 (text+ko) ==== @@ -54,7 +54,7 @@ /* string defined by the Intel MP Spec as identifying the MP table */ #define MP_SIG 0x5f504d5f /* _MP_ */ -#define NAPICID 32 /* Max number of I/O APIC's */ +#define NAPICID 32 /* Max number of APIC's */ #define BIOS_BASE (0xf0000) #define BIOS_SIZE (0x10000) @@ -811,7 +811,7 @@ * physical processor. If any of those ID's are * already in the table, then kill the fixup. */ - for (id = 0; id <= MAXCPU; id++) { + for (id = 0; id < NAPICID; id++) { if ((id_mask & 1 << id) == 0) continue; /* First, make sure we are on a logical_cpus boundary. */ ==== //depot/projects/hammer/sys/amd64/include/apicreg.h#8 (text+ko) ==== @@ -342,38 +342,6 @@ #define APIC_TDCR_128 0x0a #define APIC_TDCR_1 0x0b - -/* - * fields in IRR - * ISA INTerrupts are in bits 16-31 of the 1st IRR register. - * these masks DON'T EQUAL the isa IRQs of the same name. - */ -#define APIC_IRQ0 0x00000001 -#define APIC_IRQ1 0x00000002 -#define APIC_IRQ2 0x00000004 -#define APIC_IRQ3 0x00000008 -#define APIC_IRQ4 0x00000010 -#define APIC_IRQ5 0x00000020 -#define APIC_IRQ6 0x00000040 -#define APIC_IRQ7 0x00000080 -#define APIC_IRQ8 0x00000100 -#define APIC_IRQ9 0x00000200 -#define APIC_IRQ10 0x00000400 -#define APIC_IRQ11 0x00000800 -#define APIC_IRQ12 0x00001000 -#define APIC_IRQ13 0x00002000 -#define APIC_IRQ14 0x00004000 -#define APIC_IRQ15 0x00008000 -#define APIC_IRQ16 0x00010000 -#define APIC_IRQ17 0x00020000 -#define APIC_IRQ18 0x00040000 -#define APIC_IRQ19 0x00080000 -#define APIC_IRQ20 0x00100000 -#define APIC_IRQ21 0x00200000 -#define APIC_IRQ22 0x00400000 -#define APIC_IRQ23 0x00800000 - - /****************************************************************************** * I/O APIC defines */ From owner-p4-projects@FreeBSD.ORG Thu Dec 11 08:37:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DDD816A4D0; Thu, 11 Dec 2003 08:37:46 -0800 (PST) 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 6552516A4CE for ; Thu, 11 Dec 2003 08:37:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A303D43D32 for ; Thu, 11 Dec 2003 08:37:45 -0800 (PST) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBBGbjXJ021538 for ; Thu, 11 Dec 2003 08:37:45 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBBGbilP021535 for perforce@freebsd.org; Thu, 11 Dec 2003 08:37:44 -0800 (PST) (envelope-from des@freebsd.org) Date: Thu, 11 Dec 2003 08:37:44 -0800 (PST) Message-Id: <200312111637.hBBGbilP021535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 43810 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 Dec 2003 16:37:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=43810 Change 43810 by des@des.at.des.thinksec.com on 2003/12/11 08:37:14 Tell gcc that _openpam_log() behaves like printf(). Affected files ... .. //depot/projects/openpam/include/security/openpam.h#27 edit Differences ... ==== //depot/projects/openpam/include/security/openpam.h#27 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam.h#26 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#27 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED @@ -147,7 +147,11 @@ _openpam_log(int _level, const char *_func, const char *_fmt, - ...); + ...) +#if defined(__GNUC__) + __attribute__((__format__(__printf__, 3, 4))) +#endif + ; #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) #define openpam_log(lvl, ...) \ From owner-p4-projects@FreeBSD.ORG Thu Dec 11 08:41:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 176E116A4D0; Thu, 11 Dec 2003 08:41:56 -0800 (PST) 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 CDE0216A4CE for ; Thu, 11 Dec 2003 08:41:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 365CA43D2F for ; Thu, 11 Dec 2003 08:41:52 -0800 (PST) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBBGfqXJ021727 for ; Thu, 11 Dec 2003 08:41:52 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBBGfpfP021723 for perforce@freebsd.org; Thu, 11 Dec 2003 08:41:51 -0800 (PST) (envelope-from des@freebsd.org) Date: Thu, 11 Dec 2003 08:41:51 -0800 (PST) Message-Id: <200312111641.hBBGfpfP021723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 43812 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 Dec 2003 16:41:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=43812 Change 43812 by des@des.at.des.thinksec.com on 2003/12/11 08:41:17 I originally thought the XSSO was wrong to declare pam_get_data()'s final argument as void ** rather than const void **, but having seen the strict aliasing warnings gcc generates at higher -O levels, it makes a lot more sense. Change the prototype and definition back to what the XSSO specifies, and make the necessary changes to avoid warnings in code that calls pam_get_data(). Affected files ... .. //depot/projects/openpam/include/security/pam_appl.h#14 edit .. //depot/projects/openpam/lib/openpam_borrow_cred.c#11 edit .. //depot/projects/openpam/lib/openpam_restore_cred.c#10 edit .. //depot/projects/openpam/lib/pam_get_authtok.c#27 edit .. //depot/projects/openpam/lib/pam_get_data.c#13 edit .. //depot/projects/openpam/lib/pam_get_user.c#19 edit .. //depot/projects/openpam/lib/pam_vprompt.c#13 edit Differences ... ==== //depot/projects/openpam/include/security/pam_appl.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_appl.h#13 $ + * $P4: //depot/projects/openpam/include/security/pam_appl.h#14 $ */ #ifndef _PAM_APPL_H_INCLUDED @@ -71,7 +71,7 @@ int pam_get_data(pam_handle_t *_pamh, const char *_module_data_name, - const void **_data); + void **_data); int pam_get_item(pam_handle_t *_pamh, ==== //depot/projects/openpam/lib/openpam_borrow_cred.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#10 $ + * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#11 $ */ #include @@ -57,11 +57,12 @@ const struct passwd *pwd) { struct pam_saved_cred *scred; + void *scredp; int r; ENTERI(pwd->pw_uid); - r = pam_get_data(pamh, PAM_SAVED_CRED, (const void **)&scred); - if (r == PAM_SUCCESS && scred != NULL) { + r = pam_get_data(pamh, PAM_SAVED_CRED, &scredp); + if (r == PAM_SUCCESS && scredp != NULL) { openpam_log(PAM_LOG_DEBUG, "already operating under borrowed credentials"); RETURNC(PAM_SYSTEM_ERR); ==== //depot/projects/openpam/lib/openpam_restore_cred.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#9 $ + * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#10 $ */ #include @@ -56,14 +56,16 @@ openpam_restore_cred(pam_handle_t *pamh) { struct pam_saved_cred *scred; + void *scredp; int r; ENTER(); - r = pam_get_data(pamh, PAM_SAVED_CRED, (const void **)&scred); + r = pam_get_data(pamh, PAM_SAVED_CRED, &scredp); if (r != PAM_SUCCESS) RETURNC(r); - if (scred == NULL) + if (scredp == NULL) RETURNC(PAM_SYSTEM_ERR); + scred = scredp; if (scred->euid != geteuid()) { if (seteuid(scred->euid) < 0 || setgroups(scred->ngroups, scred->groups) < 0 || ==== //depot/projects/openpam/lib/pam_get_authtok.c#27 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#26 $ + * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#27 $ */ #include @@ -60,7 +60,7 @@ const char **authtok, const char *prompt) { - const void *oldauthtok; + const void *oldauthtok, *prevauthtok, *promptp; const char *default_prompt; char *resp, *resp2; int pitem, r, style, twice; @@ -90,16 +90,20 @@ } if (openpam_get_option(pamh, "try_first_pass") || openpam_get_option(pamh, "use_first_pass")) { - r = pam_get_item(pamh, item, (const void **)authtok); - if (r == PAM_SUCCESS && *authtok != NULL) + r = pam_get_item(pamh, item, &prevauthtok); + if (r == PAM_SUCCESS && prevauthtok != NULL) { + *authtok = prevauthtok; RETURNC(PAM_SUCCESS); + } else if (openpam_get_option(pamh, "use_first_pass")) RETURNC(r == PAM_SUCCESS ? PAM_AUTH_ERR : r); } if (prompt == NULL) { - r = pam_get_item(pamh, pitem, (const void **)&prompt); - if (r != PAM_SUCCESS || prompt == NULL) + r = pam_get_item(pamh, pitem, &promptp); + if (r != PAM_SUCCESS || promptp == NULL) prompt = default_prompt; + else + prompt = promptp; } style = openpam_get_option(pamh, "echo_pass") ? PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF; ==== //depot/projects/openpam/lib/pam_get_data.c#13 (text+ko) ==== @@ -31,9 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_data.c#12 $ + * $P4: //depot/projects/openpam/lib/pam_get_data.c#13 $ */ +#include #include #include @@ -50,18 +51,19 @@ int pam_get_data(pam_handle_t *pamh, const char *module_data_name, - const void **data) + void **data) { pam_data_t *dp; ENTERS(module_data_name); if (pamh == NULL) RETURNC(PAM_SYSTEM_ERR); - for (dp = pamh->module_data; dp != NULL; dp = dp->next) + for (dp = pamh->module_data; dp != NULL; dp = dp->next) { if (strcmp(dp->name, module_data_name) == 0) { - *data = dp->data; + *data = (void *)(intptr_t)dp->data; RETURNC(PAM_SUCCESS); } + } RETURNC(PAM_NO_MODULE_DATA); } ==== //depot/projects/openpam/lib/pam_get_user.c#19 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_user.c#18 $ + * $P4: //depot/projects/openpam/lib/pam_get_user.c#19 $ */ #include @@ -57,6 +57,7 @@ const char **user, const char *prompt) { + const void *promptp; char *resp; int r; @@ -67,9 +68,11 @@ if (r == PAM_SUCCESS && *user != NULL) RETURNC(PAM_SUCCESS); if (prompt == NULL) { - r = pam_get_item(pamh, PAM_USER_PROMPT, (const void **)&prompt); - if (r != PAM_SUCCESS || prompt == NULL) + r = pam_get_item(pamh, PAM_USER_PROMPT, &promptp); + if (r != PAM_SUCCESS || promptp == NULL) prompt = user_prompt; + else + prompt = promptp; } r = pam_prompt(pamh, PAM_PROMPT_ECHO_ON, &resp, "%s", prompt); if (r != PAM_SUCCESS) ==== //depot/projects/openpam/lib/pam_vprompt.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_vprompt.c#12 $ + * $P4: //depot/projects/openpam/lib/pam_vprompt.c#13 $ */ #include @@ -59,13 +59,15 @@ struct pam_message msg; const struct pam_message *msgp; struct pam_response *rsp; - struct pam_conv *conv; + const struct pam_conv *conv; + const void *convp; int r; ENTER(); - r = pam_get_item(pamh, PAM_CONV, (const void **)&conv); + r = pam_get_item(pamh, PAM_CONV, &convp); if (r != PAM_SUCCESS) RETURNC(r); + conv = convp; if (conv == NULL || conv->conv == NULL) { openpam_log(PAM_LOG_ERROR, "no conversation function"); RETURNC(PAM_SYSTEM_ERR); From owner-p4-projects@FreeBSD.ORG Thu Dec 11 15:21:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4084016A4D0; Thu, 11 Dec 2003 15:21:59 -0800 (PST) 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 1AC9716A4CE for ; Thu, 11 Dec 2003 15:21:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58E3443D2D for ; Thu, 11 Dec 2003 15:21:58 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBBNLwXJ054530 for ; Thu, 11 Dec 2003 15:21:58 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBBNLveu054527 for perforce@freebsd.org; Thu, 11 Dec 2003 15:21:57 -0800 (PST) (envelope-from sam@freebsd.org) Date: Thu, 11 Dec 2003 15:21:57 -0800 (PST) Message-Id: <200312112321.hBBNLveu054527@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43832 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 Dec 2003 23:21:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=43832 Change 43832 by sam@sam_ebb on 2003/12/11 15:21:22 drop locks before calling sonewconn to avoid recursion on the unpcb head lock and to avoid holding locks over malloc Affected files ... .. //depot/projects/netperf+sockets/sys/kern/uipc_usrreq.c#5 edit Differences ... ==== //depot/projects/netperf+sockets/sys/kern/uipc_usrreq.c#5 (text+ko) ==== @@ -839,8 +839,19 @@ goto bad; } if (so->so_proto->pr_flags & PR_CONNREQUIRED) { - if ((so2->so_options & SO_ACCEPTCONN) == 0 || - (so3 = sonewconn(so2, 0)) == 0) { + if (so2->so_options & SO_ACCEPTCONN) { + /* + * NB: drop locks here so unp_attach is entered + * w/o locks; this avoids a recursive lock + * of the head and holding sleep locks across + * a (potentially) blocking malloc. + */ + UNP_EXIT(unp); + so3 = sonewconn(so2, 0); + UNP_ENTER(unp); + } else + so3 = 0; + if (so3 == 0) { error = ECONNREFUSED; goto bad; } From owner-p4-projects@FreeBSD.ORG Thu Dec 11 15:54:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BB5516A4D0; Thu, 11 Dec 2003 15:54:40 -0800 (PST) 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 6533016A4CE for ; Thu, 11 Dec 2003 15:54:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 96F5F43D32 for ; Thu, 11 Dec 2003 15:54:39 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBBNsdXJ055848 for ; Thu, 11 Dec 2003 15:54:39 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBBNsdxn055845 for perforce@freebsd.org; Thu, 11 Dec 2003 15:54:39 -0800 (PST) (envelope-from sam@freebsd.org) Date: Thu, 11 Dec 2003 15:54:39 -0800 (PST) Message-Id: <200312112354.hBBNsdxn055845@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43835 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 Dec 2003 23:54:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=43835 Change 43835 by sam@sam_ebb on 2003/12/11 15:54:30 argh, fix typo Affected files ... .. //depot/projects/netperf+sockets/sys/sys/socketvar.h#6 edit Differences ... ==== //depot/projects/netperf+sockets/sys/sys/socketvar.h#6 (text+ko) ==== @@ -323,7 +323,7 @@ } while (0) #define sowwakeup_locked(so) do { \ if (sb_notify(&(so)->so_snd)) \ - sowakeup((so), &(so)->so_snd); \ + sowakeup_locked((so), &(so)->so_snd); \ } while (0) #ifdef _KERNEL From owner-p4-projects@FreeBSD.ORG Fri Dec 12 09:05:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C0CE16A4D0; Fri, 12 Dec 2003 09:05:47 -0800 (PST) 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 0ED3F16A4CE for ; Fri, 12 Dec 2003 09:05:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A302043D37 for ; Fri, 12 Dec 2003 09:02:46 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBCH2kXJ036297 for ; Fri, 12 Dec 2003 09:02:46 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBCH2kPq036293 for perforce@freebsd.org; Fri, 12 Dec 2003 09:02:46 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 12 Dec 2003 09:02:46 -0800 (PST) Message-Id: <200312121702.hBCH2kPq036293@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43859 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 Dec 2003 17:05:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=43859 Change 43859 by sam@sam_ebb on 2003/12/12 09:01:44 IFC Affected files ... .. //depot/projects/netperf/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/netperf/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/netperf/sys/amd64/ia32/ia32_sigtramp.S#3 branch .. //depot/projects/netperf/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/netperf/sys/boot/i386/boot0/boot0.s#4 integrate .. //depot/projects/netperf/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/netperf/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/netperf/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/netperf/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/netperf/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/netperf/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/netperf/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/netperf/sys/compat/ia32/ia32_sigtramp.S#2 delete .. //depot/projects/netperf/sys/compat/ia32/ia32_sysvec.c#5 integrate .. //depot/projects/netperf/sys/compat/ia32/ia32_util.h#3 integrate .. //depot/projects/netperf/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/netperf/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/netperf/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/netperf/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/netperf/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/netperf/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/netperf/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/netperf/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/netperf/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/netperf/sys/conf/files.amd64#8 integrate .. //depot/projects/netperf/sys/conf/files.i386#9 integrate .. //depot/projects/netperf/sys/conf/files.ia64#9 integrate .. //depot/projects/netperf/sys/dev/ata/ata-lowlevel.c#13 integrate .. //depot/projects/netperf/sys/dev/firewire/sbp.h#3 integrate .. //depot/projects/netperf/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/netperf/sys/dev/if_ndis/if_ndis.c#1 branch .. //depot/projects/netperf/sys/dev/if_ndis/if_ndisvar.h#1 branch .. //depot/projects/netperf/sys/dev/led/led.c#5 integrate .. //depot/projects/netperf/sys/dev/ofw/ofw_disk.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/netperf/sys/i386/i386/mp_machdep.c#18 integrate .. //depot/projects/netperf/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/netperf/sys/i386/include/smp.h#3 integrate .. //depot/projects/netperf/sys/ia64/ia32/Makefile#2 delete .. //depot/projects/netperf/sys/ia64/ia32/ia32.h#2 delete .. //depot/projects/netperf/sys/ia64/ia32/ia32_misc.c#2 delete .. //depot/projects/netperf/sys/ia64/ia32/ia32_proto.h#4 delete .. //depot/projects/netperf/sys/ia64/ia32/ia32_signal.c#1 branch .. //depot/projects/netperf/sys/ia64/ia32/ia32_sigtramp.c#1 branch .. //depot/projects/netperf/sys/ia64/ia32/ia32_syscall.h#4 delete .. //depot/projects/netperf/sys/ia64/ia32/ia32_sysent.c#4 delete .. //depot/projects/netperf/sys/ia64/ia32/ia32_sysvec.c#4 delete .. //depot/projects/netperf/sys/ia64/ia32/ia32_util.h#2 delete .. //depot/projects/netperf/sys/ia64/ia32/syscalls.conf#2 delete .. //depot/projects/netperf/sys/ia64/ia32/syscalls.master#4 delete .. //depot/projects/netperf/sys/ia64/include/cpufunc.h#2 integrate .. //depot/projects/netperf/sys/ia64/include/runq.h#2 integrate .. //depot/projects/netperf/sys/isa/psm.c#3 integrate .. //depot/projects/netperf/sys/kern/init_sysent.c#9 integrate .. //depot/projects/netperf/sys/kern/sched_ule.c#20 integrate .. //depot/projects/netperf/sys/kern/syscalls.c#9 integrate .. //depot/projects/netperf/sys/kern/syscalls.master#9 integrate .. //depot/projects/netperf/sys/modules/Makefile#13 integrate .. //depot/projects/netperf/sys/modules/if_ndis/Makefile#1 branch .. //depot/projects/netperf/sys/modules/ndis/Makefile#1 branch .. //depot/projects/netperf/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/netperf/sys/pci/if_sis.c#20 integrate .. //depot/projects/netperf/sys/sys/syscall.h#9 integrate .. //depot/projects/netperf/sys/sys/syscall.mk#9 integrate .. //depot/projects/netperf/sys/sys/sysproto.h#9 integrate Differences ... ==== //depot/projects/netperf/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.230 2003/12/03 14:57:25 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.231 2003/12/11 02:47:35 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -163,9 +163,9 @@ cpu_add(u_int apic_id, char boot_cpu) { - if (apic_id > MAXCPU) { + if (apic_id >= MAXCPU) { printf("SMP: CPU %d exceeds maximum CPU %d, ignoring\n", - apic_id, MAXCPU); + apic_id, MAXCPU - 1); return; } KASSERT(cpu_info[apic_id].cpu_present == 0, ("CPU %d added twice", ==== //depot/projects/netperf/sys/amd64/amd64/mptable.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.228 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.229 2003/12/11 02:47:35 peter Exp $"); #include #include @@ -54,7 +54,7 @@ /* string defined by the Intel MP Spec as identifying the MP table */ #define MP_SIG 0x5f504d5f /* _MP_ */ -#define NAPICID 32 /* Max number of I/O APIC's */ +#define NAPICID 32 /* Max number of APIC's */ #define BIOS_BASE (0xf0000) #define BIOS_SIZE (0x10000) @@ -811,7 +811,7 @@ * physical processor. If any of those ID's are * already in the table, then kill the fixup. */ - for (id = 0; id <= MAXCPU; id++) { + for (id = 0; id < NAPICID; id++) { if ((id_mask & 1 << id) == 0) continue; /* First, make sure we are on a logical_cpus boundary. */ ==== //depot/projects/netperf/sys/amd64/include/apicreg.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.25 2003/11/03 21:53:38 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.26 2003/12/11 02:48:25 peter Exp $ */ #ifndef _MACHINE_APICREG_H_ @@ -342,38 +342,6 @@ #define APIC_TDCR_128 0x0a #define APIC_TDCR_1 0x0b - -/* - * fields in IRR - * ISA INTerrupts are in bits 16-31 of the 1st IRR register. - * these masks DON'T EQUAL the isa IRQs of the same name. - */ -#define APIC_IRQ0 0x00000001 -#define APIC_IRQ1 0x00000002 -#define APIC_IRQ2 0x00000004 -#define APIC_IRQ3 0x00000008 -#define APIC_IRQ4 0x00000010 -#define APIC_IRQ5 0x00000020 -#define APIC_IRQ6 0x00000040 -#define APIC_IRQ7 0x00000080 -#define APIC_IRQ8 0x00000100 -#define APIC_IRQ9 0x00000200 -#define APIC_IRQ10 0x00000400 -#define APIC_IRQ11 0x00000800 -#define APIC_IRQ12 0x00001000 -#define APIC_IRQ13 0x00002000 -#define APIC_IRQ14 0x00004000 -#define APIC_IRQ15 0x00008000 -#define APIC_IRQ16 0x00010000 -#define APIC_IRQ17 0x00020000 -#define APIC_IRQ18 0x00040000 -#define APIC_IRQ19 0x00080000 -#define APIC_IRQ20 0x00100000 -#define APIC_IRQ21 0x00200000 -#define APIC_IRQ22 0x00400000 -#define APIC_IRQ23 0x00800000 - - /****************************************************************************** * I/O APIC defines */ ==== //depot/projects/netperf/sys/boot/i386/boot0/boot0.s#4 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.28 2003/12/09 05:40:06 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.29 2003/12/11 20:40:12 jhb Exp $ # A 512-byte boot manager. @@ -176,7 +176,7 @@ callw putx # item # # Now that we've printed the drive (if we needed to), display a prompt. -# Get ready for the input byte noting the time. +# Get ready for the input by noting the time. # main.7: movw $prompt,%si # Display callw putstr # prompt ==== //depot/projects/netperf/sys/boot/i386/cdboot/cdboot.s#2 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.9 2001/11/07 01:20:33 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.10 2003/12/11 22:42:50 jhb Exp $ # # This program is a freestanding boot program to load an a.out binary @@ -139,10 +139,26 @@ jmp error # Halt have_vd: # Have Primary VD # -# Lookup the loader binary. +# Try to look up the loader binary using the paths in the loader_paths +# array. # - mov $loader_path,%si # File to lookup - call lookup # Try to find it + mov $loader_paths,%si # Point to start of array +lookup_path: push %si # Save file name pointer + call lookup # Try to find file + pop %di # Restore file name pointer + jnc lookup_found # Found this file + xor %al,%al # Look for next + mov $0xffff,%cx # path name by + repnz # scanning for + scasb # nul char + inc %di # Skip nul + mov %di,%si # Point %si at next path + mov (%si),%al # Get first char of next path + or %al,%al # Is it double nul? + jnz lookup_path # No, try it. + mov $msg_failed,%si # Failed message + jmp error # Halt +lookup_found: # Found a loader file # # Load the binary into the buffer. Due to real mode addressing limitations # we have to read it in in 64k chunks. @@ -266,7 +282,8 @@ # Lookup the file in the path at [SI] from the root directory. # # Trashes: All but BX -# Returns: BX = pointer to record +# Returns: CF = 0 (success), BX = pointer to record +# CF = 1 (not found) # lookup: mov $VD_ROOTDIR+MEM_VOLDESC,%bx # Root directory record push %si @@ -286,17 +303,21 @@ dec %si # Undo lodsb side effect call find_file # Lookup first path item jnc lookup_dir # Try next component - mov $msg_lookupfail,%si # Not found. + mov $msg_lookupfail,%si # Not found message + call putstr + stc # Set carry + ret jmp error lookup_done: mov $msg_lookupok,%si # Success message call putstr + clc # Clear carry ret # # Lookup file at [SI] in directory whose record is at [BX]. # # Trashes: All but returns -# Returns: CF = 0 (success), BX = pointer to record, SX = next path item +# Returns: CF = 0 (success), BX = pointer to record, SI = next path item # CF = 1 (not found), SI = preserved # find_file: mov DIR_EXTENT(%bx),%eax # Load extent @@ -536,7 +557,7 @@ twiddle_index: .byte 0x0 -msg_welcome: .asciz "CD Loader 1.01\r\n\n" +msg_welcome: .asciz "CD Loader 1.2\r\n\n" msg_bootinfo: .asciz "Building the boot loader arguments\r\n" msg_relocate: .asciz "Relocating the loader and the BTX\r\n" msg_jump: .asciz "Starting the BTX loader\r\n" @@ -548,6 +569,9 @@ msg_lookupok: .asciz "Found\r\n" msg_lookupfail: .asciz "File not found\r\n" msg_load2big: .asciz "File too big\r\n" -loader_path: .asciz "/BOOT/LOADER" +msg_failed: .asciz "Boot failed\r\n" twiddle_chars: .ascii "|/-\\" +loader_paths: .asciz "/BOOT/LOADER" + .asciz "/boot/loader" + .byte 0 ==== //depot/projects/netperf/sys/compat/freebsd32/freebsd32_misc.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.15 2003/11/07 21:27:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.16 2003/12/11 02:34:49 peter Exp $"); #include "opt_compat.h" @@ -761,29 +761,21 @@ freebsd32_gettimeofday(struct thread *td, struct freebsd32_gettimeofday_args *uap) { - int error; - caddr_t sg; - struct timeval32 *p32, s32; - struct timeval *p = NULL, s; + struct timeval atv; + struct timeval32 atv32; + struct timezone rtz; + int error = 0; - p32 = uap->tp; - if (p32) { - sg = stackgap_init(); - p = stackgap_alloc(&sg, sizeof(struct timeval)); - uap->tp = (struct timeval32 *)p; + if (uap->tp) { + microtime(&atv); + CP(atv, atv32, tv_sec); + CP(atv, atv32, tv_usec); + error = copyout(&atv32, uap->tp, sizeof (atv32)); } - error = gettimeofday(td, (struct gettimeofday_args *) uap); - if (error) - return (error); - if (p32) { - error = copyin(p, &s, sizeof(s)); - if (error) - return (error); - CP(s, s32, tv_sec); - CP(s, s32, tv_usec); - error = copyout(&s32, p32, sizeof(s32)); - if (error) - return (error); + if (error == 0 && uap->tzp != NULL) { + rtz.tz_minuteswest = tz_minuteswest; + rtz.tz_dsttime = tz_dsttime; + error = copyout(&rtz, uap->tzp, sizeof (rtz)); } return (error); } ==== //depot/projects/netperf/sys/compat/freebsd32/freebsd32_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.14 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.16 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/netperf/sys/compat/freebsd32/freebsd32_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.14 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.16 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ #define FREEBSD32_SYS_syscall 0 @@ -53,7 +53,7 @@ #define FREEBSD32_SYS_getlogin 49 #define FREEBSD32_SYS_setlogin 50 #define FREEBSD32_SYS_acct 51 -#define FREEBSD32_SYS_sigpending 52 + /* 52 is obsolete osigpending */ #define FREEBSD32_SYS_freebsd32_sigaltstack 53 #define FREEBSD32_SYS_ioctl 54 #define FREEBSD32_SYS_reboot 55 @@ -98,7 +98,7 @@ #define FREEBSD32_SYS_setpriority 96 #define FREEBSD32_SYS_socket 97 #define FREEBSD32_SYS_connect 98 -#define FREEBSD32_SYS_accept 99 + /* 99 is obsolete oaccept */ #define FREEBSD32_SYS_getpriority 100 /* 101 is obsolete osend */ /* 102 is obsolete orecv */ @@ -123,7 +123,7 @@ #define FREEBSD32_SYS_freebsd32_settimeofday 122 #define FREEBSD32_SYS_fchown 123 #define FREEBSD32_SYS_fchmod 124 -#define FREEBSD32_SYS_recvfrom 125 + /* 125 is obsolete orecvfrom */ #define FREEBSD32_SYS_setreuid 126 #define FREEBSD32_SYS_setregid 127 #define FREEBSD32_SYS_rename 128 @@ -149,7 +149,7 @@ #define FREEBSD32_SYS_quotactl 148 /* 149 is obsolete oquota */ /* 150 is obsolete ogetsockname */ -#define FREEBSD32_SYS_getdirentries 156 + /* 156 is obsolete ogetdirentries */ #define FREEBSD32_SYS_freebsd32_statfs 157 #define FREEBSD32_SYS_freebsd32_fstatfs 158 #define FREEBSD32_SYS_getfh 161 @@ -295,4 +295,4 @@ #define FREEBSD32_SYS__umtx_lock 434 #define FREEBSD32_SYS__umtx_unlock 435 #define FREEBSD32_SYS_jail_attach 436 -#define FREEBSD32_SYS_MAXSYSCALL 437 +#define FREEBSD32_SYS_MAXSYSCALL 441 ==== //depot/projects/netperf/sys/compat/freebsd32/freebsd32_syscalls.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.5 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.7 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ const char *freebsd32_syscallnames[] = { @@ -59,7 +59,7 @@ "getlogin", /* 49 = getlogin */ "setlogin", /* 50 = setlogin */ "acct", /* 51 = acct */ - "sigpending", /* 52 = sigpending */ + "obs_osigpending", /* 52 = obsolete osigpending */ "freebsd32_sigaltstack", /* 53 = freebsd32_sigaltstack */ "ioctl", /* 54 = ioctl */ "reboot", /* 55 = reboot */ @@ -106,7 +106,7 @@ "setpriority", /* 96 = setpriority */ "socket", /* 97 = socket */ "connect", /* 98 = connect */ - "accept", /* 99 = accept */ + "obs_oaccept", /* 99 = obsolete oaccept */ "getpriority", /* 100 = getpriority */ "obs_osend", /* 101 = obsolete osend */ "obs_orecv", /* 102 = obsolete orecv */ @@ -132,7 +132,7 @@ "freebsd32_settimeofday", /* 122 = freebsd32_settimeofday */ "fchown", /* 123 = fchown */ "fchmod", /* 124 = fchmod */ - "recvfrom", /* 125 = recvfrom */ + "obs_orecvfrom", /* 125 = obsolete orecvfrom */ "setreuid", /* 126 = setreuid */ "setregid", /* 127 = setregid */ "rename", /* 128 = rename */ @@ -163,7 +163,7 @@ "#153", /* 153 = asyncdaemon */ "#154", /* 154 = nosys */ "#155", /* 155 = nfssvc */ - "getdirentries", /* 156 = getdirentries */ + "obs_ogetdirentries", /* 156 = obsolete ogetdirentries */ "freebsd32_statfs", /* 157 = freebsd32_statfs */ "freebsd32_fstatfs", /* 158 = freebsd32_fstatfs */ "#159", /* 159 = nosys */ @@ -444,4 +444,8 @@ "_umtx_lock", /* 434 = _umtx_lock */ "_umtx_unlock", /* 435 = _umtx_unlock */ "jail_attach", /* 436 = jail_attach */ + "#437", /* 437 = extattr_list_fd */ + "#438", /* 438 = extattr_list_file */ + "#439", /* 439 = extattr_list_link */ + "#440", /* 440 = kse_switchin */ }; ==== //depot/projects/netperf/sys/compat/freebsd32/freebsd32_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.15 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.17 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ #include "opt_compat.h" @@ -77,7 +77,7 @@ { SYF_MPSAFE | AS(getlogin_args), (sy_call_t *)getlogin }, /* 49 = getlogin */ { SYF_MPSAFE | AS(setlogin_args), (sy_call_t *)setlogin }, /* 50 = setlogin */ { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct }, /* 51 = acct */ - { SYF_MPSAFE | 0, (sy_call_t *)sigpending }, /* 52 = sigpending */ + { 0, (sy_call_t *)nosys }, /* 52 = obsolete osigpending */ { SYF_MPSAFE | AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack }, /* 53 = freebsd32_sigaltstack */ { SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl }, /* 54 = ioctl */ { SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot }, /* 55 = reboot */ @@ -124,7 +124,7 @@ { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority }, /* 96 = setpriority */ { SYF_MPSAFE | AS(socket_args), (sy_call_t *)socket }, /* 97 = socket */ { SYF_MPSAFE | AS(connect_args), (sy_call_t *)connect }, /* 98 = connect */ - { SYF_MPSAFE | AS(accept_args), (sy_call_t *)accept }, /* 99 = accept */ + { 0, (sy_call_t *)nosys }, /* 99 = obsolete oaccept */ { SYF_MPSAFE | AS(getpriority_args), (sy_call_t *)getpriority }, /* 100 = getpriority */ { 0, (sy_call_t *)nosys }, /* 101 = obsolete osend */ { 0, (sy_call_t *)nosys }, /* 102 = obsolete orecv */ @@ -141,7 +141,7 @@ { 0, (sy_call_t *)nosys }, /* 113 = obsolete orecvmsg */ { 0, (sy_call_t *)nosys }, /* 114 = obsolete osendmsg */ { 0, (sy_call_t *)nosys }, /* 115 = obsolete vtrace */ - { AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday }, /* 116 = freebsd32_gettimeofday */ + { SYF_MPSAFE | AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday }, /* 116 = freebsd32_gettimeofday */ { AS(freebsd32_getrusage_args), (sy_call_t *)freebsd32_getrusage }, /* 117 = freebsd32_getrusage */ { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys }, /* 119 = resuba */ @@ -150,7 +150,7 @@ { AS(freebsd32_settimeofday_args), (sy_call_t *)freebsd32_settimeofday }, /* 122 = freebsd32_settimeofday */ { AS(fchown_args), (sy_call_t *)fchown }, /* 123 = fchown */ { AS(fchmod_args), (sy_call_t *)fchmod }, /* 124 = fchmod */ - { SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)recvfrom }, /* 125 = recvfrom */ + { 0, (sy_call_t *)nosys }, /* 125 = obsolete orecvfrom */ { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid }, /* 126 = setreuid */ { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid }, /* 127 = setregid */ { AS(rename_args), (sy_call_t *)rename }, /* 128 = rename */ @@ -181,7 +181,7 @@ { 0, (sy_call_t *)nosys }, /* 153 = asyncdaemon */ { 0, (sy_call_t *)nosys }, /* 154 = nosys */ { 0, (sy_call_t *)nosys }, /* 155 = nfssvc */ - { AS(getdirentries_args), (sy_call_t *)getdirentries }, /* 156 = getdirentries */ + { 0, (sy_call_t *)nosys }, /* 156 = obsolete ogetdirentries */ { AS(freebsd32_statfs_args), (sy_call_t *)freebsd32_statfs }, /* 157 = freebsd32_statfs */ { AS(freebsd32_fstatfs_args), (sy_call_t *)freebsd32_fstatfs }, /* 158 = freebsd32_fstatfs */ { 0, (sy_call_t *)nosys }, /* 159 = nosys */ @@ -462,4 +462,8 @@ { SYF_MPSAFE | AS(_umtx_lock_args), (sy_call_t *)_umtx_lock }, /* 434 = _umtx_lock */ { SYF_MPSAFE | AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock }, /* 435 = _umtx_unlock */ { SYF_MPSAFE | AS(jail_attach_args), (sy_call_t *)jail_attach }, /* 436 = jail_attach */ + { 0, (sy_call_t *)nosys }, /* 437 = extattr_list_fd */ + { 0, (sy_call_t *)nosys }, /* 438 = extattr_list_file */ + { 0, (sy_call_t *)nosys }, /* 439 = extattr_list_link */ + { 0, (sy_call_t *)nosys }, /* 440 = kse_switchin */ }; ==== //depot/projects/netperf/sys/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -110,7 +110,7 @@ 49 MNOPROTO BSD { int getlogin(char *namebuf, u_int namelen); } 50 MNOPROTO BSD { int setlogin(char *namebuf); } 51 MNOPROTO BSD { int acct(char *path); } -52 MNOPROTO POSIX { int sigpending(void); } +52 OBSOL POSIX osigpending 53 MSTD BSD { int freebsd32_sigaltstack(struct sigaltstack32 *ss, \ struct sigaltstack32 *oss); } 54 MNOPROTO POSIX { int ioctl(int fd, u_long com, caddr_t data); } @@ -171,8 +171,7 @@ 96 MNOPROTO BSD { int setpriority(int which, int who, int prio); } 97 MNOPROTO BSD { int socket(int domain, int type, int protocol); } 98 MNOPROTO BSD { int connect(int s, caddr_t name, int namelen); } -99 MNOPROTO BSD { int accept(int s, caddr_t name, int *anamelen); } \ - accept accept_args int +99 OBSOL BSD oaccept 100 MNOPROTO BSD { int getpriority(int which, int who); } 101 OBSOL BSD osend 102 OBSOL BSD orecv @@ -190,7 +189,7 @@ 113 OBSOL BSD orecvmsg 114 OBSOL BSD osendmsg 115 OBSOL NOHIDE vtrace -116 STD BSD { int freebsd32_gettimeofday(struct timeval32 *tp, \ +116 MSTD BSD { int freebsd32_gettimeofday(struct timeval32 *tp, \ struct timezone *tzp); } 117 STD BSD { int freebsd32_getrusage(int who, \ struct rusage32 *rusage); } @@ -205,9 +204,7 @@ struct timezone *tzp); } 123 NOPROTO BSD { int fchown(int fd, int uid, int gid); } 124 NOPROTO BSD { int fchmod(int fd, int mode); } -125 MNOPROTO BSD { int recvfrom(int s, caddr_t buf, size_t len, \ - int flags, caddr_t from, int *fromlenaddr); } \ - recvfrom recvfrom_args int +125 OBSOL BSD orecvfrom 126 MNOPROTO BSD { int setreuid(int ruid, int euid); } 127 MNOPROTO BSD { int setregid(int rgid, int egid); } 128 NOPROTO POSIX { int rename(char *from, char *to); } @@ -249,8 +246,7 @@ 154 UNIMPL NOHIDE nosys ; 155 is initialized by the NFS code, if present. 155 UNIMPL NOHIDE nfssvc -156 NOPROTO BSD { int getdirentries(int fd, char *buf, u_int count, \ - long *basep); } +156 OBSOL BSD ogetdirentries 157 STD BSD { int freebsd32_statfs(char *path, \ struct statfs32 *buf); } 158 STD BSD { int freebsd32_fstatfs(int fd, struct statfs32 *buf); } @@ -633,4 +629,7 @@ 434 MNOPROTO BSD { int _umtx_lock(struct umtx *umtx); } 435 MNOPROTO BSD { int _umtx_unlock(struct umtx *umtx); } 436 MNOPROTO BSD { int jail_attach(int jid); } - +437 UNIMPL BSD extattr_list_fd +438 UNIMPL BSD extattr_list_file +439 UNIMPL BSD extattr_list_link +440 UNIMPL BSD kse_switchin ==== //depot/projects/netperf/sys/compat/ia32/ia32_sysvec.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.12 2003/11/08 07:43:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.14 2003/12/11 01:05:09 peter Exp $"); #include "opt_compat.h" @@ -66,10 +66,17 @@ #include #include +#include #include +#ifdef __amd64__ #include #include #include +#else +#include +#include +#include +#endif #include #include #include @@ -93,7 +100,7 @@ SYSCTL_NODE(_compat, OID_AUTO, ia32, CTLFLAG_RW, 0, "ia32 mode"); struct sysentvec ia32_freebsd_sysvec = { - SYS_MAXSYSCALL, + FREEBSD32_SYS_MAXSYSCALL, freebsd32_sysent, 0, 0, @@ -110,7 +117,7 @@ elf32_coredump, NULL, MINSIGSTKSZ, - PAGE_SIZE, + IA32_PAGE_SIZE, 0, FREEBSD32_USRSTACK, FREEBSD32_USRSTACK, ==== //depot/projects/netperf/sys/compat/ia32/ia32_util.h#3 (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/compat/ia32/ia32_util.h,v 1.8 2003/09/25 01:10:23 peter Exp $ + * $FreeBSD: src/sys/compat/ia32/ia32_util.h,v 1.9 2003/12/11 01:05:09 peter Exp $ */ #include @@ -37,8 +37,13 @@ #include #include -#define FREEBSD32_USRSTACK ((1ul << 32) - PAGE_SIZE) +#ifdef __ia64__ +#define FREEBSD32_USRSTACK ((1ul << 32) - IA32_PAGE_SIZE * 2) +#else +#define FREEBSD32_USRSTACK ((1ul << 32) - IA32_PAGE_SIZE) +#endif +#define IA32_PAGE_SIZE 4096 #define IA32_MAXDSIZ (512*1024*1024) /* 512MB */ #define IA32_MAXSSIZ (64*1024*1024) /* 64MB */ #define IA32_MAXVMEM 0 /* Unlimited */ ==== //depot/projects/netperf/sys/conf/files.amd64#8 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.26 2003/11/17 08:58:16 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.27 2003/12/11 01:09:51 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -116,10 +116,10 @@ # amd64/ia32/ia32_exception.S optional ia32 amd64/ia32/ia32_signal.c optional ia32 +amd64/ia32/ia32_sigtramp.S optional ia32 amd64/ia32/ia32_syscall.c optional ia32 compat/freebsd32/freebsd32_misc.c optional ia32 compat/freebsd32/freebsd32_syscalls.c optional ia32 compat/freebsd32/freebsd32_sysent.c optional ia32 -compat/ia32/ia32_sigtramp.S optional ia32 compat/ia32/ia32_sysvec.c optional ia32 kern/imgact_elf32.c optional ia32 ==== //depot/projects/netperf/sys/conf/files.i386#9 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.459 2003/12/07 04:18:51 imp Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.460 2003/12/11 22:34:36 wpaul Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -74,6 +74,11 @@ compat/linux/linux_sysctl.c optional compat_linux compat/linux/linux_uid16.c optional compat_linux compat/linux/linux_util.c optional compat_linux +compat/ndis/kern_ndis.c optional ndisapi pci pccard +compat/ndis/subr_hal.c optional ndisapi pci pccard +compat/ndis/subr_ndis.c optional ndisapi pci pccard +compat/ndis/subr_ntoskrnl.c optional ndisapi pci pccard +compat/ndis/subr_pe.c optional ndisapi pci pccard compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 @@ -127,6 +132,7 @@ dev/fb/splash.c optional splash dev/fb/vga.c optional vga dev/fe/if_fe_isa.c optional fe isa +dev/if_ndis/if_ndis.c optional ndis pci pccard dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd ==== //depot/projects/netperf/sys/conf/files.ia64#9 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.61 2003/10/24 06:48:41 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.63 2003/12/11 01:05:09 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -28,6 +28,10 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # +compat/freebsd32/freebsd32_misc.c optional ia32 +compat/freebsd32/freebsd32_syscalls.c optional ia32 +compat/freebsd32/freebsd32_sysent.c optional ia32 +compat/ia32/ia32_sysvec.c optional ia32 contrib/ia64/libuwx/src/uwx_bstream.c standard contrib/ia64/libuwx/src/uwx_context.c standard contrib/ia64/libuwx/src/uwx_env.c standard @@ -83,9 +87,8 @@ ia64/disasm/disasm_decode.c standard ia64/disasm/disasm_extract.c standard ia64/disasm/disasm_format.c standard -ia64/ia32/ia32_misc.c optional ia32 -ia64/ia32/ia32_sysent.c optional ia32 -ia64/ia32/ia32_sysvec.c optional ia32 +ia64/ia32/ia32_signal.c optional ia32 +ia64/ia32/ia32_sigtramp.c optional ia32 ia64/ia64/autoconf.c standard ia64/ia64/busdma_machdep.c standard ia64/ia64/clock.c standard @@ -135,7 +138,6 @@ isa/vga_isa.c optional vga kern/imgact_elf32.c optional ia32 libkern/bcmp.c standard -libkern/ffs.c standard libkern/ia64/__divdi3.S standard libkern/ia64/__divsi3.S standard libkern/ia64/__moddi3.S standard ==== //depot/projects/netperf/sys/dev/ata/ata-lowlevel.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.24 2003/12/03 15:32:53 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.25 2003/12/10 23:06:24 sos Exp $"); #include "opt_ata.h" #include @@ -606,10 +606,14 @@ if (mask == 0x02) /* wait for slave only */ if (!(stat1 & ATA_S_BUSY) || (stat1 == 0xff && timeout > 20)) break; - if (mask == 0x03) /* wait for both master & slave */ - if ((!(stat0 & ATA_S_BUSY) || (stat0 == 0xff && timeout > 20)) && - (!(stat1 & ATA_S_BUSY) || (stat1 == 0xff && timeout > 20))) + if (mask == 0x03) { /* wait for both master & slave */ + if (!(stat0 & ATA_S_BUSY) && !(stat1 & ATA_S_BUSY)) break; + if (stat0 == 0xff && timeout > 20) + mask &= ~0x01; + if (stat1 == 0xff && timeout > 20) + mask &= ~0x02; + } DELAY(100000); } ==== //depot/projects/netperf/sys/dev/firewire/sbp.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/sbp.h,v 1.2 2003/11/12 03:29:57 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/sbp.h,v 1.3 2003/12/11 03:42:40 simokawa Exp $ * */ @@ -125,6 +125,7 @@ /* 6: Maximum payload too small */ /* 7: Reserved for future standardization */ /* 8: Resource unavailabe */ +#define STATUS_RES_UNAVAIL 8 /* 9: Function Rejected */ /* 10: Login ID not recognized */ /* 11: Dummy ORB completed */ ==== //depot/projects/netperf/sys/dev/firewire/sbp_targ.c#3 (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/dev/firewire/sbp_targ.c,v 1.2 2003/11/12 04:06:21 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/sbp_targ.c,v 1.3 2003/12/11 03:42:40 simokawa Exp $ */ #include @@ -62,14 +62,17 @@ #include #include -#define SBP_TARG_RECV_LEN (8) -#define MAX_LUN 63 +#define SBP_TARG_RECV_LEN 8 +#define MAX_INITIATORS 8 +#define MAX_LUN 63 +#define MAX_LOGINS 63 +#define MAX_NODES 63 /* * management/command block agent registers * * BASE 0xffff f001 0000 management port - * BASE 0xffff f001 0020 command port for lun0 - * BASE 0xffff f001 0040 command port for lun1 + * BASE 0xffff f001 0020 command port for login id 0 + * BASE 0xffff f001 0040 command port for login id 1 * */ #define SBP_TARG_MGM 0x10000 /* offset from 0xffff f000 000 */ @@ -78,13 +81,19 @@ #define SBP_TARG_BIND_START (((u_int64_t)SBP_TARG_BIND_HI << 32) | \ SBP_TARG_BIND_LO(-1)) #define SBP_TARG_BIND_END (((u_int64_t)SBP_TARG_BIND_HI << 32) | \ - SBP_TARG_BIND_LO(MAX_LUN)) -#define SBP_TARG_LUN(lo) (((lo) - SBP_TARG_BIND_LO(0))/0x20) + SBP_TARG_BIND_LO(MAX_LOGINS)) +#define SBP_TARG_LOGIN_ID(lo) (((lo) - SBP_TARG_BIND_LO(0))/0x20) #define FETCH_MGM 0 #define FETCH_CMD 1 #define FETCH_POINTER 2 +#define F_LINK_ACTIVE (1 << 0) +#define F_ATIO_STARVED (1 << 1) +#define F_LOGIN (1 << 2) +#define F_HOLD (1 << 3) +#define F_FREEZED (1 << 4) + MALLOC_DEFINE(M_SBP_TARG, "sbp_targ", "SBP-II/FireWire target mode"); static int debug = 0; @@ -92,36 +101,44 @@ SYSCTL_INT(_debug, OID_AUTO, sbp_targ_debug, CTLFLAG_RW, &debug, 0, "SBP target mode debug flag"); +struct sbp_targ_login { + struct sbp_targ_lstate *lstate; + struct fw_device *fwdev; + struct sbp_login_res loginres; + u_int32_t flags; + u_int16_t fifo_hi; + u_int16_t last_hi; + u_int32_t fifo_lo; + u_int32_t last_lo; + STAILQ_HEAD(, orb_info) orbs; + u_int16_t id; + STAILQ_ENTRY(sbp_targ_login) link; + int hold_sec; + struct callout hold_callout; +}; + +struct sbp_targ_lstate { + u_int16_t lun; + struct sbp_targ_softc *sc; + struct cam_path *path; + struct ccb_hdr_slist accept_tios; + struct ccb_hdr_slist immed_notifies; + struct crom_chunk model; + u_int32_t flags; + STAILQ_HEAD(, sbp_targ_login) logins; +}; + struct sbp_targ_softc { struct firewire_dev_comm fd; struct cam_sim *sim; struct cam_path *path; struct fw_bind fwb; int ndevs; + int flags; struct crom_chunk unit; struct sbp_targ_lstate *lstate[MAX_LUN]; struct sbp_targ_lstate *black_hole; -}; - -struct sbp_targ_lstate { - struct sbp_targ_softc *sc; - struct cam_path *path; - struct ccb_hdr_slist accept_tios; - struct ccb_hdr_slist immed_notifies; - struct crom_chunk model; - /* XXX per initiater data */ - struct fw_device *fwdev; - struct sbp_login_res loginres; - u_int32_t flags; -#define LINK_ACTIVE 1 -#define ATIO_STARVED 2 - u_int16_t fifo_hi; - u_int16_t last_hi; - u_int32_t fifo_lo; - u_int32_t last_lo; - STAILQ_HEAD(, orb_info) orbs; - u_int16_t login_id; - u_int16_t lun; + struct sbp_targ_login *logins[MAX_LOGINS]; }; struct corb4 { @@ -167,7 +184,7 @@ struct orb_info { struct sbp_targ_softc *sc; struct fw_device *fwdev; - struct sbp_targ_lstate *lstate; + struct sbp_targ_login *login; union ccb *ccb; struct ccb_accept_tio *atio; u_int8_t state; @@ -196,7 +213,7 @@ static void sbp_targ_recv(struct fw_xfer *); static void sbp_targ_fetch_orb(struct sbp_targ_softc *, struct fw_device *, - u_int16_t, u_int32_t, struct sbp_targ_lstate *, int); + u_int16_t, u_int32_t, struct sbp_targ_login *, int); static void sbp_targ_identify(driver_t *driver, device_t parent) @@ -218,6 +235,42 @@ return (0); } + +static void +sbp_targ_dealloc_login(struct sbp_targ_login *login) +{ + struct orb_info *orbi, *next; + + if (login == NULL) { + printf("%s: login = NULL\n", __FUNCTION__); + return; + } + for (orbi = STAILQ_FIRST(&login->orbs); orbi != NULL; orbi = next) { + next = STAILQ_NEXT(orbi, link); + free(orbi, M_SBP_TARG); + } + callout_stop(&login->hold_callout); + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 12 16:19:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A47C616A4D0; Fri, 12 Dec 2003 16:19:55 -0800 (PST) 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 7E0C116A4CE for ; Fri, 12 Dec 2003 16:19:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F5D343D3F for ; Fri, 12 Dec 2003 16:19:54 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBD0JsXJ064612 for ; Fri, 12 Dec 2003 16:19:54 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBD0Jrh9064609 for perforce@freebsd.org; Fri, 12 Dec 2003 16:19:53 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 12 Dec 2003 16:19:53 -0800 (PST) Message-Id: <200312130019.hBD0Jrh9064609@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 43872 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 Dec 2003 00:19:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=43872 Change 43872 by rwatson@rwatson_none on 2003/12/12 16:19:19 Structures in socketvar.h now depend on the defition of struct mtx. Include _lock.h and _mutex.h so that files including socketvar.h but not the mutex APIs via mutex.h still ciompile. This affected the GRE module. Affected files ... .. //depot/projects/netperf+sockets/sys/sys/socketvar.h#7 edit Differences ... ==== //depot/projects/netperf+sockets/sys/sys/socketvar.h#7 (text+ko) ==== @@ -39,6 +39,8 @@ #include /* for TAILQ macros */ #include /* for struct selinfo */ +#include +#include /* * Kernel structure per socket. From owner-p4-projects@FreeBSD.ORG Fri Dec 12 20:44:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD5FC16A4D0; Fri, 12 Dec 2003 20:44:37 -0800 (PST) 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 97AE016A4CE for ; Fri, 12 Dec 2003 20:44:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B490F43D31 for ; Fri, 12 Dec 2003 20:44:17 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBD4iHXJ083232 for ; Fri, 12 Dec 2003 20:44:17 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBD4iFbt083229 for perforce@freebsd.org; Fri, 12 Dec 2003 20:44:15 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Fri, 12 Dec 2003 20:44:15 -0800 (PST) Message-Id: <200312130444.hBD4iFbt083229@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 43875 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 Dec 2003 04:44:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=43875 Change 43875 by marcel@marcel_nfs on 2003/12/12 20:43:51 IFC @43874 Affected files ... .. //depot/projects/ia64/Makefile#35 integrate .. //depot/projects/ia64/Makefile.inc1#87 integrate .. //depot/projects/ia64/UPDATING#59 integrate .. //depot/projects/ia64/contrib/libreadline/readline.h#3 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#18 integrate .. //depot/projects/ia64/etc/defaults/periodic.conf#10 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#21 integrate .. //depot/projects/ia64/etc/rc.d/jail#7 integrate .. //depot/projects/ia64/etc/rc.d/mountcritlocal#6 integrate .. //depot/projects/ia64/etc/rc.d/root#6 integrate .. //depot/projects/ia64/etc/rc.d/syscons#5 integrate .. //depot/projects/ia64/etc/rc.subr#15 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/include/Makefile#5 integrate .. //depot/projects/ia64/include/Makefile#34 integrate .. //depot/projects/ia64/lib/libc/Makefile#12 integrate .. //depot/projects/ia64/lib/libc/locale/setrunelocale.c#10 integrate .. //depot/projects/ia64/lib/libc/powerpc/_fpmath.h#3 integrate .. //depot/projects/ia64/lib/libc/sys/Makefile.inc#18 integrate .. //depot/projects/ia64/lib/libc/sys/kse.2#11 integrate .. //depot/projects/ia64/lib/libc/sys/stat.2#10 integrate .. //depot/projects/ia64/lib/libkiconv/Makefile#2 integrate .. //depot/projects/ia64/lib/libkiconv/kiconv.3#3 integrate .. //depot/projects/ia64/lib/libkiconv/xlat16_iconv.c#2 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_echo/pam_echo.c#3 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_group/pam_group.c#3 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_krb5/pam_krb5.c#14 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_ksu/pam_ksu.c#3 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#14 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_login_access/pam_login_access.c#5 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#9 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_radius/pam_radius.c#12 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_rhosts/pam_rhosts.c#3 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_securetty/pam_securetty.c#6 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_unix/pam_unix.c#17 integrate .. //depot/projects/ia64/lib/libpthread/pthread.map#8 integrate .. //depot/projects/ia64/lib/libpthread/thread/Makefile.inc#13 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_accept.c#1 branch .. //depot/projects/ia64/lib/libpthread/thread/thr_aio_suspend.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#15 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_close.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#18 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_connect.c#1 branch .. //depot/projects/ia64/lib/libpthread/thread/thr_creat.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_fcntl.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_fsync.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_join.c#7 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#42 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_msync.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_mutex.c#13 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_nanosleep.c#8 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_open.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_pause.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_poll.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#29 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_pselect.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_read.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_readv.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_select.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sem.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigsuspend.c#10 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigwait.c#13 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sleep.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_spinlock.c#7 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_system.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_tcdrain.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_wait.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_wait4.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_waitpid.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_write.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_writev.c#3 integrate .. //depot/projects/ia64/lib/libstand/Makefile#15 integrate .. //depot/projects/ia64/lib/libstand/gzipfs.c#3 integrate .. //depot/projects/ia64/lib/libthr/thread/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_cond.c#8 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#14 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_private.h#10 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_resume_np.c#3 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_sig.c#5 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_spinlock.c#7 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_subr.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_syscalls.c#3 integrate .. //depot/projects/ia64/libexec/rtld-elf/amd64/lockdflt.c#2 integrate .. //depot/projects/ia64/libexec/rtld-elf/amd64/reloc.c#3 integrate .. //depot/projects/ia64/libexec/rtld-elf/amd64/rtld_machdep.h#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#30 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#75 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#10 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#135 integrate .. //depot/projects/ia64/release/doc/share/sgml/release.ent#13 integrate .. //depot/projects/ia64/sbin/ccdconfig/ccdconfig.8#9 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#29 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#29 integrate .. //depot/projects/ia64/sbin/mount/getmntopts.c#3 integrate .. //depot/projects/ia64/sbin/mount/mount.c#14 integrate .. //depot/projects/ia64/sbin/mount_cd9660/mount_cd9660.c#7 integrate .. //depot/projects/ia64/sbin/mount_msdosfs/mount_msdosfs.c#8 integrate .. //depot/projects/ia64/sbin/mount_ntfs/mount_ntfs.c#5 integrate .. //depot/projects/ia64/sbin/mount_udf/mount_udf.c#8 integrate .. //depot/projects/ia64/share/examples/meteor/rgb16.c#2 integrate .. //depot/projects/ia64/share/examples/meteor/rgb24.c#2 integrate .. //depot/projects/ia64/share/examples/meteor/test-n.c#2 integrate .. //depot/projects/ia64/share/examples/meteor/yuvpk.c#2 integrate .. //depot/projects/ia64/share/examples/meteor/yuvpl.c#2 integrate .. //depot/projects/ia64/share/man/man4/Makefile#65 integrate .. //depot/projects/ia64/share/man/man4/aha.4#5 integrate .. //depot/projects/ia64/share/man/man4/ata.4#9 integrate .. //depot/projects/ia64/share/man/man4/digi.4#1 branch .. //depot/projects/ia64/share/man/man4/man4.i386/Makefile#16 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/ndis.4#1 branch .. //depot/projects/ia64/share/man/man4/meteor.4#1 branch .. //depot/projects/ia64/share/man/man4/ng_iface.4#2 integrate .. //depot/projects/ia64/share/man/man9/BUS_SETUP_INTR.9#7 integrate .. //depot/projects/ia64/share/man/man9/Makefile#37 integrate .. //depot/projects/ia64/share/man/man9/bus_alloc_resource.9#4 integrate .. //depot/projects/ia64/share/man/man9/cr_seeothergids.9#1 branch .. //depot/projects/ia64/share/man/man9/cr_seeotheruids.9#1 branch .. //depot/projects/ia64/share/man/man9/hexdump.9#2 integrate .. //depot/projects/ia64/share/man/man9/kobj.9#4 integrate .. //depot/projects/ia64/share/man/man9/mutex.9#11 integrate .. //depot/projects/ia64/share/man/man9/p_candebug.9#1 branch .. //depot/projects/ia64/share/man/man9/prison_check.9#1 branch .. //depot/projects/ia64/sys/alpha/conf/GENERIC#27 integrate .. //depot/projects/ia64/sys/alpha/include/ioctl_bt848.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/ioctl_meteor.h#5 integrate .. //depot/projects/ia64/sys/amd64/acpica/madt.c#4 integrate .. //depot/projects/ia64/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/ia64/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/ia64/sys/amd64/ia32/ia32_sigtramp.S#3 branch .. //depot/projects/ia64/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/ia64/sys/amd64/include/pcvt_ioctl.h#1 branch .. //depot/projects/ia64/sys/boot/Makefile#9 integrate .. //depot/projects/ia64/sys/boot/efi/include/efiapi.h#9 integrate .. //depot/projects/ia64/sys/boot/ficl/Makefile#8 integrate .. //depot/projects/ia64/sys/boot/ficl/loader.c#6 integrate .. //depot/projects/ia64/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/ia64/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/ia64/sys/boot/i386/Makefile#7 integrate .. //depot/projects/ia64/sys/boot/i386/boot0/Makefile#4 integrate .. //depot/projects/ia64/sys/boot/i386/boot0/boot0.s#4 integrate .. //depot/projects/ia64/sys/boot/i386/boot0/boot0sio.s#1 branch .. //depot/projects/ia64/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/ia64/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/acpi_stub.c#3 integrate .. //depot/projects/ia64/sys/boot/powerpc/loader/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/powerpc/loader/conf.c#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#54 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/ia64/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/ia64/sys/compat/ia32/ia32_sigtramp.S#2 delete .. //depot/projects/ia64/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/ia64/sys/compat/ia32/ia32_util.h#3 integrate .. //depot/projects/ia64/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/ia64/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/ia64/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/ia64/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/ia64/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/ia64/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/ia64/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/ia64/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/ia64/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/ia64/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/ia64/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/ia64/sys/conf/Makefile.powerpc#14 integrate .. //depot/projects/ia64/sys/conf/files.amd64#14 integrate .. //depot/projects/ia64/sys/conf/files.i386#50 integrate .. //depot/projects/ia64/sys/conf/files.ia64#51 integrate .. //depot/projects/ia64/sys/conf/options.i386#24 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acconfig.h#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acdisasm.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acenv.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acevents.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acexcep.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acglobal.h#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acmacros.h#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acobject.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpica_prep.sh#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acstruct.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actbl.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actbl1.h#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actbl2.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actypes.h#14 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acutils.h#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbcmds.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbdisply.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbexec.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbfileio.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbstats.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbutils.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmresrc.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmresrcl.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsfield.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsinit.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsmethod.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsmthdat.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsopcode.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsutils.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswexec.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswload.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswscope.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswstate.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evgpeblk.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evmisc.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evregion.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evrgnini.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evxfregn.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exconfig.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/excreate.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exdump.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exfield.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exfldio.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exmisc.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exmutex.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg1.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg3.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exprep.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exregion.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresnte.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresolv.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresop.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exstore.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exstoren.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exsystem.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exutils.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwacpi.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwregs.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwsleep.c#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsaccess.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsalloc.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsdump.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsdumpdv.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsinit.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsobject.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nssearch.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsutils.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsxfname.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/osunixxf.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psargs.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psparse.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psxface.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsaddr.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rscalc.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rscreate.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsdump.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsirq.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rslist.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbconvrt.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbget.c#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbgetall.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbinstal.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbrsdt.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbxface.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbxfroot.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utalloc.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utdebug.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utdelete.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/uteval.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utglobal.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utobject.c#8 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#46 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cpu.c#13 integrate .. //depot/projects/ia64/sys/dev/acpica/madt.h#2 delete .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#29 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#15 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#34 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#35 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#44 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_audio.c#6 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_card.c#7 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_core.c#16 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_i2c.c#6 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_os.c#17 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_tuner.c#4 integrate .. //depot/projects/ia64/sys/dev/bktr/ioctl_bt848.h#1 branch .. //depot/projects/ia64/sys/dev/bktr/ioctl_meteor.h#1 branch .. //depot/projects/ia64/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#28 integrate .. //depot/projects/ia64/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed.c#15 integrate .. //depot/projects/ia64/sys/dev/fe/if_fe.c#8 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.h#3 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/ia64/sys/dev/if_ndis/if_ndis.c#1 branch .. //depot/projects/ia64/sys/dev/if_ndis/if_ndisvar.h#1 branch .. //depot/projects/ia64/sys/dev/led/led.c#3 integrate .. //depot/projects/ia64/sys/dev/lge/if_lge.c#17 integrate .. //depot/projects/ia64/sys/dev/lnc/if_lnc.c#11 integrate .. //depot/projects/ia64/sys/dev/my/if_my.c#16 integrate .. //depot/projects/ia64/sys/dev/nge/if_nge.c#25 integrate .. //depot/projects/ia64/sys/dev/ofw/ofw_disk.c#8 integrate .. //depot/projects/ia64/sys/dev/owi/if_owi.c#4 integrate .. //depot/projects/ia64/sys/dev/puc/pucdata.c#22 integrate .. //depot/projects/ia64/sys/dev/re/if_re.c#9 integrate .. //depot/projects/ia64/sys/dev/sn/if_sn.c#10 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sndstat.c#9 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sound.c#16 integrate .. //depot/projects/ia64/sys/dev/tx/if_tx.c#17 integrate .. //depot/projects/ia64/sys/dev/usb/if_aue.c#26 integrate .. //depot/projects/ia64/sys/dev/usb/if_axe.c#7 integrate .. //depot/projects/ia64/sys/dev/usb/if_cue.c#19 integrate .. //depot/projects/ia64/sys/dev/usb/if_rue.c#6 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#50 integrate .. //depot/projects/ia64/sys/dev/wi/if_wivar.h#17 integrate .. //depot/projects/ia64/sys/dev/xe/if_xe.c#13 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_conv.c#6 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#41 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#33 integrate .. //depot/projects/ia64/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/ia64/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#34 integrate .. //depot/projects/ia64/sys/i386/i386/mptable.c#3 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#32 integrate .. //depot/projects/ia64/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/ia64/sys/i386/include/ioctl_bt848.h#2 integrate .. //depot/projects/ia64/sys/i386/include/ioctl_meteor.h#5 integrate .. //depot/projects/ia64/sys/i386/include/pcvt_ioctl.h#2 integrate .. //depot/projects/ia64/sys/i386/include/sf_buf.h#2 integrate .. //depot/projects/ia64/sys/i386/include/smp.h#10 integrate .. //depot/projects/ia64/sys/ia64/acpica/madt.c#17 integrate .. //depot/projects/ia64/sys/ia64/ia32/Makefile#2 delete .. //depot/projects/ia64/sys/ia64/ia32/ia32.h#3 delete .. //depot/projects/ia64/sys/ia64/ia32/ia32_misc.c#11 delete .. //depot/projects/ia64/sys/ia64/ia32/ia32_proto.h#12 delete .. //depot/projects/ia64/sys/ia64/ia32/ia32_signal.c#1 branch .. //depot/projects/ia64/sys/ia64/ia32/ia32_sigtramp.c#1 branch .. //depot/projects/ia64/sys/ia64/ia32/ia32_syscall.h#13 delete .. //depot/projects/ia64/sys/ia64/ia32/ia32_sysent.c#14 delete .. //depot/projects/ia64/sys/ia64/ia32/ia32_sysvec.c#9 delete .. //depot/projects/ia64/sys/ia64/ia32/ia32_util.h#6 delete .. //depot/projects/ia64/sys/ia64/ia32/syscalls.conf#2 delete .. //depot/projects/ia64/sys/ia64/ia32/syscalls.master#19 delete .. //depot/projects/ia64/sys/ia64/ia64/trap.c#68 integrate .. //depot/projects/ia64/sys/ia64/include/cpufunc.h#12 integrate .. //depot/projects/ia64/sys/ia64/include/ioctl_bt848.h#2 delete .. //depot/projects/ia64/sys/ia64/include/ioctl_meteor.h#5 delete .. //depot/projects/ia64/sys/ia64/include/runq.h#3 integrate .. //depot/projects/ia64/sys/isa/psm.c#19 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#69 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#71 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#30 integrate .. //depot/projects/ia64/sys/kern/subr_mbpool.c#2 integrate .. //depot/projects/ia64/sys/kern/subr_mbuf.c#34 integrate .. //depot/projects/ia64/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#35 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#36 integrate .. //depot/projects/ia64/sys/libkern/iconv_xlat16.c#2 integrate .. //depot/projects/ia64/sys/modules/Makefile#68 integrate .. //depot/projects/ia64/sys/modules/if_ndis/Makefile#1 branch .. //depot/projects/ia64/sys/modules/ndis/Makefile#1 branch .. //depot/projects/ia64/sys/net/if_gre.c#11 integrate .. //depot/projects/ia64/sys/net/route.c#17 integrate .. //depot/projects/ia64/sys/netgraph/atm/ngatmbase.c#2 integrate .. //depot/projects/ia64/sys/netgraph/ng_base.c#15 integrate .. //depot/projects/ia64/sys/netinet6/ip6_mroute.c#14 integrate .. //depot/projects/ia64/sys/netinet6/nd6.c#16 integrate .. //depot/projects/ia64/sys/netkey/key.c#18 integrate .. //depot/projects/ia64/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/ia64/sys/pci/if_pcn.c#20 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#50 integrate .. //depot/projects/ia64/sys/pci/if_sf.c#19 integrate .. //depot/projects/ia64/sys/pci/if_sis.c#31 integrate .. //depot/projects/ia64/sys/pci/if_sk.c#21 integrate .. //depot/projects/ia64/sys/pci/if_ste.c#23 integrate .. //depot/projects/ia64/sys/pci/if_tl.c#16 integrate .. //depot/projects/ia64/sys/pci/if_vr.c#24 integrate .. //depot/projects/ia64/sys/pci/if_wb.c#19 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#44 integrate .. //depot/projects/ia64/sys/powerpc/include/cpufunc.h#12 integrate .. //depot/projects/ia64/sys/powerpc/include/powerpc.h#4 integrate .. //depot/projects/ia64/sys/powerpc/powermac/ata_macio.c#7 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/db_interface.c#3 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#33 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/ofw_machdep.c#8 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#32 integrate .. //depot/projects/ia64/sys/security/mac_test/mac_test.c#17 integrate .. //depot/projects/ia64/sys/sys/iconv.h#7 integrate .. //depot/projects/ia64/sys/sys/ioctl_bt848.h#2 delete .. //depot/projects/ia64/sys/sys/ioctl_meteor.h#5 delete .. //depot/projects/ia64/sys/sys/syscall.h#34 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#34 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#37 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#29 integrate .. //depot/projects/ia64/tools/test/ppsapi/Makefile#1 branch .. //depot/projects/ia64/tools/test/ppsapi/README#1 branch .. //depot/projects/ia64/tools/test/ppsapi/ppsapitest.c#1 branch .. //depot/projects/ia64/tools/tools/ath/80211stats.c#2 integrate .. //depot/projects/ia64/tools/tools/ath/Makefile#3 integrate .. //depot/projects/ia64/tools/tools/ath/athstats.c#4 integrate .. //depot/projects/ia64/tools/tools/crypto/Makefile#6 integrate .. //depot/projects/ia64/tools/tools/tinderbox/etc/Makefile#3 integrate .. //depot/projects/ia64/tools/tools/tinderbox/etc/experimental.rc#4 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tinderbox.1#5 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tinderbox.pl#12 integrate .. //depot/projects/ia64/usr.bin/kdump/kdump.1#4 integrate .. //depot/projects/ia64/usr.bin/kdump/kdump.c#7 integrate .. //depot/projects/ia64/usr.bin/m4/m4.1#9 integrate .. //depot/projects/ia64/usr.bin/vmstat/vmstat.8#6 integrate .. //depot/projects/ia64/usr.bin/vmstat/vmstat.c#17 integrate .. //depot/projects/ia64/usr.sbin/Makefile#55 integrate .. //depot/projects/ia64/usr.sbin/ndiscvt/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/ndiscvt/inf-parse.y#1 branch .. //depot/projects/ia64/usr.sbin/ndiscvt/inf-token.l#1 branch .. //depot/projects/ia64/usr.sbin/ndiscvt/inf.c#1 branch .. //depot/projects/ia64/usr.sbin/ndiscvt/inf.h#1 branch .. //depot/projects/ia64/usr.sbin/ndiscvt/ndiscvt.8#1 branch .. //depot/projects/ia64/usr.sbin/ndiscvt/ndiscvt.c#1 branch Differences ... ==== //depot/projects/ia64/Makefile#35 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.291 2003/11/07 08:36:55 kris Exp $ +# $FreeBSD: src/Makefile,v 1.292 2003/12/09 02:08:19 peter Exp $ # # The user-driven targets are: # @@ -58,12 +58,18 @@ # Define the user-driven targets. These are listed here in alphabetical # order, but that's not important. # +# Targets that begin with underscore are internal targets intended for +# developer convenience only. They are intentionally not documented and +# completely subject to change without notice. +# TGTS= all all-man buildkernel buildworld checkdpadd clean \ cleandepend cleandir depend distribute distributeworld everything \ hierarchy install installcheck installkernel installkernel.debug\ reinstallkernel reinstallkernel.debug installworld \ libraries lint maninstall \ - obj objlink regress rerelease tags update + obj objlink regress rerelease tags update \ + _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ + _build-tools _cross-tools _includes _libraries _depend BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} ==== //depot/projects/ia64/Makefile.inc1#87 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.397 2003/11/16 21:17:43 gordon Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.398 2003/12/09 00:42:44 gad Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -46,19 +46,16 @@ .if exists(${.CURDIR}/include) SUBDIR+= include .endif + +# We must do lib and libexec before bin, because if installworld +# installs a new /bin/sh, the 'make' command will *immediately* +# use that new version. And the new (dynamically-linked) /bin/sh +# will expect to find appropriate libraries in /lib and /libexec. .if exists(${.CURDIR}/lib) SUBDIR+= lib .endif - -# When upgrading to a dynamically linked root, install the runtime -# linker early into its new location before make(1) has a chance -# to run the dynamically linked /bin/sh. -.if !defined(NO_DYNAMICROOT) && !defined(NOPIC) && \ - (!defined(TARGET_ARCH) || ${TARGET_ARCH} == ${MACHINE_ARCH}) && \ - !defined(DISTDIR) && \ - (!defined(DESTDIR) || empty(DESTDIR) || ${DESTDIR} == "/") && \ - !exists(/libexec/ld-elf.so.1) -SUBDIR+= libexec/rtld-elf +.if exists(${.CURDIR}/libexec) +SUBDIR+= libexec .endif .if exists(${.CURDIR}/bin) @@ -74,9 +71,6 @@ !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) SUBDIR+= kerberos5 .endif -.if exists(${.CURDIR}/libexec) -SUBDIR+= libexec -.endif .if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) SUBDIR+= rescue .endif ==== //depot/projects/ia64/UPDATING#59 (text+ko) ==== @@ -50,6 +50,14 @@ netgraph to boot need to make sure to have world and kernel in sync before rebooting. +20031111: + Hyperthreading logical CPU's are no longer probed by default + when using the MP Table. If ACPI is being used, then logical + CPUs will be probed if hyperthreading is enabled in the BIOS. + If ACPI is not being used and hyperthreading is enabled in the + BIOS, logical CPUs can be enabled by building a custom kernel + with the option MPTABLE_FORCE_HTT enabled. + 20031103: The i386 APIC_IO kernel option has been replaced by 'device apic'. The ACPI module has also been temporarily @@ -1431,4 +1439,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.282 2003/11/17 23:25:16 rwatson Exp $ +$FreeBSD: src/UPDATING,v 1.283 2003/12/10 15:59:20 jhb Exp $ ==== //depot/projects/ia64/contrib/libreadline/readline.h#3 (text+ko) ==== @@ -19,7 +19,8 @@ is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -/* $FreeBSD: src/contrib/libreadline/readline.h,v 1.13 2003/08/31 18:29:38 ache Exp $ */ + +/* $FreeBSD: src/contrib/libreadline/readline.h,v 1.14 2003/12/08 01:52:09 obrien Exp $ */ #if !defined (_READLINE_H_) #define _READLINE_H_ ==== //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#18 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#23 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#24 $ */ #include @@ -119,7 +119,7 @@ } /* trim trailing whitespace */ for (len = strlen(buf); len > 0; --len) - if (!isspace(buf[len - 1])) + if (buf[len - 1] != '\r' && buf[len - 1] != '\n') break; buf[len] = '\0'; retval = strdup(buf); @@ -166,26 +166,27 @@ struct pam_response **resp, void *data) { + struct pam_response *aresp; int i; ENTER(); (void)data; if (n <= 0 || n > PAM_MAX_NUM_MSG) RETURNC(PAM_CONV_ERR); - if ((*resp = calloc(n, sizeof **resp)) == NULL) + if ((aresp = calloc(n, sizeof *aresp)) == NULL) RETURNC(PAM_BUF_ERR); for (i = 0; i < n; ++i) { - resp[i]->resp_retcode = 0; - resp[i]->resp = NULL; + aresp[i].resp_retcode = 0; + aresp[i].resp = NULL; switch (msg[i]->msg_style) { case PAM_PROMPT_ECHO_OFF: - (*resp[i]).resp = prompt_echo_off(msg[i]->msg); - if ((*resp[i]).resp == NULL) + aresp[i].resp = prompt_echo_off(msg[i]->msg); + if (aresp[i].resp == NULL) goto fail; break; case PAM_PROMPT_ECHO_ON: - (*resp[i]).resp = prompt(msg[i]->msg); - if ((*resp[i]).resp == NULL) + aresp[i].resp = prompt(msg[i]->msg); + if (aresp[i].resp == NULL) goto fail; break; case PAM_ERROR_MSG: @@ -204,16 +205,18 @@ goto fail; } } + *resp = aresp; RETURNC(PAM_SUCCESS); fail: for (i = 0; i < n; ++i) { - if ((*resp[i]).resp != NULL) { - memset((*resp[i]).resp, 0, strlen((*resp[i]).resp)); - FREE((*resp[i]).resp); + if (aresp[i].resp != NULL) { + memset(aresp[i].resp, 0, strlen(aresp[i].resp)); + FREE(aresp[i].resp); } } - memset(*resp, 0, n * sizeof **resp); - FREE(*resp); + memset(aresp, 0, n * sizeof *aresp); + FREE(aresp); + *resp = NULL; RETURNC(PAM_CONV_ERR); } ==== //depot/projects/ia64/etc/defaults/periodic.conf#10 (text+ko) ==== @@ -10,7 +10,7 @@ # values set in this file. This eases the upgrade path when defaults # are changed and new features are added. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.26 2003/10/27 20:14:53 jesper Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.27 2003/12/12 21:23:27 jesper Exp $ # # What files override these defaults ? @@ -86,7 +86,7 @@ daily_status_disks_df_flags="-k -t nonfs" # df(1) flags for check # 405.status-ata_raid -status_ata_raid_enable="NO" # Check ATA raid status +daily_status_ata_raid_enable="NO" # Check ATA raid status # 420.status-network daily_status_network_enable="YES" # Check network status ==== //depot/projects/ia64/etc/mtree/BSD.include.dist#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.77 2003/11/29 18:22:01 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.78 2003/12/08 07:22:41 obrien Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -28,6 +28,8 @@ dev an .. + bktr + .. firewire .. ic ==== //depot/projects/ia64/etc/rc.d/jail#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.7 2003/10/13 08:20:55 dougb Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.10 2003/12/09 08:51:11 mtm Exp $ # # PROVIDE: jail @@ -100,11 +100,19 @@ # Transitional symlink for old binaries if [ ! -L ${jail_devdir}/log ]; then - devfs_link ${jail_devdir} ../var/run/log log + __pwd="`pwd`" + cd "${jail_devdir}" + ln -sf ../var/run/log log + cd "$__pwd" fi + # XXX - It seems symlinks don't work when there + # is a devfs(5) device of the same name. # Jail console output - devfs_link ${jail_devdir} ../var/log/console console + # __pwd="`pwd`" + # cd "${jail_devdir}" + # ln -sf ../var/log/console console + # cd "$__pwd" fi if checkyesno jail_fdescfs; then info "Mounting fdescfs on ${jail_fdescdir}" @@ -116,7 +124,7 @@ mount -t procfs proc "${jail_procdir}" fi fi - jail 1>/dev/null 2>&1 \ + jail 1>${jail_rootdir}/var/log/console.log 2>&1 \ ${jail_rootdir} ${jail_hostname} ${jail_ip} ${jail_exec} [ "$?" -eq 0 ] && echo -n " $jail_hostname" done @@ -138,14 +146,16 @@ for _jail in ${jail_list} do init_variables $_jail + if checkyesno jail_fdescfs; then + if [ -d ${jail_fdescdir} ] ; then + umount -f ${jail_fdescdir} >/dev/null 2>&1 + fi + fi if checkyesno jail_devfs; then if [ -d ${jail_devdir} ] ; then umount -f ${jail_devdir} >/dev/null 2>&1 fi fi - if checkyesno jail_fdescfs; then - umount -f ${jail_fdescdir} >/dev/null 2>&1 - fi if checkyesno jail_procfs; then if [ -d ${jail_procdir} ] ; then umount -f ${jail_procdir} >/dev/null 2>&1 ==== //depot/projects/ia64/etc/rc.d/mountcritlocal#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.5 2003/06/01 01:43:37 gordon Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.6 2003/12/09 08:17:32 mtm Exp $ # # PROVIDE: mountcritlocal @@ -43,7 +43,7 @@ *) echo 'Mounting /etc/fstab filesystems failed,' \ ' startup aborted' - exit 1 + kill -QUIT $$ ;; esac ;; ==== //depot/projects/ia64/etc/rc.d/root#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: root,v 1.2 2000/05/13 08:45:09 lukem Exp $ -# $FreeBSD: src/etc/rc.d/root,v 1.5 2002/10/31 02:06:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.6 2003/12/09 08:17:33 mtm Exp $ # # PROVIDE: root @@ -27,13 +27,12 @@ *) if ! mount -u -o rw /; then echo 'Mounting root filesystem rw failed, startup aborted' - exit 1 + /bin/kill -QUIT $$ fi ;; esac umount -a >/dev/null 2>&1 - mount / # If we booted a special kernel remove the record # so we will boot the default kernel next time. ==== //depot/projects/ia64/etc/rc.d/syscons#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/etc/rc.d/syscons,v 1.9 2002/09/09 22:40:34 gordon Exp $ +# $FreeBSD: src/etc/rc.d/syscons,v 1.10 2003/12/10 15:48:49 peter Exp $ # # PROVIDE: syscons @@ -44,13 +44,15 @@ syscons_precmd() { - if [ -c $kbddev ] && \ - [ -x /usr/sbin/ispcvt ] && \ - ! /usr/sbin/ispcvt + if [ ! -c $kbddev ] + then + return 1 + fi + if [ -x /usr/sbin/ispcvt ] && /usr/sbin/ispcvt then - return 0 + return 1 fi - return 1 + return 0 } syscons_start() ==== //depot/projects/ia64/etc/rc.subr#15 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.16 2003/08/20 06:50:34 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.17 2003/12/09 08:51:11 mtm Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -1038,29 +1038,30 @@ fi } -# devfs_link dir src link -# Make a symbolic link 'link' to src in chroot/dev. -# Returns 0 on sucess. +# make_symlink src link +# Make a symbolic link 'link' to src from basedir. If the +# directory in which link is to be created does not exist +# a warning will be displayed and an error will be returned. +# Returns 0 on sucess, 1 otherwise. # -devfs_link() +make_symlink() { - local dir src link _me - dir="$1" - src="$2" - link="$3" - _me="devfs_link" + local src link linkdir _me + src="$1" + link="$2" + linkdir="`dirname $link`" + _me="make_symlink()" - if [ -z "$dir" -o -z "$src" -o -z "$link" ]; then - warn "devfs_link(): requires three arguments." + if [ -z "$src" -o -z "$link" ]; then + warn "$_me: requires two arguments." return 1 fi - if [ -z "$dir" ]; then - warn "$_me: the directory ($dir) does not exist" + if [ ! -d "$linkdir" ]; then + warn "$_me: the directory $linkdir does not exist" return 1 fi - cd ${chroot}/dev if ! ln -sf $src $link ; then - warn "$_me: unable to link $link --> $src in $dir" + warn "$_me: unable to make a symbolic link from $link to $src" return 1 fi return 0 ==== //depot/projects/ia64/gnu/usr.bin/cc/include/Makefile#5 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/cc/include/Makefile,v 1.5 2003/04/26 20:04:38 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/include/Makefile,v 1.6 2003/12/09 16:31:30 kan Exp $ .include "../Makefile.inc" .PATH: ${GCCDIR}/config/${GCC_CPU} .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" -INCS= mmintrin.h xmmintrin.h +INCS= emmintrin.h mmintrin.h pmmintrin.h xmmintrin.h .elif ${TARGET_ARCH} == "ia64" INCS= ia64intrin.h .endif ==== //depot/projects/ia64/include/Makefile#34 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.207 2003/11/22 06:08:59 scottl Exp $ +# $FreeBSD: src/include/Makefile,v 1.209 2003/12/08 07:22:41 obrien Exp $ # # Doing a "make install" builds /usr/include. @@ -31,8 +31,8 @@ netipsec netipx netkey netnatm netncp netsmb nfs nfsclient nfsserver \ pccard posix4 sys vm -LSUBDIRS= cam/scsi dev/an dev/ic dev/iicbus dev/firewire dev/ofw \ - dev/ppbus dev/smbus dev/usb dev/wi dev/utopia fs/devfs \ +LSUBDIRS= cam/scsi dev/an dev/bktr dev/firewire dev/ic dev/iicbus \ + dev/ofw dev/ppbus dev/smbus dev/usb dev/wi dev/utopia fs/devfs \ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/udf fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ @@ -100,11 +100,14 @@ done .endif .endfor -.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} +.for i in ${LDIRS} ${LSUBDIRS:Ndev/bktr} ${LSUBSUBDIRS} cd ${.CURDIR}/../sys; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \ ${DESTDIR}${INCLUDEDIR}/$i .endfor + cd ${.CURDIR}/../sys/dev/bktr; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ioctl_*.h \ + ${DESTDIR}${INCLUDEDIR}/dev/bktr cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/netinet ==== //depot/projects/ia64/lib/libc/Makefile#12 (text+ko) ==== @@ -1,15 +1,15 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.45 2003/11/17 04:20:02 nectar Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.47 2003/12/11 09:53:25 bde Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does # not contain these strings, add -DSTRIP_FBSDID (see ) to CFLAGS -# below. Note, there are no IDs for syscall stubs whose sources are generated. -# To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS -# (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the -# system call stubs. +# below. Note: there are no IDs for syscall stubs whose sources are generated. +# To include legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS +# to CFLAGS below. -DSYSLIBC_SCCS affects just the system call stubs. LIB=c -# If you bump SHLIB_MAJOR, remove kluge from gen/gethostname.c. +# If you bump SHLIB_MAJOR, remove the kluge from gen/gethostname.c. +# If you bump SHLIB_MAJOR, see standards/55112. SHLIB_MAJOR= 5 SHLIBDIR?= /lib WARNS?= 1 ==== //depot/projects/ia64/lib/libc/locale/setrunelocale.c#10 (text+ko) ==== @@ -38,7 +38,7 @@ #define OBSOLETE_IN_6 #include -__FBSDID("$FreeBSD: src/lib/libc/locale/setrunelocale.c,v 1.33 2003/11/05 22:52:51 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/setrunelocale.c,v 1.34 2003/12/08 23:52:22 tjr Exp $"); #include #include @@ -71,6 +71,10 @@ mbstate_t * __restrict ps); extern rune_t __emulated_sgetrune(const char *, size_t, const char **); extern int __emulated_sputrune(rune_t, char *, size_t, char **); +extern size_t _none_mbrtowc(wchar_t * __restrict, const char * __restrict, + size_t, mbstate_t * __restrict); +extern size_t _none_wcrtomb(char * __restrict, wchar_t, + mbstate_t * __restrict); static int __setrunelocale(const char *); @@ -104,6 +108,10 @@ static char ctype_encoding[ENCODING_LEN + 1]; static _RuneLocale *CachedRuneLocale; static int Cached__mb_cur_max; + static size_t (*Cached__mbrtowc)(wchar_t * __restrict, + const char * __restrict, size_t, mbstate_t * __restrict); + static size_t (*Cached__wcrtomb)(char * __restrict, wchar_t, + mbstate_t * __restrict); /* * The "C" and "POSIX" locale are always here. @@ -111,6 +119,8 @@ if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0) { _CurrentRuneLocale = &_DefaultRuneLocale; __mb_cur_max = 1; + __mbrtowc = _none_mbrtowc; + __wcrtomb = _none_wcrtomb; return (0); } @@ -121,6 +131,8 @@ strcmp(encoding, ctype_encoding) == 0) { _CurrentRuneLocale = CachedRuneLocale; __mb_cur_max = Cached__mb_cur_max; + __mbrtowc = Cached__mbrtowc; + __wcrtomb = Cached__wcrtomb; return (0); } @@ -177,6 +189,8 @@ } CachedRuneLocale = _CurrentRuneLocale; Cached__mb_cur_max = __mb_cur_max; + Cached__mbrtowc = __mbrtowc; + Cached__wcrtomb = __wcrtomb; (void)strcpy(ctype_encoding, encoding); } else >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 13 10:39:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7A0B16A4D0; Sat, 13 Dec 2003 10:39:17 -0800 (PST) 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 A1DD016A4CE for ; Sat, 13 Dec 2003 10:39:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25ECB43D3C for ; Sat, 13 Dec 2003 10:39:16 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBDIdFXJ057359 for ; Sat, 13 Dec 2003 10:39:15 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBDIdFN9057356 for perforce@freebsd.org; Sat, 13 Dec 2003 10:39:15 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sat, 13 Dec 2003 10:39:15 -0800 (PST) Message-Id: <200312131839.hBDIdFN9057356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43903 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 Dec 2003 18:39:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=43903 Change 43903 by sam@sam_ebb on 2003/12/13 10:38:26 only expect a negotiated rate set when operating in station mode; this corrects a problem where marking the interface up in monitor mode w/o first operating in another mode would cause an assertion failure note this may be suboptimal for adhoc mode; we may want to default to a base rate other than the lowest Affected files ... .. //depot/projects/netperf/sys/dev/ath/if_ath.c#48 edit Differences ... ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#48 (text+ko) ==== @@ -2774,7 +2774,21 @@ struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_node *ni; - if (ic->ic_opmode != IEEE80211_M_STA) { + if (ic->ic_opmode == IEEE80211_M_STA) { + /* + * Reset local xmit state; this is really only + * meaningful when operating in station mode. + */ + ni = ic->ic_bss; + if (state == IEEE80211_S_RUN) { + /* start with highest negotiated rate */ + KASSERT(ni->ni_rates.rs_nrates > 0, + ("transition to RUN state w/ no rates!")); + ath_rate_update(sc, ni, ni->ni_rates.rs_nrates - 1); + } else { + ath_rate_update(sc, ni, 0); + } + } else { /* * When operating as a station the node table holds * the AP's that were discovered during scanning. @@ -2783,19 +2797,7 @@ */ TAILQ_FOREACH(ni, &ic->ic_node, ni_list) ath_rate_update(sc, ni, 0); /* use lowest rate */ - } - /* - * Reset local xmit state; this is really only meaningful - * when operating in station or adhoc mode. - */ - ni = ic->ic_bss; - if (state == IEEE80211_S_RUN) { - /* start with highest negotiated rate */ - KASSERT(ni->ni_rates.rs_nrates > 0, - ("transition to RUN state w/ no rates!")); - ath_rate_update(sc, ni, ni->ni_rates.rs_nrates - 1); - } else { - ath_rate_update(sc, ni, 0); /* use lowest rate */ + ath_rate_update(sc, ic->ic_bss, 0); } } From owner-p4-projects@FreeBSD.ORG Sat Dec 13 10:44:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34A1E16A4D0; Sat, 13 Dec 2003 10:44:35 -0800 (PST) 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 0C0DE16A4CE for ; Sat, 13 Dec 2003 10:44:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3CFBB43D1D for ; Sat, 13 Dec 2003 10:44:23 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBDIiNXJ057634 for ; Sat, 13 Dec 2003 10:44:23 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBDIiMgS057631 for perforce@freebsd.org; Sat, 13 Dec 2003 10:44:22 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sat, 13 Dec 2003 10:44:22 -0800 (PST) Message-Id: <200312131844.hBDIiMgS057631@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43904 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 Dec 2003 18:44:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=43904 Change 43904 by sam@sam_ebb on 2003/12/13 10:43:48 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/netperf+sockets/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/netperf+sockets/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/netperf+sockets/sys/boot/i386/boot0/boot0.s#4 integrate .. //depot/projects/netperf+sockets/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/netperf+sockets/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/netperf+sockets/sys/compat/ia32/ia32_sigtramp.S#2 delete .. //depot/projects/netperf+sockets/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/netperf+sockets/sys/compat/ia32/ia32_util.h#2 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/netperf+sockets/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/netperf+sockets/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/netperf+sockets/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/netperf+sockets/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/netperf+sockets/sys/conf/files.amd64#3 integrate .. //depot/projects/netperf+sockets/sys/conf/files.i386#3 integrate .. //depot/projects/netperf+sockets/sys/conf/files.ia64#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/sbp.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndis.c#1 branch .. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndisvar.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/led/led.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/netperf+sockets/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/netperf+sockets/sys/i386/include/smp.h#3 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia32/Makefile#2 delete .. //depot/projects/netperf+sockets/sys/ia64/ia32/ia32.h#2 delete .. //depot/projects/netperf+sockets/sys/ia64/ia32/ia32_misc.c#2 delete .. //depot/projects/netperf+sockets/sys/ia64/ia32/ia32_proto.h#3 delete .. //depot/projects/netperf+sockets/sys/ia64/ia32/ia32_signal.c#1 branch .. //depot/projects/netperf+sockets/sys/ia64/ia32/ia32_sigtramp.c#1 branch .. //depot/projects/netperf+sockets/sys/ia64/ia32/ia32_syscall.h#3 delete .. //depot/projects/netperf+sockets/sys/ia64/ia32/ia32_sysent.c#3 delete .. //depot/projects/netperf+sockets/sys/ia64/ia32/ia32_sysvec.c#2 delete .. //depot/projects/netperf+sockets/sys/ia64/ia32/ia32_util.h#2 delete .. //depot/projects/netperf+sockets/sys/ia64/ia32/syscalls.conf#2 delete .. //depot/projects/netperf+sockets/sys/ia64/ia32/syscalls.master#3 delete .. //depot/projects/netperf+sockets/sys/ia64/include/cpufunc.h#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/include/runq.h#2 integrate .. //depot/projects/netperf+sockets/sys/isa/psm.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/init_sysent.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/sched_ule.c#4 integrate .. //depot/projects/netperf+sockets/sys/kern/syscalls.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/syscalls.master#3 integrate .. //depot/projects/netperf+sockets/sys/modules/Makefile#4 integrate .. //depot/projects/netperf+sockets/sys/modules/if_ndis/Makefile#1 branch .. //depot/projects/netperf+sockets/sys/modules/ndis/Makefile#1 branch .. //depot/projects/netperf+sockets/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/netperf+sockets/sys/pci/if_sis.c#4 integrate .. //depot/projects/netperf+sockets/sys/sys/syscall.h#3 integrate .. //depot/projects/netperf+sockets/sys/sys/syscall.mk#3 integrate .. //depot/projects/netperf+sockets/sys/sys/sysproto.h#3 integrate .. //depot/projects/netperf/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/netperf/sys/conf/majors#9 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_cpu.c#9 integrate .. //depot/projects/netperf/sys/dev/bktr/msp34xx.c#3 integrate .. //depot/projects/netperf/sys/dev/ciss/ciss.c#8 integrate .. //depot/projects/netperf/sys/dev/firewire/sbp_targ.c#4 integrate .. //depot/projects/netperf/sys/dev/md/md.c#8 edit .. //depot/projects/netperf/sys/kern/kern_switch.c#5 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/amd64/amd64/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.230 2003/12/03 14:57:25 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.231 2003/12/11 02:47:35 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -163,9 +163,9 @@ cpu_add(u_int apic_id, char boot_cpu) { - if (apic_id > MAXCPU) { + if (apic_id >= MAXCPU) { printf("SMP: CPU %d exceeds maximum CPU %d, ignoring\n", - apic_id, MAXCPU); + apic_id, MAXCPU - 1); return; } KASSERT(cpu_info[apic_id].cpu_present == 0, ("CPU %d added twice", ==== //depot/projects/netperf+sockets/sys/amd64/amd64/mptable.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.228 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.229 2003/12/11 02:47:35 peter Exp $"); #include #include @@ -54,7 +54,7 @@ /* string defined by the Intel MP Spec as identifying the MP table */ #define MP_SIG 0x5f504d5f /* _MP_ */ -#define NAPICID 32 /* Max number of I/O APIC's */ +#define NAPICID 32 /* Max number of APIC's */ #define BIOS_BASE (0xf0000) #define BIOS_SIZE (0x10000) @@ -811,7 +811,7 @@ * physical processor. If any of those ID's are * already in the table, then kill the fixup. */ - for (id = 0; id <= MAXCPU; id++) { + for (id = 0; id < NAPICID; id++) { if ((id_mask & 1 << id) == 0) continue; /* First, make sure we are on a logical_cpus boundary. */ ==== //depot/projects/netperf+sockets/sys/amd64/include/apicreg.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.25 2003/11/03 21:53:38 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.26 2003/12/11 02:48:25 peter Exp $ */ #ifndef _MACHINE_APICREG_H_ @@ -342,38 +342,6 @@ #define APIC_TDCR_128 0x0a #define APIC_TDCR_1 0x0b - -/* - * fields in IRR - * ISA INTerrupts are in bits 16-31 of the 1st IRR register. - * these masks DON'T EQUAL the isa IRQs of the same name. - */ -#define APIC_IRQ0 0x00000001 -#define APIC_IRQ1 0x00000002 -#define APIC_IRQ2 0x00000004 -#define APIC_IRQ3 0x00000008 -#define APIC_IRQ4 0x00000010 -#define APIC_IRQ5 0x00000020 -#define APIC_IRQ6 0x00000040 -#define APIC_IRQ7 0x00000080 -#define APIC_IRQ8 0x00000100 -#define APIC_IRQ9 0x00000200 -#define APIC_IRQ10 0x00000400 -#define APIC_IRQ11 0x00000800 -#define APIC_IRQ12 0x00001000 -#define APIC_IRQ13 0x00002000 -#define APIC_IRQ14 0x00004000 -#define APIC_IRQ15 0x00008000 -#define APIC_IRQ16 0x00010000 -#define APIC_IRQ17 0x00020000 -#define APIC_IRQ18 0x00040000 -#define APIC_IRQ19 0x00080000 -#define APIC_IRQ20 0x00100000 -#define APIC_IRQ21 0x00200000 -#define APIC_IRQ22 0x00400000 -#define APIC_IRQ23 0x00800000 - - /****************************************************************************** * I/O APIC defines */ ==== //depot/projects/netperf+sockets/sys/boot/i386/boot0/boot0.s#4 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.28 2003/12/09 05:40:06 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.29 2003/12/11 20:40:12 jhb Exp $ # A 512-byte boot manager. @@ -176,7 +176,7 @@ callw putx # item # # Now that we've printed the drive (if we needed to), display a prompt. -# Get ready for the input byte noting the time. +# Get ready for the input by noting the time. # main.7: movw $prompt,%si # Display callw putstr # prompt ==== //depot/projects/netperf+sockets/sys/boot/i386/cdboot/cdboot.s#2 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.9 2001/11/07 01:20:33 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.10 2003/12/11 22:42:50 jhb Exp $ # # This program is a freestanding boot program to load an a.out binary @@ -139,10 +139,26 @@ jmp error # Halt have_vd: # Have Primary VD # -# Lookup the loader binary. +# Try to look up the loader binary using the paths in the loader_paths +# array. # - mov $loader_path,%si # File to lookup - call lookup # Try to find it + mov $loader_paths,%si # Point to start of array +lookup_path: push %si # Save file name pointer + call lookup # Try to find file + pop %di # Restore file name pointer + jnc lookup_found # Found this file + xor %al,%al # Look for next + mov $0xffff,%cx # path name by + repnz # scanning for + scasb # nul char + inc %di # Skip nul + mov %di,%si # Point %si at next path + mov (%si),%al # Get first char of next path + or %al,%al # Is it double nul? + jnz lookup_path # No, try it. + mov $msg_failed,%si # Failed message + jmp error # Halt +lookup_found: # Found a loader file # # Load the binary into the buffer. Due to real mode addressing limitations # we have to read it in in 64k chunks. @@ -266,7 +282,8 @@ # Lookup the file in the path at [SI] from the root directory. # # Trashes: All but BX -# Returns: BX = pointer to record +# Returns: CF = 0 (success), BX = pointer to record +# CF = 1 (not found) # lookup: mov $VD_ROOTDIR+MEM_VOLDESC,%bx # Root directory record push %si @@ -286,17 +303,21 @@ dec %si # Undo lodsb side effect call find_file # Lookup first path item jnc lookup_dir # Try next component - mov $msg_lookupfail,%si # Not found. + mov $msg_lookupfail,%si # Not found message + call putstr + stc # Set carry + ret jmp error lookup_done: mov $msg_lookupok,%si # Success message call putstr + clc # Clear carry ret # # Lookup file at [SI] in directory whose record is at [BX]. # # Trashes: All but returns -# Returns: CF = 0 (success), BX = pointer to record, SX = next path item +# Returns: CF = 0 (success), BX = pointer to record, SI = next path item # CF = 1 (not found), SI = preserved # find_file: mov DIR_EXTENT(%bx),%eax # Load extent @@ -536,7 +557,7 @@ twiddle_index: .byte 0x0 -msg_welcome: .asciz "CD Loader 1.01\r\n\n" +msg_welcome: .asciz "CD Loader 1.2\r\n\n" msg_bootinfo: .asciz "Building the boot loader arguments\r\n" msg_relocate: .asciz "Relocating the loader and the BTX\r\n" msg_jump: .asciz "Starting the BTX loader\r\n" @@ -548,6 +569,9 @@ msg_lookupok: .asciz "Found\r\n" msg_lookupfail: .asciz "File not found\r\n" msg_load2big: .asciz "File too big\r\n" -loader_path: .asciz "/BOOT/LOADER" +msg_failed: .asciz "Boot failed\r\n" twiddle_chars: .ascii "|/-\\" +loader_paths: .asciz "/BOOT/LOADER" + .asciz "/boot/loader" + .byte 0 ==== //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_misc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.15 2003/11/07 21:27:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.16 2003/12/11 02:34:49 peter Exp $"); #include "opt_compat.h" @@ -761,29 +761,21 @@ freebsd32_gettimeofday(struct thread *td, struct freebsd32_gettimeofday_args *uap) { - int error; - caddr_t sg; - struct timeval32 *p32, s32; - struct timeval *p = NULL, s; + struct timeval atv; + struct timeval32 atv32; + struct timezone rtz; + int error = 0; - p32 = uap->tp; - if (p32) { - sg = stackgap_init(); - p = stackgap_alloc(&sg, sizeof(struct timeval)); - uap->tp = (struct timeval32 *)p; + if (uap->tp) { + microtime(&atv); + CP(atv, atv32, tv_sec); + CP(atv, atv32, tv_usec); + error = copyout(&atv32, uap->tp, sizeof (atv32)); } - error = gettimeofday(td, (struct gettimeofday_args *) uap); - if (error) - return (error); - if (p32) { - error = copyin(p, &s, sizeof(s)); - if (error) - return (error); - CP(s, s32, tv_sec); - CP(s, s32, tv_usec); - error = copyout(&s32, p32, sizeof(s32)); - if (error) - return (error); + if (error == 0 && uap->tzp != NULL) { + rtz.tz_minuteswest = tz_minuteswest; + rtz.tz_dsttime = tz_dsttime; + error = copyout(&rtz, uap->tzp, sizeof (rtz)); } return (error); } ==== //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.14 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.16 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.14 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.16 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ #define FREEBSD32_SYS_syscall 0 @@ -53,7 +53,7 @@ #define FREEBSD32_SYS_getlogin 49 #define FREEBSD32_SYS_setlogin 50 #define FREEBSD32_SYS_acct 51 -#define FREEBSD32_SYS_sigpending 52 + /* 52 is obsolete osigpending */ #define FREEBSD32_SYS_freebsd32_sigaltstack 53 #define FREEBSD32_SYS_ioctl 54 #define FREEBSD32_SYS_reboot 55 @@ -98,7 +98,7 @@ #define FREEBSD32_SYS_setpriority 96 #define FREEBSD32_SYS_socket 97 #define FREEBSD32_SYS_connect 98 -#define FREEBSD32_SYS_accept 99 + /* 99 is obsolete oaccept */ #define FREEBSD32_SYS_getpriority 100 /* 101 is obsolete osend */ /* 102 is obsolete orecv */ @@ -123,7 +123,7 @@ #define FREEBSD32_SYS_freebsd32_settimeofday 122 #define FREEBSD32_SYS_fchown 123 #define FREEBSD32_SYS_fchmod 124 -#define FREEBSD32_SYS_recvfrom 125 + /* 125 is obsolete orecvfrom */ #define FREEBSD32_SYS_setreuid 126 #define FREEBSD32_SYS_setregid 127 #define FREEBSD32_SYS_rename 128 @@ -149,7 +149,7 @@ #define FREEBSD32_SYS_quotactl 148 /* 149 is obsolete oquota */ /* 150 is obsolete ogetsockname */ -#define FREEBSD32_SYS_getdirentries 156 + /* 156 is obsolete ogetdirentries */ #define FREEBSD32_SYS_freebsd32_statfs 157 #define FREEBSD32_SYS_freebsd32_fstatfs 158 #define FREEBSD32_SYS_getfh 161 @@ -295,4 +295,4 @@ #define FREEBSD32_SYS__umtx_lock 434 #define FREEBSD32_SYS__umtx_unlock 435 #define FREEBSD32_SYS_jail_attach 436 -#define FREEBSD32_SYS_MAXSYSCALL 437 +#define FREEBSD32_SYS_MAXSYSCALL 441 ==== //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_syscalls.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.5 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.7 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ const char *freebsd32_syscallnames[] = { @@ -59,7 +59,7 @@ "getlogin", /* 49 = getlogin */ "setlogin", /* 50 = setlogin */ "acct", /* 51 = acct */ - "sigpending", /* 52 = sigpending */ + "obs_osigpending", /* 52 = obsolete osigpending */ "freebsd32_sigaltstack", /* 53 = freebsd32_sigaltstack */ "ioctl", /* 54 = ioctl */ "reboot", /* 55 = reboot */ @@ -106,7 +106,7 @@ "setpriority", /* 96 = setpriority */ "socket", /* 97 = socket */ "connect", /* 98 = connect */ - "accept", /* 99 = accept */ + "obs_oaccept", /* 99 = obsolete oaccept */ "getpriority", /* 100 = getpriority */ "obs_osend", /* 101 = obsolete osend */ "obs_orecv", /* 102 = obsolete orecv */ @@ -132,7 +132,7 @@ "freebsd32_settimeofday", /* 122 = freebsd32_settimeofday */ "fchown", /* 123 = fchown */ "fchmod", /* 124 = fchmod */ - "recvfrom", /* 125 = recvfrom */ + "obs_orecvfrom", /* 125 = obsolete orecvfrom */ "setreuid", /* 126 = setreuid */ "setregid", /* 127 = setregid */ "rename", /* 128 = rename */ @@ -163,7 +163,7 @@ "#153", /* 153 = asyncdaemon */ "#154", /* 154 = nosys */ "#155", /* 155 = nfssvc */ - "getdirentries", /* 156 = getdirentries */ + "obs_ogetdirentries", /* 156 = obsolete ogetdirentries */ "freebsd32_statfs", /* 157 = freebsd32_statfs */ "freebsd32_fstatfs", /* 158 = freebsd32_fstatfs */ "#159", /* 159 = nosys */ @@ -444,4 +444,8 @@ "_umtx_lock", /* 434 = _umtx_lock */ "_umtx_unlock", /* 435 = _umtx_unlock */ "jail_attach", /* 436 = jail_attach */ + "#437", /* 437 = extattr_list_fd */ + "#438", /* 438 = extattr_list_file */ + "#439", /* 439 = extattr_list_link */ + "#440", /* 440 = kse_switchin */ }; ==== //depot/projects/netperf+sockets/sys/compat/freebsd32/freebsd32_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.15 2003/11/08 07:31:49 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.17 2003/12/11 02:36:37 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp */ #include "opt_compat.h" @@ -77,7 +77,7 @@ { SYF_MPSAFE | AS(getlogin_args), (sy_call_t *)getlogin }, /* 49 = getlogin */ { SYF_MPSAFE | AS(setlogin_args), (sy_call_t *)setlogin }, /* 50 = setlogin */ { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct }, /* 51 = acct */ - { SYF_MPSAFE | 0, (sy_call_t *)sigpending }, /* 52 = sigpending */ + { 0, (sy_call_t *)nosys }, /* 52 = obsolete osigpending */ { SYF_MPSAFE | AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack }, /* 53 = freebsd32_sigaltstack */ { SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl }, /* 54 = ioctl */ { SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot }, /* 55 = reboot */ @@ -124,7 +124,7 @@ { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority }, /* 96 = setpriority */ { SYF_MPSAFE | AS(socket_args), (sy_call_t *)socket }, /* 97 = socket */ { SYF_MPSAFE | AS(connect_args), (sy_call_t *)connect }, /* 98 = connect */ - { SYF_MPSAFE | AS(accept_args), (sy_call_t *)accept }, /* 99 = accept */ + { 0, (sy_call_t *)nosys }, /* 99 = obsolete oaccept */ { SYF_MPSAFE | AS(getpriority_args), (sy_call_t *)getpriority }, /* 100 = getpriority */ { 0, (sy_call_t *)nosys }, /* 101 = obsolete osend */ { 0, (sy_call_t *)nosys }, /* 102 = obsolete orecv */ @@ -141,7 +141,7 @@ { 0, (sy_call_t *)nosys }, /* 113 = obsolete orecvmsg */ { 0, (sy_call_t *)nosys }, /* 114 = obsolete osendmsg */ { 0, (sy_call_t *)nosys }, /* 115 = obsolete vtrace */ - { AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday }, /* 116 = freebsd32_gettimeofday */ + { SYF_MPSAFE | AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday }, /* 116 = freebsd32_gettimeofday */ { AS(freebsd32_getrusage_args), (sy_call_t *)freebsd32_getrusage }, /* 117 = freebsd32_getrusage */ { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys }, /* 119 = resuba */ @@ -150,7 +150,7 @@ { AS(freebsd32_settimeofday_args), (sy_call_t *)freebsd32_settimeofday }, /* 122 = freebsd32_settimeofday */ { AS(fchown_args), (sy_call_t *)fchown }, /* 123 = fchown */ { AS(fchmod_args), (sy_call_t *)fchmod }, /* 124 = fchmod */ - { SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)recvfrom }, /* 125 = recvfrom */ + { 0, (sy_call_t *)nosys }, /* 125 = obsolete orecvfrom */ { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid }, /* 126 = setreuid */ { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid }, /* 127 = setregid */ { AS(rename_args), (sy_call_t *)rename }, /* 128 = rename */ @@ -181,7 +181,7 @@ { 0, (sy_call_t *)nosys }, /* 153 = asyncdaemon */ { 0, (sy_call_t *)nosys }, /* 154 = nosys */ { 0, (sy_call_t *)nosys }, /* 155 = nfssvc */ - { AS(getdirentries_args), (sy_call_t *)getdirentries }, /* 156 = getdirentries */ + { 0, (sy_call_t *)nosys }, /* 156 = obsolete ogetdirentries */ { AS(freebsd32_statfs_args), (sy_call_t *)freebsd32_statfs }, /* 157 = freebsd32_statfs */ { AS(freebsd32_fstatfs_args), (sy_call_t *)freebsd32_fstatfs }, /* 158 = freebsd32_fstatfs */ { 0, (sy_call_t *)nosys }, /* 159 = nosys */ @@ -462,4 +462,8 @@ { SYF_MPSAFE | AS(_umtx_lock_args), (sy_call_t *)_umtx_lock }, /* 434 = _umtx_lock */ { SYF_MPSAFE | AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock }, /* 435 = _umtx_unlock */ { SYF_MPSAFE | AS(jail_attach_args), (sy_call_t *)jail_attach }, /* 436 = jail_attach */ + { 0, (sy_call_t *)nosys }, /* 437 = extattr_list_fd */ + { 0, (sy_call_t *)nosys }, /* 438 = extattr_list_file */ + { 0, (sy_call_t *)nosys }, /* 439 = extattr_list_link */ + { 0, (sy_call_t *)nosys }, /* 440 = kse_switchin */ }; ==== //depot/projects/netperf+sockets/sys/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -110,7 +110,7 @@ 49 MNOPROTO BSD { int getlogin(char *namebuf, u_int namelen); } 50 MNOPROTO BSD { int setlogin(char *namebuf); } 51 MNOPROTO BSD { int acct(char *path); } -52 MNOPROTO POSIX { int sigpending(void); } +52 OBSOL POSIX osigpending 53 MSTD BSD { int freebsd32_sigaltstack(struct sigaltstack32 *ss, \ struct sigaltstack32 *oss); } 54 MNOPROTO POSIX { int ioctl(int fd, u_long com, caddr_t data); } @@ -171,8 +171,7 @@ 96 MNOPROTO BSD { int setpriority(int which, int who, int prio); } 97 MNOPROTO BSD { int socket(int domain, int type, int protocol); } 98 MNOPROTO BSD { int connect(int s, caddr_t name, int namelen); } -99 MNOPROTO BSD { int accept(int s, caddr_t name, int *anamelen); } \ - accept accept_args int +99 OBSOL BSD oaccept 100 MNOPROTO BSD { int getpriority(int which, int who); } 101 OBSOL BSD osend 102 OBSOL BSD orecv @@ -190,7 +189,7 @@ 113 OBSOL BSD orecvmsg 114 OBSOL BSD osendmsg 115 OBSOL NOHIDE vtrace -116 STD BSD { int freebsd32_gettimeofday(struct timeval32 *tp, \ +116 MSTD BSD { int freebsd32_gettimeofday(struct timeval32 *tp, \ struct timezone *tzp); } 117 STD BSD { int freebsd32_getrusage(int who, \ struct rusage32 *rusage); } @@ -205,9 +204,7 @@ struct timezone *tzp); } 123 NOPROTO BSD { int fchown(int fd, int uid, int gid); } 124 NOPROTO BSD { int fchmod(int fd, int mode); } -125 MNOPROTO BSD { int recvfrom(int s, caddr_t buf, size_t len, \ - int flags, caddr_t from, int *fromlenaddr); } \ - recvfrom recvfrom_args int +125 OBSOL BSD orecvfrom 126 MNOPROTO BSD { int setreuid(int ruid, int euid); } 127 MNOPROTO BSD { int setregid(int rgid, int egid); } 128 NOPROTO POSIX { int rename(char *from, char *to); } @@ -249,8 +246,7 @@ 154 UNIMPL NOHIDE nosys ; 155 is initialized by the NFS code, if present. 155 UNIMPL NOHIDE nfssvc -156 NOPROTO BSD { int getdirentries(int fd, char *buf, u_int count, \ - long *basep); } +156 OBSOL BSD ogetdirentries 157 STD BSD { int freebsd32_statfs(char *path, \ struct statfs32 *buf); } 158 STD BSD { int freebsd32_fstatfs(int fd, struct statfs32 *buf); } @@ -633,4 +629,7 @@ 434 MNOPROTO BSD { int _umtx_lock(struct umtx *umtx); } 435 MNOPROTO BSD { int _umtx_unlock(struct umtx *umtx); } 436 MNOPROTO BSD { int jail_attach(int jid); } - +437 UNIMPL BSD extattr_list_fd +438 UNIMPL BSD extattr_list_file +439 UNIMPL BSD extattr_list_link +440 UNIMPL BSD kse_switchin ==== //depot/projects/netperf+sockets/sys/compat/ia32/ia32_sysvec.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.12 2003/11/08 07:43:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.14 2003/12/11 01:05:09 peter Exp $"); #include "opt_compat.h" @@ -66,10 +66,17 @@ #include #include +#include #include +#ifdef __amd64__ #include #include #include +#else +#include +#include +#include +#endif #include #include #include @@ -93,7 +100,7 @@ SYSCTL_NODE(_compat, OID_AUTO, ia32, CTLFLAG_RW, 0, "ia32 mode"); struct sysentvec ia32_freebsd_sysvec = { - SYS_MAXSYSCALL, + FREEBSD32_SYS_MAXSYSCALL, freebsd32_sysent, 0, 0, @@ -110,7 +117,7 @@ elf32_coredump, NULL, MINSIGSTKSZ, - PAGE_SIZE, + IA32_PAGE_SIZE, 0, FREEBSD32_USRSTACK, FREEBSD32_USRSTACK, ==== //depot/projects/netperf+sockets/sys/compat/ia32/ia32_util.h#2 (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/compat/ia32/ia32_util.h,v 1.8 2003/09/25 01:10:23 peter Exp $ + * $FreeBSD: src/sys/compat/ia32/ia32_util.h,v 1.9 2003/12/11 01:05:09 peter Exp $ */ #include @@ -37,8 +37,13 @@ #include #include -#define FREEBSD32_USRSTACK ((1ul << 32) - PAGE_SIZE) +#ifdef __ia64__ +#define FREEBSD32_USRSTACK ((1ul << 32) - IA32_PAGE_SIZE * 2) +#else +#define FREEBSD32_USRSTACK ((1ul << 32) - IA32_PAGE_SIZE) +#endif +#define IA32_PAGE_SIZE 4096 #define IA32_MAXDSIZ (512*1024*1024) /* 512MB */ #define IA32_MAXSSIZ (64*1024*1024) /* 64MB */ #define IA32_MAXVMEM 0 /* Unlimited */ ==== //depot/projects/netperf+sockets/sys/conf/files.amd64#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.26 2003/11/17 08:58:16 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.27 2003/12/11 01:09:51 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -116,10 +116,10 @@ # amd64/ia32/ia32_exception.S optional ia32 amd64/ia32/ia32_signal.c optional ia32 +amd64/ia32/ia32_sigtramp.S optional ia32 amd64/ia32/ia32_syscall.c optional ia32 compat/freebsd32/freebsd32_misc.c optional ia32 compat/freebsd32/freebsd32_syscalls.c optional ia32 compat/freebsd32/freebsd32_sysent.c optional ia32 -compat/ia32/ia32_sigtramp.S optional ia32 compat/ia32/ia32_sysvec.c optional ia32 kern/imgact_elf32.c optional ia32 ==== //depot/projects/netperf+sockets/sys/conf/files.i386#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.459 2003/12/07 04:18:51 imp Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.460 2003/12/11 22:34:36 wpaul Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -74,6 +74,11 @@ compat/linux/linux_sysctl.c optional compat_linux compat/linux/linux_uid16.c optional compat_linux compat/linux/linux_util.c optional compat_linux +compat/ndis/kern_ndis.c optional ndisapi pci pccard +compat/ndis/subr_hal.c optional ndisapi pci pccard +compat/ndis/subr_ndis.c optional ndisapi pci pccard +compat/ndis/subr_ntoskrnl.c optional ndisapi pci pccard +compat/ndis/subr_pe.c optional ndisapi pci pccard compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 @@ -127,6 +132,7 @@ dev/fb/splash.c optional splash dev/fb/vga.c optional vga dev/fe/if_fe_isa.c optional fe isa +dev/if_ndis/if_ndis.c optional ndis pci pccard dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd ==== //depot/projects/netperf+sockets/sys/conf/files.ia64#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.61 2003/10/24 06:48:41 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.63 2003/12/11 01:05:09 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -28,6 +28,10 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # +compat/freebsd32/freebsd32_misc.c optional ia32 +compat/freebsd32/freebsd32_syscalls.c optional ia32 +compat/freebsd32/freebsd32_sysent.c optional ia32 +compat/ia32/ia32_sysvec.c optional ia32 contrib/ia64/libuwx/src/uwx_bstream.c standard contrib/ia64/libuwx/src/uwx_context.c standard contrib/ia64/libuwx/src/uwx_env.c standard @@ -83,9 +87,8 @@ ia64/disasm/disasm_decode.c standard ia64/disasm/disasm_extract.c standard ia64/disasm/disasm_format.c standard -ia64/ia32/ia32_misc.c optional ia32 -ia64/ia32/ia32_sysent.c optional ia32 -ia64/ia32/ia32_sysvec.c optional ia32 +ia64/ia32/ia32_signal.c optional ia32 +ia64/ia32/ia32_sigtramp.c optional ia32 ia64/ia64/autoconf.c standard ia64/ia64/busdma_machdep.c standard ia64/ia64/clock.c standard @@ -135,7 +138,6 @@ isa/vga_isa.c optional vga kern/imgact_elf32.c optional ia32 libkern/bcmp.c standard -libkern/ffs.c standard libkern/ia64/__divdi3.S standard libkern/ia64/__divsi3.S standard libkern/ia64/__moddi3.S standard ==== //depot/projects/netperf+sockets/sys/dev/ata/ata-lowlevel.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.24 2003/12/03 15:32:53 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.25 2003/12/10 23:06:24 sos Exp $"); #include "opt_ata.h" #include @@ -606,10 +606,14 @@ if (mask == 0x02) /* wait for slave only */ if (!(stat1 & ATA_S_BUSY) || (stat1 == 0xff && timeout > 20)) break; - if (mask == 0x03) /* wait for both master & slave */ - if ((!(stat0 & ATA_S_BUSY) || (stat0 == 0xff && timeout > 20)) && - (!(stat1 & ATA_S_BUSY) || (stat1 == 0xff && timeout > 20))) + if (mask == 0x03) { /* wait for both master & slave */ + if (!(stat0 & ATA_S_BUSY) && !(stat1 & ATA_S_BUSY)) break; + if (stat0 == 0xff && timeout > 20) + mask &= ~0x01; + if (stat1 == 0xff && timeout > 20) + mask &= ~0x02; + } DELAY(100000); } ==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#3 (text+ko) ==== @@ -2774,7 +2774,21 @@ struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_node *ni; - if (ic->ic_opmode != IEEE80211_M_STA) { + if (ic->ic_opmode == IEEE80211_M_STA) { + /* + * Reset local xmit state; this is really only + * meaningful when operating in station mode. + */ + ni = ic->ic_bss; + if (state == IEEE80211_S_RUN) { + /* start with highest negotiated rate */ + KASSERT(ni->ni_rates.rs_nrates > 0, + ("transition to RUN state w/ no rates!")); + ath_rate_update(sc, ni, ni->ni_rates.rs_nrates - 1); + } else { + ath_rate_update(sc, ni, 0); + } + } else { /* * When operating as a station the node table holds * the AP's that were discovered during scanning. @@ -2783,19 +2797,7 @@ */ TAILQ_FOREACH(ni, &ic->ic_node, ni_list) ath_rate_update(sc, ni, 0); /* use lowest rate */ - } - /* - * Reset local xmit state; this is really only meaningful - * when operating in station or adhoc mode. - */ - ni = ic->ic_bss; - if (state == IEEE80211_S_RUN) { - /* start with highest negotiated rate */ - KASSERT(ni->ni_rates.rs_nrates > 0, - ("transition to RUN state w/ no rates!")); - ath_rate_update(sc, ni, ni->ni_rates.rs_nrates - 1); - } else { - ath_rate_update(sc, ni, 0); /* use lowest rate */ + ath_rate_update(sc, ic->ic_bss, 0); } } ==== //depot/projects/netperf+sockets/sys/dev/firewire/sbp.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/sbp.h,v 1.2 2003/11/12 03:29:57 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/sbp.h,v 1.3 2003/12/11 03:42:40 simokawa Exp $ * */ @@ -125,6 +125,7 @@ /* 6: Maximum payload too small */ /* 7: Reserved for future standardization */ /* 8: Resource unavailabe */ +#define STATUS_RES_UNAVAIL 8 /* 9: Function Rejected */ /* 10: Login ID not recognized */ /* 11: Dummy ORB completed */ ==== //depot/projects/netperf+sockets/sys/dev/firewire/sbp_targ.c#3 (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/dev/firewire/sbp_targ.c,v 1.2 2003/11/12 04:06:21 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/sbp_targ.c,v 1.3 2003/12/11 03:42:40 simokawa Exp $ */ #include @@ -62,14 +62,17 @@ #include #include -#define SBP_TARG_RECV_LEN (8) -#define MAX_LUN 63 +#define SBP_TARG_RECV_LEN 8 +#define MAX_INITIATORS 8 +#define MAX_LUN 63 +#define MAX_LOGINS 63 +#define MAX_NODES 63 /* * management/command block agent registers * * BASE 0xffff f001 0000 management port - * BASE 0xffff f001 0020 command port for lun0 - * BASE 0xffff f001 0040 command port for lun1 + * BASE 0xffff f001 0020 command port for login id 0 + * BASE 0xffff f001 0040 command port for login id 1 * */ #define SBP_TARG_MGM 0x10000 /* offset from 0xffff f000 000 */ @@ -78,13 +81,19 @@ #define SBP_TARG_BIND_START (((u_int64_t)SBP_TARG_BIND_HI << 32) | \ SBP_TARG_BIND_LO(-1)) #define SBP_TARG_BIND_END (((u_int64_t)SBP_TARG_BIND_HI << 32) | \ - SBP_TARG_BIND_LO(MAX_LUN)) -#define SBP_TARG_LUN(lo) (((lo) - SBP_TARG_BIND_LO(0))/0x20) + SBP_TARG_BIND_LO(MAX_LOGINS)) +#define SBP_TARG_LOGIN_ID(lo) (((lo) - SBP_TARG_BIND_LO(0))/0x20) #define FETCH_MGM 0 #define FETCH_CMD 1 #define FETCH_POINTER 2 +#define F_LINK_ACTIVE (1 << 0) +#define F_ATIO_STARVED (1 << 1) +#define F_LOGIN (1 << 2) +#define F_HOLD (1 << 3) +#define F_FREEZED (1 << 4) + MALLOC_DEFINE(M_SBP_TARG, "sbp_targ", "SBP-II/FireWire target mode"); static int debug = 0; @@ -92,36 +101,44 @@ SYSCTL_INT(_debug, OID_AUTO, sbp_targ_debug, CTLFLAG_RW, &debug, 0, "SBP target mode debug flag"); +struct sbp_targ_login { + struct sbp_targ_lstate *lstate; + struct fw_device *fwdev; + struct sbp_login_res loginres; + u_int32_t flags; + u_int16_t fifo_hi; + u_int16_t last_hi; + u_int32_t fifo_lo; + u_int32_t last_lo; + STAILQ_HEAD(, orb_info) orbs; + u_int16_t id; + STAILQ_ENTRY(sbp_targ_login) link; + int hold_sec; + struct callout hold_callout; +}; + +struct sbp_targ_lstate { + u_int16_t lun; + struct sbp_targ_softc *sc; + struct cam_path *path; + struct ccb_hdr_slist accept_tios; + struct ccb_hdr_slist immed_notifies; + struct crom_chunk model; + u_int32_t flags; + STAILQ_HEAD(, sbp_targ_login) logins; +}; + struct sbp_targ_softc { struct firewire_dev_comm fd; struct cam_sim *sim; struct cam_path *path; struct fw_bind fwb; int ndevs; + int flags; struct crom_chunk unit; struct sbp_targ_lstate *lstate[MAX_LUN]; struct sbp_targ_lstate *black_hole; -}; - -struct sbp_targ_lstate { - struct sbp_targ_softc *sc; - struct cam_path *path; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 13 10:45:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0667516A4D0; Sat, 13 Dec 2003 10:45:26 -0800 (PST) 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 D561E16A4CE for ; Sat, 13 Dec 2003 10:45:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27AFF43D1F for ; Sat, 13 Dec 2003 10:45:25 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBDIjOXJ057719 for ; Sat, 13 Dec 2003 10:45:24 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBDIjOHk057716 for perforce@freebsd.org; Sat, 13 Dec 2003 10:45:24 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sat, 13 Dec 2003 10:45:24 -0800 (PST) Message-Id: <200312131845.hBDIjOHk057716@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43905 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 Dec 2003 18:45:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=43905 Change 43905 by sam@sam_ebb on 2003/12/13 10:45:22 skip scanning when operating in adhoc mode with a fixed channel Affected files ... .. //depot/projects/netperf/sys/net80211/ieee80211_proto.c#10 edit Differences ... ==== //depot/projects/netperf/sys/net80211/ieee80211_proto.c#10 (text+ko) ==== @@ -383,7 +383,9 @@ ni->ni_rstamp = 0; switch (ostate) { case IEEE80211_S_INIT: - if (ic->ic_opmode == IEEE80211_M_HOSTAP && + if ((ic->ic_opmode == IEEE80211_M_HOSTAP || + ic->ic_opmode == IEEE80211_M_IBSS || + ic->ic_opmode == IEEE80211_M_AHDEMO) && ic->ic_des_chan != IEEE80211_CHAN_ANYC) { /* * AP operation and we already have a channel; From owner-p4-projects@FreeBSD.ORG Sat Dec 13 12:53:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D599116A4D0; Sat, 13 Dec 2003 12:53:03 -0800 (PST) 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 AB08A16A4CE for ; Sat, 13 Dec 2003 12:53:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E378543D55 for ; Sat, 13 Dec 2003 12:53:02 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBDKr2XJ069674 for ; Sat, 13 Dec 2003 12:53:02 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBDKr2xR069671 for perforce@freebsd.org; Sat, 13 Dec 2003 12:53:02 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sat, 13 Dec 2003 12:53:02 -0800 (PST) Message-Id: <200312132053.hBDKr2xR069671@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43910 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 Dec 2003 20:53:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=43910 Change 43910 by sam@sam_ebb on 2003/12/13 12:52:37 reclaim node references held in packets when draining the tx queue Affected files ... .. //depot/projects/netperf/sys/dev/ath/if_ath.c#49 edit Differences ... ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#49 (text+ko) ==== @@ -2246,7 +2246,9 @@ ath_draintxq(struct ath_softc *sc) { struct ath_hal *ah = sc->sc_ah; - struct ifnet *ifp = &sc->sc_ic.ic_if; + struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = &ic->ic_if; + struct ieee80211_node *ni; struct ath_buf *bf; /* XXX return value */ @@ -2278,7 +2280,14 @@ bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); m_freem(bf->bf_m); bf->bf_m = NULL; + ni = bf->bf_node; bf->bf_node = NULL; + if (ni != NULL && ni != ic->ic_bss) { + /* + * Reclaim node reference. + */ + ieee80211_free_node(ic, ni); + } ATH_TXBUF_LOCK(sc); TAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); From owner-p4-projects@FreeBSD.ORG Sat Dec 13 12:55:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F083416A509; Sat, 13 Dec 2003 12:55:06 -0800 (PST) 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 CAED216A4D7 for ; Sat, 13 Dec 2003 12:55:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18A5543D31 for ; Sat, 13 Dec 2003 12:55:06 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBDKt5XJ069734 for ; Sat, 13 Dec 2003 12:55:05 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBDKt5cc069731 for perforce@freebsd.org; Sat, 13 Dec 2003 12:55:05 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sat, 13 Dec 2003 12:55:05 -0800 (PST) Message-Id: <200312132055.hBDKt5cc069731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43911 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 Dec 2003 20:55:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=43911 Change 43911 by sam@sam_ebb on 2003/12/13 12:54:33 continue setting up the next beacon xmit even when dma doesn't stop; this doesn't work all the time but is better than just returning which stops beacon xmits Affected files ... .. //depot/projects/netperf/sys/dev/ath/if_ath.c#50 edit Differences ... ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#50 (text+ko) ==== @@ -1227,7 +1227,7 @@ if (!ath_hal_stoptxdma(ah, sc->sc_bhalq)) { DPRINTF(("%s: beacon queue %u did not stop?", __func__, sc->sc_bhalq)); - return; /* busy, XXX is this right? */ + /* NB: the HAL still stops DMA, so proceed */ } bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_PREWRITE); From owner-p4-projects@FreeBSD.ORG Sat Dec 13 12:56:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30B7216A4D0; Sat, 13 Dec 2003 12:56:13 -0800 (PST) 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 E901216A4CE for ; Sat, 13 Dec 2003 12:56:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03A0243D31 for ; Sat, 13 Dec 2003 12:56:08 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBDKu7XJ069824 for ; Sat, 13 Dec 2003 12:56:07 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBDKu77K069821 for perforce@freebsd.org; Sat, 13 Dec 2003 12:56:07 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sat, 13 Dec 2003 12:56:07 -0800 (PST) Message-Id: <200312132056.hBDKu77K069821@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43912 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 Dec 2003 20:56:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=43912 Change 43912 by sam@sam_ebb on 2003/12/13 12:55:56 convert ath_debug printf control to a bit vector to improve the control over debugging msgs Affected files ... .. //depot/projects/netperf/sys/dev/ath/if_ath.c#51 edit Differences ... ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#51 (text+ko) ==== @@ -167,13 +167,25 @@ ((_ifp)->if_flags & (IFF_DEBUG|IFF_LINK2)) == (IFF_DEBUG|IFF_LINK2)) static void ath_printrxbuf(struct ath_buf *bf, int); static void ath_printtxbuf(struct ath_buf *bf, int); -#define DPRINTF(X) if (ath_debug) printf X -#define DPRINTF2(X) if (ath_debug > 1) printf X +enum { + ATH_DEBUG_XMIT = 0x00000001, /* basic xmit operation */ + ATH_DEBUG_RECV = 0x00000002, /* basic recv operation */ + ATH_DEBUG_RATE = 0x00000004, /* rate control */ + ATH_DEBUG_RESET = 0x00000008, /* device reset */ + ATH_DEBUG_MODE = 0x00000010, /* mode init/setup */ + ATH_DEBUG_BEACON = 0x00000020, /* beacon handling */ + ATH_DEBUG_INTR = 0x00001000, /* ISR */ + ATH_DEBUG_TX_PROC = 0x00002000, /* tx ISR proc */ + ATH_DEBUG_RX_PROC = 0x00004000, /* rx ISR proc */ + ATH_DEBUG_BEACON_PROC = 0x00008000, /* beacon ISR proc */ + ATH_DEBUG_CALIBRATE = 0x00010000, /* periodic calibration */ + ATH_DEBUG_ANY = 0xffffffff +}; +#define DPRINTF(_m,X) if (ath_debug&_m) printf X #else #define IFF_DUMPPKTS(_ifp) \ (((_ifp)->if_flags & (IFF_DEBUG|IFF_LINK2)) == (IFF_DEBUG|IFF_LINK2)) -#define DPRINTF(X) -#define DPRINTF2(X) +#define DPRINTF(_m, X) #endif int @@ -185,7 +197,7 @@ HAL_STATUS status; int error = 0; - DPRINTF(("ath_attach: devid 0x%x\n", devid)); + DPRINTF(ATH_DEBUG_ANY, ("ath_attach: devid 0x%x\n", devid)); /* set these up early for if_printf use */ if_initname(ifp, device_get_name(sc->sc_dev), @@ -348,7 +360,7 @@ { struct ifnet *ifp = &sc->sc_ic.ic_if; - DPRINTF(("ath_detach: if_flags %x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("ath_detach: if_flags %x\n", ifp->if_flags)); ath_stop(ifp); bpfdetach(ifp); @@ -367,7 +379,7 @@ { struct ifnet *ifp = &sc->sc_ic.ic_if; - DPRINTF(("ath_suspend: if_flags %x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("ath_suspend: if_flags %x\n", ifp->if_flags)); ath_stop(ifp); } @@ -377,7 +389,7 @@ { struct ifnet *ifp = &sc->sc_ic.ic_if; - DPRINTF(("ath_resume: if_flags %x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("ath_resume: if_flags %x\n", ifp->if_flags)); if (ifp->if_flags & IFF_UP) { ath_init(ifp); @@ -391,7 +403,7 @@ { struct ifnet *ifp = &sc->sc_ic.ic_if; - DPRINTF(("ath_shutdown: if_flags %x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("ath_shutdown: if_flags %x\n", ifp->if_flags)); ath_stop(ifp); } @@ -410,17 +422,18 @@ * The hardware is not ready/present, don't touch anything. * Note this can happen early on if the IRQ is shared. */ - DPRINTF(("ath_intr: invalid; ignored\n")); + DPRINTF(ATH_DEBUG_ANY, ("ath_intr: invalid; ignored\n")); return; } if ((ifp->if_flags & (IFF_RUNNING|IFF_UP)) != (IFF_RUNNING|IFF_UP)) { - DPRINTF(("ath_intr: if_flags 0x%x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, + ("ath_intr: if_flags 0x%x\n", ifp->if_flags)); ath_hal_getisr(ah, &status); /* clear ISR */ ath_hal_intrset(ah, 0); /* disable further intr's */ return; } ath_hal_getisr(ah, &status); /* NB: clears ISR too */ - DPRINTF2(("ath_intr: status 0x%x\n", status)); + DPRINTF(ATH_DEBUG_INTR, ("ath_intr: status 0x%x\n", status)); #ifdef AR_DEBUG if (ath_debug && (status & (HAL_INT_FATAL|HAL_INT_RXORN|HAL_INT_BMISS))) { @@ -489,7 +502,7 @@ struct ath_softc *sc = arg; struct ieee80211com *ic = &sc->sc_ic; - DPRINTF(("ath_bmiss_proc: pending %u\n", pending)); + DPRINTF(ATH_DEBUG_ANY, ("ath_bmiss_proc: pending %u\n", pending)); KASSERT(ic->ic_opmode == IEEE80211_M_STA, ("unexpect operating mode %u", ic->ic_opmode)); if (ic->ic_state == IEEE80211_S_RUN) { @@ -528,7 +541,7 @@ HAL_STATUS status; HAL_CHANNEL hchan; - DPRINTF(("ath_init: if_flags 0x%x\n", ifp->if_flags)); + DPRINTF(ATH_DEBUG_ANY, ("ath_init: if_flags 0x%x\n", ifp->if_flags)); ATH_LOCK(sc); /* @@ -602,7 +615,7 @@ struct ath_softc *sc = ifp->if_softc; struct ath_hal *ah = sc->sc_ah; - DPRINTF(("ath_stop: invalid %u if_flags 0x%x\n", + DPRINTF(ATH_DEBUG_ANY, ("ath_stop: invalid %u if_flags 0x%x\n", sc->sc_invalid, ifp->if_flags)); ATH_LOCK(sc); @@ -705,7 +718,8 @@ TAILQ_REMOVE(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); if (bf == NULL) { - DPRINTF(("ath_start: out of xmit buffers\n")); + DPRINTF(ATH_DEBUG_ANY, + ("ath_start: out of xmit buffers\n")); sc->sc_stats.ast_tx_qstop++; ifp->if_flags |= IFF_OACTIVE; break; @@ -720,7 +734,8 @@ * No data frames go out unless we're associated. */ if (ic->ic_state != IEEE80211_S_RUN) { - DPRINTF(("ath_start: ignore data packet, " + DPRINTF(ATH_DEBUG_ANY, + ("ath_start: ignore data packet, " "state %u\n", ic->ic_state)); sc->sc_stats.ast_tx_discard++; ATH_TXBUF_LOCK(sc); @@ -742,7 +757,8 @@ */ m = ieee80211_encap(ifp, m, &ni); if (m == NULL) { - DPRINTF(("ath_start: encapsulation failure\n")); + DPRINTF(ATH_DEBUG_ANY, + ("ath_start: encapsulation failure\n")); sc->sc_stats.ast_tx_encap++; goto bad; } @@ -1032,7 +1048,8 @@ mfilt[0] = mfilt[1] = ~0; } ath_hal_setmcastfilter(ah, mfilt[0], mfilt[1]); - DPRINTF(("ath_mode_init: RX filter 0x%x, MC filter %08x:%08x\n", + DPRINTF(ATH_DEBUG_MODE, + ("ath_mode_init: RX filter 0x%x, MC filter %08x:%08x\n", rfilt, mfilt[0], mfilt[1])); } @@ -1086,7 +1103,8 @@ else m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); if (m == NULL) { - DPRINTF(("ath_beacon_alloc: cannot get mbuf/cluster; size %u\n", + DPRINTF(ATH_DEBUG_BEACON, + ("ath_beacon_alloc: cannot get mbuf/cluster; size %u\n", pktlen)); sc->sc_stats.ast_be_nombuf++; return ENOMEM; @@ -1157,7 +1175,8 @@ ("beacon bigger than expected, len %u calculated %u", m->m_pkthdr.len, pktlen)); - DPRINTF2(("ath_beacon_alloc: m %p len %u\n", m, m->m_len)); + DPRINTF(ATH_DEBUG_BEACON, + ("ath_beacon_alloc: m %p len %u\n", m, m->m_len)); error = bus_dmamap_load_mbuf(sc->sc_dmat, bf->bf_dmamap, m, ath_mbuf_load_cb, bf, BUS_DMA_NOWAIT); @@ -1216,16 +1235,16 @@ struct ath_buf *bf = sc->sc_bcbuf; struct ath_hal *ah = sc->sc_ah; - DPRINTF2(("%s: pending %u\n", __func__, pending)); + DPRINTF(ATH_DEBUG_BEACON_PROC, ("%s: pending %u\n", __func__, pending)); if (ic->ic_opmode == IEEE80211_M_STA || bf == NULL || bf->bf_m == NULL) { - DPRINTF(("%s: ic_flags=%x bf=%p bf_m=%p\n", + DPRINTF(ATH_DEBUG_ANY, ("%s: ic_flags=%x bf=%p bf_m=%p\n", __func__, ic->ic_flags, bf, bf ? bf->bf_m : NULL)); return; } /* TODO: update beacon to reflect PS poll state */ if (!ath_hal_stoptxdma(ah, sc->sc_bhalq)) { - DPRINTF(("%s: beacon queue %u did not stop?", + DPRINTF(ATH_DEBUG_ANY, ("%s: beacon queue %u did not stop?\n", __func__, sc->sc_bhalq)); /* NB: the HAL still stops DMA, so proceed */ } @@ -1233,7 +1252,8 @@ ath_hal_puttxbuf(ah, sc->sc_bhalq, bf->bf_daddr); ath_hal_txstart(ah, sc->sc_bhalq); - DPRINTF2(("%s: TXDP%u = %p (%p)\n", __func__, + DPRINTF(ATH_DEBUG_BEACON_PROC, + ("%s: TXDP%u = %p (%p)\n", __func__, sc->sc_bhalq, (caddr_t)bf->bf_daddr, bf->bf_desc)); } @@ -1275,7 +1295,7 @@ nexttbtt = (LE_READ_4(ni->ni_tstamp + 4) << 22) | (LE_READ_4(ni->ni_tstamp) >> 10); - DPRINTF(("%s: nexttbtt=%u\n", __func__, nexttbtt)); + DPRINTF(ATH_DEBUG_BEACON, ("%s: nexttbtt=%u\n", __func__, nexttbtt)); nexttbtt += ni->ni_intval; if (ic->ic_opmode == IEEE80211_M_STA) { HAL_BEACON_STATE bs; @@ -1315,7 +1335,8 @@ if (bs.bs_sleepduration > bs.bs_dtimperiod) bs.bs_sleepduration = roundup(bs.bs_sleepduration, bs.bs_dtimperiod); - DPRINTF(("%s: intval %u nexttbtt %u dtim %u nextdtim %u bmiss %u sleep %u\n" + DPRINTF(ATH_DEBUG_BEACON, + ("%s: intval %u nexttbtt %u dtim %u nextdtim %u bmiss %u sleep %u\n" , __func__ , bs.bs_intval , bs.bs_nexttbtt @@ -1335,7 +1356,7 @@ sc->sc_imask |= HAL_INT_BMISS; ath_hal_intrset(ah, sc->sc_imask); } else { - DPRINTF(("%s: intval %u nexttbtt %u\n", + DPRINTF(ATH_DEBUG_BEACON, ("%s: intval %u nexttbtt %u\n", __func__, ni->ni_intval, nexttbtt)); ath_hal_intrset(ah, 0); ath_hal_beaconinit(ah, ic->ic_opmode, @@ -1380,9 +1401,9 @@ goto fail1; ds = sc->sc_desc; - DPRINTF(("ath_desc_alloc: DMA map: %p (%d) -> %p (%lu)\n", - ds, sc->sc_desc_len, - (caddr_t) sc->sc_desc_paddr, /*XXX*/ (u_long) sc->sc_desc_len)); + DPRINTF(ATH_DEBUG_ANY, ("%s: DMA map: %p (%d) -> %p (%lu)\n", + __func__, ds, sc->sc_desc_len, (caddr_t) sc->sc_desc_paddr, + /*XXX*/ (u_long) sc->sc_desc_len)); /* allocate buffers */ bsize = sizeof(struct ath_buf) * (ATH_TXBUF + ATH_RXBUF + 1); @@ -1561,7 +1582,8 @@ */ m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); if (m == NULL) { - DPRINTF(("ath_rxbuf_init: no mbuf/cluster\n")); + DPRINTF(ATH_DEBUG_ANY, + ("%s: no mbuf/cluster\n", __func__)); sc->sc_stats.ast_rx_nombuf++; return ENOMEM; } @@ -1572,8 +1594,9 @@ ath_mbuf_load_cb, bf, BUS_DMA_NOWAIT); if (error != 0) { - DPRINTF(("ath_rxbuf_init: bus_dmamap_load_mbuf failed;" - " error %d\n", error)); + DPRINTF(ATH_DEBUG_ANY, + ("%s: bus_dmamap_load_mbuf failed; error %d\n", + __func__, error)); sc->sc_stats.ast_rx_busdma++; return error; } @@ -1633,7 +1656,7 @@ u_int phyerr; HAL_STATUS status; - DPRINTF2(("ath_rx_proc: pending %u\n", npending)); + DPRINTF(ATH_DEBUG_RX_PROC, ("%s: pending %u\n", __func__, npending)); do { bf = TAILQ_FIRST(&sc->sc_rxbuf); if (bf == NULL) { /* NB: shouldn't happen */ @@ -1697,7 +1720,8 @@ len = ds->ds_rxstat.rs_datalen; if (len < IEEE80211_MIN_LEN) { - DPRINTF(("ath_rx_proc: short packet %d\n", len)); + DPRINTF(ATH_DEBUG_RECV, ("%s: short packet %d\n", + __func__, len)); sc->sc_stats.ast_rx_tooshort++; goto rx_next; } @@ -1917,7 +1941,7 @@ m_freem(m0); return EIO; } - DPRINTF2(("ath_tx_start: m %p len %u\n", m0, pktlen)); + DPRINTF(ATH_DEBUG_XMIT, ("%s: m %p len %u\n", __func__, m0, pktlen)); bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_PREWRITE); bf->bf_m = m0; bf->bf_node = ni; /* NB: held reference */ @@ -2123,9 +2147,10 @@ , i == 0 /* first segment */ , i == bf->bf_nseg - 1 /* last segment */ ); - DPRINTF2(("ath_tx_start: %d: %08x %08x %08x %08x %08x %08x\n", - i, ds->ds_link, ds->ds_data, ds->ds_ctl0, ds->ds_ctl1, - ds->ds_hw[0], ds->ds_hw[1])); + DPRINTF(ATH_DEBUG_XMIT, + ("%s: %d: %08x %08x %08x %08x %08x %08x\n", + __func__, i, ds->ds_link, ds->ds_data, + ds->ds_ctl0, ds->ds_ctl1, ds->ds_hw[0], ds->ds_hw[1])); } /* @@ -2136,11 +2161,11 @@ TAILQ_INSERT_TAIL(&sc->sc_txq, bf, bf_list); if (sc->sc_txlink == NULL) { ath_hal_puttxbuf(ah, sc->sc_txhalq, bf->bf_daddr); - DPRINTF2(("ath_tx_start: TXDP0 = %p (%p)\n", + DPRINTF(ATH_DEBUG_XMIT, ("%s: TXDP0 = %p (%p)\n", __func__, (caddr_t)bf->bf_daddr, bf->bf_desc)); } else { *sc->sc_txlink = bf->bf_daddr; - DPRINTF2(("ath_tx_start: link(%p)=%p (%p)\n", + DPRINTF(ATH_DEBUG_XMIT, ("%s: link(%p)=%p (%p)\n", __func__, sc->sc_txlink, (caddr_t)bf->bf_daddr, bf->bf_desc)); } sc->sc_txlink = &bf->bf_desc[bf->bf_nseg - 1].ds_link; @@ -2164,8 +2189,9 @@ int sr, lr; HAL_STATUS status; - DPRINTF2(("ath_tx_proc: pending %u tx queue %p, link %p\n", - npending, (caddr_t) ath_hal_gettxbuf(sc->sc_ah, sc->sc_txhalq), + DPRINTF(ATH_DEBUG_TX_PROC, ("%s: pending %u tx queue %p, link %p\n", + __func__, npending, + (caddr_t) ath_hal_gettxbuf(sc->sc_ah, sc->sc_txhalq), sc->sc_txlink)); for (;;) { ATH_TXQ_LOCK(sc); @@ -2255,11 +2281,13 @@ if (!sc->sc_invalid) { /* don't touch the hardware if marked invalid */ (void) ath_hal_stoptxdma(ah, sc->sc_txhalq); - DPRINTF(("ath_draintxq: tx queue %p, link %p\n", + DPRINTF(ATH_DEBUG_RESET, + ("%s: tx queue %p, link %p\n", __func__, (caddr_t) ath_hal_gettxbuf(ah, sc->sc_txhalq), sc->sc_txlink)); (void) ath_hal_stoptxdma(ah, sc->sc_bhalq); - DPRINTF(("ath_draintxq: beacon queue %p\n", + DPRINTF(ATH_DEBUG_RESET, + ("%s: beacon queue %p\n", __func__, (caddr_t) ath_hal_gettxbuf(ah, sc->sc_bhalq))); } for (;;) { @@ -2315,8 +2343,9 @@ if (ath_debug) { struct ath_buf *bf; - DPRINTF(("ath_stoprecv: rx queue %p, link %p\n", - (caddr_t) ath_hal_getrxbuf(ah), sc->sc_rxlink)); + DPRINTF(ATH_DEBUG_RECV, ("%s: rx queue %p, link %p\n", + __func__, + (caddr_t) ath_hal_getrxbuf(ah), sc->sc_rxlink)); TAILQ_FOREACH(bf, &sc->sc_rxbuf, bf_list) { struct ath_desc *ds = bf->bf_desc; if (ath_hal_rxprocdesc(ah, ds, bf->bf_daddr, @@ -2342,8 +2371,9 @@ TAILQ_FOREACH(bf, &sc->sc_rxbuf, bf_list) { int error = ath_rxbuf_init(sc, bf); if (error != 0) { - DPRINTF(("ath_startrecv: ath_rxbuf_init failed %d\n", - error)); + DPRINTF(ATH_DEBUG_RECV, + ("%s: ath_rxbuf_init failed %d\n", + __func__, error)); return error; } } @@ -2368,7 +2398,7 @@ struct ath_hal *ah = sc->sc_ah; struct ieee80211com *ic = &sc->sc_ic; - DPRINTF(("ath_chan_set: %u (%u MHz) -> %u (%u MHz)\n", + DPRINTF(ATH_DEBUG_ANY, ("%s: %u (%u MHz) -> %u (%u MHz)\n", __func__, ieee80211_chan2ieee(ic, ic->ic_ibss_chan), ic->ic_ibss_chan->ic_freq, ieee80211_chan2ieee(ic, chan), chan->ic_freq)); @@ -2467,7 +2497,8 @@ hchan.channel = c->ic_freq; hchan.channelFlags = ath_chan2flags(ic, c); - DPRINTF(("%s: channel %u/%x\n", __func__, c->ic_freq, c->ic_flags)); + DPRINTF(ATH_DEBUG_CALIBRATE, + ("%s: channel %u/%x\n", __func__, c->ic_freq, c->ic_flags)); if (ath_hal_getrfgain(ah) == HAL_RFGAIN_NEED_CHANGE) { /* @@ -2478,7 +2509,8 @@ ath_reset(sc, 0); } if (!ath_hal_calibrate(ah, &hchan)) { - DPRINTF(("%s: calibration of channel %u failed\n", + DPRINTF(ATH_DEBUG_ANY, + ("%s: calibration of channel %u failed\n", __func__, c->ic_freq)); sc->sc_stats.ast_per_calfail++; } @@ -2503,7 +2535,7 @@ HAL_LED_RUN, /* IEEE80211_S_RUN */ }; - DPRINTF(("%s: %s -> %s\n", __func__, + DPRINTF(ATH_DEBUG_ANY, ("%s: %s -> %s\n", __func__, ieee80211_state_name[ic->ic_state], ieee80211_state_name[nstate])); @@ -2530,7 +2562,7 @@ bssid = ni->ni_bssid; } ath_hal_setrxfilter(ah, rfilt); - DPRINTF(("%s: RX filter 0x%x bssid %s\n", + DPRINTF(ATH_DEBUG_ANY, ("%s: RX filter 0x%x bssid %s\n", __func__, rfilt, ether_sprintf(bssid))); if (nstate == IEEE80211_S_RUN && ic->ic_opmode == IEEE80211_M_STA) @@ -2544,7 +2576,7 @@ } if (nstate == IEEE80211_S_RUN) { - DPRINTF(("%s(RUN): ic_flags=0x%08x iv=%d bssid=%s " + DPRINTF(ATH_DEBUG_ANY, ("%s(RUN): ic_flags=0x%08x iv=%d bssid=%s " "capinfo=0x%04x chan=%d\n" , __func__ , ic->ic_flags @@ -2682,14 +2714,16 @@ sc->sc_rates[mode] = ath_hal_getratetable(ah, HAL_MODE_TURBO); break; default: - DPRINTF(("%s: invalid mode %u\n", __func__, mode)); + DPRINTF(ATH_DEBUG_ANY, + ("%s: invalid mode %u\n", __func__, mode)); return 0; } rt = sc->sc_rates[mode]; if (rt == NULL) return 0; if (rt->rateCount > IEEE80211_RATE_MAXSIZE) { - DPRINTF(("%s: rate table too small (%u > %u)\n", + DPRINTF(ATH_DEBUG_ANY, + ("%s: rate table too small (%u > %u)\n", __func__, rt->rateCount, IEEE80211_RATE_MAXSIZE)); maxrates = IEEE80211_RATE_MAXSIZE; } else @@ -2866,7 +2900,8 @@ } if (nrate != ni->ni_txrate) { - DPRINTF(("%s: %dM -> %dM (%d ok, %d err, %d retr)\n", + DPRINTF(ATH_DEBUG_RATE, + ("%s: %dM -> %dM (%d ok, %d err, %d retr)\n", __func__, (rs->rs_rates[ni->ni_txrate] & IEEE80211_RATE_VAL) / 2, (rs->rs_rates[nrate] & IEEE80211_RATE_VAL) / 2, From owner-p4-projects@FreeBSD.ORG Sat Dec 13 13:27:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA41016A4D0; Sat, 13 Dec 2003 13:27:48 -0800 (PST) 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 943C116A4CE for ; Sat, 13 Dec 2003 13:27:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8033A43D2D for ; Sat, 13 Dec 2003 13:27:47 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBDLRlXJ071730 for ; Sat, 13 Dec 2003 13:27:47 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBDLRloq071727 for perforce@freebsd.org; Sat, 13 Dec 2003 13:27:47 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sat, 13 Dec 2003 13:27:47 -0800 (PST) Message-Id: <200312132127.hBDLRloq071727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43914 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 Dec 2003 21:27:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=43914 Change 43914 by sam@sam_ebb on 2003/12/13 13:27:16 o must initialize each device-private rate control state at node creation so xmits have rate cookies for sending management frames (fixes ap operation) o must initialize curmode state so calling ath_rate_update works for the bss node at startup o use __func__ to consolidate some debug msg strings Affected files ... .. //depot/projects/netperf/sys/dev/ath/if_ath.c#52 edit Differences ... ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#52 (text+ko) ==== @@ -252,6 +252,8 @@ ath_rate_setup(sc, IEEE80211_MODE_11B); ath_rate_setup(sc, IEEE80211_MODE_11G); ath_rate_setup(sc, IEEE80211_MODE_TURBO); + /* NB: setup here so ath_rate_update is happy */ + ath_setcurmode(sc, IEEE80211_MODE_11A); error = ath_desc_alloc(sc); if (error != 0) { @@ -1104,8 +1106,8 @@ m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); if (m == NULL) { DPRINTF(ATH_DEBUG_BEACON, - ("ath_beacon_alloc: cannot get mbuf/cluster; size %u\n", - pktlen)); + ("%s: cannot get mbuf/cluster; size %u\n", + __func__, pktlen)); sc->sc_stats.ast_be_nombuf++; return ENOMEM; } @@ -1175,8 +1177,7 @@ ("beacon bigger than expected, len %u calculated %u", m->m_pkthdr.len, pktlen)); - DPRINTF(ATH_DEBUG_BEACON, - ("ath_beacon_alloc: m %p len %u\n", m, m->m_len)); + DPRINTF(ATH_DEBUG_BEACON, ("%s: m %p len %u\n", __func__, m, m->m_len)); error = bus_dmamap_load_mbuf(sc->sc_dmat, bf->bf_dmamap, m, ath_mbuf_load_cb, bf, BUS_DMA_NOWAIT); @@ -1185,8 +1186,7 @@ return error; } KASSERT(bf->bf_nseg == 1, - ("ath_beacon_alloc: multi-segment packet; nseg %u", - bf->bf_nseg)); + ("%s: multi-segment packet; nseg %u", __func__, bf->bf_nseg)); bf->bf_m = m; /* setup descriptors */ @@ -1499,10 +1499,13 @@ struct ath_node *an = malloc(sizeof(struct ath_node), M_DEVBUF, M_NOWAIT | M_ZERO); if (an) { + struct ath_softc *sc = ic->ic_if.if_softc; int i; + for (i = 0; i < ATH_RHIST_SIZE; i++) an->an_rx_hist[i].arh_ticks = ATH_RHIST_NOTIME; an->an_rx_hist_next = ATH_RHIST_SIZE-1; + ath_rate_update(sc, &an->an_node, 0); return &an->an_node; } else return NULL; From owner-p4-projects@FreeBSD.ORG Sat Dec 13 21:59:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A86DE16A4D0; Sat, 13 Dec 2003 21:59:00 -0800 (PST) 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 6B45D16A4CE for ; Sat, 13 Dec 2003 21:59:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 72BF843D67 for ; Sat, 13 Dec 2003 21:58:24 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBE5w9XJ008605 for ; Sat, 13 Dec 2003 21:58:09 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBE5w9Ta008602 for perforce@freebsd.org; Sat, 13 Dec 2003 21:58:09 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sat, 13 Dec 2003 21:58:09 -0800 (PST) Message-Id: <200312140558.hBE5w9Ta008602@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 43924 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, 14 Dec 2003 05:59:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=43924 Change 43924 by sam@sam_ebb on 2003/12/13 21:57:46 o move xmit and recv descriptor debugging stuff under ath_debug bit flags o collect stats about xmits that make use of the multi-rate support o add more debug stuff for rate control monitoring Affected files ... .. //depot/projects/netperf/sys/dev/ath/if_ath.c#53 edit .. //depot/projects/netperf/sys/dev/ath/if_athioctl.h#9 edit Differences ... ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#53 (text+ko) ==== @@ -162,18 +162,21 @@ int ath_debug = 0; SYSCTL_INT(_hw_ath, OID_AUTO, debug, CTLFLAG_RW, &ath_debug, 0, "control debugging printfs"); -#define IFF_DUMPPKTS(_ifp) \ - (ath_debug || \ +#define IFF_DUMPPKTS(_ifp, _m) \ + ((ath_debug & _m) || \ ((_ifp)->if_flags & (IFF_DEBUG|IFF_LINK2)) == (IFF_DEBUG|IFF_LINK2)) static void ath_printrxbuf(struct ath_buf *bf, int); static void ath_printtxbuf(struct ath_buf *bf, int); enum { ATH_DEBUG_XMIT = 0x00000001, /* basic xmit operation */ - ATH_DEBUG_RECV = 0x00000002, /* basic recv operation */ - ATH_DEBUG_RATE = 0x00000004, /* rate control */ - ATH_DEBUG_RESET = 0x00000008, /* device reset */ - ATH_DEBUG_MODE = 0x00000010, /* mode init/setup */ - ATH_DEBUG_BEACON = 0x00000020, /* beacon handling */ + ATH_DEBUG_XMIT_DESC = 0x00000002, /* xmit descriptors */ + ATH_DEBUG_RECV = 0x00000004, /* basic recv operation */ + ATH_DEBUG_RECV_DESC = 0x00000008, /* recv descriptors */ + ATH_DEBUG_RATE = 0x00000010, /* rate control */ + ATH_DEBUG_RESET = 0x00000020, /* reset processing */ + ATH_DEBUG_MODE = 0x00000040, /* mode init/setup */ + ATH_DEBUG_BEACON = 0x00000080, /* beacon handling */ + ATH_DEBUG_WATCHDOG = 0x00000100, /* watchdog timeout */ ATH_DEBUG_INTR = 0x00001000, /* ISR */ ATH_DEBUG_TX_PROC = 0x00002000, /* tx ISR proc */ ATH_DEBUG_RX_PROC = 0x00004000, /* rx ISR proc */ @@ -181,9 +184,9 @@ ATH_DEBUG_CALIBRATE = 0x00010000, /* periodic calibration */ ATH_DEBUG_ANY = 0xffffffff }; -#define DPRINTF(_m,X) if (ath_debug&_m) printf X +#define DPRINTF(_m,X) if (ath_debug & _m) printf X #else -#define IFF_DUMPPKTS(_ifp) \ +#define IFF_DUMPPKTS(_ifp, _m) \ (((_ifp)->if_flags & (IFF_DEBUG|IFF_LINK2)) == (IFF_DEBUG|IFF_LINK2)) #define DPRINTF(_m, X) #endif @@ -840,7 +843,7 @@ if (--sc->sc_tx_timer == 0) { if_printf(ifp, "device timeout\n"); #ifdef AR_DEBUG - if (ath_debug) + if (ath_debug & ATH_DEBUG_WATCHDOG) ath_hal_dumpstate(sc->sc_ah); #endif /* AR_DEBUG */ ath_reset(sc, 0); @@ -1691,7 +1694,7 @@ status = ath_hal_rxprocdesc(ah, ds, bf->bf_daddr, PA2DESC(sc, ds->ds_link)); #ifdef AR_DEBUG - if (ath_debug > 1) + if (ath_debug & ATH_DEBUG_RECV_DESC) ath_printrxbuf(bf, status == HAL_OK); #endif if (status == HAL_EINPROGRESS) @@ -2208,7 +2211,7 @@ ds = &bf->bf_desc[bf->bf_nseg - 1]; status = ath_hal_txprocdesc(ah, ds); #ifdef AR_DEBUG - if (ath_debug > 1) + if (ath_debug & ATH_DEBUG_XMIT_DESC) ath_printtxbuf(bf, status == HAL_OK); #endif if (status == HAL_EINPROGRESS) { @@ -2224,6 +2227,8 @@ if (ds->ds_txstat.ts_status == 0) { an->an_tx_ok++; an->an_tx_antenna = ds->ds_txstat.ts_antenna; + if (ds->ds_txstat.ts_rate != 0) + sc->sc_stats.ast_tx_altrate++; } else { an->an_tx_err++; ifp->if_oerrors++; @@ -2304,7 +2309,7 @@ TAILQ_REMOVE(&sc->sc_txq, bf, bf_list); ATH_TXQ_UNLOCK(sc); #ifdef AR_DEBUG - if (ath_debug) + if (ath_debug & ATH_DEBUG_RESET) ath_printtxbuf(bf, ath_hal_txprocdesc(ah, bf->bf_desc) == HAL_OK); #endif /* AR_DEBUG */ @@ -2343,12 +2348,11 @@ ath_hal_stopdmarecv(ah); /* disable DMA engine */ DELAY(3000); /* long enough for 1 frame */ #ifdef AR_DEBUG - if (ath_debug) { + if (ath_debug & ATH_DEBUG_RESET) { struct ath_buf *bf; - DPRINTF(ATH_DEBUG_RECV, ("%s: rx queue %p, link %p\n", - __func__, - (caddr_t) ath_hal_getrxbuf(ah), sc->sc_rxlink)); + printf("%s: rx queue %p, link %p\n", __func__, + (caddr_t) ath_hal_getrxbuf(ah), sc->sc_rxlink); TAILQ_FOREACH(bf, &sc->sc_rxbuf, bf_list) { struct ath_desc *ds = bf->bf_desc; if (ath_hal_rxprocdesc(ah, ds, bf->bf_daddr, @@ -2766,6 +2770,10 @@ KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode)); + DPRINTF(ATH_DEBUG_RATE, ("%s: set xmit rate for %s to %dM\n", + __func__, ether_sprintf(ni->ni_macaddr), + (ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL) / 2)); + ni->ni_txrate = rate; an->an_tx_rix0 = sc->sc_rixmap[ ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL]; ==== //depot/projects/netperf/sys/dev/ath/if_athioctl.h#9 (text+ko) ==== @@ -70,6 +70,7 @@ u_int32_t ast_tx_rts; /* tx frames with rts enabled */ u_int32_t ast_tx_cts; /* tx frames with cts enabled */ u_int32_t ast_tx_shortpre;/* tx frames with short preamble */ + u_int32_t ast_tx_altrate; /* tx frames with alternate rate */ u_int32_t ast_rx_nombuf; /* rx setup failed 'cuz no mbuf */ u_int32_t ast_rx_busdma; /* rx setup failed for dma resrcs */ u_int32_t ast_rx_orn; /* rx failed 'cuz of desc overrun */