From owner-p4-projects@FreeBSD.ORG Sun Mar 7 00:21:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BB1F16A4D0; Sun, 7 Mar 2004 00:21: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 D1A9316A4CE for ; Sun, 7 Mar 2004 00:21:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1CFB43D2D for ; Sun, 7 Mar 2004 00:21:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i278LoGe004511 for ; Sun, 7 Mar 2004 00:21:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i278Lmvn004475 for perforce@freebsd.org; Sun, 7 Mar 2004 00:21:48 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 7 Mar 2004 00:21:48 -0800 (PST) Message-Id: <200403070821.i278Lmvn004475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48337 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 Mar 2004 08:21:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=48337 Change 48337 by jmallett@jmallett_oingo on 2004/03/07 00:21:22 IFC. Affected files ... .. //depot/projects/mips/MAINTAINERS#14 integrate .. //depot/projects/mips/Makefile#10 integrate .. //depot/projects/mips/Makefile.inc1#22 integrate .. //depot/projects/mips/UPDATING#15 integrate .. //depot/projects/mips/UPDATING.64BTT#1 branch .. //depot/projects/mips/bin/date/date.c#5 integrate .. //depot/projects/mips/bin/dd/Makefile#4 integrate .. //depot/projects/mips/bin/dd/args.c#4 integrate .. //depot/projects/mips/bin/dd/dd.1#3 integrate .. //depot/projects/mips/bin/dd/dd.c#5 integrate .. //depot/projects/mips/bin/dd/dd.h#3 integrate .. //depot/projects/mips/bin/dd/gen.c#1 branch .. //depot/projects/mips/bin/dd/ref.ascii#1 branch .. //depot/projects/mips/bin/dd/ref.ebcdic#1 branch .. //depot/projects/mips/bin/dd/ref.ibm#1 branch .. //depot/projects/mips/bin/dd/ref.lcase#1 branch .. //depot/projects/mips/bin/dd/ref.oldascii#1 branch .. //depot/projects/mips/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/mips/bin/dd/ref.oldibm#1 branch .. //depot/projects/mips/bin/dd/ref.pareven#1 branch .. //depot/projects/mips/bin/dd/ref.parnone#1 branch .. //depot/projects/mips/bin/dd/ref.parodd#1 branch .. //depot/projects/mips/bin/dd/ref.parset#1 branch .. //depot/projects/mips/bin/dd/ref.swab#1 branch .. //depot/projects/mips/bin/dd/ref.ucase#1 branch .. //depot/projects/mips/bin/df/df.c#8 integrate .. //depot/projects/mips/bin/ls/print.c#10 integrate .. //depot/projects/mips/bin/pax/options.c#4 integrate .. //depot/projects/mips/contrib/diff/diff.h#3 integrate .. //depot/projects/mips/etc/defaults/rc.conf#17 integrate .. //depot/projects/mips/etc/pccard_ether#6 integrate .. //depot/projects/mips/etc/rc.d/Makefile#10 integrate .. //depot/projects/mips/etc/rc.d/NETWORKING#7 integrate .. //depot/projects/mips/etc/rc.d/accounting#4 integrate .. //depot/projects/mips/etc/rc.d/amd#4 integrate .. //depot/projects/mips/etc/rc.d/cleartmp#6 integrate .. //depot/projects/mips/etc/rc.d/dhclient#6 integrate .. //depot/projects/mips/etc/rc.d/hostname#3 integrate .. //depot/projects/mips/etc/rc.d/ipfilter#11 integrate .. //depot/projects/mips/etc/rc.d/ipsec#5 integrate .. //depot/projects/mips/etc/rc.d/ldconfig#5 integrate .. //depot/projects/mips/etc/rc.d/mountd#4 integrate .. //depot/projects/mips/etc/rc.d/routed#6 integrate .. //depot/projects/mips/etc/rc.d/rpcbind#3 integrate .. //depot/projects/mips/etc/rc.d/syslogd#3 integrate .. //depot/projects/mips/etc/rc.d/virecover#5 integrate .. //depot/projects/mips/etc/rc.subr#10 integrate .. //depot/projects/mips/gnu/lib/csu/Makefile#6 integrate .. //depot/projects/mips/gnu/lib/libregex/regex.c#4 integrate .. //depot/projects/mips/gnu/lib/libregex/regex.h#3 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/Makefile.inc0#5 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gasp/Makefile#5 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/Makefile#7 integrate .. //depot/projects/mips/gnu/usr.bin/grep/ChangeLog#2 integrate .. //depot/projects/mips/gnu/usr.bin/grep/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/grep/NEWS#2 integrate .. //depot/projects/mips/gnu/usr.bin/grep/THANKS#2 integrate .. //depot/projects/mips/gnu/usr.bin/grep/config.h#3 integrate .. //depot/projects/mips/gnu/usr.bin/grep/dfa.c#3 integrate .. //depot/projects/mips/gnu/usr.bin/grep/doc/grep.texi#2 integrate .. //depot/projects/mips/gnu/usr.bin/grep/doc/version.texi#2 integrate .. //depot/projects/mips/gnu/usr.bin/grep/getpagesize.h#2 integrate .. //depot/projects/mips/gnu/usr.bin/grep/grep.1#3 integrate .. //depot/projects/mips/gnu/usr.bin/grep/grep.c#3 integrate .. //depot/projects/mips/gnu/usr.bin/grep/grepmat.c#1 branch .. //depot/projects/mips/gnu/usr.bin/grep/kwset.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/grep/savedir.c#2 integrate .. //depot/projects/mips/gnu/usr.bin/grep/search.c#3 integrate .. //depot/projects/mips/gnu/usr.bin/grep/system.h#2 integrate .. //depot/projects/mips/gnu/usr.bin/tar/Makefile#4 integrate .. //depot/projects/mips/installworld_newk#1 branch .. //depot/projects/mips/installworld_oldk#1 branch .. //depot/projects/mips/lib/Makefile#12 integrate .. //depot/projects/mips/lib/libarchive/archive.h#2 integrate .. //depot/projects/mips/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_write_set_format_shar.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/mips/lib/libbluetooth/bluetooth.c#2 integrate .. //depot/projects/mips/lib/libbsnmp/Makefile.inc#3 integrate .. //depot/projects/mips/lib/libc/gen/dlfcn.c#4 integrate .. //depot/projects/mips/lib/libc/gen/getpwent.c#8 integrate .. //depot/projects/mips/lib/libc/net/gethostbydns.c#5 integrate .. //depot/projects/mips/lib/libc/powerpc/gen/Makefile.inc#3 integrate .. //depot/projects/mips/lib/libc/powerpc/gen/_ctx_start.S#1 branch .. //depot/projects/mips/lib/libc/powerpc/gen/makecontext.c#1 branch .. //depot/projects/mips/lib/libc/rpc/getnetconfig.c#5 integrate .. //depot/projects/mips/lib/libc/stdio/fvwrite.c#2 integrate .. //depot/projects/mips/lib/libc/stdlib/getopt.3#4 integrate .. //depot/projects/mips/lib/libc/stdlib/getopt.c#2 integrate .. //depot/projects/mips/lib/libc/stdlib/getopt_long.3#4 integrate .. //depot/projects/mips/lib/libc/stdlib/getopt_long.c#4 integrate .. //depot/projects/mips/lib/libc/sys/select.2#6 integrate .. //depot/projects/mips/lib/libpam/modules/pam_login_access/login_access.c#2 integrate .. //depot/projects/mips/lib/libthr/arch/i386/i386/_setcurthread.c#6 integrate .. //depot/projects/mips/lib/libthr/arch/powerpc/Makefile.inc#1 branch .. //depot/projects/mips/lib/libthr/arch/powerpc/powerpc/_curthread.c#1 branch .. //depot/projects/mips/libexec/rtld-elf/rtld.c#15 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/errata/article.sgml#17 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#29 integrate .. //depot/projects/mips/release/doc/ja_JP.eucJP/errata/article.sgml#9 integrate .. //depot/projects/mips/sbin/atm/atmconfig/diag.c#3 integrate .. //depot/projects/mips/sbin/camcontrol/camcontrol.c#6 integrate .. //depot/projects/mips/sbin/ip6fw/Makefile#3 integrate .. //depot/projects/mips/sbin/ip6fw/ip6fw.c#5 integrate .. //depot/projects/mips/sbin/kldconfig/kldconfig.c#4 integrate .. //depot/projects/mips/sbin/mount/mount.8#8 integrate .. //depot/projects/mips/sbin/raidctl/raidctl.c#2 integrate .. //depot/projects/mips/sbin/raidctl/rf_configure.c#2 integrate .. //depot/projects/mips/sbin/swapon/swapon.c#5 integrate .. //depot/projects/mips/sbin/sysctl/sysctl.c#6 integrate .. //depot/projects/mips/sbin/umount/umount.8#5 integrate .. //depot/projects/mips/share/man/man4/Makefile#23 integrate .. //depot/projects/mips/share/man/man4/acpi.4#11 integrate .. //depot/projects/mips/share/man/man4/acpi_video.4#1 branch .. //depot/projects/mips/share/man/man4/bfe.4#2 integrate .. //depot/projects/mips/share/man/man4/man4.i386/Makefile#12 integrate .. //depot/projects/mips/share/man/man4/man4.i386/ct.4#1 branch .. //depot/projects/mips/share/man/man4/man4.i386/cx.4#6 integrate .. //depot/projects/mips/share/man/man4/ng_vlan.4#1 branch .. //depot/projects/mips/share/man/man4/polling.4#6 integrate .. //depot/projects/mips/share/man/man4/re.4#3 integrate .. //depot/projects/mips/share/man/man4/ste.4#4 integrate .. //depot/projects/mips/share/man/man4/ubtbcmfw.4#3 integrate .. //depot/projects/mips/share/man/man5/rc.conf.5#16 integrate .. //depot/projects/mips/share/man/man9/DEVICE_IDENTIFY.9#2 integrate .. //depot/projects/mips/share/man/man9/Makefile#16 integrate .. //depot/projects/mips/share/man/man9/contigmalloc.9#1 branch .. //depot/projects/mips/share/man/man9/ieee80211.9#1 branch .. //depot/projects/mips/share/man/man9/ieee80211_crypto.9#1 branch .. //depot/projects/mips/share/man/man9/ieee80211_input.9#1 branch .. //depot/projects/mips/share/man/man9/ieee80211_ioctl.9#1 branch .. //depot/projects/mips/share/man/man9/ieee80211_node.9#1 branch .. //depot/projects/mips/share/man/man9/ieee80211_output.9#1 branch .. //depot/projects/mips/share/man/man9/ieee80211_proto.9#1 branch .. //depot/projects/mips/share/man/man9/ieee80211_radiotap.9#1 branch .. //depot/projects/mips/share/man/man9/malloc.9#9 integrate .. //depot/projects/mips/share/man/man9/pfil.9#3 integrate .. //depot/projects/mips/share/misc/bsd-family-tree#10 integrate .. //depot/projects/mips/share/mk/bsd.cpu.mk#8 integrate .. //depot/projects/mips/sys/alpha/alpha/machdep.c#16 integrate .. //depot/projects/mips/sys/alpha/include/critical.h#3 integrate .. //depot/projects/mips/sys/alpha/include/pmap.h#7 integrate .. //depot/projects/mips/sys/amd64/amd64/critical.c#4 integrate .. //depot/projects/mips/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/mips/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/mips/sys/amd64/conf/NOTES.fixed#2 delete .. //depot/projects/mips/sys/amd64/include/cpufunc.h#5 integrate .. //depot/projects/mips/sys/amd64/include/critical.h#4 integrate .. //depot/projects/mips/sys/amd64/include/dvcfg.h#1 branch .. //depot/projects/mips/sys/amd64/include/physio_proc.h#1 branch .. //depot/projects/mips/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/mips/sys/boot/forth/loader.conf#8 integrate .. //depot/projects/mips/sys/compat/ndis/kern_ndis.c#7 integrate .. //depot/projects/mips/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/mips/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/mips/sys/compat/ndis/subr_ntoskrnl.c#7 integrate .. //depot/projects/mips/sys/conf/NOTES#23 integrate .. //depot/projects/mips/sys/conf/files#27 integrate .. //depot/projects/mips/sys/conf/files.amd64#5 integrate .. //depot/projects/mips/sys/conf/files.i386#19 integrate .. //depot/projects/mips/sys/conf/files.pc98#19 integrate .. //depot/projects/mips/sys/conf/kern.mk#9 integrate .. //depot/projects/mips/sys/conf/kmod.mk#12 integrate .. //depot/projects/mips/sys/conf/options.amd64#4 integrate .. //depot/projects/mips/sys/contrib/dev/acpica/acfreebsd.h#5 integrate .. //depot/projects/mips/sys/dev/aac/aac.c#13 integrate .. //depot/projects/mips/sys/dev/acpica/Osd/OsdHardware.c#4 integrate .. //depot/projects/mips/sys/dev/acpica/acpi.c#16 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_acad.c#5 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_ec.c#7 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_lid.c#4 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_pci.c#4 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_powerres.c#5 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_thermal.c#7 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_timer.c#6 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_video.c#1 branch .. //depot/projects/mips/sys/dev/acpica/acpivar.h#11 integrate .. //depot/projects/mips/sys/dev/adlink/adlink.c#5 integrate .. //depot/projects/mips/sys/dev/ata/ata-all.c#19 integrate .. //depot/projects/mips/sys/dev/ata/ata-all.h#14 integrate .. //depot/projects/mips/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/mips/sys/dev/ata/ata-disk.c#17 integrate .. //depot/projects/mips/sys/dev/ata/ata-queue.c#6 integrate .. //depot/projects/mips/sys/dev/ata/atapi-cam.c#11 integrate .. //depot/projects/mips/sys/dev/ata/atapi-cd.c#14 integrate .. //depot/projects/mips/sys/dev/ata/atapi-fd.c#11 integrate .. //depot/projects/mips/sys/dev/ata/atapi-tape.c#12 integrate .. //depot/projects/mips/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/mips/sys/dev/ctau/ctau.c#2 integrate .. //depot/projects/mips/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/mips/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/mips/sys/dev/drm/drm_drv.h#10 integrate .. //depot/projects/mips/sys/dev/drm/drm_os_freebsd.h#7 integrate .. //depot/projects/mips/sys/dev/drm/drm_vm.h#7 integrate .. //depot/projects/mips/sys/dev/drm/radeon_state.c#6 integrate .. //depot/projects/mips/sys/dev/drm/sis_ds.h#2 integrate .. //depot/projects/mips/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/mips/sys/dev/ed/if_ed.c#9 integrate .. //depot/projects/mips/sys/dev/ed/if_edvar.h#3 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndis_pccard.c#1 branch .. //depot/projects/mips/sys/dev/if_ndis/if_ndis_pci.c#1 branch .. //depot/projects/mips/sys/dev/if_ndis/if_ndisvar.h#7 integrate .. //depot/projects/mips/sys/dev/lnc/if_lnc.c#7 integrate .. //depot/projects/mips/sys/dev/lnc/if_lncvar.h#2 integrate .. //depot/projects/mips/sys/dev/md/md.c#19 integrate .. //depot/projects/mips/sys/dev/mlx/mlx.c#8 integrate .. //depot/projects/mips/sys/dev/pccbb/pccbb.c#12 integrate .. //depot/projects/mips/sys/dev/random/harvest.c#5 integrate .. //depot/projects/mips/sys/dev/sound/isa/ad1816.c#6 integrate .. //depot/projects/mips/sys/dev/sound/isa/ess.c#5 integrate .. //depot/projects/mips/sys/dev/sound/isa/sb16.c#5 integrate .. //depot/projects/mips/sys/dev/sound/isa/sb8.c#5 integrate .. //depot/projects/mips/sys/dev/sound/pci/als4000.c#5 integrate .. //depot/projects/mips/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/mips/sys/dev/sound/pci/aureal.c#5 integrate .. //depot/projects/mips/sys/dev/sound/pci/cmi.c#7 integrate .. //depot/projects/mips/sys/dev/sound/pci/cs4281.c#5 integrate .. //depot/projects/mips/sys/dev/sound/pci/csapcm.c#4 integrate .. //depot/projects/mips/sys/dev/sound/pci/ds1.c#7 integrate .. //depot/projects/mips/sys/dev/sound/pci/emu10k1.c#9 integrate .. //depot/projects/mips/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/mips/sys/dev/sound/pci/fm801.c#5 integrate .. //depot/projects/mips/sys/dev/sound/pci/ich.c#7 integrate .. //depot/projects/mips/sys/dev/sound/pci/maestro.c#4 integrate .. //depot/projects/mips/sys/dev/sound/pci/maestro3.c#4 integrate .. //depot/projects/mips/sys/dev/sound/pci/neomagic.c#3 integrate .. //depot/projects/mips/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/mips/sys/dev/sound/pci/t4dwave.c#6 integrate .. //depot/projects/mips/sys/dev/sound/pci/via8233.c#8 integrate .. //depot/projects/mips/sys/dev/sound/pci/via82c686.c#6 integrate .. //depot/projects/mips/sys/dev/sound/pci/vibes.c#4 integrate .. //depot/projects/mips/sys/dev/sound/pcm/sound.h#8 integrate .. //depot/projects/mips/sys/dev/usb/uftdi.c#8 integrate .. //depot/projects/mips/sys/dev/usb/umass.c#17 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs#19 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs.h#18 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs_data.h#18 integrate .. //depot/projects/mips/sys/dev/usb/usbdi.c#4 integrate .. //depot/projects/mips/sys/dev/utopia/utopia.c#2 integrate .. //depot/projects/mips/sys/fs/udf/udf_vnops.c#10 integrate .. //depot/projects/mips/sys/geom/bde/g_bde_work.c#11 integrate .. //depot/projects/mips/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/mips/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/mips/sys/i386/acpica/acpi_toshiba.c#2 integrate .. //depot/projects/mips/sys/i386/conf/NOTES#20 integrate .. //depot/projects/mips/sys/i386/i386/critical.c#6 integrate .. //depot/projects/mips/sys/i386/include/cpufunc.h#4 integrate .. //depot/projects/mips/sys/i386/include/critical.h#3 integrate .. //depot/projects/mips/sys/i386/include/pmap.h#8 integrate .. //depot/projects/mips/sys/ia64/ia64/pmap.c#16 integrate .. //depot/projects/mips/sys/ia64/include/critical.h#3 integrate .. //depot/projects/mips/sys/ia64/include/pmap.h#8 integrate .. //depot/projects/mips/sys/kern/kern_acct.c#12 integrate .. //depot/projects/mips/sys/kern/kern_exec.c#20 integrate .. //depot/projects/mips/sys/kern/kern_exit.c#20 integrate .. //depot/projects/mips/sys/kern/kern_fork.c#22 integrate .. //depot/projects/mips/sys/kern/kern_intr.c#14 integrate .. //depot/projects/mips/sys/kern/kern_sig.c#19 integrate .. //depot/projects/mips/sys/kern/kern_synch.c#18 integrate .. //depot/projects/mips/sys/kern/kern_sysctl.c#10 integrate .. //depot/projects/mips/sys/kern/kern_tc.c#11 integrate .. //depot/projects/mips/sys/kern/kern_thread.c#23 integrate .. //depot/projects/mips/sys/kern/sched_4bsd.c#15 integrate .. //depot/projects/mips/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/mips/sys/kern/subr_trap.c#17 integrate .. //depot/projects/mips/sys/kern/uipc_syscalls.c#17 integrate .. //depot/projects/mips/sys/kern/vfs_bio.c#20 integrate .. //depot/projects/mips/sys/kern/vfs_subr.c#18 integrate .. //depot/projects/mips/sys/modules/acpi/Makefile#7 integrate .. //depot/projects/mips/sys/modules/acpi/acpi_video/Makefile#1 branch .. //depot/projects/mips/sys/modules/ctau/Makefile#1 branch .. //depot/projects/mips/sys/modules/if_ndis/Makefile#2 integrate .. //depot/projects/mips/sys/modules/ndis/Makefile#3 integrate .. //depot/projects/mips/sys/modules/netgraph/Makefile#7 integrate .. //depot/projects/mips/sys/modules/netgraph/vlan/Makefile#1 branch .. //depot/projects/mips/sys/net/if_ethersubr.c#15 integrate .. //depot/projects/mips/sys/net/if_stf.c#10 integrate .. //depot/projects/mips/sys/netgraph/ng_vlan.c#1 branch .. //depot/projects/mips/sys/netgraph/ng_vlan.h#1 branch .. //depot/projects/mips/sys/netinet/ip_dummynet.c#11 integrate .. //depot/projects/mips/sys/netinet/ip_input.c#19 integrate .. //depot/projects/mips/sys/netinet/ip_output.c#18 integrate .. //depot/projects/mips/sys/netinet/tcp_input.c#19 integrate .. //depot/projects/mips/sys/netinet6/in6.c#8 integrate .. //depot/projects/mips/sys/netinet6/ip6_input.c#9 integrate .. //depot/projects/mips/sys/netinet6/mld6.c#6 integrate .. //depot/projects/mips/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/mips/sys/opencrypto/crypto.c#8 integrate .. //depot/projects/mips/sys/pc98/conf/GENERIC#16 integrate .. //depot/projects/mips/sys/pc98/conf/NOTES#13 integrate .. //depot/projects/mips/sys/pc98/pc98/sio_cbus.c#3 integrate .. //depot/projects/mips/sys/powerpc/include/critical.h#3 integrate .. //depot/projects/mips/sys/powerpc/include/sr.h#3 integrate .. //depot/projects/mips/sys/powerpc/include/ucontext.h#2 integrate .. //depot/projects/mips/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/mips/sys/powerpc/powerpc/copyinout.c#5 integrate .. //depot/projects/mips/sys/powerpc/powerpc/machdep.c#17 integrate .. //depot/projects/mips/sys/powerpc/powerpc/pmap.c#10 integrate .. //depot/projects/mips/sys/powerpc/powerpc/vm_machdep.c#11 integrate .. //depot/projects/mips/sys/sparc64/include/critical.h#3 integrate .. //depot/projects/mips/sys/sys/_null.h#3 integrate .. //depot/projects/mips/sys/sys/eventhandler.h#5 integrate .. //depot/projects/mips/sys/sys/filedesc.h#8 integrate .. //depot/projects/mips/sys/sys/mutex.h#7 integrate .. //depot/projects/mips/sys/sys/param.h#16 integrate .. //depot/projects/mips/sys/vm/uma_core.c#17 integrate .. //depot/projects/mips/sys/vm/vm_contig.c#9 integrate .. //depot/projects/mips/sys/vm/vm_extern.h#8 integrate .. //depot/projects/mips/sys/vm/vm_glue.c#10 integrate .. //depot/projects/mips/sys/vm/vm_mmap.c#10 integrate .. //depot/projects/mips/sys/vm/vm_page.c#21 integrate .. //depot/projects/mips/sys/vm/vm_page.h#9 integrate .. //depot/projects/mips/sys/vm/vm_pageout.c#16 integrate .. //depot/projects/mips/sys/vm/vm_zeroidle.c#7 integrate .. //depot/projects/mips/tools/build/Makefile#4 integrate .. //depot/projects/mips/tools/regression/geom_concat/Makefile#1 branch .. //depot/projects/mips/tools/regression/geom_concat/runtests.sh#1 branch .. //depot/projects/mips/tools/regression/geom_concat/test-1.sh#1 branch .. //depot/projects/mips/tools/regression/geom_concat/test-2.sh#1 branch .. //depot/projects/mips/usr.bin/Makefile#14 integrate .. //depot/projects/mips/usr.bin/c99/c99.1#3 integrate .. //depot/projects/mips/usr.bin/chpass/chpass.1#3 integrate .. //depot/projects/mips/usr.bin/elfdump/elfdump.c#4 integrate .. //depot/projects/mips/usr.bin/logins/Makefile#1 branch .. //depot/projects/mips/usr.bin/logins/logins.1#1 branch .. //depot/projects/mips/usr.bin/logins/logins.c#1 branch .. //depot/projects/mips/usr.bin/mail/lex.c#3 integrate .. //depot/projects/mips/usr.bin/yacc/main.c#2 integrate .. //depot/projects/mips/usr.sbin/ac/ac.c#3 integrate .. //depot/projects/mips/usr.sbin/acpi/acpiconf/acpiconf.c#5 integrate .. //depot/projects/mips/usr.sbin/ancontrol/ancontrol.8#4 integrate .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/send_recv.c#6 integrate .. //depot/projects/mips/usr.sbin/boot98cfg/boot98cfg.c#4 integrate .. //depot/projects/mips/usr.sbin/bsnmpd/bsnmpd/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/burncd/burncd.c#9 integrate .. //depot/projects/mips/usr.sbin/cron/crontab/crontab.1#3 integrate .. //depot/projects/mips/usr.sbin/mergemaster/mergemaster.sh#9 integrate .. //depot/projects/mips/usr.sbin/mountd/mountd.8#3 integrate .. //depot/projects/mips/usr.sbin/mountd/mountd.c#5 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/inf.c#6 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/ndiscvt.c#3 integrate .. //depot/projects/mips/usr.sbin/nologin/Makefile#1 branch .. //depot/projects/mips/usr.sbin/nologin/nologin.5#1 branch .. //depot/projects/mips/usr.sbin/nologin/nologin.8#1 branch .. //depot/projects/mips/usr.sbin/nologin/nologin.c#1 branch .. //depot/projects/mips/usr.sbin/pkg_install/add/main.c#4 integrate .. //depot/projects/mips/usr.sbin/pkg_install/add/pkg_add.1#5 integrate .. //depot/projects/mips/usr.sbin/pstat/pstat.c#7 integrate .. //depot/projects/mips/usr.sbin/rpc.lockd/lock_proc.c#4 integrate Differences ... ==== //depot/projects/mips/MAINTAINERS#14 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.81 2004/02/28 00:48:20 vkashyap Exp $ +$FreeBSD: src/MAINTAINERS,v 1.82 2004/03/01 16:34:39 obrien Exp $ subsystem login notes ----------------------------- @@ -10,6 +10,7 @@ MAC Modules rwatson Pre-commit review requested. ATA/IDE sos Pre-commit review requested. ahc(4) gibbs Pre-commit review requested. +ahd(4) gibbs Pre-commit review requested. NEWCARD imp Pre-commit review requested. OLDCARD imp Pre-commit review requested. wi imp Pre-commit review requested. @@ -31,7 +32,6 @@ mly scottl Pre-commit review requested. maestro3 scottl Pre-commit review requested. raidframe scottl Pre-commit review requested. -powerpc benno Pre-commit review preferred. CAM gibbs, ken Pre-commit review requested. send to scsi@freebsd.org devstat(9) ken Pre-commit review requested. @@ -84,12 +84,14 @@ libc nectar Opportuntity for pre-commit review appreciated for nsdispatch(3) and its consumers. unifdef(1) fanf Pre-commit review requested. -ntp roberto Pre-commit review requested. +ntp roberto Pre-commit review requested. inetd dwmalone Recommends pre-commit review. nwfs bp In case of functional changes pre-commit review requested. contrib/smbfs bp Open for in-tree committs. In case of functional changes pre-commit review requested. +binutils obrien Insists on BU blocked from unapproved commits + Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/mips/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.296 2004/02/29 13:07:05 johan Exp $ +# $FreeBSD: src/Makefile,v 1.297 2004/03/02 14:32:23 ru Exp $ # # The user-driven targets are: # @@ -144,7 +144,9 @@ # Set a reasonable default .MAIN: all +.if make(world) STARTTIME!= LC_ALL=C date +.endif # # world # @@ -251,8 +253,10 @@ @echo " (started ${STARTTIME})" @echo "--------------------------------------------------------------" +.if make(buildkernels) KERNCONFS!= cd ${.CURDIR}/sys/${TARGET}/conf && \ find [A-Z]*[A-Z] -type f -maxdepth 0 ! -name NOTES +.endif buildkernels: .for kernel in ${KERNCONFS} ==== //depot/projects/mips/Makefile.inc1#22 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.405 2004/02/13 21:52:08 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.410 2004/03/05 18:16:28 gad Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -221,7 +221,7 @@ @echo @echo "*** Error: path to source tree contains a comma ','" @echo - @false + false .endif @echo @echo "--------------------------------------------------------------" @@ -343,11 +343,71 @@ .ORDER: ${WMAKE_TGTS} # +# Use this to add checks to installworld/installkernel targets. +# +SPECIAL_INSTALLCHECKS= + +# +# The following install-time check will see if the installation will +# change the type used for time_t, and if it will, the target makes +# sure that the user is expecting to make that change. +# +.if ${TARGET_ARCH} == "sparc64" +SPECIAL_INSTALLCHECKS+=sparc64_installcheck + +CUR_TIMET!= grep __time_t /usr/include/machine/_types.h | awk '{print $$2}' +SRC_TIMET!= grep __time_t ${.CURDIR}/sys/sparc64/include/_types.h | \ + awk '{print $$2}' +NEWSPARC_TIMETYPE?=${CUR_TIMET} +THISHOST!= hostname -s +.if empty(THISHOST) +THISHOST="name not set yet" +.endif + +sparc64_installcheck: +.if ${CUR_TIMET} != ${SRC_TIMET} + @echo +.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMET} + @echo "*** ERROR: This target would change the type used for time_t!" +.else + @echo "* Note: This installation changes the type used for time_t." +.endif + @echo "* " + @echo "* This host (${THISHOST}) has time_t defined as ${CUR_TIMET}," + @echo "* and this installation would change that to type ${SRC_TIMET}." +.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMET} + @echo "* " + @echo "* If that is *NOT* what you wanted, then you need to change the" + @echo "* typedef of __time_t in ${.CURDIR}/sys/sparc64/include/_types.h" + @echo "* from '${SRC_TIMET}' to '${CUR_TIMET}'. After that you *MUST*" + @echo "* do a complete cleanworld, buildworld, buildkernel before you" + @echo "* retry the 'make' command. Also read /usr/src/UPDATING.64BTT." + @echo "* " + @echo "* If that *is* what you want, then enter the commands:" + @echo " NEWSPARC_TIMETYPE=${SRC_TIMET}" + @echo " export NEWSPARC_TIMETYPE" + @echo "* and repeat your 'make' command." + @echo + false +.endif + @echo +.elif ${NEWSPARC_TIMETYPE} != ${SRC_TIMET} + @echo + @echo "*** ERROR: NEWSPARC_TIMETYPE is set to '${NEWSPARC_TIMETYPE}'" + @echo "*** but ${.CURDIR}/sys/sparc64/include/_types.h" + @echo "*** has __time_t defined as '${SRC_TIMET}'." + false +.else + @# in sparc64_installcheck, all TIMETYPEs == '${CUR_TIMET}' +.endif +.endif + +# # installcheck # # Checks to be sure system is ready for installworld # -installcheck: +installcheck: ${SPECIAL_INSTALLCHECKS} .if !defined(NO_SENDMAIL) @if ! `id -u smmsp > /dev/null`; then \ echo "ERROR: Required smmsp user is missing, see /usr/src/UPDATING."; \ @@ -386,7 +446,7 @@ # and do a 'make reinstall' on the *client* to install new binaries from the # most recent server build. # -reinstall: +reinstall: ${SPECIAL_INSTALLCHECKS} @echo "--------------------------------------------------------------" @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" @@ -453,7 +513,7 @@ buildkernel: .if empty(BUILDKERNELS) @echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; - @false + false .endif .if defined(KERNWARN) @echo "--------------------------------------------------------------" @@ -503,14 +563,15 @@ .endfor # -# installkernel +# installkernel, etc. # # Install the kernel defined by INSTALLKERNEL # -installkernel reinstallkernel installkernel.debug reinstallkernel.debug: +installkernel installkernel.debug \ +reinstallkernel reinstallkernel.debug: ${SPECIAL_INSTALLCHECKS} .if empty(INSTALLKERNEL) @echo "ERROR: No kernel \"${KERNCONF}\" to install." - @false + false .endif cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH} \ ==== //depot/projects/mips/UPDATING#15 (text+ko) ==== @@ -17,7 +17,18 @@ developers choose to disable these features on build machines to maximize performance. -20040226: +20040303: + If you are having trouble with the libc_r -> libpthread transition + (see the 20040130 entry), place the following lines at the top of + /etc/libmap.conf: + + libc_r.so.5 libpthread.so.1 + libc_r.so libpthread.so + + This will cause all programs and libraries linked against libc_r + to use libpthread instead. + +20040226: Some sshd configuration defaults have changed: protocol version 1 is no longer enabled by default, and password authentication is disabled by default if PAM is enabled (which it is by default). @@ -1519,4 +1530,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.296 2004/02/26 16:44:31 green Exp $ +$FreeBSD: src/UPDATING,v 1.297 2004/03/03 09:17:06 des Exp $ ==== //depot/projects/mips/bin/date/date.c#5 (text+ko) ==== @@ -44,7 +44,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.44 2003/10/04 07:16:40 dds Exp $"); +__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.45 2004/03/04 15:46:14 mtm Exp $"); #include #include @@ -234,9 +234,9 @@ case 10: /* yy */ if (century) lt->tm_year += ATOI2(p); - else { /* hack for 2000 ;-} */ + else { lt->tm_year = ATOI2(p); - if (lt->tm_year < 69) + if (lt->tm_year < 69) /* hack for 2000 ;-} */ lt->tm_year += 2000 - TM_YEAR_BASE; else lt->tm_year += 1900 - TM_YEAR_BASE; ==== //depot/projects/mips/bin/dd/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/dd/Makefile,v 1.12 2003/06/13 07:04:01 markm Exp $ +# $FreeBSD: src/bin/dd/Makefile,v 1.16 2004/03/06 06:54:58 ache Exp $ PROG= dd SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c @@ -7,3 +7,20 @@ MAINTAINER= green@FreeBSD.org .include + +CLEANFILES+= a.out +# +# Test the character conversion functions. We have to be explicit about +# which LC_LANG we use because the definition of upper and lower case +# depends on it. +test: ${PROG} + cc ${.CURDIR}/gen.c +.for conv in ascii ebcdic ibm oldascii oldebcdic oldibm \ + pareven parnone parodd parset \ + swab lcase ucase + @echo testing conv=${conv} + @./a.out | \ + /usr/bin/env -i LC_CTYPE=en_US.US-ASCII ./dd conv=${conv} 2>/dev/null | \ + /usr/bin/env -i LC_CTYPE=en_US.US-ASCII hexdump -C | \ + diff -IFreeBSD - ${.CURDIR}/ref.${conv} +.endfor ==== //depot/projects/mips/bin/dd/args.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.36 2003/03/15 13:34:48 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.37 2004/03/05 19:35:51 phk Exp $"); #include @@ -299,6 +299,10 @@ { "oldebcdic", C_EBCDIC, C_ASCII, a2e_32V }, { "oldibm", C_EBCDIC, C_ASCII, a2ibm_32V }, { "osync", C_OSYNC, C_BS, NULL }, + { "pareven", C_PAREVEN, C_PARODD|C_PARSET|C_PARNONE, NULL}, + { "parnone", C_PARNONE, C_PARODD|C_PARSET|C_PAREVEN, NULL}, + { "parodd", C_PARODD, C_PAREVEN|C_PARSET|C_PARNONE, NULL}, + { "parset", C_PARSET, C_PARODD|C_PAREVEN|C_PARNONE, NULL}, { "sparse", C_SPARSE, 0, NULL }, { "swab", C_SWAB, 0, NULL }, { "sync", C_SYNC, 0, NULL }, ==== //depot/projects/mips/bin/dd/dd.1#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $FreeBSD: src/bin/dd/dd.1,v 1.21 2002/11/26 17:55:40 ru Exp $ +.\" $FreeBSD: src/bin/dd/dd.1,v 1.22 2004/03/05 19:35:51 phk Exp $ .\" .Dd January 13, 1994 .Dt DD 1 @@ -231,6 +231,13 @@ systems. .It Cm lcase Transform uppercase characters into lowercase characters. +.It Cm pareven , parnone , parodd , parset +Output data with the specified parity. +The parity bit on input is stripped unless +.Tn EBCDIC +to +.Tn ASCII +conversions is also specified. .It Cm noerror Do not stop processing on an input error. When an input error occurs, a diagnostic message followed by the current @@ -355,6 +362,19 @@ in the same format as the standard completion message and .Nm will exit. +.Sh EXAMPLES +Check that a disk drive contains no bad blocks: +.Dl dd if=/dev/ad0 of=/dev/null bs=1m +.Pp +Do a refresh of a disk drive, in order to prevent presently +recoverable read errors from progressing into unrecoverable read errors: +.Dl dd if=/dev/ad0 of=/dev/ad0 bs=1m +.Pp +Remove parity bit from a file +.Dl dd if=file conv=parnone of=file.txt +.Pp +Check for (even) parity errors on a file: +.Dl dd if=file conv=pareven | cmp -x - file .Sh DIAGNOSTICS .Ex -std .Sh SEE ALSO ==== //depot/projects/mips/bin/dd/dd.c#5 (text+ko) ==== @@ -47,7 +47,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.40 2003/05/01 16:58:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.41 2004/03/05 19:35:51 phk Exp $"); #include #include @@ -104,6 +104,16 @@ exit(0); } +static int +parity(u_char c) +{ + int i; + + i = c ^ (c >> 1) ^ (c >> 2) ^ (c >> 3) ^ + (c >> 4) ^ (c >> 5) ^ (c >> 6) ^ (c >> 7); + return (i & 1); +} + static void setup(void) { @@ -176,29 +186,52 @@ if (ftruncate(out.fd, out.offset * out.dbsz) == -1) err(1, "truncating %s", out.name); - /* - * If converting case at the same time as another conversion, build a - * table that does both at once. If just converting case, use the - * built-in tables. - */ - if (ddflags & (C_LCASE | C_UCASE)) { - if (ddflags & (C_ASCII | C_EBCDIC)) { - if (ddflags & C_LCASE) { - for (cnt = 0; cnt <= 0377; ++cnt) - casetab[cnt] = tolower(ctab[cnt]); - } else { - for (cnt = 0; cnt <= 0377; ++cnt) - casetab[cnt] = toupper(ctab[cnt]); - } + if (ddflags & (C_LCASE | C_UCASE | C_ASCII | C_EBCDIC | C_PARITY)) { + if (ctab != NULL) { + for (cnt = 0; cnt <= 0377; ++cnt) + casetab[cnt] = ctab[cnt]; } else { - if (ddflags & C_LCASE) { - for (cnt = 0; cnt <= 0377; ++cnt) - casetab[cnt] = tolower((int)cnt); - } else { - for (cnt = 0; cnt <= 0377; ++cnt) - casetab[cnt] = toupper((int)cnt); - } + for (cnt = 0; cnt <= 0377; ++cnt) + casetab[cnt] = cnt; + } + if ((ddflags & C_PARITY) && !(ddflags & C_ASCII)) { + /* + * If the input is not EBCDIC, and we do parity + * processing, strip input parity. + */ + for (cnt = 200; cnt <= 0377; ++cnt) + casetab[cnt] = casetab[cnt & 0x7f]; + } + if (ddflags & C_LCASE) { + for (cnt = 0; cnt <= 0377; ++cnt) + casetab[cnt] = tolower(casetab[cnt]); + } else if (ddflags & C_UCASE) { + for (cnt = 0; cnt <= 0377; ++cnt) + casetab[cnt] = toupper(casetab[cnt]); + } + if ((ddflags & C_PARITY)) { + /* + * This should strictly speaking be a no-op, but I + * wonder what funny LANG settings could get us. + */ + for (cnt = 0; cnt <= 0377; ++cnt) + casetab[cnt] = casetab[cnt] & 0x7f; + } + if ((ddflags & C_PARSET)) { + for (cnt = 0; cnt <= 0377; ++cnt) + casetab[cnt] = casetab[cnt] | 0x80; + } + if ((ddflags & C_PAREVEN)) { + for (cnt = 0; cnt <= 0377; ++cnt) + if (parity(casetab[cnt])) + casetab[cnt] = casetab[cnt] | 0x80; + } + if ((ddflags & C_PARODD)) { + for (cnt = 0; cnt <= 0377; ++cnt) + if (!parity(casetab[cnt])) + casetab[cnt] = casetab[cnt] | 0x80; } + ctab = casetab; } ==== //depot/projects/mips/bin/dd/dd.h#3 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)dd.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/dd/dd.h,v 1.18 2003/02/27 18:04:54 markm Exp $ + * $FreeBSD: src/bin/dd/dd.h,v 1.20 2004/03/06 08:21:32 bde Exp $ */ /* Input/output stream state. */ @@ -55,10 +55,9 @@ #define ISTRUNC 0x20 /* valid to ftruncate() */ u_int flags; - const char *name; /* name */ + const char *name; /* name */ int fd; /* file descriptor */ off_t offset; /* # of blocks to skip */ - } IO; typedef struct { @@ -69,7 +68,7 @@ uintmax_t trunc; /* # of truncated records */ uintmax_t swab; /* # of odd-length swab blocks */ uintmax_t bytes; /* # of bytes written */ - double start; /* start time of dd */ + double start; /* start time of dd */ } STAT; /* Flags (in ddflags). */ @@ -87,11 +86,17 @@ #define C_NOTRUNC 0x00800 #define C_OBS 0x01000 #define C_OF 0x02000 -#define C_SEEK 0x04000 -#define C_SKIP 0x08000 -#define C_SWAB 0x10000 -#define C_SYNC 0x20000 -#define C_UCASE 0x40000 -#define C_UNBLOCK 0x80000 -#define C_OSYNC 0x100000 -#define C_SPARSE 0x200000 +#define C_OSYNC 0x04000 +#define C_PAREVEN 0x08000 +#define C_PARNONE 0x100000 +#define C_PARODD 0x200000 +#define C_PARSET 0x400000 +#define C_SEEK 0x800000 +#define C_SKIP 0x1000000 +#define C_SPARSE 0x2000000 +#define C_SWAB 0x4000000 +#define C_SYNC 0x8000000 +#define C_UCASE 0x10000000 +#define C_UNBLOCK 0x20000000 + +#define C_PARITY (C_PAREVEN | C_PARODD | C_PARNONE | C_PARSET) ==== //depot/projects/mips/bin/df/df.c#8 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.54 2004/02/08 23:42:09 iedowse Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.55 2004/03/05 08:10:16 markm Exp $"); #include #include @@ -579,7 +579,7 @@ *strptr = ','; free(listptr[i]); } - *(--strptr) = NULL; + *(--strptr) = '\0'; free(keep_xvfsp); free(listptr); ==== //depot/projects/mips/bin/ls/print.c#10 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.67 2004/01/22 04:33:00 cperciva Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.68 2004/03/01 19:25:27 cperciva Exp $"); #include #include @@ -623,11 +623,11 @@ dbytes = bytes; unit = unit_adjust(&dbytes); - if (dbytes == 0) - (void)printf("%*s ", 4, "0B"); + if (unit == 0) + (void)printf("%*d%c ", 4, (int)bytes, 'B'); else - (void)printf("%*.*f%c ", 3, - dbytes > 10 ? 0 : 1, dbytes, "BKMGTPE"[unit]); + (void)printf("%*.*f%c ", 4, + dbytes >= 99.95 ? 0 : 1, dbytes, "BKMGTPE"[unit]); } else (void)printf("%*jd ", (u_int)width, bytes); } ==== //depot/projects/mips/bin/pax/options.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/pax/options.c,v 1.29 2003/05/03 16:39:33 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/options.c,v 1.30 2004/03/05 08:10:17 markm Exp $"); #include #include @@ -1256,7 +1256,7 @@ */ maxflt = 0; while ((str = getline(stdin)) != NULL) { - ftree_add(str, NULL); + ftree_add(str, 0); } if (getline_error) { paxwarn(1, "Problem while reading stdin"); ==== //depot/projects/mips/contrib/diff/diff.h#3 (text+ko) ==== ==== //depot/projects/mips/etc/defaults/rc.conf#17 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.198 2004/02/03 11:26:08 des Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.199 2004/03/03 15:21:01 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -448,6 +448,7 @@ performance_throttle_state="HIGH" # Online throttling state economy_cx_lowest="LOW" # Offline CPU idle state economy_throttle_state="HIGH" # Offline throttling state +virecover_enable="YES" # Perform housekeeping for the vi(1) editor ############################################################## ### Jail Configuration ####################################### ==== //depot/projects/mips/etc/pccard_ether#6 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.39 2004/01/25 19:52:16 ambrisko Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.40 2004/03/05 08:49:59 rse Exp $ # # pccard_ether interfacename [start|stop] [ifconfig option] # @@ -92,7 +92,7 @@ [ -n "$dhcp_program" ] && dhclient_program="$dhcp_program" [ -n "$dhcp_flags" ] && dhclient_flags="$dhcp_flags" if [ -x "${dhclient_program}" ]; then - interfaces=`echo $_dhcplist ${interface} | xargs -n 1 echo | sort -u ` + interfaces=`echo $_dhcplist ${interface} | xargs -n 1 echo | sort -u` ${dhclient_program} ${dhclient_flags} ${interfaces} else echo "${dhclient_program}: DHCP client software not available" ==== //depot/projects/mips/etc/rc.d/Makefile#10 (text+ko) ==== @@ -1,7 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.31 2004/02/07 15:46:20 imp Exp $ - -.include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 7 08:22:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 981C416A4CF; Sun, 7 Mar 2004 08:22:33 -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 6CE6316A4D2 for ; Sun, 7 Mar 2004 08:22:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EDD843D3F for ; Sun, 7 Mar 2004 08:22:33 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i27GMXGe022073 for ; Sun, 7 Mar 2004 08:22:33 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i27GMWLJ022070 for perforce@freebsd.org; Sun, 7 Mar 2004 08:22:32 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 7 Mar 2004 08:22:32 -0800 (PST) Message-Id: <200403071622.i27GMWLJ022070@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 48344 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 Mar 2004 16:22:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=48344 Change 48344 by peter@peter_melody on 2004/03/07 08:21:56 dont grab giant for kmem_free() Affected files ... .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#20 edit Differences ... ==== //depot/projects/hammer/sys/i386/i386/vm_machdep.c#20 (text+ko) ==== @@ -320,10 +320,8 @@ * XXX do we need to move the TSS off the allocated pages * before freeing them? (not done here) */ - mtx_lock(&Giant); kmem_free(kernel_map, (vm_offset_t)pcb->pcb_ext, ctob(IOPAGES + 1)); - mtx_unlock(&Giant); pcb->pcb_ext = 0; } } From owner-p4-projects@FreeBSD.ORG Sun Mar 7 08:22:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F88A16A4CF; Sun, 7 Mar 2004 08:22: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 D98AF16A4F2 for ; Sun, 7 Mar 2004 08:22:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6F2043D3F for ; Sun, 7 Mar 2004 08:22:33 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i27GMXGe022080 for ; Sun, 7 Mar 2004 08:22:33 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i27GMX3e022076 for perforce@freebsd.org; Sun, 7 Mar 2004 08:22:33 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 7 Mar 2004 08:22:33 -0800 (PST) Message-Id: <200403071622.i27GMX3e022076@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 48345 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 Mar 2004 16:22:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=48345 Change 48345 by peter@peter_melody on 2004/03/07 08:22:20 kmem_free() doesn't appear to be need giant Affected files ... .. //depot/projects/hammer/sys/vm/vm_kern.c#15 edit Differences ... ==== //depot/projects/hammer/sys/vm/vm_kern.c#15 (text+ko) ==== @@ -229,6 +229,8 @@ * associated with that region. * * This routine may not block on kernel maps. + * + * MPSAFE (see vm_mmap()'s calls) */ void kmem_free(map, addr, size) From owner-p4-projects@FreeBSD.ORG Sun Mar 7 08:23:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F18E916A4D0; Sun, 7 Mar 2004 08:23: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 CBDE116A4CE for ; Sun, 7 Mar 2004 08:23:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4A5F43D41 for ; Sun, 7 Mar 2004 08:23:35 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i27GNZGe022150 for ; Sun, 7 Mar 2004 08:23:35 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i27GNZMK022147 for perforce@freebsd.org; Sun, 7 Mar 2004 08:23:35 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 7 Mar 2004 08:23:35 -0800 (PST) Message-Id: <200403071623.i27GNZMK022147@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 48346 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 Mar 2004 16:23:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=48346 Change 48346 by peter@peter_melody on 2004/03/07 08:22:38 kse_create() appears to be mpsafe Affected files ... .. //depot/projects/hammer/sys/kern/init_sysent.c#25 edit .. //depot/projects/hammer/sys/kern/syscalls.master#25 edit Differences ... ==== //depot/projects/hammer/sys/kern/init_sysent.c#25 (text+ko) ==== @@ -409,7 +409,7 @@ { AS(nmount_args), (sy_call_t *)nmount }, /* 378 = nmount */ { SYF_MPSAFE | 0, (sy_call_t *)kse_exit }, /* 379 = kse_exit */ { SYF_MPSAFE | AS(kse_wakeup_args), (sy_call_t *)kse_wakeup }, /* 380 = kse_wakeup */ - { AS(kse_create_args), (sy_call_t *)kse_create }, /* 381 = kse_create */ + { SYF_MPSAFE | AS(kse_create_args), (sy_call_t *)kse_create }, /* 381 = kse_create */ { SYF_MPSAFE | AS(kse_thr_interrupt_args), (sy_call_t *)kse_thr_interrupt }, /* 382 = kse_thr_interrupt */ { SYF_MPSAFE | AS(kse_release_args), (sy_call_t *)kse_release }, /* 383 = kse_release */ { SYF_MPSAFE | AS(__mac_get_proc_args), (sy_call_t *)__mac_get_proc }, /* 384 = __mac_get_proc */ ==== //depot/projects/hammer/sys/kern/syscalls.master#25 (text+ko) ==== @@ -540,7 +540,7 @@ int flags); } 379 MSTD { int kse_exit(void); } 380 MSTD { int kse_wakeup(struct kse_mailbox *mbx); } -381 STD { int kse_create(struct kse_mailbox *mbx, \ +381 MSTD { int kse_create(struct kse_mailbox *mbx, \ int newgroup); } 382 MSTD { int kse_thr_interrupt(struct kse_thr_mailbox *tmbx, int cmd, \ long data); } From owner-p4-projects@FreeBSD.ORG Sun Mar 7 09:25:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48E4E16A4D0; Sun, 7 Mar 2004 09:25:53 -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 1DE5916A4CE for ; Sun, 7 Mar 2004 09:25:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 123DA43D1F for ; Sun, 7 Mar 2004 09:25:53 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i27HPqGe041778 for ; Sun, 7 Mar 2004 09:25:52 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i27HPqqM041774 for perforce@freebsd.org; Sun, 7 Mar 2004 09:25:52 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 7 Mar 2004 09:25:52 -0800 (PST) Message-Id: <200403071725.i27HPqqM041774@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 48350 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 Mar 2004 17:25:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=48350 Change 48350 by marcel@marcel_nfs on 2004/03/07 09:25:04 Don't update the mailbox again. It's already donr in set_mcontext(). I think this change got submitted by accident... Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/trap.c#70 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/trap.c#70 (text+ko) ==== @@ -452,11 +452,6 @@ &mc, sizeof(mc)); if (!error) { set_mcontext(td, &mc); - if (mc.mc_flags & - _MC_FLAGS_KSE_SET_MBOX) - suword((caddr_t) - mc.mc_special.ifa, - mc.mc_special.isr); return; /* Don't call do_ast()!!! */ } ucode = tf->tf_scratch.gr8; From owner-p4-projects@FreeBSD.ORG Sun Mar 7 09:37:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF1F616A4D0; Sun, 7 Mar 2004 09:37:09 -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 A7F1016A4CE for ; Sun, 7 Mar 2004 09:37:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97C7F43D39 for ; Sun, 7 Mar 2004 09:37:09 -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.10/8.12.10) with ESMTP id i27Hb9Ge044073 for ; Sun, 7 Mar 2004 09:37:09 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i27Hb8t7044070 for perforce@freebsd.org; Sun, 7 Mar 2004 09:37:08 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 7 Mar 2004 09:37:08 -0800 (PST) Message-Id: <200403071737.i27Hb8t7044070@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 48353 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 Mar 2004 17:37:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=48353 Change 48353 by rwatson@rwatson_paprika on 2004/03/07 09:36:30 - NDISulator support for PCCard - /dev/sndstat lists the kernel module supporting a device - Remove more Giant in fork() - vtryrecycle() write leak fix - NFS and RPC now use callouts not timeouts - uma_timeout() now runs without Giant Affected files ... .. //depot/projects/netperf_socket/sys/alpha/include/pmap.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#3 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#3 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pccard.c#1 branch .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#1 branch .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/neomagic.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/trm/trm.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/trm/trm.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umass.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#7 integrate .. //depot/projects/netperf_socket/sys/i386/include/pmap.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/pmap.h#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_fork.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/netperf_socket/sys/modules/if_ndis/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ndis/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/net/if_stf.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio_cbus.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/wd_cd.h#2 integrate .. //depot/projects/netperf_socket/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/netperf_socket/sys/vm/uma_core.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/include/pmap.h#2 (text+ko) ==== @@ -43,7 +43,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.24 2003/10/06 01:47:11 bms Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.25 2004/03/07 07:13:15 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -212,8 +212,6 @@ extern pt_entry_t *CMAP1; extern vm_offset_t avail_end; extern vm_offset_t avail_start; -extern vm_offset_t clean_eva; -extern vm_offset_t clean_sva; extern vm_offset_t phys_avail[]; extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; ==== //depot/projects/netperf_socket/sys/amd64/include/pmap.h#2 (text+ko) ==== @@ -43,7 +43,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.109 2003/11/17 08:58:14 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.110 2004/03/07 07:13:15 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -262,8 +262,6 @@ extern pt_entry_t *CMAP1; extern vm_paddr_t avail_end; extern vm_paddr_t avail_start; -extern vm_offset_t clean_eva; -extern vm_offset_t clean_sva; extern vm_paddr_t phys_avail[]; extern char *ptvmmap; /* poor name! */ extern vm_offset_t virtual_avail; ==== //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.40 2004/03/05 22:42:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.41 2004/03/07 02:49:06 wpaul Exp $"); #include #include @@ -66,9 +66,6 @@ #include #include -#include -#include "card_if.h" - #include #include #include @@ -536,50 +533,6 @@ return; } -#define NDIS_AM_RID 3 - -int -ndis_alloc_amem(arg) - void *arg; -{ - struct ndis_softc *sc; - int error, rid; - - if (arg == NULL) - return(EINVAL); - - sc = arg; - rid = NDIS_AM_RID; - sc->ndis_res_am = bus_alloc_resource(sc->ndis_dev, SYS_RES_MEMORY, - &rid, 0UL, ~0UL, 0x1000, RF_ACTIVE); - - if (sc->ndis_res_am == NULL) { - device_printf(sc->ndis_dev, - "failed to allocate attribute memory\n"); - return(ENXIO); - } - - error = CARD_SET_MEMORY_OFFSET(device_get_parent(sc->ndis_dev), - sc->ndis_dev, rid, 0, NULL); - - if (error) { - device_printf(sc->ndis_dev, - "CARD_SET_MEMORY_OFFSET() returned 0x%x\n", error); - return(error); - } - - error = CARD_SET_RES_FLAGS(device_get_parent(sc->ndis_dev), - sc->ndis_dev, SYS_RES_MEMORY, rid, PCCARD_A_MEM_ATTR); - - if (error) { - device_printf(sc->ndis_dev, - "CARD_SET_RES_FLAGS() returned 0x%x\n", error); - return(error); - } - - return(0); -} - int ndis_create_sysctls(arg) void *arg; ==== //depot/projects/netperf_socket/sys/conf/files.pc98#3 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.286 2004/02/19 13:10:39 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.287 2004/03/07 05:38:20 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -43,12 +43,6 @@ compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ no-implicit-rule # -hal.o optional ath_hal \ - dependency "$S/contrib/dev/ath/freebsd/i386-elf.hal.o.uu" \ - compile-with "uudecode < $S/contrib/dev/ath/freebsd/i386-elf.hal.o.uu" \ - no-implicit-rule -# -# compat/linux/linux_file.c optional compat_linux compat/linux/linux_getcwd.c optional compat_linux compat/linux/linux_ioctl.c optional compat_linux @@ -205,14 +199,9 @@ i386/isa/bs/bsfunc.c optional bs i386/isa/bs/bshw.c optional bs i386/isa/bs/bsif.c count bs -i386/isa/ctx.c optional ctx i386/isa/cy.c count cy i386/isa/elink.c optional ep i386/isa/elink.c optional ie -i386/isa/gpib.c optional gp -i386/isa/if_el.c count el -i386/isa/if_le.c count le -i386/isa/if_rdp.c count rdp i386/isa/isa.c optional isa i386/isa/isa_compat.c optional isa compat_oldisa \ warning "Old ISA driver compatibility shims present." @@ -221,9 +210,7 @@ i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine i386/isa/spkr.c optional speaker -i386/isa/spigot.c count spigot i386/isa/stallion.c optional stl nowerror -i386/isa/wt.c count wt i386/linux/imgact_linux.c optional compat_linux i386/linux/linux_dummy.c optional compat_linux i386/linux/linux_locore.s optional compat_linux \ ==== //depot/projects/netperf_socket/sys/conf/kmod.mk#3 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.153 2004/02/13 10:40:54 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.154 2004/03/06 21:23:56 ru Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -170,11 +170,11 @@ # Search for kernel source tree in standard places. .for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys -.if !defined(SYSDIR) && exists(${_dir}/kern) +.if !defined(SYSDIR) && exists(${_dir}/kern/) SYSDIR= ${_dir} .endif .endfor -.if !defined(SYSDIR) || !exists(${SYSDIR}/kern) +.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) .error "can't find kernel source tree" .endif ==== //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.42 2004/02/11 21:53:40 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.43 2004/03/07 02:49:06 wpaul Exp $"); #include "opt_bdg.h" @@ -75,29 +75,16 @@ #include #include +#define NDIS_IMAGE +#define NDIS_REGVALS + #include "ndis_driver_data.h" -MODULE_DEPEND(ndis, pci, 1, 1, 1); -MODULE_DEPEND(ndis, ether, 1, 1, 1); -MODULE_DEPEND(ndis, wlan, 1, 1, 1); -MODULE_DEPEND(ndis, ndisapi, 1, 1, 1); - -/* - * Various supported device vendors/types and their names. - * These are defined in the ndis_driver_data.h file. - */ -static struct ndis_type ndis_devs[] = { -#ifdef NDIS_DEV_TABLE - NDIS_DEV_TABLE -#endif - { 0, 0, 0, NULL } -}; - -static int ndis_probe (device_t); -static int ndis_attach (device_t); -static int ndis_detach (device_t); -static int ndis_suspend (device_t); -static int ndis_resume (device_t); +int ndis_attach (device_t); +int ndis_detach (device_t); +int ndis_suspend (device_t); +int ndis_resume (device_t); +void ndis_shutdown (device_t); static __stdcall void ndis_txeof (ndis_handle, ndis_packet *, ndis_status); @@ -119,7 +106,6 @@ static void ndis_init (void *); static void ndis_stop (struct ndis_softc *); static void ndis_watchdog (struct ifnet *); -static void ndis_shutdown (device_t); static int ndis_ifmedia_upd (struct ifnet *); static void ndis_ifmedia_sts (struct ifnet *, struct ifmediareq *); static int ndis_get_assoc (struct ndis_softc *, ndis_wlan_bssid_ex *); @@ -135,42 +121,6 @@ extern struct mtx_pool *ndis_mtxpool; -static device_method_t ndis_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, ndis_probe), - DEVMETHOD(device_attach, ndis_attach), - DEVMETHOD(device_detach, ndis_detach), - DEVMETHOD(device_shutdown, ndis_shutdown), - DEVMETHOD(device_suspend, ndis_suspend), - DEVMETHOD(device_resume, ndis_resume), - - { 0, 0 } -}; - -static driver_t ndis_driver = { -#ifdef NDIS_DEVNAME - NDIS_DEVNAME, -#else - "ndis", -#endif - ndis_methods, - sizeof(struct ndis_softc) -}; - -static devclass_t ndis_devclass; - -#ifdef NDIS_MODNAME -#define NDIS_MODNAME_OVERRIDE_PCI(x) \ - DRIVER_MODULE(x, pci, ndis_driver, ndis_devclass, 0, 0) -#define NDIS_MODNAME_OVERRIDE_CARDBUS(x) \ - DRIVER_MODULE(x, cardbus, ndis_driver, ndis_devclass, 0, 0) -NDIS_MODNAME_OVERRIDE_PCI(NDIS_MODNAME); -NDIS_MODNAME_OVERRIDE_CARDBUS(NDIS_MODNAME); -#else -DRIVER_MODULE(ndis, pci, ndis_driver, ndis_devclass, 0, 0); -DRIVER_MODULE(ndis, cardbus, ndis_driver, ndis_devclass, 0, 0); -#endif - /* * Program the 64-bit multicast hash filter. */ @@ -246,32 +196,6 @@ return; } -/* - * Probe for an NDIS device. Check the PCI vendor and device - * IDs against our list and return a device name if we find a match. - */ -static int -ndis_probe(dev) - device_t dev; -{ - struct ndis_type *t; - - t = ndis_devs; - - while(t->ndis_name != NULL) { - if ((pci_get_vendor(dev) == t->ndis_vid) && - (pci_get_device(dev) == t->ndis_did) && - ((pci_read_config(dev, PCIR_SUBVEND_0, 4) == - t->ndis_subsys) || t->ndis_subsys == 0)) { - device_set_desc(dev, t->ndis_name); - return(0); - } - t++; - } - - return(ENXIO); -} - static int ndis_set_offload(sc) struct ndis_softc *sc; @@ -428,105 +352,22 @@ * Attach the interface. Allocate softc structures, do ifmedia * setup and ethernet/BPF attach. */ -static int +int ndis_attach(dev) device_t dev; { u_char eaddr[ETHER_ADDR_LEN]; - struct ndis_softc *sc; + struct ndis_softc *sc; struct ifnet *ifp = NULL; - int unit, error = 0, rid, len; void *img; - struct ndis_type *t; - int i, devidx = 0, defidx = 0; - struct resource_list *rl; - struct resource_list_entry *rle; + int error = 0, len; + int i; sc = device_get_softc(dev); - unit = device_get_unit(dev); - sc->ndis_dev = dev; sc->ndis_mtx = mtx_pool_alloc(ndis_mtxpool); sc->ndis_intrmtx = mtx_pool_alloc(ndis_mtxpool); - /* - * Map control/status registers. - */ - - pci_enable_busmaster(dev); - - rl = BUS_GET_RESOURCE_LIST(device_get_parent(dev), dev); - if (rl != NULL) { - SLIST_FOREACH(rle, rl, link) { - switch (rle->type) { - case SYS_RES_IOPORT: - sc->ndis_io_rid = rle->rid; - sc->ndis_res_io = bus_alloc_resource(dev, - SYS_RES_IOPORT, &sc->ndis_io_rid, - 0, ~0, 1, RF_ACTIVE); - if (sc->ndis_res_io == NULL) { - device_printf(dev, - "couldn't map iospace\n"); - error = ENXIO; - goto fail; - } - break; - case SYS_RES_MEMORY: - if (sc->ndis_res_altmem != NULL && - sc->ndis_res_mem != NULL) { - device_printf(dev, - "too many memory resources\n"); - error = ENXIO; - goto fail; - } - if (rle->rid == PCIR_BAR(2)) { - sc->ndis_altmem_rid = rle->rid; - sc->ndis_res_altmem = - bus_alloc_resource(dev, - SYS_RES_MEMORY, - &sc->ndis_altmem_rid, - 0, ~0, 1, RF_ACTIVE); - if (sc->ndis_res_altmem == NULL) { - device_printf(dev, - "couldn't map alt " - "memory\n"); - error = ENXIO; - goto fail; - } - } else { - sc->ndis_mem_rid = rle->rid; - sc->ndis_res_mem = - bus_alloc_resource(dev, - SYS_RES_MEMORY, - &sc->ndis_mem_rid, - 0, ~0, 1, RF_ACTIVE); - if (sc->ndis_res_mem == NULL) { - device_printf(dev, - "couldn't map memory\n"); - error = ENXIO; - goto fail; - } - } - break; - case SYS_RES_IRQ: - rid = rle->rid; - sc->ndis_irq = bus_alloc_resource(dev, - SYS_RES_IRQ, &rid, 0, ~0, 1, - RF_SHAREABLE | RF_ACTIVE); - if (sc->ndis_irq == NULL) { - device_printf(dev, - "couldn't map interrupt\n"); - error = ENXIO; - goto fail; - } - break; - default: - break; - } - sc->ndis_rescnt++; - } - } - /* * Hook interrupt early, since calling the driver's * init routine may trigger an interrupt. @@ -540,51 +381,7 @@ goto fail; } - /* - * Allocate the parent bus DMA tag appropriate for PCI. - */ -#define NDIS_NSEG_NEW 32 - error = bus_dma_tag_create(NULL, /* parent */ - 1, 0, /* alignment, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - MAXBSIZE, NDIS_NSEG_NEW,/* maxsize, nsegments */ - BUS_SPACE_MAXSIZE_32BIT,/* maxsegsize */ - BUS_DMA_ALLOCNOW, /* flags */ - NULL, NULL, /* lockfunc, lockarg */ - &sc->ndis_parent_tag); - - if (error) - goto fail; - - img = drv_data; sc->ndis_regvals = ndis_regvals; - sc->ndis_iftype = PCIBus; - - /* Figure out exactly which device we matched. */ - - t = ndis_devs; - - while(t->ndis_name != NULL) { - if ((pci_get_vendor(dev) == t->ndis_vid) && - (pci_get_device(dev) == t->ndis_did)) { - if (t->ndis_subsys == 0) - defidx = devidx; - else { - if (t->ndis_subsys == - pci_read_config(dev, PCIR_SUBVEND_0, 4)) - break; - } - } - t++; - devidx++; - } - - if (ndis_devs[devidx].ndis_name == NULL) - sc->ndis_devidx = defidx; - else - sc->ndis_devidx = devidx; sysctl_ctx_init(&sc->ndis_ctx); @@ -592,6 +389,7 @@ ndis_create_sysctls(sc); /* Set up driver image in memory. */ + img = drv_data; ndis_load_driver((vm_offset_t)img, sc); /* Tell the user what version of the API the driver is using. */ @@ -622,7 +420,6 @@ len = sizeof(eaddr); ndis_get_info(sc, OID_802_3_CURRENT_ADDRESS, &eaddr, &len); - sc->ndis_unit = unit; bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); /* @@ -900,7 +697,7 @@ * to be careful about only freeing resources that have actually been * allocated. */ -static int +int ndis_detach(dev) device_t dev; { @@ -947,14 +744,15 @@ ndis_unload_driver((void *)ifp); - bus_dma_tag_destroy(sc->ndis_parent_tag); + if (sc->ndis_iftype == PCIBus) + bus_dma_tag_destroy(sc->ndis_parent_tag); sysctl_ctx_free(&sc->ndis_ctx); return(0); } -static int +int ndis_suspend(dev) device_t dev; { @@ -972,7 +770,7 @@ return(0); } -static int +int ndis_resume(dev) device_t dev; { @@ -2241,7 +2039,7 @@ * Stop all chip I/O so that the kernel's probe routines don't * get confused by errant DMAs when rebooting. */ -static void +void ndis_shutdown(dev) device_t dev; { ==== //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndisvar.h#3 (text+ko) ==== @@ -29,16 +29,22 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/if_ndis/if_ndisvar.h,v 1.10 2004/01/27 09:08:12 wpaul Exp $ + * $FreeBSD: src/sys/dev/if_ndis/if_ndisvar.h,v 1.11 2004/03/07 02:49:06 wpaul Exp $ */ -struct ndis_type { +struct ndis_pci_type { uint16_t ndis_vid; uint16_t ndis_did; uint32_t ndis_subsys; char *ndis_name; }; +struct ndis_pccard_type { + const char *ndis_vid; + const char *ndis_did; + char *ndis_name; +}; + struct ndis_shmem { bus_dma_tag_t ndis_stag; bus_dmamap_t ndis_smap; ==== //depot/projects/netperf_socket/sys/dev/sound/isa/ad1816.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.29 2003/09/07 16:28:02 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.30 2004/03/06 15:52:41 matk Exp $"); struct ad1816_info; @@ -621,12 +621,13 @@ else status2[0] = '\0'; - snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u", + snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u %s", rman_get_start(ad1816->io_base), rman_get_start(ad1816->irq), rman_get_start(ad1816->drq1), status2, - ad1816->bufsize); + ad1816->bufsize, + PCM_KLDSTRING(snd_ad1816)); if (pcm_register(dev, ad1816, 1, 1)) goto no; pcm_addchan(dev, PCMDIR_REC, &ad1816chan_class, ad1816); ==== //depot/projects/netperf_socket/sys/dev/sound/isa/ess.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.27 2003/09/07 16:28:02 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.28 2004/03/06 15:52:41 matk Exp $"); #define ESS_BUFFSIZE (4096) #define ABS(x) (((x) < 0)? -(x) : (x)) @@ -866,9 +866,10 @@ else buf[0] = '\0'; - snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u", + snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u %s", rman_get_start(sc->io_base), rman_get_start(sc->irq), - rman_get_start(sc->drq1), buf, sc->bufsize); + rman_get_start(sc->drq1), buf, sc->bufsize, + PCM_KLDSTRING(snd_ess)); if (pcm_register(dev, sc, 1, 1)) goto no; ==== //depot/projects/netperf_socket/sys/dev/sound/isa/sb16.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.80 2003/09/07 16:28:02 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.81 2004/03/06 15:52:41 matk Exp $"); #define SB16_BUFFSIZE 4096 #define PLAIN_SB16(x) ((((x)->bd_flags) & (BD_F_SB16|BD_F_SB16X)) == BD_F_SB16) @@ -824,9 +824,10 @@ else status2[0] = '\0'; - snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %ud", + snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %ud %s", rman_get_start(sb->io_base), rman_get_start(sb->irq), - rman_get_start(sb->drq1), status2, sb->bufsize); + rman_get_start(sb->drq1), status2, sb->bufsize, + PCM_KLDSTRING(snd_sb16)); if (pcm_register(dev, sb, 1, 1)) goto no; ==== //depot/projects/netperf_socket/sys/dev/sound/isa/sb8.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb8.c,v 1.73 2003/09/07 16:28:02 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb8.c,v 1.74 2004/03/06 15:52:41 matk Exp $"); #define SB_DEFAULT_BUFSZ 4096 @@ -730,8 +730,9 @@ goto no; } - snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld bufsz %u", - rman_get_start(sb->io_base), rman_get_start(sb->irq), rman_get_start(sb->drq), sb->bufsize); + snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld bufsz %u %s", + rman_get_start(sb->io_base), rman_get_start(sb->irq), + rman_get_start(sb->drq), sb->bufsize, PCM_KLDSTRING(snd_sb8)); if (pcm_register(dev, sb, 1, 1)) goto no; ==== //depot/projects/netperf_socket/sys/dev/sound/pci/als4000.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/als4000.c,v 1.13 2003/09/02 17:30:37 jhb Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/als4000.c,v 1.14 2004/03/06 15:52:41 matk Exp $"); /* Debugging macro's */ #undef DEB @@ -818,8 +818,8 @@ pcm_addchan(dev, PCMDIR_PLAY, &alspchan_class, sc); pcm_addchan(dev, PCMDIR_REC, &alsrchan_class, sc); - snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld", - rman_get_start(sc->reg), rman_get_start(sc->irq)); + snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s", + rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_als4000)); pcm_setstatus(dev, status); return 0; ==== //depot/projects/netperf_socket/sys/dev/sound/pci/au88x0.c#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/dev/sound/pci/au88x0.c,v 1.5 2003/10/12 11:33:39 des Exp $ + * $FreeBSD: src/sys/dev/sound/pci/au88x0.c,v 1.6 2004/03/06 15:52:41 matk Exp $ */ #include @@ -529,9 +529,9 @@ struct au88x0_info *aui; aui = pcm_getdevinfo(dev); - snprintf(status, sizeof status, "at %s 0x%lx irq %ld", + snprintf(status, sizeof status, "at %s 0x%lx irq %ld %s", (aui->aui_regtype == SYS_RES_IOPORT)? "io" : "memory", - rman_get_start(aui->aui_reg), rman_get_start(aui->aui_irq)); + rman_get_start(aui->aui_reg), rman_get_start(aui->aui_irq),PCM_KLDSTRING(snd_au88x0)); pcm_setstatus(dev, status); } ==== //depot/projects/netperf_socket/sys/dev/sound/pci/aureal.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/aureal.c,v 1.26 2003/09/07 16:28:02 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/aureal.c,v 1.27 2004/03/06 15:52:41 matk Exp $"); /* PCI IDs of supported chips */ #define AU8820_PCI_ID 0x000112eb @@ -647,9 +647,9 @@ goto bad; } - snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld", + snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld %s", (type[0] == SYS_RES_IOPORT)? "io" : "memory", - rman_get_start(reg[0]), rman_get_start(irq)); + rman_get_start(reg[0]), rman_get_start(irq),PCM_KLDSTRING(snd_aureal)); if (pcm_register(dev, au, 1, 1)) goto bad; /* pcm_addchan(dev, PCMDIR_REC, &au_chantemplate, au); */ ==== //depot/projects/netperf_socket/sys/dev/sound/pci/cmi.c#2 (text+ko) ==== @@ -51,7 +51,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.24 2003/11/11 05:38:27 scottl Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.25 2004/03/06 15:52:41 matk Exp $"); /* Supported chip ID's */ #define CMI8338A_PCI_ID 0x010013f6 @@ -898,8 +898,8 @@ pcm_addchan(dev, PCMDIR_PLAY, &cmichan_class, sc); pcm_addchan(dev, PCMDIR_REC, &cmichan_class, sc); - snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld", - rman_get_start(sc->reg), rman_get_start(sc->irq)); + snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s", + rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_cmi)); pcm_setstatus(dev, status); DEB(printf("cmi_attach: succeeded\n")); ==== //depot/projects/netperf_socket/sys/dev/sound/pci/cs4281.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cs4281.c,v 1.17 2003/09/02 17:30:37 jhb Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cs4281.c,v 1.18 2004/03/06 15:52:41 matk Exp $"); #define CS4281_DEFAULT_BUFSZ 16384 @@ -858,9 +858,9 @@ pcm_addchan(dev, PCMDIR_PLAY, &cs4281chan_class, sc); pcm_addchan(dev, PCMDIR_REC, &cs4281chan_class, sc); - snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld", + snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld %s", (sc->regtype == SYS_RES_IOPORT)? "io" : "memory", - rman_get_start(sc->reg), rman_get_start(sc->irq)); + rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_cs4281)); pcm_setstatus(dev, status); return 0; ==== //depot/projects/netperf_socket/sys/dev/sound/pci/csapcm.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.27 2003/09/02 17:30:37 jhb Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.28 2004/03/06 15:52:41 matk Exp $"); /* Buffer size on dma transfer. Fixed for CS416x. */ #define CS461x_BUFFSIZE (4 * 1024) @@ -788,7 +788,8 @@ return (ENXIO); } - snprintf(status, SND_STATUSLEN, "at irq %ld", rman_get_start(resp->irq)); + snprintf(status, SND_STATUSLEN, "at irq %ld %s", + rman_get_start(resp->irq),PCM_KLDSTRING(snd_csa)); /* Enable interrupt. */ if (snd_setup_intr(dev, resp->irq, INTR_MPSAFE, csa_intr, csa, &csa->ih)) { ==== //depot/projects/netperf_socket/sys/dev/sound/pci/ds1.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.36 2003/09/02 17:30:37 jhb Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.37 2004/03/06 15:52:41 matk Exp $"); /* -------------------------------------------------------------------- */ @@ -996,8 +996,8 @@ goto bad; } - snprintf(status, SND_STATUSLEN, "at memory 0x%lx irq %ld", - rman_get_start(sc->reg), rman_get_start(sc->irq)); + snprintf(status, SND_STATUSLEN, "at memory 0x%lx irq %ld %s", + rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_ds1)); if (pcm_register(dev, sc, DS1_CHANS, 2)) goto bad; ==== //depot/projects/netperf_socket/sys/dev/sound/pci/emu10k1.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.45 2004/01/12 00:06:30 obrien Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.46 2004/03/06 15:52:42 matk Exp $"); /* -------------------------------------------------------------------- */ @@ -1950,8 +1950,9 @@ goto bad; } - snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld", - rman_get_start(sc->reg), rman_get_start(sc->irq)); + snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s", + rman_get_start(sc->reg), rman_get_start(sc->irq), + PCM_KLDSTRING(snd_emu10k1)); if (pcm_register(dev, sc, sc->nchans, gotmic ? 3 : 2)) goto bad; for (i = 0; i < sc->nchans; i++) ==== //depot/projects/netperf_socket/sys/dev/sound/pci/es137x.c#2 (text+ko) ==== @@ -59,7 +59,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.48 2003/09/07 16:28:03 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.49 2004/03/06 15:52:42 matk Exp $"); static int debug = 0; SYSCTL_INT(_debug, OID_AUTO, es_debug, CTLFLAG_RW, &debug, 0, ""); @@ -924,9 +924,9 @@ goto bad; } - snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld", + snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld %s", (es->regtype == SYS_RES_IOPORT)? "io" : "memory", - rman_get_start(es->reg), rman_get_start(es->irq)); + rman_get_start(es->reg), rman_get_start(es->irq),PCM_KLDSTRING(snd_es137x)); if (pcm_register(dev, es, 1, 1)) goto bad; pcm_addchan(dev, PCMDIR_REC, ct, es); ==== //depot/projects/netperf_socket/sys/dev/sound/pci/fm801.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.20 2003/09/02 17:30:37 jhb Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.21 2004/03/06 15:52:42 matk Exp $"); #define PCI_VENDOR_FORTEMEDIA 0x1319 #define PCI_DEVICE_FORTEMEDIA1 0x08011319 @@ -638,9 +638,9 @@ goto oops; } - snprintf(status, 64, "at %s 0x%lx irq %ld", + snprintf(status, 64, "at %s 0x%lx irq %ld %s", (fm801->regtype == SYS_RES_IOPORT)? "io" : "memory", - rman_get_start(fm801->reg), rman_get_start(fm801->irq)); + rman_get_start(fm801->reg), rman_get_start(fm801->irq),PCM_KLDSTRING(snd_fm801)); #define FM801_MAXPLAYCH 1 if (pcm_register(dev, fm801, FM801_MAXPLAYCH, 1)) goto oops; ==== //depot/projects/netperf_socket/sys/dev/sound/pci/ich.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.37 2003/09/15 21:16:47 njl Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.38 2004/03/06 15:52:42 matk Exp $"); /* -------------------------------------------------------------------- */ @@ -761,8 +761,8 @@ if (sc->hasmic) pcm_addchan(dev, PCMDIR_REC, &ichchan_class, sc); /* record mic */ - snprintf(status, SND_STATUSLEN, "at io 0x%lx, 0x%lx irq %ld bufsz %u", - rman_get_start(sc->nambar), rman_get_start(sc->nabmbar), rman_get_start(sc->irq), sc->bufsz); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 7 11:40:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C03716A4D0; Sun, 7 Mar 2004 11:40: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 2003416A4CE for ; Sun, 7 Mar 2004 11:40:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EF9E43D1D for ; Sun, 7 Mar 2004 11:40:45 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i27JeiGe070595 for ; Sun, 7 Mar 2004 11:40:44 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i27JeiDf070592 for perforce@freebsd.org; Sun, 7 Mar 2004 11:40:44 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 7 Mar 2004 11:40:44 -0800 (PST) Message-Id: <200403071940.i27JeiDf070592@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 48362 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 Mar 2004 19:40:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=48362 Change 48362 by peter@peter_daintree on 2004/03/07 11:39:56 Get out the big hammer and hack the tree to build ld-elf32.so.1 Affected files ... .. //depot/projects/hammer/Makefile.inc1#41 edit .. //depot/projects/hammer/etc/mtree/BSD.local.dist#15 edit .. //depot/projects/hammer/etc/mtree/BSD.root.dist#6 edit .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#19 edit .. //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#5 edit .. //depot/projects/hammer/etc/mtree/BSD.x11.dist#2 edit .. //depot/projects/hammer/lib/Makefile#31 edit .. //depot/projects/hammer/lib/libc/Makefile#13 edit .. //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/compat-43/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/db/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/db/btree/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/db/db/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/db/hash/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/db/man/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/db/mpool/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/db/recno/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#5 edit .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#11 edit .. //depot/projects/hammer/lib/libc/gmon/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#16 edit .. //depot/projects/hammer/lib/libc/net/Makefile.inc#7 edit .. //depot/projects/hammer/lib/libc/nls/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#7 edit .. //depot/projects/hammer/lib/libc/quad/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/regex/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/regex/grot/Makefile#2 edit .. //depot/projects/hammer/lib/libc/rpc/Makefile.inc#6 edit .. //depot/projects/hammer/lib/libc/sparc64/fpu/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/sparc64/sys/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#10 edit .. //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#10 edit .. //depot/projects/hammer/lib/libc/stdtime/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/string/Makefile.inc#7 edit .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#12 edit .. //depot/projects/hammer/lib/libc/uuid/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/xdr/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/yp/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc32/Makefile#1 add .. //depot/projects/hammer/libexec/Makefile#20 edit .. //depot/projects/hammer/libexec/rtld-elf/Makefile#8 edit .. //depot/projects/hammer/libexec/rtld-elf/debug.h#2 edit .. //depot/projects/hammer/libexec/rtld-elf/libmap.c#11 edit .. //depot/projects/hammer/libexec/rtld-elf/libmap.h#3 edit .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#17 edit .. //depot/projects/hammer/libexec/rtld-elf/rtld.h#6 edit .. //depot/projects/hammer/libexec/rtld-elf32/Makefile#1 add .. //depot/projects/hammer/share/mk/bsd.lib.mk#13 edit .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#11 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#41 (text+ko) ==== @@ -256,8 +256,8 @@ mkdir -p ${WORLDTMP}/legacy/${_dir} .endfor .for _dir in \ - lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ - usr/libexec usr/share/misc usr/share/bsnmp/defs usr/share/bsnmp/mibs + lib lib32 usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ + usr/lib32 usr/libexec usr/share/misc usr/share/bsnmp/defs usr/share/bsnmp/mibs mkdir -p ${WORLDTMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ ==== //depot/projects/hammer/etc/mtree/BSD.local.dist#15 (text+ko) ==== @@ -19,6 +19,8 @@ .. lib .. + lib32 + .. libdata .. libexec ==== //depot/projects/hammer/etc/mtree/BSD.root.dist#6 (text+ko) ==== @@ -63,6 +63,8 @@ .. lib .. + lib32 + .. libexec .. mnt ==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#19 (text+ko) ==== @@ -19,6 +19,8 @@ .. .. .. + lib32 + .. libdata doscmd fonts ==== //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#5 (text+ko) ==== @@ -347,6 +347,8 @@ .. .. .. + lib32 + .. libdata pkgconfig .. ==== //depot/projects/hammer/etc/mtree/BSD.x11.dist#2 (text+ko) ==== @@ -191,6 +191,8 @@ modules .. .. + lib32 + .. libdata .. libexec ==== //depot/projects/hammer/lib/Makefile#31 (text+ko) ==== @@ -32,7 +32,7 @@ ${_libngatm} libopie libpam libpanel libpcap \ ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libufs libugidfw \ - ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz + ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz ${_libc32} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf @@ -49,6 +49,11 @@ .endif .endif +# build libc_pic.a for rtld-elf-32 on amd64 +.if ${MACHINE_ARCH} == "amd64" +_libc32= libc32 +.endif + .if !defined(NOATM) _libatm= libatm _libngatm= libngatm ==== //depot/projects/hammer/lib/libc/Makefile#13 (text+ko) ==== @@ -10,11 +10,15 @@ LIB=c # If you bump SHLIB_MAJOR, remove the kluge from gen/gethostname.c. # If you bump SHLIB_MAJOR, see standards/55112. +.if !defined(${NOSHLIB}) SHLIB_MAJOR= 5 SHLIBDIR?= /lib +.endif WARNS?= 2 -CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include -CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH} +TARGET?=${MACHINE_ARCH} +LIBCSRC?=${.CURDIR} +CFLAGS+=-I${LIBCSRC}/include -I${LIBCSRC}/../../include +CFLAGS+=-I${LIBCSRC}/${TARGET} CLEANFILES+=tags INSTALL_PIC_ARCHIVE= yes PRECIOUSLIB= yes @@ -30,36 +34,36 @@ # # If there is a machine dependent makefile, use it: # -.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc) -.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc" +.if exists(${LIBCSRC}/${TARGET}/Makefile.inc) +.include "${LIBCSRC}/${TARGET}/Makefile.inc" .endif -.include "${.CURDIR}/db/Makefile.inc" -.include "${.CURDIR}/compat-43/Makefile.inc" -.include "${.CURDIR}/gdtoa/Makefile.inc" -.include "${.CURDIR}/gen/Makefile.inc" -.if ${MACHINE_ARCH} != "powerpc" -.include "${.CURDIR}/gmon/Makefile.inc" +.include "${LIBCSRC}/db/Makefile.inc" +.include "${LIBCSRC}/compat-43/Makefile.inc" +.include "${LIBCSRC}/gdtoa/Makefile.inc" +.include "${LIBCSRC}/gen/Makefile.inc" +.if ${TARGET} != "powerpc" +.include "${LIBCSRC}/gmon/Makefile.inc" .endif -.include "${.CURDIR}/locale/Makefile.inc" -.include "${.CURDIR}/net/Makefile.inc" -.include "${.CURDIR}/nls/Makefile.inc" -.include "${.CURDIR}/posix1e/Makefile.inc" +.include "${LIBCSRC}/locale/Makefile.inc" +.include "${LIBCSRC}/net/Makefile.inc" +.include "${LIBCSRC}/nls/Makefile.inc" +.include "${LIBCSRC}/posix1e/Makefile.inc" .if !defined(NO_QUAD) -.include "${.CURDIR}/quad/Makefile.inc" +.include "${LIBCSRC}/quad/Makefile.inc" .endif -.include "${.CURDIR}/regex/Makefile.inc" -.include "${.CURDIR}/stdio/Makefile.inc" -.include "${.CURDIR}/stdlib/Makefile.inc" -.include "${.CURDIR}/stdtime/Makefile.inc" -.include "${.CURDIR}/string/Makefile.inc" -.include "${.CURDIR}/sys/Makefile.inc" -.include "${.CURDIR}/rpc/Makefile.inc" -.include "${.CURDIR}/uuid/Makefile.inc" -.include "${.CURDIR}/xdr/Makefile.inc" +.include "${LIBCSRC}/regex/Makefile.inc" +.include "${LIBCSRC}/stdio/Makefile.inc" +.include "${LIBCSRC}/stdlib/Makefile.inc" +.include "${LIBCSRC}/stdtime/Makefile.inc" +.include "${LIBCSRC}/string/Makefile.inc" +.include "${LIBCSRC}/sys/Makefile.inc" +.include "${LIBCSRC}/rpc/Makefile.inc" +.include "${LIBCSRC}/uuid/Makefile.inc" +.include "${LIBCSRC}/xdr/Makefile.inc" .if !defined(NO_YP_LIBC) CFLAGS+= -DYP -.include "${.CURDIR}/yp/Makefile.inc" +.include "${LIBCSRC}/yp/Makefile.inc" .endif .if !defined(NO_HESIOD_LIBC) CFLAGS+= -DHESIOD @@ -86,14 +90,14 @@ KSRCS= bcmp.c ffs.c ffsl.c fls.c flsl.c index.c mcount.c rindex.c \ strcat.c strcmp.c strcpy.c strlen.c strncpy.c -libkern: libkern.gen libkern.${MACHINE_ARCH} +libkern: libkern.gen libkern.${TARGET} libkern.gen: ${KQSRCS} ${KSRCS} - cp -p ${.CURDIR}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern + cp -p ${LIBCSRC}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern -libkern.${MACHINE_ARCH}:: ${KMSRCS} +libkern.${TARGET}:: ${KMSRCS} .if defined(KMSRCS) && !empty(KMSRCS) - cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${MACHINE_ARCH} + cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${TARGET} .endif .include ==== //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#4 (text+ko) ==== @@ -14,34 +14,34 @@ CLEANFILES+= __remqu.S __remq.S __remlu.S __reml.S -__divqu.S: ${.CURDIR}/alpha/gen/divrem.m4 +__divqu.S: ${LIBCSRC}/alpha/gen/divrem.m4 m4 -DNAME=__divqu -DOP=div -DS=false -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__divq.S: ${.CURDIR}/alpha/gen/divrem.m4 +__divq.S: ${LIBCSRC}/alpha/gen/divrem.m4 m4 -DNAME=__divq -DOP=div -DS=true -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__divlu.S: ${.CURDIR}/alpha/gen/divrem.m4 +__divlu.S: ${LIBCSRC}/alpha/gen/divrem.m4 m4 -DNAME=__divlu -DOP=div -DS=false -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__divl.S: ${.CURDIR}/alpha/gen/divrem.m4 +__divl.S: ${LIBCSRC}/alpha/gen/divrem.m4 m4 -DNAME=__divl -DOP=div -DS=true -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__remqu.S: ${.CURDIR}/alpha/gen/divrem.m4 +__remqu.S: ${LIBCSRC}/alpha/gen/divrem.m4 m4 -DNAME=__remqu -DOP=rem -DS=false -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__remq.S: ${.CURDIR}/alpha/gen/divrem.m4 +__remq.S: ${LIBCSRC}/alpha/gen/divrem.m4 m4 -DNAME=__remq -DOP=rem -DS=true -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__remlu.S: ${.CURDIR}/alpha/gen/divrem.m4 +__remlu.S: ${LIBCSRC}/alpha/gen/divrem.m4 m4 -DNAME=__remlu -DOP=rem -DS=false -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__reml.S: ${.CURDIR}/alpha/gen/divrem.m4 +__reml.S: ${LIBCSRC}/alpha/gen/divrem.m4 m4 -DNAME=__reml -DOP=rem -DS=true -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} ==== //depot/projects/hammer/lib/libc/compat-43/Makefile.inc#3 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.12 2002/11/18 09:50:54 ru Exp $ # compat-43 sources -.PATH: ${.CURDIR}/${MACHINE_ARCH}/compat-43 ${.CURDIR}/compat-43 +.PATH: ${LIBCSRC}/${TARGET}/compat-43 ${LIBCSRC}/compat-43 SRCS+= creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \ setrgid.c setruid.c sigcompat.c ==== //depot/projects/hammer/lib/libc/db/Makefile.inc#3 (text+ko) ==== @@ -3,9 +3,9 @@ # CFLAGS+=-D__DBINTERFACE_PRIVATE -.include "${.CURDIR}/db/btree/Makefile.inc" -.include "${.CURDIR}/db/db/Makefile.inc" -.include "${.CURDIR}/db/hash/Makefile.inc" -.include "${.CURDIR}/db/man/Makefile.inc" -.include "${.CURDIR}/db/mpool/Makefile.inc" -.include "${.CURDIR}/db/recno/Makefile.inc" +.include "${LIBCSRC}/db/btree/Makefile.inc" +.include "${LIBCSRC}/db/db/Makefile.inc" +.include "${LIBCSRC}/db/hash/Makefile.inc" +.include "${LIBCSRC}/db/man/Makefile.inc" +.include "${LIBCSRC}/db/mpool/Makefile.inc" +.include "${LIBCSRC}/db/recno/Makefile.inc" ==== //depot/projects/hammer/lib/libc/db/btree/Makefile.inc#3 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 7/14/94 # $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/db/btree +.PATH: ${LIBCSRC}/db/btree SRCS+= bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \ bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \ ==== //depot/projects/hammer/lib/libc/db/db/Makefile.inc#3 (text+ko) ==== @@ -1,6 +1,6 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/db/db +.PATH: ${LIBCSRC}/db/db SRCS+= db.c ==== //depot/projects/hammer/lib/libc/db/hash/Makefile.inc#3 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.5 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/db/hash +.PATH: ${LIBCSRC}/db/hash SRCS+= hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \ hash_page.c ndbm.c ==== //depot/projects/hammer/lib/libc/db/man/Makefile.inc#3 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/db/man +.PATH: ${LIBCSRC}/db/man MAN+= btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3 ==== //depot/projects/hammer/lib/libc/db/mpool/Makefile.inc#3 (text+ko) ==== @@ -1,6 +1,6 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $ -.PATH: ${.CURDIR}/db/mpool +.PATH: ${LIBCSRC}/db/mpool SRCS+= mpool.c ==== //depot/projects/hammer/lib/libc/db/recno/Makefile.inc#3 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $ -.PATH: ${.CURDIR}/db/recno +.PATH: ${LIBCSRC}/db/recno SRCS+= rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \ rec_seq.c rec_utils.c ==== //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#5 (text+ko) ==== @@ -1,21 +1,21 @@ # $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.6 2004/01/18 10:32:49 das Exp $ # netlib gdtoa sources -.PATH: ${.CURDIR}/gdtoa +.PATH: ${LIBCSRC}/gdtoa MISRCS+=_hdtoa.c _ldtoa.c glue.c GDTOASRCS=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \ hd_init.c hexnan.c misc.c smisc.c \ strtoIg.c strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c -.if exists(${.CURDIR}/${MACHINE_ARCH}/stdlib/gdtoa.mk) -.include "${.CURDIR}/${MACHINE_ARCH}/stdlib/gdtoa.mk" +.if exists(${LIBCSRC}/${TARGET}/stdlib/gdtoa.mk) +.include "${LIBCSRC}/${TARGET}/stdlib/gdtoa.mk" .endif -CFLAGS+=-I${.CURDIR}/../../contrib/gdtoa +CFLAGS+=-I${LIBCSRC}/../../contrib/gdtoa .for src in ${GDTOASRCS} MISRCS+=gdtoa_${src} CLEANFILES+=gdtoa_${src} gdtoa_${src}: - ln -sf ${.CURDIR}/../../contrib/gdtoa/${src} ${.TARGET} + ln -sf ${LIBCSRC}/../../contrib/gdtoa/${src} ${.TARGET} .endfor ==== //depot/projects/hammer/lib/libc/gen/Makefile.inc#11 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.109 2004/01/15 17:27:28 ru Exp $ # machine-independent gen sources -.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen +.PATH: ${LIBCSRC}/${TARGET}/gen ${LIBCSRC}/gen SRCS+= __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \ alarm.c arc4random.c assert.c basename.c check_utility_compat.c \ @@ -33,8 +33,8 @@ valloc.c vis.c wait.c wait3.c waitpid.c wordexp.c # machine-dependent gen sources -.if exists(${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc) -.include "${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc" +.if exists(${LIBCSRC}/${TARGET}/gen/Makefile.inc) +.include "${LIBCSRC}/${TARGET}/gen/Makefile.inc" .endif MAN+= alarm.3 arc4random.3 \ ==== //depot/projects/hammer/lib/libc/gmon/Makefile.inc#3 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.9 2002/11/18 09:50:55 ru Exp $ # gmon sources -.PATH: ${.CURDIR}/gmon +.PATH: ${LIBCSRC}/gmon SRCS+= gmon.c mcount.c ==== //depot/projects/hammer/lib/libc/locale/Makefile.inc#16 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.53 2003/12/07 06:33:52 tjr Exp $ # locale sources -.PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale +.PATH: ${LIBCSRC}/${TARGET}/locale ${LIBCSRC}/locale SRCS+= big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \ gb18030.c gb2312.c gbk.c isctype.c iswctype.c \ ==== //depot/projects/hammer/lib/libc/net/Makefile.inc#7 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.50 2003/11/14 18:53:22 bms Exp $ # machine-independent net sources -.PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net +.PATH: ${LIBCSRC}/${TARGET}/net ${LIBCSRC}/net SRCS+= addr2ascii.c ascii2addr.c base64.c ether_addr.c getaddrinfo.c \ gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \ @@ -35,8 +35,8 @@ sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET} # machine-dependent net sources -.if exists(${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc) -.include "${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc" +.if exists(${LIBCSRC}/${TARGET}/net/Makefile.inc) +.include "${LIBCSRC}/${TARGET}/net/Makefile.inc" .endif MAN+= addr2ascii.3 byteorder.3 ethers.3 getaddrinfo.3 gethostbyname.3 \ ==== //depot/projects/hammer/lib/libc/nls/Makefile.inc#3 (text+ko) ==== @@ -1,7 +1,7 @@ # from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $ # $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.8 2002/11/18 09:50:55 ru Exp $ -.PATH: ${.CURDIR}/nls +.PATH: ${LIBCSRC}/nls SRCS+= msgcat.c ==== //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#7 (text+ko) ==== @@ -2,7 +2,7 @@ MAINTAINER= rwatson@FreeBSD.org -.PATH: ${.CURDIR}/posix1e +.PATH: ${LIBCSRC}/posix1e SRCS+= acl_calc_mask.c \ acl_copy.c \ ==== //depot/projects/hammer/lib/libc/quad/Makefile.inc#3 (text+ko) ==== @@ -2,9 +2,9 @@ # $FreeBSD: src/lib/libc/quad/Makefile.inc,v 1.9 2002/11/18 09:50:56 ru Exp $ # Quad support, if needed -.PATH: ${.CURDIR}/${MACHINE_ARCH}/quad ${.CURDIR}/quad +.PATH: ${LIBCSRC}/${TARGET}/quad ${LIBCSRC}/quad -.if ${MACHINE_ARCH} == "i386" +.if ${TARGET} == "i386" SRCS+= cmpdi2.c divdi3.c moddi3.c qdivrem.c ucmpdi2.c udivdi3.c umoddi3.c ==== //depot/projects/hammer/lib/libc/regex/Makefile.inc#3 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/regex/Makefile.inc,v 1.7 2002/11/18 09:50:56 ru Exp $ # regex sources -.PATH: ${.CURDIR}/regex +.PATH: ${LIBCSRC}/regex CFLAGS+=-DPOSIX_MISTAKE ==== //depot/projects/hammer/lib/libc/regex/grot/Makefile#2 (text+ko) ==== @@ -5,7 +5,7 @@ # Do not take -DPOSIX_MISTAKE out. REGCFLAGS isn't important to you (it's # for my use in some special contexts). -PATHS= ${.CURDIR}/.. ${.CURDIR}/../../locale ${.CURDIR}/../../../../include +PATHS= ${LIBCSRC}/.. ${LIBCSRC}/../../locale ${LIBCSRC}/../../../../include .PATH: ${PATHS} CFLAGS+= -DPOSIX_MISTAKE -DREDEBUG $(REGCFLAGS) ==== //depot/projects/hammer/lib/libc/rpc/Makefile.inc#6 (text+ko) ==== @@ -1,7 +1,7 @@ # @(#)Makefile 5.11 (Berkeley) 9/6/90 # $FreeBSD: src/lib/libc/rpc/Makefile.inc,v 1.26 2004/01/11 17:14:54 ru Exp $ -.PATH: ${.CURDIR}/rpc ${.CURDIR}/. +.PATH: ${LIBCSRC}/rpc ${LIBCSRC}/. SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ clnt_vc.c rpc_dtablesize.c getnetconfig.c getnetpath.c getrpcent.c \ @@ -26,7 +26,7 @@ SRCS+= crypt_clnt.c crypt_xdr.c crypt.h CFLAGS+= -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -CFLAGS+= -I${.CURDIR}/rpc +CFLAGS+= -I${LIBCSRC}/rpc CLEANFILES+= crypt_clnt.c crypt_xdr.c crypt.h ==== //depot/projects/hammer/lib/libc/sparc64/fpu/Makefile.inc#3 (text+ko) ==== @@ -1,8 +1,8 @@ # $FreeBSD: src/lib/libc/sparc64/fpu/Makefile.inc,v 1.5 2002/11/18 09:50:56 ru Exp $ -.PATH: ${.CURDIR}/sparc64/fpu +.PATH: ${LIBCSRC}/sparc64/fpu -CFLAGS+= -I${.CURDIR}/sparc64/sys +CFLAGS+= -I${LIBCSRC}/sparc64/sys SRCS+= fpu.c fpu_add.c fpu_compare.c fpu_div.c fpu_explode.c fpu_implode.c \ fpu_mul.c fpu_qp.c fpu_reg.S fpu_sqrt.c fpu_subr.c ==== //depot/projects/hammer/lib/libc/sparc64/sys/Makefile.inc#4 (text+ko) ==== @@ -10,7 +10,7 @@ __sparc_utrap_setup.c \ sigcode.S -CFLAGS+= -I${.CURDIR}/sparc64/fpu +CFLAGS+= -I${LIBCSRC}/sparc64/fpu MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S sigaction.S ==== //depot/projects/hammer/lib/libc/stdio/Makefile.inc#10 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.32 2003/01/10 06:22:28 tjr Exp $ # stdio sources -.PATH: ${.CURDIR}/stdio +.PATH: ${LIBCSRC}/stdio SRCS+= _flock_stub.c asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c \ fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetws.c \ ==== //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#10 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.47 2004/02/24 08:07:26 ache Exp $ # machine-independent stdlib sources -.PATH: ${.CURDIR}/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib +.PATH: ${LIBCSRC}/${TARGET}/stdlib ${LIBCSRC}/stdlib MISRCS+=_Exit.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ bsearch.c calloc.c div.c exit.c getenv.c getopt.c getopt_long.c \ @@ -14,8 +14,8 @@ system.c tdelete.c tfind.c tsearch.c twalk.c # machine-dependent stdlib sources -.if exists(${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc) -.include "${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc" +.if exists(${LIBCSRC}/${TARGET}/stdlib/Makefile.inc) +.include "${LIBCSRC}/${TARGET}/stdlib/Makefile.inc" .endif MAN+= abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \ ==== //depot/projects/hammer/lib/libc/stdtime/Makefile.inc#3 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp # $FreeBSD: src/lib/libc/stdtime/Makefile.inc,v 1.14 2002/11/18 09:50:56 ru Exp $ -.PATH: ${.CURDIR}/stdtime ${.CURDIR}/../locale +.PATH: ${LIBCSRC}/stdtime ${LIBCSRC}/../locale SRCS+= asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c \ time32.c ==== //depot/projects/hammer/lib/libc/string/Makefile.inc#7 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.34 2004/01/13 16:05:47 des Exp $ -.PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string +.PATH: ${LIBCSRC}/${TARGET}/string ${LIBCSRC}/string -CFLAGS+= -I${.CURDIR}/locale +CFLAGS+= -I${LIBCSRC}/locale # machine-independent string sources MISRCS+=bcmp.c bcopy.c bzero.c ffs.c ffsl.c fls.c flsl.c index.c memccpy.c \ @@ -22,8 +22,8 @@ # machine-dependent string sources -.if exists(${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc) -.include "${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc" +.if exists(${LIBCSRC}/${TARGET}/string/Makefile.inc) +.include "${LIBCSRC}/${TARGET}/string/Makefile.inc" .endif MAN+= bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \ ==== //depot/projects/hammer/lib/libc/sys/Makefile.inc#12 (text+ko) ==== @@ -2,19 +2,19 @@ # $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.109 2004/01/14 21:22:10 ru Exp $ # sys sources -.PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys +.PATH: ${LIBCSRC}/${TARGET}/sys ${LIBCSRC}/sys # Include the generated makefile containing the *complete* list # of syscall names in MIASM. -.include "${.CURDIR}/../../sys/sys/syscall.mk" +.include "${LIBCSRC}/../../sys/sys/syscall.mk" # Include machine dependent definitions. # # MDASM names override the default syscall names in MIASM. # NOASM will prevent the default syscall code from being generated. # -.if exists(${.CURDIR}/${MACHINE_ARCH}/sys/Makefile.inc) -.include "${.CURDIR}/${MACHINE_ARCH}/sys/Makefile.inc" +.if exists(${LIBCSRC}/${TARGET}/sys/Makefile.inc) +.include "${LIBCSRC}/${TARGET}/sys/Makefile.inc" .endif # Sources common to both syscall interfaces: ==== //depot/projects/hammer/lib/libc/uuid/Makefile.inc#3 (text+ko) ==== @@ -2,7 +2,7 @@ # DCE 1.1 UUID implementation sources -.PATH: ${.CURDIR}/uuid +.PATH: ${LIBCSRC}/uuid SRCS+= uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \ uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_to_string.c ==== //depot/projects/hammer/lib/libc/xdr/Makefile.inc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # @(#)Makefile 5.11 (Berkeley) 9/6/90 # $FreeBSD: src/lib/libc/xdr/Makefile.inc,v 1.14 2002/11/18 09:50:57 ru Exp $ -.PATH: ${.CURDIR}/xdr ${.CURDIR}/. +.PATH: ${LIBCSRC}/xdr ${LIBCSRC}/. SRCS+= xdr.c xdr_array.c xdr_float.c xdr_mem.c \ xdr_rec.c xdr_reference.c xdr_stdio.c ==== //depot/projects/hammer/lib/libc/yp/Makefile.inc#3 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/yp/Makefile.inc,v 1.9 2002/11/18 09:50:57 ru Exp $ # yp sources -.PATH: ${.CURDIR}/yp +.PATH: ${LIBCSRC}/yp SRCS+= xdryp.c yp.h yp_xdr.c yplib.c CLEANFILES+= yp.h yp_xdr.c ==== //depot/projects/hammer/libexec/Makefile#20 (text+ko) ==== @@ -26,6 +26,7 @@ rpc.sprayd \ rshd \ ${_rtld-elf} \ + ${_rtld-elf32} \ save-entropy \ ${_smrsh} \ talkd \ @@ -40,6 +41,9 @@ .if !defined(NOPIC) _rtld-elf= rtld-elf +.if ${MACHINE_ARCH} == "amd64" +_rtld-elf32= rtld-elf32 +.endif .endif .if !defined(NO_SENDMAIL) ==== //depot/projects/hammer/libexec/rtld-elf/Makefile#8 (text+ko) ==== @@ -1,12 +1,14 @@ # $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.25 2003/09/13 21:50:35 mdodd Exp $ -PROG= ld-elf.so.1 +PROG?= ld-elf.so.1 SRCS= rtld_start.S rtld.c rtld_lock.c map_object.c malloc.c \ xmalloc.c debug.c reloc.c libmap.c MAN= rtld.1 CSTD?= gnu99 +TARGET?= ${MACHINE_ARCH} +RTLDSRC?= ${.CURDIR} CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -CFLAGS+= -I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR} +CFLAGS+= -I${RTLDSRC}/${TARGET} -I${RTLDSRC} LDFLAGS+= -nostdlib -e .rtld_start INSTALLFLAGS= -fschg -C -b BINDIR= /libexec @@ -14,8 +16,8 @@ MLINKS= rtld.1 ld-elf.so.1.1 \ rtld.1 ld.so.1 -.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc) -.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc" +.if exists(${RTLDSRC}/${TARGET}/Makefile.inc) +.include "${RTLDSRC}/${TARGET}/Makefile.inc" .endif # If LDSCRIPT is defined, we build the dynamic linker as an @@ -48,6 +50,6 @@ beforeinstall: -chflags noschg ${DESTDIR}/usr/libexec/${PROG} -.PATH: ${.CURDIR}/${MACHINE_ARCH} +.PATH: ${RTLDSRC} ${RTLDSRC}/${TARGET} .include ==== //depot/projects/hammer/libexec/rtld-elf/debug.h#2 (text+ko) ==== @@ -50,10 +50,17 @@ #define dbg(format, args...) ((void) 0) #endif +#ifndef COMPAT_32BIT +#define _MYNAME "ld-elf.so.1" +#else +#define _MYNAME "ld-elf32.so.1" +#endif + #define assert(cond) ((cond) ? (void) 0 : \ - (msg("ld-elf.so.1: assert failed: " __FILE__ ":" \ + (msg(_MYNAME ": assert failed: " __FILE__ ":" \ __XSTRING(__LINE__) "\n"), abort())) #define msg(s) write(STDOUT_FILENO, s, strlen(s)) -#define trace() msg("ld-elf.so.1: " __XSTRING(__LINE__) "\n") +#define trace() msg(_MYNAME ": " __XSTRING(__LINE__) "\n") + #endif /* DEBUG_H */ ==== //depot/projects/hammer/libexec/rtld-elf/libmap.c#11 (text+ko) ==== @@ -17,6 +17,11 @@ #define _PATH_LIBMAP_CONF "/etc/libmap.conf" #endif +#ifdef COMPAT_32BIT +#undef _PATH_LIBMAP_CONF +#define _PATH_LIBMAP_CONF "/etc/libmap32.conf" +#endif + TAILQ_HEAD(lm_list, lm); struct lm { char *f; @@ -211,6 +216,27 @@ return (NULL); } +#ifdef COMPAT_32BIT +char * +lm_findn (const char *p, const char *f, const int n) +{ + char pathbuf[64], *s, *t; + + if (n < sizeof(pathbuf) - 1) { + memcpy(pathbuf, f, n); + pathbuf[n] = '\0'; + s = pathbuf; + } else { + s = xmalloc(n + 1); + strcpy(s, f); + } + t = lm_find(p, s); + if (s != pathbuf) + free(s); + return (t); +} +#endif + static char * lml_find (struct lm_list *lmh, const char *f) { @@ -219,8 +245,7 @@ dbg("%s(%p, \"%s\")", __func__, lmh, f); TAILQ_FOREACH(lm, lmh, lm_link) - if ((strncmp(f, lm->f, strlen(lm->f)) == 0) && - (strlen(f) == strlen(lm->f))) + if (strcmp(f, lm->f) == 0) return (lm->t); return NULL; } @@ -233,8 +258,7 @@ dbg("%s(\"%s\")", __func__, n); TAILQ_FOREACH(lmp, &lmp_head, lmp_link) - if ((strncmp(n, lmp->p, strlen(lmp->p)) == 0) && - (strlen(n) == strlen(lmp->p))) + if (strcmp(n, lmp->p) == 0) return (&lmp->lml); return (NULL); } ==== //depot/projects/hammer/libexec/rtld-elf/libmap.h#3 (text+ko) ==== @@ -5,3 +5,6 @@ int lm_init (void); void lm_fini (void); char * lm_find (const char *, const char *); +#ifdef COMPAT_32BIT +char * lm_findn (const char *, const char *, const int); +#endif ==== //depot/projects/hammer/libexec/rtld-elf/rtld.c#17 (text+ko) ==== @@ -54,7 +54,11 @@ #include "rtld.h" #include "libmap.h" +#ifndef COMPAT_32BIT #define PATH_RTLD "/libexec/ld-elf.so.1" +#else +#define PATH_RTLD "/libexec/ld-elf32.so.1" +#endif /* Types. */ typedef void (*func_ptr_type)(); @@ -261,14 +265,14 @@ trust = !issetugid(); - ld_bind_now = getenv("LD_BIND_NOW"); + ld_bind_now = getenv(LD_ "BIND_NOW"); if (trust) { - ld_debug = getenv("LD_DEBUG"); - libmap_disable = getenv("LD_LIBMAP_DISABLE") != NULL; - ld_library_path = getenv("LD_LIBRARY_PATH"); - ld_preload = getenv("LD_PRELOAD"); + ld_debug = getenv(LD_ "DEBUG"); + libmap_disable = getenv(LD_ "LIBMAP_DISABLE") != NULL; + ld_library_path = getenv(LD_ "LIBRARY_PATH"); + ld_preload = getenv(LD_ "PRELOAD"); } - ld_tracing = getenv("LD_TRACE_LOADED_OBJECTS"); + ld_tracing = getenv(LD_ "TRACE_LOADED_OBJECTS"); if (ld_debug != NULL && *ld_debug != '\0') debug = 1; @@ -360,7 +364,7 @@ exit(0); } - if (getenv("LD_DUMP_REL_PRE") != NULL) { + if (getenv(LD_ "DUMP_REL_PRE") != NULL) { dump_relocations(obj_main); exit (0); } @@ -373,7 +377,7 @@ if (do_copy_relocations(obj_main) == -1) die(); - if (getenv("LD_DUMP_REL_POST") != NULL) { + if (getenv(LD_ "DUMP_REL_POST") != NULL) { dump_relocations(obj_main); exit (0); } @@ -1460,6 +1464,9 @@ static void * path_enumerate(const char *path, path_enum_proc callback, void *arg) { +#ifdef COMPAT_32BIT + const char *trans; +#endif if (path == NULL) return (NULL); @@ -1469,6 +1476,12 @@ char *res; len = strcspn(path, ":;"); +#ifdef COMPAT_32BIT + trans = lm_findn(NULL, path, len); + if (trans) + res = callback(trans, strlen(trans), arg); + else +#endif res = callback(path, len, arg); if (res != NULL) @@ -2259,16 +2272,16 @@ char *fmt1, *fmt2, *fmt, *main_local, *list_containers; int c; - if ((main_local = getenv("LD_TRACE_LOADED_OBJECTS_PROGNAME")) == NULL) + if ((main_local = getenv(LD_ "TRACE_LOADED_OBJECTS_PROGNAME")) == NULL) main_local = ""; - if ((fmt1 = getenv("LD_TRACE_LOADED_OBJECTS_FMT1")) == NULL) + if ((fmt1 = getenv(LD_ "TRACE_LOADED_OBJECTS_FMT1")) == NULL) fmt1 = "\t%o => %p (%x)\n"; - if ((fmt2 = getenv("LD_TRACE_LOADED_OBJECTS_FMT2")) == NULL) + if ((fmt2 = getenv(LD_ "TRACE_LOADED_OBJECTS_FMT2")) == NULL) fmt2 = "\t%o (%x)\n"; - list_containers = getenv("LD_TRACE_LOADED_OBJECTS_ALL"); + list_containers = getenv(LD_ "TRACE_LOADED_OBJECTS_ALL"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 7 11:47:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBAAF16A4D0; Sun, 7 Mar 2004 11:47: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 7D6F416A4CE for ; Sun, 7 Mar 2004 11:47:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6AD9743D1D for ; Sun, 7 Mar 2004 11:47:54 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i27JlsGe072534 for ; Sun, 7 Mar 2004 11:47:54 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i27Jlrfi072531 for perforce@freebsd.org; Sun, 7 Mar 2004 11:47:53 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 7 Mar 2004 11:47:53 -0800 (PST) Message-Id: <200403071947.i27Jlrfi072531@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 48363 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 Mar 2004 19:47:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=48363 Change 48363 by peter@peter_daintree on 2004/03/07 11:47:51 IFC @48354 Affected files ... .. //depot/projects/hammer/lib/libgeom/Makefile#6 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.3#3 integrate .. //depot/projects/hammer/share/man/man9/Makefile#29 integrate .. //depot/projects/hammer/share/man/man9/securelevel_gt.9#1 branch .. //depot/projects/hammer/share/misc/bsd-family-tree#14 integrate .. //depot/projects/hammer/sys/alpha/include/pmap.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#25 integrate .. //depot/projects/hammer/sys/conf/files.pc98#23 integrate .. //depot/projects/hammer/sys/dev/trm/trm.c#12 integrate .. //depot/projects/hammer/sys/dev/trm/trm.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#29 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#28 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#28 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#24 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#10 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#21 integrate .. //depot/projects/hammer/sys/ia64/include/pmap.h#8 integrate .. //depot/projects/hammer/sys/net/if_stf.c#10 integrate .. //depot/projects/hammer/sys/nfsserver/nfs.h#3 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#9 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#15 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#19 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio_cbus.c#4 integrate .. //depot/projects/hammer/sys/pc98/pc98/wd_cd.h#3 integrate .. //depot/projects/hammer/sys/rpc/rpcclnt.c#5 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#22 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#9 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/inf.c#5 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/ndiscvt.c#3 integrate Differences ... ==== //depot/projects/hammer/lib/libgeom/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libgeom/Makefile,v 1.9 2003/08/18 15:25:38 obrien Exp $ +# $FreeBSD: src/lib/libgeom/Makefile,v 1.10 2004/03/07 16:07:57 phk Exp $ LIB= geom SHLIBDIR?= /lib @@ -25,6 +25,12 @@ libgeom.3 geom_stats_snapshot_free.3 \ libgeom.3 geom_stats_snapshot_timestamp.3 \ libgeom.3 geom_stats_snapshot_reset.3 \ - libgeom.3 geom_stats_snapshot_next.3 + libgeom.3 geom_stats_snapshot_next.3 \ + libgeom.3 gctl_get_handle.3 \ + libgeom.3 gctl_ro_param.3 \ + libgeom.3 gctl_rw_param.3 \ + libgeom.3 gctl_issue.3 \ + libgeom.3 gctl_free.3 \ + libgeom.3 gctl_dump.3 .include ==== //depot/projects/hammer/lib/libgeom/libgeom.3#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.4 2003/06/18 19:43:17 charnier Exp $ +.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.5 2004/03/07 16:07:57 phk Exp $ .\" .Dd February 8, 2003 .Dt LIBGEOM 3 @@ -38,7 +38,13 @@ .Nm geom_stats_snapshot_free , .Nm geom_stats_snapshot_timestamp , .Nm geom_stats_snapshot_reset , -.Nm geom_stats_snapshot_next +.Nm geom_stats_snapshot_next , +.Nm gctl_get_handle , +.Nm gctl_ro_param , +.Nm gctl_rw_param , +.Nm gctl_issue , +.Nm gctl_free , +.Nm gctl_dump .Nd userland API library for kernel GEOM subsystem .Sh LIBRARY .Lb libgeom @@ -61,6 +67,19 @@ .Fn geom_stats_snapshot_reset "void *arg" .Ft "struct g_stat *" .Fn geom_stats_snapshot_next "void *arg" +.Ss "Control Functions" +.Ft "struct gctl_req *" +.Fn gctl_get_handle "void" +.Ft void +.Fn gctl_ro_param "struct gctl_req *req" "const char *name" "int len" "const void *value" +.Ft void +.Fn gctl_rw_param "struct gctl_req *req" "const char *name" "int len" "void *value" +.Ft "const char *" +.Fn gctl_issue "struct gctl_req *req" +.Ft void +.Fn gctl_free "struct gctl_req *req" +.Ft void +.Fn gctl_dump "struct gctl_req *req" "FILE *f" .Sh DESCRIPTION The .Nm geom @@ -129,10 +148,99 @@ returns the next item, and .Dv NULL if there are no more items in the snapshot. -.Sh AUTHORS -.An Poul-Henning Kamp Aq phk@FreeBSD.org +.Ss "Control Functions" +The +.Fn gctl_* +functions are used to send requests to GEOM classes. In order for a GEOM +class to actually be able to receive these requests, it must have defined a +"ctlreq" method. +.Pp +A +.Ar struct gctl_req * , +obtained with +.Fn gctl_get_handle , +can hold any number of parameters, which must be added to it with +.Fn gctl_ro_param +(for read-only parameters) or +.Fn gctl_rw_param +(for read/write parameters). +.Pp +Both +.Fn gctl_ro_param +and +.Fn gctl_rw_param +take a string +.Ar name , +which is used to identify the parameter, and a +.Ar value , +which contains - in the read-only case - the data to be passed to the +GEOM class, or - in the read/write case - a pointer to preallocated memory +that the GEOM class should fill with the desired data. If +.Ar len +is negative, it is assumed that +.Ar value +is an ASCII string and the actual length is taken from the string length of +.Ar value ; +otherwise it must hold the size of +.Ar value . +.Pp +A parameter with a +.Ar name +containing the string "class" is mandatory for each request, and the +corresponding +.Ar value +must hold the name of the GEOM class where the request should be sent to. +.Pp +Also mandatory for each request is a parameter with a +.Ar name +called "verb", and the corresponding +.Ar value +needs to hold the command string that the GEOM class should react upon. +.Pp +Once all desired parameters are filled in, the request must be sent to +the GEOM subsystem with +.Fn gctl_issue , +which returns NULL on success, or a string containing the error message +on failure. +.Pp +After the request is finished, the allocated memory should be released with +.Fn gctl_free . +.Pp +.Fn gctl_dump +can be used to format the contents of +.Ar req +to the open file handle pointed to by +.Ar f +for debugging purposes. +.Pp +Error handling for the control functions is postponed until the call +to +.Fn gctl_issue +which returns NULL on success or an error message corresponding to the +first error which happened. +.Sh EXAMPLES +Create a request that is to be sent to the CCD class and tell +it to destroy a specific geom: +.Bd -literal -offset indent +H = gctl_get_handle(); +gctl_ro_param(H, "verb", -1, "destroy geom"); +gctl_ro_param(H, "class", -1, "CCD"); +sprintf(buf, "ccd%d", ccd); +gctl_ro_param(H, "geom", -1, buf); +errstr = gctl_issue(H); +if (errstr != NULL) + err(1, "Could not destroy ccd: %s", errstr); +gctl_free(H); +.Ed +.Sh SEE ALSO +.Rs +http://ezine.daemonnews.org/200308/blueprints.html +.Re .Sh HISTORY The .Nm geom library appeared in .Fx 5.1 . +.Sh AUTHORS +.An Poul-Henning Kamp Aq phk@FreeBSD.org +.An Lukas Ertl Aq le@FreeBSD.org ==== //depot/projects/hammer/share/man/man9/Makefile#29 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.225 2004/03/06 08:01:16 jkoshy Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.226 2004/03/07 15:22:08 josef Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -186,6 +186,7 @@ runqueue.9 \ sbuf.9 \ scheduler.9 \ + securelevel_gt.9 \ selrecord.9 \ sema.9 \ signal.9 \ @@ -732,6 +733,7 @@ scheduler.9 sched_setup.9 \ scheduler.9 setrunnable.9 \ scheduler.9 updatepri.9 +MLINKS+=securelevel_gt.9 securelevel_ge.9 MLINKS+=selrecord.9 selwakeup.9 MLINKS+=sema.9 sema_destroy.9 \ sema.9 sema_init.9 \ ==== //depot/projects/hammer/share/misc/bsd-family-tree#14 (text+ko) ==== @@ -158,17 +158,17 @@ | | | NetBSD 1.6 OpenBSD 3.2 | | FreeBSD 4.8 | | | | | | | | | NetBSD 1.6.1 | | - | | | | | OpenBSD 3.3 | + | | | | | OpenBSD 3.3 BSD/OS 5.0 | | | | | | | - | FreeBSD 4.9 | | | OpenBSD 3.4 | - | | | | | | | - | v | | NetBSD 1.6.2 | | - | | | | | | - | | | v | | -FreeBSD 5.0 | | | | - | | | | BSD/OS 5.0 -FreeBSD 5.1 | NetBSD -current OpenBSD -current | - | \ | | | v + | FreeBSD 4.9 | | | OpenBSD 3.4 BSD/OS 5.1 ISE + | | | | | | + | v | | NetBSD 1.6.2 | + | | | | | + | | | v | +FreeBSD 5.0 | | | + | | | | +FreeBSD 5.1 | NetBSD -current OpenBSD -current + | \ | | | | ----- Mac OS X | | | 10.3 | | FreeBSD 5.2 | | | @@ -391,6 +391,7 @@ FreeBSD 5.1 2003-06-09 [FBD] Mac OS X 10.3 2003-10-24 [APL] FreeBSD 4.9 2003-10-28 [FBD] +BSD/OS 5.1 ISE 2003-10-?? [WRS] (final version) OpenBSD 3.4 2003-11-01 [OBD] FreeBSD 5.2 2004-01-12 [FBD] FreeBSD 5.2.1 2004-02-22 [FBD] (patch release) @@ -451,4 +452,4 @@ Copyright (c) 1997-2004 Wolfram Schneider URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.78 2004/03/04 05:34:29 maxim Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.79 2004/03/07 16:44:10 wosch Exp $ ==== //depot/projects/hammer/sys/alpha/include/pmap.h#6 (text+ko) ==== @@ -43,7 +43,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.24 2003/10/06 01:47:11 bms Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.25 2004/03/07 07:13:15 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -212,8 +212,6 @@ extern pt_entry_t *CMAP1; extern vm_offset_t avail_end; extern vm_offset_t avail_start; -extern vm_offset_t clean_eva; -extern vm_offset_t clean_sva; extern vm_offset_t phys_avail[]; extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; ==== //depot/projects/hammer/sys/amd64/include/pmap.h#25 (text+ko) ==== @@ -43,7 +43,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.109 2003/11/17 08:58:14 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.110 2004/03/07 07:13:15 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -262,8 +262,6 @@ extern pt_entry_t *CMAP1; extern vm_paddr_t avail_end; extern vm_paddr_t avail_start; -extern vm_offset_t clean_eva; -extern vm_offset_t clean_sva; extern vm_paddr_t phys_avail[]; extern char *ptvmmap; /* poor name! */ extern vm_offset_t virtual_avail; ==== //depot/projects/hammer/sys/conf/files.pc98#23 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.286 2004/02/19 13:10:39 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.287 2004/03/07 05:38:20 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -43,12 +43,6 @@ compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ no-implicit-rule # -hal.o optional ath_hal \ - dependency "$S/contrib/dev/ath/freebsd/i386-elf.hal.o.uu" \ - compile-with "uudecode < $S/contrib/dev/ath/freebsd/i386-elf.hal.o.uu" \ - no-implicit-rule -# -# compat/linux/linux_file.c optional compat_linux compat/linux/linux_getcwd.c optional compat_linux compat/linux/linux_ioctl.c optional compat_linux @@ -205,14 +199,9 @@ i386/isa/bs/bsfunc.c optional bs i386/isa/bs/bshw.c optional bs i386/isa/bs/bsif.c count bs -i386/isa/ctx.c optional ctx i386/isa/cy.c count cy i386/isa/elink.c optional ep i386/isa/elink.c optional ie -i386/isa/gpib.c optional gp -i386/isa/if_el.c count el -i386/isa/if_le.c count le -i386/isa/if_rdp.c count rdp i386/isa/isa.c optional isa i386/isa/isa_compat.c optional isa compat_oldisa \ warning "Old ISA driver compatibility shims present." @@ -221,9 +210,7 @@ i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine i386/isa/spkr.c optional speaker -i386/isa/spigot.c count spigot i386/isa/stallion.c optional stl nowerror -i386/isa/wt.c count wt i386/linux/imgact_linux.c optional compat_linux i386/linux/linux_dummy.c optional compat_linux i386/linux/linux_locore.s optional compat_linux \ ==== //depot/projects/hammer/sys/dev/trm/trm.c#12 (text+ko) ==== @@ -12,7 +12,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/trm/trm.c,v 1.19 2004/02/20 20:36:55 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/trm/trm.c,v 1.20 2004/03/07 17:23:39 cognet Exp $"); /* * HISTORY: @@ -2992,6 +2992,25 @@ return; } +static void +trm_destroySRB(PACB pACB) +{ + PSRB pSRB; + + pSRB = pACB->pFreeSRB; + while (pSRB) { + if (pSRB->sg_dmamap) { + bus_dmamap_unload(pACB->sg_dmat, pSRB->sg_dmamap); + bus_dmamem_free(pACB->sg_dmat, pSRB->pSRBSGL, + pSRB->sg_dmamap); + bus_dmamap_destroy(pACB->sg_dmat, pSRB->sg_dmamap); + } + if (pSRB->dmamap) + bus_dmamap_destroy(pACB->buffer_dmat, pSRB->dmamap); + pSRB = pSRB->pNextSRB; + } +} + static int trm_initSRB(PACB pACB) { @@ -3002,29 +3021,11 @@ for (i = 0; i < TRM_MAX_SRB_CNT; i++) { pSRB = (PSRB)&pACB->pFreeSRB[i]; - /* DMA tag for our S/G structures */ - if (bus_dma_tag_create( - /*parent_dmat*/pSRB->parent_dmat, - /*alignment*/ 1, - /*boundary*/ 0, - /*lowaddr*/ BUS_SPACE_MAXADDR, - /*highaddr*/ BUS_SPACE_MAXADDR, - /*filter*/ NULL, - /*filterarg*/ NULL, - /*maxsize*/ TRM_MAX_SG_LISTENTRY * sizeof(SGentry), - /*nsegments*/ 1, - /*maxsegsz*/ TRM_MAXTRANSFER_SIZE, - /*flags*/ 0, - /*lockfunc*/ busdma_lock_mutex, - /*lockarg*/ &Giant, - /*dmat*/ &pSRB->sg_dmat) != 0) { - return ENXIO; - } - if (bus_dmamem_alloc(pSRB->sg_dmat, (void **)&pSRB->pSRBSGL, + if (bus_dmamem_alloc(pACB->sg_dmat, (void **)&pSRB->pSRBSGL, BUS_DMA_NOWAIT, &pSRB->sg_dmamap) !=0 ) { return ENXIO; } - bus_dmamap_load(pSRB->sg_dmat, pSRB->sg_dmamap, pSRB->pSRBSGL, + bus_dmamap_load(pACB->sg_dmat, pSRB->sg_dmamap, pSRB->pSRBSGL, TRM_MAX_SG_LISTENTRY * sizeof(SGentry), trm_srbmapSG, pSRB, /*flags*/0); if (i != TRM_MAX_SRB_CNT - 1) { @@ -3042,9 +3043,6 @@ /* * Create the dmamap. This is no longer optional! - * - * XXX This is not freed on unload! None of the other - * allocations in this function are either! */ if ((error = bus_dmamap_create(pACB->buffer_dmat, 0, &pSRB->dmamap)) != 0) @@ -3499,6 +3497,23 @@ } } bzero(pACB->pFreeSRB, TRM_MAX_SRB_CNT * sizeof(TRM_SRB)); + if (bus_dma_tag_create( + /*parent_dmat*/NULL, + /*alignment*/ 1, + /*boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR, + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ TRM_MAX_SG_LISTENTRY * sizeof(SGentry), + /*nsegments*/ 1, + /*maxsegsz*/ TRM_MAXTRANSFER_SIZE, + /*flags*/ 0, + /*lockfunc*/ busdma_lock_mutex, + /*lockarg*/ &Giant, + /*dmat*/ &pACB->sg_dmat) != 0) + goto bad; + if (trm_initSRB(pACB)) { printf("trm_initSRB: error\n"); goto bad; @@ -3520,6 +3535,10 @@ } if (pACB->sense_dmat) bus_dma_tag_destroy(pACB->sense_dmat); + if (pACB->sg_dmat) { + trm_destroySRB(pACB); + bus_dma_tag_destroy(pACB->sg_dmat); + } if (pACB->srb_dmamap) { bus_dmamap_unload(pACB->srb_dmat, pACB->srb_dmamap); bus_dmamem_free(pACB->srb_dmat, pACB->pFreeSRB, @@ -3628,6 +3647,11 @@ if (pACB->iores) bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(0), pACB->iores); + if (pACB->sg_dmat) { + trm_destroySRB(pACB); + bus_dma_tag_destroy(pACB->sg_dmat); + } + if (pACB->srb_dmamap) { bus_dmamap_unload(pACB->srb_dmat, pACB->srb_dmamap); bus_dmamem_free(pACB->srb_dmat, pACB->pFreeSRB, @@ -3685,6 +3709,8 @@ PACB pACB = device_get_softc(dev); bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(0), pACB->iores); + trm_destroySRB(pACB); + bus_dma_tag_destroy(pACB->sg_dmat); bus_dmamap_unload(pACB->srb_dmat, pACB->srb_dmamap); bus_dmamem_free(pACB->srb_dmat, pACB->pFreeSRB, pACB->srb_dmamap); ==== //depot/projects/hammer/sys/dev/trm/trm.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/trm/trm.h,v 1.3 2003/02/20 03:21:34 cognet Exp $ + * $FreeBSD: src/sys/dev/trm/trm.h,v 1.4 2004/03/07 17:23:39 cognet Exp $ */ #ifndef trm_H @@ -155,8 +155,6 @@ * CAM ccb */ union ccb *pccb; - bus_dma_tag_t parent_dmat; - bus_dma_tag_t sg_dmat; bus_dmamap_t sg_dmamap; bus_dmamap_t dmamap; u_int16_t SRBState; @@ -235,6 +233,7 @@ bus_dma_tag_t buffer_dmat; /* dmat for buffer I/O */ bus_dma_tag_t srb_dmat; bus_dma_tag_t sense_dmat; /* dmat for sense buffer */ + bus_dma_tag_t sg_dmat; bus_dmamap_t sense_dmamap; bus_dmamap_t srb_dmamap; bus_addr_t sense_busaddr; ==== //depot/projects/hammer/sys/dev/usb/umass.c#19 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.104 2004/03/04 07:20:48 sanpei Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.105 2004/03/07 05:33:09 sanpei Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -351,12 +351,20 @@ UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_QUIRKS }, + { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_DVR_UEH8, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + NO_QUIRKS + }, { USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100, RID_WILDCARD, /* XXX This is not correct as there are Zip drives that use ATAPI. */ UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_TEST_UNIT_READY }, + { USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443SU2, RID_WILDCARD, + UMASS_PROTO_SCSI, + NO_QUIRKS + }, { USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443U2, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_QUIRKS ==== //depot/projects/hammer/sys/dev/usb/usbdevs#29 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.165 2004/03/04 07:20:48 sanpei Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.166 2004/03/07 05:33:09 sanpei Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -787,6 +787,7 @@ product IODATA USBETTXS 0x0913 USB ETTX product IODATA USBRSAQ 0x0a03 USB serial adapter USB-RSAQ1 product IODATA IU_CD2 0x0204 DVD Multi-plus unit iU-CD2 +product IODATA DVR_UEH8 0x0206 DVD Multi-plus unit DVR-UEH8 /* Iomega products */ product IOMEGA ZIP100 0x0001 Zip 100 @@ -888,6 +889,7 @@ product LOGITECH QUICKCAMPRO2 0xd001 QuickCam Pro /* Logitec Corp. products */ +product LOGITEC LDR_H443SU2 0x0033 DVD Multi-plus unit LDR-H443SU2 product LOGITEC LDR_H443U2 0x00b3 DVD Multi-plus unit LDR-H443U2 /* Lucent products */ ==== //depot/projects/hammer/sys/dev/usb/usbdevs.h#28 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.172 2004/03/04 07:22:30 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.173 2004/03/07 05:34:36 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.165 2004/03/04 07:20:48 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.166 2004/03/07 05:33:09 sanpei Exp */ /* @@ -794,6 +794,7 @@ #define USB_PRODUCT_IODATA_USBETTXS 0x0913 /* USB ETTX */ #define USB_PRODUCT_IODATA_USBRSAQ 0x0a03 /* USB serial adapter USB-RSAQ1 */ #define USB_PRODUCT_IODATA_IU_CD2 0x0204 /* DVD Multi-plus unit iU-CD2 */ +#define USB_PRODUCT_IODATA_DVR_UEH8 0x0206 /* DVD Multi-plus unit DVR-UEH8 */ /* Iomega products */ #define USB_PRODUCT_IOMEGA_ZIP100 0x0001 /* Zip 100 */ @@ -895,6 +896,7 @@ #define USB_PRODUCT_LOGITECH_QUICKCAMPRO2 0xd001 /* QuickCam Pro */ /* Logitec Corp. products */ +#define USB_PRODUCT_LOGITEC_LDR_H443SU2 0x0033 /* DVD Multi-plus unit LDR-H443SU2 */ #define USB_PRODUCT_LOGITEC_LDR_H443U2 0x00b3 /* DVD Multi-plus unit LDR-H443U2 */ /* Lucent products */ ==== //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#28 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.172 2004/03/04 07:22:30 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.173 2004/03/07 05:34:36 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.165 2004/03/04 07:20:48 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.166 2004/03/07 05:33:09 sanpei Exp */ /* @@ -1504,6 +1504,12 @@ "DVD Multi-plus unit iU-CD2", }, { + USB_VENDOR_IODATA, USB_PRODUCT_IODATA_DVR_UEH8, + 0, + "I/O Data", + "DVD Multi-plus unit DVR-UEH8", + }, + { USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100, 0, "Iomega", @@ -1882,6 +1888,12 @@ "QuickCam Pro", }, { + USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443SU2, + 0, + "Logitec Corp", + "DVD Multi-plus unit LDR-H443SU2", + }, + { USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443U2, 0, "Logitec Corp", ==== //depot/projects/hammer/sys/geom/geom_subr.c#24 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.71 2004/02/14 17:58:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.72 2004/03/07 17:33:15 phk Exp $"); #include #include @@ -272,7 +272,8 @@ if (!(gp->flags & G_GEOM_WITHER)) { gp->flags |= G_GEOM_WITHER; LIST_FOREACH(pp, &gp->provider, provider) - g_orphan_provider(pp, error); + if (!(pp->flags & G_PF_ORPHAN)) + g_orphan_provider(pp, error); } for (pp = LIST_FIRST(&gp->provider); pp != NULL; pp = pp2) { pp2 = LIST_NEXT(pp, provider); ==== //depot/projects/hammer/sys/i386/include/pmap.h#10 (text+ko) ==== @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pmap.h,v 1.103 2003/11/08 03:01:26 alc Exp $ + * $FreeBSD: src/sys/i386/include/pmap.h,v 1.104 2004/03/07 07:13:15 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -326,8 +326,6 @@ extern pt_entry_t *CMAP1; extern vm_paddr_t avail_end; extern vm_paddr_t avail_start; -extern vm_offset_t clean_eva; -extern vm_offset_t clean_sva; extern vm_paddr_t phys_avail[]; extern int pseflag; extern int pgeflag; ==== //depot/projects/hammer/sys/ia64/ia64/pmap.c#21 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.125 2003/10/08 19:55:45 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.126 2004/03/07 07:43:13 alc Exp $"); #include #include @@ -728,7 +728,7 @@ pmap->pm_flags = 0; for (i = 0; i < 5; i++) - pmap->pm_rid[i] = 0; + pmap->pm_rid[i] = pmap_allocate_rid(); pmap->pm_ptphint = NULL; pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvlist); @@ -744,10 +744,6 @@ void pmap_pinit2(struct pmap *pmap) { - int i; - - for (i = 0; i < 5; i++) - pmap->pm_rid[i] = pmap_allocate_rid(); } /*************************************************** ==== //depot/projects/hammer/sys/ia64/include/pmap.h#8 (text+ko) ==== @@ -43,7 +43,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/ia64/include/pmap.h,v 1.15 2003/10/06 01:47:11 bms Exp $ + * $FreeBSD: src/sys/ia64/include/pmap.h,v 1.16 2004/03/07 07:13:15 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -109,8 +109,6 @@ extern vm_offset_t avail_end; extern vm_offset_t avail_start; -extern vm_offset_t clean_eva; -extern vm_offset_t clean_sva; extern vm_offset_t phys_avail[]; extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; ==== //depot/projects/hammer/sys/net/if_stf.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/if_stf.c,v 1.35 2003/12/28 03:55:59 sam Exp $ */ +/* $FreeBSD: src/sys/net/if_stf.c,v 1.36 2004/03/07 05:15:42 rwatson Exp $ */ /* $KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $ */ /* @@ -141,7 +141,7 @@ static LIST_HEAD(, stf_softc) stf_softc_list; static MALLOC_DEFINE(M_STF, STFNAME, "6to4 Tunnel Interface"); -static int ip_stf_ttl = 40; +static const int ip_stf_ttl = 40; extern struct domain inetdomain; struct protosw in_stf_protosw = ==== //depot/projects/hammer/sys/nfsserver/nfs.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.4 (Berkeley) 5/1/95 - * $FreeBSD: src/sys/nfsserver/nfs.h,v 1.69 2003/05/25 06:17:33 truckman Exp $ + * $FreeBSD: src/sys/nfsserver/nfs.h,v 1.70 2004/03/07 16:28:31 kan Exp $ */ #ifndef _NFSSERVER_NFS_H_ @@ -132,7 +132,7 @@ struct vattr; struct nameidata; -extern struct callout_handle nfsrv_timer_handle; +extern struct callout nfsrv_callout; extern struct nfsrvstats nfsrvstats; extern int nfsrv_ticks; ==== //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsock.c,v 1.86 2003/11/17 00:56:53 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsock.c,v 1.87 2004/03/07 16:28:31 kan Exp $"); /* * Socket operations for use by nfs @@ -96,7 +96,7 @@ */ #define NFS_CWNDSCALE 256 #define NFS_MAXCWND (NFS_CWNDSCALE * 32) -struct callout_handle nfsrv_timer_handle; +struct callout nfsrv_callout; static void nfs_realign(struct mbuf **pm, int hsiz); /* XXX SHARED */ static int nfsrv_getstream(struct nfssvc_sock *, int); @@ -779,5 +779,5 @@ nfsrv_wakenfsd(slp); } splx(s); - nfsrv_timer_handle = timeout(nfsrv_timer, NULL, nfsrv_ticks); + callout_reset(&nfsrv_callout, nfsrv_ticks, nfsrv_timer, NULL); } ==== //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.123 2003/12/17 16:12:01 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.124 2004/03/07 16:28:31 kan Exp $"); /* * These functions support the macros and help fiddle mbuf chains for @@ -545,6 +545,7 @@ nfsrv_init(0); /* Init server data structures */ nfsrv_initcache(); /* Init the server request cache */ + callout_init(&nfsrv_callout, 0); nfsrv_timer(0); nfs_prev_nfssvc_sy_narg = sysent[SYS_nfssvc].sy_narg; @@ -555,7 +556,7 @@ case MOD_UNLOAD: - untimeout(nfsrv_timer, (void *)NULL, nfsrv_timer_handle); + callout_stop(&nfsrv_callout); sysent[SYS_nfssvc].sy_narg = nfs_prev_nfssvc_sy_narg; sysent[SYS_nfssvc].sy_call = nfs_prev_nfssvc_sy_call; break; ==== //depot/projects/hammer/sys/pc98/conf/GENERIC#15 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.242 2004/01/30 13:15:42 nyan Exp $ +# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.243 2004/03/07 04:07:57 nyan Exp $ machine pc98 #cpu I386_CPU # Do not enable with other cpu types @@ -128,6 +128,8 @@ # syscons is the default console driver, resembling an SCO console device sc +#device agp # support several AGP chipsets + # Floating point support - do not disable. device npx @@ -175,15 +177,18 @@ # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support +device bfe # Broadcom BCM440x 10/100 ethernet device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device pcn # AMD Am79C97x PCI 10/100 NICs +device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 +device sk # SysKonnect SK-984x and SK-982x gigabit ethernet device ste # Sundance ST201 (D-Link DFE-550TX) +device ti # Alteon Networks Tigon I/II gigabit ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vr # VIA Rhine, Rhine II @@ -223,8 +228,6 @@ # Be aware of the administrative consequences of enabling this! device bpf # Berkeley packet filter -#device compat_atdisk # IBM-PC HDD support - # USB support #device uhci # UHCI PCI->USB interface #device ohci # OHCI PCI->USB interface ==== //depot/projects/hammer/sys/pc98/conf/NOTES#19 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.25 2004/01/30 13:06:57 nyan Exp $ +# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.27 2004/03/07 05:38:20 nyan Exp $ # # @@ -341,7 +341,7 @@ # config as well, or you will not have the dependencies. The other option # is to load both as modules. -device tdfx # Enable 3Dfx Voodoo support +device tdfx # Enable 3Dfx Voodoo support options TDFX_LINUX # Enable Linuxulator support # DRM options: @@ -380,59 +380,36 @@ # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) # (requires miibus) -# el: 3Com 3C501 (slow!) # ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; # Intel EtherExpress -# le: Digital Equipment EtherWorks 2 and EtherWorks 3 (DEPCA, DE100, -# DE101, DE200, DE201, DE202, DE203, DE204, DE205, DE422) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) -# oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133 -# (no hints needed). +# oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133. # Olicom PCI token-ring adapters OC-3136, OC-3137, OC-3139, OC-3140, -# OC-3141, OC-3540, OC-3250 -# rdp: RealTek RTL 8002-based pocket ethernet adapters -# sbni: Granch SBNI12-xx ISA and PCI adapters +# OC-3141, OC-3540 and OC-3250. +# sbni: Granch SBNI12-xx ISA and PCI adapters # sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) -# wl: Lucent Wavelan (ISA card only). +# wl: Lucent Wavelan (ISA card only). # Order for ISA/EISA devices is important here device ar -hint.ar.0.at="isa" -hint.ar.0.port="0x300" -hint.ar.0.irq="10" -hint.ar.0.maddr="0xd0000" device ed #options ED_NO_MIIBUS # Disable ed miibus support hint.ed.0.at="isa" hint.ed.0.port="0x280" hint.ed.0.irq="5" hint.ed.0.maddr="0xd8000" -device el 1 -hint.el.0.at="isa" -hint.el.0.port="0x300" -hint.el.0.irq="9" device ie # Hints only required for Starlan hint.ie.2.at="isa" hint.ie.2.port="0x300" hint.ie.2.irq="5" hint.ie.2.maddr="0xd0000" -device le 1 -hint.le.0.at="isa" -hint.le.0.port="0x300" -hint.le.0.irq="5" -hint.le.0.maddr="0xd0000" device lnc hint.lnc.0.at="isa" hint.lnc.0.port="0x280" hint.lnc.0.irq="10" hint.lnc.0.drq="0" -device rdp 1 -hint.rdp.0.at="isa" -hint.rdp.0.port="0x378" -hint.rdp.0.irq="7" -hint.rdp.0.flags="2" device sbni hint.sbni.0.at="isa" hint.sbni.0.port="0x210" @@ -444,12 +421,7 @@ hint.snc.0.irq="6" hint.snc.0.maddr="0xc0000" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 7 11:52:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65C4316A4D0; Sun, 7 Mar 2004 11:52: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 4019916A4CE for ; Sun, 7 Mar 2004 11:52:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2145943D1F for ; Sun, 7 Mar 2004 11:52:00 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i27JpxGe074026 for ; Sun, 7 Mar 2004 11:51:59 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i27JpxGc074020 for perforce@freebsd.org; Sun, 7 Mar 2004 11:51:59 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 7 Mar 2004 11:51:59 -0800 (PST) Message-Id: <200403071951.i27JpxGc074020@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 48364 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 Mar 2004 19:52:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=48364 Change 48364 by peter@peter_daintree on 2004/03/07 11:50:58 NOP - integ -I -b i386_hammer (updates base branchpoint) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#28 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#26 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#28 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pmap.h#26 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Mar 7 13:35:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E34DD16A4D0; Sun, 7 Mar 2004 13:35:19 -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 B942B16A4CE for ; Sun, 7 Mar 2004 13:35:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A7E6243D1F for ; Sun, 7 Mar 2004 13:35:19 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i27LZJGe003158 for ; Sun, 7 Mar 2004 13:35:19 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i27LZ5gU003128 for perforce@freebsd.org; Sun, 7 Mar 2004 13:35:05 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 7 Mar 2004 13:35:05 -0800 (PST) Message-Id: <200403072135.i27LZ5gU003128@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 48369 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 Mar 2004 21:35:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=48369 Change 48369 by marcel@marcel_nfs on 2004/03/07 13:34:47 IFC @48354 Affected files ... .. //depot/projects/gdb/MAINTAINERS#3 integrate .. //depot/projects/gdb/Makefile#3 integrate .. //depot/projects/gdb/Makefile.inc1#3 integrate .. //depot/projects/gdb/UPDATING#3 integrate .. //depot/projects/gdb/UPDATING.64BTT#1 branch .. //depot/projects/gdb/bin/csh/Makefile#2 integrate .. //depot/projects/gdb/bin/date/date.c#2 integrate .. //depot/projects/gdb/bin/dd/Makefile#2 integrate .. //depot/projects/gdb/bin/dd/args.c#2 integrate .. //depot/projects/gdb/bin/dd/dd.1#2 integrate .. //depot/projects/gdb/bin/dd/dd.c#2 integrate .. //depot/projects/gdb/bin/dd/dd.h#2 integrate .. //depot/projects/gdb/bin/dd/gen.c#1 branch .. //depot/projects/gdb/bin/dd/ref.ascii#1 branch .. //depot/projects/gdb/bin/dd/ref.ebcdic#1 branch .. //depot/projects/gdb/bin/dd/ref.ibm#1 branch .. //depot/projects/gdb/bin/dd/ref.lcase#1 branch .. //depot/projects/gdb/bin/dd/ref.oldascii#1 branch .. //depot/projects/gdb/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/gdb/bin/dd/ref.oldibm#1 branch .. //depot/projects/gdb/bin/dd/ref.pareven#1 branch .. //depot/projects/gdb/bin/dd/ref.parnone#1 branch .. //depot/projects/gdb/bin/dd/ref.parodd#1 branch .. //depot/projects/gdb/bin/dd/ref.parset#1 branch .. //depot/projects/gdb/bin/dd/ref.swab#1 branch .. //depot/projects/gdb/bin/dd/ref.ucase#1 branch .. //depot/projects/gdb/bin/df/df.c#3 integrate .. //depot/projects/gdb/bin/ls/print.c#3 integrate .. //depot/projects/gdb/bin/pax/options.c#2 integrate .. //depot/projects/gdb/bin/ps/Makefile#2 integrate .. //depot/projects/gdb/bin/ps/ps.c#2 integrate .. //depot/projects/gdb/bin/rmail/Makefile#2 integrate .. //depot/projects/gdb/bin/sh/Makefile#3 integrate .. //depot/projects/gdb/contrib/binutils/bfd/aout-tic30.c#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/coff-mips.c#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/coff-tic30.c#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/coff-z8k.c#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/cpu-mips.c#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/cpu-tic30.c#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/cpu-v850.c#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/cpu-z8k.c#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/elf32-mips.c#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/elf32-v850.c#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/elf64-mips.c#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/mipsbsd.c#2 delete .. //depot/projects/gdb/contrib/binutils/bfd/pe-mips.c#2 delete .. //depot/projects/gdb/contrib/binutils/binutils/rcparse.c#2 delete .. //depot/projects/gdb/contrib/binutils/binutils/rcparse.h#2 delete .. //depot/projects/gdb/contrib/binutils/gas/config/tc-tic30.c#2 delete .. //depot/projects/gdb/contrib/binutils/gas/config/tc-tic30.h#2 delete .. //depot/projects/gdb/contrib/binutils/gas/config/tc-v850.c#2 delete .. //depot/projects/gdb/contrib/binutils/gas/config/tc-v850.h#2 delete .. //depot/projects/gdb/contrib/binutils/gas/config/tc-z8k.c#2 delete .. //depot/projects/gdb/contrib/binutils/gas/config/tc-z8k.h#2 delete .. //depot/projects/gdb/contrib/binutils/gas/doc/c-v850.texi#2 delete .. //depot/projects/gdb/contrib/binutils/gas/doc/c-z8k.texi#2 delete .. //depot/projects/gdb/contrib/binutils/include/opcode/arc.h#2 delete .. //depot/projects/gdb/contrib/binutils/include/opcode/convex.h#2 delete .. //depot/projects/gdb/contrib/binutils/include/opcode/mips.h#2 delete .. //depot/projects/gdb/contrib/binutils/include/opcode/np1.h#2 delete .. //depot/projects/gdb/contrib/binutils/include/opcode/pn.h#2 delete .. //depot/projects/gdb/contrib/binutils/include/opcode/tic30.h#2 delete .. //depot/projects/gdb/contrib/binutils/include/opcode/v850.h#2 delete .. //depot/projects/gdb/contrib/binutils/ld/configdoc.texi#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/arcelf.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/elf32b4300.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/elf32bmip.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/elf32bmipn32.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/elf32bsmip.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/elf32ebmip.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/elf32elmip.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/elf32l4300.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/elf32lmip.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/elf32lsmip.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/elf64bmip.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/sh.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/shelf.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/shelf_linux.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/shl.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/shlelf.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/tic30aout.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/tic30coff.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/v850.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/vsta.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/z8001.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/emulparams/z8002.sh#2 delete .. //depot/projects/gdb/contrib/binutils/ld/scripttempl/tic30aout.sc#2 delete .. //depot/projects/gdb/contrib/binutils/ld/scripttempl/tic30coff.sc#2 delete .. //depot/projects/gdb/contrib/binutils/ld/scripttempl/v850.sc#2 delete .. //depot/projects/gdb/contrib/binutils/ld/scripttempl/z8000.sc#2 delete .. //depot/projects/gdb/contrib/binutils/libiberty/acconfig.h#2 delete .. //depot/projects/gdb/contrib/binutils/opcodes/tic30-dis.c#2 delete .. //depot/projects/gdb/contrib/binutils/opcodes/v850-dis.c#2 delete .. //depot/projects/gdb/contrib/binutils/opcodes/v850-opc.c#2 delete .. //depot/projects/gdb/contrib/binutils/opcodes/z8k-dis.c#2 delete .. //depot/projects/gdb/contrib/binutils/opcodes/z8k-opc.h#2 delete .. //depot/projects/gdb/contrib/binutils/opcodes/z8kgen.c#2 delete .. //depot/projects/gdb/contrib/diff/diff.h#3 integrate .. //depot/projects/gdb/contrib/groff/FREEBSD-Xlist#3 integrate .. //depot/projects/gdb/contrib/pf/authpf/authpf.8#1 branch .. //depot/projects/gdb/contrib/pf/authpf/authpf.c#1 branch .. //depot/projects/gdb/contrib/pf/authpf/pathnames.h#1 branch .. //depot/projects/gdb/contrib/pf/ftp-proxy/ftp-proxy.8#1 branch .. //depot/projects/gdb/contrib/pf/ftp-proxy/ftp-proxy.c#1 branch .. //depot/projects/gdb/contrib/pf/ftp-proxy/getline.c#1 branch .. //depot/projects/gdb/contrib/pf/ftp-proxy/util.c#1 branch .. //depot/projects/gdb/contrib/pf/ftp-proxy/util.h#1 branch .. //depot/projects/gdb/contrib/pf/man/pf.4#1 branch .. //depot/projects/gdb/contrib/pf/man/pf.conf.5#1 branch .. //depot/projects/gdb/contrib/pf/man/pf.os.5#1 branch .. //depot/projects/gdb/contrib/pf/man/pflog.4#1 branch .. //depot/projects/gdb/contrib/pf/man/pfsync.4#1 branch .. //depot/projects/gdb/contrib/pf/pfctl/parse.y#1 branch .. //depot/projects/gdb/contrib/pf/pfctl/pf_print_state.c#1 branch .. //depot/projects/gdb/contrib/pf/pfctl/pfctl.8#1 branch .. //depot/projects/gdb/contrib/pf/pfctl/pfctl.c#1 branch .. //depot/projects/gdb/contrib/pf/pfctl/pfctl.h#1 branch .. //depot/projects/gdb/contrib/pf/pfctl/pfctl_altq.c#1 branch .. //depot/projects/gdb/contrib/pf/pfctl/pfctl_osfp.c#1 branch .. //depot/projects/gdb/contrib/pf/pfctl/pfctl_parser.c#1 branch .. //depot/projects/gdb/contrib/pf/pfctl/pfctl_parser.h#1 branch .. //depot/projects/gdb/contrib/pf/pfctl/pfctl_qstats.c#1 branch .. //depot/projects/gdb/contrib/pf/pfctl/pfctl_radix.c#1 branch .. //depot/projects/gdb/contrib/pf/pfctl/pfctl_table.c#1 branch .. //depot/projects/gdb/contrib/pf/pflogd/pflogd.8#1 branch .. //depot/projects/gdb/contrib/pf/pflogd/pflogd.c#1 branch .. //depot/projects/gdb/contrib/pf/pflogd/pidfile.c#1 branch .. //depot/projects/gdb/contrib/pf/pflogd/pidfile.h#1 branch .. //depot/projects/gdb/contrib/smbfs/lib/smb/nb_net.c#3 integrate .. //depot/projects/gdb/crypto/openssh/CREDITS#2 integrate .. //depot/projects/gdb/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/gdb/crypto/openssh/FREEBSD-Xlist#2 integrate .. //depot/projects/gdb/crypto/openssh/FREEBSD-upgrade#3 integrate .. //depot/projects/gdb/crypto/openssh/INSTALL#2 integrate .. //depot/projects/gdb/crypto/openssh/LICENCE#2 integrate .. //depot/projects/gdb/crypto/openssh/Makefile.in#2 integrate .. //depot/projects/gdb/crypto/openssh/OVERVIEW#2 integrate .. //depot/projects/gdb/crypto/openssh/README#2 integrate .. //depot/projects/gdb/crypto/openssh/README.dns#2 integrate .. //depot/projects/gdb/crypto/openssh/README.platform#1 branch .. //depot/projects/gdb/crypto/openssh/README.privsep#2 integrate .. //depot/projects/gdb/crypto/openssh/README.smartcard#2 integrate .. //depot/projects/gdb/crypto/openssh/RFC.nroff#2 integrate .. //depot/projects/gdb/crypto/openssh/TODO#2 integrate .. //depot/projects/gdb/crypto/openssh/WARNING.RNG#2 integrate .. //depot/projects/gdb/crypto/openssh/acconfig.h#2 integrate .. //depot/projects/gdb/crypto/openssh/acss.c#1 branch .. //depot/projects/gdb/crypto/openssh/acss.h#1 branch .. //depot/projects/gdb/crypto/openssh/auth-chall.c#2 integrate .. //depot/projects/gdb/crypto/openssh/auth-krb5.c#2 integrate .. //depot/projects/gdb/crypto/openssh/auth-pam.c#2 integrate .. //depot/projects/gdb/crypto/openssh/auth-pam.h#2 integrate .. //depot/projects/gdb/crypto/openssh/auth-passwd.c#2 integrate .. //depot/projects/gdb/crypto/openssh/auth-rh-rsa.c#2 integrate .. //depot/projects/gdb/crypto/openssh/auth-rhosts.c#2 integrate .. //depot/projects/gdb/crypto/openssh/auth-rsa.c#2 integrate .. //depot/projects/gdb/crypto/openssh/auth-shadow.c#1 branch .. //depot/projects/gdb/crypto/openssh/auth-sia.c#2 integrate .. //depot/projects/gdb/crypto/openssh/auth.c#2 integrate .. //depot/projects/gdb/crypto/openssh/auth.h#2 integrate .. //depot/projects/gdb/crypto/openssh/auth1.c#2 integrate .. //depot/projects/gdb/crypto/openssh/auth2-gss.c#2 integrate .. //depot/projects/gdb/crypto/openssh/auth2-hostbased.c#2 integrate .. //depot/projects/gdb/crypto/openssh/auth2-passwd.c#2 integrate .. //depot/projects/gdb/crypto/openssh/auth2-pubkey.c#2 integrate .. //depot/projects/gdb/crypto/openssh/auth2.c#2 integrate .. //depot/projects/gdb/crypto/openssh/authfd.c#2 integrate .. //depot/projects/gdb/crypto/openssh/authfd.h#2 integrate .. //depot/projects/gdb/crypto/openssh/authfile.c#2 integrate .. //depot/projects/gdb/crypto/openssh/bufaux.c#2 integrate .. //depot/projects/gdb/crypto/openssh/bufaux.h#2 integrate .. //depot/projects/gdb/crypto/openssh/buffer.c#2 integrate .. //depot/projects/gdb/crypto/openssh/canohost.c#2 integrate .. //depot/projects/gdb/crypto/openssh/channels.c#2 integrate .. //depot/projects/gdb/crypto/openssh/channels.h#2 integrate .. //depot/projects/gdb/crypto/openssh/cipher-3des1.c#2 integrate .. //depot/projects/gdb/crypto/openssh/cipher-acss.c#1 branch .. //depot/projects/gdb/crypto/openssh/cipher-aes.c#2 integrate .. //depot/projects/gdb/crypto/openssh/cipher-ctr.c#2 integrate .. //depot/projects/gdb/crypto/openssh/cipher.c#2 integrate .. //depot/projects/gdb/crypto/openssh/cipher.h#2 integrate .. //depot/projects/gdb/crypto/openssh/cleanup.c#1 branch .. //depot/projects/gdb/crypto/openssh/clientloop.c#2 integrate .. //depot/projects/gdb/crypto/openssh/clientloop.h#2 integrate .. //depot/projects/gdb/crypto/openssh/compat.c#2 integrate .. //depot/projects/gdb/crypto/openssh/compat.h#2 integrate .. //depot/projects/gdb/crypto/openssh/compress.c#2 integrate .. //depot/projects/gdb/crypto/openssh/config.guess#2 integrate .. //depot/projects/gdb/crypto/openssh/config.h#2 integrate .. //depot/projects/gdb/crypto/openssh/config.sub#2 integrate .. //depot/projects/gdb/crypto/openssh/configure.ac#2 integrate .. //depot/projects/gdb/crypto/openssh/defines.h#2 integrate .. //depot/projects/gdb/crypto/openssh/dh.c#2 integrate .. //depot/projects/gdb/crypto/openssh/dns.c#2 integrate .. //depot/projects/gdb/crypto/openssh/dns.h#2 integrate .. //depot/projects/gdb/crypto/openssh/entropy.c#2 integrate .. //depot/projects/gdb/crypto/openssh/fatal.c#2 integrate .. //depot/projects/gdb/crypto/openssh/fixprogs#2 integrate .. //depot/projects/gdb/crypto/openssh/groupaccess.c#2 integrate .. //depot/projects/gdb/crypto/openssh/gss-genr.c#2 integrate .. //depot/projects/gdb/crypto/openssh/gss-serv-krb5.c#2 integrate .. //depot/projects/gdb/crypto/openssh/gss-serv.c#2 integrate .. //depot/projects/gdb/crypto/openssh/hostfile.c#2 integrate .. //depot/projects/gdb/crypto/openssh/hostfile.h#2 integrate .. //depot/projects/gdb/crypto/openssh/includes.h#2 integrate .. //depot/projects/gdb/crypto/openssh/install-sh#2 integrate .. //depot/projects/gdb/crypto/openssh/kex.c#2 integrate .. //depot/projects/gdb/crypto/openssh/kexgexc.c#2 integrate .. //depot/projects/gdb/crypto/openssh/key.c#2 integrate .. //depot/projects/gdb/crypto/openssh/key.h#2 integrate .. //depot/projects/gdb/crypto/openssh/log.c#2 integrate .. //depot/projects/gdb/crypto/openssh/log.h#2 integrate .. //depot/projects/gdb/crypto/openssh/loginrec.c#2 integrate .. //depot/projects/gdb/crypto/openssh/mac.c#2 integrate .. //depot/projects/gdb/crypto/openssh/md5crypt.c#2 integrate .. //depot/projects/gdb/crypto/openssh/mdoc2man.awk#2 integrate .. //depot/projects/gdb/crypto/openssh/misc.c#2 integrate .. //depot/projects/gdb/crypto/openssh/mkinstalldirs#2 integrate .. //depot/projects/gdb/crypto/openssh/moduli#2 integrate .. //depot/projects/gdb/crypto/openssh/moduli.c#2 integrate .. //depot/projects/gdb/crypto/openssh/monitor.c#2 integrate .. //depot/projects/gdb/crypto/openssh/monitor.h#2 integrate .. //depot/projects/gdb/crypto/openssh/monitor_wrap.c#2 integrate .. //depot/projects/gdb/crypto/openssh/monitor_wrap.h#2 integrate .. //depot/projects/gdb/crypto/openssh/msg.c#2 integrate .. //depot/projects/gdb/crypto/openssh/msg.h#2 integrate .. //depot/projects/gdb/crypto/openssh/nchan.ms#2 integrate .. //depot/projects/gdb/crypto/openssh/nchan2.ms#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/Makefile.in#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/base64.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/basename.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-arc4random.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-cray.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-cray.h#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-getpeereid.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-misc.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-misc.h#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-openpty.c#1 branch .. //depot/projects/gdb/crypto/openssh/openbsd-compat/daemon.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/dirname.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/fake-rfc2553.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/fake-rfc2553.h#3 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/getcwd.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/getgrouplist.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/getopt.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/getrrsetbyname.h#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/glob.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/glob.h#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/inet_aton.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/inet_ntoa.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/inet_ntop.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/mktemp.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/openbsd-compat.h#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/port-aix.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/port-aix.h#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/readpassphrase.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/readpassphrase.h#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/realpath.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/rresvport.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/setenv.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/setproctitle.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/sigact.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/strlcat.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/strlcpy.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/strmode.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/strsep.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/strtoul.c#1 branch .. //depot/projects/gdb/crypto/openssh/openbsd-compat/sys-queue.h#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/sys-tree.h#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/vis.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/vis.h#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/xcrypt.c#2 integrate .. //depot/projects/gdb/crypto/openssh/packet.c#2 integrate .. //depot/projects/gdb/crypto/openssh/pathnames.h#2 integrate .. //depot/projects/gdb/crypto/openssh/progressmeter.c#2 integrate .. //depot/projects/gdb/crypto/openssh/readconf.c#2 integrate .. //depot/projects/gdb/crypto/openssh/readconf.h#2 integrate .. //depot/projects/gdb/crypto/openssh/regress/Makefile#2 integrate .. //depot/projects/gdb/crypto/openssh/regress/README.regress#2 integrate .. //depot/projects/gdb/crypto/openssh/regress/agent-ptrace.sh#2 integrate .. //depot/projects/gdb/crypto/openssh/regress/banner.sh#1 branch .. //depot/projects/gdb/crypto/openssh/regress/sftp-badcmds.sh#2 integrate .. //depot/projects/gdb/crypto/openssh/regress/sftp-batch.sh#2 integrate .. //depot/projects/gdb/crypto/openssh/regress/sftp-cmds.sh#2 integrate .. //depot/projects/gdb/crypto/openssh/regress/ssh-com.sh#2 integrate .. //depot/projects/gdb/crypto/openssh/regress/test-exec.sh#2 integrate .. //depot/projects/gdb/crypto/openssh/rijndael.c#2 integrate .. //depot/projects/gdb/crypto/openssh/scard-opensc.c#2 integrate .. //depot/projects/gdb/crypto/openssh/scp.1#2 integrate .. //depot/projects/gdb/crypto/openssh/scp.c#2 integrate .. //depot/projects/gdb/crypto/openssh/servconf.c#3 integrate .. //depot/projects/gdb/crypto/openssh/servconf.h#2 integrate .. //depot/projects/gdb/crypto/openssh/serverloop.c#2 integrate .. //depot/projects/gdb/crypto/openssh/session.c#2 integrate .. //depot/projects/gdb/crypto/openssh/session.h#2 integrate .. //depot/projects/gdb/crypto/openssh/sftp-client.c#2 integrate .. //depot/projects/gdb/crypto/openssh/sftp-client.h#2 integrate .. //depot/projects/gdb/crypto/openssh/sftp-common.c#2 integrate .. //depot/projects/gdb/crypto/openssh/sftp-common.h#2 integrate .. //depot/projects/gdb/crypto/openssh/sftp-glob.c#2 integrate .. //depot/projects/gdb/crypto/openssh/sftp-glob.h#2 delete .. //depot/projects/gdb/crypto/openssh/sftp-int.c#2 delete .. //depot/projects/gdb/crypto/openssh/sftp-int.h#2 delete .. //depot/projects/gdb/crypto/openssh/sftp-server.8#2 integrate .. //depot/projects/gdb/crypto/openssh/sftp-server.c#2 integrate .. //depot/projects/gdb/crypto/openssh/sftp.1#2 integrate .. //depot/projects/gdb/crypto/openssh/sftp.c#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh-add.1#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh-add.c#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh-agent.c#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh-dss.c#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh-gss.h#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh-keygen.1#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh-keygen.c#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh-keyscan.c#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh-keysign.c#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh-rand-helper.8#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh-rand-helper.c#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh-rsa.c#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh.1#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh.c#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh.h#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh_config#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh_prng_cmds.in#2 integrate .. //depot/projects/gdb/crypto/openssh/sshconnect.c#2 integrate .. //depot/projects/gdb/crypto/openssh/sshconnect2.c#2 integrate .. //depot/projects/gdb/crypto/openssh/sshd.8#2 integrate .. //depot/projects/gdb/crypto/openssh/sshd.c#2 integrate .. //depot/projects/gdb/crypto/openssh/sshd_config#3 integrate .. //depot/projects/gdb/crypto/openssh/sshd_config.5#3 integrate .. //depot/projects/gdb/crypto/openssh/sshpty.c#2 integrate .. //depot/projects/gdb/crypto/openssh/sshtty.c#2 integrate .. //depot/projects/gdb/crypto/openssh/sshtty.h#2 integrate .. //depot/projects/gdb/crypto/openssh/uidswap.c#2 integrate .. //depot/projects/gdb/crypto/openssh/uuencode.c#2 integrate .. //depot/projects/gdb/crypto/openssh/uuencode.h#2 integrate .. //depot/projects/gdb/crypto/openssh/version.h#2 integrate .. //depot/projects/gdb/etc/defaults/rc.conf#3 integrate .. //depot/projects/gdb/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/gdb/etc/pccard_ether#3 integrate .. //depot/projects/gdb/etc/periodic/daily/110.clean-tmps#2 integrate .. //depot/projects/gdb/etc/rc#2 integrate .. //depot/projects/gdb/etc/rc.d/Makefile#3 integrate .. //depot/projects/gdb/etc/rc.d/NETWORKING#3 integrate .. //depot/projects/gdb/etc/rc.d/accounting#3 integrate .. //depot/projects/gdb/etc/rc.d/amd#3 integrate .. //depot/projects/gdb/etc/rc.d/cleartmp#3 integrate .. //depot/projects/gdb/etc/rc.d/dhclient#3 integrate .. //depot/projects/gdb/etc/rc.d/hostname#2 integrate .. //depot/projects/gdb/etc/rc.d/ipfilter#3 integrate .. //depot/projects/gdb/etc/rc.d/ipsec#3 integrate .. //depot/projects/gdb/etc/rc.d/ldconfig#3 integrate .. //depot/projects/gdb/etc/rc.d/mountd#3 integrate .. //depot/projects/gdb/etc/rc.d/netif#2 integrate .. //depot/projects/gdb/etc/rc.d/nfslocking#3 integrate .. //depot/projects/gdb/etc/rc.d/routed#3 integrate .. //depot/projects/gdb/etc/rc.d/rpcbind#3 integrate .. //depot/projects/gdb/etc/rc.d/syslogd#3 integrate .. //depot/projects/gdb/etc/rc.d/virecover#3 integrate .. //depot/projects/gdb/etc/rc.subr#3 integrate .. //depot/projects/gdb/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/gdb/gnu/lib/libdialog/menubox.c#2 integrate .. //depot/projects/gdb/gnu/lib/libregex/AUTHORS#2 delete .. //depot/projects/gdb/gnu/lib/libregex/COPYING#2 delete .. //depot/projects/gdb/gnu/lib/libregex/ChangeLog#2 delete .. //depot/projects/gdb/gnu/lib/libregex/FREEBSD-upgrade#1 branch .. //depot/projects/gdb/gnu/lib/libregex/INSTALL#2 delete .. //depot/projects/gdb/gnu/lib/libregex/Makefile#3 integrate .. //depot/projects/gdb/gnu/lib/libregex/Makefile.gnu#2 delete .. //depot/projects/gdb/gnu/lib/libregex/Makefile.in#2 delete .. //depot/projects/gdb/gnu/lib/libregex/NEWS#2 delete .. //depot/projects/gdb/gnu/lib/libregex/README#2 delete .. //depot/projects/gdb/gnu/lib/libregex/VERSION#2 delete .. //depot/projects/gdb/gnu/lib/libregex/config.status#2 delete .. //depot/projects/gdb/gnu/lib/libregex/configure#2 delete .. //depot/projects/gdb/gnu/lib/libregex/configure.in#2 delete .. //depot/projects/gdb/gnu/lib/libregex/gnuregex.h#2 integrate .. //depot/projects/gdb/gnu/lib/libregex/posix/regex.h#1 branch .. //depot/projects/gdb/gnu/lib/libregex/regex.c#2 integrate .. //depot/projects/gdb/gnu/lib/libregex/regex.h#2 integrate .. //depot/projects/gdb/gnu/lib/libregex/test/ChangeLog#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/Makefile#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/Makefile.in#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/alloca.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/bsd-interf.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/debugmalloc.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/emacsmalloc.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/fileregex.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/g++malloc.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/getpagesize.h#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/iregex.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/main.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/malloc-test.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/other.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/printchar.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/psx-basic.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/psx-extend.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/psx-generic.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/psx-group.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/psx-interf.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/psx-interv.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/regexcpp.sed#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/syntax.skel#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/test.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/test.h#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/tregress.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/upcase.c#2 delete .. //depot/projects/gdb/gnu/lib/libregex/test/xmalloc.c#2 delete .. //depot/projects/gdb/gnu/usr.bin/binutils/Makefile.inc#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/Makefile.inc0#3 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/addr2line/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/as/Makefile.inc#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/as/Makefile.inc0#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/as/ia64-freebsd/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/gasp/Makefile#3 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/Makefile#3 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/ld/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile#3 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/i386/config.h#2 delete .. //depot/projects/gdb/gnu/usr.bin/binutils/libbinutils/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libiberty/Makefile#3 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/nm/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/objcopy/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/objdump/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/readelf/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/size/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/strings/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/strip/Makefile#3 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc_tools/Makefile#3 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/f771/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#4 edit .. //depot/projects/gdb/gnu/usr.bin/grep/ChangeLog#2 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/Makefile#3 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/NEWS#2 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/THANKS#2 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/config.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/dfa.c#3 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/doc/grep.texi#2 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/doc/version.texi#2 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/getpagesize.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/grep.1#2 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/grep.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/grepmat.c#1 branch .. //depot/projects/gdb/gnu/usr.bin/grep/kwset.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/savedir.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/search.c#3 integrate .. //depot/projects/gdb/gnu/usr.bin/grep/system.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/tar/Makefile#3 integrate .. //depot/projects/gdb/include/Makefile#3 integrate .. //depot/projects/gdb/include/getopt.h#2 integrate .. //depot/projects/gdb/include/netdb.h#3 integrate .. //depot/projects/gdb/include/protocols/routed.h#2 integrate .. //depot/projects/gdb/include/resolv.h#2 integrate .. //depot/projects/gdb/include/stdlib.h#2 integrate .. //depot/projects/gdb/include/unistd.h#2 integrate .. //depot/projects/gdb/installworld_newk#1 branch .. //depot/projects/gdb/installworld_oldk#1 branch .. //depot/projects/gdb/lib/Makefile#3 integrate .. //depot/projects/gdb/lib/libarchive/archive.h#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_shar.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/gdb/lib/libatm/ioctl_subr.c#2 integrate .. //depot/projects/gdb/lib/libatm/ip_addr.c#2 integrate .. //depot/projects/gdb/lib/libbluetooth/bluetooth.c#2 integrate .. //depot/projects/gdb/lib/libbsnmp/Makefile.inc#3 integrate .. //depot/projects/gdb/lib/libc/amd64/SYS.h#2 integrate .. //depot/projects/gdb/lib/libc/amd64/sys/pipe.S#2 integrate .. //depot/projects/gdb/lib/libc/amd64/sys/reboot.S#2 integrate .. //depot/projects/gdb/lib/libc/amd64/sys/setlogin.S#2 integrate .. //depot/projects/gdb/lib/libc/gen/arc4random.c#3 integrate .. //depot/projects/gdb/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/gdb/lib/libc/gen/getpwent.c#2 integrate .. //depot/projects/gdb/lib/libc/gen/signal.3#2 integrate .. //depot/projects/gdb/lib/libc/include/reentrant.h#2 integrate .. //depot/projects/gdb/lib/libc/locale/wcstombs.3#2 integrate .. //depot/projects/gdb/lib/libc/net/getaddrinfo.3#2 integrate .. //depot/projects/gdb/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/gdb/lib/libc/net/gethostbydns.c#2 integrate .. //depot/projects/gdb/lib/libc/net/gethostbyname.3#2 integrate .. //depot/projects/gdb/lib/libc/net/gethostbynis.c#2 integrate .. //depot/projects/gdb/lib/libc/net/getipnodebyname.3#2 integrate .. //depot/projects/gdb/lib/libc/net/herror.c#2 integrate .. //depot/projects/gdb/lib/libc/net/name6.c#3 integrate .. //depot/projects/gdb/lib/libc/net/res_init.c#2 integrate .. //depot/projects/gdb/lib/libc/net/res_send.c#2 integrate .. //depot/projects/gdb/lib/libc/net/res_send_private.h#1 branch .. //depot/projects/gdb/lib/libc/net/resolver.3#2 integrate .. //depot/projects/gdb/lib/libc/powerpc/gen/Makefile.inc#3 integrate .. //depot/projects/gdb/lib/libc/powerpc/gen/_ctx_start.S#1 branch .. //depot/projects/gdb/lib/libc/powerpc/gen/makecontext.c#1 branch .. //depot/projects/gdb/lib/libc/rpc/getnetconfig.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/fvwrite.c#2 integrate .. //depot/projects/gdb/lib/libc/stdlib/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libc/stdlib/getopt.3#2 integrate .. //depot/projects/gdb/lib/libc/stdlib/getopt.c#2 integrate .. //depot/projects/gdb/lib/libc/stdlib/getopt_long.3#2 integrate .. //depot/projects/gdb/lib/libc/stdlib/getopt_long.c#3 integrate .. //depot/projects/gdb/lib/libc/stdlib/getsubopt.3#2 integrate .. //depot/projects/gdb/lib/libc/stdlib/getsubopt.c#2 integrate .. //depot/projects/gdb/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/gdb/lib/libc/sys/select.2#3 integrate .. //depot/projects/gdb/lib/libdisk/Makefile#2 integrate .. //depot/projects/gdb/lib/libgeom/Makefile#2 integrate .. //depot/projects/gdb/lib/libgeom/libgeom.3#2 integrate .. //depot/projects/gdb/lib/libkvm/kvm_getprocs.3#2 integrate .. //depot/projects/gdb/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/gdb/lib/libmd/Makefile#2 integrate .. //depot/projects/gdb/lib/libngatm/Makefile#2 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_login_access/login_access.c#2 integrate .. //depot/projects/gdb/lib/libsdp/search.c#3 integrate .. //depot/projects/gdb/lib/libstand/zalloc_defs.h#2 integrate .. //depot/projects/gdb/lib/libstand/zalloc_malloc.c#3 integrate .. //depot/projects/gdb/lib/libthr/arch/i386/i386/_setcurthread.c#3 integrate .. //depot/projects/gdb/lib/libthr/arch/powerpc/Makefile.inc#1 branch .. //depot/projects/gdb/lib/libthr/arch/powerpc/powerpc/_curthread.c#1 branch .. //depot/projects/gdb/lib/libugidfw/Makefile#2 integrate .. //depot/projects/gdb/lib/libugidfw/bsde_get_rule.3#2 integrate .. //depot/projects/gdb/lib/libugidfw/libugidfw.3#2 integrate .. //depot/projects/gdb/lib/libugidfw/ugidfw.c#2 integrate .. //depot/projects/gdb/lib/libugidfw/ugidfw.h#2 integrate .. //depot/projects/gdb/lib/libutil/Makefile#2 integrate .. //depot/projects/gdb/lib/libutil/libutil.h#2 integrate .. //depot/projects/gdb/libexec/ftp-proxy/Makefile#1 branch .. //depot/projects/gdb/libexec/rtld-elf/rtld.c#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/errata/article.sgml#3 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/gdb/release/doc/ja_JP.eucJP/errata/article.sgml#3 integrate .. //depot/projects/gdb/release/scripts/print-cdrom-packages.sh#2 integrate .. //depot/projects/gdb/sbin/Makefile#3 integrate .. //depot/projects/gdb/sbin/atm/atmconfig/Makefile#2 integrate .. //depot/projects/gdb/sbin/atm/atmconfig/diag.c#3 integrate .. //depot/projects/gdb/sbin/camcontrol/camcontrol.c#2 integrate .. //depot/projects/gdb/sbin/dhclient/Makefile.inc#2 integrate .. //depot/projects/gdb/sbin/dumpon/Makefile#2 integrate .. //depot/projects/gdb/sbin/fdisk/Makefile#2 integrate .. //depot/projects/gdb/sbin/fdisk_pc98/Makefile#2 integrate .. //depot/projects/gdb/sbin/fsck_ffs/Makefile#2 integrate .. //depot/projects/gdb/sbin/fsck_ffs/fsck.h#2 integrate .. //depot/projects/gdb/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/gdb/sbin/fsck_ffs/pass1.c#3 integrate .. //depot/projects/gdb/sbin/fsck_ffs/pass1b.c#2 integrate .. //depot/projects/gdb/sbin/fsck_ffs/pass2.c#2 integrate .. //depot/projects/gdb/sbin/fsck_ffs/pass3.c#2 integrate .. //depot/projects/gdb/sbin/fsck_ffs/pass4.c#2 integrate .. //depot/projects/gdb/sbin/fsck_ffs/pass5.c#2 integrate .. //depot/projects/gdb/sbin/fsck_ffs/utilities.c#2 integrate .. //depot/projects/gdb/sbin/fsck_msdosfs/Makefile#2 integrate .. //depot/projects/gdb/sbin/fsirand/Makefile#2 integrate .. //depot/projects/gdb/sbin/gconcat/Makefile#2 integrate .. //depot/projects/gdb/sbin/gconcat/gconcat.8#1 branch .. //depot/projects/gdb/sbin/gconcat/gconcat.c#2 integrate .. //depot/projects/gdb/sbin/gpt/Makefile#2 integrate .. //depot/projects/gdb/sbin/idmapd/Makefile#2 integrate .. //depot/projects/gdb/sbin/idmapd/idmapd.c#2 integrate .. //depot/projects/gdb/sbin/ifconfig/Makefile#2 integrate .. //depot/projects/gdb/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/gdb/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/gdb/sbin/init/Makefile#2 integrate .. //depot/projects/gdb/sbin/ip6fw/Makefile#2 integrate .. //depot/projects/gdb/sbin/ip6fw/ip6fw.c#3 integrate .. //depot/projects/gdb/sbin/ipf/Makefile#2 integrate .. //depot/projects/gdb/sbin/ipfs/Makefile#2 integrate .. //depot/projects/gdb/sbin/ipfstat/Makefile#2 integrate .. //depot/projects/gdb/sbin/ipmon/Makefile#2 integrate .. //depot/projects/gdb/sbin/ipnat/Makefile#2 integrate .. //depot/projects/gdb/sbin/kldconfig/kldconfig.c#2 integrate .. //depot/projects/gdb/sbin/ldconfig/Makefile#2 integrate .. //depot/projects/gdb/sbin/mca/Makefile#2 integrate .. //depot/projects/gdb/sbin/mdmfs/mdmfs.8#2 integrate .. //depot/projects/gdb/sbin/mdmfs/mdmfs.c#3 integrate .. //depot/projects/gdb/sbin/mknod/Makefile#2 integrate .. //depot/projects/gdb/sbin/mount/mount.8#3 integrate .. //depot/projects/gdb/sbin/mount_cd9660/Makefile#2 integrate .. //depot/projects/gdb/sbin/mount_hpfs/Makefile#2 integrate .. //depot/projects/gdb/sbin/mount_nfs/Makefile#2 integrate .. //depot/projects/gdb/sbin/mount_nfs4/Makefile#2 integrate .. //depot/projects/gdb/sbin/mount_ntfs/Makefile#2 integrate .. //depot/projects/gdb/sbin/mount_nullfs/Makefile#2 integrate .. //depot/projects/gdb/sbin/mount_std/Makefile#2 integrate .. //depot/projects/gdb/sbin/mount_udf/Makefile#2 integrate .. //depot/projects/gdb/sbin/mount_umapfs/Makefile#2 integrate .. //depot/projects/gdb/sbin/mount_unionfs/Makefile#2 integrate .. //depot/projects/gdb/sbin/natd/Makefile#2 integrate .. //depot/projects/gdb/sbin/newfs/mkfs.c#2 integrate .. //depot/projects/gdb/sbin/newfs/newfs.8#2 integrate .. //depot/projects/gdb/sbin/newfs/newfs.c#2 integrate .. //depot/projects/gdb/sbin/newfs/newfs.h#2 integrate .. //depot/projects/gdb/sbin/newfs_msdos/Makefile#2 integrate .. //depot/projects/gdb/sbin/nologin/Makefile#2 integrate .. //depot/projects/gdb/sbin/nologin/nologin.c#2 integrate .. //depot/projects/gdb/sbin/nos-tun/Makefile#2 integrate .. //depot/projects/gdb/sbin/pfctl/Makefile#1 branch .. //depot/projects/gdb/sbin/pfctl/missing/altq/altq.h#1 branch .. //depot/projects/gdb/sbin/pfctl/missing/altq/altq_cbq.h#1 branch .. //depot/projects/gdb/sbin/pfctl/missing/altq/altq_classq.h#1 branch .. //depot/projects/gdb/sbin/pfctl/missing/altq/altq_hfsc.h#1 branch .. //depot/projects/gdb/sbin/pfctl/missing/altq/altq_priq.h#1 branch .. //depot/projects/gdb/sbin/pfctl/missing/altq/altq_red.h#1 branch .. //depot/projects/gdb/sbin/pfctl/missing/altq/altq_rio.h#1 branch .. //depot/projects/gdb/sbin/pfctl/missing/altq/altq_rmclass.h#1 branch .. //depot/projects/gdb/sbin/pfctl/missing/altq/altq_rmclass_debug.h#1 branch .. //depot/projects/gdb/sbin/pfctl/missing/altq/altq_var.h#1 branch .. //depot/projects/gdb/sbin/pfctl/missing/altq/altq_wfq.h#1 branch .. //depot/projects/gdb/sbin/pflogd/Makefile#1 branch .. //depot/projects/gdb/sbin/ping/Makefile#2 integrate .. //depot/projects/gdb/sbin/ping6/Makefile#2 integrate .. //depot/projects/gdb/sbin/quotacheck/Makefile#2 integrate .. //depot/projects/gdb/sbin/raidctl/raidctl.c#2 integrate .. //depot/projects/gdb/sbin/raidctl/rf_configure.c#2 integrate .. //depot/projects/gdb/sbin/rcorder/Makefile#3 integrate .. //depot/projects/gdb/sbin/restore/Makefile#2 integrate .. //depot/projects/gdb/sbin/route/Makefile#2 integrate .. //depot/projects/gdb/sbin/routed/Makefile#3 integrate .. //depot/projects/gdb/sbin/routed/defs.h#2 integrate .. //depot/projects/gdb/sbin/routed/if.c#2 integrate .. //depot/projects/gdb/sbin/routed/input.c#2 integrate .. //depot/projects/gdb/sbin/routed/main.c#2 integrate .. //depot/projects/gdb/sbin/routed/output.c#2 integrate .. //depot/projects/gdb/sbin/routed/parms.c#2 integrate .. //depot/projects/gdb/sbin/routed/pathnames.h#2 integrate .. //depot/projects/gdb/sbin/routed/radix.c#2 integrate .. //depot/projects/gdb/sbin/routed/rdisc.c#2 integrate .. //depot/projects/gdb/sbin/routed/routed.8#2 integrate .. //depot/projects/gdb/sbin/routed/rtquery/Makefile#3 integrate .. //depot/projects/gdb/sbin/routed/rtquery/rtquery.8#2 integrate .. //depot/projects/gdb/sbin/routed/rtquery/rtquery.c#2 integrate .. //depot/projects/gdb/sbin/routed/table.c#2 integrate .. //depot/projects/gdb/sbin/routed/trace.c#2 integrate .. //depot/projects/gdb/sbin/rtsol/Makefile#2 integrate .. //depot/projects/gdb/sbin/savecore/Makefile#2 integrate .. //depot/projects/gdb/sbin/savecore/savecore.c#3 integrate .. //depot/projects/gdb/sbin/slattach/Makefile#2 integrate .. //depot/projects/gdb/sbin/startslip/Makefile#2 integrate .. //depot/projects/gdb/sbin/swapon/swapon.c#2 integrate .. //depot/projects/gdb/sbin/sysctl/Makefile#2 integrate .. //depot/projects/gdb/sbin/sysctl/sysctl.c#2 integrate .. //depot/projects/gdb/sbin/umount/Makefile#2 integrate .. //depot/projects/gdb/sbin/umount/umount.8#2 integrate .. //depot/projects/gdb/sbin/vinum/Makefile#2 integrate .. //depot/projects/gdb/secure/lib/libssh/Makefile#2 integrate .. //depot/projects/gdb/secure/usr.bin/bdes/Makefile#2 integrate .. //depot/projects/gdb/secure/usr.bin/sftp/Makefile#2 integrate .. //depot/projects/gdb/secure/usr.bin/ssh/Makefile#2 integrate .. //depot/projects/gdb/secure/usr.sbin/sshd/Makefile#3 integrate .. //depot/projects/gdb/share/doc/papers/timecounter/timecounter.ms#2 integrate .. //depot/projects/gdb/share/examples/cvsup/cvs-supfile#3 integrate .. //depot/projects/gdb/share/examples/cvsup/ports-supfile#3 integrate .. //depot/projects/gdb/share/man/man4/Makefile#3 integrate .. //depot/projects/gdb/share/man/man4/acpi.4#3 integrate .. //depot/projects/gdb/share/man/man4/acpi_video.4#1 branch .. //depot/projects/gdb/share/man/man4/ata.4#3 integrate .. //depot/projects/gdb/share/man/man4/bfe.4#2 integrate .. //depot/projects/gdb/share/man/man4/cue.4#2 integrate .. //depot/projects/gdb/share/man/man4/led.4#2 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/Makefile#3 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/ct.4#1 branch .. //depot/projects/gdb/share/man/man4/man4.i386/cx.4#2 integrate .. //depot/projects/gdb/share/man/man4/miibus.4#2 integrate .. //depot/projects/gdb/share/man/man4/ncv.4#2 integrate .. //depot/projects/gdb/share/man/man4/ng_vlan.4#1 branch .. //depot/projects/gdb/share/man/man4/polling.4#2 integrate .. //depot/projects/gdb/share/man/man4/re.4#2 integrate .. //depot/projects/gdb/share/man/man4/ste.4#2 integrate .. //depot/projects/gdb/share/man/man4/ubser.4#1 branch .. //depot/projects/gdb/share/man/man4/ubtbcmfw.4#2 integrate .. //depot/projects/gdb/share/man/man4/udav.4#1 branch .. //depot/projects/gdb/share/man/man4/umct.4#1 branch .. //depot/projects/gdb/share/man/man4/watchdog.4#2 integrate .. //depot/projects/gdb/share/man/man5/make.conf.5#3 integrate .. //depot/projects/gdb/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/gdb/share/man/man7/environ.7#3 integrate .. //depot/projects/gdb/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/gdb/share/man/man9/DEVICE_IDENTIFY.9#2 integrate .. //depot/projects/gdb/share/man/man9/Makefile#3 integrate .. //depot/projects/gdb/share/man/man9/bus_set_resource.9#3 integrate .. //depot/projects/gdb/share/man/man9/contigmalloc.9#1 branch .. //depot/projects/gdb/share/man/man9/ieee80211.9#1 branch .. //depot/projects/gdb/share/man/man9/ieee80211_crypto.9#1 branch .. //depot/projects/gdb/share/man/man9/ieee80211_input.9#1 branch .. //depot/projects/gdb/share/man/man9/ieee80211_ioctl.9#1 branch .. //depot/projects/gdb/share/man/man9/ieee80211_node.9#1 branch .. //depot/projects/gdb/share/man/man9/ieee80211_output.9#1 branch .. //depot/projects/gdb/share/man/man9/ieee80211_proto.9#1 branch .. //depot/projects/gdb/share/man/man9/ieee80211_radiotap.9#1 branch .. //depot/projects/gdb/share/man/man9/mac.9#3 integrate .. //depot/projects/gdb/share/man/man9/malloc.9#3 integrate .. //depot/projects/gdb/share/man/man9/mbuf.9#3 integrate .. //depot/projects/gdb/share/man/man9/pfil.9#2 integrate .. //depot/projects/gdb/share/man/man9/securelevel_gt.9#1 branch .. //depot/projects/gdb/share/man/man9/sx.9#3 integrate .. //depot/projects/gdb/share/man/man9/sysctl_add_oid.9#2 integrate .. //depot/projects/gdb/share/man/man9/watchdog.9#1 branch .. //depot/projects/gdb/share/misc/bsd-family-tree#2 integrate .. //depot/projects/gdb/share/mk/bsd.cpu.mk#3 integrate .. //depot/projects/gdb/share/syscons/scrnmaps/Makefile#3 integrate .. //depot/projects/gdb/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/gdb/sys/alpha/alpha/mem.c#2 integrate .. //depot/projects/gdb/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/gdb/sys/alpha/include/critical.h#2 integrate .. //depot/projects/gdb/sys/alpha/include/pmap.h#2 integrate .. //depot/projects/gdb/sys/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/critical.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/mpboot.S#2 integrate .. //depot/projects/gdb/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/gdb/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/gdb/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/gdb/sys/amd64/include/critical.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/dvcfg.h#1 branch .. //depot/projects/gdb/sys/amd64/include/physio_proc.h#1 branch .. //depot/projects/gdb/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/gdb/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/gdb/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/gdb/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/gdb/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/gdb/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/gdb/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/gdb/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/gdb/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/gdb/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/gdb/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/gdb/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/gdb/sys/coda/coda_venus.c#2 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/gdb/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/gdb/sys/compat/ia32/ia32_genassym.c#2 integrate .. //depot/projects/gdb/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/gdb/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/gdb/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/gdb/sys/conf/NOTES#3 integrate .. //depot/projects/gdb/sys/conf/files#3 integrate .. //depot/projects/gdb/sys/conf/files.amd64#3 integrate .. //depot/projects/gdb/sys/conf/files.i386#3 integrate .. //depot/projects/gdb/sys/conf/files.pc98#3 integrate .. //depot/projects/gdb/sys/conf/kern.mk#3 integrate .. //depot/projects/gdb/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/gdb/sys/conf/kmod.mk#3 integrate .. //depot/projects/gdb/sys/conf/majors#3 integrate .. //depot/projects/gdb/sys/conf/options#3 integrate .. //depot/projects/gdb/sys/conf/options.amd64#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/tbconvrt.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/tbget.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_fil.c#2 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/gdb/sys/contrib/pf/net/if_pflog.c#1 branch .. //depot/projects/gdb/sys/contrib/pf/net/if_pflog.h#1 branch .. //depot/projects/gdb/sys/contrib/pf/net/if_pfsync.c#1 branch .. //depot/projects/gdb/sys/contrib/pf/net/if_pfsync.h#1 branch .. //depot/projects/gdb/sys/contrib/pf/net/pf.c#1 branch .. //depot/projects/gdb/sys/contrib/pf/net/pf_ioctl.c#1 branch .. //depot/projects/gdb/sys/contrib/pf/net/pf_norm.c#1 branch .. //depot/projects/gdb/sys/contrib/pf/net/pf_osfp.c#1 branch .. //depot/projects/gdb/sys/contrib/pf/net/pf_table.c#1 branch .. //depot/projects/gdb/sys/contrib/pf/net/pfvar.h#1 branch .. //depot/projects/gdb/sys/contrib/pf/netinet/in4_cksum.c#1 branch .. //depot/projects/gdb/sys/ddb/db_command.c#2 integrate .. //depot/projects/gdb/sys/ddb/db_ps.c#2 integrate .. //depot/projects/gdb/sys/ddb/db_sym.c#2 integrate .. //depot/projects/gdb/sys/dev/aac/aac.c#3 integrate .. //depot/projects/gdb/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_powerres.c#3 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_video.c#1 branch .. //depot/projects/gdb/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/gdb/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/gdb/sys/dev/amr/amr.c#3 integrate .. //depot/projects/gdb/sys/dev/amr/amr_disk.c#3 integrate .. //depot/projects/gdb/sys/dev/asr/asr.c#2 integrate .. //depot/projects/gdb/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/gdb/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/gdb/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/gdb/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/gdb/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/gdb/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/gdb/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/gdb/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/gdb/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/gdb/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/gdb/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/gdb/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/gdb/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/gdb/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/gdb/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/gdb/sys/dev/ctau/am8530.h#1 branch .. //depot/projects/gdb/sys/dev/ctau/ctau.c#1 branch .. //depot/projects/gdb/sys/dev/ctau/ctau2fw.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 7 15:09:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA57C16A4D0; Sun, 7 Mar 2004 15:09:15 -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 A474B16A4CE for ; Sun, 7 Mar 2004 15:09:15 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D7FE43D41 for ; Sun, 7 Mar 2004 15:09:15 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i27N9FGe023550 for ; Sun, 7 Mar 2004 15:09:15 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i27N9FWv023547 for perforce@freebsd.org; Sun, 7 Mar 2004 15:09:15 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 7 Mar 2004 15:09:15 -0800 (PST) Message-Id: <200403072309.i27N9FWv023547@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 48373 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 Mar 2004 23:09:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=48373 Change 48373 by peter@peter_melody on 2004/03/07 15:09:06 tweak this some more. It seems I still had a bootstrap problem. Affected files ... .. //depot/projects/hammer/libexec/rtld-elf32/Makefile#2 edit Differences ... ==== //depot/projects/hammer/libexec/rtld-elf32/Makefile#2 (text+ko) ==== @@ -4,12 +4,12 @@ TARGET= i386 LIBDIR= /usr/lib32 .if exists(${.OBJDIR}/../../lib/libc32) -LIBC= ${.OBJDIR}/../../lib/libc32/libc_pic.a +LIBCPATH=${.OBJDIR}/../../lib/libc32 .else -LIBC= ${.CURDIR}/../../lib/libc32/libc_pic.a +LIBCPATH=${.CURDIR}/../../lib/libc32 .endif -#LIBC= ${DESTDIR}${LIBDIR}/libc_pic.a -CFLAGS+=-m32 -I. -L${LIBDIR} -DCOMPAT_32BIT +LIBC= ${LIBCPATH}/libc_pic.a +CFLAGS+=-m32 -I. -L${LIBCPATH} -DCOMPAT_32BIT NOMAN= compat only beforedepend: machine From owner-p4-projects@FreeBSD.ORG Sun Mar 7 15:24:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F32AB16A4D0; Sun, 7 Mar 2004 15:24: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 CCDCE16A4CE for ; Sun, 7 Mar 2004 15:24:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B080E43D2D for ; Sun, 7 Mar 2004 15:24:34 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i27NOYGe027581 for ; Sun, 7 Mar 2004 15:24:34 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i27NOYRZ027578 for perforce@freebsd.org; Sun, 7 Mar 2004 15:24:34 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 7 Mar 2004 15:24:34 -0800 (PST) Message-Id: <200403072324.i27NOYRZ027578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48374 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 Mar 2004 23:24:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=48374 Change 48374 by jmallett@jmallett_oingo on 2004/03/07 15:24:10 Attempt to cleanup and stuff. Like, using a table. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#15 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#15 (text+ko) ==== @@ -29,6 +29,40 @@ #define VEND(x) \ _VEND(x) +ExceptionHandlerTable: + .dword GenericException /* Int */ + .dword GenericException /* TLBMod */ + .dword XTLBMissVector /* TLBL */ + .dword XTLBMissVector /* TLBS */ + .dword GenericException /* AdEL */ + .dword GenericException /* AdES */ + .dword GenericException /* IBE */ + .dword GenericException /* DBE */ + .dword GenericException /* Sys */ + .dword GenericException /* Bp */ + .dword GenericException /* RI */ + .dword GenericException /* CpU */ + .dword GenericException /* Ov */ + .dword GenericException /* Tr */ + .dword GenericException /* VCEI */ + .dword GenericException /* FPE */ + .dword GenericException /* Res (16) */ + .dword GenericException /* Res (17) */ + .dword GenericException /* Res (18) */ + .dword GenericException /* Res (19) */ + .dword GenericException /* Res (20) */ + .dword GenericException /* Res (21) */ + .dword GenericException /* Res (22) */ + .dword GenericException /* WATCH */ + .dword GenericException /* Res (24) */ + .dword GenericException /* Res (25) */ + .dword GenericException /* Res (26) */ + .dword GenericException /* Res (27) */ + .dword GenericException /* Res (28) */ + .dword GenericException /* Res (29) */ + .dword GenericException /* Res (30) */ + .dword GenericException /* VCED */ + .text .set noreorder @@ -41,6 +75,20 @@ */ LEAF(ExceptionVector) .set noat + mfc0 k0, MIPS_COP_0_CAUSE + and k0, MIPS_CR_EXC_CODE + dsrl k0, MIPS_CR_EXC_CODE_SHIFT + dsll k0, 3 /* Index 64-bits. */ + dla k1, ExceptionHandlerTable + daddu k1, k0 + ld k1, 0(k1) + jr k1 + nop + .set at +VEND(ExceptionVector) + +LEAF(GenericException) + .set noat dsubu sp, sp, TF_SIZE dla k0, 1f j exception_save_registers @@ -73,61 +121,35 @@ daddu sp, sp, TF_SIZE eret .set at -VEND(ExceptionVector) +END(GenericException) LEAF(CacheVector) .set noat - - dsubu sp, sp, TF_SIZE - dla k0, 1f - j exception_save_registers - move k1, sp -1: - /* - * No turning back, and nothing we can do. Just call into - * trap and let it tell the user lovely things about how bad - * their cache has been, - */ - mfc0 a1, MIPS_COP_0_CAUSE - dmfc0 a2, MIPS_COP_0_BAD_VADDR - jal trap - move a0, k1 - - jal exception_restore_registers - move a0, sp - daddu sp, sp, TF_SIZE + dla k0, __panic + li a0, 0 + li a1, 0 + dmtc0 k0, MIPS_COP_0_EXC_PC + dla a2, 1f eret .set at VEND(CacheVector) + .data +1: .asciiz "CacheVector" + .text LEAF(TLBMissVector) .set noat -#if R4600 - j XTLBMissVector - nop -#else - dsubu sp, sp, TF_SIZE - dla k0, 1f - j exception_save_registers - move k1, sp -1: - /* - * No turning back, and nothing we can do. Just call into - * trap and let it tell the user lovely things about how bad - * their cache has been, - */ - mfc0 a1, MIPS_COP_0_CAUSE - dmfc0 a2, MIPS_COP_0_BAD_VADDR - jal trap - move a0, k1 - - jal exception_restore_registers - move a0, sp - daddu sp, sp, TF_SIZE + dla k0, __panic + li a0, 0 + li a1, 0 + dmtc0 k0, MIPS_COP_0_EXC_PC + dla a2, 1f eret -#endif .set at VEND(TLBMissVector) + .data +1: .asciiz "32-bit TLB Miss Vector" + .text /* * XXX kernel only. For now that makes sense. @@ -136,6 +158,7 @@ .set noat dmfc0 k0, MIPS_COP_0_BAD_VADDR dli k1, MIPS_XKSEG_START + tltu k0, k1 dsubu k0, k1 /* * Shift right logical to get a page index, but leaving @@ -169,39 +192,6 @@ VEND(XTLBMissVector) /* - * Handle an interrupt. Return into panic, for now. - */ -LEAF(Interrupt) - .set noat - mfc0 k1, MIPS_COP_0_CAUSE - li a0, 0 - li a1, 0 - dla k0, __panic - dmtc0 k0, MIPS_COP_0_EXC_PC - dla a2, 1f - move a3, k1 - eret - .set at -END(Interrupt) - .data -1: .asciiz "Interrupt, cause: %lx\n" - .text - -/* - * Handle VCED. - */ -LEAF(VCED) - .set noat - dmfc0 k0, MIPS_COP_0_BAD_VADDR - li k1, -16 - and k0, k1 - cache (CACHE_R4K_SD | CACHEOP_R4K_HIT_WB_INV), 0(k0) - cache (CACHE_R4K_D | CACHEOP_R4K_HIT_INV), 0(k0) - eret - .set at -END(VCED) - -/* * Restore registers from a trapframe pointed to in k1, returning to ra * that is passed in, and kept in k0. */ From owner-p4-projects@FreeBSD.ORG Sun Mar 7 15:27:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8273216A4D0; Sun, 7 Mar 2004 15:27:39 -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 4467416A4CE for ; Sun, 7 Mar 2004 15:27:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3373143D31 for ; Sun, 7 Mar 2004 15:27:39 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i27NRdGe027698 for ; Sun, 7 Mar 2004 15:27:39 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i27NRcrx027695 for perforce@freebsd.org; Sun, 7 Mar 2004 15:27:38 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 7 Mar 2004 15:27:38 -0800 (PST) Message-Id: <200403072327.i27NRcrx027695@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48375 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 Mar 2004 23:27:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=48375 Change 48375 by jmallett@jmallett_oingo on 2004/03/07 15:26:45 IFC. Affected files ... .. //depot/projects/mips/lib/libc/stdlib/malloc.c#8 integrate .. //depot/projects/mips/lib/libgeom/Makefile#7 integrate .. //depot/projects/mips/lib/libgeom/libgeom.3#5 integrate .. //depot/projects/mips/share/man/man9/Makefile#17 integrate .. //depot/projects/mips/share/man/man9/securelevel_gt.9#1 branch .. //depot/projects/mips/share/misc/bsd-family-tree#11 integrate .. //depot/projects/mips/sys/alpha/alpha/pmap.c#12 integrate .. //depot/projects/mips/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/mips/sys/dev/trm/trm.c#10 integrate .. //depot/projects/mips/sys/dev/trm/trm.h#4 integrate .. //depot/projects/mips/sys/geom/geom_subr.c#20 integrate .. //depot/projects/mips/sys/i386/i386/pmap.c#22 integrate .. //depot/projects/mips/sys/ia64/ia64/pmap.c#17 integrate .. //depot/projects/mips/sys/netgraph/ng_iface.c#8 integrate .. //depot/projects/mips/sys/netgraph/ng_iface.h#4 integrate .. //depot/projects/mips/sys/nfsserver/nfs.h#3 integrate .. //depot/projects/mips/sys/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/mips/sys/nfsserver/nfs_srvsubs.c#9 integrate .. //depot/projects/mips/sys/pc98/pc98/wd_cd.h#2 integrate .. //depot/projects/mips/sys/powerpc/powerpc/pmap.c#11 integrate .. //depot/projects/mips/sys/rpc/rpcclnt.c#4 integrate .. //depot/projects/mips/sys/sparc64/sparc64/pmap.c#13 integrate .. //depot/projects/mips/sys/vm/pmap.h#9 integrate .. //depot/projects/mips/sys/vm/vm_glue.c#11 integrate .. //depot/projects/mips/sys/vm/vm_map.c#18 integrate .. //depot/projects/mips/usr.bin/printf/printf.c#2 integrate .. //depot/projects/mips/usr.sbin/mergemaster/mergemaster.sh#10 integrate Differences ... ==== //depot/projects/mips/lib/libc/stdlib/malloc.c#8 (text+ko) ==== @@ -9,7 +9,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.86 2004/02/21 09:14:38 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.87 2004/03/07 20:41:27 phk Exp $"); /* * Defining MALLOC_EXTRA_SANITY will enable extra checks which are related @@ -198,9 +198,6 @@ #define INIT_MMAP() #endif -/* Set when initialization has been done */ -static unsigned malloc_started; - /* Number of free pages we cache */ static unsigned malloc_cache = 16; @@ -491,9 +488,6 @@ malloc_ninfo = malloc_pagesize / sizeof *page_dir; - /* Been here, done that */ - malloc_started++; - /* Recalculate the cache size in bytes, and make sure it's nonzero */ if (!malloc_cache) @@ -729,9 +723,6 @@ { void *result; - if (!malloc_started) - malloc_init(); - if (suicide) abort(); @@ -764,11 +755,6 @@ if (suicide) abort(); - if (!malloc_started) { - wrtwarning("malloc() has never been called\n"); - return (NULL); - } - index = ptr2index(ptr); if (index < malloc_pageshift) { @@ -1061,11 +1047,6 @@ if (ptr == NULL) return; - if (!malloc_started) { - wrtwarning("malloc() has never been called\n"); - return; - } - /* If we're already sinking, don't make matters any worse. */ if (suicide) return; @@ -1097,6 +1078,7 @@ void *r; int err = 0; static int malloc_active; /* Recusion flag for public interface. */ + static unsigned malloc_started; /* Set when initialization has been done */ /* * If a thread is inside our code with a functional lock held, and then @@ -1115,6 +1097,18 @@ return (NULL); } malloc_active = 1; + + if (!malloc_started) { + if (ptr != NULL) { + wrtwarning("malloc() has never been called\n"); + malloc_active = 0; + _MALLOC_UNLOCK(); + errno = EDOOFUS; + return (NULL); + } + malloc_init(); + malloc_started = 1; + } if (ptr == ZEROSIZEPTR) ptr = NULL; ==== //depot/projects/mips/lib/libgeom/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libgeom/Makefile,v 1.9 2003/08/18 15:25:38 obrien Exp $ +# $FreeBSD: src/lib/libgeom/Makefile,v 1.10 2004/03/07 16:07:57 phk Exp $ LIB= geom SHLIBDIR?= /lib @@ -25,6 +25,12 @@ libgeom.3 geom_stats_snapshot_free.3 \ libgeom.3 geom_stats_snapshot_timestamp.3 \ libgeom.3 geom_stats_snapshot_reset.3 \ - libgeom.3 geom_stats_snapshot_next.3 + libgeom.3 geom_stats_snapshot_next.3 \ + libgeom.3 gctl_get_handle.3 \ + libgeom.3 gctl_ro_param.3 \ + libgeom.3 gctl_rw_param.3 \ + libgeom.3 gctl_issue.3 \ + libgeom.3 gctl_free.3 \ + libgeom.3 gctl_dump.3 .include ==== //depot/projects/mips/lib/libgeom/libgeom.3#5 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.4 2003/06/18 19:43:17 charnier Exp $ +.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.5 2004/03/07 16:07:57 phk Exp $ .\" .Dd February 8, 2003 .Dt LIBGEOM 3 @@ -38,7 +38,13 @@ .Nm geom_stats_snapshot_free , .Nm geom_stats_snapshot_timestamp , .Nm geom_stats_snapshot_reset , -.Nm geom_stats_snapshot_next +.Nm geom_stats_snapshot_next , +.Nm gctl_get_handle , +.Nm gctl_ro_param , +.Nm gctl_rw_param , +.Nm gctl_issue , +.Nm gctl_free , +.Nm gctl_dump .Nd userland API library for kernel GEOM subsystem .Sh LIBRARY .Lb libgeom @@ -61,6 +67,19 @@ .Fn geom_stats_snapshot_reset "void *arg" .Ft "struct g_stat *" .Fn geom_stats_snapshot_next "void *arg" +.Ss "Control Functions" +.Ft "struct gctl_req *" +.Fn gctl_get_handle "void" +.Ft void +.Fn gctl_ro_param "struct gctl_req *req" "const char *name" "int len" "const void *value" +.Ft void +.Fn gctl_rw_param "struct gctl_req *req" "const char *name" "int len" "void *value" +.Ft "const char *" +.Fn gctl_issue "struct gctl_req *req" +.Ft void +.Fn gctl_free "struct gctl_req *req" +.Ft void +.Fn gctl_dump "struct gctl_req *req" "FILE *f" .Sh DESCRIPTION The .Nm geom @@ -129,10 +148,99 @@ returns the next item, and .Dv NULL if there are no more items in the snapshot. -.Sh AUTHORS -.An Poul-Henning Kamp Aq phk@FreeBSD.org +.Ss "Control Functions" +The +.Fn gctl_* +functions are used to send requests to GEOM classes. In order for a GEOM +class to actually be able to receive these requests, it must have defined a +"ctlreq" method. +.Pp +A +.Ar struct gctl_req * , +obtained with +.Fn gctl_get_handle , +can hold any number of parameters, which must be added to it with +.Fn gctl_ro_param +(for read-only parameters) or +.Fn gctl_rw_param +(for read/write parameters). +.Pp +Both +.Fn gctl_ro_param +and +.Fn gctl_rw_param +take a string +.Ar name , +which is used to identify the parameter, and a +.Ar value , +which contains - in the read-only case - the data to be passed to the +GEOM class, or - in the read/write case - a pointer to preallocated memory +that the GEOM class should fill with the desired data. If +.Ar len +is negative, it is assumed that +.Ar value +is an ASCII string and the actual length is taken from the string length of +.Ar value ; +otherwise it must hold the size of +.Ar value . +.Pp +A parameter with a +.Ar name +containing the string "class" is mandatory for each request, and the +corresponding +.Ar value +must hold the name of the GEOM class where the request should be sent to. +.Pp +Also mandatory for each request is a parameter with a +.Ar name +called "verb", and the corresponding +.Ar value +needs to hold the command string that the GEOM class should react upon. +.Pp +Once all desired parameters are filled in, the request must be sent to +the GEOM subsystem with +.Fn gctl_issue , +which returns NULL on success, or a string containing the error message +on failure. +.Pp +After the request is finished, the allocated memory should be released with +.Fn gctl_free . +.Pp +.Fn gctl_dump +can be used to format the contents of +.Ar req +to the open file handle pointed to by +.Ar f +for debugging purposes. +.Pp +Error handling for the control functions is postponed until the call +to +.Fn gctl_issue +which returns NULL on success or an error message corresponding to the +first error which happened. +.Sh EXAMPLES +Create a request that is to be sent to the CCD class and tell +it to destroy a specific geom: +.Bd -literal -offset indent +H = gctl_get_handle(); +gctl_ro_param(H, "verb", -1, "destroy geom"); +gctl_ro_param(H, "class", -1, "CCD"); +sprintf(buf, "ccd%d", ccd); +gctl_ro_param(H, "geom", -1, buf); +errstr = gctl_issue(H); +if (errstr != NULL) + err(1, "Could not destroy ccd: %s", errstr); +gctl_free(H); +.Ed +.Sh SEE ALSO +.Rs +http://ezine.daemonnews.org/200308/blueprints.html +.Re .Sh HISTORY The .Nm geom library appeared in .Fx 5.1 . +.Sh AUTHORS +.An Poul-Henning Kamp Aq phk@FreeBSD.org +.An Lukas Ertl Aq le@FreeBSD.org ==== //depot/projects/mips/share/man/man9/Makefile#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.225 2004/03/06 08:01:16 jkoshy Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.226 2004/03/07 15:22:08 josef Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -186,6 +186,7 @@ runqueue.9 \ sbuf.9 \ scheduler.9 \ + securelevel_gt.9 \ selrecord.9 \ sema.9 \ signal.9 \ @@ -732,6 +733,7 @@ scheduler.9 sched_setup.9 \ scheduler.9 setrunnable.9 \ scheduler.9 updatepri.9 +MLINKS+=securelevel_gt.9 securelevel_ge.9 MLINKS+=selrecord.9 selwakeup.9 MLINKS+=sema.9 sema_destroy.9 \ sema.9 sema_init.9 \ ==== //depot/projects/mips/share/misc/bsd-family-tree#11 (text+ko) ==== @@ -158,17 +158,17 @@ | | | NetBSD 1.6 OpenBSD 3.2 | | FreeBSD 4.8 | | | | | | | | | NetBSD 1.6.1 | | - | | | | | OpenBSD 3.3 | + | | | | | OpenBSD 3.3 BSD/OS 5.0 | | | | | | | - | FreeBSD 4.9 | | | OpenBSD 3.4 | - | | | | | | | - | v | | NetBSD 1.6.2 | | - | | | | | | - | | | v | | -FreeBSD 5.0 | | | | - | | | | BSD/OS 5.0 -FreeBSD 5.1 | NetBSD -current OpenBSD -current | - | \ | | | v + | FreeBSD 4.9 | | | OpenBSD 3.4 BSD/OS 5.1 ISE + | | | | | | + | v | | NetBSD 1.6.2 | + | | | | | + | | | v | +FreeBSD 5.0 | | | + | | | | +FreeBSD 5.1 | NetBSD -current OpenBSD -current + | \ | | | | ----- Mac OS X | | | 10.3 | | FreeBSD 5.2 | | | @@ -391,6 +391,7 @@ FreeBSD 5.1 2003-06-09 [FBD] Mac OS X 10.3 2003-10-24 [APL] FreeBSD 4.9 2003-10-28 [FBD] +BSD/OS 5.1 ISE 2003-10-?? [WRS] (final version) OpenBSD 3.4 2003-11-01 [OBD] FreeBSD 5.2 2004-01-12 [FBD] FreeBSD 5.2.1 2004-02-22 [FBD] (patch release) @@ -451,4 +452,4 @@ Copyright (c) 1997-2004 Wolfram Schneider URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.78 2004/03/04 05:34:29 maxim Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.79 2004/03/07 16:44:10 wosch Exp $ ==== //depot/projects/mips/sys/alpha/alpha/pmap.c#12 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.139 2003/10/03 22:46:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.140 2004/03/07 21:06:46 alc Exp $"); #include #include @@ -1109,18 +1109,6 @@ mtx_lock_spin(&allpmaps_lock); LIST_INSERT_HEAD(&allpmaps, pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); -} - -/* - * Wire in kernel global address entries. To avoid a race condition - * between pmap initialization and pmap_growkernel, this procedure - * should be called after the vmspace is attached to the process - * but before this pmap is activated. - */ -void -pmap_pinit2(pmap) - struct pmap *pmap; -{ bcopy(PTlev1 + K1SEGLEV1I, pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE); } ==== //depot/projects/mips/sys/amd64/amd64/pmap.c#6 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.452 2004/02/05 00:11:05 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.453 2004/03/07 21:06:47 alc Exp $"); /* * Manages physical address maps. @@ -1103,19 +1103,6 @@ } /* - * Wire in kernel global address entries. To avoid a race condition - * between pmap initialization and pmap_growkernel, this procedure - * should be called after the vmspace is attached to the process - * but before this pmap is activated. - */ -void -pmap_pinit2(pmap) - struct pmap *pmap; -{ - /* XXX: Remove this stub when no longer called */ -} - -/* * this routine is called if the page table page is not * mapped correctly. * ==== //depot/projects/mips/sys/dev/trm/trm.c#10 (text+ko) ==== @@ -12,7 +12,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/trm/trm.c,v 1.19 2004/02/20 20:36:55 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/trm/trm.c,v 1.20 2004/03/07 17:23:39 cognet Exp $"); /* * HISTORY: @@ -2992,6 +2992,25 @@ return; } +static void +trm_destroySRB(PACB pACB) +{ + PSRB pSRB; + + pSRB = pACB->pFreeSRB; + while (pSRB) { + if (pSRB->sg_dmamap) { + bus_dmamap_unload(pACB->sg_dmat, pSRB->sg_dmamap); + bus_dmamem_free(pACB->sg_dmat, pSRB->pSRBSGL, + pSRB->sg_dmamap); + bus_dmamap_destroy(pACB->sg_dmat, pSRB->sg_dmamap); + } + if (pSRB->dmamap) + bus_dmamap_destroy(pACB->buffer_dmat, pSRB->dmamap); + pSRB = pSRB->pNextSRB; + } +} + static int trm_initSRB(PACB pACB) { @@ -3002,29 +3021,11 @@ for (i = 0; i < TRM_MAX_SRB_CNT; i++) { pSRB = (PSRB)&pACB->pFreeSRB[i]; - /* DMA tag for our S/G structures */ - if (bus_dma_tag_create( - /*parent_dmat*/pSRB->parent_dmat, - /*alignment*/ 1, - /*boundary*/ 0, - /*lowaddr*/ BUS_SPACE_MAXADDR, - /*highaddr*/ BUS_SPACE_MAXADDR, - /*filter*/ NULL, - /*filterarg*/ NULL, - /*maxsize*/ TRM_MAX_SG_LISTENTRY * sizeof(SGentry), - /*nsegments*/ 1, - /*maxsegsz*/ TRM_MAXTRANSFER_SIZE, - /*flags*/ 0, - /*lockfunc*/ busdma_lock_mutex, - /*lockarg*/ &Giant, - /*dmat*/ &pSRB->sg_dmat) != 0) { - return ENXIO; - } - if (bus_dmamem_alloc(pSRB->sg_dmat, (void **)&pSRB->pSRBSGL, + if (bus_dmamem_alloc(pACB->sg_dmat, (void **)&pSRB->pSRBSGL, BUS_DMA_NOWAIT, &pSRB->sg_dmamap) !=0 ) { return ENXIO; } - bus_dmamap_load(pSRB->sg_dmat, pSRB->sg_dmamap, pSRB->pSRBSGL, + bus_dmamap_load(pACB->sg_dmat, pSRB->sg_dmamap, pSRB->pSRBSGL, TRM_MAX_SG_LISTENTRY * sizeof(SGentry), trm_srbmapSG, pSRB, /*flags*/0); if (i != TRM_MAX_SRB_CNT - 1) { @@ -3042,9 +3043,6 @@ /* * Create the dmamap. This is no longer optional! - * - * XXX This is not freed on unload! None of the other - * allocations in this function are either! */ if ((error = bus_dmamap_create(pACB->buffer_dmat, 0, &pSRB->dmamap)) != 0) @@ -3499,6 +3497,23 @@ } } bzero(pACB->pFreeSRB, TRM_MAX_SRB_CNT * sizeof(TRM_SRB)); + if (bus_dma_tag_create( + /*parent_dmat*/NULL, + /*alignment*/ 1, + /*boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR, + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ TRM_MAX_SG_LISTENTRY * sizeof(SGentry), + /*nsegments*/ 1, + /*maxsegsz*/ TRM_MAXTRANSFER_SIZE, + /*flags*/ 0, + /*lockfunc*/ busdma_lock_mutex, + /*lockarg*/ &Giant, + /*dmat*/ &pACB->sg_dmat) != 0) + goto bad; + if (trm_initSRB(pACB)) { printf("trm_initSRB: error\n"); goto bad; @@ -3520,6 +3535,10 @@ } if (pACB->sense_dmat) bus_dma_tag_destroy(pACB->sense_dmat); + if (pACB->sg_dmat) { + trm_destroySRB(pACB); + bus_dma_tag_destroy(pACB->sg_dmat); + } if (pACB->srb_dmamap) { bus_dmamap_unload(pACB->srb_dmat, pACB->srb_dmamap); bus_dmamem_free(pACB->srb_dmat, pACB->pFreeSRB, @@ -3628,6 +3647,11 @@ if (pACB->iores) bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(0), pACB->iores); + if (pACB->sg_dmat) { + trm_destroySRB(pACB); + bus_dma_tag_destroy(pACB->sg_dmat); + } + if (pACB->srb_dmamap) { bus_dmamap_unload(pACB->srb_dmat, pACB->srb_dmamap); bus_dmamem_free(pACB->srb_dmat, pACB->pFreeSRB, @@ -3685,6 +3709,8 @@ PACB pACB = device_get_softc(dev); bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(0), pACB->iores); + trm_destroySRB(pACB); + bus_dma_tag_destroy(pACB->sg_dmat); bus_dmamap_unload(pACB->srb_dmat, pACB->srb_dmamap); bus_dmamem_free(pACB->srb_dmat, pACB->pFreeSRB, pACB->srb_dmamap); ==== //depot/projects/mips/sys/dev/trm/trm.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/trm/trm.h,v 1.3 2003/02/20 03:21:34 cognet Exp $ + * $FreeBSD: src/sys/dev/trm/trm.h,v 1.4 2004/03/07 17:23:39 cognet Exp $ */ #ifndef trm_H @@ -155,8 +155,6 @@ * CAM ccb */ union ccb *pccb; - bus_dma_tag_t parent_dmat; - bus_dma_tag_t sg_dmat; bus_dmamap_t sg_dmamap; bus_dmamap_t dmamap; u_int16_t SRBState; @@ -235,6 +233,7 @@ bus_dma_tag_t buffer_dmat; /* dmat for buffer I/O */ bus_dma_tag_t srb_dmat; bus_dma_tag_t sense_dmat; /* dmat for sense buffer */ + bus_dma_tag_t sg_dmat; bus_dmamap_t sense_dmamap; bus_dmamap_t srb_dmamap; bus_addr_t sense_busaddr; ==== //depot/projects/mips/sys/geom/geom_subr.c#20 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.71 2004/02/14 17:58:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.72 2004/03/07 17:33:15 phk Exp $"); #include #include @@ -272,7 +272,8 @@ if (!(gp->flags & G_GEOM_WITHER)) { gp->flags |= G_GEOM_WITHER; LIST_FOREACH(pp, &gp->provider, provider) - g_orphan_provider(pp, error); + if (!(pp->flags & G_PF_ORPHAN)) + g_orphan_provider(pp, error); } for (pp = LIST_FIRST(&gp->provider); pp != NULL; pp = pp2) { pp2 = LIST_NEXT(pp, provider); ==== //depot/projects/mips/sys/i386/i386/pmap.c#22 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.462 2004/02/01 20:14:00 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.463 2004/03/07 21:06:47 alc Exp $"); /* * Manages physical address maps. @@ -1147,19 +1147,6 @@ } /* - * Wire in kernel global address entries. To avoid a race condition - * between pmap initialization and pmap_growkernel, this procedure - * should be called after the vmspace is attached to the process - * but before this pmap is activated. - */ -void -pmap_pinit2(pmap) - struct pmap *pmap; -{ - /* XXX: Remove this stub when no longer called */ -} - -/* * this routine is called if the page table page is not * mapped correctly. */ ==== //depot/projects/mips/sys/ia64/ia64/pmap.c#17 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.126 2004/03/07 07:43:13 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.127 2004/03/07 21:06:47 alc Exp $"); #include #include @@ -735,17 +735,6 @@ bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } -/* - * Wire in kernel global address entries. To avoid a race condition - * between pmap initialization and pmap_growkernel, this procedure - * should be called after the vmspace is attached to the process - * but before this pmap is activated. - */ -void -pmap_pinit2(struct pmap *pmap) -{ -} - /*************************************************** * Pmap allocation/deallocation routines. ***************************************************/ ==== //depot/projects/mips/sys/netgraph/ng_iface.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ * * Author: Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_iface.c,v 1.28 2003/12/28 03:56:00 sam Exp $ + * $FreeBSD: src/sys/netgraph/ng_iface.c,v 1.29 2004/03/07 23:00:44 ru Exp $ * $Whistle: ng_iface.c,v 1.33 1999/11/01 09:24:51 julian Exp $ */ @@ -186,6 +186,13 @@ NULL, &ng_cisco_ipaddr_type }, + { + NGM_IFACE_COOKIE, + NGM_IFACE_GET_IFINDEX, + "getifindex", + NULL, + &ng_parse_uint32_type + }, { 0 } }; @@ -667,6 +674,15 @@ break; } + case NGM_IFACE_GET_IFINDEX: + NG_MKRESPONSE(resp, msg, sizeof(uint32_t), M_NOWAIT); + if (resp == NULL) { + error = ENOMEM; + break; + } + *((uint32_t *)resp->data) = priv->ifp->if_index; + break; + default: error = EINVAL; break; ==== //depot/projects/mips/sys/netgraph/ng_iface.h#4 (text+ko) ==== @@ -36,7 +36,7 @@ * * Author: Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_iface.h,v 1.5 2003/11/11 12:30:37 ru Exp $ + * $FreeBSD: src/sys/netgraph/ng_iface.h,v 1.6 2004/03/07 23:00:44 ru Exp $ * $Whistle: ng_iface.h,v 1.5 1999/01/20 00:22:13 archie Exp $ */ @@ -69,6 +69,7 @@ NGM_IFACE_GET_IFNAME = 1, /* returns struct ng_iface_ifname */ NGM_IFACE_POINT2POINT, NGM_IFACE_BROADCAST, + NGM_IFACE_GET_IFINDEX, }; struct ng_iface_ifname { ==== //depot/projects/mips/sys/nfsserver/nfs.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.4 (Berkeley) 5/1/95 - * $FreeBSD: src/sys/nfsserver/nfs.h,v 1.69 2003/05/25 06:17:33 truckman Exp $ + * $FreeBSD: src/sys/nfsserver/nfs.h,v 1.70 2004/03/07 16:28:31 kan Exp $ */ #ifndef _NFSSERVER_NFS_H_ @@ -132,7 +132,7 @@ struct vattr; struct nameidata; -extern struct callout_handle nfsrv_timer_handle; +extern struct callout nfsrv_callout; extern struct nfsrvstats nfsrvstats; extern int nfsrv_ticks; ==== //depot/projects/mips/sys/nfsserver/nfs_srvsock.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsock.c,v 1.86 2003/11/17 00:56:53 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsock.c,v 1.87 2004/03/07 16:28:31 kan Exp $"); /* * Socket operations for use by nfs @@ -96,7 +96,7 @@ */ #define NFS_CWNDSCALE 256 #define NFS_MAXCWND (NFS_CWNDSCALE * 32) -struct callout_handle nfsrv_timer_handle; +struct callout nfsrv_callout; static void nfs_realign(struct mbuf **pm, int hsiz); /* XXX SHARED */ static int nfsrv_getstream(struct nfssvc_sock *, int); @@ -779,5 +779,5 @@ nfsrv_wakenfsd(slp); } splx(s); - nfsrv_timer_handle = timeout(nfsrv_timer, NULL, nfsrv_ticks); + callout_reset(&nfsrv_callout, nfsrv_ticks, nfsrv_timer, NULL); } ==== //depot/projects/mips/sys/nfsserver/nfs_srvsubs.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.123 2003/12/17 16:12:01 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.124 2004/03/07 16:28:31 kan Exp $"); /* * These functions support the macros and help fiddle mbuf chains for @@ -545,6 +545,7 @@ nfsrv_init(0); /* Init server data structures */ nfsrv_initcache(); /* Init the server request cache */ + callout_init(&nfsrv_callout, 0); nfsrv_timer(0); nfs_prev_nfssvc_sy_narg = sysent[SYS_nfssvc].sy_narg; @@ -555,7 +556,7 @@ case MOD_UNLOAD: - untimeout(nfsrv_timer, (void *)NULL, nfsrv_timer_handle); + callout_stop(&nfsrv_callout); sysent[SYS_nfssvc].sy_narg = nfs_prev_nfssvc_sy_narg; sysent[SYS_nfssvc].sy_call = nfs_prev_nfssvc_sy_call; break; ==== //depot/projects/mips/sys/pc98/pc98/wd_cd.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/pc98/pc98/wd_cd.h,v 1.3 2002/09/23 18:54:32 alfred Exp $ + * $FreeBSD: src/sys/pc98/pc98/wd_cd.h,v 1.4 2004/03/07 14:16:42 nyan Exp $ */ /* @@ -347,3 +347,12 @@ u_int next_writeable_lba; /* Next writable position */ struct wormio_prepare_track preptrack; /* Scratch region */ }; + +struct ioc_read_audio { + u_char address_format; + union msf_lba address; + int nframes; + u_char* buffer; +}; + +#define CDIOCREADAUDIO _IOWR('c',31,struct ioc_read_audio) ==== //depot/projects/mips/sys/powerpc/powerpc/pmap.c#11 (text+ko) ==== @@ -91,7 +91,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.71 2004/03/02 06:49:21 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.72 2004/03/07 21:06:48 alc Exp $"); /* * Manages physical address maps. @@ -1443,12 +1443,6 @@ bzero(&pm->pm_stats, sizeof(pm->pm_stats)); } -void -pmap_pinit2(pmap_t pmap) -{ - /* XXX: Remove this stub when no longer called */ -} - /* * Set the physical protection on the specified range of this map as requested. */ ==== //depot/projects/mips/sys/rpc/rpcclnt.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/rpc/rpcclnt.c,v 1.6 2004/01/17 21:25:05 alfred Exp $ */ +/* $FreeBSD: src/sys/rpc/rpcclnt.c,v 1.7 2004/03/07 16:23:03 kan Exp $ */ /* $Id: rpcclnt.c,v 1.9 2003/11/05 14:59:03 rees Exp $ */ /* @@ -203,7 +203,7 @@ */ static TAILQ_HEAD(, rpctask) rpctask_q; -struct callout_handle rpcclnt_timer_handle; +struct callout rpcclnt_callout; #ifdef __OpenBSD__ static int rpcclnt_send(struct socket *, struct mbuf *, struct mbuf *, struct rpctask *); @@ -283,8 +283,8 @@ timeout_set(&rpcclnt_timer_to, rpcclnt_timer, &rpcclnt_timer_to); rpcclnt_timer(&rpcclnt_timer_to); #else /* !__OpenBSD__ */ + callout_init(&rpcclnt_callout, 0); rpcclnt_timer(NULL); - #endif /* !__OpenBSD__ */ RPCDEBUG("rpc initialed"); @@ -296,7 +296,7 @@ rpcclnt_uninit(void) { RPCDEBUG("uninit"); - untimeout(rpcclnt_timer, (void *)NULL, rpcclnt_timer_handle); + callout_stop(&rpcclnt_callout); /* XXX delete sysctl variables? */ } @@ -1476,7 +1476,7 @@ #ifdef __OpenBSD__ timeout_add(rpcclnt_timer, to, rpcclnt_ticks); #else - rpcclnt_timer_handle = timeout(rpcclnt_timer, NULL, rpcclnt_ticks); + callout_reset(&rpcclnt_callout, rpcclnt_ticks, rpcclnt_timer, NULL); #endif } ==== //depot/projects/mips/sys/sparc64/sparc64/pmap.c#13 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.126 2003/10/03 22:46:53 alc Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.127 2004/03/07 21:06:48 alc Exp $ */ /* @@ -1027,12 +1027,6 @@ bzero(&pm->pm_stats, sizeof(pm->pm_stats)); } -void -pmap_pinit2(pmap_t pmap) -{ - /* XXX: Remove this stub when no longer called */ -} - /* * Release any resources held by the given physical map. * Called when a pmap initialized by pmap_pinit is being released. ==== //depot/projects/mips/sys/vm/pmap.h#9 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/pmap.h,v 1.65 2003/10/06 01:47:12 bms Exp $ + * $FreeBSD: src/sys/vm/pmap.h,v 1.66 2004/03/07 21:06:48 alc Exp $ */ /* @@ -120,7 +120,6 @@ void pmap_page_protect(vm_page_t m, vm_prot_t prot); void pmap_pinit(pmap_t); void pmap_pinit0(pmap_t); -void pmap_pinit2(pmap_t); void pmap_protect(pmap_t, vm_offset_t, vm_offset_t, vm_prot_t); void pmap_qenter(vm_offset_t, vm_page_t *, int); void pmap_qremove(vm_offset_t, int); ==== //depot/projects/mips/sys/vm/vm_glue.c#11 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.191 2004/03/05 22:03:11 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.192 2004/03/07 21:06:48 alc Exp $"); #include "opt_vm.h" #include "opt_kstack_pages.h" @@ -675,9 +675,6 @@ if ((flags & RFMEM) == 0) { p2->p_vmspace = vmspace_fork(p1->p_vmspace); - - pmap_pinit2(vmspace_pmap(p2->p_vmspace)); - if (p1->p_vmspace->vm_shm) shmfork(p1, p2); } ==== //depot/projects/mips/sys/vm/vm_map.c#18 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.329 2004/02/12 20:56:06 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.330 2004/03/07 21:06:48 alc Exp $"); #include #include @@ -2798,7 +2798,6 @@ * here, it is a good idea to keep this form for future mods. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 7 16:02:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA91916A4D0; Sun, 7 Mar 2004 16:02:21 -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 B258516A4CE for ; Sun, 7 Mar 2004 16:02:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93FF243D1D for ; Sun, 7 Mar 2004 16:02:21 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2802LGe035893 for ; Sun, 7 Mar 2004 16:02:21 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2802Lf6035887 for perforce@freebsd.org; Sun, 7 Mar 2004 16:02:21 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 7 Mar 2004 16:02:21 -0800 (PST) Message-Id: <200403080002.i2802Lf6035887@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 48376 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 Mar 2004 00:02:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=48376 Change 48376 by peter@peter_melody on 2004/03/07 16:01:58 doh! be consistent about the name. Affected files ... .. //depot/projects/hammer/libexec/rtld-elf32/Makefile#3 edit Differences ... ==== //depot/projects/hammer/libexec/rtld-elf32/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ -PROG= ld-elf-32.so.1 +PROG= ld-elf32.so.1 RTLDSRC=${.CURDIR}/../rtld-elf TARGET= i386 LIBDIR= /usr/lib32 From owner-p4-projects@FreeBSD.ORG Sun Mar 7 16:23:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8B7816A4D1; Sun, 7 Mar 2004 16:23:50 -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 9128D16A4D0 for ; Sun, 7 Mar 2004 16:23:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 873A543D31 for ; Sun, 7 Mar 2004 16:23:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i280NoGe041327 for ; Sun, 7 Mar 2004 16:23:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i280NoNe041323 for perforce@freebsd.org; Sun, 7 Mar 2004 16:23:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 7 Mar 2004 16:23:50 -0800 (PST) Message-Id: <200403080023.i280NoNe041323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48381 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 Mar 2004 00:23:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=48381 Change 48381 by jmallett@jmallett_oingo on 2004/03/07 16:23:32 Try to integ from alpha. Affected files ... .. //depot/projects/mips/sys/mips/mips/pmap.c#29 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/pmap.c#29 (text+ko) ==== @@ -44,7 +44,6 @@ * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap * from: Alpha Id: pmap.c,v 1.122 2003/04/10 18:42:06 jhb Exp - * $FreeBSD$ */ /* @@ -73,6 +72,9 @@ * and to when physical maps must be made correct. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include @@ -196,7 +198,6 @@ static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t mpte, vm_page_t m); - /* * Routine: pmap_pte * Function: @@ -336,9 +337,41 @@ return (va); } -/* - * A free function for the above. - */ +void * +uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) +{ + static vm_pindex_t color; + vm_page_t m; + int pflags; + void *va; + + *flags = UMA_SLAB_PRIV; + + if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) + pflags = VM_ALLOC_INTERRUPT; + else + pflags = VM_ALLOC_SYSTEM; + + if (wait & M_ZERO) + pflags |= VM_ALLOC_ZERO; + + for (;;) { + m = vm_page_alloc(NULL, color++, pflags | VM_ALLOC_NOOBJ); + if (m == NULL) { + if (wait & M_NOWAIT) + return (NULL); + else + VM_WAIT; + } else + break; + } + + va = (void *)MIPS_PHYS_TO_KSEG0(m->phys_addr); + if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) + bzero(va, PAGE_SIZE); + return (va); +} + void uma_small_free(void *mem, int size, u_int8_t flags) { @@ -677,7 +710,38 @@ pmap_pinit(pmap) register struct pmap *pmap; { - pmap->pm_lev1 = kptmap; /* XXX */ +#if notyet + vm_page_t lev1pg; + int i; + + /* + * allocate object for the ptes + */ + if (pmap->pm_pteobj == NULL) + pmap->pm_pteobj = vm_object_allocate(OBJT_DEFAULT, NUSERLEV3MAPS + NUSERLEV2MAPS + 1); + + /* + * allocate the page directory page + */ + VM_OBJECT_LOCK(pmap->pm_pteobj); + lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS, + VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED); + + vm_page_lock_queues(); + vm_page_flag_clear(lev1pg, PG_BUSY); + lev1pg->valid = VM_PAGE_BITS_ALL; + vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(pmap->pm_pteobj); + + pmap->pm_lev1 = (pt_entry_t*) MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(lev1pg)); + if ((lev1pg->flags & PG_ZERO) == 0) + bzero(pmap->pm_lev1, PAGE_SIZE); + + + /* install self-referential address mapping entry (not PG_ASM) */ + pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg)) + | PG_V | PG_KRE | PG_KWE; +#endif pmap->pm_ptphint = NULL; pmap->pm_active = 0; pmap->pm_asid = 0; @@ -687,18 +751,9 @@ mtx_lock_spin(&allpmaps_lock); LIST_INSERT_HEAD(&allpmaps, pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); -} - -/* - * Wire in kernel global address entries. To avoid a race condition - * between pmap initialization and pmap_growkernel, this procedure - * should be called after the vmspace is attached to the process - * but before this pmap is activated. - */ -void -pmap_pinit2(pmap) - struct pmap *pmap; -{ +#if notyet + bcopy(PTlev1 + K1SEGLEV1I, pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE); +#endif } /*************************************************** @@ -1147,7 +1202,37 @@ if (wired) pmap->pm_stats.wired_count++; - tlb_enter(pmap, va, pa, PG_V | (wired ? PG_W : 0)); +validate: + /* + * Now validate mapping with desired protection/wiring. + */ + newpte = pmap_phys_to_pte(pa) | pte_prot(pmap, prot) | PG_V | managed; + + if (managed) { + /* + * Set up referenced/modified emulation for the new + * mapping. Any old referenced/modified emulation + * results for the old mapping will have been recorded + * either in pmap_remove_pte() or above in the code + * which handles protection and/or wiring changes. + */ + newpte |= (PG_FOR | PG_FOW | PG_FOE); + } + + if (wired) + newpte |= PG_W; + + /* + * if the mapping or permission bits are different, we need + * to update the pte. + */ + if (origpte != newpte) { + *pte = newpte; + if (origpte) + pmap_invalidate_page(pmap, va); + if (prot & VM_PROT_EXECUTE) + alpha_pal_imb(); + } } /* @@ -1608,23 +1693,30 @@ */ if ((*pte & PG_RO) == 0) val |= MINCORE_MODIFIED|MINCORE_MODIFIED_OTHER; - /* - * Modified by someone - */ - else if (m->dirty || pmap_is_modified(m)) - val |= MINCORE_MODIFIED_OTHER; + else { + /* + * Modified by someone + */ + vm_page_lock_queues(); + if (m->dirty || pmap_is_modified(m)) + val |= MINCORE_MODIFIED_OTHER; + vm_page_unlock_queues(); + } /* * Referenced by us */ if ((*pte & PG_D) == 0) val |= MINCORE_REFERENCED|MINCORE_REFERENCED_OTHER; - - /* - * Referenced by someone - */ - else if ((m->flags & PG_REFERENCED) || pmap_ts_referenced(m)) { - val |= MINCORE_REFERENCED_OTHER; - vm_page_flag_set(m, PG_REFERENCED); + else { + /* + * Referenced by someone + */ + vm_page_lock_queues(); + if ((m->flags & PG_REFERENCED) || pmap_ts_referenced(m)) { + val |= MINCORE_REFERENCED_OTHER; + vm_page_flag_set(m, PG_REFERENCED); + } + vm_page_unlock_queues(); } } return val; From owner-p4-projects@FreeBSD.ORG Sun Mar 7 16:39:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDCC116A4D0; Sun, 7 Mar 2004 16:39: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 9FFD816A4CE for ; Sun, 7 Mar 2004 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 7AA1443D1F for ; Sun, 7 Mar 2004 16:39:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i280dCGe043705 for ; Sun, 7 Mar 2004 16:39:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i280dCMD043702 for perforce@freebsd.org; Sun, 7 Mar 2004 16:39:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 7 Mar 2004 16:39:12 -0800 (PST) Message-Id: <200403080039.i280dCMD043702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48386 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 Mar 2004 00:39:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=48386 Change 48386 by jmallett@jmallett_oingo on 2004/03/07 16:39:06 Catching up with boneheaded resolves. Affected files ... .. //depot/projects/mips/sys/mips/mips/pmap.c#30 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/pmap.c#30 (text+ko) ==== @@ -298,45 +298,6 @@ LIST_INSERT_HEAD(&allpmaps, kernel_pmap, pm_list); } -/* - * Perform a small allocation for UMA, used early in the boot process - * and possibly at other times. - */ -void * -uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) -{ - static vm_pindex_t color; - vm_page_t m; - int pflags; - void *va; - - *flags = UMA_SLAB_PRIV; - - if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) - pflags = VM_ALLOC_INTERRUPT; - else - pflags = VM_ALLOC_SYSTEM; - - if (wait & M_ZERO) - pflags |= VM_ALLOC_ZERO; - - for (;;) { - m = vm_page_alloc(NULL, color++, pflags | VM_ALLOC_NOOBJ); - if (m == NULL) { - if (wait & M_NOWAIT) - return (NULL); - else - VM_WAIT; - } else - break; - } - - va = (void *)MIPS_PHYS_TO_KSEG0(m->phys_addr); - if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) - bzero(va, PAGE_SIZE); - return (va); -} - void * uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { @@ -1202,37 +1163,8 @@ if (wired) pmap->pm_stats.wired_count++; -validate: - /* - * Now validate mapping with desired protection/wiring. - */ - newpte = pmap_phys_to_pte(pa) | pte_prot(pmap, prot) | PG_V | managed; - - if (managed) { - /* - * Set up referenced/modified emulation for the new - * mapping. Any old referenced/modified emulation - * results for the old mapping will have been recorded - * either in pmap_remove_pte() or above in the code - * which handles protection and/or wiring changes. - */ - newpte |= (PG_FOR | PG_FOW | PG_FOE); - } - - if (wired) - newpte |= PG_W; - - /* - * if the mapping or permission bits are different, we need - * to update the pte. - */ - if (origpte != newpte) { - *pte = newpte; - if (origpte) - pmap_invalidate_page(pmap, va); - if (prot & VM_PROT_EXECUTE) - alpha_pal_imb(); - } + wired = wired ? PG_W : 0; + tlb_enter(pmap, va, pa, PG_V | wired); } /* From owner-p4-projects@FreeBSD.ORG Sun Mar 7 18:00:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E73316A4D0; Sun, 7 Mar 2004 18:00: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 0687C16A4CE for ; Sun, 7 Mar 2004 18:00:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBCAC43D31 for ; Sun, 7 Mar 2004 18:00:58 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2820wGe068159 for ; Sun, 7 Mar 2004 18:00:58 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2820vo7068156 for perforce@freebsd.org; Sun, 7 Mar 2004 18:00:57 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 7 Mar 2004 18:00:57 -0800 (PST) Message-Id: <200403080200.i2820vo7068156@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 48394 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 Mar 2004 02:00:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=48394 Change 48394 by peter@peter_overcee on 2004/03/07 18:00:33 IFC @48391 Affected files ... .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#14 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#19 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#34 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#82 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#57 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#57 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#40 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#21 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#30 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#21 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#30 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.h#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#19 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#21 integrate .. //depot/projects/hammer/sys/vm/pmap.h#15 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#24 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#31 integrate .. //depot/projects/hammer/usr.bin/printf/printf.c#3 integrate Differences ... ==== //depot/projects/hammer/lib/libc/stdlib/malloc.c#14 (text+ko) ==== @@ -9,7 +9,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.86 2004/02/21 09:14:38 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.87 2004/03/07 20:41:27 phk Exp $"); /* * Defining MALLOC_EXTRA_SANITY will enable extra checks which are related @@ -198,9 +198,6 @@ #define INIT_MMAP() #endif -/* Set when initialization has been done */ -static unsigned malloc_started; - /* Number of free pages we cache */ static unsigned malloc_cache = 16; @@ -491,9 +488,6 @@ malloc_ninfo = malloc_pagesize / sizeof *page_dir; - /* Been here, done that */ - malloc_started++; - /* Recalculate the cache size in bytes, and make sure it's nonzero */ if (!malloc_cache) @@ -729,9 +723,6 @@ { void *result; - if (!malloc_started) - malloc_init(); - if (suicide) abort(); @@ -764,11 +755,6 @@ if (suicide) abort(); - if (!malloc_started) { - wrtwarning("malloc() has never been called\n"); - return (NULL); - } - index = ptr2index(ptr); if (index < malloc_pageshift) { @@ -1061,11 +1047,6 @@ if (ptr == NULL) return; - if (!malloc_started) { - wrtwarning("malloc() has never been called\n"); - return; - } - /* If we're already sinking, don't make matters any worse. */ if (suicide) return; @@ -1097,6 +1078,7 @@ void *r; int err = 0; static int malloc_active; /* Recusion flag for public interface. */ + static unsigned malloc_started; /* Set when initialization has been done */ /* * If a thread is inside our code with a functional lock held, and then @@ -1115,6 +1097,18 @@ return (NULL); } malloc_active = 1; + + if (!malloc_started) { + if (ptr != NULL) { + wrtwarning("malloc() has never been called\n"); + malloc_active = 0; + _MALLOC_UNLOCK(); + errno = EDOOFUS; + return (NULL); + } + malloc_init(); + malloc_started = 1; + } if (ptr == ZEROSIZEPTR) ptr = NULL; ==== //depot/projects/hammer/sys/alpha/alpha/pmap.c#19 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.139 2003/10/03 22:46:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.140 2004/03/07 21:06:46 alc Exp $"); #include #include @@ -1109,18 +1109,6 @@ mtx_lock_spin(&allpmaps_lock); LIST_INSERT_HEAD(&allpmaps, pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); -} - -/* - * Wire in kernel global address entries. To avoid a race condition - * between pmap initialization and pmap_growkernel, this procedure - * should be called after the vmspace is attached to the process - * but before this pmap is activated. - */ -void -pmap_pinit2(pmap) - struct pmap *pmap; -{ bcopy(PTlev1 + K1SEGLEV1I, pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE); } ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#34 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.7 2004/01/30 00:24:45 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.8 2004/03/08 00:15:29 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#82 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.604 2004/02/25 23:12:39 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.605 2004/03/08 00:16:52 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#57 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.234 2004/01/30 00:24:45 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.235 2004/03/08 00:25:03 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#57 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.452 2004/02/05 00:11:05 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.453 2004/03/07 21:06:47 alc Exp $"); /* * Manages physical address maps. @@ -1103,19 +1103,6 @@ } /* - * Wire in kernel global address entries. To avoid a race condition - * between pmap initialization and pmap_growkernel, this procedure - * should be called after the vmspace is attached to the process - * but before this pmap is activated. - */ -void -pmap_pinit2(pmap) - struct pmap *pmap; -{ - /* XXX: Remove this stub when no longer called */ -} - -/* * this routine is called if the page table page is not * mapped correctly. * ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#40 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.272 2004/01/29 00:05:03 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.273 2004/03/08 00:17:27 peter Exp $"); /* * AMD64 Trap and System call handling ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#21 (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.140 2004/03/05 09:19:59 le Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.141 2004/03/08 00:24:15 peter Exp $ */ /* @@ -763,6 +763,8 @@ u_int64_t rdr7(void); u_int64_t rdtsc(void); u_int read_rflags(void); +u_int rfs(void); +u_int rgs(void); void wbinvd(void); void write_rflags(u_int rf); void wrmsr(u_int msr, u_int64_t newval); ==== //depot/projects/hammer/sys/i386/i386/pmap.c#30 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.462 2004/02/01 20:14:00 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.463 2004/03/07 21:06:47 alc Exp $"); /* * Manages physical address maps. @@ -1147,19 +1147,6 @@ } /* - * Wire in kernel global address entries. To avoid a race condition - * between pmap initialization and pmap_growkernel, this procedure - * should be called after the vmspace is attached to the process - * but before this pmap is activated. - */ -void -pmap_pinit2(pmap) - struct pmap *pmap; -{ - /* XXX: Remove this stub when no longer called */ -} - -/* * this routine is called if the page table page is not * mapped correctly. */ ==== //depot/projects/hammer/sys/i386/i386/vm_machdep.c#21 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.225 2004/01/05 12:00:58 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.227 2004/03/08 01:55:34 peter Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" ==== //depot/projects/hammer/sys/ia64/ia64/pmap.c#22 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.126 2004/03/07 07:43:13 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.127 2004/03/07 21:06:47 alc Exp $"); #include #include @@ -735,17 +735,6 @@ bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } -/* - * Wire in kernel global address entries. To avoid a race condition - * between pmap initialization and pmap_growkernel, this procedure - * should be called after the vmspace is attached to the process - * but before this pmap is activated. - */ -void -pmap_pinit2(struct pmap *pmap) -{ -} - /*************************************************** * Pmap allocation/deallocation routines. ***************************************************/ ==== //depot/projects/hammer/sys/kern/kern_fork.c#30 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.219 2004/03/07 00:06:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.220 2004/03/08 00:32:34 peter Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" ==== //depot/projects/hammer/sys/netgraph/ng_iface.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ * * Author: Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_iface.c,v 1.28 2003/12/28 03:56:00 sam Exp $ + * $FreeBSD: src/sys/netgraph/ng_iface.c,v 1.29 2004/03/07 23:00:44 ru Exp $ * $Whistle: ng_iface.c,v 1.33 1999/11/01 09:24:51 julian Exp $ */ @@ -186,6 +186,13 @@ NULL, &ng_cisco_ipaddr_type }, + { + NGM_IFACE_COOKIE, + NGM_IFACE_GET_IFINDEX, + "getifindex", + NULL, + &ng_parse_uint32_type + }, { 0 } }; @@ -667,6 +674,15 @@ break; } + case NGM_IFACE_GET_IFINDEX: + NG_MKRESPONSE(resp, msg, sizeof(uint32_t), M_NOWAIT); + if (resp == NULL) { + error = ENOMEM; + break; + } + *((uint32_t *)resp->data) = priv->ifp->if_index; + break; + default: error = EINVAL; break; ==== //depot/projects/hammer/sys/netgraph/ng_iface.h#4 (text+ko) ==== @@ -36,7 +36,7 @@ * * Author: Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_iface.h,v 1.5 2003/11/11 12:30:37 ru Exp $ + * $FreeBSD: src/sys/netgraph/ng_iface.h,v 1.6 2004/03/07 23:00:44 ru Exp $ * $Whistle: ng_iface.h,v 1.5 1999/01/20 00:22:13 archie Exp $ */ @@ -69,6 +69,7 @@ NGM_IFACE_GET_IFNAME = 1, /* returns struct ng_iface_ifname */ NGM_IFACE_POINT2POINT, NGM_IFACE_BROADCAST, + NGM_IFACE_GET_IFINDEX, }; struct ng_iface_ifname { ==== //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#19 (text+ko) ==== @@ -91,7 +91,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.71 2004/03/02 06:49:21 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.72 2004/03/07 21:06:48 alc Exp $"); /* * Manages physical address maps. @@ -1443,12 +1443,6 @@ bzero(&pm->pm_stats, sizeof(pm->pm_stats)); } -void -pmap_pinit2(pmap_t pmap) -{ - /* XXX: Remove this stub when no longer called */ -} - /* * Set the physical protection on the specified range of this map as requested. */ ==== //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#21 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.126 2003/10/03 22:46:53 alc Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.127 2004/03/07 21:06:48 alc Exp $ */ /* @@ -1027,12 +1027,6 @@ bzero(&pm->pm_stats, sizeof(pm->pm_stats)); } -void -pmap_pinit2(pmap_t pmap) -{ - /* XXX: Remove this stub when no longer called */ -} - /* * Release any resources held by the given physical map. * Called when a pmap initialized by pmap_pinit is being released. ==== //depot/projects/hammer/sys/vm/pmap.h#15 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/pmap.h,v 1.65 2003/10/06 01:47:12 bms Exp $ + * $FreeBSD: src/sys/vm/pmap.h,v 1.66 2004/03/07 21:06:48 alc Exp $ */ /* @@ -120,7 +120,6 @@ void pmap_page_protect(vm_page_t m, vm_prot_t prot); void pmap_pinit(pmap_t); void pmap_pinit0(pmap_t); -void pmap_pinit2(pmap_t); void pmap_protect(pmap_t, vm_offset_t, vm_offset_t, vm_prot_t); void pmap_qenter(vm_offset_t, vm_page_t *, int); void pmap_qremove(vm_offset_t, int); ==== //depot/projects/hammer/sys/vm/vm_glue.c#24 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.191 2004/03/05 22:03:11 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.192 2004/03/07 21:06:48 alc Exp $"); #include "opt_vm.h" #include "opt_kstack_pages.h" @@ -675,9 +675,6 @@ if ((flags & RFMEM) == 0) { p2->p_vmspace = vmspace_fork(p1->p_vmspace); - - pmap_pinit2(vmspace_pmap(p2->p_vmspace)); - if (p1->p_vmspace->vm_shm) shmfork(p1, p2); } ==== //depot/projects/hammer/sys/vm/vm_map.c#31 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.329 2004/02/12 20:56:06 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.330 2004/03/07 21:06:48 alc Exp $"); #include #include @@ -2798,7 +2798,6 @@ * here, it is a good idea to keep this form for future mods. */ p->p_vmspace = newvmspace; - pmap_pinit2(vmspace_pmap(newvmspace)); if (p == curthread->td_proc) /* XXXKSE ? */ pmap_activate(curthread); vmspace_free(oldvmspace); @@ -2819,7 +2818,6 @@ return; newvmspace = vmspace_fork(oldvmspace); p->p_vmspace = newvmspace; - pmap_pinit2(vmspace_pmap(newvmspace)); if (p == curthread->td_proc) /* XXXKSE ? */ pmap_activate(curthread); vmspace_free(oldvmspace); ==== //depot/projects/hammer/usr.bin/printf/printf.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ static char const sccsid[] = "@(#)printf.c 8.1 (Berkeley) 7/20/93"; #endif static const char rcsid[] = - "$FreeBSD: src/usr.bin/printf/printf.c,v 1.26 2002/09/04 23:29:05 dwmalone Exp $"; + "$FreeBSD: src/usr.bin/printf/printf.c,v 1.27 2004/03/07 22:22:13 cperciva Exp $"; #endif /* not lint */ #include @@ -473,7 +473,7 @@ *dp = asciicode(); return (0); } - rval = 1; + rval = 0; errno = 0; *dp = strtod(*gargv, &ep); if (ep == *gargv) { From owner-p4-projects@FreeBSD.ORG Sun Mar 7 18:04:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A386516A4D0; Sun, 7 Mar 2004 18:04: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 7E93C16A4CE for ; Sun, 7 Mar 2004 18:04:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 620DB43D1F for ; Sun, 7 Mar 2004 18:04:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i28243Ge070869 for ; Sun, 7 Mar 2004 18:04:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i28242pT070866 for perforce@freebsd.org; Sun, 7 Mar 2004 18:04:02 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 7 Mar 2004 18:04:02 -0800 (PST) Message-Id: <200403080204.i28242pT070866@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 48395 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 Mar 2004 02:04:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=48395 Change 48395 by peter@peter_overcee on 2004/03/07 18:04:00 go go gadget indirect branch merge (-I -b i386_hammer) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#58 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#29 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#58 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#29 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Mar 7 18:06:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B89B816A4D1; Sun, 7 Mar 2004 18:06: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 9049E16A4CF for ; Sun, 7 Mar 2004 18:06:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 737F343D1D for ; Sun, 7 Mar 2004 18:06:06 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i28266Ge071025 for ; Sun, 7 Mar 2004 18:06:06 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i28266st071022 for perforce@freebsd.org; Sun, 7 Mar 2004 18:06:06 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 7 Mar 2004 18:06:06 -0800 (PST) Message-Id: <200403080206.i28266st071022@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 48396 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 Mar 2004 02:06:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=48396 Change 48396 by peter@peter_overcee on 2004/03/07 18:05:04 alas, dont mark kmem_free as safe. Affected files ... .. //depot/projects/hammer/sys/vm/vm_kern.c#16 edit Differences ... ==== //depot/projects/hammer/sys/vm/vm_kern.c#16 (text+ko) ==== @@ -229,8 +229,6 @@ * associated with that region. * * This routine may not block on kernel maps. - * - * MPSAFE (see vm_mmap()'s calls) */ void kmem_free(map, addr, size) From owner-p4-projects@FreeBSD.ORG Sun Mar 7 18:21:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6656616A4D0; Sun, 7 Mar 2004 18:21: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 40DBF16A4CE for ; Sun, 7 Mar 2004 18:21:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22E8A43D48 for ; Sun, 7 Mar 2004 18:21:26 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i282LPGe074137 for ; Sun, 7 Mar 2004 18:21:25 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i282LP95074131 for perforce@freebsd.org; Sun, 7 Mar 2004 18:21:25 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 7 Mar 2004 18:21:25 -0800 (PST) Message-Id: <200403080221.i282LP95074131@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 48398 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 Mar 2004 02:21:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=48398 Change 48398 by peter@peter_overcee on 2004/03/07 18:20:55 nuke before I accidently commit it. Affected files ... .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#22 edit Differences ... ==== //depot/projects/hammer/sys/i386/i386/vm_machdep.c#22 (text+ko) ==== @@ -320,8 +320,10 @@ * XXX do we need to move the TSS off the allocated pages * before freeing them? (not done here) */ + mtx_lock(&Giant); kmem_free(kernel_map, (vm_offset_t)pcb->pcb_ext, ctob(IOPAGES + 1)); + mtx_unlock(&Giant); pcb->pcb_ext = 0; } } From owner-p4-projects@FreeBSD.ORG Sun Mar 7 22:23:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AB1916A4D0; Sun, 7 Mar 2004 22:23: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 151D316A4CE for ; Sun, 7 Mar 2004 22:23:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0862B43D1D for ; Sun, 7 Mar 2004 22:23:36 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i286NZGe033116 for ; Sun, 7 Mar 2004 22:23:35 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i286NZHq033113 for perforce@freebsd.org; Sun, 7 Mar 2004 22:23:35 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 7 Mar 2004 22:23:35 -0800 (PST) Message-Id: <200403080623.i286NZHq033113@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48409 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 Mar 2004 06:23:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=48409 Change 48409 by jmallett@jmallett_oingo on 2004/03/07 22:22:44 Simpler, more shortsighted machine/asm.h. Affected files ... .. //depot/projects/mips/sys/mips/include/asm.h#13 edit .. //depot/projects/mips/sys/mips/mips/exception.S#16 edit .. //depot/projects/mips/sys/mips/sgimips/ip22_cache.S#3 edit Differences ... ==== //depot/projects/mips/sys/mips/include/asm.h#13 (text+ko) ==== @@ -1,6 +1,5 @@ -/* - * Copyright (C) 1995, 1996 Wolfgang Solfrank. - * Copyright (C) 1995, 1996 TooLs GmbH. +/*- + * Copyright (c) 2004 Juli Mallett * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,128 +10,40 @@ * 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 TooLs GmbH. - * 4. The name of TooLs GmbH may not be used to endorse or promote products - * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. * - * $NetBSD: asm.h,v 1.6.18.1 2000/07/25 08:37:14 kleink Exp $ - * $FreeBSD: src/sys/powerpc/include/asm.h,v 1.6 2002/09/23 07:27:45 peter Exp $ + * $P4: //depot/projects/mips/sys/mips/include/asm.h#13 $ */ -#ifndef _MACHINE_ASM_H_ +#ifndef _MACHINE_ASM_H_ #define _MACHINE_ASM_H_ #include -#ifdef PIC -#define PIC_PROLOGUE XXX -#define PIC_EPILOGUE XXX -#define PIC_PLT(x) x@plt -#ifdef __STDC__ -#define PIC_GOT(x) XXX -#else /* not __STDC__ */ -#define PIC_GOT(x) XXX -#endif /* __STDC__ */ -#else -#define PIC_PROLOGUE -#define PIC_EPILOGUE -#define PIC_PLT(x) x -#define PIC_GOT(x) x -#endif +#define GLOBAL(sym) \ + .globl sym; sym: -#ifdef GPROF -#error Need to define the profile prologue. -#else -#define _PROF_PROLOGUE -#endif +#define XLEAF(sym) \ + .globl sym; sym: -#define CNAME(csym) csym -#define HIDENAME(asmsym) __CONCAT(.,asmsym) +#define LEAF(sym) \ + .globl sym; .ent sym; sym: .frame sp, 0, ra -#define _GLOBAL(x) \ - .data; .align 2; .globl x; x: +#define ENTRY(sym) \ + .text; .globl sym; .ent sym; sym: -#define _ENTRY(x) \ - .text; .align 2; .globl x; .ent x; .type x,@function; x: +#define END(sym) \ + .end sym -#define _XLEAF(x) \ - .globl x; x: - -#define _LEAF(x) \ - .globl x; .ent x; x: ; .frame sp, 0, ra; - -#define _EXPORT(x) \ - .globl x; x: - -#define _END(x) \ - .end x - -#define _NESTED(x, fsize, retpc) \ - .globl x; .ent x; x:; .frame sp, fsize, retpc; - -#define GLOBAL(y) _GLOBAL(CNAME(y)) -#define ENTRY(y) _ENTRY(CNAME(y)); _PROF_PROLOGUE -#define XLEAF(y) _XLEAF(CNAME(y)) -#define LEAF(y) _LEAF(CNAME(y)); _PROF_PROLOGUE -#define LEAF_NOPROFILE(y) _LEAF(CNAME(y)) -#define EXPORT(y) _EXPORT(CNAME(y)) -#define END(y) _END(CNAME(y)) -#define NESTED(y,f,r) _NESTED(CNAME(y), f, r); _PROF_PROLOGUE -#define NESTED_NOPROFILE(y,f,r) _NESTED(CNAME(y), f, r) - -#define ASMSTR .asciz - -#define RCSID(x) .text; .asciz x - -#if !defined(lint) && !defined(STRIP_FBSDID) -#define __FBSDID(s) .ident s -#else -#define __FBSDID(s) /* nothing */ -#endif /* not lint and not STRIP_FBSDID */ - -#define WEAK_ALIAS(alias,sym) \ - .weak alias; \ - alias = sym - -#ifdef __STDC__ -#define WARN_REFERENCES(_sym,_msg) \ - .section .gnu.warning. ## _sym ; .ascii _msg ; .text -#else -#define WARN_REFERENCES(_sym,_msg) \ - .section .gnu.warning./**/_sym ; .ascii _msg ; .text -#endif /* __STDC__ */ - -/* - * Macros to panic and printf from assembly language. - */ -#define PANIC(msg) \ - la a0, 9f; \ - jal panic; \ - nop; \ - MSG(msg) - -#define PRINTF(msg) \ - la a0, 9f; \ - jal printf; \ - nop; \ - MSG(msg) - -#define MSG(msg) \ - .rdata; \ -9: .asciiz msg; \ - .text - -#endif /* !_MACHINE_ASM_H_ */ +#endif /* _MACHINE_ASM_H_ */ ==== //depot/projects/mips/sys/mips/mips/exception.S#16 (text+ko) ==== @@ -23,7 +23,7 @@ * Mark the end of a vector. */ #define _VEND(x) \ - EXPORT(x ## End); \ + GLOBAL(x ## End); \ END(x); #define VEND(x) \ ==== //depot/projects/mips/sys/mips/sgimips/ip22_cache.S#3 (text+ko) ==== @@ -72,7 +72,7 @@ * * Write-back and invalidate the cache lines [a0..a1]. */ -LEAF_NOPROFILE(ip22_sdcache_do_wbinv) +LEAF(ip22_sdcache_do_wbinv) PROLOGUE /* @@ -97,7 +97,7 @@ nop END(ip22_sdcache_do_wbinv) -LEAF_NOPROFILE(ip22_sdcache_enable) +LEAF(ip22_sdcache_enable) PROLOGUE li a0, 0x1 @@ -113,7 +113,7 @@ nop END(ip22_sdcache_enable) -LEAF_NOPROFILE(ip22_sdcache_disable) +LEAF(ip22_sdcache_disable) PROLOGUE li a0, 0x1 From owner-p4-projects@FreeBSD.ORG Sun Mar 7 22:49:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCDED16A4D0; Sun, 7 Mar 2004 22:49: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 8F15D16A4CE for ; Sun, 7 Mar 2004 22:49:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 82A3343D2D for ; Sun, 7 Mar 2004 22:49:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i286n7Ge037586 for ; Sun, 7 Mar 2004 22:49:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i286n7gn037583 for perforce@freebsd.org; Sun, 7 Mar 2004 22:49:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 7 Mar 2004 22:49:07 -0800 (PST) Message-Id: <200403080649.i286n7gn037583@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48410 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 Mar 2004 06:49:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=48410 Change 48410 by jmallett@jmallett_oingo on 2004/03/07 22:48:18 "Consistency is all I ask." Affected files ... .. //depot/projects/mips/sys/mips/include/db_machdep.h#8 edit .. //depot/projects/mips/sys/mips/include/trap.h#4 edit .. //depot/projects/mips/sys/mips/mips/db_interface.c#14 edit .. //depot/projects/mips/sys/mips/mips/trap.c#16 edit Differences ... ==== //depot/projects/mips/sys/mips/include/db_machdep.h#8 (text+ko) ==== @@ -68,7 +68,7 @@ #define BKPT_SIZE (4) /* size of breakpoint inst */ #define BKPT_SET(inst) (BKPT_INST) -#define IS_BREAKPOINT_TRAP(type, code) ((type) == T_BREAK) +#define IS_BREAKPOINT_TRAP(type, code) ((type) == TrBp) #define IS_WATCHPOINT_TRAP(type, code) (0) /* XXX mips3 watchpoint */ /* ==== //depot/projects/mips/sys/mips/include/trap.h#4 (text+ko) ==== @@ -1,13 +1,5 @@ -/* $NetBSD: trap.h,v 1.13 2000/09/15 06:50:46 jeffs Exp $ */ - -/* - * Copyright (c) 1988 University of Utah. - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * the Systems Programming Group of the University of Utah Computer - * Science Department and Ralph Campbell. +/*- + * Copyright (c) 2003-2004 Juli Mallett. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -17,18 +9,11 @@ * 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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS 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) @@ -37,45 +22,34 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: Utah Hdr: trap.h 1.1 90/07/09 - * - * @(#)trap.h 8.1 (Berkeley) 6/10/93 + * $FreeBSD$ */ #ifndef _MACHINE_TRAP_H_ #define _MACHINE_TRAP_H_ -/* - * Trap codes - * also known in trap.c for name strings - */ +#define TrInt 0 +#define TrMod 1 +#define TrTLBL 2 +#define TrTLBS 3 +#define TrAdEL 4 +#define TrAdES 5 +#define TrIBE 6 +#define TrDBE 7 +#define TrSys 8 +#define TrBp 9 +#define TrRI 10 +#define TrCpU 11 +#define TrOv 12 +#define TrTr 13 +#define TrVCEI 14 +#define TrFPE 15 +/* 16 - 22 */ +#define TrWATCH 23 +/* 24 - 30 */ +#define TrVCED 31 -#define T_INT 0 /* Interrupt pending */ -#define T_TLB_MOD 1 /* TLB modified fault */ -#define T_TLB_LD_MISS 2 /* TLB miss on load or ifetch */ -#define T_TLB_ST_MISS 3 /* TLB miss on a store */ -#define T_ADDR_ERR_LD 4 /* Address error on a load or ifetch */ -#define T_ADDR_ERR_ST 5 /* Address error on a store */ -#define T_BUS_ERR_IFETCH 6 /* Bus error on an ifetch */ -#define T_BUS_ERR_LD_ST 7 /* Bus error on a load or store */ -#define T_SYSCALL 8 /* System call */ -#define T_BREAK 9 /* Breakpoint */ -#define T_RES_INST 10 /* Reserved instruction exception */ -#define T_COP_UNUSABLE 11 /* Coprocessor unusable */ -#define T_OVFLOW 12 /* Arithmetic overflow */ - -/* - * Trap definitions added for r4000 port. - */ -#define T_TRAP 13 /* Trap instruction */ -#define T_VCEI 14 /* Virtual coherency exception */ -#define T_FPE 15 /* Floating point exception */ -#define T_WATCH 23 /* Watch address reference */ -#define T_VCED 31 /* Virtual coherency data */ - -#define T_USER 0x20 /* user-mode flag or'ed with type */ - -#ifndef LOCORE /* XXX */ +#ifndef LOCORE /* XXX */ void platform_trap_enter(void); void platform_trap_exit(void); #endif ==== //depot/projects/mips/sys/mips/mips/db_interface.c#14 (text+ko) ==== @@ -156,12 +156,21 @@ db_active++; cndbctl(TRUE); +#if notyet db_trap(type & ~T_USER, 0 /*code*/); +#else + db_trap(type, 0 /*code*/); +#endif cndbctl(FALSE); db_active--; +#if notyet if (type & T_USER) *(struct frame *)curthread->td_md.md_regs = *f; +#else + if (0) + return (1); +#endif else { /* Synthetic full scale register context when trap happens */ kdbaux[0] = f->f_regs[S0]; @@ -187,8 +196,13 @@ /* Should switch to kdb`s own stack here. */ +#if notyet if (type & T_USER) *f = *(struct frame *)curthread->td_md.md_regs; +#else + if (0) + return; +#endif else { /* Synthetic full scale register context when trap happens */ f->f_regs[AST] = tfp->tf_regs[TF_AST]; ==== //depot/projects/mips/sys/mips/mips/trap.c#16 (text+ko) ==== @@ -103,7 +103,7 @@ * Handle that which we can. */ switch (code) { - case T_TLB_MOD: + case TrMod: /* XXX Kernel only. */ tlb_modified(badvaddr); platform_trap_exit(); @@ -143,7 +143,7 @@ } switch (code) { - case T_BREAK: + case TrBp: #if DDB default: kdb_trap(code, tf); From owner-p4-projects@FreeBSD.ORG Sun Mar 7 22:56:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB48A16A4D0; Sun, 7 Mar 2004 22:56: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 7A3EF16A4CE for ; Sun, 7 Mar 2004 22:56:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68D7A43D41 for ; Sun, 7 Mar 2004 22:56:17 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i286uHGe040106 for ; Sun, 7 Mar 2004 22:56:17 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i286uGia040103 for perforce@freebsd.org; Sun, 7 Mar 2004 22:56:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sun, 7 Mar 2004 22:56:16 -0800 (PST) Message-Id: <200403080656.i286uGia040103@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48411 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 Mar 2004 06:56:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=48411 Change 48411 by jmallett@jmallett_oingo on 2004/03/07 22:55:16 Get types right. Affected files ... .. //depot/projects/mips/sys/mips/mips/cache_r4k.c#3 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/cache_r4k.c#3 (text+ko) ==== @@ -60,8 +60,8 @@ void r4k_icache_sync_all_16(void) { - vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); - vm_paddr_t eva = va + mips_picache_size; + vm_offset_t va = MIPS_PHYS_TO_KSEG0(0); + vm_offset_t eva = va + mips_picache_size; mips_dcache_wbinv_all(); @@ -74,9 +74,9 @@ } void -r4k_icache_sync_range_16(vm_paddr_t va, vm_size_t size) +r4k_icache_sync_range_16(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -96,9 +96,9 @@ } void -r4k_icache_sync_range_index_16(vm_paddr_t va, vm_size_t size) +r4k_icache_sync_range_index_16(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva, orig_va; + vm_offset_t eva, orig_va; orig_va = va; @@ -134,8 +134,8 @@ void r4k_pdcache_wbinv_all_16(void) { - vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); - vm_paddr_t eva = va + mips_pdcache_size; + vm_offset_t va = MIPS_PHYS_TO_KSEG0(0); + vm_offset_t eva = va + mips_pdcache_size; while (va < eva) { cache_r4k_op_32lines_16(va, @@ -145,9 +145,9 @@ } void -r4k_pdcache_wbinv_range_16(vm_paddr_t va, vm_size_t size) +r4k_pdcache_wbinv_range_16(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -164,9 +164,9 @@ } void -r4k_pdcache_wbinv_range_index_16(vm_paddr_t va, vm_size_t size) +r4k_pdcache_wbinv_range_index_16(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva; + vm_offset_t eva; /* * Since we're doing Index ops, we expect to not be able @@ -192,9 +192,9 @@ } void -r4k_pdcache_inv_range_16(vm_paddr_t va, vm_size_t size) +r4k_pdcache_inv_range_16(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -210,9 +210,9 @@ } void -r4k_pdcache_wb_range_16(vm_paddr_t va, vm_size_t size) +r4k_pdcache_wb_range_16(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -236,8 +236,8 @@ void r4k_icache_sync_all_32(void) { - vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); - vm_paddr_t eva = va + mips_picache_size; + vm_offset_t va = MIPS_PHYS_TO_KSEG0(0); + vm_offset_t eva = va + mips_picache_size; mips_dcache_wbinv_all(); @@ -250,9 +250,9 @@ } void -r4k_icache_sync_range_32(vm_paddr_t va, vm_size_t size) +r4k_icache_sync_range_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -272,9 +272,9 @@ } void -r4k_icache_sync_range_index_32(vm_paddr_t va, vm_size_t size) +r4k_icache_sync_range_index_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva; + vm_offset_t eva; eva = round_line(va + size); va = trunc_line(va); @@ -308,8 +308,8 @@ void r4k_pdcache_wbinv_all_32(void) { - vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); - vm_paddr_t eva = va + mips_pdcache_size; + vm_offset_t va = MIPS_PHYS_TO_KSEG0(0); + vm_offset_t eva = va + mips_pdcache_size; while (va < eva) { cache_r4k_op_32lines_32(va, @@ -319,9 +319,9 @@ } void -r4k_pdcache_wbinv_range_32(vm_paddr_t va, vm_size_t size) +r4k_pdcache_wbinv_range_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -338,9 +338,9 @@ } void -r4k_pdcache_wbinv_range_index_32(vm_paddr_t va, vm_size_t size) +r4k_pdcache_wbinv_range_index_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva; + vm_offset_t eva; /* * Since we're doing Index ops, we expect to not be able @@ -366,9 +366,9 @@ } void -r4k_pdcache_inv_range_32(vm_paddr_t va, vm_size_t size) +r4k_pdcache_inv_range_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -384,9 +384,9 @@ } void -r4k_pdcache_wb_range_32(vm_paddr_t va, vm_size_t size) +r4k_pdcache_wb_range_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -404,8 +404,8 @@ void r4k_sdcache_wbinv_all_32(void) { - vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); - vm_paddr_t eva = va + mips_sdcache_size; + vm_offset_t va = MIPS_PHYS_TO_KSEG0(0); + vm_offset_t eva = va + mips_sdcache_size; while (va < eva) { cache_r4k_op_32lines_32(va, @@ -415,9 +415,9 @@ } void -r4k_sdcache_wbinv_range_32(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wbinv_range_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -434,9 +434,9 @@ } void -r4k_sdcache_wbinv_range_index_32(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wbinv_range_index_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva; + vm_offset_t eva; /* * Since we're doing Index ops, we expect to not be able @@ -462,9 +462,9 @@ } void -r4k_sdcache_inv_range_32(vm_paddr_t va, vm_size_t size) +r4k_sdcache_inv_range_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -480,9 +480,9 @@ } void -r4k_sdcache_wb_range_32(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wb_range_32(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -506,8 +506,8 @@ void r4k_sdcache_wbinv_all_128(void) { - vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); - vm_paddr_t eva = va + mips_sdcache_size; + vm_offset_t va = MIPS_PHYS_TO_KSEG0(0); + vm_offset_t eva = va + mips_sdcache_size; while (va < eva) { cache_r4k_op_32lines_128(va, @@ -517,9 +517,9 @@ } void -r4k_sdcache_wbinv_range_128(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wbinv_range_128(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -536,9 +536,9 @@ } void -r4k_sdcache_wbinv_range_index_128(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wbinv_range_index_128(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva; + vm_offset_t eva; /* * Since we're doing Index ops, we expect to not be able @@ -564,9 +564,9 @@ } void -r4k_sdcache_inv_range_128(vm_paddr_t va, vm_size_t size) +r4k_sdcache_inv_range_128(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -582,9 +582,9 @@ } void -r4k_sdcache_wb_range_128(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wb_range_128(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); va = trunc_line(va); @@ -608,8 +608,8 @@ void r4k_sdcache_wbinv_all_generic(void) { - vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); - vm_paddr_t eva = va + mips_sdcache_size; + vm_offset_t va = MIPS_PHYS_TO_KSEG0(0); + vm_offset_t eva = va + mips_sdcache_size; int line_size = mips_sdcache_line_size; while (va < eva) { @@ -619,9 +619,9 @@ } void -r4k_sdcache_wbinv_range_generic(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wbinv_range_generic(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); int line_size = mips_sdcache_line_size; va = trunc_line(va); @@ -633,9 +633,9 @@ } void -r4k_sdcache_wbinv_range_index_generic(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wbinv_range_index_generic(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva; + vm_offset_t eva; int line_size = mips_sdcache_line_size; /* @@ -656,9 +656,9 @@ } void -r4k_sdcache_inv_range_generic(vm_paddr_t va, vm_size_t size) +r4k_sdcache_inv_range_generic(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); int line_size = mips_sdcache_line_size; va = trunc_line(va); @@ -670,9 +670,9 @@ } void -r4k_sdcache_wb_range_generic(vm_paddr_t va, vm_size_t size) +r4k_sdcache_wb_range_generic(vm_offset_t va, vm_size_t size) { - vm_paddr_t eva = round_line(va + size); + vm_offset_t eva = round_line(va + size); int line_size = mips_sdcache_line_size; va = trunc_line(va); From owner-p4-projects@FreeBSD.ORG Mon Mar 8 12:05:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10C3516A4D0; Mon, 8 Mar 2004 12:05: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 C731016A4CE for ; Mon, 8 Mar 2004 12:05:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFF5743D2D for ; Mon, 8 Mar 2004 12:05:45 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i28K5jGe035229 for ; Mon, 8 Mar 2004 12:05:45 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i28K5jn4035226 for perforce@freebsd.org; Mon, 8 Mar 2004 12:05:45 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 8 Mar 2004 12:05:45 -0800 (PST) Message-Id: <200403082005.i28K5jn4035226@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 48458 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 Mar 2004 20:05:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=48458 Change 48458 by peter@peter_overcee on 2004/03/08 12:05:00 reduce Giant coverage for non-mpsafe syscalls. This should probably be done for all platforms. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/trap.c#41 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#41 (text+ko) ==== @@ -758,13 +758,6 @@ ktrsyscall(code, narg, argp); #endif - /* - * Try to run the syscall without Giant if the syscall - * is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); - if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = frame.tf_rdx; @@ -773,7 +766,12 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - error = (*callp->sy_call)(td, argp); + if ((callp->sy_narg & SYF_MPSAFE) == 0) { + mtx_lock(&Giant); + error = (*callp->sy_call)(td, argp); + mtx_unlock(&Giant); + } else + error = (*callp->sy_call)(td, argp); } switch (error) { @@ -811,12 +809,6 @@ } /* - * Release Giant if we previously set it. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Traced syscall. */ if (orig_tf_rflags & PSL_T) { From owner-p4-projects@FreeBSD.ORG Mon Mar 8 21:47:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A27C16A4D0; Mon, 8 Mar 2004 21:47: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 39E0A16A4CE for ; Mon, 8 Mar 2004 21:47:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28BE543D2D for ; Mon, 8 Mar 2004 21:47:18 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i295lIGe080648 for ; Mon, 8 Mar 2004 21:47:18 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i295lHiJ080645 for perforce@freebsd.org; Mon, 8 Mar 2004 21:47:17 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Mon, 8 Mar 2004 21:47:17 -0800 (PST) Message-Id: <200403090547.i295lHiJ080645@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 48482 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 Mar 2004 05:47:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=48482 Change 48482 by marcel@marcel_nfs on 2004/03/08 21:46:39 IFC @48480 Affected files ... .. //depot/projects/gdb/UPDATING#4 integrate .. //depot/projects/gdb/bin/dd/Makefile#3 integrate .. //depot/projects/gdb/contrib/pf/pfctl/parse.y#2 integrate .. //depot/projects/gdb/contrib/pf/pfctl/pfctl_altq.c#2 integrate .. //depot/projects/gdb/etc/Makefile#3 integrate .. //depot/projects/gdb/etc/group#2 integrate .. //depot/projects/gdb/etc/inetd.conf#2 integrate .. //depot/projects/gdb/etc/master.passwd#2 integrate .. //depot/projects/gdb/etc/pf.conf#1 branch .. //depot/projects/gdb/etc/pf.os#1 branch .. //depot/projects/gdb/etc/protocols#2 integrate .. //depot/projects/gdb/etc/rc#3 integrate .. //depot/projects/gdb/etc/rc.d/abi#2 integrate .. //depot/projects/gdb/etc/rc.d/accounting#4 integrate .. //depot/projects/gdb/etc/rc.d/addswap#2 integrate .. //depot/projects/gdb/etc/rc.d/adjkerntz#2 integrate .. //depot/projects/gdb/etc/rc.d/amd#4 integrate .. //depot/projects/gdb/etc/rc.d/apm#2 integrate .. //depot/projects/gdb/etc/rc.d/apmd#3 integrate .. //depot/projects/gdb/etc/rc.d/archdep#2 integrate .. //depot/projects/gdb/etc/rc.d/atm1#2 integrate .. //depot/projects/gdb/etc/rc.d/atm2#2 integrate .. //depot/projects/gdb/etc/rc.d/atm3#2 integrate .. //depot/projects/gdb/etc/rc.d/bgfsck#2 integrate .. //depot/projects/gdb/etc/rc.d/bootparams#3 integrate .. //depot/projects/gdb/etc/rc.d/ccd#3 integrate .. //depot/projects/gdb/etc/rc.d/devd#2 integrate .. //depot/projects/gdb/etc/rc.d/devfs#2 integrate .. //depot/projects/gdb/etc/rc.d/dhclient#4 integrate .. //depot/projects/gdb/etc/rc.d/diskless#2 integrate .. //depot/projects/gdb/etc/rc.d/dmesg#2 integrate .. //depot/projects/gdb/etc/rc.d/dumpon#3 integrate .. //depot/projects/gdb/etc/rc.d/fsck#3 integrate .. //depot/projects/gdb/etc/rc.d/gbde#3 integrate .. //depot/projects/gdb/etc/rc.d/gbde_swap#2 integrate .. //depot/projects/gdb/etc/rc.d/ike#2 integrate .. //depot/projects/gdb/etc/rc.d/initdiskless#2 integrate .. //depot/projects/gdb/etc/rc.d/initrandom#2 integrate .. //depot/projects/gdb/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/gdb/etc/rc.d/ip6fw#3 integrate .. //depot/projects/gdb/etc/rc.d/ipfilter#4 integrate .. //depot/projects/gdb/etc/rc.d/ipfs#3 integrate .. //depot/projects/gdb/etc/rc.d/ipfw#2 integrate .. //depot/projects/gdb/etc/rc.d/ipmon#3 integrate .. //depot/projects/gdb/etc/rc.d/ipnat#3 integrate .. //depot/projects/gdb/etc/rc.d/ipsec#4 integrate .. //depot/projects/gdb/etc/rc.d/ipxrouted#2 integrate .. //depot/projects/gdb/etc/rc.d/isdnd#3 integrate .. //depot/projects/gdb/etc/rc.d/jail#3 integrate .. //depot/projects/gdb/etc/rc.d/kldxref#2 integrate .. //depot/projects/gdb/etc/rc.d/lomac#2 integrate .. //depot/projects/gdb/etc/rc.d/mountcritlocal#3 integrate .. //depot/projects/gdb/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/gdb/etc/rc.d/mountd#4 integrate .. //depot/projects/gdb/etc/rc.d/moused#3 integrate .. //depot/projects/gdb/etc/rc.d/mroute6d#2 integrate .. //depot/projects/gdb/etc/rc.d/mrouted#3 integrate .. //depot/projects/gdb/etc/rc.d/netif#3 integrate .. //depot/projects/gdb/etc/rc.d/netoptions#2 integrate .. //depot/projects/gdb/etc/rc.d/network_ipv6#2 integrate .. //depot/projects/gdb/etc/rc.d/nfsclient#2 integrate .. //depot/projects/gdb/etc/rc.d/nfsd#3 integrate .. //depot/projects/gdb/etc/rc.d/nfslocking#4 integrate .. //depot/projects/gdb/etc/rc.d/nfsserver#2 integrate .. //depot/projects/gdb/etc/rc.d/ntpd#3 integrate .. //depot/projects/gdb/etc/rc.d/ntpdate#3 integrate .. //depot/projects/gdb/etc/rc.d/pccard#2 integrate .. //depot/projects/gdb/etc/rc.d/pcvt#2 integrate .. //depot/projects/gdb/etc/rc.d/power_profile#2 integrate .. //depot/projects/gdb/etc/rc.d/ppp-user#2 integrate .. //depot/projects/gdb/etc/rc.d/pppoed#2 integrate .. //depot/projects/gdb/etc/rc.d/quota#2 integrate .. //depot/projects/gdb/etc/rc.d/random#3 integrate .. //depot/projects/gdb/etc/rc.d/rarpd#3 integrate .. //depot/projects/gdb/etc/rc.d/root#3 integrate .. //depot/projects/gdb/etc/rc.d/route6d#3 integrate .. //depot/projects/gdb/etc/rc.d/routed#4 integrate .. //depot/projects/gdb/etc/rc.d/routing#2 integrate .. //depot/projects/gdb/etc/rc.d/rtadvd#3 integrate .. //depot/projects/gdb/etc/rc.d/savecore#3 integrate .. //depot/projects/gdb/etc/rc.d/serial#2 integrate .. //depot/projects/gdb/etc/rc.d/sppp#2 integrate .. //depot/projects/gdb/etc/rc.d/swap1#3 integrate .. //depot/projects/gdb/etc/rc.d/syscons#2 integrate .. //depot/projects/gdb/etc/rc.d/timed#3 integrate .. //depot/projects/gdb/etc/rc.d/usbd#2 integrate .. //depot/projects/gdb/etc/rc.d/vinum#2 integrate .. //depot/projects/gdb/etc/rc.d/watchdogd#2 integrate .. //depot/projects/gdb/lib/libc/stdio/_flock_stub.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/local.h#2 integrate .. //depot/projects/gdb/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/gdb/lib/libgeom/geom_xml2tree.c#2 integrate .. //depot/projects/gdb/libexec/Makefile#3 integrate .. //depot/projects/gdb/sbin/Makefile#4 integrate .. //depot/projects/gdb/share/examples/etc/make.conf#3 integrate .. //depot/projects/gdb/share/man/man4/Makefile#4 integrate .. //depot/projects/gdb/share/man/man4/ng_atmllc.4#1 branch .. //depot/projects/gdb/share/man/man9/pmap_pinit.9#2 integrate .. //depot/projects/gdb/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/gdb/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/gdb/sys/amd64/include/cpufunc.h#4 integrate .. //depot/projects/gdb/sys/boot/efi/libefi/efi_console.c#2 integrate .. //depot/projects/gdb/sys/conf/NOTES#4 integrate .. //depot/projects/gdb/sys/conf/files#4 integrate .. //depot/projects/gdb/sys/conf/options#4 integrate .. //depot/projects/gdb/sys/i386/i386/elan-mmcr.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/gdb/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/gdb/sys/kern/kern_fork.c#4 integrate .. //depot/projects/gdb/sys/kern/kern_synch.c#4 integrate .. //depot/projects/gdb/sys/kern/subr_smp.c#3 integrate .. //depot/projects/gdb/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/gdb/sys/modules/Makefile#4 integrate .. //depot/projects/gdb/sys/modules/netgraph/atmllc/Makefile#1 branch .. //depot/projects/gdb/sys/netgraph/ng_atmllc.c#1 branch .. //depot/projects/gdb/sys/netgraph/ng_atmllc.h#1 branch .. //depot/projects/gdb/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_iface.h#2 integrate .. //depot/projects/gdb/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/gdb/sys/netinet/pim.h#2 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/pmap.c#4 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/gdb/sys/sys/param.h#4 integrate .. //depot/projects/gdb/sys/sys/pcpu.h#2 integrate .. //depot/projects/gdb/sys/vm/pmap.h#2 integrate .. //depot/projects/gdb/sys/vm/vm_glue.c#4 integrate .. //depot/projects/gdb/sys/vm/vm_map.c#3 integrate .. //depot/projects/gdb/sys/vm/vm_object.c#4 integrate .. //depot/projects/gdb/usr.bin/mail/mail.1#3 integrate .. //depot/projects/gdb/usr.bin/printf/printf.c#2 integrate .. //depot/projects/gdb/usr.sbin/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/ac/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/ac/ac.c#3 integrate .. //depot/projects/gdb/usr.sbin/pw/edgroup.c#2 integrate .. //depot/projects/gdb/usr.sbin/pw/fileupd.c#2 integrate Differences ... ==== //depot/projects/gdb/UPDATING#4 (text+ko) ==== @@ -17,6 +17,17 @@ developers choose to disable these features on build machines to maximize performance. +20040308: + The packet filter (pf) is now installed with the base system. Make + sure to run mergemaster -p before installworld to create required + user accounts. If you do not want to build pf with your system you + can use the NO_PF knob in make.conf. + Also note that pf requires "options PFIL_HOOKS" in the kernel. The + pf system consists of the following three devices: + device pf # required + device pflog # optional + device pfsync # optional + 20040303: If you are having trouble with the libc_r -> libpthread transition (see the 20040130 entry), place the following lines at the top of @@ -1530,4 +1541,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.297 2004/03/03 09:17:06 des Exp $ +$FreeBSD: src/UPDATING,v 1.298 2004/03/08 22:26:46 mlaier Exp $ ==== //depot/projects/gdb/bin/dd/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/dd/Makefile,v 1.16 2004/03/06 06:54:58 ache Exp $ +# $FreeBSD: src/bin/dd/Makefile,v 1.17 2004/03/08 18:09:33 ache Exp $ PROG= dd SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c @@ -8,7 +8,6 @@ .include -CLEANFILES+= a.out # # Test the character conversion functions. We have to be explicit about # which LC_LANG we use because the definition of upper and lower case @@ -24,3 +23,4 @@ /usr/bin/env -i LC_CTYPE=en_US.US-ASCII hexdump -C | \ diff -IFreeBSD - ${.CURDIR}/ref.${conv} .endfor + @rm -f a.out ==== //depot/projects/gdb/contrib/pf/pfctl/parse.y#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.2 2004/02/28 18:41:43 mlaier Exp $ */ +/* $FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.3 2004/03/08 15:19:55 mlaier Exp $ */ /* $OpenBSD: parse.y,v 1.415 2003/09/01 15:07:40 henning Exp $ */ /* @@ -2737,7 +2737,7 @@ memcpy(&r.rpool.key, $8.key, sizeof(struct pf_poolhashkey)); - if ($9 != NULL) { + if ($9 != 0) { if (r.action != PF_NAT) { yyerror("the 'static-port' option is " "only valid with nat rules"); ==== //depot/projects/gdb/contrib/pf/pfctl/pfctl_altq.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ +/* $FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.3 2004/03/08 15:19:55 mlaier Exp $ */ /* $OpenBSD: pfctl_altq.c,v 1.77 2003/08/22 21:50:34 david Exp $ */ /* @@ -165,7 +165,7 @@ print_altq(const struct pf_altq *a, unsigned level, struct node_queue_bw *bw, struct node_queue_opt *qopts) { - if (a->qname[0] != NULL) { + if (a->qname[0] != '\0') { print_queue(a, level, bw, 0, qopts); return; } ==== //depot/projects/gdb/etc/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.324 2004/01/22 08:18:37 ru Exp $ +# $FreeBSD: src/etc/Makefile,v 1.325 2004/03/08 22:03:27 mlaier Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -11,7 +11,7 @@ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ - phones profile protocols \ + pf.conf pf.os phones profile protocols \ rc rc.firewall rc.firewall6 rc.sendmail rc.shutdown \ rc.subr remote rpc services \ shells sysctl.conf syslog.conf usbd.conf \ ==== //depot/projects/gdb/etc/group#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/group,v 1.28 2003/04/27 05:49:53 imp Exp $ +# $FreeBSD: src/etc/group,v 1.29 2004/03/08 22:03:27 mlaier Exp $ # wheel:*:0:root daemon:*:1: @@ -17,6 +17,8 @@ mailnull:*:26: guest:*:31: bind:*:53: +proxy:*:62 +authpf:*:63 uucp:*:66: dialer:*:68: network:*:69: ==== //depot/projects/gdb/etc/inetd.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.63 2003/06/09 21:04:30 markm Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.65 2004/03/08 23:18:50 ale Exp $ # # Internet server configuration database # @@ -117,3 +117,9 @@ #netbios-ssn stream tcp nowait root /usr/local/sbin/smbd smbd #netbios-ns dgram udp wait root /usr/local/sbin/nmbd nmbd #swat stream tcp nowait/400 root /usr/local/sbin/swat swat +# +# Enable the following entry to enable ftp-proxy to NAT ftp sessions with pf +# N.B.: inetd binds to * in the default installation so you should add +# an appropriate block rule to your pf.conf +# +#ftp-proxy stream tcp nowait root /usr/local/libexec/ftp-proxy ftp-proxy ==== //depot/projects/gdb/etc/master.passwd#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/master.passwd,v 1.34 2003/04/27 05:45:29 imp Exp $ +# $FreeBSD: src/etc/master.passwd,v 1.35 2004/03/08 22:03:27 mlaier Exp $ # root::0:0::0:0:Charlie &:/root:/bin/csh toor:*:0:0::0:0:Bourne-again Superuser:/root: @@ -14,6 +14,7 @@ smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/sbin/nologin mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/sbin/nologin bind:*:53:53::0:0:Bind Sandbox:/:/sbin/nologin +proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/sbin/nologin uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico pop:*:68:6::0:0:Post Office Owner:/nonexistent:/sbin/nologin www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/sbin/nologin ==== //depot/projects/gdb/etc/protocols#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # Internet protocols # -# $FreeBSD: src/etc/protocols,v 1.18 2002/12/13 09:18:09 fenner Exp $ +# $FreeBSD: src/etc/protocols,v 1.19 2004/03/08 22:03:27 mlaier Exp $ # from: @(#)protocols 5.1 (Berkeley) 4/17/89 # # See also http://www.iana.org/assignments/protocol-numbers @@ -65,7 +65,7 @@ mobile 55 MOBILE # IP Mobility tlsp 56 TLSP # Transport Layer Security Protocol skip 57 SKIP # SKIP -ipv6-icmp 58 IPV6-ICMP # ICMP for IPv6 +ipv6-icmp 58 IPV6-ICMP icmp6 # ICMP for IPv6 ipv6-nonxt 59 IPV6-NONXT # no next header for ipv6 ipv6-opts 60 IPV6-OPTS # destination options for ipv6 # 61 # any host internal protocol ==== //depot/projects/gdb/etc/rc#3 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.330 2004/02/27 10:44:33 mtm Exp $ +# $FreeBSD: src/etc/rc,v 1.331 2004/03/08 12:02:07 pjd Exp $ # # System startup script run by init on autoboot @@ -66,9 +66,9 @@ fi os=`eval ${CMD_OSTYPE}` -skip="nostart" -[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip nojail" -files=`rcorder -k ${os} -s ${skip} /etc/rc.d/* 2>/dev/null` +skip="-s nostart" +[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip -s nojail" +files=`rcorder -k ${os} ${skip} /etc/rc.d/* 2>/dev/null` for _rc_elem in ${files}; do run_rc_script ${_rc_elem} ${_boot} ==== //depot/projects/gdb/etc/rc.d/abi#2 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.2 2003/05/05 15:38:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.3 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: abi # REQUIRE: LOGIN # BEFORE: securelevel -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/accounting#4 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/accounting,v 1.7 2004/03/05 07:43:38 mtm Exp $ +# $FreeBSD: src/etc/rc.d/accounting,v 1.8 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: accounting # REQUIRE: mountcritremote # BEFORE: DAEMON -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/addswap#2 (text+ko) ==== @@ -2,13 +2,13 @@ # # Add additional swap files # -# $FreeBSD: src/etc/rc.d/addswap,v 1.2 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/addswap,v 1.3 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: addswap # REQUIRE: mountcritlocal # BEFORE: sysctl -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/adjkerntz#2 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.2 2003/04/18 17:55:05 mtm Exp $ +# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.3 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: adjkerntz # REQUIRE: diskless mountcritlocal random # BEFORE: netif -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/amd#4 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.12 2004/03/05 07:43:38 mtm Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.13 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: amd # REQUIRE: rpcbind ypbind nfsclient # BEFORE: DAEMON -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/apm#2 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/apm,v 1.4 2003/06/09 17:44:30 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apm,v 1.5 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: apm # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/apmd#3 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.10 2004/01/17 11:25:16 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.11 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: apmd # REQUIRE: DAEMON apm # BEFORE: LOGIN -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/archdep#2 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.5 2003/05/06 00:09:51 obrien Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.6 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: archdep # REQUIRE: LOGIN # BEFORE: abi -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/atm1#2 (text+ko) ==== @@ -24,13 +24,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/atm1,v 1.13 2003/07/28 13:30:42 harti Exp $ +# $FreeBSD: src/etc/rc.d/atm1,v 1.14 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: atm1 # REQUIRE: root # BEFORE: netif -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/atm2#2 (text+ko) ==== @@ -24,13 +24,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/atm2,v 1.14 2003/07/28 13:30:42 harti Exp $ +# $FreeBSD: src/etc/rc.d/atm2,v 1.15 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: atm2 # REQUIRE: atm1 netif # BEFORE: routing -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail # # Additional ATM interface configuration ==== //depot/projects/gdb/etc/rc.d/atm3#2 (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/atm3,v 1.12 2003/10/13 08:20:55 dougb Exp $ +# $FreeBSD: src/etc/rc.d/atm3,v 1.13 2004/03/08 12:25:05 pjd Exp $ # # Start ATM daemons @@ -32,7 +32,7 @@ # PROVIDE: atm3 # REQUIRE: atm2 # BEFORE: DAEMON -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/bgfsck#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/bgfsck,v 1.4 2003/04/23 15:38:02 matusita Exp $ +# $FreeBSD: src/etc/rc.d/bgfsck,v 1.5 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: bgfsck # REQUIRE: cron devfs -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/bootparams#3 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: bootparams,v 1.6 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/bootparams,v 1.5 2004/01/17 10:40:45 mtm Exp $ +# $FreeBSD: src/etc/rc.d/bootparams,v 1.6 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: bootparams # REQUIRE: rpcbind DAEMON # BEFORE: LOGIN -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/ccd#3 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: ccd,v 1.3 2000/05/13 08:45:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ccd,v 1.3 2004/01/17 10:16:38 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ccd,v 1.4 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: disks -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/devd#2 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devd,v 1.5 2003/02/12 04:22:40 imp Exp $ +# $FreeBSD: src/etc/rc.d/devd,v 1.6 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: devd # REQUIRE: NETWORKING # BEFORE: mountcritremote -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/devfs#2 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.6 2003/08/20 06:15:18 mtm Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.7 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: devfs # REQUIRE: LOGIN # BEFORE: securelevel -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/dhclient#4 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.14 2004/03/05 07:43:38 mtm Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.15 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: dhclient # REQUIRE: netif ipfw ipfilter mountcritlocal # BEFORE: NETWORKING -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail # # Note that there no syslog logging of dhclient messages at boot because # dhclient needs to start before services that syslog depends upon do. ==== //depot/projects/gdb/etc/rc.d/diskless#2 (text+ko) ==== @@ -24,13 +24,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/diskless,v 1.30 2004/01/05 19:14:47 brooks Exp $ +# $FreeBSD: src/etc/rc.d/diskless,v 1.31 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: diskless # REQUIRE: initdiskless rcconf mountcritlocal # BEFORE: addswap random -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null` [ ${dlv:=0} -eq 0 ] && exit 0 ==== //depot/projects/gdb/etc/rc.d/dmesg#2 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: dmesg,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dmesg,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/dmesg,v 1.3 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: dmesg # REQUIRE: mountcritremote # BEFORE: DAEMON -# KEYWORD: FreeBSD Daemon +# KEYWORD: FreeBSD Daemon nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/dumpon#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dumpon,v 1.2 2004/02/02 19:05:06 pjd Exp $ +# $FreeBSD: src/etc/rc.d/dumpon,v 1.3 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: dumpon # REQUIRE: initrandom # BEFORE: disks savecore -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/fsck#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # # $NetBSD: fsck,v 1.2 2001/06/18 06:42:35 lukem Exp $ -# $FreeBSD: src/etc/rc.d/fsck,v 1.7 2004/01/17 11:52:37 mtm Exp $ +# $FreeBSD: src/etc/rc.d/fsck,v 1.8 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: fsck # REQUIRE: localswap -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/gbde#3 (text+ko) ==== @@ -3,11 +3,11 @@ # This file, originally written by Garrett A. Wollman, is in the public # domain. # -# $FreeBSD: src/etc/rc.d/gbde,v 1.3 2004/02/03 10:22:55 des Exp $ +# $FreeBSD: src/etc/rc.d/gbde,v 1.4 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: disks -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/gbde_swap#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/gbde_swap,v 1.3 2004/02/05 21:40:37 des Exp $ +# $FreeBSD: src/etc/rc.d/gbde_swap,v 1.4 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: disks # REQUIRE: initrandom -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/ike#2 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ike,v 1.1 2003/11/28 17:28:42 bms Exp $ +# $FreeBSD: src/etc/rc.d/ike,v 1.2 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: ike # REQUIRE: root beforenetlkm mountcritlocal # BEFORE: DAEMON -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/initdiskless#2 (text+ko) ==== @@ -24,10 +24,10 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/initdiskless,v 1.28 2003/10/13 08:20:55 dougb Exp $ +# $FreeBSD: src/etc/rc.d/initdiskless,v 1.29 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: initdiskless -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail # On entry to this script the entire system consists of a read-only root ==== //depot/projects/gdb/etc/rc.d/initrandom#2 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/initrandom,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/initrandom,v 1.2 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: initrandom # REQUIRE: initdiskless # BEFORE: disks -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/ip6addrctl#2 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.1 2003/10/30 17:55:52 ume Exp $ +# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.2 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: ip6addrctl # REQUIRE: mountcritlocal netif # BEFORE: network_ipv6 -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr . /etc/network.subr ==== //depot/projects/gdb/etc/rc.d/ip6fw#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6fw,v 1.4 2004/02/19 06:53:24 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ip6fw,v 1.5 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: ip6fw # REQUIRE: routing # BEFORE: network_ipv6 -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/ipfilter#4 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.18 2004/03/05 07:43:38 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.19 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: ipfilter # REQUIRE: root mountcritlocal ipmon # BEFORE: netif -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/ipfs#3 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: ipfs,v 1.3 2002/02/11 13:55:42 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfs,v 1.4 2004/01/17 10:40:45 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfs,v 1.5 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: ipfs # REQUIRE: ipnat # BEFORE: netif -# KEYWORD: FreeBSD shutdown +# KEYWORD: FreeBSD nojail shutdown . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/ipfw#2 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.5 2003/07/27 20:34:30 mbr Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.6 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: ipfw # REQUIRE: ppp-user # BEFORE: NETWORKING -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr . /etc/network.subr ==== //depot/projects/gdb/etc/rc.d/ipmon#3 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: ipmon,v 2002/04/18 05:02:01 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipmon,v 1.8 2004/01/17 10:40:45 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipmon,v 1.9 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: ipmon # REQUIRE: mountcritlocal hostname sysctl cleanvar # BEFORE: SERVERS -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/ipnat#3 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipnat,v 1.12 2004/01/17 10:40:45 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipnat,v 1.13 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: ipnat # REQUIRE: ipfilter # BEFORE: DAEMON netif -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/ipsec#4 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ipsec,v 1.9 2004/03/05 07:43:38 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipsec,v 1.10 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: ipsec # REQUIRE: root mountcritlocal # BEFORE: DAEMON -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail # it does not really require beforenetlkm. ==== //depot/projects/gdb/etc/rc.d/ipxrouted#2 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipxrouted,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ipxrouted,v 1.2 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: ipxrouted # REQUIRE: SERVERS # BEFORE: DAEMON -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/gdb/etc/rc.d/isdnd#3 (text+ko) ==== @@ -1,14 +1,14 @@ #!/bin/sh >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 9 11:17:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3B0816A4D0; Tue, 9 Mar 2004 11:17:09 -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 A577716A4CE for ; Tue, 9 Mar 2004 11:17:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93FFF43D1F for ; Tue, 9 Mar 2004 11:17:09 -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.10/8.12.10) with ESMTP id i29JH9Ge080398 for ; Tue, 9 Mar 2004 11:17:09 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i29JH8TN080385 for perforce@freebsd.org; Tue, 9 Mar 2004 11:17:08 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 9 Mar 2004 11:17:08 -0800 (PST) Message-Id: <200403091917.i29JH8TN080385@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 48511 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 Mar 2004 19:17:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=48511 Change 48511 by rwatson@rwatson_paprika on 2004/03/09 11:16:37 Integrate netperf_socket: pmap_pinit2() removed acpi type fixes netgraph atm magic ndis pieces vinum type fixes more geom_concat geom orphan fixes More giant pushdown/removal in fork() loadav() now runs MPSAFE cpus are now hung off busdma by acpi configurable policy limits on hard links in vfs pf now hooked up if_disc locking (loopback) if_loop locking (loopback) netgraph getifindex PIM registration fix Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/cpufunc.h#4 integrate .. //depot/projects/netperf_socket/sys/boot/efi/libefi/efi_console.c#2 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#6 integrate .. //depot/projects/netperf_socket/sys/conf/files#7 integrate .. //depot/projects/netperf_socket/sys/conf/options#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumext.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumio.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumrequest.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.h#5 integrate .. //depot/projects/netperf_socket/sys/geom/geom_subr.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/elan-mmcr.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_fork.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_synch.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/subr_smp.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/modules/netgraph/atmllc/Makefile#1 branch .. //depot/projects/netperf_socket/sys/net/if_disc.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_loop.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_atmllc.c#1 branch .. //depot/projects/netperf_socket/sys/netgraph/ng_atmllc.h#1 branch .. //depot/projects/netperf_socket/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_iface.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/pim.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/pcpu.h#2 integrate .. //depot/projects/netperf_socket/sys/vm/pmap.h#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_glue.c#4 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_object.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#2 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.139 2003/10/03 22:46:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.140 2004/03/07 21:06:46 alc Exp $"); #include #include @@ -1109,18 +1109,6 @@ mtx_lock_spin(&allpmaps_lock); LIST_INSERT_HEAD(&allpmaps, pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); -} - -/* - * Wire in kernel global address entries. To avoid a race condition - * between pmap initialization and pmap_growkernel, this procedure - * should be called after the vmspace is attached to the process - * but before this pmap is activated. - */ -void -pmap_pinit2(pmap) - struct pmap *pmap; -{ bcopy(PTlev1 + K1SEGLEV1I, pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE); } ==== //depot/projects/netperf_socket/sys/amd64/amd64/local_apic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.7 2004/01/30 00:24:45 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.8 2004/03/08 00:15:29 peter Exp $"); #include #include @@ -691,8 +691,8 @@ intr_restore(eflags); } +#define BEFORE_SPIN 1000000 #ifdef DETECT_DEADLOCK -#define BEFORE_SPIN 1000000 #define AFTER_SPIN 1000 #endif @@ -723,11 +723,9 @@ destfield = dest; } -#ifdef DETECT_DEADLOCK - /* Check for an earlier stuck IPI. */ + /* Wait for an earlier IPI to finish. */ if (!lapic_ipi_wait(BEFORE_SPIN)) panic("APIC: Previous IPI is stuck"); -#endif lapic_ipi_raw(icrlo, destfield); ==== //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.604 2004/02/25 23:12:39 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.605 2004/03/08 00:16:52 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1162,6 +1162,7 @@ pcpu_init(pc, 0, sizeof(struct pcpu)); PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); + PCPU_SET(curpcb, thread0.td_pcb); PCPU_SET(tssp, &common_tss[0]); /* ==== //depot/projects/netperf_socket/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.234 2004/01/30 00:24:45 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.235 2004/03/08 00:25:03 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#3 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.452 2004/02/05 00:11:05 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.453 2004/03/07 21:06:47 alc Exp $"); /* * Manages physical address maps. @@ -1103,19 +1103,6 @@ } /* - * Wire in kernel global address entries. To avoid a race condition - * between pmap initialization and pmap_growkernel, this procedure - * should be called after the vmspace is attached to the process - * but before this pmap is activated. - */ -void -pmap_pinit2(pmap) - struct pmap *pmap; -{ - /* XXX: Remove this stub when no longer called */ -} - -/* * this routine is called if the page table page is not * mapped correctly. * ==== //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.272 2004/01/29 00:05:03 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.273 2004/03/08 00:17:27 peter Exp $"); /* * AMD64 Trap and System call handling @@ -371,8 +371,7 @@ frame.tf_rip = (long)doreti_iret_fault; goto out; } - if (PCPU_GET(curpcb) != NULL && - PCPU_GET(curpcb)->pcb_onfault != NULL) { + if (PCPU_GET(curpcb)->pcb_onfault != NULL) { frame.tf_rip = (long)PCPU_GET(curpcb)->pcb_onfault; goto out; @@ -555,7 +554,6 @@ nogo: if (!usermode) { if (td->td_intr_nesting_level == 0 && - PCPU_GET(curpcb) != NULL && PCPU_GET(curpcb)->pcb_onfault != NULL) { frame->tf_rip = (long)PCPU_GET(curpcb)->pcb_onfault; return (0); ==== //depot/projects/netperf_socket/sys/amd64/include/cpufunc.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.140 2004/03/05 09:19:59 le Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.141 2004/03/08 00:24:15 peter Exp $ */ /* @@ -43,13 +43,8 @@ #ifndef _MACHINE_CPUFUNC_H_ #define _MACHINE_CPUFUNC_H_ -#include -#include - -struct thread; struct region_descriptor; -__BEGIN_DECLS #define readb(va) (*(volatile u_int8_t *) (va)) #define readw(va) (*(volatile u_int16_t *) (va)) #define readl(va) (*(volatile u_int32_t *) (va)) @@ -563,21 +558,18 @@ } #endif -/* void lidt(struct region_descriptor *addr); */ static __inline void lidt(struct region_descriptor *addr) { __asm __volatile("lidt (%0)" : : "r" (addr)); } -/* void lldt(u_short sel); */ static __inline void lldt(u_short sel) { __asm __volatile("lldt %0" : : "r" (sel)); } -/* void ltr(u_short sel); */ static __inline void ltr(u_short sel) { @@ -717,30 +709,37 @@ int breakpoint(void); u_int bsfl(u_int mask); u_int bsrl(u_int mask); -void cpu_invlpg(u_long addr); -void cpu_invlpg_range(u_long start, u_long end); void disable_intr(void); void do_cpuid(u_int ax, u_int *p); void enable_intr(void); void halt(void); +void ia32_pause(void); u_char inb(u_int port); u_int inl(u_int port); void insb(u_int port, void *addr, size_t cnt); void insl(u_int port, void *addr, size_t cnt); void insw(u_int port, void *addr, size_t cnt); +register_t intr_disable(void); +void intr_restore(register_t rf); void invd(void); void invlpg(u_int addr); -void invlpg_range(u_int start, u_int end); void invltlb(void); u_short inw(u_int port); -void load_cr0(u_int cr0); -void load_cr3(u_int cr3); -void load_cr4(u_int cr4); +void lidt(struct region_descriptor *addr); +void lldt(u_short sel); +void load_cr0(u_long cr0); +void load_cr3(u_long cr3); +void load_cr4(u_long cr4); +void load_dr0(u_int64_t dr0); +void load_dr1(u_int64_t dr1); +void load_dr2(u_int64_t dr2); +void load_dr3(u_int64_t dr3); +void load_dr4(u_int64_t dr4); +void load_dr5(u_int64_t dr5); +void load_dr6(u_int64_t dr6); +void load_dr7(u_int64_t dr7); void load_fs(u_int sel); void load_gs(u_int sel); -struct region_descriptor; -void lidt(struct region_descriptor *addr); -void lldt(u_short sel); void ltr(u_short sel); void outb(u_int port, u_char data); void outl(u_int port, u_int data); @@ -748,43 +747,30 @@ void outsl(u_int port, const void *addr, size_t cnt); void outsw(u_int port, const void *addr, size_t cnt); void outw(u_int port, u_short data); -void ia32_pause(void); -u_int rcr0(void); -u_int rcr2(void); -u_int rcr3(void); -u_int rcr4(void); -u_int rfs(void); -u_int rgs(void); +u_long rcr0(void); +u_long rcr2(void); +u_long rcr3(void); +u_long rcr4(void); u_int64_t rdmsr(u_int msr); u_int64_t rdpmc(u_int pmc); +u_int64_t rdr0(void); +u_int64_t rdr1(void); +u_int64_t rdr2(void); +u_int64_t rdr3(void); +u_int64_t rdr4(void); +u_int64_t rdr5(void); +u_int64_t rdr6(void); +u_int64_t rdr7(void); u_int64_t rdtsc(void); u_int read_rflags(void); +u_int rfs(void); +u_int rgs(void); void wbinvd(void); void write_rflags(u_int rf); void wrmsr(u_int msr, u_int64_t newval); -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); -__END_DECLS - #endif /* !_MACHINE_CPUFUNC_H_ */ ==== //depot/projects/netperf_socket/sys/boot/efi/libefi/efi_console.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/efi_console.c,v 1.4 2003/04/03 21:36:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/efi_console.c,v 1.5 2004/03/09 04:00:33 marcel Exp $"); #include #include @@ -46,6 +46,7 @@ static int efi_cons_init(int arg) { + conout->SetAttribute(conout, EFI_TEXT_ATTR(EFI_LIGHTGRAY, EFI_BLACK)); return 0; } ==== //depot/projects/netperf_socket/sys/conf/NOTES#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1203 2004/03/01 07:51:51 bde Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1205 2004/03/08 22:03:28 mlaier Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -409,6 +409,7 @@ # corresponding man page, e.g., ng_async(8). options NETGRAPH #netgraph(4) system options NETGRAPH_ASYNC +options NETGRAPH_ATMLLC options NETGRAPH_BPF options NETGRAPH_BRIDGE options NETGRAPH_CISCO @@ -486,6 +487,13 @@ # The `ef' device provides support for multiple ethernet frame types # specified via ETHER_* options. See ef(4) for details. # +# The pf packet filter consists of three devices: +# The `pf' device provides /dev/pf and the firewall code itself. +# The `pflog' device provides the pflog0 interface which logs packets. +# The `pfsync' device provides the pfsync0 interface used for +# synchronization of firewall state tables (over the net). +# Requires option PFIL_HOOKS and (when used as a module) option RANDOM_IP_ID +# # The PPP_BSDCOMP option enables support for compress(1) style entire # packet compression, the PPP_DEFLATE is for zlib/gzip style compression. # PPP_FILTER enables code for filtering the ppp data stream and selecting @@ -506,6 +514,9 @@ device tun #Tunnel driver (ppp(8), nos-tun(8)) device sl #Serial Line IP device gre #IP over IP tunneling +device pf #PF OpenBSD packet-filter firewall +device pflog #logging support interface for PF +device pfsync #synchronization interface for PF device ppp #Point-to-point protocol options PPP_BSDCOMP #PPP BSD-compress support options PPP_DEFLATE #PPP zlib/deflate/gzip support @@ -560,7 +571,7 @@ # # PFIL_HOOKS enables an abtraction layer which is meant to be used in # network code where filtering is required. See the pfil(9) man page. -# This option is required by the IPFILTER option. +# This option is required by the IPFILTER option and the PF device. # # TCPDEBUG enables code which keeps traces of the TCP state machine # for sockets with the SO_DEBUG option set, which can then be examined ==== //depot/projects/netperf_socket/sys/conf/files#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.872 2004/03/03 09:33:03 obrien Exp $ +# $FreeBSD: src/sys/conf/files,v 1.873 2004/03/08 10:54:35 benno Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1402,6 +1402,7 @@ contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni netgraph/ng_UI.c optional netgraph_UI netgraph/ng_async.c optional netgraph_async +netgraph/ng_atmllc.c optional netgraph_atmllc netgraph/ng_base.c optional netgraph netgraph/ng_bpf.c optional netgraph_bpf net/bpf_filter.c optional netgraph_bpf ==== //depot/projects/netperf_socket/sys/conf/options#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.433 2004/02/28 20:56:35 phk Exp $ +# $FreeBSD: src/sys/conf/options,v 1.434 2004/03/08 10:54:35 benno Exp $ # # On the handling of kernel options # @@ -376,6 +376,7 @@ # option below. Each type has its own man page, e.g. ng_async(4). NETGRAPH NETGRAPH_ASYNC opt_netgraph.h +NETGRAPH_ATMLLC opt_netgraph.h NETGRAPH_BPF opt_netgraph.h NETGRAPH_BRIDGE opt_netgraph.h NETGRAPH_CISCO opt_netgraph.h ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.123 2004/03/04 04:42:59 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.125 2004/03/09 05:44:47 njl Exp $ */ #include "opt_acpi.h" @@ -1369,7 +1369,7 @@ } ACPI_STATUS -acpi_SetInteger(ACPI_HANDLE handle, char *path, int number) +acpi_SetInteger(ACPI_HANDLE handle, char *path, UINT32 number) { ACPI_OBJECT arg1; ACPI_OBJECT_LIST args; @@ -1388,7 +1388,7 @@ * Evaluate a path that should return an integer. */ ACPI_STATUS -acpi_GetInteger(ACPI_HANDLE handle, char *path, int *number) +acpi_GetInteger(ACPI_HANDLE handle, char *path, UINT32 *number) { ACPI_STATUS status; ACPI_BUFFER buf; @@ -1435,9 +1435,10 @@ } ACPI_STATUS -acpi_ConvertBufferToInteger(ACPI_BUFFER *bufp, int *number) +acpi_ConvertBufferToInteger(ACPI_BUFFER *bufp, UINT32 *number) { ACPI_OBJECT *p; + UINT8 *val; int i; p = (ACPI_OBJECT *)bufp->Pointer; @@ -1451,8 +1452,9 @@ return (AE_BAD_DATA); *number = 0; + val = p->Buffer.Pointer; for (i = 0; i < p->Buffer.Length; i++) - *number += (*(p->Buffer.Pointer + i) << (i * 8)); + *number += val[i] << (i * 8); return (AE_OK); } ==== //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.56 2004/03/03 18:34:42 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.57 2004/03/09 05:41:28 njl Exp $ */ #include "bus_if.h" @@ -176,11 +176,11 @@ ACPI_HANDLE *result); extern ACPI_BUFFER *acpi_AllocBuffer(int size); extern ACPI_STATUS acpi_ConvertBufferToInteger(ACPI_BUFFER *bufp, - int *number); + UINT32 *number); extern ACPI_STATUS acpi_GetInteger(ACPI_HANDLE handle, char *path, - int *number); + UINT32 *number); extern ACPI_STATUS acpi_SetInteger(ACPI_HANDLE handle, char *path, - int number); + UINT32 number); extern ACPI_STATUS acpi_ForeachPackageObject(ACPI_OBJECT *obj, void (*func)(ACPI_OBJECT *comp, void *arg), void *arg); ==== //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.1 2004/03/07 02:49:06 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.2 2004/03/09 18:39:40 wpaul Exp $"); #include #include @@ -263,6 +263,26 @@ } /* + * If the BIOS did not set up an interrupt for this device, + * the resource traversal code above will fail to set up + * an IRQ resource. This is usually a bad thing, so try to + * force the allocation of an interrupt here. If one was + * not assigned to us by the BIOS, bus_alloc_resource() + * should route one for us. + */ + if (sc->ndis_irq == NULL) { + rid = 0; + sc->ndis_irq = bus_alloc_resource(dev, SYS_RES_IRQ, + &rid, 0, ~0, 1, RF_SHAREABLE | RF_ACTIVE); + if (sc->ndis_irq == NULL) { + device_printf(dev, "couldn't route interrupt\n"); + error = ENXIO; + goto fail; + } + sc->ndis_rescnt++; + } + + /* * Allocate the parent bus DMA tag appropriate for PCI. */ #define NDIS_NSEG_NEW 32 ==== //depot/projects/netperf_socket/sys/dev/vinum/vinumext.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * advised of the possibility of such damage. * * $Id: vinumext.h,v 1.33 2003/05/23 00:57:48 grog Exp $ - * $FreeBSD: src/sys/dev/vinum/vinumext.h,v 1.40 2003/05/23 01:13:43 grog Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumext.h,v 1.41 2004/03/09 09:50:15 le Exp $ */ /* vinumext.h: external definitions */ @@ -187,8 +187,6 @@ void update_plex_state(int plexno); void update_volume_state(int volno); void invalidate_subdisks(struct plex *, enum sdstate); -void get_volume_label(char *name, int plexes, u_int64_t size, struct disklabel *lp); -int write_volume_label(int); void start_object(struct vinum_ioctl_msg *); void stop_object(struct vinum_ioctl_msg *); void setstate(struct vinum_ioctl_msg *msg); ==== //depot/projects/netperf_socket/sys/dev/vinum/vinumio.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ * advised of the possibility of such damage. * * $Id: vinumio.c,v 1.39 2003/05/23 00:59:53 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.95 2003/11/24 04:06:56 grog Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.96 2004/03/09 09:50:15 le Exp $ */ #include @@ -627,66 +627,6 @@ } /* - * Disk labels are a mess. The correct way to - * access them is with the DIOC[GSW]DINFO ioctls, - * but some programs, such as newfs, access the - * disk directly, so we have to write things - * there. We do this only on request. If a user - * request tries to read it directly, we fake up - * one on the fly. - */ - -/* - * get_volume_label returns a label structure to - * lp, which is allocated by the caller. - */ -void -get_volume_label(char *name, int plexes, u_int64_t size, struct disklabel *lp) -{ - bzero(lp, sizeof(struct disklabel)); - - strncpy(lp->d_typename, "vinum", sizeof(lp->d_typename)); - lp->d_type = DTYPE_VINUM; - strncpy(lp->d_packname, name, min(sizeof(lp->d_packname), sizeof(name))); - lp->d_rpm = 14400 * plexes; /* to keep them guessing */ - lp->d_interleave = 1; - lp->d_flags = 0; - - /* - * A Vinum volume has a single track with all - * its sectors. - */ - lp->d_secsize = DEV_BSIZE; /* bytes per sector */ - lp->d_nsectors = size; /* data sectors per track */ - lp->d_ntracks = 1; /* tracks per cylinder */ - lp->d_ncylinders = 1; /* data cylinders per unit */ - lp->d_secpercyl = size; /* data sectors per cylinder */ - lp->d_secperunit = size; /* data sectors per unit */ - - lp->d_bbsize = BBSIZE; - lp->d_sbsize = 0; /* no longer used? */ - lp->d_magic = DISKMAGIC; - lp->d_magic2 = DISKMAGIC; - - /* - * Set up partitions a, b and c to be identical - * and the size of the volume. a is UFS, b is - * swap, c is nothing. - */ - lp->d_partitions[0].p_size = size; - lp->d_partitions[0].p_fsize = 1024; - lp->d_partitions[0].p_fstype = FS_BSDFFS; /* FreeBSD File System :-) */ - lp->d_partitions[0].p_fsize = 1024; /* FS fragment size */ - lp->d_partitions[0].p_frag = 8; /* and fragments per block */ - lp->d_partitions[SWAP_PART].p_size = size; - lp->d_partitions[SWAP_PART].p_fstype = FS_SWAP; /* swap partition */ - lp->d_partitions[LABEL_PART].p_size = size; - lp->d_npartitions = LABEL_PART + 1; - strncpy(lp->d_packname, name, min(sizeof(lp->d_packname), sizeof(name))); - lp->d_checksum = dkcksum(lp); -} - -/* * Search disks on system for vinum slices and add * them to the configuuration if they're not * there already. devicename is a blank-separate ==== //depot/projects/netperf_socket/sys/dev/vinum/vinumrequest.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumrequest.c,v 1.71 2003/11/24 04:06:56 grog Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumrequest.c,v 1.72 2004/03/09 12:45:43 le Exp $"); #include #include @@ -1018,7 +1018,7 @@ int vinum_bounds_check(struct buf *bp, struct volume *vol) { - int maxsize = vol->size; /* size of the partition (sectors) */ + int64_t maxsize = vol->size; /* size of the partition (sectors) */ int size = (bp->b_bcount + DEV_BSIZE - 1) >> DEV_BSHIFT; /* size of this request (sectors) */ #ifdef LABELSECTOR ==== //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.5 2004/03/04 10:22:42 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.6 2004/03/09 11:18:53 pjd Exp $"); #include #include @@ -65,6 +65,32 @@ /* + * Greatest Common Divisor. + */ +static u_int +gcd(u_int a, u_int b) +{ + u_int c; + + while (b != 0) { + c = a; + a = b; + b = (c % b); + } + return (a); +} + +/* + * Least Common Multiple. + */ +static u_int +lcm(u_int a, u_int b) +{ + + return ((a * b) / gcd(a, b)); +} + +/* * Return the number of valid disks. */ static u_int @@ -273,8 +299,8 @@ g_concat_check_and_run(struct g_concat_softc *sc) { struct g_concat_disk *disk; + u_int no, sectorsize = 0; off_t start; - u_int no; if (g_concat_nvalid(sc) != sc->sc_ndisks) return; @@ -288,7 +314,14 @@ if (sc->sc_type == G_CONCAT_TYPE_AUTOMATIC) disk->d_end -= disk->d_consumer->provider->sectorsize; start = disk->d_end; + if (no == 0) + sectorsize = disk->d_consumer->provider->sectorsize; + else { + sectorsize = lcm(sectorsize, + disk->d_consumer->provider->sectorsize); + } } + sc->sc_provider->sectorsize = sectorsize; /* We have sc->sc_disks[sc->sc_ndisks - 1].d_end in 'start'. */ sc->sc_provider->mediasize = start; g_error_provider(sc->sc_provider, 0); @@ -366,6 +399,7 @@ if (sc->sc_type == G_CONCAT_TYPE_AUTOMATIC) { struct g_concat_metadata md; + /* Re-read metadata. */ error = g_concat_read_metadata(cp, &md); if (error != 0) goto fail; @@ -399,7 +433,7 @@ static struct g_geom * g_concat_create(struct g_class *mp, const struct g_concat_metadata *md, - u_int type, size_t sectorsize) + u_int type) { struct g_provider *pp; struct g_concat_softc *sc; @@ -452,10 +486,9 @@ pp = g_new_providerf(gp, "%s", gp->name); sc->sc_provider = pp; - pp->sectorsize = sectorsize; /* * Don't run provider yet (by setting its error to 0), because we're - * not aware of its mediasize. + * not aware of its media and sector size. */ G_CONCAT_DEBUG(0, "Device %s created (id=%u).", gp->name, sc->sc_id); @@ -510,8 +543,8 @@ } static int -g_concat_destroy_geom(struct gctl_req *req, struct g_class *mp, - struct g_geom *gp) +g_concat_destroy_geom(struct gctl_req *req __unused, + struct g_class *mp __unused, struct g_geom *gp) { struct g_concat_softc *sc; @@ -580,8 +613,7 @@ return (NULL); } } else { - gp = g_concat_create(mp, &md, G_CONCAT_TYPE_AUTOMATIC, - pp->sectorsize); + gp = g_concat_create(mp, &md, G_CONCAT_TYPE_AUTOMATIC); if (gp == NULL) { G_CONCAT_DEBUG(0, "Cannot create device %s.concat.", md.md_name); @@ -610,13 +642,12 @@ struct g_concat_softc *sc; struct g_geom *gp; struct sbuf *sb; - uint32_t sectorsize = 0; char buf[20]; g_topology_assert(); md = gctl_get_paraml(req, "metadata", sizeof(*md)); if (md == NULL) { - gctl_error(req, "No 'metadata' argument"); + gctl_error(req, "No '%s' argument.", "metadata"); return; } if (md->md_all <= 1) { @@ -630,17 +661,15 @@ snprintf(buf, sizeof(buf), "disk%u", no); pp = gctl_get_provider(req, buf); if (pp == NULL) { - G_CONCAT_DEBUG(1, "Disk %u is invalid.", no); - gctl_error(req, "Disk %u is invalid", no); + G_CONCAT_DEBUG(1, "Disk %u is invalid.", no + 1); + gctl_error(req, "Disk %u is invalid.", no + 1); return; } - if (no == 0) - sectorsize = pp->sectorsize; } - gp = g_concat_create(mp, md, G_CONCAT_TYPE_MANUAL, sectorsize); + gp = g_concat_create(mp, md, G_CONCAT_TYPE_MANUAL); if (gp == NULL) { - gctl_error(req, "Can't configure %s.concat", md->md_name); + gctl_error(req, "Can't configure %s.concat.", md->md_name); return; } @@ -673,9 +702,10 @@ int *force, error; g_topology_assert(); + force = gctl_get_paraml(req, "force", sizeof(*force)); if (force == NULL) { - gctl_error(req, "No 'force' argument"); + gctl_error(req, "No '%s' argument.", "force"); return; } sc = gp->softc; @@ -713,8 +743,7 @@ g_concat_ctl_destroy(req, gp); return; } - - gctl_error(req, "unknown verb"); + gctl_error(req, "Unknown verb."); } static void ==== //depot/projects/netperf_socket/sys/geom/concat/g_concat.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/geom/concat/g_concat.h,v 1.5 2004/03/04 10:22:42 pjd Exp $ + * $FreeBSD: src/sys/geom/concat/g_concat.h,v 1.6 2004/03/09 11:00:24 pjd Exp $ */ #ifndef _G_CONCAT_H_ @@ -51,6 +51,7 @@ if (g_concat_debug >= 2) { \ printf("GEOM_CONCAT[2]: "); \ printf(__VA_ARGS__); \ + printf(" "); \ g_print_bio(bp); \ printf("\n"); \ } \ ==== //depot/projects/netperf_socket/sys/geom/geom_subr.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.71 2004/02/14 17:58:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.72 2004/03/07 17:33:15 phk Exp $"); #include #include @@ -272,7 +272,8 @@ if (!(gp->flags & G_GEOM_WITHER)) { gp->flags |= G_GEOM_WITHER; LIST_FOREACH(pp, &gp->provider, provider) - g_orphan_provider(pp, error); + if (!(pp->flags & G_PF_ORPHAN)) + g_orphan_provider(pp, error); } for (pp = LIST_FIRST(&gp->provider); pp != NULL; pp = pp2) { pp2 = LIST_NEXT(pp, provider); ==== //depot/projects/netperf_socket/sys/i386/i386/elan-mmcr.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/elan-mmcr.c,v 1.24 2004/02/28 20:06:58 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/elan-mmcr.c,v 1.25 2004/03/09 02:51:21 jb Exp $"); #include "opt_cpu.h" #include @@ -75,6 +75,7 @@ u_int pps_a, pps_d; u_int echo_a, echo_d; #endif /* CPU_ELAN_PPS */ +#ifdef CPU_SOEKRIS u_int led_cookie[32]; dev_t led_dev[32]; @@ -90,6 +91,7 @@ v ^= 0xc; mmcrptr[v / 2] = u; } +#endif static int sysctl_machdep_elan_gpio_config(SYSCTL_HANDLER_ARGS) @@ -97,7 +99,10 @@ u_int u, v; int i, np, ne; int error; - char buf[32], tmp[10]; + char buf[32]; +#ifdef CPU_SOEKRIS + char tmp[10]; +#endif error = SYSCTL_OUT(req, gpio_config, 33); if (error != 0 || req->newptr == NULL) @@ -141,11 +146,13 @@ v = 2; else >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 9 12:31:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADE9316A4D0; Tue, 9 Mar 2004 12:31: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 866DC16A4CF for ; Tue, 9 Mar 2004 12:31:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76D3143D2D for ; Tue, 9 Mar 2004 12:31:45 -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.10/8.12.10) with ESMTP id i29KVjGe002964 for ; Tue, 9 Mar 2004 12:31:45 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i29KViL7002955 for perforce@freebsd.org; Tue, 9 Mar 2004 12:31:44 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 9 Mar 2004 12:31:44 -0800 (PST) Message-Id: <200403092031.i29KViL7002955@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 48518 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 Mar 2004 20:31:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=48518 Change 48518 by rwatson@rwatson_paprika on 2004/03/09 12:31:40 Loop back locking of global variables for if_faith, if_stf. Merg NDIS cleanup. Affected files ... .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_faith.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_stf.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pccard.c#2 (text+ko) ==== @@ -31,14 +31,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.1 2004/03/07 02:49:06 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.2 2004/03/09 20:29:21 wpaul Exp $"); #include #include #include -#include -#include -#include #include #include #include @@ -46,24 +43,15 @@ #include #include -#include -#include #include -#include - -#include -#include #include #include #include #include #include -#include -#include - #include #include #include @@ -200,8 +188,6 @@ struct ndis_pccard_type *t; int devidx = 0; const char *prodstr, *vendstr; - struct resource_list *rl; - struct resource_list_entry *rle; sc = device_get_softc(dev); unit = device_get_unit(dev); ==== //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#3 (text+ko) ==== @@ -31,13 +31,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.2 2004/03/09 18:39:40 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.3 2004/03/09 20:29:21 wpaul Exp $"); #include #include -#include -#include -#include #include #include #include @@ -45,23 +42,14 @@ #include #include -#include -#include #include -#include - -#include -#include #include #include #include #include #include -#include - -#include #include #include ==== //depot/projects/netperf_socket/sys/net/if_faith.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_faith.c,v 1.25 2003/12/28 03:55:59 sam Exp $ + * $FreeBSD: src/sys/net/if_faith.c,v 1.26 2004/03/09 19:23:06 rwatson Exp $ */ /* * derived from @@ -99,11 +99,13 @@ static int faithmodevent(module_t, int, void *); +static struct mtx faith_mtx; static MALLOC_DEFINE(M_FAITH, FAITHNAME, "Firewall Assisted Tunnel Interface"); static LIST_HEAD(, faith_softc) faith_softc_list; int faith_clone_create(struct if_clone *, int); void faith_clone_destroy(struct ifnet *); +static void faith_destroy(struct faith_softc *); struct if_clone faith_cloner = IF_CLONE_INITIALIZER(FAITHNAME, faith_clone_create, faith_clone_destroy, 0, IF_MAXUNIT); @@ -116,9 +118,11 @@ int type; void *data; { + struct faith_softc *sc; switch (type) { case MOD_LOAD: + mtx_init(&faith_mtx, "faith_mtx", NULL, MTX_DEF); LIST_INIT(&faith_softc_list); if_clone_attach(&faith_cloner); @@ -134,10 +138,15 @@ if_clone_detach(&faith_cloner); - while (!LIST_EMPTY(&faith_softc_list)) - faith_clone_destroy( - &LIST_FIRST(&faith_softc_list)->sc_if); - + mtx_lock(&faith_mtx); + while ((sc = LIST_FIRST(&faith_softc_list)) != NULL) { + LIST_REMOVE(sc, sc_list); + mtx_unlock(&faith_mtx); + faith_destroy(sc); + mtx_lock(&faith_mtx); + } + mtx_unlock(&faith_mtx); + mtx_destroy(&faith_mtx); break; } return 0; @@ -176,21 +185,32 @@ sc->sc_if.if_snd.ifq_maxlen = ifqmaxlen; if_attach(&sc->sc_if); bpfattach(&sc->sc_if, DLT_NULL, sizeof(u_int)); + mtx_lock(&faith_mtx); LIST_INSERT_HEAD(&faith_softc_list, sc, sc_list); + mtx_unlock(&faith_mtx); return (0); } +static void +faith_destroy(struct faith_softc *sc) +{ + + bpfdetach(&sc->sc_if); + if_detach(&sc->sc_if); + free(sc, M_FAITH); +} + void faith_clone_destroy(ifp) struct ifnet *ifp; { struct faith_softc *sc = (void *) ifp; + mtx_lock(&faith_mtx); LIST_REMOVE(sc, sc_list); - bpfdetach(ifp); - if_detach(ifp); + mtx_unlock(&faith_mtx); - free(sc, M_FAITH); + faith_destroy(sc); } int ==== //depot/projects/netperf_socket/sys/net/if_stf.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/if_stf.c,v 1.36 2004/03/07 05:15:42 rwatson Exp $ */ +/* $FreeBSD: src/sys/net/if_stf.c,v 1.37 2004/03/09 20:29:19 rwatson Exp $ */ /* $KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $ */ /* @@ -138,6 +138,13 @@ LIST_ENTRY(stf_softc) sc_list; /* all stf's are linked */ }; +/* + * All mutable global variables in if_stf.c are protected by stf_mtx. + * XXXRW: Note that mutable fields in the softc are not currently locked: + * in particular, sc_ro needs to be protected from concurrent entrance + * of stf_output(). + */ +static struct mtx stf_mtx; static LIST_HEAD(, stf_softc) stf_softc_list; static MALLOC_DEFINE(M_STF, STFNAME, "6to4 Tunnel Interface"); @@ -197,24 +204,36 @@ sc->sc_if.if_snd.ifq_maxlen = IFQ_MAXLEN; if_attach(&sc->sc_if); bpfattach(&sc->sc_if, DLT_NULL, sizeof(u_int)); + mtx_lock(&stf_mtx); LIST_INSERT_HEAD(&stf_softc_list, sc, sc_list); + mtx_unlock(&stf_mtx); return (0); } +static void +stf_destroy(struct stf_softc *sc) +{ + int err; + + err = encap_detach(sc->encap_cookie); + KASSERT(err == 0, ("Unexpected error detaching encap_cookie")); + bpfdetach(&sc->sc_if); + if_detach(&sc->sc_if); + + free(sc, M_STF); +} + void stf_clone_destroy(ifp) struct ifnet *ifp; { - int err; struct stf_softc *sc = (void *) ifp; + mtx_lock(&stf_mtx); LIST_REMOVE(sc, sc_list); - err = encap_detach(sc->encap_cookie); - KASSERT(err == 0, ("Unexpected error detaching encap_cookie")); - bpfdetach(ifp); - if_detach(ifp); + mtx_unlock(&stf_mtx); - free(sc, M_STF); + stf_destroy(sc); } static int @@ -223,9 +242,11 @@ int type; void *data; { + struct stf_softc *sc; switch (type) { case MOD_LOAD: + mtx_init(&stf_mtx, "stf_mtx", NULL, MTX_DEF); LIST_INIT(&stf_softc_list); if_clone_attach(&stf_cloner); @@ -233,8 +254,15 @@ case MOD_UNLOAD: if_clone_detach(&stf_cloner); - while (!LIST_EMPTY(&stf_softc_list)) - stf_clone_destroy(&LIST_FIRST(&stf_softc_list)->sc_if); + mtx_lock(&stf_mtx); + while ((sc = LIST_FIRST(&stf_softc_list)) != NULL) { + LIST_REMOVE(sc, sc_list); + mtx_unlock(&stf_mtx); + stf_destroy(sc); + mtx_lock(&stf_mtx); + } + mtx_unlock(&stf_mtx); + mtx_destroy(&stf_mtx); break; } @@ -467,6 +495,9 @@ else ip_ecn_ingress(ECN_NOCARE, &ip->ip_tos, &tos); + /* + * XXXRW: Locking of sc_ro required. + */ dst4 = (struct sockaddr_in *)&sc->sc_ro.ro_dst; if (dst4->sin_family != AF_INET || bcmp(&dst4->sin_addr, &ip->ip_dst, sizeof(ip->ip_dst)) != 0) { From owner-p4-projects@FreeBSD.ORG Tue Mar 9 19:45:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90F2E16A4D0; Tue, 9 Mar 2004 19:45: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 6B3E316A4CE for ; Tue, 9 Mar 2004 19:45:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59CC643D1D for ; Tue, 9 Mar 2004 19:45:45 -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.10/8.12.10) with ESMTP id i2A3jjGe011130 for ; Tue, 9 Mar 2004 19:45:45 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2A3jiVX011127 for perforce@freebsd.org; Tue, 9 Mar 2004 19:45:44 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 9 Mar 2004 19:45:44 -0800 (PST) Message-Id: <200403100345.i2A3jiVX011127@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 48544 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 Mar 2004 03:45:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=48544 Change 48544 by rwatson@rwatson_paprika on 2004/03/09 19:45:29 fork() file descriptor locking fixes from Giant removal. Constify etherbroadcastaddr, fddibroadcastaddr. Remove unused zeroin_addr. Loopback of ip_encap.c locking from merge. Affected files ... .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_fork.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/in_var.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_encap.c#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#3 (text+ko) ==== @@ -41,9 +41,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.228 2004/03/09 02:49:24 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.229 2004/03/09 20:53:01 jb Exp $"); -#include "opt_cpu.h" #include "opt_isa.h" #include "opt_kstack_pages.h" #include "opt_npx.h" @@ -78,9 +77,6 @@ #include #include #include -#ifdef CPU_ELAN -#include -#endif #ifdef CPU_ELAN #include @@ -563,12 +559,6 @@ } outb(0xf0, 0x00); /* Reset. */ #else -#ifdef CPU_ELAN - if (elan_mmcr != NULL) - /* SYS_RST */ - elan_mmcr->RESCFG = 1; -#endif - /* * Attempt to do a CPU reset via the keyboard controller, * do not turn of the GateA20, as any machine that fails ==== //depot/projects/netperf_socket/sys/kern/kern_fork.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.220 2004/03/08 00:32:34 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.221 2004/03/10 00:27:36 jmg Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -232,7 +232,9 @@ */ if (flags & RFCFDG) { struct filedesc *fdtmp; + FILEDESC_LOCK(td->td_proc->p_fd); fdtmp = fdinit(td->td_proc->p_fd); + FILEDESC_UNLOCK(td->td_proc->p_fd); fdfree(td); p1->p_fd = fdtmp; } @@ -428,7 +430,9 @@ * Copy filedesc. */ if (flags & RFCFDG) { + FILEDESC_LOCK(td->td_proc->p_fd); fd = fdinit(td->td_proc->p_fd); + FILEDESC_UNLOCK(td->td_proc->p_fd); fdtol = NULL; } else if (flags & RFFDG) { FILEDESC_LOCK(p1->p_fd); ==== //depot/projects/netperf_socket/sys/net/if_ethersubr.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.160 2004/03/02 14:37:23 mlaier Exp $ + * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.161 2004/03/09 23:55:59 rwatson Exp $ */ #include "opt_atalk.h" @@ -111,7 +111,7 @@ bdgtakeifaces_t *bdgtakeifaces_ptr; struct bdg_softc *ifp2sc; -static u_char etherbroadcastaddr[ETHER_ADDR_LEN] = +static const u_char etherbroadcastaddr[ETHER_ADDR_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; static int ether_resolvemulti(struct ifnet *, struct sockaddr **, ==== //depot/projects/netperf_socket/sys/net/if_fddisubr.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp - * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.87 2003/11/14 21:02:22 andre Exp $ + * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.88 2004/03/09 23:55:59 rwatson Exp $ */ #include "opt_atalk.h" @@ -89,7 +89,7 @@ extern u_char aarp_org_code[ 3 ]; #endif /* NETATALK */ -static u_char fddibroadcastaddr[FDDI_ADDR_LEN] = +static const u_char fddibroadcastaddr[FDDI_ADDR_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; static int fddi_resolvemulti(struct ifnet *, struct sockaddr **, ==== //depot/projects/netperf_socket/sys/netinet/in_pcb.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.136 2004/01/13 09:51:47 ume Exp $ + * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.137 2004/03/10 01:01:04 rwatson Exp $ */ #include "opt_ipsec.h" @@ -83,8 +83,6 @@ #include #endif /* FAST_IPSEC */ -struct in_addr zeroin_addr; - /* * These configure the range of local port addresses assigned to * "unspecified" outgoing connections/packets/whatever. ==== //depot/projects/netperf_socket/sys/netinet/in_var.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_var.h 8.2 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/netinet/in_var.h,v 1.48 2003/11/14 21:02:21 andre Exp $ + * $FreeBSD: src/sys/netinet/in_var.h,v 1.49 2004/03/10 01:01:04 rwatson Exp $ */ #ifndef _NETINET_IN_VAR_H_ @@ -83,7 +83,6 @@ #ifdef _KERNEL -extern struct in_addr zeroin_addr; extern u_char inetctlerrmap[]; /* ==== //depot/projects/netperf_socket/sys/netinet/ip_encap.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet/ip_encap.c,v 1.18 2003/06/01 09:20:38 phk Exp $ */ +/* $FreeBSD: src/sys/netinet/ip_encap.c,v 1.19 2004/03/10 02:48:50 rwatson Exp $ */ /* $KAME: ip_encap.c,v 1.41 2001/03/15 08:35:08 itojun Exp $ */ /* @@ -98,31 +98,20 @@ const struct sockaddr *); static void encap_fillarg(struct mbuf *, const struct encaptab *); -#ifndef LIST_HEAD_INITIALIZER -/* rely upon BSS initialization */ -LIST_HEAD(, encaptab) encaptab; -#else +/* + * All global variables in ip_encap.c are locked using encapmtx. + */ +static struct mtx encapmtx; +MTX_SYSINIT(encapmtx, &encapmtx, "encapmtx", MTX_DEF); LIST_HEAD(, encaptab) encaptab = LIST_HEAD_INITIALIZER(&encaptab); -#endif +/* + * We currently keey encap_init() for source code compatibility reasons -- + * it's referenced by KAME pieces in netinet6. + */ void encap_init() { - static int initialized = 0; - - if (initialized) - return; - initialized++; -#if 0 - /* - * we cannot use LIST_INIT() here, since drivers may want to call - * encap_attach(), on driver attach. encap_init() will be called - * on AF_INET{,6} initialization, which happens after driver - * initialization - using LIST_INIT() here can nuke encap_attach() - * from drivers. - */ - LIST_INIT(&encaptab); -#endif } #ifdef INET @@ -152,6 +141,7 @@ match = NULL; matchprio = 0; + mtx_lock(&encapmtx); LIST_FOREACH(ep, &encaptab, chain) { if (ep->af != AF_INET) continue; @@ -193,6 +183,7 @@ match = ep; } } + mtx_unlock(&encapmtx); if (match) { /* found a match, "match" has the best one */ @@ -237,6 +228,7 @@ match = NULL; matchprio = 0; + mtx_lock(&encapmtx); LIST_FOREACH(ep, &encaptab, chain) { if (ep->af != AF_INET6) continue; @@ -261,6 +253,7 @@ match = ep; } } + mtx_unlock(&encapmtx); if (match) { /* found a match */ @@ -285,6 +278,7 @@ struct encaptab *ep; { + mtx_assert(&encapmtx, MA_OWNED); LIST_INSERT_HEAD(&encaptab, ep, chain); } @@ -303,21 +297,17 @@ void *arg; { struct encaptab *ep; - int s; - s = splnet(); /* sanity check on args */ - if (sp->sa_len > sizeof(ep->src) || dp->sa_len > sizeof(ep->dst)) { - goto fail; - } - if (sp->sa_len != dp->sa_len) { - goto fail; - } - if (af != sp->sa_family || af != dp->sa_family) { - goto fail; - } + if (sp->sa_len > sizeof(ep->src) || dp->sa_len > sizeof(ep->dst)) + return (NULL); + if (sp->sa_len != dp->sa_len) + return (NULL); + if (af != sp->sa_family || af != dp->sa_family) + return (NULL); /* check if anyone have already attached with exactly same config */ + mtx_lock(&encapmtx); LIST_FOREACH(ep, &encaptab, chain) { if (ep->af != af) continue; @@ -332,12 +322,14 @@ bcmp(&ep->dstmask, dm, dp->sa_len) != 0) continue; - goto fail; + mtx_unlock(&encapmtx); + return (NULL); } ep = malloc(sizeof(*ep), M_NETADDR, M_NOWAIT); /*XXX*/ if (ep == NULL) { - goto fail; + mtx_unlock(&encapmtx); + return (NULL); } bzero(ep, sizeof(*ep)); @@ -351,13 +343,8 @@ ep->arg = arg; encap_add(ep); - - splx(s); - return ep; - -fail: - splx(s); - return NULL; + mtx_unlock(&encapmtx); + return (ep); } const struct encaptab * @@ -369,16 +356,14 @@ void *arg; { struct encaptab *ep; - int s; - s = splnet(); /* sanity check on args */ if (!func) - goto fail; + return (NULL); ep = malloc(sizeof(*ep), M_NETADDR, M_NOWAIT); /*XXX*/ if (ep == NULL) - goto fail; + return (NULL); bzero(ep, sizeof(*ep)); ep->af = af; @@ -387,14 +372,10 @@ ep->psw = psw; ep->arg = arg; + mtx_lock(&encapmtx); encap_add(ep); - - splx(s); - return ep; - -fail: - splx(s); - return NULL; + mtx_unlock(&encapmtx); + return (ep); } int @@ -404,13 +385,16 @@ const struct encaptab *ep = cookie; struct encaptab *p; + mtx_lock(&encapmtx); LIST_FOREACH(p, &encaptab, chain) { if (p == ep) { LIST_REMOVE(p, chain); + mtx_unlock(&encapmtx); free(p, M_NETADDR); /*XXX*/ return 0; } } + mtx_unlock(&encapmtx); return EINVAL; } From owner-p4-projects@FreeBSD.ORG Tue Mar 9 21:06:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3B0016A4D0; Tue, 9 Mar 2004 21:06:28 -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 7C3DF16A4CE for ; Tue, 9 Mar 2004 21:06:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D91A43D1D for ; Tue, 9 Mar 2004 21:06:28 -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.10/8.12.10) with ESMTP id i2A56SGe035230 for ; Tue, 9 Mar 2004 21:06:28 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2A56Rw9035226 for perforce@freebsd.org; Tue, 9 Mar 2004 21:06:27 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 9 Mar 2004 21:06:27 -0800 (PST) Message-Id: <200403100506.i2A56Rw9035226@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 48552 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 Mar 2004 05:06:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=48552 Change 48552 by rwatson@rwatson_paprika on 2004/03/09 21:06:02 Integrate netperf_socket: - Giant no longer required for some more kernel memory map operations. - Move ah_algorithms to static const global instad of function local to make it more clear that no synchronization is required (loopback via KAME). Affected files ... .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet6/ah_core.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/uma_core.c#4 integrate .. //depot/projects/netperf_socket/sys/vm/vm_fault.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.229 2004/03/09 20:53:01 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.230 2004/03/10 04:44:42 alc Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -320,10 +320,8 @@ * XXX do we need to move the TSS off the allocated pages * before freeing them? (not done here) */ - mtx_lock(&Giant); kmem_free(kernel_map, (vm_offset_t)pcb->pcb_ext, ctob(IOPAGES + 1)); - mtx_unlock(&Giant); pcb->pcb_ext = 0; } } ==== //depot/projects/netperf_socket/sys/netinet6/ah_core.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ah_core.c,v 1.22 2003/11/15 06:18:09 ume Exp $ */ +/* $FreeBSD: src/sys/netinet6/ah_core.c,v 1.23 2004/03/10 04:56:54 rwatson Exp $ */ /* $KAME: ah_core.c,v 1.59 2003/07/25 10:17:14 itojun Exp $ */ /* @@ -153,47 +153,48 @@ static void ah_update_mbuf __P((struct mbuf *, int, int, const struct ah_algorithm *, struct ah_algorithm_state *)); +/* checksum algorithms */ +static const struct ah_algorithm ah_algorithms[] = { + { ah_sumsiz_1216, ah_common_mature, 128, 128, "hmac-md5", + ah_hmac_md5_init, ah_hmac_md5_loop, + ah_hmac_md5_result, }, + { ah_sumsiz_1216, ah_common_mature, 160, 160, "hmac-sha1", + ah_hmac_sha1_init, ah_hmac_sha1_loop, + ah_hmac_sha1_result, }, + { ah_sumsiz_1216, ah_keyed_md5_mature, 128, 128, "keyed-md5", + ah_keyed_md5_init, ah_keyed_md5_loop, + ah_keyed_md5_result, }, + { ah_sumsiz_1216, ah_common_mature, 160, 160, "keyed-sha1", + ah_keyed_sha1_init, ah_keyed_sha1_loop, + ah_keyed_sha1_result, }, + { ah_sumsiz_zero, ah_none_mature, 0, 2048, "none", + ah_none_init, ah_none_loop, ah_none_result, }, + { ah_sumsiz_1216, ah_common_mature, 256, 256, + "hmac-sha2-256", + ah_hmac_sha2_256_init, ah_hmac_sha2_256_loop, + ah_hmac_sha2_256_result, }, + { ah_sumsiz_1216, ah_common_mature, 384, 384, + "hmac-sha2-384", + ah_hmac_sha2_384_init, ah_hmac_sha2_384_loop, + ah_hmac_sha2_384_result, }, + { ah_sumsiz_1216, ah_common_mature, 512, 512, + "hmac-sha2-512", + ah_hmac_sha2_512_init, ah_hmac_sha2_512_loop, + ah_hmac_sha2_512_result, }, + { ah_sumsiz_1216, ah_common_mature, 160, 160, + "hmac-ripemd160", + ah_hmac_ripemd160_init, ah_hmac_ripemd160_loop, + ah_hmac_ripemd160_result, }, + { ah_sumsiz_1216, ah_common_mature, 128, 128, + "aes-xcbc-mac", + ah_aes_xcbc_mac_init, ah_aes_xcbc_mac_loop, + ah_aes_xcbc_mac_result, }, +}; + const struct ah_algorithm * ah_algorithm_lookup(idx) int idx; { - /* checksum algorithms */ - static struct ah_algorithm ah_algorithms[] = { - { ah_sumsiz_1216, ah_common_mature, 128, 128, "hmac-md5", - ah_hmac_md5_init, ah_hmac_md5_loop, - ah_hmac_md5_result, }, - { ah_sumsiz_1216, ah_common_mature, 160, 160, "hmac-sha1", - ah_hmac_sha1_init, ah_hmac_sha1_loop, - ah_hmac_sha1_result, }, - { ah_sumsiz_1216, ah_keyed_md5_mature, 128, 128, "keyed-md5", - ah_keyed_md5_init, ah_keyed_md5_loop, - ah_keyed_md5_result, }, - { ah_sumsiz_1216, ah_common_mature, 160, 160, "keyed-sha1", - ah_keyed_sha1_init, ah_keyed_sha1_loop, - ah_keyed_sha1_result, }, - { ah_sumsiz_zero, ah_none_mature, 0, 2048, "none", - ah_none_init, ah_none_loop, ah_none_result, }, - { ah_sumsiz_1216, ah_common_mature, 256, 256, - "hmac-sha2-256", - ah_hmac_sha2_256_init, ah_hmac_sha2_256_loop, - ah_hmac_sha2_256_result, }, - { ah_sumsiz_1216, ah_common_mature, 384, 384, - "hmac-sha2-384", - ah_hmac_sha2_384_init, ah_hmac_sha2_384_loop, - ah_hmac_sha2_384_result, }, - { ah_sumsiz_1216, ah_common_mature, 512, 512, - "hmac-sha2-512", - ah_hmac_sha2_512_init, ah_hmac_sha2_512_loop, - ah_hmac_sha2_512_result, }, - { ah_sumsiz_1216, ah_common_mature, 160, 160, - "hmac-ripemd160", - ah_hmac_ripemd160_init, ah_hmac_ripemd160_loop, - ah_hmac_ripemd160_result, }, - { ah_sumsiz_1216, ah_common_mature, 128, 128, - "aes-xcbc-mac", - ah_aes_xcbc_mac_init, ah_aes_xcbc_mac_loop, - ah_aes_xcbc_mac_result, }, - }; switch (idx) { case SADB_AALG_MD5HMAC: ==== //depot/projects/netperf_socket/sys/vm/uma_core.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.92 2004/03/07 07:00:46 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.93 2004/03/10 04:44:43 alc Exp $"); /* I should really use ktr.. */ /* @@ -2052,17 +2052,7 @@ uma_large_free(uma_slab_t slab) { vsetobj((vm_offset_t)slab->us_data, kmem_object); - /* - * XXX: We get a lock order reversal if we don't have Giant: - * vm_map_remove (locks system map) -> vm_map_delete -> - * vm_map_entry_unwire -> vm_fault_unwire -> mtx_lock(&Giant) - */ - if (!mtx_owned(&Giant)) { - mtx_lock(&Giant); - page_free(slab->us_data, slab->us_size, slab->us_flags); - mtx_unlock(&Giant); - } else - page_free(slab->us_data, slab->us_size, slab->us_flags); + page_free(slab->us_data, slab->us_size, slab->us_flags); uma_zfree_internal(slabzone, slab, NULL, 0); } ==== //depot/projects/netperf_socket/sys/vm/vm_fault.c#3 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.185 2004/02/15 00:42:26 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.186 2004/03/10 04:44:43 alc Exp $"); #include #include @@ -1081,7 +1081,8 @@ pmap = vm_map_pmap(map); - mtx_lock(&Giant); + if (pmap != kernel_pmap) + mtx_lock(&Giant); /* * Since the pages are wired down, we must be able to get their * mappings from the physical map system. @@ -1095,7 +1096,8 @@ vm_page_unlock_queues(); } } - mtx_unlock(&Giant); + if (pmap != kernel_pmap) + mtx_unlock(&Giant); } /* From owner-p4-projects@FreeBSD.ORG Wed Mar 10 00:01:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F35A16A4D3; Wed, 10 Mar 2004 00:01: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 B6BCC16A4CF for ; Wed, 10 Mar 2004 00:01:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F60243D31 for ; Wed, 10 Mar 2004 00:01:07 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2A817Ge071876 for ; Wed, 10 Mar 2004 00:01:07 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2A810eC071863 for perforce@freebsd.org; Wed, 10 Mar 2004 00:01:00 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Wed, 10 Mar 2004 00:01:00 -0800 (PST) Message-Id: <200403100801.i2A810eC071863@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 48556 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 Mar 2004 08:01:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=48556 Change 48556 by marcel@marcel_nfs on 2004/03/10 00:00:12 Revamp the kernel debugger support. There's a non-optional front-end which constitutes the interface. Behind it are the debugger back-ends. The back-ends, currently only DDB and GDB, are optional and selectable at runtime. This commit replaces Debugger() and backtrace() references with kdb_enter() and kdb_backtrace() respectively. Where appropriate, is included. Note that most #ifdef DDB instances have to be replaced with #ifdef DEBUG, because DDB is specific to a single back-end, not to having debugging support in general. A new option, GDB, has been added to add support for gdb. This has to be worked-out still. More to come... Affected files ... .. //depot/projects/gdb/sys/alpha/alpha/db_interface.c#2 edit .. //depot/projects/gdb/sys/alpha/alpha/machdep.c#3 edit .. //depot/projects/gdb/sys/alpha/tlsb/zs_tlsb.c#3 edit .. //depot/projects/gdb/sys/amd64/amd64/db_interface.c#3 edit .. //depot/projects/gdb/sys/amd64/amd64/machdep.c#5 edit .. //depot/projects/gdb/sys/cam/scsi/scsi_low.h#2 edit .. //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#4 edit .. //depot/projects/gdb/sys/conf/NOTES#5 edit .. //depot/projects/gdb/sys/conf/files#5 edit .. //depot/projects/gdb/sys/conf/files.alpha#2 edit .. //depot/projects/gdb/sys/conf/files.amd64#4 edit .. //depot/projects/gdb/sys/conf/files.i386#4 edit .. //depot/projects/gdb/sys/conf/files.ia64#2 edit .. //depot/projects/gdb/sys/conf/files.pc98#4 edit .. //depot/projects/gdb/sys/conf/options#5 edit .. //depot/projects/gdb/sys/ddb/db_elf.c#2 edit .. //depot/projects/gdb/sys/ddb/db_kld.c#2 edit .. //depot/projects/gdb/sys/ddb/ddb.h#2 edit .. //depot/projects/gdb/sys/dev/acpica/Osd/OsdDebug.c#2 edit .. //depot/projects/gdb/sys/dev/en/midway.c#3 edit .. //depot/projects/gdb/sys/dev/syscons/syscons.c#4 edit .. //depot/projects/gdb/sys/dev/vinum/vinumhdr.h#2 edit .. //depot/projects/gdb/sys/dev/vinum/vinuminterrupt.c#2 edit .. //depot/projects/gdb/sys/dev/vinum/vinumioctl.c#2 edit .. //depot/projects/gdb/sys/dev/vinum/vinummemory.c#2 edit .. //depot/projects/gdb/sys/fs/devfs/devfs_devs.c#3 edit .. //depot/projects/gdb/sys/fs/nullfs/null_vfsops.c#2 edit .. //depot/projects/gdb/sys/fs/smbfs/smbfs_node.c#3 edit .. //depot/projects/gdb/sys/i386/i386/db_interface.c#3 edit .. //depot/projects/gdb/sys/i386/i386/machdep.c#3 edit .. //depot/projects/gdb/sys/i386/i386/trap.c#3 edit .. //depot/projects/gdb/sys/i386/include/frame.h#2 edit .. //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_hdr.h#3 edit .. //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_kbd.c#2 edit .. //depot/projects/gdb/sys/ia64/ia64/db_interface.c#2 edit .. //depot/projects/gdb/sys/ia64/ia64/machdep.c#3 edit .. //depot/projects/gdb/sys/kern/kern_clock.c#3 edit .. //depot/projects/gdb/sys/kern/kern_malloc.c#3 edit .. //depot/projects/gdb/sys/kern/kern_shutdown.c#3 edit .. //depot/projects/gdb/sys/kern/kern_switch.c#3 edit .. //depot/projects/gdb/sys/kern/sched_ule.c#4 edit .. //depot/projects/gdb/sys/kern/subr_kdb.c#1 add .. //depot/projects/gdb/sys/kern/subr_mbuf.c#2 edit .. //depot/projects/gdb/sys/kern/subr_witness.c#4 edit .. //depot/projects/gdb/sys/kern/vfs_subr.c#3 edit .. //depot/projects/gdb/sys/kern/vfs_vnops.c#2 edit .. //depot/projects/gdb/sys/netgraph/ng_base.c#3 edit .. //depot/projects/gdb/sys/netgraph/ng_socket.c#3 edit .. //depot/projects/gdb/sys/pc98/i386/machdep.c#2 edit .. //depot/projects/gdb/sys/pci/ncr.c#2 edit .. //depot/projects/gdb/sys/powerpc/powermac/pswitch.c#2 edit .. //depot/projects/gdb/sys/powerpc/powerpc/db_interface.c#2 edit .. //depot/projects/gdb/sys/powerpc/powerpc/machdep.c#4 edit .. //depot/projects/gdb/sys/security/mac_test/mac_test.c#4 edit .. //depot/projects/gdb/sys/sparc64/pci/psycho.c#2 edit .. //depot/projects/gdb/sys/sparc64/sparc64/machdep.c#2 edit .. //depot/projects/gdb/sys/sparc64/sparc64/trap.c#2 edit .. //depot/projects/gdb/sys/sys/kdb.h#1 add .. //depot/projects/gdb/sys/sys/systm.h#4 edit .. //depot/projects/gdb/sys/ufs/ffs/ffs_softdep.c#3 edit .. //depot/projects/gdb/sys/vm/uma_core.c#4 edit Differences ... ==== //depot/projects/gdb/sys/alpha/alpha/db_interface.c#2 (text+ko) ==== @@ -156,7 +156,7 @@ /* * Don't bother checking for usermode, since a benign entry - * by the kernel (call to Debugger() or a breakpoint) has + * by the kernel (call to kdb_enter() or a breakpoint) has * already checked for usermode. If neither of those * conditions exist, something Bad has happened. */ @@ -267,17 +267,6 @@ db_nofault = 0; } -void -Debugger(const char* msg) -{ - u_int saveintr; - - printf("%s\n", msg); - saveintr = alpha_pal_swpipl(ALPHA_PSL_IPL_HIGH); - __asm("call_pal 0x81"); /* XXX bugchk */ - alpha_pal_swpipl(saveintr); -} - /* * Alpha-specific ddb commands: * ==== //depot/projects/gdb/sys/alpha/alpha/machdep.c#3 (text+ko) ==== @@ -2226,14 +2226,6 @@ return (0); } -#ifndef DDB -void -Debugger(const char *msg) -{ - printf("Debugger(\"%s\") called.\n", msg); -} -#endif /* no DDB */ - static int sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS) { ==== //depot/projects/gdb/sys/alpha/tlsb/zs_tlsb.c#3 (text+ko) ==== @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -524,9 +525,9 @@ while (zs_get_status(base, 0) & 1) { c = zs_get_data(base, 0); -#ifdef DDB +#ifdef DEBUG if (c == CTRL('\\')) - Debugger("manual escape to debugger"); + kdb_enter("manual escape to debugger"); #endif if (tp && (tp->t_state & TS_ISOPEN)) (*linesw[tp->t_line].l_rint)(c, tp); @@ -539,9 +540,9 @@ while (zs_get_status(base, 1) & 1) { c = zs_get_data(base, 1); -#ifdef DDB +#ifdef DEBUG if (c == CTRL('\\')) - Debugger("manual escape to debugger"); + kdb_enter("manual escape to debugger"); #endif if (tp && (tp->t_state & TS_ISOPEN)) (*linesw[tp->t_line].l_rint)(c, tp); ==== //depot/projects/gdb/sys/amd64/amd64/db_interface.c#3 (text+ko) ==== @@ -311,32 +311,6 @@ } } -/* - * XXX - * Move this to machdep.c and allow it to be called if any debugger is - * installed. - */ -void -Debugger(const char *msg) -{ - static volatile u_int in_Debugger; - - /* - * XXX - * Do nothing if the console is in graphics mode. This is - * OK if the call is for the debugger hotkey but not if the call - * is a weak form of panicing. - */ - if (cnunavailable() != 0 && !(boothowto & RB_GDB)) - return; - - if (atomic_cmpset_acq_int(&in_Debugger, 0, 1)) { - db_printf("Debugger(\"%s\")\n", msg); - breakpoint(); - atomic_store_rel_int(&in_Debugger, 0); - } -} - void db_show_mdpcpu(struct pcpu *pc) { ==== //depot/projects/gdb/sys/amd64/amd64/machdep.c#5 (text+ko) ==== @@ -59,6 +59,7 @@ #include #include #include +#include #include #include #include @@ -1213,10 +1214,11 @@ atpic_startup(); #endif -#ifdef DDB kdb_init(); + +#ifdef DEBUG if (boothowto & RB_KDB) - Debugger("Boot flags requested debugger"); + kdb_enter("Boot flags requested debugger"); #endif identify_cpu(); /* Final stage of CPU initialization */ @@ -1772,14 +1774,6 @@ return 0; } -#ifndef DDB -void -Debugger(const char *msg) -{ - printf("Debugger(\"%s\") called.\n", msg); -} -#endif /* no DDB */ - #ifdef DDB /* ==== //depot/projects/gdb/sys/cam/scsi/scsi_low.h#2 (text+ko) ==== @@ -66,6 +66,7 @@ #ifdef __FreeBSD__ #include +#include #include #include #include @@ -86,7 +87,7 @@ #ifdef __FreeBSD__ #undef MSG_IDENTIFY -#define SCSI_LOW_DEBUGGER(dev) Debugger((dev)) +#define SCSI_LOW_DEBUGGER(dev) kdb_enter(dev) #define SCSI_LOW_DELAY(mu) DELAY((mu)) #define SCSI_LOW_SPLSCSI splcam #define SCSI_LOW_BZERO(pt, size) bzero((pt), (size)) ==== //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#4 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -1643,8 +1644,8 @@ __stdcall static void ntoskrnl_debugger(void) { - Debugger("ntoskrnl_debugger(): breakpoint"); - return; + + kdb_enter("ntoskrnl_debugger(): breakpoint"); } static void ==== //depot/projects/gdb/sys/conf/NOTES#5 (text+ko) ==== @@ -179,13 +179,13 @@ # MUTEX_DEBUG enables various extra assertions in the mutex code. # WITNESS enables the witness code which detects deadlocks and cycles # during locking operations. -# WITNESS_DDB causes the witness code to drop into the kernel debugger if +# WITNESS_KDB causes the witness code to drop into the kernel debugger if # a lock heirarchy violation occurs or if locks are held when going to # sleep. # WITNESS_SKIPSPIN disables the witness checks on spin mutexes. options MUTEX_DEBUG options WITNESS -options WITNESS_DDB +options WITNESS_KDB options WITNESS_SKIPSPIN # MUTEX_PROFILING - Profiling mutual exclusion locks (mutexes). See @@ -229,7 +229,19 @@ # DEBUGGING OPTIONS # -# Enable the kernel debugger. +# Print a stack trace of the current thread on the console for a panic. +# +options KDB_TRACE + +# +# Don't enter the debugger for a panic. Intended for unattended operation +# where you may want to enter the debugger from the console, but still want +# the machine to recover from a panic. +# +options KDB_UNATTENDED + +# +# Enable the ddb debugger backend. # options DDB @@ -248,25 +260,9 @@ options DDB_NUMSYM # -# Print a stack trace of the current thread out on the console for a panic. +# Enable the remote gdb debugger backend. # -options DDB_TRACE - -# -# Don't drop into DDB for a panic. Intended for unattended operation -# where you may want to drop to DDB from the console, but still want -# the machine to recover from a panic -# -options DDB_UNATTENDED - -# -# If using GDB remote mode to debug the kernel, there's a non-standard -# extension to the remote protocol that can be used to use the serial -# port as both the debugging port and the system console. It's non- -# standard and you're on your own if you enable it. See also the -# "remotechat" variables in the FreeBSD specific version of gdb. -# -options GDB_REMOTE_CHAT +options GDB # # KTRACE enables the system-call tracing facility ktrace(2). To be more @@ -1143,7 +1139,7 @@ options SC_ALT_MOUSE_IMAGE # simplified mouse cursor in text mode options SC_DFLT_FONT # compile font in makeoptions SC_DFLT_FONT=cp850 -options SC_DISABLE_DDBKEY # disable `debug' key +options SC_DISABLE_KDBKEY # disable `debug' key options SC_DISABLE_REBOOT # disable reboot key sequence options SC_HISTORY_SIZE=200 # number of history buffer lines options SC_MOUSE_CHAR=0x3 # char code for text mode mouse cursor ==== //depot/projects/gdb/sys/conf/files#5 (text+ko) ==== @@ -238,7 +238,6 @@ ddb/db_ps.c optional ddb ddb/db_run.c optional ddb ddb/db_sym.c optional ddb -ddb/db_sysctl.c optional ddb ddb/db_trap.c optional ddb ddb/db_variables.c optional ddb ddb/db_watch.c optional ddb @@ -1142,6 +1141,7 @@ kern/subr_disk.c standard kern/subr_eventhandler.c standard kern/subr_hints.c standard +kern/subr_kdb.c standard kern/subr_kobj.c standard kern/subr_log.c standard kern/subr_mbpool.c optional libmbpool ==== //depot/projects/gdb/sys/conf/files.alpha#2 (text+ko) ==== @@ -35,7 +35,7 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # -alpha/alpha/alpha-gdbstub.c optional ddb +alpha/alpha/alpha-gdbstub.c optional gdb alpha/alpha/api_up1000.c optional api_up1000 alpha/alpha/atomic.s standard alpha/alpha/autoconf.c standard ==== //depot/projects/gdb/sys/conf/files.amd64#4 (text+ko) ==== @@ -39,7 +39,7 @@ amd64/acpica/acpi_machdep.c optional acpi amd64/acpica/acpi_wakeup.c optional acpi amd64/acpica/madt.c optional acpi -amd64/amd64/amd64-gdbstub.c optional ddb +amd64/amd64/amd64-gdbstub.c optional gdb amd64/amd64/amd64_mem.c standard amd64/amd64/apic_vector.S standard amd64/amd64/atomic.c standard ==== //depot/projects/gdb/sys/conf/files.i386#4 (text+ko) ==== @@ -205,7 +205,7 @@ i386/i386/elf_machdep.c standard i386/i386/exception.s standard i386/i386/geode.c optional cpu_geode -i386/i386/i386-gdbstub.c optional ddb +i386/i386/i386-gdbstub.c optional gdb i386/i386/i686_mem.c standard i386/i386/identcpu.c standard i386/i386/in_cksum.c optional inet ==== //depot/projects/gdb/sys/conf/files.ia64#2 (text+ko) ==== @@ -102,7 +102,7 @@ ia64/ia64/eficlock.c standard ia64/ia64/elf_machdep.c standard ia64/ia64/exception.S standard -ia64/ia64/ia64-gdbstub.c optional ddb +ia64/ia64/ia64-gdbstub.c optional gdb ia64/ia64/in_cksum.c optional inet ia64/ia64/interrupt.c standard ia64/ia64/locore.S standard no-obj ==== //depot/projects/gdb/sys/conf/files.pc98#4 (text+ko) ==== @@ -146,7 +146,7 @@ i386/i386/dump_machdep.c standard i386/i386/elf_machdep.c standard i386/i386/exception.s standard -i386/i386/i386-gdbstub.c optional ddb +i386/i386/i386-gdbstub.c optional gdb i386/i386/i686_mem.c standard i386/i386/identcpu.c standard i386/i386/in_cksum.c optional inet ==== //depot/projects/gdb/sys/conf/options#5 (text+ko) ==== @@ -71,6 +71,15 @@ ADW_ALLOW_MEMIO opt_adw.h # Allow PCI devices to use memory # mapped I/O +# Debugging options. +DDB +DDB_NOKLDSYM opt_ddb.h +DDB_NUMSYM opt_ddb.h +GDB +GDBSPEED opt_gdb.h +KDB_TRACE opt_kdb.h +KDB_UNATTENDED opt_kdb.h + # Miscellaneous options. ADAPTIVE_MUTEXES ALQ @@ -81,14 +90,7 @@ COMPILING_LINT opt_global.h CONSPEED opt_comconsole.h CY_PCI_FASTINTR -DDB -DDB_NOKLDSYM opt_ddb.h -DDB_NUMSYM opt_ddb.h -DDB_TRACE -DDB_UNATTENDED DIRECTIO opt_directio.h -GDB_REMOTE_CHAT opt_ddb.h -GDBSPEED opt_ddb.h GEOM_AES opt_geom.h GEOM_APPLE opt_geom.h GEOM_BDE opt_geom.h @@ -579,7 +581,7 @@ KTR_ENTRIES opt_global.h KTR_VERBOSE opt_ktr.h WITNESS opt_global.h -WITNESS_DDB opt_witness.h +WITNESS_KDB opt_witness.h WITNESS_SKIPSPIN opt_witness.h # options for ACPI support @@ -632,7 +634,7 @@ SC_CUT_SEPCHARS opt_syscons.h SC_DEBUG_LEVEL opt_syscons.h SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h +SC_DISABLE_KDBKEY opt_syscons.h SC_DISABLE_REBOOT opt_syscons.h SC_HISTORY_SIZE opt_syscons.h SC_KERNEL_CONS_ATTR opt_syscons.h ==== //depot/projects/gdb/sys/ddb/db_elf.c#2 (text+ko) ==== @@ -382,7 +382,7 @@ #endif void -kdb_init(void) +db_init(void) { static Elf_Ehdr elf; static Elf_Shdr sh[2]; ==== //depot/projects/gdb/sys/ddb/db_kld.c#2 (text+ko) ==== @@ -125,7 +125,7 @@ * Initialization routine for a.out files. */ void -kdb_init() +db_init() { db_add_symbol_table(0, 0, "kernel", 0); } ==== //depot/projects/gdb/sys/ddb/ddb.h#2 (text+ko) ==== @@ -115,7 +115,7 @@ /* machine-dependent */ void db_stack_thread(db_expr_t addr, boolean_t have_addr, db_expr_t count, char *modif); -void kdb_init(void); +void db_init(void); db_cmdfcn_t db_breakpoint_cmd; db_cmdfcn_t db_continue_cmd; ==== //depot/projects/gdb/sys/dev/acpica/Osd/OsdDebug.c#2 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -86,12 +87,12 @@ fatal = (ACPI_SIGNAL_FATAL_INFO *)Info; printf("ACPI fatal signal, type 0x%x code 0x%x argument 0x%x", fatal->Type, fatal->Code, fatal->Argument); - Debugger("AcpiOsSignal"); + kdb_enter("AcpiOsSignal"); break; case ACPI_SIGNAL_BREAKPOINT: message = (char *)Info; - Debugger(message); + kdb_enter(message); break; default: ==== //depot/projects/gdb/sys/dev/en/midway.c#3 (text+ko) ==== @@ -127,6 +127,7 @@ #include #include +#include #include #include #include @@ -2442,9 +2443,7 @@ if_printf(&sc->ifatm.ifnet, "unexpected interrupt=0x%b, " "resetting\n", reg, MID_INTBITS); #ifdef EN_DEBUG -#ifdef DDB - Debugger("en: unexpected error"); -#endif /* DDB */ + kdb_enter("en: unexpected error"); sc->ifatm.ifnet.if_flags &= ~IFF_RUNNING; /* FREEZE! */ #else en_reset_ul(sc); ==== //depot/projects/gdb/sys/dev/syscons/syscons.c#4 (text+ko) ==== @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -3343,15 +3344,9 @@ break; case DBG: -#ifndef SC_DISABLE_DDBKEY -#ifdef DDB - Debugger("manual escape to debugger"); -#else - printf("No debugger in kernel\n"); +#ifndef SC_DISABLE_KDBKEY + kdb_enter("manual escape to debugger"); #endif -#else /* SC_DISABLE_DDBKEY */ - /* do nothing */ -#endif /* SC_DISABLE_DDBKEY */ break; case PNC: ==== //depot/projects/gdb/sys/dev/vinum/vinumhdr.h#2 (text+ko) ==== @@ -44,6 +44,7 @@ #ifdef _KERNEL #include "opt_vinum.h" #include +#include #include #include #include ==== //depot/projects/gdb/sys/dev/vinum/vinuminterrupt.c#2 (text+ko) ==== @@ -210,7 +210,7 @@ #ifdef VINUMDEBUG if (debug & DEBUG_RESID) { if (ubp->b_resid != 0) /* still something to transfer? */ - Debugger("resid"); + kdb_enter("resid"); } #endif ==== //depot/projects/gdb/sys/dev/vinum/vinumioctl.c#2 (text+ko) ==== @@ -201,7 +201,7 @@ boothowto |= RB_GDB; /* serial debug line */ else boothowto &= ~RB_GDB; /* local ddb */ - Debugger("vinum debug"); + kdb_enter("vinum debug"); } ioctl_reply = (struct _ioctl_reply *) data; /* reinstate the address to reply to */ ioctl_reply->error = 0; ==== //depot/projects/gdb/sys/dev/vinum/vinummemory.c#2 (text+ko) ==== @@ -175,7 +175,7 @@ for (i = 0; i < malloccount; i++) { if (((result + size) > malloced[i].address) && (result < malloced[i].address + malloced[i].size)) /* overlap */ - Debugger("Malloc overlap"); + kdb_enter("Malloc overlap"); } if (result) { char *f = basename(file); @@ -238,7 +238,7 @@ mem, file, line); - Debugger("Free"); + kdb_enter("Free"); } void ==== //depot/projects/gdb/sys/fs/devfs/devfs_devs.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -395,12 +396,12 @@ /* see if it was occupied */ dp = devfs_itod(ino); if (dp == NULL) - Debugger("dp == NULL\n"); + kdb_enter("dp == NULL\n"); if (*dp != NULL) continue; ip = devfs_itor(ino); if (ip == NULL) - Debugger("ip == NULL\n"); + kdb_enter("ip == NULL\n"); if (*ip != 0) continue; ==== //depot/projects/gdb/sys/fs/nullfs/null_vfsops.c#2 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include +#include #include #include #include @@ -264,7 +265,7 @@ #ifdef NULLFS_DEBUG if (VOP_ISLOCKED(vp, NULL)) { - Debugger("root vnode is locked.\n"); + kdb_enter("root vnode is locked.\n"); vrele(vp); return (EDEADLK); } ==== //depot/projects/gdb/sys/fs/smbfs/smbfs_node.c#3 (text+ko) ==== @@ -33,6 +33,7 @@ */ #include #include +#include #include #include #include @@ -140,7 +141,7 @@ cp--; if (*cp != 0xfc) { printf("First byte of name entry '%s' corrupted\n", name); - Debugger("ditto"); + kdb_enter("ditto"); } cp -= sizeof(int); nmlen = *(int*)cp; @@ -148,11 +149,11 @@ if (nmlen != slen) { printf("Name length mismatch: was %d, now %d name '%s'\n", nmlen, slen, name); - Debugger("ditto"); + kdb_enter("ditto"); } if (name[nmlen] != 0xfe) { printf("Last byte of name entry '%s' corrupted\n", name); - Debugger("ditto"); + kdb_enter("ditto"); } free(cp, M_SMBNODENAME); #else ==== //depot/projects/gdb/sys/i386/i386/db_interface.c#3 (text+ko) ==== @@ -53,12 +53,14 @@ static jmp_buf *db_nofault = 0; extern jmp_buf db_jmpbuf; +#if 0 extern void gdb_handle_exception(db_regs_t *, int, int); +static jmp_buf db_global_jmpbuf; +#endif int db_active; db_regs_t ddb_regs; -static jmp_buf db_global_jmpbuf; static __inline u_short rss(void) @@ -72,11 +74,12 @@ return ss; } +#if 0 /* - * kdb_trap - field a TRACE or BPT trap + * ddb_trap - field a TRACE or BPT trap */ int -kdb_trap(int type, int code, struct i386_saved_state *regs) +ddb_trap(int type, int code, struct i386_saved_state *regs) { u_int ef; volatile int ddb_mode = !(boothowto & RB_GDB); @@ -226,6 +229,7 @@ return (1); } +#endif /* * Read bytes from kernel address space for debugger. @@ -304,32 +308,6 @@ } } -/* - * XXX - * Move this to machdep.c and allow it to be called if any debugger is - * installed. - */ -void -Debugger(const char *msg) -{ - static volatile u_int in_Debugger; - - /* - * XXX - * Do nothing if the console is in graphics mode. This is - * OK if the call is for the debugger hotkey but not if the call - * is a weak form of panicing. - */ - if (cnunavailable() != 0 && !(boothowto & RB_GDB)) - return; - - if (atomic_cmpset_acq_int(&in_Debugger, 0, 1)) { - db_printf("Debugger(\"%s\")\n", msg); - breakpoint(); - atomic_store_rel_int(&in_Debugger, 0); - } -} - void db_show_mdpcpu(struct pcpu *pc) { ==== //depot/projects/gdb/sys/i386/i386/machdep.c#3 (text+ko) ==== @@ -59,6 +59,7 @@ #include #include #include +#include #include #include #include @@ -2098,10 +2099,11 @@ atpic_startup(); #endif -#ifdef DDB kdb_init(); + +#ifdef DEBUG if (boothowto & RB_KDB) - Debugger("Boot flags requested debugger"); + kdb_enter("Boot flags requested debugger"); #endif finishidentcpu(); /* Final stage of CPU initialization */ @@ -2744,14 +2746,6 @@ return 0; } -#ifndef DDB -void -Debugger(const char *msg) -{ - printf("Debugger(\"%s\") called.\n", msg); -} -#endif /* no DDB */ - #ifndef DEV_APIC #include ==== //depot/projects/gdb/sys/i386/i386/trap.c#3 (text+ko) ==== @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/gdb/sys/i386/include/frame.h#2 (text+ko) ==== @@ -153,8 +153,6 @@ int cf_ss; }; -int kdb_trap(int, int, struct trapframe *); - #define INTR_TO_TRAPFRAME(frame) ((struct trapframe *)&(frame)->if_fs) #endif /* _MACHINE_FRAME_H_ */ ==== //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_hdr.h#3 (text+ko) ==== @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_kbd.c#2 (text+ko) ==== @@ -945,27 +945,20 @@ shutdown_nice(0); #endif /* PCVT_CTRL_ALT_DEL */ -#if defined(DDB) /* Check for cntl-alt-esc */ +#if defined(DEBUG) /* Check for cntl-alt-esc */ if((key == 110) && ctrl_down && (meta_down || altgr_down)) { - static u_char in_Debugger; - - if(!in_Debugger) - { - in_Debugger = 1; - - /* the string is actually not used... */ - Debugger("kbd"); - - in_Debugger = 0; - if(noblock) - return NULL; - else - goto loop; - } - } -#endif /* defined(DDB) */ + if (!kdb_active) + { + kdb_enter("kbd"); + if(noblock) + return NULL; + else + goto loop; + } + } +#endif /* defined(DEBUG) */ /* look for keys with special handling */ if(key == 128) ==== //depot/projects/gdb/sys/ia64/ia64/db_interface.c#2 (text+ko) ==== @@ -428,13 +428,6 @@ db_nofault = 0; } -void -Debugger(const char* msg) -{ - printf("%s\n", msg); - __asm("break 0x80100"); -} - u_long db_register_value(db_regs_t *regs, int regno) { ==== //depot/projects/gdb/sys/ia64/ia64/machdep.c#3 (text+ko) ==== @@ -753,13 +753,13 @@ /* * Initialize debuggers, and break into them if appropriate. */ -#ifdef DDB kdb_init(); - if (boothowto & RB_KDB) { - printf("Boot flags requested debugger\n"); - breakpoint(); - } + +#ifdef DEBUG + if (boothowto & RB_KDB) + kdb_enter("Boot flags requested debugger\n"); #endif + ia64_set_tpr(0); /* @@ -1350,14 +1350,6 @@ return (1); } -#ifndef DDB -void -Debugger(const char *msg) -{ - printf("Debugger(\"%s\") called.\n", msg); -} -#endif /* no DDB */ - int sysbeep(int pitch, int period) { ==== //depot/projects/gdb/sys/kern/kern_clock.c#3 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -547,12 +548,12 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 10 00:17:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8562916A4D1; Wed, 10 Mar 2004 00:17: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 5F69016A4CE; Wed, 10 Mar 2004 00:17:24 -0800 (PST) Received: from critter.freebsd.dk (critter.freebsd.dk [212.242.86.163]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9715643D3F; Wed, 10 Mar 2004 00:17:23 -0800 (PST) (envelope-from phk@phk.freebsd.dk) Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.12.11/8.12.11) with ESMTP id i2A8HMHA039072; Wed, 10 Mar 2004 09:17:22 +0100 (CET) (envelope-from phk@phk.freebsd.dk) To: Marcel Moolenaar From: "Poul-Henning Kamp" In-Reply-To: Your message of "Wed, 10 Mar 2004 00:01:00 PST." <200403100801.i2A810eC071863@repoman.freebsd.org> Date: Wed, 10 Mar 2004 09:17:22 +0100 Message-ID: <39071.1078906642@critter.freebsd.dk> cc: Perforce Change Reviews Subject: Re: PERFORCE change 48556 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 Mar 2004 08:17:25 -0000 In message <200403100801.i2A810eC071863@repoman.freebsd.org>, Marcel Moolenaar writes: >http://perforce.freebsd.org/chv.cgi?CH=48556 > >Change 48556 by marcel@marcel_nfs on 2004/03/10 00:00:12 > > Revamp the kernel debugger support. There's a non-optional > front-end which constitutes the interface. Behind it are > the debugger back-ends. The back-ends, currently only DDB > and GDB, are optional and selectable at runtime. > > This commit replaces Debugger() and backtrace() references > with kdb_enter() and kdb_backtrace() respectively. Where > appropriate, is included. > > Note that most #ifdef DDB instances have to be replaced > with #ifdef DEBUG, because DDB is specific to a single > back-end, not to having debugging support in general. A > new option, GDB, has been added to add support for gdb. > This has to be worked-out still. #ifdef DEBUG is a singulary bad choice since much code have private use of that macro. -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From owner-p4-projects@FreeBSD.ORG Wed Mar 10 08:15:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A96F16A4D0; Wed, 10 Mar 2004 08:15: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 3273E16A4CE for ; Wed, 10 Mar 2004 08:15:47 -0800 (PST) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0E3243D1D for ; Wed, 10 Mar 2004 08:15:46 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by ns1.xcllnt.net (8.12.11/8.12.11) with ESMTP id i2AGFkpn016083; Wed, 10 Mar 2004 08:15:46 -0800 (PST) (envelope-from marcel@piii.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) i2AGFkrH036043; Wed, 10 Mar 2004 08:15:46 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.11/8.12.11/Submit) id i2AGFcVm036042; Wed, 10 Mar 2004 08:15:38 -0800 (PST) (envelope-from marcel) Date: Wed, 10 Mar 2004 08:15:37 -0800 From: Marcel Moolenaar To: Poul-Henning Kamp Message-ID: <20040310161537.GA36028@dhcp01.pn.xcllnt.net> References: <200403100801.i2A810eC071863@repoman.freebsd.org> <39071.1078906642@critter.freebsd.dk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <39071.1078906642@critter.freebsd.dk> User-Agent: Mutt/1.4.2.1i cc: Perforce Change Reviews Subject: Re: PERFORCE change 48556 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 Mar 2004 16:15:47 -0000 On Wed, Mar 10, 2004 at 09:17:22AM +0100, Poul-Henning Kamp wrote: > In message <200403100801.i2A810eC071863@repoman.freebsd.org>, Marcel Moolenaar > > Note that most #ifdef DDB instances have to be replaced > > with #ifdef DEBUG, because DDB is specific to a single > > back-end, not to having debugging support in general. A > > new option, GDB, has been added to add support for gdb. > > This has to be worked-out still. > > #ifdef DEBUG is a singulary bad choice since much code have private > use of that macro. The point of using a define is to be able to get rid of the debugger calls in production systems. It doesn't matter if DEBUG has private meaning as long as it relates to having debugging code. Other than that, anything else is fine too, as long as it's not DDB. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Wed Mar 10 09:00:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B30116A4CE; Wed, 10 Mar 2004 09:00: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 11B8216A511 for ; Wed, 10 Mar 2004 09:00:45 -0800 (PST) Received: from critter.freebsd.dk (critter.freebsd.dk [212.242.86.163]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC1A643D2D for ; Wed, 10 Mar 2004 09:00:44 -0800 (PST) (envelope-from phk@phk.freebsd.dk) Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.12.11/8.12.11) with ESMTP id i2AH0h3Z043077; Wed, 10 Mar 2004 18:00:44 +0100 (CET) (envelope-from phk@phk.freebsd.dk) To: Marcel Moolenaar From: "Poul-Henning Kamp" In-Reply-To: Your message of "Wed, 10 Mar 2004 08:15:37 PST." <20040310161537.GA36028@dhcp01.pn.xcllnt.net> Date: Wed, 10 Mar 2004 18:00:43 +0100 Message-ID: <43076.1078938043@critter.freebsd.dk> cc: Perforce Change Reviews Subject: Re: PERFORCE change 48556 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 Mar 2004 17:00:47 -0000 In message <20040310161537.GA36028@dhcp01.pn.xcllnt.net>, Marcel Moolenaar writ es: >On Wed, Mar 10, 2004 at 09:17:22AM +0100, Poul-Henning Kamp wrote: >> In message <200403100801.i2A810eC071863@repoman.freebsd.org>, Marcel Moolenaar >> > Note that most #ifdef DDB instances have to be replaced >> > with #ifdef DEBUG, because DDB is specific to a single >> > back-end, not to having debugging support in general. A >> > new option, GDB, has been added to add support for gdb. >> > This has to be worked-out still. >> >> #ifdef DEBUG is a singulary bad choice since much code have private >> use of that macro. > >The point of using a define is to be able to get rid of the debugger >calls in production systems. It doesn't matter if DEBUG has private >meaning as long as it relates to having debugging code. Other than >that, anything else is fine too, as long as it's not DDB. Well, having an option people cannot enable without crippling a lot of other code is no good either. I'll really suggest you use #ifdef KDB or something more specific than DEBUG. -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From owner-p4-projects@FreeBSD.ORG Wed Mar 10 09:22:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE8A816A4D0; Wed, 10 Mar 2004 09:22:22 -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 A88E016A4CE for ; Wed, 10 Mar 2004 09:22:22 -0800 (PST) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0632543D45 for ; Wed, 10 Mar 2004 09:22:22 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from ns1.xcllnt.net (localhost [127.0.0.1]) by ns1.xcllnt.net (8.12.11/8.12.11) with ESMTP id i2AHMLEG016433; Wed, 10 Mar 2004 09:22:21 -0800 (PST) (envelope-from marcel@ns1.xcllnt.net) Received: (from marcel@localhost) by ns1.xcllnt.net (8.12.11/8.12.11/Submit) id i2AHMHcZ016432; Wed, 10 Mar 2004 09:22:17 -0800 (PST) (envelope-from marcel) Date: Wed, 10 Mar 2004 09:22:17 -0800 From: Marcel Moolenaar To: Poul-Henning Kamp Message-ID: <20040310172217.GA16418@ns1.xcllnt.net> References: <20040310161537.GA36028@dhcp01.pn.xcllnt.net> <43076.1078938043@critter.freebsd.dk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <43076.1078938043@critter.freebsd.dk> User-Agent: Mutt/1.5.5.1i cc: Perforce Change Reviews Subject: Re: PERFORCE change 48556 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 Mar 2004 17:22:23 -0000 On Wed, Mar 10, 2004 at 06:00:43PM +0100, Poul-Henning Kamp wrote: > > Well, having an option people cannot enable without crippling a lot > of other code is no good either. I'll really suggest you use > #ifdef KDB or something more specific than DEBUG. Works for me. KDB it is. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Wed Mar 10 09:24:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40DFF16A4CF; Wed, 10 Mar 2004 09:24:27 -0800 (PST) Delivered-To: perforce@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 931) id 010A816A4D0; Wed, 10 Mar 2004 09:24:26 -0800 (PST) Date: Wed, 10 Mar 2004 07:24:26 -1000 From: juli mallett To: Marcel Moolenaar Message-ID: <20040310172426.GA75977@FreeBSD.org> References: <200403100801.i2A810eC071863@repoman.freebsd.org> <39071.1078906642@critter.freebsd.dk> <20040310161537.GA36028@dhcp01.pn.xcllnt.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20040310161537.GA36028@dhcp01.pn.xcllnt.net> User-Agent: Mutt/1.4.1i X-Negacore: Yes X-Authentication-Warning: localhost: juli pwned teh intarweb X-Disclaimer: Opinions expressed about the deliciousness of eating brains are my own unless expressed by my employer. cc: Poul-Henning Kamp cc: Perforce Change Reviews Subject: Re: PERFORCE change 48556 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 Mar 2004 17:24:27 -0000 * Marcel Moolenaar [ Date: 2004-03-10 ] [ w.r.t. Re: PERFORCE change 48556 for review ] > On Wed, Mar 10, 2004 at 09:17:22AM +0100, Poul-Henning Kamp wrote: > > In message <200403100801.i2A810eC071863@repoman.freebsd.org>, Marcel Moolenaar > > > Note that most #ifdef DDB instances have to be replaced > > > with #ifdef DEBUG, because DDB is specific to a single > > > back-end, not to having debugging support in general. A > > > new option, GDB, has been added to add support for gdb. > > > This has to be worked-out still. > > > > #ifdef DEBUG is a singulary bad choice since much code have private > > use of that macro. > > The point of using a define is to be able to get rid of the debugger > calls in production systems. It doesn't matter if DEBUG has private > meaning as long as it relates to having debugging code. Other than > that, anything else is fine too, as long as it's not DDB. I disagree. What if you are defining DEBUG and a file was once: #if DEBUG /* Ignore privlege elevation checks or something similarly * dangerous, in the hopes of figuring out what's going on * and then leave the system in a useless state so I can * debug my own code. */ #endif #if DDB /* For the average user, just show a warning and backtrace * to show me. */ #endif What PHK means is "#if DEBUG" is other people's macro, it's ambiguous, and it's not necessarily the sort of debugging you want to enable. As long as you're running with "kdb" why not: #if KDB #if KERNEL_DEBUGGER #if KERNEL_DEBUGGING #if KDEBUGGER -- juli mallett. jmallett@freebsd.org. adrift in the pacific. From owner-p4-projects@FreeBSD.ORG Wed Mar 10 13:46:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E72B16A4D0; Wed, 10 Mar 2004 13:46:39 -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 EBE2E16A4CE for ; Wed, 10 Mar 2004 13:46:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE8BF43D31 for ; Wed, 10 Mar 2004 13:46:38 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2ALkcGe083080 for ; Wed, 10 Mar 2004 13:46:38 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2ALkcCV083077 for perforce@freebsd.org; Wed, 10 Mar 2004 13:46:38 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Wed, 10 Mar 2004 13:46:38 -0800 (PST) Message-Id: <200403102146.i2ALkcCV083077@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 48623 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 Mar 2004 21:46:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=48623 Change 48623 by marcel@marcel_nfs on 2004/03/10 13:46:37 Replace #ifdef DDB with #ifdef KDB and not with #ifdef DEBUG. Add KDB as a global option. Requested by: phk, jmallet Affected files ... .. //depot/projects/gdb/sys/alpha/tlsb/zs_tlsb.c#4 edit .. //depot/projects/gdb/sys/amd64/amd64/machdep.c#6 edit .. //depot/projects/gdb/sys/conf/NOTES#6 edit .. //depot/projects/gdb/sys/conf/options#6 edit .. //depot/projects/gdb/sys/i386/i386/machdep.c#4 edit .. //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_kbd.c#3 edit .. //depot/projects/gdb/sys/ia64/ia64/machdep.c#4 edit .. //depot/projects/gdb/sys/kern/kern_clock.c#4 edit .. //depot/projects/gdb/sys/kern/kern_shutdown.c#4 edit .. //depot/projects/gdb/sys/kern/subr_witness.c#5 edit .. //depot/projects/gdb/sys/kern/vfs_vnops.c#3 edit .. //depot/projects/gdb/sys/pc98/i386/machdep.c#3 edit .. //depot/projects/gdb/sys/powerpc/powermac/pswitch.c#3 edit .. //depot/projects/gdb/sys/sparc64/sparc64/machdep.c#3 edit Differences ... ==== //depot/projects/gdb/sys/alpha/tlsb/zs_tlsb.c#4 (text+ko) ==== @@ -525,7 +525,7 @@ while (zs_get_status(base, 0) & 1) { c = zs_get_data(base, 0); -#ifdef DEBUG +#ifdef KDB if (c == CTRL('\\')) kdb_enter("manual escape to debugger"); #endif @@ -540,7 +540,7 @@ while (zs_get_status(base, 1) & 1) { c = zs_get_data(base, 1); -#ifdef DEBUG +#ifdef KDB if (c == CTRL('\\')) kdb_enter("manual escape to debugger"); #endif ==== //depot/projects/gdb/sys/amd64/amd64/machdep.c#6 (text+ko) ==== @@ -1216,7 +1216,7 @@ kdb_init(); -#ifdef DEBUG +#ifdef KDB if (boothowto & RB_KDB) kdb_enter("Boot flags requested debugger"); #endif ==== //depot/projects/gdb/sys/conf/NOTES#6 (text+ko) ==== @@ -229,6 +229,11 @@ # DEBUGGING OPTIONS # +# Compile with kernel debugger related code. +# +options KDB + +# # Print a stack trace of the current thread on the console for a panic. # options KDB_TRACE ==== //depot/projects/gdb/sys/conf/options#6 (text+ko) ==== @@ -77,6 +77,7 @@ DDB_NUMSYM opt_ddb.h GDB GDBSPEED opt_gdb.h +KDB opt_global.h KDB_TRACE opt_kdb.h KDB_UNATTENDED opt_kdb.h ==== //depot/projects/gdb/sys/i386/i386/machdep.c#4 (text+ko) ==== @@ -2101,7 +2101,7 @@ kdb_init(); -#ifdef DEBUG +#ifdef KDB if (boothowto & RB_KDB) kdb_enter("Boot flags requested debugger"); #endif ==== //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_kbd.c#3 (text+ko) ==== @@ -945,7 +945,7 @@ shutdown_nice(0); #endif /* PCVT_CTRL_ALT_DEL */ -#if defined(DEBUG) /* Check for cntl-alt-esc */ +#if defined(KDB) /* Check for cntl-alt-esc */ if((key == 110) && ctrl_down && (meta_down || altgr_down)) { @@ -958,7 +958,7 @@ goto loop; } } -#endif /* defined(DEBUG) */ +#endif /* defined(KDB) */ /* look for keys with special handling */ if(key == 128) ==== //depot/projects/gdb/sys/ia64/ia64/machdep.c#4 (text+ko) ==== @@ -755,7 +755,7 @@ */ kdb_init(); -#ifdef DEBUG +#ifdef KDB if (boothowto & RB_KDB) kdb_enter("Boot flags requested debugger\n"); #endif ==== //depot/projects/gdb/sys/kern/kern_clock.c#4 (text+ko) ==== @@ -548,12 +548,12 @@ } printf("Total %20ju\n", (uintmax_t)inttotal); -#ifdef DEBUG +#ifdef KDB kdb_backtrace(); kdb_enter("watchdog timeout"); #else panic("watchdog timeout"); -#endif /* DEBUG */ +#endif /* KDB */ } #endif /* SW_WATCHDOG */ ==== //depot/projects/gdb/sys/kern/kern_shutdown.c#4 (text+ko) ==== @@ -84,7 +84,7 @@ */ #include -#ifdef DEBUG +#ifdef KDB #ifdef KDB_UNATTENDED int debugger_on_panic = 0; #else @@ -100,7 +100,7 @@ #endif SYSCTL_INT(_debug, OID_AUTO, trace_on_panic, CTLFLAG_RW, &trace_on_panic, 0, "Print stack trace on kernel panic"); -#endif /* DEBUG */ +#endif /* KDB */ int sync_on_panic = 1; SYSCTL_INT(_kern, OID_AUTO, sync_on_panic, CTLFLAG_RW, @@ -507,7 +507,7 @@ #endif #endif -#ifdef DEBUG +#ifdef KDB if (newpanic && trace_on_panic) kdb_backtrace(); if (debugger_on_panic) ==== //depot/projects/gdb/sys/kern/subr_witness.c#5 (text+ko) ==== @@ -207,10 +207,10 @@ SYSCTL_PROC(_debug, OID_AUTO, witness_watch, CTLFLAG_RW | CTLTYPE_INT, NULL, 0, sysctl_debug_witness_watch, "I", "witness is watching lock operations"); -#ifdef DEBUG +#ifdef KDB /* - * When DEBUG is enabled and witness_kdb is set to 1, it will cause the - * system to drop into kdebug() when: + * When KDB is enabled and witness_kdb is set to 1, it will cause the system + * to drop into kdebug() when: * - a lock heirarchy violation occurs * - locks are held when going to sleep. */ @@ -223,15 +223,15 @@ SYSCTL_INT(_debug, OID_AUTO, witness_kdb, CTLFLAG_RW, &witness_kdb, 0, ""); /* - * When DEBUG is enabled and witness_trace is set to 1, it will cause the - * system to print a stack trace: + * When KDB is enabled and witness_trace is set to 1, it will cause the system + * to print a stack trace: * - a lock heirarchy violation occurs * - locks are held when going to sleep. */ int witness_trace = 1; TUNABLE_INT("debug.witness_trace", &witness_trace); SYSCTL_INT(_debug, OID_AUTO, witness_trace, CTLFLAG_RW, &witness_trace, 0, ""); -#endif /* DEBUG */ +#endif /* KDB */ #ifdef WITNESS_SKIPSPIN int witness_skipspin = 1; @@ -872,7 +872,7 @@ mtx_unlock_spin(&w_mtx); return; -#ifdef DEBUG +#ifdef KDB debugger: if (witness_trace) kdb_backtrace(); @@ -1148,7 +1148,7 @@ } if (flags & WARN_PANIC && n) panic("witness_warn"); -#ifdef DEBUG +#ifdef KDB else if (witness_kdb && n) kdb_enter(__func__); #endif ==== //depot/projects/gdb/sys/kern/vfs_vnops.c#3 (text+ko) ==== @@ -790,7 +790,7 @@ } error = VOP_IOCTL(vp, com, data, fp->f_flag, active_cred, td); if (error == ENOIOCTL) { -#ifdef DEBUG +#ifdef DIAGNOSTIC kdb_enter("ENOIOCTL leaked through"); #endif error = ENOTTY; ==== //depot/projects/gdb/sys/pc98/i386/machdep.c#3 (text+ko) ==== @@ -2166,7 +2166,7 @@ kdb_init(); -#ifdef DEBUG +#ifdef KDB if (boothowto & RB_KDB) kdb_enter("Boot flags requested debugger"); #endif ==== //depot/projects/gdb/sys/powerpc/powermac/pswitch.c#3 (text+ko) ==== @@ -138,7 +138,5 @@ dev = (device_t)arg; -#ifdef DEBUG kdb_enter(device_get_nameunit(dev)); -#endif } ==== //depot/projects/gdb/sys/sparc64/sparc64/machdep.c#3 (text+ko) ==== @@ -385,7 +385,7 @@ kdb_init(); -#ifdef DEBUG +#ifdef KDB if (boothowto & RB_KDB) kdb_enter("Boot flags requested debugger"); #endif From owner-p4-projects@FreeBSD.ORG Wed Mar 10 13:56:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E26316A4D0; Wed, 10 Mar 2004 13:56: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 EE50C16A4CE for ; Wed, 10 Mar 2004 13:56:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCEE143D48 for ; Wed, 10 Mar 2004 13:56:05 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2ALu5Ge085253 for ; Wed, 10 Mar 2004 13:56:05 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2ALtpNg085244 for perforce@freebsd.org; Wed, 10 Mar 2004 13:55:51 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Wed, 10 Mar 2004 13:55:51 -0800 (PST) Message-Id: <200403102155.i2ALtpNg085244@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 48624 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 Mar 2004 21:56:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=48624 Change 48624 by jhb@jhb_slimer on 2004/03/10 13:55:03 IFC @48610. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#66 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#54 integrate .. //depot/projects/smpng/sys/alpha/alpha/promcons.c#17 integrate .. //depot/projects/smpng/sys/alpha/include/critical.h#4 integrate .. //depot/projects/smpng/sys/alpha/include/pmap.h#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/critical.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#22 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#23 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#16 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/smpng/sys/amd64/include/cpufunc.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/critical.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/dvcfg.h#1 branch .. //depot/projects/smpng/sys/amd64/include/physio_proc.h#1 branch .. //depot/projects/smpng/sys/amd64/include/pmap.h#9 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/efi_console.c#4 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#22 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#19 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#10 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#6 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#11 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#9 integrate .. //depot/projects/smpng/sys/conf/NOTES#63 integrate .. //depot/projects/smpng/sys/conf/files#105 integrate .. //depot/projects/smpng/sys/conf/files.amd64#13 integrate .. //depot/projects/smpng/sys/conf/files.i386#55 integrate .. //depot/projects/smpng/sys/conf/files.pc98#53 integrate .. //depot/projects/smpng/sys/conf/kern.mk#10 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#28 integrate .. //depot/projects/smpng/sys/conf/options#71 integrate .. //depot/projects/smpng/sys/conf/options.amd64#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acapps.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdispat.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acefi.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acgcc.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/achware.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acnamesp.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acoutput.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acparser.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpi.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acresrc.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acstruct.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actables.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl1.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl2.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlcode.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlresrc.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslanalyze.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfold.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltree.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbhistry.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbxface.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmbuffer.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmnames.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmobject.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmopcode.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrc.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcl.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcs.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmutils.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmwalk.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsinit.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswscope.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evsci.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfevnt.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconvrt.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfield.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exnames.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg3.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg6.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstoren.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstorob.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwacpi.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwgpe.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwtimer.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsnames.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsobject.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsparse.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nswalk.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfeval.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfname.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfobj.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psopcode.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psscope.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pstree.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psutils.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pswalk.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsaddr.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscreate.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsdump.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsio.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsirq.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rslist.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmemory.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmisc.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsutils.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsxface.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbrsdt.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbutils.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utalloc.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utclib.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utinit.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmath.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utxface.c#13 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#17 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#38 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#12 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#61 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#21 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#24 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#7 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_powerres.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#23 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#39 integrate .. //depot/projects/smpng/sys/dev/adlink/adlink.c#7 integrate .. //depot/projects/smpng/sys/dev/advansys/advmcode.h#2 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#48 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#24 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#31 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#38 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#10 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#20 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#48 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#23 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#26 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/smpng/sys/dev/ctau/ctau.c#2 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.h#17 integrate .. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#15 integrate .. //depot/projects/smpng/sys/dev/drm/drm_vm.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_state.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/sis_ds.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/sis_mm.c#3 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#18 integrate .. //depot/projects/smpng/sys/dev/ed/if_edvar.h#6 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#22 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#12 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751reg.h#4 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#10 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#1 branch .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#1 branch .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/smpng/sys/dev/ips/ips.c#9 integrate .. //depot/projects/smpng/sys/dev/ips/ips.h#6 integrate .. //depot/projects/smpng/sys/dev/ips/ips_commands.c#8 integrate .. //depot/projects/smpng/sys/dev/ips/ips_disk.c#6 integrate .. //depot/projects/smpng/sys/dev/ips/ips_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#12 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lncvar.h#3 integrate .. //depot/projects/smpng/sys/dev/md/md.c#46 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx.c#14 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm.c#5 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_attach.c#4 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_intr.c#3 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_ioctl.c#5 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_rtables.c#3 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_rx.c#5 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_tx.c#5 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#40 integrate .. //depot/projects/smpng/sys/dev/random/harvest.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ess.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb8.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pci/als4000.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/au88x0.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/aureal.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cs4281.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csapcm.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ds1.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#25 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/neomagic.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/solo.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pci/vibes.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#27 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.h#10 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#20 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#15 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#15 integrate .. //depot/projects/smpng/sys/dev/trm/trm.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/if_udav.c#1 branch .. //depot/projects/smpng/sys/dev/usb/if_udavreg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/ubser.c#1 branch .. //depot/projects/smpng/sys/dev/usb/ubser.h#1 branch .. //depot/projects/smpng/sys/dev/usb/uftdi.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#36 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#47 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#47 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#47 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.c#16 integrate .. //depot/projects/smpng/sys/dev/utopia/utopia.c#4 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumext.h#10 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumio.c#17 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#15 integrate .. //depot/projects/smpng/sys/dev/watchdog/watchdog.c#1 branch .. //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#15 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#30 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#16 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_work.c#12 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#3 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.h#3 integrate .. //depot/projects/smpng/sys/geom/geom.h#36 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#23 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#27 integrate .. //depot/projects/smpng/sys/geom/geom_int.h#12 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#38 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_toshiba.c#2 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#78 integrate .. //depot/projects/smpng/sys/i386/i386/critical.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/geode.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/p4tcc.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#58 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#48 integrate .. //depot/projects/smpng/sys/i386/include/cpufunc.h#25 integrate .. //depot/projects/smpng/sys/i386/include/critical.h#6 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#19 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#54 integrate .. //depot/projects/smpng/sys/ia64/include/critical.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/pmap.h#15 integrate .. //depot/projects/smpng/sys/isa/fd.c#30 integrate .. //depot/projects/smpng/sys/kern/init_main.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#67 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#73 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#74 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#88 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#66 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#52 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#24 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#29 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#62 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#48 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#31 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#48 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#33 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#59 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#70 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#69 integrate .. //depot/projects/smpng/sys/modules/Makefile#71 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#20 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_video/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ctau/Makefile#1 branch .. //depot/projects/smpng/sys/modules/if_ndis/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/ndis/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/netgraph/Makefile#11 integrate .. //depot/projects/smpng/sys/modules/netgraph/atmllc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/vlan/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ubser/Makefile#1 branch .. //depot/projects/smpng/sys/modules/udav/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.c#33 integrate .. //depot/projects/smpng/sys/net/bpfdesc.h#8 integrate .. //depot/projects/smpng/sys/net/if_disc.c#11 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#43 integrate .. //depot/projects/smpng/sys/net/if_faith.c#19 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#16 integrate .. //depot/projects/smpng/sys/net/if_loop.c#27 integrate .. //depot/projects/smpng/sys/net/if_stf.c#23 integrate .. //depot/projects/smpng/sys/net/if_tap.c#24 integrate .. //depot/projects/smpng/sys/net/raw_usrreq.c#14 integrate .. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#17 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#11 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#9 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#8 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_atmllc.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_atmllc.h#1 branch .. //depot/projects/smpng/sys/netgraph/ng_iface.c#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_vlan.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_vlan.h#1 branch .. //depot/projects/smpng/sys/netinet/in_pcb.c#42 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#9 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#29 integrate .. //depot/projects/smpng/sys/netinet/ip_encap.c#12 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#50 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#30 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#53 integrate .. //depot/projects/smpng/sys/netinet/pim.h#2 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#51 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#46 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#23 integrate .. //depot/projects/smpng/sys/netinet6/ah_core.c#7 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#20 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#30 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#8 integrate .. //depot/projects/smpng/sys/netipx/ipx_pcb.c#10 integrate .. //depot/projects/smpng/sys/netipx/spx_usrreq.c#11 integrate .. //depot/projects/smpng/sys/netnatm/natm.c#17 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.c#11 integrate .. //depot/projects/smpng/sys/netsmb/smb_trantcp.c#16 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_socket.c#2 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_subs.c#3 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#14 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#35 integrate .. //depot/projects/smpng/sys/nfsserver/nfs.h#10 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvcache.c#7 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#16 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#18 integrate .. //depot/projects/smpng/sys/opencrypto/crypto.c#10 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#40 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#22 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#29 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio_cbus.c#6 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd_cd.h#3 integrate .. //depot/projects/smpng/sys/powerpc/include/critical.h#5 integrate .. //depot/projects/smpng/sys/powerpc/include/sr.h#3 integrate .. //depot/projects/smpng/sys/powerpc/include/ucontext.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/vmparam.h#4 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/copyinout.c#9 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#50 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#38 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#32 integrate .. //depot/projects/smpng/sys/rpc/rpcclnt.c#4 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#10 integrate .. //depot/projects/smpng/sys/sparc64/include/_types.h#4 integrate .. //depot/projects/smpng/sys/sparc64/include/critical.h#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#45 integrate .. //depot/projects/smpng/sys/sys/_null.h#4 integrate .. //depot/projects/smpng/sys/sys/eventhandler.h#19 integrate .. //depot/projects/smpng/sys/sys/filedesc.h#21 integrate .. //depot/projects/smpng/sys/sys/kernel.h#23 integrate .. //depot/projects/smpng/sys/sys/mdioctl.h#7 integrate .. //depot/projects/smpng/sys/sys/mutex.h#40 integrate .. //depot/projects/smpng/sys/sys/param.h#58 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#11 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#35 integrate .. //depot/projects/smpng/sys/sys/time.h#14 integrate .. //depot/projects/smpng/sys/sys/watchdog.h#3 integrate .. //depot/projects/smpng/sys/vm/pmap.h#23 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#42 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#22 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#21 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#34 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#39 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#57 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#41 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#51 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#48 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#22 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#44 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#15 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#66 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.216 2004/01/03 02:02:24 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.218 2004/03/01 19:19:15 kensmith Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -201,6 +201,9 @@ long unknownmem; /* amount of memory with an unknown use */ int ncpus; /* number of cpus */ +int promcons_dly_mkdev = 1; /* need to delay call to make_dev() */ +void promcons_delayed_makedev(void); + vm_offset_t phys_avail[10]; /* must be 2 less so 0 0 can signal end of chunks */ @@ -582,22 +585,6 @@ } snprintf(cpu_model, sizeof(cpu_model), "%s", platform.model); - /* - * Initalize the real console, so the the bootstrap console is - * no longer necessary. - */ -#ifndef NO_SIO - if (platform.cons_init) { - platform.cons_init(); - promcndetach(); - } -#else - if (platform.cons_init) - platform.cons_init(); - promcndetach(); - cninit(); -#endif - /* NO MORE FIRMWARE ACCESS ALLOWED */ #ifdef _PMAP_MAY_USE_PROM_CONSOLE /* @@ -889,6 +876,32 @@ } /* + * Initalize the real console, so the the bootstrap console is + * no longer necessary. Note this now involves mutexes as part + * of some operations so needs to be after proc0/thread0/curthread + * become valid. + */ +#ifndef NO_SIO + if (platform.cons_init) { + platform.cons_init(); + promcndetach(); + } +#else + if (platform.cons_init) + platform.cons_init(); + promcndetach(); + cninit(); +#endif + + /* + * Check to see if promcons needs to make_dev() now, + * doing it before now crashes with kernel stack issues. + */ + if (promcons_dly_mkdev > 1) + promcons_delayed_makedev(); + promcons_dly_mkdev = 0; + + /* * Initialize the virtual memory system, and set the * page table base register in proc 0's PCB. */ ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#54 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.139 2003/10/03 22:46:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.140 2004/03/07 21:06:46 alc Exp $"); #include #include @@ -1109,18 +1109,6 @@ mtx_lock_spin(&allpmaps_lock); LIST_INSERT_HEAD(&allpmaps, pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); -} - -/* - * Wire in kernel global address entries. To avoid a race condition - * between pmap initialization and pmap_growkernel, this procedure - * should be called after the vmspace is attached to the process - * but before this pmap is activated. - */ -void -pmap_pinit2(pmap) - struct pmap *pmap; -{ bcopy(PTlev1 + K1SEGLEV1I, pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE); } ==== //depot/projects/smpng/sys/alpha/alpha/promcons.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.34 2004/02/21 21:10:38 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.36 2004/02/28 16:36:14 kensmith Exp $"); #include #include @@ -83,6 +83,9 @@ int promparam(struct tty *, struct termios *); void promstop(struct tty *, int); +extern int promcons_dly_mkdev; +void promcons_delayed_makedev(void); + int promopen(dev, flag, mode, td) dev_t dev; @@ -248,12 +251,24 @@ { prom_consdev.cn_pri = CN_NORMAL; sprintf(prom_consdev.cn_name, "promcons"); - make_dev(&prom_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "promcons"); + if (promcons_dly_mkdev) + promcons_dly_mkdev++; + else { + make_dev(&prom_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "promcons"); + } cnadd(&prom_consdev); promcn_attached = 1; } void +promcons_delayed_makedev(void) +{ + if (promcn_attached) { + make_dev(&prom_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "promcons"); + } +} + +void promcndetach(void) { if (promcn_attached) { ==== //depot/projects/smpng/sys/alpha/include/critical.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * related support functions residing * in //critical.c - prototyped * - * $FreeBSD: src/sys/alpha/include/critical.h,v 1.3 2003/08/12 23:24:03 imp Exp $ + * $FreeBSD: src/sys/alpha/include/critical.h,v 1.4 2004/03/05 09:19:59 le Exp $ */ #ifndef _MACHINE_CRITICAL_H_ @@ -81,8 +81,8 @@ #else /* !__GNUC__ */ -void cpu_critical_enter(void) -void cpu_critical_exit(void) +void cpu_critical_enter(void); +void cpu_critical_exit(void); #endif /* __GNUC__ */ ==== //depot/projects/smpng/sys/alpha/include/pmap.h#17 (text+ko) ==== @@ -43,7 +43,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.24 2003/10/06 01:47:11 bms Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.25 2004/03/07 07:13:15 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -212,8 +212,6 @@ extern pt_entry_t *CMAP1; extern vm_offset_t avail_end; extern vm_offset_t avail_start; -extern vm_offset_t clean_eva; -extern vm_offset_t clean_sva; extern vm_offset_t phys_avail[]; extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; ==== //depot/projects/smpng/sys/amd64/amd64/critical.c#6 (text+ko) ==== @@ -26,15 +26,19 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.13 2003/12/06 23:13:22 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.14 2004/03/05 14:31:21 bde Exp $"); #include #include #include + #include +#include /* * cpu_critical_fork_exit() - cleanup after fork + * + * Enable interrupts in the saved copy of eflags. */ void cpu_critical_fork_exit(void) ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#7 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.128 2003/11/21 03:01:59 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.129 2004/03/06 00:51:30 peter Exp $"); #include "opt_cpu.h" @@ -123,8 +123,8 @@ } if (strcmp(cpu_vendor, "GenuineIntel") == 0) { - /* How the hell did you get here?? */ - strcat(cpu_model, "Yamhill?"); + /* Better late than never I suppose.. */ + strcat(cpu_model, "IA-32e"); } else if (strcmp(cpu_vendor, "AuthenticAMD") == 0) { /* * Values taken from AMD Processor Recognition ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.7 2004/01/30 00:24:45 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.8 2004/03/08 00:15:29 peter Exp $"); #include #include @@ -691,8 +691,8 @@ intr_restore(eflags); } +#define BEFORE_SPIN 1000000 #ifdef DETECT_DEADLOCK -#define BEFORE_SPIN 1000000 #define AFTER_SPIN 1000 #endif @@ -723,11 +723,9 @@ destfield = dest; } -#ifdef DETECT_DEADLOCK - /* Check for an earlier stuck IPI. */ + /* Wait for an earlier IPI to finish. */ if (!lapic_ipi_wait(BEFORE_SPIN)) panic("APIC: Previous IPI is stuck"); -#endif lapic_ipi_raw(icrlo, destfield); ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#22 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.604 2004/02/25 23:12:39 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.605 2004/03/08 00:16:52 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1162,6 +1162,7 @@ pcpu_init(pc, 0, sizeof(struct pcpu)); PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); + PCPU_SET(curpcb, thread0.td_pcb); PCPU_SET(tssp, &common_tss[0]); /* ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.234 2004/01/30 00:24:45 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.235 2004/03/08 00:25:03 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#23 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.452 2004/02/05 00:11:05 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.453 2004/03/07 21:06:47 alc Exp $"); /* * Manages physical address maps. @@ -1103,19 +1103,6 @@ } /* - * Wire in kernel global address entries. To avoid a race condition - * between pmap initialization and pmap_growkernel, this procedure - * should be called after the vmspace is attached to the process - * but before this pmap is activated. - */ -void -pmap_pinit2(pmap) - struct pmap *pmap; -{ - /* XXX: Remove this stub when no longer called */ -} - -/* * this routine is called if the page table page is not * mapped correctly. * ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#16 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.272 2004/01/29 00:05:03 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.273 2004/03/08 00:17:27 peter Exp $"); /* * AMD64 Trap and System call handling @@ -371,8 +371,7 @@ frame.tf_rip = (long)doreti_iret_fault; goto out; } - if (PCPU_GET(curpcb) != NULL && - PCPU_GET(curpcb)->pcb_onfault != NULL) { + if (PCPU_GET(curpcb)->pcb_onfault != NULL) { frame.tf_rip = (long)PCPU_GET(curpcb)->pcb_onfault; goto out; @@ -555,7 +554,6 @@ nogo: if (!usermode) { if (td->td_intr_nesting_level == 0 && - PCPU_GET(curpcb) != NULL && PCPU_GET(curpcb)->pcb_onfault != NULL) { frame->tf_rip = (long)PCPU_GET(curpcb)->pcb_onfault; return (0); ==== //depot/projects/smpng/sys/amd64/conf/NOTES#4 (text+ko) ==== @@ -4,31 +4,67 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.4 2004/02/19 04:39:14 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.10 2004/03/05 08:04:10 obrien Exp $ # +# We don't have modules on amd64. +makeoptions NO_MODULES=not_yet + # # This directive is mandatory; it defines the architecture to be -# configured for; in this case, the 386 family based IBM-PC and -# compatibles. +# configured for; in this case, the AMD64 family based machines. # machine amd64 -cpu HAMMER -# +# # We want LINT to cover profiling as well -profile 2 +#XXX#profile 2 + + +##################################################################### +# SMP OPTIONS: +# +# The apic device enables the use of the I/O APIC for interrupt delivery. +# The apic device can be used in both UP and SMP kernels, but is required +# for SMP kernels. Thus, the apic device is not strictly an SMP option, +# but it is a prerequisite for SMP. +# +# Notes: +# +# By default, mixed mode is used to route IRQ0 from the AT timer via +# the 8259A master PIC through the ExtINT pin on the first I/O APIC. +# This can be disabled via the NO_MIXED_MODE option. In that case, +# IRQ0 will be routed via an intpin on the first I/O APIC. Not all +# motherboards hook IRQ0 up to the first I/O APIC even though their +# MP table or MADT may claim to do so. That is why mixed mode is +# enabled by default. +# + +# Optional: +device atpic # Optional legacy pic support +device mptable # Optional MPSPEC mptable support +options NO_MIXED_MODE # Disable use of mixed mode -# Debug options -options NPX_DEBUG # enable npx debugging (FPU/math emu) - #new math emulator +##################################################################### +# CPU OPTIONS + +# +# You must specify at least one CPU (the one you intend to run on); +# deleting the specification for CPUs you don't need to use may make +# parts of the system run faster. +# +cpu HAMMER # aka K8, aka Opteron & Athlon64 + +# +# Options for CPU features. +# # # PERFMON causes the driver for Pentium/Pentium Pro performance counters # to be compiled. See perfmon(4) for more information. # -options PERFMON +#XXX#options PERFMON ##################################################################### @@ -39,7 +75,7 @@ # of network device drivers, which has significant benefits in terms # of robustness to overloads and responsivity, as well as permitting # accurate scheduling of the CPU time between kernel network processing -# and other activities. The drawback is a moderate (up to 1/HZ seconds) +# and other activities. The drawback is a moderate (up to 1/HZ seconds) # potential increase in response times. # It is strongly recommended to use HZ=1000 or 2000 with DEVICE_POLLING # to achieve smoother behaviour. @@ -48,8 +84,8 @@ # the CPU fraction reserved to userland with the sysctl variable # kern.polling.user_frac (default 50, range 0..100). # -# Only the "dc" "fxp" and "sis" devices support this mode of operation at -# the time of this writing. +# Not all device drivers support this mode of operation at the time of +# this writing. See polling(4) for more details. options DEVICE_POLLING @@ -59,20 +95,22 @@ # The following options are used for debugging clock behavior only, and # should not be used for production systems. -# -# CLK_CALIBRATION_LOOP will run the clock calibration loop at startup -# until the user presses a key. +# CLK_CALIBRATION_LOOP causes clock calibration to be run in a loop at +# startup until the user presses a key. (The i8254 clock is always +# calibrated relative to the RTC (mc146818a) and this option causes the +# calibration to be repeated.) options CLK_CALIBRATION_LOOP +# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254 +# clock to actually be used. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 10 15:44:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDB0616A510; Wed, 10 Mar 2004 15:43: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 AE6C216A4F1 for ; Wed, 10 Mar 2004 15:43:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DF5C43D2F for ; Wed, 10 Mar 2004 15:43:59 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2ANhxGe010512 for ; Wed, 10 Mar 2004 15:43:59 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2ANhxbT010509 for perforce@freebsd.org; Wed, 10 Mar 2004 15:43:59 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Wed, 10 Mar 2004 15:43:59 -0800 (PST) Message-Id: <200403102343.i2ANhxbT010509@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 48643 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 Mar 2004 23:44:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=48643 Change 48643 by marcel@marcel_nfs on 2004/03/10 15:43:41 Cleanup kdb_trap(). Each platform had its own implementation of this function, with differing prototypes. Since it's basicly a wrapper for db_trap() most of the logic can be moved there with appropriate calls to MD specific functions. For now, just compile-out the existing kdb_trap() functions and fixup the existing call-sites. When DDB and GDB get hooked into the KDB frontend, this will be merged into a single db_trap() (or gdb_trap() for that matter). Affected files ... .. //depot/projects/gdb/sys/alpha/alpha/db_interface.c#3 edit .. //depot/projects/gdb/sys/alpha/alpha/interrupt.c#2 edit .. //depot/projects/gdb/sys/alpha/alpha/trap.c#2 edit .. //depot/projects/gdb/sys/alpha/include/db_machdep.h#2 edit .. //depot/projects/gdb/sys/amd64/amd64/db_interface.c#4 edit .. //depot/projects/gdb/sys/amd64/amd64/trap.c#4 edit .. //depot/projects/gdb/sys/amd64/include/frame.h#2 edit .. //depot/projects/gdb/sys/ia64/ia64/db_interface.c#3 edit .. //depot/projects/gdb/sys/ia64/ia64/machdep.c#5 edit .. //depot/projects/gdb/sys/ia64/ia64/trap.c#3 edit .. //depot/projects/gdb/sys/ia64/include/db_machdep.h#2 edit .. //depot/projects/gdb/sys/kern/subr_kdb.c#2 edit .. //depot/projects/gdb/sys/powerpc/include/db_machdep.h#2 edit .. //depot/projects/gdb/sys/powerpc/powerpc/db_interface.c#3 edit .. //depot/projects/gdb/sys/powerpc/powerpc/trap.c#2 edit .. //depot/projects/gdb/sys/sparc64/include/frame.h#2 edit .. //depot/projects/gdb/sys/sparc64/sparc64/db_interface.c#2 edit .. //depot/projects/gdb/sys/sparc64/sparc64/trap.c#3 edit Differences ... ==== //depot/projects/gdb/sys/alpha/alpha/db_interface.c#3 (text+ko) ==== @@ -143,11 +143,12 @@ entry); } +#if 0 /* * ddb_trap - field a kernel trap */ int -kdb_trap(a0, a1, a2, entry, regs) +ddb_trap(a0, a1, a2, entry, regs) unsigned long a0, a1, a2, entry; db_regs_t *regs; { @@ -225,6 +226,7 @@ */ return (1); } +#endif /* * Read bytes from kernel address space for debugger. ==== //depot/projects/gdb/sys/alpha/alpha/interrupt.c#2 (text+ko) ==== @@ -230,8 +230,8 @@ printf(" pid = %d, comm = %s\n", curproc->p_pid, curproc->p_comm); printf("\n"); -#ifdef DDB - kdb_trap(mces, vector, param, ALPHA_KENTRY_MM, framep); +#ifdef KDB + kdb_trap(ALPHA_KENTRY_MM, mces, framep); #endif panic("machine check"); } ==== //depot/projects/gdb/sys/alpha/alpha/trap.c#2 (text+ko) ==== @@ -375,7 +375,7 @@ */ if (a0 == ALPHA_IF_CODE_BUGCHK || a0 == ALPHA_IF_CODE_BPT) { - if (kdb_trap(a0, a1, a2, entry, framep)) + if (kdb_trap(entry, a0, framep)) goto out; } @@ -595,8 +595,8 @@ dopanic: printtrap(a0, a1, a2, entry, framep, 1, user); /* XXX dump registers */ -#ifdef DDB - kdb_trap(a0, a1, a2, entry, framep); +#ifdef KDB + kdb_trap(entry, a0, framep); #endif panic("trap"); } ==== //depot/projects/gdb/sys/alpha/include/db_machdep.h#2 (text+ko) ==== @@ -95,8 +95,6 @@ #define next_instr_address(v, b) ((db_addr_t) ((b) ? (v) : ((v) + 4))) u_long db_register_value(db_regs_t *, int); -int kdb_trap(unsigned long, unsigned long, unsigned long, - unsigned long, struct trapframe *); /* * Pretty arbitrary ==== //depot/projects/gdb/sys/amd64/amd64/db_interface.c#4 (text+ko) ==== @@ -69,11 +69,12 @@ return ss; } +#if 0 /* - * kdb_trap - field a TRACE or BPT trap + * ddb_trap - field a TRACE or BPT trap */ int -kdb_trap(int type, int code, struct amd64_saved_state *regs) +ddb_trap(int type, int code, struct amd64_saved_state *regs) { u_long ef; volatile int ddb_mode = !(boothowto & RB_GDB); @@ -233,6 +234,7 @@ return (1); } +#endif /* * Read bytes from kernel address space for debugger. ==== //depot/projects/gdb/sys/amd64/amd64/trap.c#4 (text+ko) ==== @@ -283,7 +283,7 @@ /* machine/parity/power fail/"kitchen sink" faults */ /* XXX Giant */ if (isa_nmi(code) == 0) { -#ifdef DDB +#ifdef KDB /* * NMI can be hooked up to a pushbutton * for debugging. @@ -292,7 +292,7 @@ printf ("NMI ... going to debugger\n"); kdb_trap (type, 0, &frame); } -#endif /* DDB */ +#endif /* KDB */ goto userout; } else if (panic_on_nmi) panic("NMI indicates hardware failure"); @@ -422,7 +422,7 @@ * If DDB is enabled, let it handle the debugger trap. * Otherwise, debugger traps "can't happen". */ -#ifdef DDB +#ifdef KDB /* XXX Giant */ if (kdb_trap (type, 0, &frame)) goto out; @@ -434,7 +434,7 @@ /* XXX Giant */ /* machine/parity/power fail/"kitchen sink" faults */ if (isa_nmi(code) == 0) { -#ifdef DDB +#ifdef KDB /* * NMI can be hooked up to a pushbutton * for debugging. @@ -443,7 +443,7 @@ printf ("NMI ... going to debugger\n"); kdb_trap (type, 0, &frame); } -#endif /* DDB */ +#endif /* KDB */ goto out; } else if (panic_on_nmi == 0) goto out; @@ -630,10 +630,6 @@ } #ifdef KDB - if (kdb_trap(&psl)) - return; -#endif -#ifdef DDB if ((debugger_on_panic || db_active) && kdb_trap(type, 0, frame)) return; #endif ==== //depot/projects/gdb/sys/amd64/include/frame.h#2 (text+ko) ==== @@ -140,6 +140,4 @@ register_t cf_ss; }; -int kdb_trap(int, int, struct trapframe *); - #endif /* _MACHINE_FRAME_H_ */ ==== //depot/projects/gdb/sys/ia64/ia64/db_interface.c#3 (text+ko) ==== @@ -278,11 +278,12 @@ #define CPUSTOP_ON_DDBBREAK #define VERBOSE_CPUSTOP_ON_DDBBREAK +#if 0 /* * ddb_trap - field a kernel trap */ int -kdb_trap(int vector, struct trapframe *regs) +ddb_trap(int vector, struct trapframe *regs) { int ddb_mode = !(boothowto & RB_GDB); register_t s; @@ -393,6 +394,7 @@ */ return (1); } +#endif /* * Read bytes from kernel address space for debugger. ==== //depot/projects/gdb/sys/ia64/ia64/machdep.c#5 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/gdb/sys/ia64/ia64/trap.c#3 (text+ko) ==== @@ -316,8 +316,8 @@ { printtrap(vector, tf, 1, TRAPF_USERMODE(tf)); -#ifdef DDB - kdb_trap(vector, tf); +#ifdef KDB + kdb_trap(vector, 0, tf); #endif panic("trap"); } @@ -461,8 +461,8 @@ sig = SIGTRAP; } } else { -#ifdef DDB - if (kdb_trap(vector, tf)) +#ifdef KDB + if (kdb_trap(vector, 0, tf)) return; panic("trap"); #else @@ -626,8 +626,8 @@ case IA64_VEC_SINGLE_STEP_TRAP: tf->tf_special.psr &= ~IA64_PSR_SS; if (!user) { -#ifdef DDB - if (kdb_trap(vector, tf)) +#ifdef KDB + if (kdb_trap(vector, 0, tf)) return; panic("trap"); #else ==== //depot/projects/gdb/sys/ia64/include/db_machdep.h#2 (text+ko) ==== @@ -83,7 +83,6 @@ #define next_instr_address(v, b) ((db_addr_t) ((b) ? (v) : ((v) + 4))) u_long db_register_value(db_regs_t *, int); -int kdb_trap(int vector, struct trapframe *regs); u_int64_t *db_rse_current_frame(void); u_int64_t *db_rse_previous_frame(u_int64_t *bsp, int sof); ==== //depot/projects/gdb/sys/kern/subr_kdb.c#2 (text+ko) ==== ==== //depot/projects/gdb/sys/powerpc/include/db_machdep.h#2 (text+ko) ==== @@ -104,7 +104,6 @@ #ifdef _KERNEL void kdb_kintr(void *); -int kdb_trap(int, void *); #endif /* _KERNEL */ ==== //depot/projects/gdb/sys/powerpc/powerpc/db_interface.c#3 (text+ko) ==== @@ -63,11 +63,12 @@ if (type == EXC_PGM && (frame->srr1 & 0x20000)) { type = T_BREAKPOINT; } - return kdb_trap(type, frame); + return kdb_trap(type, 0, frame); } return 0; } +#if 0 int ddb_trap(type, v) int type; @@ -143,6 +144,7 @@ return 1; } +#endif #ifdef PPC_IBM4XX const struct db_command db_machine_command_table[] = { ==== //depot/projects/gdb/sys/powerpc/powerpc/trap.c#2 (text+ko) ==== @@ -271,8 +271,8 @@ { printtrap(frame->exc, frame, 1, (frame->srr1 & PSL_PR)); -#ifdef DDB - if ((debugger_on_panic || db_active) && kdb_trap(frame->exc, frame)) +#ifdef KDB + if ((debugger_on_panic || db_active) && kdb_trap(frame->exc, 0, frame)) return; #endif panic("%s trap", trapname(frame->exc)); ==== //depot/projects/gdb/sys/sparc64/include/frame.h#2 (text+ko) ==== @@ -90,6 +90,4 @@ int rwindow_save(struct thread *td); int rwindow_load(struct thread *td, struct trapframe *tf, int n); -int kdb_trap(struct trapframe *tf); - #endif /* !_MACHINE_FRAME_H_ */ ==== //depot/projects/gdb/sys/sparc64/sparc64/db_interface.c#2 (text+ko) ==== @@ -60,6 +60,7 @@ static jmp_buf db_global_jmpbuf; static int db_global_jmpbuf_valid; +#if 0 int kdb_trap(struct trapframe *tf) { @@ -88,6 +89,7 @@ TF_DONE(tf); return (1); } +#endif void db_read_bytes(vm_offset_t addr, size_t size, char *data) ==== //depot/projects/gdb/sys/sparc64/sparc64/trap.c#3 (text+ko) ==== @@ -298,10 +298,10 @@ ("trap: kernel trap isn't")); switch (tf->tf_type & ~T_KERNEL) { -#ifdef DDB +#ifdef KDB case T_BREAKPOINT: case T_KSTACK_FAULT: - error = (kdb_trap(tf) == 0); + error = (kdb_trap(tf->tf_type, 0, tf) == 0); break; #ifdef notyet case T_PA_WATCHPOINT: From owner-p4-projects@FreeBSD.ORG Wed Mar 10 19:42:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 915D616A4D0; Wed, 10 Mar 2004 19:42: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 194DD16A4CE for ; Wed, 10 Mar 2004 19:42:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8AF943D1F for ; Wed, 10 Mar 2004 19:42:10 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2B3gAGe069147 for ; Wed, 10 Mar 2004 19:42:10 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2B3gAEk069141 for perforce@freebsd.org; Wed, 10 Mar 2004 19:42:10 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Wed, 10 Mar 2004 19:42:10 -0800 (PST) Message-Id: <200403110342.i2B3gAEk069141@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 48668 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 Mar 2004 03:42:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=48668 Change 48668 by marcel@marcel_nfs on 2004/03/10 19:41:18 Add a first draft of a debug port for the GDB backend. The debug port is registered in the same way as a console and the GDB backend pretty much goes through the same probe, select and initialize steps as the console. The end result being that a single device is selected as the communication medium. As such, any device that has a GDB_DBGPORT entry can be used. This file is not hooked into the build yet. Affected files ... .. //depot/projects/gdb/sys/dev/uart/uart_dbg.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Mar 10 19:53:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C22EF16A4D0; Wed, 10 Mar 2004 19:53: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 9563B16A4CE for ; Wed, 10 Mar 2004 19:53:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77D3D43D45 for ; Wed, 10 Mar 2004 19:53:25 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2B3rPGe071373 for ; Wed, 10 Mar 2004 19:53:25 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2B3rO5e071370 for perforce@freebsd.org; Wed, 10 Mar 2004 19:53:24 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Wed, 10 Mar 2004 19:53:24 -0800 (PST) Message-Id: <200403110353.i2B3rO5e071370@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 48669 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 Mar 2004 03:53:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=48669 Change 48669 by marcel@marcel_nfs on 2004/03/10 19:53:21 First draft of the GDB debug port interface. Affected files ... .. //depot/projects/gdb/sys/gdb/gdb.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Mar 10 20:17:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0F0016A4D0; Wed, 10 Mar 2004 20:17: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 B51D816A4CE for ; Wed, 10 Mar 2004 20:17:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9522B43D2D for ; Wed, 10 Mar 2004 20:17:55 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2B4HtGe076427 for ; Wed, 10 Mar 2004 20:17:55 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2B4Ht8U076424 for perforce@freebsd.org; Wed, 10 Mar 2004 20:17:55 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Wed, 10 Mar 2004 20:17:55 -0800 (PST) Message-Id: <200403110417.i2B4Ht8U076424@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 48670 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 Mar 2004 04:17:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=48670 Change 48670 by marcel@marcel_nfs on 2004/03/10 20:17:06 Have gdb.h and uart_dbg.c agree on the interface. This compiles. Affected files ... .. //depot/projects/gdb/sys/dev/uart/uart_dbg.c#2 edit .. //depot/projects/gdb/sys/gdb/gdb.h#2 edit Differences ... ==== //depot/projects/gdb/sys/dev/uart/uart_dbg.c#2 (text+ko) ==== @@ -29,21 +29,24 @@ #include #include +#include +#include +#include #include #include #include -static gdb_probe_t uart_dbg_probe; -static gdb_init_t uart_dbg_init; -static gdb_term_t uart_dbg_term; -static gdb_getc_t uart_dbg_getc; -static gdb_checkc_t uart_dbg_checkc; -static gdb_putc_t uart_dbg_putc; +static gdb_probe_f uart_dbg_probe; +static gdb_init_f uart_dbg_init; +static gdb_term_f uart_dbg_term; +static gdb_getc_f uart_dbg_getc; +static gdb_checkc_f uart_dbg_checkc; +static gdb_putc_f uart_dbg_putc; -GDB_DBGPORT(uart, uart_dbg_probe, uart_dbg_init, uart_dbg_term, uart_dbg_getc, - uart_dbg_checkc, uart_dbg_putc); +GDB_DBGPORT(uart, uart_dbg_probe, uart_dbg_init, uart_dbg_term, + uart_dbg_checkc, uart_dbg_getc, uart_dbg_putc); static struct uart_devinfo uart_dbgport; @@ -70,28 +73,28 @@ } static void -uart_cnterm(void) +uart_dbg_term(void) { uart_term(&uart_dbgport); } static void -uart_cnputc(int c) +uart_dbg_putc(int c) { uart_putc(&uart_dbgport, c); } static int -uart_cncheckc(void) +uart_dbg_checkc(void) { return (uart_poll(&uart_dbgport)); } static int -uart_cngetc(void) +uart_dbg_getc(void) { return (uart_getc(&uart_dbgport)); ==== //depot/projects/gdb/sys/gdb/gdb.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ typedef int gdb_getc_f(void); typedef void gdb_init_f(void); typedef int gdb_probe_f(void); -typedef void gdb_putc_f(void); +typedef void gdb_putc_f(int); typedef void gdb_term_f(void); struct gdb_dbgport { From owner-p4-projects@FreeBSD.ORG Wed Mar 10 21:31:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE3DC16A4D0; Wed, 10 Mar 2004 21:31:28 -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 935F816A4CE for ; Wed, 10 Mar 2004 21:31:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88C6043D39 for ; Wed, 10 Mar 2004 21:31:28 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2B5VSGe098696 for ; Wed, 10 Mar 2004 21:31:28 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2B5VSUZ098687 for perforce@freebsd.org; Wed, 10 Mar 2004 21:31:28 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Wed, 10 Mar 2004 21:31:28 -0800 (PST) Message-Id: <200403110531.i2B5VSUZ098687@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 48677 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 Mar 2004 05:31:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=48677 Change 48677 by marcel@marcel_nfs on 2004/03/10 21:31:12 First draft of the KDB backend interface. Affected files ... .. //depot/projects/gdb/sys/kern/subr_kdb.c#3 edit .. //depot/projects/gdb/sys/sys/kdb.h#2 edit Differences ... ==== //depot/projects/gdb/sys/kern/subr_kdb.c#3 (text+ko) ==== @@ -30,10 +30,14 @@ #include #include #include +#include int kdb_active = 0; struct kdb_dbbe *kdb_cur = NULL; +KDB_BACKEND(null, NULL, NULL, NULL, NULL); +SET_DECLARE(kdb_dbbe_set, struct kdb_dbbe); + /* * Solaris implements a new BREAK which is initiated by a character sequence * CR ~ ^b which is similar to a familiar pattern used on Sun servers by the @@ -120,9 +124,30 @@ void kdb_init() { + struct kdb_dbbe *be, **iter; + int cur_pri, pri; kdb_active = 0; kdb_cur = NULL; + cur_pri = -1; + SET_FOREACH(iter, kdb_dbbe_set) { + be = *iter; + pri = (be->dbbe_init != NULL) ? be->dbbe_init() : -1; + if (pri >= 0) { + if (cur_pri == -1) + printf("KDB: debugger backends:"); + printf(" %s", be->dbbe_name); + if (pri > cur_pri) { + cur_pri = pri; + kdb_cur = be; + } + } + } + if (cur_pri != -1) { + printf("\n"); + printf("KDB: current=%s\n", kdb_cur->dbbe_name); + } else + printf("KDB: no debugger backends present\n"); } /* ==== //depot/projects/gdb/sys/sys/kdb.h#2 (text+ko) ==== @@ -44,6 +44,16 @@ dbbe_trap_f *dbbe_trap; }; +#define KDB_BACKEND(name, init, trace, enter, trap) \ + static struct kdb_dbbe name##_dbbe = { \ + .dbbe_name = #name, \ + .dbbe_enter = enter, \ + .dbbe_init = init, \ + .dbbe_trace = trace, \ + .dbbe_trap = trap \ + }; \ + DATA_SET(kdb_dbbe_set, name##_dbbe) + extern int kdb_active; /* Non-zero while in debugger. */ extern struct kdb_dbbe *kdb_cur; /* Default debugger backend or NULL. */ From owner-p4-projects@FreeBSD.ORG Wed Mar 10 21:34:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 219CA16A4D0; Wed, 10 Mar 2004 21:34:33 -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 EC8BF16A4CE for ; Wed, 10 Mar 2004 21:34:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC30D43D2D for ; Wed, 10 Mar 2004 21:34:32 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2B5YWGe099547 for ; Wed, 10 Mar 2004 21:34:32 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2B5YWuq099544 for perforce@freebsd.org; Wed, 10 Mar 2004 21:34:32 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Wed, 10 Mar 2004 21:34:32 -0800 (PST) Message-Id: <200403110534.i2B5YWuq099544@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 48678 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 Mar 2004 05:34:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=48678 Change 48678 by marcel@marcel_nfs on 2004/03/10 21:33:49 Add missing #include . LINT compiles on ia64. Affected files ... .. //depot/projects/gdb/sys/ia64/ia64/trap.c#4 edit Differences ... ==== //depot/projects/gdb/sys/ia64/ia64/trap.c#4 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Wed Mar 10 21:35:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FF1616A4D0; Wed, 10 Mar 2004 21:35: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 DDD8716A4CE for ; Wed, 10 Mar 2004 21:35:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D42F143D1F for ; Wed, 10 Mar 2004 21:35:34 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2B5ZYGe099651 for ; Wed, 10 Mar 2004 21:35:34 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2B5ZYwA099648 for perforce@freebsd.org; Wed, 10 Mar 2004 21:35:34 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Wed, 10 Mar 2004 21:35:34 -0800 (PST) Message-Id: <200403110535.i2B5ZYwA099648@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 48679 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 Mar 2004 05:35:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=48679 Change 48679 by marcel@marcel_nfs on 2004/03/10 21:35:10 Add missing #include to machdep.c and compile-out global variables now unused. LINT compiles on sparc64. Affected files ... .. //depot/projects/gdb/sys/sparc64/sparc64/db_interface.c#3 edit .. //depot/projects/gdb/sys/sparc64/sparc64/machdep.c#4 edit Differences ... ==== //depot/projects/gdb/sys/sparc64/sparc64/db_interface.c#3 (text+ko) ==== @@ -57,12 +57,12 @@ int db_active; db_regs_t ddb_regs; +#if 0 static jmp_buf db_global_jmpbuf; static int db_global_jmpbuf_valid; -#if 0 int -kdb_trap(struct trapframe *tf) +ddb_trap(struct trapframe *tf) { if (db_global_jmpbuf_valid) ==== //depot/projects/gdb/sys/sparc64/sparc64/machdep.c#4 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Wed Mar 10 21:53:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD0BB16A4D0; Wed, 10 Mar 2004 21:53: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 7DD8F16A4CE for ; Wed, 10 Mar 2004 21:53:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69F8843D41 for ; Wed, 10 Mar 2004 21:53:59 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2B5rxGe003734 for ; Wed, 10 Mar 2004 21:53:59 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2B5rwSG003731 for perforce@freebsd.org; Wed, 10 Mar 2004 21:53:58 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Wed, 10 Mar 2004 21:53:58 -0800 (PST) Message-Id: <200403110553.i2B5rwSG003731@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 48681 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 Mar 2004 05:54:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=48681 Change 48681 by marcel@marcel_nfs on 2004/03/10 21:53:13 IFC @48671 LINT compiles on i386. Affected files ... .. //depot/projects/gdb/Makefile.inc1#4 integrate .. //depot/projects/gdb/UPDATING#5 integrate .. //depot/projects/gdb/UPDATING.64BTT#2 integrate .. //depot/projects/gdb/bin/df/df.c#4 integrate .. //depot/projects/gdb/etc/group#3 integrate .. //depot/projects/gdb/etc/inetd.conf#3 integrate .. //depot/projects/gdb/etc/rc.d/initdiskless#3 integrate .. //depot/projects/gdb/lib/Makefile#4 integrate .. //depot/projects/gdb/lib/libarchive/Makefile#2 integrate .. //depot/projects/gdb/lib/libarchive/archive.h#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_check_magic.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_platform.h#1 branch .. //depot/projects/gdb/lib/libarchive/archive_private.h#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_data_into_buffer.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_data_into_fd.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_open_file.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_all.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_gnutar.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_open_file.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_by_name.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_shar.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_ustar.c#3 integrate .. //depot/projects/gdb/lib/libc/stdio/fgetln.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/fputc.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/getchar.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/puts.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/ungetc.c#2 integrate .. //depot/projects/gdb/lib/libgeom/geom_xml2tree.c#3 integrate .. //depot/projects/gdb/lib/libgeom/libgeom.h#2 integrate .. //depot/projects/gdb/sbin/gconcat/gconcat.c#3 integrate .. //depot/projects/gdb/sbin/ifconfig/ifconfig.c#4 integrate .. //depot/projects/gdb/sbin/mdconfig/mdconfig.8#3 integrate .. //depot/projects/gdb/sbin/mdconfig/mdconfig.c#2 integrate .. //depot/projects/gdb/share/man/man4/Makefile#5 integrate .. //depot/projects/gdb/share/man/man4/ng_eiface.4#1 branch .. //depot/projects/gdb/share/man/man5/Makefile#3 integrate .. //depot/projects/gdb/share/man/man5/newsyslog.conf.5#1 branch .. //depot/projects/gdb/share/man/man9/Makefile#4 integrate .. //depot/projects/gdb/share/man/man9/condvar.9#2 integrate .. //depot/projects/gdb/share/termcap/termcap.src#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/gdb/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/gdb/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/gdb/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/gdb/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/gdb/sys/dev/advansys/advmcode.h#2 integrate .. //depot/projects/gdb/sys/dev/hifn/hifn7751reg.h#2 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/md/md.c#3 integrate .. //depot/projects/gdb/sys/dev/patm/if_patm.c#3 integrate .. //depot/projects/gdb/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/gdb/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/gdb/sys/dev/patm/if_patm_ioctl.c#2 integrate .. //depot/projects/gdb/sys/dev/patm/if_patm_rtables.c#2 integrate .. //depot/projects/gdb/sys/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/gdb/sys/dev/patm/if_patm_tx.c#2 integrate .. //depot/projects/gdb/sys/dev/vinum/vinumext.h#2 integrate .. //depot/projects/gdb/sys/dev/vinum/vinumio.c#2 integrate .. //depot/projects/gdb/sys/dev/vinum/vinumrequest.c#2 integrate .. //depot/projects/gdb/sys/fs/specfs/spec_vnops.c#3 integrate .. //depot/projects/gdb/sys/geom/concat/g_concat.c#3 integrate .. //depot/projects/gdb/sys/geom/concat/g_concat.h#3 integrate .. //depot/projects/gdb/sys/geom/geom.h#3 integrate .. //depot/projects/gdb/sys/geom/geom_dump.c#2 integrate .. //depot/projects/gdb/sys/geom/geom_event.c#3 integrate .. //depot/projects/gdb/sys/geom/geom_int.h#2 integrate .. //depot/projects/gdb/sys/geom/geom_subr.c#4 integrate .. //depot/projects/gdb/sys/i386/i386/trap.c#4 integrate .. //depot/projects/gdb/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/gdb/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_fork.c#5 integrate .. //depot/projects/gdb/sys/net/if_disc.c#2 integrate .. //depot/projects/gdb/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/gdb/sys/net/if_faith.c#2 integrate .. //depot/projects/gdb/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/gdb/sys/net/if_loop.c#2 integrate .. //depot/projects/gdb/sys/net/if_stf.c#3 integrate .. //depot/projects/gdb/sys/net/if_tap.c#3 integrate .. //depot/projects/gdb/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/gdb/sys/netinet/in_var.h#2 integrate .. //depot/projects/gdb/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/gdb/sys/netinet6/ah_core.c#2 integrate .. //depot/projects/gdb/sys/sparc64/include/_types.h#2 integrate .. //depot/projects/gdb/sys/sys/kernel.h#4 integrate .. //depot/projects/gdb/sys/sys/mdioctl.h#2 integrate .. //depot/projects/gdb/sys/sys/param.h#5 integrate .. //depot/projects/gdb/sys/vm/uma_core.c#5 integrate .. //depot/projects/gdb/sys/vm/vm_fault.c#3 integrate .. //depot/projects/gdb/tools/test/ppsapi/ppsapitest.c#2 integrate .. //depot/projects/gdb/tools/tools/nanobsd/Makefile#1 branch .. //depot/projects/gdb/tools/tools/nanobsd/i386.diskimage#1 branch .. //depot/projects/gdb/tools/tools/nanobsd/make.conf#1 branch .. //depot/projects/gdb/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/gdb/usr.bin/make/for.c#2 integrate .. //depot/projects/gdb/usr.bin/make/nonints.h#2 integrate .. //depot/projects/gdb/usr.bin/make/parse.c#2 integrate .. //depot/projects/gdb/usr.bin/systat/convtbl.c#2 integrate .. //depot/projects/gdb/usr.bin/systat/convtbl.h#2 integrate .. //depot/projects/gdb/usr.bin/systat/extern.h#2 integrate .. //depot/projects/gdb/usr.bin/systat/ifcmds.c#2 integrate .. //depot/projects/gdb/usr.bin/systat/ifstat.c#2 integrate .. //depot/projects/gdb/usr.bin/systat/main.c#2 integrate .. //depot/projects/gdb/usr.bin/usbhidaction/usbhidaction.c#2 integrate .. //depot/projects/gdb/usr.sbin/gstat/gstat.c#3 integrate .. //depot/projects/gdb/usr.sbin/newsyslog/newsyslog.8#2 integrate .. //depot/projects/gdb/usr.sbin/rtadvd/rrenum.c#2 integrate Differences ... ==== //depot/projects/gdb/Makefile.inc1#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.410 2004/03/05 18:16:28 gad Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.412 2004/03/11 00:22:04 mlaier Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -418,6 +418,12 @@ false; \ fi .endif +.if !defined(NO_PF) + @if ! `id -u proxy > /dev/null`; then \ + echo "ERROR: Required proxy user is missing, see /usr/src/UPDATING."; \ + false; \ + fi +.endif # # distributeworld ==== //depot/projects/gdb/UPDATING#5 (text+ko) ==== @@ -17,6 +17,13 @@ developers choose to disable these features on build machines to maximize performance. +20040310: + The FreeBSD/sparc64 platform is changing time_t from 32-bits to + 64-bits. This is a very major incompatible change, so people + using FreeBSD/sparc64 *must* read the UPDATING.64BTT file for + detailed instructions on how to make this upgrade. People + upgrading FreeBSD on other platforms can ignore this event. + 20040308: The packet filter (pf) is now installed with the base system. Make sure to run mergemaster -p before installworld to create required @@ -1541,4 +1548,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.298 2004/03/08 22:26:46 mlaier Exp $ +$FreeBSD: src/UPDATING,v 1.299 2004/03/10 17:39:05 gad Exp $ ==== //depot/projects/gdb/UPDATING.64BTT#2 (text+ko) ==== @@ -1,6 +1,6 @@ # -------+---------+---------+---------+---------+---------+---------+---------+ - The FreeBSD/sparc64 port is going to change time_t from 32-bits to 64-bits. + The FreeBSD/sparc64 port has now changed time_t from 32-bits to 64-bits. This file explains the exact steps that users should follow to update their sparc64 systems for this change. People running FreeBSD on other types of hardware, such as CPU's from Intel or AMD, can ignore this file. For now, @@ -28,7 +28,7 @@ # POSSIBILITY OF SUCH DAMAGE. # # -------+---------+---------+---------+---------+---------+---------+---------+ -# $FreeBSD: src/UPDATING.64BTT,v 1.3 2004/03/05 23:10:49 gad Exp $ +# $FreeBSD: src/UPDATING.64BTT,v 1.4 2004/03/10 17:39:05 gad Exp $ # -------+---------+---------+---------+---------+---------+---------+---------+ If you are in too much of a hurry to read this file, then this is not the @@ -43,7 +43,16 @@ Do not start this update unless you have the extra time. -* READ THIS ENTIRE DOCUMENT at least once before starting the upgrade. * +As of March 10th, the official value for time_t on sparc64 has changed to +be 64-bits. If you really must build system with 32-bit time_t's, then it +would be best to stick with a snapshot of current from before March 10th. +With src snapshots after that point, there will soon be ports which assume +you have a 64-bit time_t based on the value of __FreeBSD_version. + +If you are ready to upgrade, then *READ THIS ENTIRE DOCUMENT* at least +once before starting the upgrade. + +# -------+---------+---------+---------+---------+---------+---------+---------+ This is a major change. This change will *not* be backwards-compatible. Any programs which call system-routines for handling time-values will @@ -60,8 +69,12 @@ problems, but if you ignore these steps you are very likely to run into some very painful and time-consuming headaches when upgrading. -Step Pre-1: Update to a recent snapshot of -current, keeping it as - a system with 32-bit time_t. +Step Pre-1: Update to a recent snapshot of -current, and first build + that as a system with 32-bit time_t. To do this, edit + the file /usr/src/sys/sparc64/include/_types.h + find the line: + typedef __int64_t __time_t; /* time()... */ + and change '__int64_t' to '__int32_t' Step Pre-2: Install that system, using whatever steps you normally use, and make sure that installation seems to work okay. Step Pre-3: While still running that 32-bit time_t system, it would @@ -78,17 +91,17 @@ The 'dhclient' in the base system is known to be unreliable on a system which is upgraded to 64-bit time_t's. It may work for you, but it probably will not. - As of March 3rd 2004, we have no fix for that. + As of March 10th 2004, we have no fix for that. However, the net/isc-dhcp3-client port does seem to work. IF your machine needs DHCP, then you should probably install that port and make sure you can get it working *before* you make the change to use 64-bit time_t's. - +After you have built and installed that src-snapshot with 32-bit time_t's, edit the file /usr/src/sys/sparc64/include/_types.h find the line: typedef __int32_t __time_t; /* time()... */ - and change '__int32_t' to '__int64_t' + and change '__int32_t' back to '__int64_t' For best results, do NOT make any other changes. Do NOT cvsup the source tree trying to pick up any other changes. At this point you @@ -104,8 +117,9 @@ I am not suggesting that you have to do two whole buildworld/ installworld cycles in a single day. You could easily wait a few days, or even a week between them. What I am suggesting is that - you should not 'cvsup' your sources inbetween the two buildworlds. - + you should not 'cvsup' your sources inbetween the two buildworlds. + +And then follow these steps to build and install the 64-bit time_t system: cd /usr/src #- 1. make cleanworld #- 2. or 'rm -Rf /usr/obj/usr/src/*' @@ -299,9 +313,9 @@ and log back in after recompiling that shell. portupgrade -Rr -f ezm3 cvsup-without-gui #- Ports 3 (maybe). If you want to rebuild a 64-bit time_t version of cvsup. - Note: ezm3 (modula-3) needs a patch to work correctly after - the change to 64-BTT. That fix has not been commited to the - port yet [as of Mar 3rd], but it should be commited soon. + Note: ezm3 (modula-3) needs a patch to work correctly after the + change to 64-BTT. That fix has not been commited to the port + yet [as of Mar 10th], but hopefully it will be commited soon. There are pre-built packages available for ezm3 and cvsup-without-gui on the new 64-bTT systems. This ezm3 package *does* include the necessarily @@ -325,10 +339,11 @@ "Now look over all the other ports you have installed, and re-compile everything that probably needs to be recompiled". -If you are going to do it piecemeal, the next ports to force-recompile -would probably be languages like perl and python, if you have them -installed. Or you might want to play it safe at this point, and simply -recompile *every* port that you have installed. +If you are going to do it piecemeal, the next ports to force-rebuild would +probably be languages like perl and python, if you have them installed. +After that, force-rebuild the ports like autoconf and automake, if you +have them installed. Or you might want to play it safe at this point, +and simply recompile *every* port that you have installed. A different tactic to use for ports is to remove *all* ports before you do the installkernel/installworld step (while you're still on a 32-bTT @@ -342,20 +357,5 @@ the mailing list freebsd-sparc64@FreeBSD.org . # -------+---------+---------+---------+---------+---------+---------+---------+ - - - For people who are helping out by testing these instructions, note - that once you make this change, you must remember to KEEP changing - __time_t in _types.h after every time you 'cvs update' or cvsup - your /usr/src tree. If you forget, and end up building a world - with 32-bit time_t's, you will probably have a very very bad day. - Once this change is committed for real (which is scheduled for - March 10th), you will not need to care about this issue as much. - - Also, a change has been committed to /usr/src/Makefile.inc1 which - does try to protect you from making this mistake. - - -# -------+---------+---------+---------+---------+---------+---------+---------+ # Notice that the following command can be useful in some settings: grep '#\- ' UPDATING.64BTT ==== //depot/projects/gdb/bin/df/df.c#4 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.55 2004/03/05 08:10:16 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.56 2004/03/09 10:02:44 le Exp $"); #include #include @@ -400,7 +400,8 @@ */ #define fsbtoblk(num, fsbs, bs) \ (((fsbs) != 0 && (fsbs) < (bs)) ? \ - (num) / ((bs) / (fsbs)) : (num) * ((fsbs) / (bs))) + (num) / (intmax_t)((bs) / (fsbs)) : \ + (num) * (intmax_t)((fsbs) / (bs))) /* * Print out status about a file system. ==== //depot/projects/gdb/etc/group#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/group,v 1.29 2004/03/08 22:03:27 mlaier Exp $ +# $FreeBSD: src/etc/group,v 1.30 2004/03/10 15:04:29 mlaier Exp $ # wheel:*:0:root daemon:*:1: @@ -17,8 +17,8 @@ mailnull:*:26: guest:*:31: bind:*:53: -proxy:*:62 -authpf:*:63 +proxy:*:62: +authpf:*:63: uucp:*:66: dialer:*:68: network:*:69: ==== //depot/projects/gdb/etc/inetd.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.65 2004/03/08 23:18:50 ale Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.66 2004/03/10 15:06:17 mlaier Exp $ # # Internet server configuration database # @@ -122,4 +122,4 @@ # N.B.: inetd binds to * in the default installation so you should add # an appropriate block rule to your pf.conf # -#ftp-proxy stream tcp nowait root /usr/local/libexec/ftp-proxy ftp-proxy +#ftp-proxy stream tcp nowait root /usr/libexec/ftp-proxy ftp-proxy ==== //depot/projects/gdb/etc/rc.d/initdiskless#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/initdiskless,v 1.29 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/initdiskless,v 1.30 2004/03/09 23:06:50 phk Exp $ # # PROVIDE: initdiskless # KEYWORD: FreeBSD nojail @@ -49,12 +49,18 @@ # /. For example, if /conf/base/etc exists then a # memory filesystem will be created for /etc. # +# If a subdirectory contains the file 'remount' the contents of the file +# is a mount command used to remount the subdirectory prior to it being +# copied. An example contents could be: "mount -o ro /dev/ad0s3". Note +# that the directory to be mounted on is supplied by this script. +# # If a subdirectory contains the file 'diskless_remount' the contents of # the file is used to remount the subdirectory prior to it being copied to # the memory filesystem. For example, if /conf/base/etc/diskless_remount # contains the string 'my.server.com:/etc' then my.server.com:/etc will be # mounted in place of the subdirectory. This allows you to avoid making -# duplicates of system directories in /conf. +# duplicates of system directories in /conf. Special processing is done +# to allow specifications relative to the root filesystem. # # If a subdirectory contains the file 'md_size', the contents of the # file is used to determine the size of the memory filesystem, in 512 @@ -79,7 +85,7 @@ # Those filesystems should not be specified in /conf. At least not yet. dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null` -[ ${dlv:=0} -eq 0 ] && exit 0 +[ ${dlv:=0} -eq 0 ] && [ ! -f /etc/diskless ] && exit 0 # chkerr: # @@ -130,23 +136,25 @@ bootp_ifc="" bootp_ipa="" bootp_ipbca="" -iflist=`ifconfig -l` -for i in ${iflist} ; do - set `ifconfig ${i}` - while [ $# -ge 1 ] ; do - if [ "${bootp_ifc}" = "" -a "$1" = "inet" ] ; then - bootp_ifc=${i} ; bootp_ipa=${2} ; shift - fi - if [ "${bootp_ipbca}" = "" -a "$1" = "broadcast" ] ; then - bootp_ipbca=$2; shift - fi - shift - done - if [ "${bootp_ifc}" != "" ] ; then - break - fi -done -echo "Interface ${bootp_ifc} IP-Address ${bootp_ipa} Broadcast ${bootp_ipbca}" +if [ ${dlv:=0} -ne 0 ] ; then + iflist=`ifconfig -l` + for i in ${iflist} ; do + set `ifconfig ${i}` + while [ $# -ge 1 ] ; do + if [ "${bootp_ifc}" = "" -a "$1" = "inet" ] ; then + bootp_ifc=${i} ; bootp_ipa=${2} ; shift + fi + if [ "${bootp_ipbca}" = "" -a "$1" = "broadcast" ] ; then + bootp_ipbca=$2; shift + fi + shift + done + if [ "${bootp_ifc}" != "" ] ; then + break + fi + done + echo "Interface ${bootp_ifc} IP-Address ${bootp_ipa} Broadcast ${bootp_ipbca}" +fi # Figure out our NFS root path # @@ -188,6 +196,14 @@ eval md_size_$subdir=`cat $j/md_size` fi + # remount + # + if [ -d $j -a -f $j/remount ]; then + nfspt=`/bin/cat $j/remount` + $nfspt $j + chkerr $? "$nfspt $j" + fi + # NFS remount # if [ -d $j -a -f $j/diskless_remount ]; then ==== //depot/projects/gdb/lib/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.180 2004/03/02 06:26:37 grehan Exp $ +# $FreeBSD: src/lib/Makefile,v 1.181 2004/03/10 08:58:06 phk Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -23,8 +23,8 @@ # Otherwise, the SUBDIR list should be in alphabetical order. SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \ - libnetgraph libradius librpcsvc libsbuf libtacplus libutil libypclnt \ - ${_compat} libalias libarchive ${_libatm} ${_libbind} \ + libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ + ${_libypclnt} ${_compat} libalias libarchive ${_libatm} ${_libbind} \ ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \ @@ -110,4 +110,8 @@ _libmp= libmp .endif +.if !defined(NO_YP_LIBC) +_libypclnt= libypclnt +.endif + .include ==== //depot/projects/gdb/lib/libarchive/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ # Makefile for libarchive. # -# $FreeBSD: src/lib/libarchive/Makefile,v 1.2 2004/02/12 04:11:40 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.3 2004/03/09 19:50:41 kientzle Exp $ # LIB= archive SRCS= archive_check_magic.c \ @@ -109,13 +109,13 @@ INCS = archive.h archive_entry.h -CFLAGS+=-DDEBUG -g .if defined(DMALLOC) -CFLAGS+=-DDMALLOC -I/usr/local/include -LDFLAGS+=-L/usr/local/lib -ldmalloc +DEBUG_FLAGS+= -DDEBUG -g +CFLAGS+= -DHAVE_DMALLOC -I/usr/local/include +LDFLAGS+= -L/usr/local/lib -ldmalloc .endif -# Should be WARNS=10, except that zlib.h is borked. -WARNS?= 3 +# Should be WARNS=6, except that zlib.h is borked. +WARNS?= 3 .include ==== //depot/projects/gdb/lib/libarchive/archive.h#3 (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/libarchive/archive.h,v 1.3 2004/03/06 01:06:49 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h,v 1.4 2004/03/09 19:50:41 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -52,6 +52,20 @@ #define ARCHIVE_FATAL (-3) /* No more operations are possible. */ /* + * As far as possible, archive_errno returns standard platform errno codes. + * Of course, the details vary by platform, so the actual definitions + * here are stored in "archive_platform.h". The symbols are listed here + * for reference; as a rule, clients should not need to know the exact + * platform-dependent error code. + */ +/* Unrecognized or invalid file format. */ +/* #define ARCHIVE_ERRNO_FILE_FORMAT */ +/* Illegal usage of the library. */ +/* #define ARCHIVE_ERRNO_PROGRAMMER_ERROR */ +/* Unknown or unclassified error. */ +/* #define ARCHIVE_ERRNO_MISC */ + +/* * Callbacks are invoked to automatically read/write/open/close the archive. * You can provide your own for complex tasks (like breaking archives * across multiple tapes) or use standard ones built into the library. ==== //depot/projects/gdb/lib/libarchive/archive_check_magic.c#2 (text+ko) ==== @@ -24,10 +24,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.1 2004/02/09 23:22:53 kientzle Exp $"); +#include "archive_platform.h" +__FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.2 2004/03/09 19:50:41 kientzle Exp $"); + +#include -#ifdef DMALLOC +#ifdef HAVE_DMALLOC #include #endif #include ==== //depot/projects/gdb/lib/libarchive/archive_entry.c#2 (text+ko) ==== @@ -24,12 +24,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.1 2004/02/09 23:22:53 kientzle Exp $"); +#include "archive_platform.h" +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.2 2004/03/09 19:50:41 kientzle Exp $"); #include #include -#ifdef DMALLOC +#ifdef HAVE_DMALLOC #include #endif #include ==== //depot/projects/gdb/lib/libarchive/archive_private.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.1 2004/02/09 23:22:53 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.2 2004/03/09 19:50:41 kientzle Exp $ */ #ifndef ARCHIVE_PRIVATE_H_INCLUDED @@ -42,16 +42,7 @@ * directories so that they can be initially restored writable, then * fixed up at end. This also handles mtime/atime fixups. */ -struct archive_extract_dir_entry { - struct archive_extract_dir_entry *next; - mode_t mode; - int64_t mtime; - int64_t atime; - unsigned long mtime_nanos; - unsigned long atime_nanos; - /* Note: ctime cannot be restored, so don't bother */ - char *name; -}; +struct archive_extract_dir_entry; struct archive { /* ==== //depot/projects/gdb/lib/libarchive/archive_read.c#2 (text+ko) ==== @@ -32,10 +32,10 @@ * needlessly bloating statically-linked clients. */ -#include -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.1 2004/02/09 23:22:54 kientzle Exp $"); +#include "archive_platform.h" +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.2 2004/03/09 19:50:41 kientzle Exp $"); -#ifdef DMALLOC +#ifdef HAVE_DMALLOC #include #endif #include @@ -183,8 +183,8 @@ * support this stream. */ if (best_bid < 1) { - archive_set_error(a, EFTYPE, "Unrecognized archive format"); - /* EFTYPE == "Inappropriate file type or format" */ + archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT, + "Unrecognized archive format"); return (ARCHIVE_FATAL); } @@ -303,7 +303,8 @@ * can't support this stream. */ if (best_bid < 1) { - archive_set_error(a, EFTYPE, "Unrecognized archive format"); + archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT, + "Unrecognized archive format"); return (ARCHIVE_FATAL); } @@ -374,7 +375,7 @@ return (ARCHIVE_FATAL); } if (bytes_read == 0) { - archive_set_error(a, 0, + archive_set_error(a, EIO, "Premature end of archive entry"); return (ARCHIVE_FATAL); } ==== //depot/projects/gdb/lib/libarchive/archive_read_data_into_buffer.c#2 (text+ko) ==== @@ -24,10 +24,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_buffer.c,v 1.1 2004/02/09 23:22:54 kientzle Exp $"); +#include "archive_platform.h" +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_buffer.c,v 1.2 2004/03/09 19:50:41 kientzle Exp $"); -#ifdef DMALLOC +#ifdef HAVE_DMALLOC #include #endif #include ==== //depot/projects/gdb/lib/libarchive/archive_read_data_into_fd.c#2 (text+ko) ==== @@ -24,10 +24,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.1 2004/02/09 23:22:54 kientzle Exp $"); +#include "archive_platform.h" +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.2 2004/03/09 19:50:41 kientzle Exp $"); + +#include -#ifdef DMALLOC +#ifdef HAVE_DMALLOC #include #endif #include ==== //depot/projects/gdb/lib/libarchive/archive_read_extract.c#2 (text+ko) ==== @@ -24,15 +24,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.2 2004/02/12 20:35:59 kientzle Exp $"); +#include "archive_platform.h" +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.3 2004/03/09 19:50:41 kientzle Exp $"); #include #include +#ifdef HAVE_POSIX_ACL #include +#endif #include -#ifdef DMALLOC +#ifdef HAVE_DMALLOC #include #endif #include @@ -75,14 +77,34 @@ static int mkdirpath(struct archive *, const char *); static int mkdirpath_recursive(char *path); static int mksubdir(char *path); +#ifdef HAVE_POSIX_ACL +static int set_acl(struct archive *a, const char *acl_text, + acl_type_t type, const char *pathname); +#endif static int set_acls(struct archive *, struct archive_entry *); static int set_extended_perm(struct archive *, struct archive_entry *, int flags); static int set_fflags(struct archive *, struct archive_entry *); static int set_ownership(struct archive *, struct archive_entry *, int); -static int set_perm(struct archive *, struct archive_entry *, int mode, int flags); +static int set_perm(struct archive *, struct archive_entry *, int mode, + int flags); static int set_time(struct archive *, struct archive_entry *, int); +static struct archive_extract_dir_entry * + sort_dir_list(struct archive_extract_dir_entry *p); + +struct archive_extract_dir_entry { + struct archive_extract_dir_entry *next; + mode_t mode; + int64_t mtime; + int64_t atime; + unsigned long mtime_nanos; + unsigned long atime_nanos; + /* Note: ctime cannot be restored, so don't bother */ + char *name; +}; + + /* * Extract this entry to disk. * @@ -108,15 +130,21 @@ writable_mode = archive_entry_stat(entry)->st_mode | 0700; /* - * If this dir isn't writable, restore it with write - * permissions and add it to the fixup list for later - * handling. + * In order to correctly restore non-writable dirs or + * dir timestamps, we need to maintain a fix-up list. */ - if (archive_entry_stat(entry)->st_mode != writable_mode) { + if (archive_entry_stat(entry)->st_mode != writable_mode || + flags & ARCHIVE_EXTRACT_TIME) { le = malloc(sizeof(struct archive_extract_dir_entry)); le->next = a->archive_extract_dir_list; a->archive_extract_dir_list = le; le->mode = archive_entry_stat(entry)->st_mode; + le->mtime = archive_entry_stat(entry)->st_mtime; + le->mtime_nanos = + archive_entry_stat(entry)->st_mtimespec.tv_nsec; + le->atime = archive_entry_stat(entry)->st_atime; + le->atime_nanos = + archive_entry_stat(entry)->st_atimespec.tv_nsec; le->name = malloc(strlen(archive_entry_pathname(entry)) + 1); strcpy(le->name, archive_entry_pathname(entry)); @@ -172,39 +200,112 @@ /* * Cleanup function for archive_extract. Free name/mode list and - * restore permissions. + * restore permissions and dir timestamps. This must be done last; + * otherwise, the dir permission might prevent us from restoring a + * file. Similarly, the act of restoring a file touches the directory + * and changes the timestamp on the dir, so we have to touch-up the + * timestamps at the end as well. Note that tar/cpio do not require + * that archives be in a particular order; there is no way to know + * when the last file has been restored within a directory, so there's + * no way to optimize the memory usage here by fixing up the directory + * any earlier than the end-of-archive. * - * TODO: Restore times here as well. + * XXX TODO: Directory ACLs should be restored here, for the same + * reason we set directory perms here. XXX * * Registering this function (rather than calling it explicitly by - * name from archive_read_finish) reduces link pollution, since + * name from archive_read_finish) reduces static link pollution, since * applications that don't use this API won't get this file linked in. */ static void archive_extract_cleanup(struct archive *a) { - struct archive_extract_dir_entry *lp; + struct archive_extract_dir_entry *next, *p; + + /* Sort dir list so directories are fixed up in depth-first order. */ + p = sort_dir_list(a->archive_extract_dir_list); + + while (p != NULL) { + struct timeval times[2]; + + times[1].tv_sec = p->mtime; + times[1].tv_usec = p->mtime_nanos / 1000; + times[0].tv_sec = p->atime; + times[0].tv_usec = p->atime_nanos / 1000; + + chmod(p->name, p->mode); + utimes(p->name, times); + + next = p->next; + free(p->name); + free(p); + p = next; + } + a->archive_extract_dir_list = NULL; +} + +/* + * Simple O(n log n) merge sort to order the directories prior to fix-up. + */ +static struct archive_extract_dir_entry * +sort_dir_list(struct archive_extract_dir_entry *p) +{ + struct archive_extract_dir_entry *a, *b, *t; + + if (p == NULL) + return NULL; + /* A one-item list is already sorted. */ + if (p->next == NULL) + return (p); + + /* Step 1: split the list. */ + t = p; + a = p->next->next; + while (a != NULL) { + /* Step a twice, t once. */ + a = a->next; + if (a != NULL) + a = a->next; + t = t->next; + } + /* Now, t is at the mid-point, so break the list here. */ + b = t->next; + t->next = NULL; + a = p; + + /* Step 2: Recursively sort the two sub-lists. */ + a = sort_dir_list(a); + b = sort_dir_list(b); + + /* Step 3: Merge the returned lists. */ + /* Pick the first element for the merged list. */ + if (strcmp(a->name, b->name) > 0) { + t = p = a; + a = a->next; + } else { + t = p = b; + b = b->next; + } - /* - * TODO: Does dir list need to be sorted so permissions are restored - * depth-first? - */ - while (a->archive_extract_dir_list) { - lp = a->archive_extract_dir_list->next; - chmod(a->archive_extract_dir_list->name, - a->archive_extract_dir_list->mode); - /* - * TODO: Consider using this hook to restore dir - * timestamps as well. However, dir timestamps don't - * really matter, and it would be a memory issue to - * record timestamps for every directory - * extracted... Ugh. - */ - if (a->archive_extract_dir_list->name) - free(a->archive_extract_dir_list->name); - free(a->archive_extract_dir_list); - a->archive_extract_dir_list = lp; + /* Always put the later element on the list first. */ + while (a != NULL && b != NULL) { + if (strcmp(a->name, b->name) > 0) { + t->next = a; + a = a->next; + } else { + t->next = b; + b = b->next; + } + t = t->next; } + + /* Only one list is non-empty, so just splice it on. */ + if (a != NULL) + t->next = a; + if (b != NULL) + t->next = b; + + return (p); } static int @@ -620,7 +721,12 @@ times[0].tv_sec = st->st_atime; times[0].tv_usec = st->st_atimespec.tv_nsec / 1000; +#ifdef HAVE_LUTIMES if (lutimes(archive_entry_pathname(entry), times) != 0) { +#else + if ((archive_entry_mode(entry) & S_IFMT) != S_IFLNK && + utimes(archive_entry_pathname(entry), times) != 0) { +#endif archive_set_error(a, errno, "Can't update time for %s", archive_entry_pathname(entry)); return (ARCHIVE_WARN); @@ -645,7 +751,12 @@ return (ARCHIVE_OK); name = archive_entry_pathname(entry); +#ifdef HAVE_LCHMOD if (lchmod(name, mode) != 0) { +#else + if ((archive_entry_mode(entry) & S_IFMT) != S_IFLNK && + chmod(name, mode) != 0) { +#endif archive_set_error(a, errno, "Can't set permissions"); return (ARCHIVE_WARN); } @@ -688,6 +799,7 @@ if (fflags == NULL) return (ARCHIVE_WARN); +#ifdef HAVE_CHFLAGS fflags_p = fflags; if (strtofflags(&fflags_p, &set, &clear) != 0 && stat(name, &st) == 0) { @@ -699,6 +811,8 @@ ret = ARCHIVE_WARN; } } +#endif + free(fflags); return (ret); } @@ -709,46 +823,58 @@ static int set_acls(struct archive *a, struct archive_entry *entry) { - const char *acldesc; - acl_t acl; +#ifdef HAVE_POSIX_ACL + const char *acl_text; const char *name; int ret; ret = ARCHIVE_OK; + name = archive_entry_pathname(entry); - acldesc = archive_entry_acl(entry); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 10 23:48:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A799B16A4D1; Wed, 10 Mar 2004 23:48:22 -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 8133C16A4CF for ; Wed, 10 Mar 2004 23:48:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 772EB43D45 for ; Wed, 10 Mar 2004 23:48:22 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2B7mMGe028499 for ; Wed, 10 Mar 2004 23:48:22 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2B7mMj5028496 for perforce@freebsd.org; Wed, 10 Mar 2004 23:48:22 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Wed, 10 Mar 2004 23:48:22 -0800 (PST) Message-Id: <200403110748.i2B7mMj5028496@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 48690 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 Mar 2004 07:48:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=48690 Change 48690 by marcel@marcel_nfs on 2004/03/10 23:48:02 Add missing #include and fix initialization of KDB. LINT compiles on alpha. Affected files ... .. //depot/projects/gdb/sys/alpha/alpha/interrupt.c#3 edit .. //depot/projects/gdb/sys/alpha/alpha/machdep.c#4 edit .. //depot/projects/gdb/sys/alpha/alpha/trap.c#3 edit Differences ... ==== //depot/projects/gdb/sys/alpha/alpha/interrupt.c#3 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/gdb/sys/alpha/alpha/machdep.c#4 (text+ko) ==== @@ -100,6 +100,7 @@ #include #include #include +#include #include #include #include @@ -1026,12 +1027,11 @@ /* * Initialize debuggers, and break into them if appropriate. */ -#ifdef DDB kdb_init(); - if (boothowto & RB_KDB) { - printf("Boot flags requested debugger\n"); - breakpoint(); - } + +#ifdef KDB + if (boothowto & RB_KDB) + kdb_enter("Boot flags requested debugger\n"); #endif /* ==== //depot/projects/gdb/sys/alpha/alpha/trap.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include +#include #include #include #include @@ -67,9 +68,6 @@ #include #endif -#ifdef DDB -#include -#endif #include /* for handle_opdec() */ unsigned long Sfloat_to_reg(unsigned int); @@ -367,7 +365,7 @@ * These are always fatal in kernel, and should never happen. */ if (!user) { -#ifdef DDB +#ifdef KDB /* * ...unless, of course, DDB is configured; BUGCHK * is used to invoke the kernel debugger, and we From owner-p4-projects@FreeBSD.ORG Thu Mar 11 00:14:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4516E16A4D0; Thu, 11 Mar 2004 00:14: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 1AA2316A4CE for ; Thu, 11 Mar 2004 00:14:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10BC443D2D for ; Thu, 11 Mar 2004 00:14:55 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2B8EsGe035294 for ; Thu, 11 Mar 2004 00:14:54 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2B8EsT9035291 for perforce@freebsd.org; Thu, 11 Mar 2004 00:14:54 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Thu, 11 Mar 2004 00:14:54 -0800 (PST) Message-Id: <200403110814.i2B8EsT9035291@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 48691 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 Mar 2004 08:14:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=48691 Change 48691 by marcel@marcel_nfs on 2004/03/11 00:14:25 o Add gdb/gdb_main.c, which declares the KDB backend and defines the GDB debug port set. o Implement gdb_init() so that debug ports are scanned. o Hook gdb_main.c & uart_dbg.c into the build. Note: the GDB backend does not define a trace function and the enter function can be omitted as well (entry into the kernel will then always happen through the trap function). The trap function is not implemented. Affected files ... .. //depot/projects/gdb/sys/conf/files#6 edit .. //depot/projects/gdb/sys/gdb/gdb_main.c#1 add .. //depot/projects/gdb/sys/modules/uart/Makefile#2 edit Differences ... ==== //depot/projects/gdb/sys/conf/files#6 (text+ko) ==== @@ -803,6 +803,7 @@ dev/uart/uart_bus_pci.c optional uart pci dev/uart/uart_bus_puc.c optional uart puc dev/uart/uart_core.c optional uart +dev/uart/uart_dbg.c optional uart gdb dev/uart/uart_dev_i8251.c optional uart dev/uart/uart_dev_ns8250.c optional uart dev/uart/uart_dev_sab82532.c optional uart @@ -955,6 +956,7 @@ fs/unionfs/union_subr.c optional unionfs fs/unionfs/union_vfsops.c optional unionfs fs/unionfs/union_vnops.c optional unionfs +gdb/gdb_main.c optional gdb geom/bde/g_bde.c optional geom_bde geom/bde/g_bde_crypt.c optional geom_bde geom/bde/g_bde_lock.c optional geom_bde ==== //depot/projects/gdb/sys/modules/uart/Makefile#2 (text+ko) ==== @@ -9,7 +9,7 @@ KMOD= uart SRCS= uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \ uart_bus_pci.c uart_bus_puc.c uart_core.c uart_cpu_${MACHINE}.c \ - uart_dev_i8251.c uart_dev_ns8250.c uart_dev_sab82532.c \ + uart_dbg.c uart_dev_i8251.c uart_dev_ns8250.c uart_dev_sab82532.c \ uart_dev_z8530.c uart_if.c uart_tty.c SRCS+= bus_if.h device_if.h isa_if.h pci_if.h uart_if.h power_if.h card_if.h From owner-p4-projects@FreeBSD.ORG Thu Mar 11 19:06:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B75116A4D0; Thu, 11 Mar 2004 19:06: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 4627416A4CE for ; Thu, 11 Mar 2004 19:06:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40C6143D53 for ; Thu, 11 Mar 2004 19:06:29 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2C36TGe019448 for ; Thu, 11 Mar 2004 19:06:29 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2C36Si5019445 for perforce@freebsd.org; Thu, 11 Mar 2004 19:06:28 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 11 Mar 2004 19:06:28 -0800 (PST) Message-Id: <200403120306.i2C36Si5019445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48750 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 Mar 2004 03:06:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=48750 Change 48750 by jmallett@jmallett_oingo on 2004/03/11 19:05:55 Don't do the cute and'ing of bits thing, I don't think I really had a reason. Let alone a good one. Affected files ... .. //depot/projects/mips/sys/mips/mips/locore.S#10 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/locore.S#10 (text+ko) ==== @@ -50,31 +50,23 @@ .set noreorder .text - .globl btext -btext: +GLOBAL(btext) ENTRY(start) /* - * t0: Bits to preserve if set: - * Soft reset - * Boot exception vectors (firmware-provided) - */ - li t0, MIPS_SR_BEV | MIPS_SR_SR - /* - * t1: Bits to set explicitly: + * t0: Bits to set: * Kernel mode is 64-bit * Enable FPU */ - li t1, MIPS_SR_KX | MIPS_SR_COP_1_BIT + li t0, MIPS_SR_KX | MIPS_SR_COP_1_BIT /* * Read coprocessor 0 status register, clear bits not * preserved (namely, clearing interrupt bits), and set * bits we want to explicitly set. */ - mfc0 t2, MIPS_COP_0_STATUS - and t2, t0 - or t2, t1 - mtc0 t2, MIPS_COP_0_STATUS + mfc0 t1, MIPS_COP_0_STATUS + or t1, t0 + mtc0 t1, MIPS_COP_0_STATUS COP0_SYNC /* Extra nops for the FPU to spin up. */ From owner-p4-projects@FreeBSD.ORG Thu Mar 11 19:07:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D2C616A4D0; Thu, 11 Mar 2004 19:07: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 474BE16A4CE for ; Thu, 11 Mar 2004 19:07:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28F4D43D46 for ; Thu, 11 Mar 2004 19:07:32 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2C37VGe019495 for ; Thu, 11 Mar 2004 19:07:31 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2C37VbZ019491 for perforce@freebsd.org; Thu, 11 Mar 2004 19:07:31 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 11 Mar 2004 19:07:31 -0800 (PST) Message-Id: <200403120307.i2C37VbZ019491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48753 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 Mar 2004 03:07:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=48753 Change 48753 by jmallett@jmallett_oingo on 2004/03/11 19:07:21 Just disable cache errors in the cache vector. I'm getting a lot of cache vector hits, which I'm incredibly suspicious of. Also use a real copyright, much as I like it being PD... Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#17 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#17 (text+ko) ==== @@ -1,12 +1,29 @@ /*- - * Author: Juli Mallett - * Date: May 24, 2003 - * Description: - * FreeBSD/MIPS exception handling and related. + * Copyright (c) 2003-2004 Juli Mallett + * 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 file is in the public domain. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$ + * $P4: //depot/projects/mips/sys/mips/mips/exception.S#17 $ */ #include "opt_ddb.h" @@ -125,17 +142,14 @@ LEAF(CacheVector) .set noat - dla k0, __panic - li a0, 0 - li a1, 0 - dmtc0 k0, MIPS_COP_0_EXC_PC - dla a2, 1f + mfc0 k0, MIPS_COP_0_CONFIG + li k1, MIPS_SR_DIAG_PE + and k0, k1 + mtc0 k0, MIPS_COP_0_CONFIG + nop eret .set at VEND(CacheVector) - .data -1: .asciiz "CacheVector" - .text LEAF(TLBMissVector) .set noat From owner-p4-projects@FreeBSD.ORG Thu Mar 11 19:08:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46A3916A4D0; Thu, 11 Mar 2004 19: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 21F3C16A4CE for ; Thu, 11 Mar 2004 19:08:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0742E43D31 for ; Thu, 11 Mar 2004 19:08:34 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2C38XGe019570 for ; Thu, 11 Mar 2004 19:08:33 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2C38XPK019567 for perforce@freebsd.org; Thu, 11 Mar 2004 19:08:33 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 11 Mar 2004 19:08:33 -0800 (PST) Message-Id: <200403120308.i2C38XPK019567@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48754 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 Mar 2004 03:08:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=48754 Change 48754 by jmallett@jmallett_oingo on 2004/03/11 19:07:56 Don't cache. Affected files ... .. //depot/projects/mips/sys/mips/mips/tlb.c#22 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/tlb.c#22 (text+ko) ==== @@ -117,10 +117,7 @@ pmap, (u_long)va, (u_long)pa, (u_long)bits); *pte &= PG_G; *pte |= MIPS_PA_TO_PFN(pa) | bits; - if (0) - *pte |= PG_C(3); - else - *pte |= PG_C_UNCACHED; + *pte |= PG_C_UNCACHED; } void From owner-p4-projects@FreeBSD.ORG Thu Mar 11 20:24:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 869AC16A4D0; Thu, 11 Mar 2004 20:24: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 5BEC716A4CE for ; Thu, 11 Mar 2004 20:24:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55C2043D41 for ; Thu, 11 Mar 2004 20:24:06 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2C4O6Ge036948 for ; Thu, 11 Mar 2004 20:24:06 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2C4O5XI036945 for perforce@freebsd.org; Thu, 11 Mar 2004 20:24:05 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 11 Mar 2004 20:24:05 -0800 (PST) Message-Id: <200403120424.i2C4O5XI036945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48756 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 Mar 2004 04:24:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=48756 Change 48756 by jmallett@jmallett_oingo on 2004/03/11 20:23:49 Run on real kstack... Seems to work. Affected files ... .. //depot/projects/mips/sys/mips/mips/locore.S#11 edit .. //depot/projects/mips/sys/mips/mips/machdep.c#40 edit .. //depot/projects/mips/sys/mips/mips/pmap.c#31 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/locore.S#11 (text+ko) ==== @@ -28,12 +28,13 @@ #include #include +#include #include "assym.s" .data GLOBAL(stackspace) - .space 131072 + .space PAGE_SIZE /* Smaller than it should be since it's temp. */ GLOBAL(topstack) /* * Dummy interrupt table to keep sysctl happy until @@ -90,6 +91,11 @@ jal platform_start nop + ld sp, kstack0 + daddiu sp, KSTACK_PAGES << PAGE_SHIFT + dsrl sp, 3 + dsll sp, 3 + /* Start MI things rolling. */ jal mi_startup nop ==== //depot/projects/mips/sys/mips/mips/machdep.c#40 (text+ko) ==== @@ -198,7 +198,6 @@ struct kva_md_info kmi; vm_offset_t kstack0; -vm_paddr_t kstack0_phys; vm_size_t physsz; ==== //depot/projects/mips/sys/mips/mips/pmap.c#31 (text+ko) ==== @@ -270,6 +270,11 @@ msgbufinit(msgbufp, MSGBUF_SIZE); /* + * Steal thread0 kstack. + */ + kstack0 = pmap_steal_memory(KSTACK_PAGES << PAGE_SHIFT); + + /* * Initialise TLB management, and have it allocate page tables. */ tlb_bootstrap(physsz >> PAGE_SHIFT, pmap_steal_memory); From owner-p4-projects@FreeBSD.ORG Thu Mar 11 21:54:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15CBC16A4D0; Thu, 11 Mar 2004 21:54: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 E027B16A4CE for ; Thu, 11 Mar 2004 21:54:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D314943D6B for ; Thu, 11 Mar 2004 21:54:06 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2C5s6Ge061830 for ; Thu, 11 Mar 2004 21:54:06 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2C5s5oR061827 for perforce@freebsd.org; Thu, 11 Mar 2004 21:54:05 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 11 Mar 2004 21:54:05 -0800 (PST) Message-Id: <200403120554.i2C5s5oR061827@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48764 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 Mar 2004 05:54:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=48764 Change 48764 by jmallett@jmallett_oingo on 2004/03/11 21:53:14 The -G0 default wasn't really working, which is OK because we don't have !-fno-pic->-KPIC stuff netbsd/linux/... have, which is not OK. But for now just put in some -G0's and if out the -G0 default attempt. Affected files ... .. //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#12 edit .. //depot/projects/mips/sys/conf/Makefile.mips#13 edit .. //depot/projects/mips/sys/conf/kern.mk#10 edit Differences ... ==== //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#12 (text+ko) ==== @@ -64,8 +64,10 @@ #undef LOCAL_LABEL_PREFIX #define LOCAL_LABEL_PREFIX ((mips_abi == ABI_32 || mips_abi == ABI_O64) \ ? "$" : ".") +#if notyet /* -G is incompatible with -KPIC which is the default, so only allow objects in the small data section if the user explicitly asks for it. */ #undef MIPS_DEFAULT_GVALUE #define MIPS_DEFAULT_GVALUE 0 +#endif ==== //depot/projects/mips/sys/conf/Makefile.mips#13 (text+ko) ==== @@ -42,6 +42,8 @@ MIPSOPTS?= -mips3 CFLAGS+= -D${PLATFORM} ${MIPSOPTS} +# Disable the gp. +LDFLAGS+= -G0 .if defined(TEXTADDR) LDFLAGS+= -Ttext ${TEXTADDR} ==== //depot/projects/mips/sys/conf/kern.mk#10 (text+ko) ==== @@ -78,9 +78,10 @@ # # For MIPS, disable ABI cals, PIC, and tell GCC to use soft floating. +# Also disable the GP. # .if ${MACHINE_ARCH} == "mips" -CFLAGS+= -mno-abicalls -fno-pic -msoft-float +CFLAGS+= -mno-abicalls -msoft-float -fno-pic -G0 INLINE_LIMIT?= 15000 .endif From owner-p4-projects@FreeBSD.ORG Thu Mar 11 21:58:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86AAB16A4D0; Thu, 11 Mar 2004 21:58: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 40FCB16A4CE for ; Thu, 11 Mar 2004 21:58:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2456443D45 for ; Thu, 11 Mar 2004 21:58:18 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2C5wCGe061975 for ; Thu, 11 Mar 2004 21:58:12 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2C5wBxV061972 for perforce@freebsd.org; Thu, 11 Mar 2004 21:58:11 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Thu, 11 Mar 2004 21:58:11 -0800 (PST) Message-Id: <200403120558.i2C5wBxV061972@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 48765 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 Mar 2004 05:58:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=48765 Change 48765 by marcel@marcel_nfs on 2004/03/11 21:57:54 Add an active field to the KDB backend structure and the GDB debug port structure. Meaning of these are: -1 backend or port is dead, 0 backend or port is inactive, >0 backend or port is active. Use the active field to iterate over the linker set and display probed backends or ports. Initialize the GDB debug port after probing. uart(4) now properly displays: uart0: <16550 or compatible> port 0x3f8-0x3ff irq 4 on acpi0 uart0: debug port (115200,n,8,1) Affected files ... .. //depot/projects/gdb/sys/gdb/gdb.h#3 edit .. //depot/projects/gdb/sys/gdb/gdb_main.c#2 edit .. //depot/projects/gdb/sys/kern/subr_kdb.c#4 edit .. //depot/projects/gdb/sys/sys/kdb.h#3 edit Differences ... ==== //depot/projects/gdb/sys/gdb/gdb.h#3 (text+ko) ==== @@ -44,6 +44,7 @@ gdb_probe_f *gdb_probe; gdb_putc_f *gdb_putc; gdb_term_f *gdb_term; + int gdb_active; }; #define GDB_DBGPORT(name, probe, init, term, checkc, getc, putc) \ @@ -58,4 +59,6 @@ }; \ DATA_SET(gdb_dbgport_set, name##_gdb_dbgport) +extern struct gdb_dbgport *gdb_cur; + #endif /* !_GDB_GDB_H_ */ ==== //depot/projects/gdb/sys/gdb/gdb_main.c#2 (text+ko) ==== @@ -55,22 +55,27 @@ SET_FOREACH(iter, gdb_dbgport_set) { dp = *iter; pri = (dp->gdb_probe != NULL) ? dp->gdb_probe() : -1; - if (pri >= 0) { - if (cur_pri == -1) - printf("GDB: debug ports:"); - printf(" %s", dp->gdb_name); - if (pri > cur_pri) { - cur_pri = pri; - gdb_cur = dp; - } + dp->gdb_active = (pri >= 0) ? 0 : -1; + if (pri > cur_pri) { + cur_pri = pri; + gdb_cur = dp; } } - if (cur_pri != -1) { + if (gdb_cur != NULL) { + printf("GDB: debug ports:"); + SET_FOREACH(iter, gdb_dbgport_set) { + dp = *iter; + if (dp->gdb_active == 0) + printf(" %s", dp->gdb_name); + } printf("\n"); - printf("GDB: current=%s\n", gdb_cur->gdb_name); } else printf("GDB: no debug ports present\n"); - return ((cur_pri == -1) ? 0 : 1); + if (gdb_cur != NULL) { + gdb_cur->gdb_init(); + printf("GDB: current port: %s\n", gdb_cur->gdb_name); + } + return ((gdb_cur != NULL) ? 1 : 0); } static int ==== //depot/projects/gdb/sys/kern/subr_kdb.c#4 (text+ko) ==== @@ -133,21 +133,23 @@ SET_FOREACH(iter, kdb_dbbe_set) { be = *iter; pri = (be->dbbe_init != NULL) ? be->dbbe_init() : -1; - if (pri >= 0) { - if (cur_pri == -1) - printf("KDB: debugger backends:"); - printf(" %s", be->dbbe_name); - if (pri > cur_pri) { - cur_pri = pri; - kdb_cur = be; - } + be->dbbe_active = (pri >= 0) ? 0 : -1; + if (pri > cur_pri) { + cur_pri = pri; + kdb_cur = be; } } - if (cur_pri != -1) { + if (kdb_cur != NULL) { + printf("KDB: debugger backends:"); + SET_FOREACH(iter, kdb_dbbe_set) { + be = *iter; + if (be->dbbe_active == 0) + printf(" %s", be->dbbe_name); + } printf("\n"); - printf("KDB: current=%s\n", kdb_cur->dbbe_name); - } else - printf("KDB: no debugger backends present\n"); + printf("KDB: current backend: %s\n", + kdb_cur->dbbe_name); + } } /* ==== //depot/projects/gdb/sys/sys/kdb.h#3 (text+ko) ==== @@ -42,6 +42,7 @@ dbbe_init_f *dbbe_init; dbbe_trace_f *dbbe_trace; dbbe_trap_f *dbbe_trap; + int dbbe_active; }; #define KDB_BACKEND(name, init, trace, enter, trap) \ From owner-p4-projects@FreeBSD.ORG Thu Mar 11 22:17:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B029316A4D0; Thu, 11 Mar 2004 22:17: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 82BC716A4CE for ; Thu, 11 Mar 2004 22:17:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A2CE43D54 for ; Thu, 11 Mar 2004 22:17:36 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2C6HaGe066905 for ; Thu, 11 Mar 2004 22:17:36 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2C6Haal066902 for perforce@freebsd.org; Thu, 11 Mar 2004 22:17:36 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 11 Mar 2004 22:17:36 -0800 (PST) Message-Id: <200403120617.i2C6Haal066902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48766 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 Mar 2004 06:17:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=48766 Change 48766 by jmallett@jmallett_oingo on 2004/03/11 22:17:31 The problem I've been chasing for a few months in vfs_init was an off-by-one in bcopy/memcpy. Shoot me now :D Affected files ... .. //depot/projects/mips/sys/mips/mips/support.S#9 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/support.S#9 (text+ko) ==== @@ -45,7 +45,6 @@ ENTRY(bcopy) beqz a2, 2f nop - subu a2, 1 1: lbu t0, (a0) addu a0, 1 sb t0, (a1) @@ -63,7 +62,6 @@ ENTRY(bzero) beqz a1, 2f nop - subu a1, 1 1: sb zero, (a0) subu a1, 1 bnezl a1, 1b @@ -79,7 +77,6 @@ ENTRY(memcpy) beqz a2, 2f move v0, a0 - subu a2, 1 1: lbu t0, (a1) addu a1, 1 sb t0, (a0) From owner-p4-projects@FreeBSD.ORG Thu Mar 11 23:21:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDBDD16A4D0; Thu, 11 Mar 2004 23:21: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 8F69D16A4CE for ; Thu, 11 Mar 2004 23:21:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DE1D43D45 for ; Thu, 11 Mar 2004 23:21:00 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2C7L0Ge080162 for ; Thu, 11 Mar 2004 23:21:00 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2C7Kx4i080157 for perforce@freebsd.org; Thu, 11 Mar 2004 23:20:59 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Thu, 11 Mar 2004 23:20:59 -0800 (PST) Message-Id: <200403120720.i2C7Kx4i080157@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48774 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 Mar 2004 07:21:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=48774 Change 48774 by jmallett@jmallett_oingo on 2004/03/11 23:20:01 Copyrights. Affected files ... .. //depot/projects/mips/sys/mips/include/intr.h#2 edit .. //depot/projects/mips/sys/mips/include/pte.h#22 edit .. //depot/projects/mips/sys/mips/sbmips/endian.h#2 edit .. //depot/projects/mips/sys/mips/sgimips/endian.h#2 edit Differences ... ==== //depot/projects/mips/sys/mips/include/intr.h#2 (text+ko) ==== @@ -1,7 +1,29 @@ -/* - * This file is in the public domain. +/*- + * Copyright (c) 2004 Juli Mallett + * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$ + * $P4: //depot/projects/mips/sys/mips/include/intr.h#2 $ */ #ifndef _MACHINE_INTR_H_ ==== //depot/projects/mips/sys/mips/include/pte.h#22 (text+ko) ==== @@ -1,12 +1,29 @@ /*- - * Author: Juli Mallett - * Date: June 02, 2003 - * Description: - * Header describing page table entries and the TLB of the MIPS. + * Copyright (c) 2003-2004 Juli Mallett + * 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 file is in the public domain. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$ + * $P4: //depot/projects/mips/sys/mips/include/pte.h#22 $ */ #ifndef _MACHINE_PTE_H_ ==== //depot/projects/mips/sys/mips/sbmips/endian.h#2 (text+ko) ==== @@ -1,7 +1,29 @@ -/* - * This file is in the public domain. +/*- + * Copyright (c) 2004 Juli Mallett + * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$ + * $P4: //depot/projects/mips/sys/mips/sbmips/endian.h#2 $ */ #ifndef _SBMIPS_ENDIAN_H_ ==== //depot/projects/mips/sys/mips/sgimips/endian.h#2 (text+ko) ==== @@ -1,7 +1,29 @@ -/* - * This file is in the public domain. +/*- + * Copyright (c) 2004 Juli Mallett + * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$ + * $P4: //depot/projects/mips/sys/mips/sgimips/endian.h#2 $ */ #ifndef _SGIMIPS_ENDIAN_H_ From owner-p4-projects@FreeBSD.ORG Fri Mar 12 00:21:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDE4616A4D0; Fri, 12 Mar 2004 00:21:15 -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 B13FA16A4CE for ; Fri, 12 Mar 2004 00:21:15 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A348643D48 for ; Fri, 12 Mar 2004 00:21:15 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2C8LFGe093720 for ; Fri, 12 Mar 2004 00:21:15 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2C8LFAp093664 for perforce@freebsd.org; Fri, 12 Mar 2004 00:21:15 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 00:21:15 -0800 (PST) Message-Id: <200403120821.i2C8LFAp093664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48778 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 Mar 2004 08:21:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=48778 Change 48778 by jmallett@jmallett_oingo on 2004/03/12 00:20:46 Add some struct __hack... Note that Index is 32-bits. Affected files ... .. //depot/projects/mips/sys/mips/include/cpufunc.h#16 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpufunc.h#16 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Juli Mallett. All rights reserved. + * Copyright (c) 2002-2004 Juli Mallett. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -104,13 +104,12 @@ : \ : [a0] "r"(a0)); \ mips_barrier(); \ -} +} struct __hack -MIPS_RDRW64_COP0(entrylo0, MIPS_COP_0_TLB_LO0) -MIPS_RDRW64_COP0(entrylo1, MIPS_COP_0_TLB_LO1) -MIPS_RDRW64_COP0(entryhi, MIPS_COP_0_TLB_HI) -MIPS_RDRW64_COP0(index, MIPS_COP_0_TLB_INDEX) -MIPS_RDRW64_COP0(pagemask, MIPS_COP_0_TLB_PG_MASK) +MIPS_RDRW64_COP0(entrylo0, MIPS_COP_0_TLB_LO0); +MIPS_RDRW64_COP0(entrylo1, MIPS_COP_0_TLB_LO1); +MIPS_RDRW64_COP0(entryhi, MIPS_COP_0_TLB_HI); +MIPS_RDRW64_COP0(pagemask, MIPS_COP_0_TLB_PG_MASK); #undef MIPS_RDRW64_COP0 @@ -134,14 +133,15 @@ : \ : [a0] "r"(a0)); \ mips_barrier(); \ -} +} struct __hack -MIPS_RDRW32_COP0(compare, MIPS_COP_0_COMPARE) -MIPS_RDRW32_COP0(config, MIPS_COP_0_CONFIG) -MIPS_RDRW32_COP0(count, MIPS_COP_0_COUNT) -MIPS_RDRW32_COP0(wired, MIPS_COP_0_TLB_WIRED) -MIPS_RDRW32_COP0(cause, MIPS_COP_0_CAUSE) -MIPS_RDRW32_COP0(status, MIPS_COP_0_STATUS) +MIPS_RDRW32_COP0(compare, MIPS_COP_0_COMPARE); +MIPS_RDRW32_COP0(config, MIPS_COP_0_CONFIG); +MIPS_RDRW32_COP0(count, MIPS_COP_0_COUNT); +MIPS_RDRW32_COP0(index, MIPS_COP_0_TLB_INDEX); +MIPS_RDRW32_COP0(wired, MIPS_COP_0_TLB_WIRED); +MIPS_RDRW32_COP0(cause, MIPS_COP_0_CAUSE); +MIPS_RDRW32_COP0(status, MIPS_COP_0_STATUS); #undef MIPS_RDRW32_COP0 From owner-p4-projects@FreeBSD.ORG Fri Mar 12 01:03:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EE5B16A4D0; Fri, 12 Mar 2004 01:03: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 E61EB16A4CE for ; Fri, 12 Mar 2004 01:03:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D87ED43D2F for ; Fri, 12 Mar 2004 01:03:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2C937Ge010358 for ; Fri, 12 Mar 2004 01:03:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2C937bK010355 for perforce@freebsd.org; Fri, 12 Mar 2004 01:03:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 01:03:07 -0800 (PST) Message-Id: <200403120903.i2C937bK010355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48780 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 Mar 2004 09:03:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=48780 Change 48780 by jmallett@jmallett_oingo on 2004/03/12 01:02:10 More SYSINIT stuff for grep justice. Affected files ... .. //depot/projects/mips/sys/kern/init_main.c#17 edit Differences ... ==== //depot/projects/mips/sys/kern/init_main.c#17 (text+ko) ==== @@ -209,8 +209,7 @@ continue; if (bootverbose) - printf("SYSINIT[%8x] = %p:%p\n", (*sipp)->subsystem, - sipp, *sipp); + printf("SYSINIT[%08x] order %08x = (func %p %p)\n", (*sipp)->subsystem, (*sipp)->order, (*sipp)->func, (*sipp)->udata); /* Call function */ (*((*sipp)->func))((*sipp)->udata); From owner-p4-projects@FreeBSD.ORG Fri Mar 12 11:03:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A78B116A4D0; Fri, 12 Mar 2004 11:03:09 -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 7C35F16A4CE for ; Fri, 12 Mar 2004 11:03:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B6B543D3F for ; Fri, 12 Mar 2004 11:03:09 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CJ39Ge056822 for ; Fri, 12 Mar 2004 11:03:09 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CJ38R3056819 for perforce@freebsd.org; Fri, 12 Mar 2004 11:03:09 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 11:03:09 -0800 (PST) Message-Id: <200403121903.i2CJ38R3056819@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48801 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 Mar 2004 19:03:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=48801 Change 48801 by jmallett@jmallett_oingo on 2004/03/12 11:03:06 submit the night's work... add some comments... set up xcontext, curious to see if that works... panic when i don't mean printf... printf when i can't live with panic, right now. Affected files ... .. //depot/projects/mips/sys/mips/mips/tlb.c#23 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/tlb.c#23 (text+ko) ==== @@ -59,6 +59,14 @@ pt_entry_t *kptmap; vm_size_t kptsize; +/* + * I think I want to keep a "wired" TLB map here, with space for PTEs + * for the whole TLB, allocated in tlb_bootstrap(), and then sourced + * for invalidate() operations, this has the added effect of making + * invalidate_all() update wired entries, without making it just avoid + * a part of the TLB. + */ + #ifdef notyet /* * XXX Move the ASID code here. @@ -78,7 +86,7 @@ kptsize = pages; kptmap = (pt_entry_t *) (*ptalloc)(kptsize * sizeof (pt_entry_t)); - printf("Kernel page table maps %ld %dK pages\n", pages, PAGE_SIZE / 1024); + printf("Kernel page table maps %ld %dK pages and is %ldK\n", pages, PAGE_SIZE / 1024, (kptsize * sizeof (pt_entry_t)) / 1024); /* * Set global bit on all pages. @@ -99,6 +107,11 @@ * Just one wired TLB entry. */ mips_wr_wired(1); + + /* + * Set up page table. + */ + mips_wr_xcontext((uintptr_t)kptmap); } void @@ -113,7 +126,7 @@ if (pte_valid(pte)) tlb_invalidate_page(va); if ((bits & PG_V) == 0) - printf("pmap %p entering invalid mapping for va %lx to pa %lx [%lx]\n", + panic("pmap %p entering invalid mapping for va %lx to pa %lx [%lx]", pmap, (u_long)va, (u_long)pa, (u_long)bits); *pte &= PG_G; *pte |= MIPS_PA_TO_PFN(pa) | bits; @@ -211,6 +224,15 @@ /* * PTE was not dirty and is being written to. XXX kernel only for now. + * + * XXX So it looks like something is broken above, because we end up + * with duplicate EntryHi's in the TLB, and that's how we get here. + * I think maybe the TLBL/TLBS routing is wrong, but I'm not prepared + * to bet on that. I will probably do a brief indirection though, and + * check tlbp. I guess ideally the TLBMiss handler would be called with + * an Index, since we can obviously just choose a Random one, and so + * forth, rather than using tlbwr, that'd make overloading said handler + * a lot easier. But I'm probably just a bad person. */ void tlb_modified(void *badvaddr) @@ -228,8 +250,10 @@ panic("write to invalid page"); if (pte_ro(pte)) panic("write to ro page"); - if (pte_dirty(pte)) - panic("dirty page caused a TLBMod"); + if (pte_dirty(pte)) { + tlb_invalidate_all(); + printf("dirty page caused a TLBMod\n"); + } /* * Mark the page dirty. From owner-p4-projects@FreeBSD.ORG Fri Mar 12 11:04:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E2CC16A4D3; Fri, 12 Mar 2004 11:04: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 5381E16A4CE for ; Fri, 12 Mar 2004 11:04:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33F4943D1F for ; Fri, 12 Mar 2004 11:04:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CJ4BGe056842 for ; Fri, 12 Mar 2004 11:04:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CJ4AFR056839 for perforce@freebsd.org; Fri, 12 Mar 2004 11:04:10 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 11:04:10 -0800 (PST) Message-Id: <200403121904.i2CJ4AFR056839@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48802 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 Mar 2004 19:04:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=48802 Change 48802 by jmallett@jmallett_oingo on 2004/03/12 11:03:48 More consistently use the XKSEG_START, which is completely wrong, luckily. Add a real copyright. Affected files ... .. //depot/projects/mips/sys/mips/include/tlb.h#4 edit Differences ... ==== //depot/projects/mips/sys/mips/include/tlb.h#4 (text+ko) ==== @@ -1,12 +1,29 @@ /*- - * Author: Juli Mallett - * Date: June 06, 2003 - * Description: - * Header describing TLB interfaces on the MIPS. + * Copyright (c) 2004 Juli Mallett + * 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 file is in the public domain. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$ + * $P4: //depot/projects/mips/sys/mips/include/tlb.h#4 $ */ #ifndef _MACHINE_TLB_H_ @@ -15,7 +32,7 @@ extern pt_entry_t *kptmap; extern vm_size_t kptsize; -#define tlb_pte_index(va) (((va) & ~VM_MIN_KERNEL_ADDRESS) >> PAGE_SHIFT) +#define tlb_pte_index(va) (((va) - (MIPS_XKSEG_START)) >> PAGE_SHIFT) #define tlb_pte_find(t,va) (&(t)[tlb_pte_index((va))]) void tlb_bootstrap(vm_size_t, vm_offset_t (*)(vm_size_t)); From owner-p4-projects@FreeBSD.ORG Fri Mar 12 11:05:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EF7F16A4D0; Fri, 12 Mar 2004 11:05: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 18C9016A4CE for ; Fri, 12 Mar 2004 11:05:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1104643D1D for ; Fri, 12 Mar 2004 11:05:13 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CJ5CGe056888 for ; Fri, 12 Mar 2004 11:05:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CJ5CAv056885 for perforce@freebsd.org; Fri, 12 Mar 2004 11:05:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 11:05:12 -0800 (PST) Message-Id: <200403121905.i2CJ5CAv056885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48803 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 Mar 2004 19:05:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=48803 Change 48803 by jmallett@jmallett_oingo on 2004/03/12 11:04:23 XContext. XXX I hate the NetBSD names for Cp0 registers, and I'll probably be rewriting those headers soon. Affected files ... .. //depot/projects/mips/sys/mips/include/cpufunc.h#17 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpufunc.h#17 (text+ko) ==== @@ -110,6 +110,7 @@ MIPS_RDRW64_COP0(entrylo1, MIPS_COP_0_TLB_LO1); MIPS_RDRW64_COP0(entryhi, MIPS_COP_0_TLB_HI); MIPS_RDRW64_COP0(pagemask, MIPS_COP_0_TLB_PG_MASK); +MIPS_RDRW64_COP0(xcontext, MIPS_COP_0_TLB_XCONTEXT); #undef MIPS_RDRW64_COP0 From owner-p4-projects@FreeBSD.ORG Fri Mar 12 11:05:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D63E416A4D4; Fri, 12 Mar 2004 11:05: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 910B216A4FC for ; Fri, 12 Mar 2004 11:05:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75B4643D1F for ; Fri, 12 Mar 2004 11:05:13 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CJ5DGe056895 for ; Fri, 12 Mar 2004 11:05:13 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CJ5DMV056891 for perforce@freebsd.org; Fri, 12 Mar 2004 11:05:13 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 11:05:13 -0800 (PST) Message-Id: <200403121905.i2CJ5DMV056891@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48804 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 Mar 2004 19:05:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=48804 Change 48804 by jmallett@jmallett_oingo on 2004/03/12 11:05:04 All I ever needed is one nop before eret. Don't pretend this is more special than it is. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#18 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#18 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/exception.S#17 $ + * $P4: //depot/projects/mips/sys/mips/mips/exception.S#18 $ */ #include "opt_ddb.h" @@ -197,10 +197,8 @@ */ dmtc0 k0, MIPS_COP_0_TLB_LO0 dmtc0 k1, MIPS_COP_0_TLB_LO1 + nop tlbwr - nop - nop - nop eret .set at VEND(XTLBMissVector) From owner-p4-projects@FreeBSD.ORG Fri Mar 12 11:29:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0749116A4D0; Fri, 12 Mar 2004 11:29: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 CF75A16A4CE for ; Fri, 12 Mar 2004 11:29:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ADBE343D39 for ; Fri, 12 Mar 2004 11:29:47 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CJTlGe061320 for ; Fri, 12 Mar 2004 11:29:47 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CJTlZM061317 for perforce@freebsd.org; Fri, 12 Mar 2004 11:29:47 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 11:29:47 -0800 (PST) Message-Id: <200403121929.i2CJTlZM061317@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48809 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 Mar 2004 19:29:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=48809 Change 48809 by jmallett@jmallett_oingo on 2004/03/12 11:29:37 Handle TLB Reload requirements for TLBS/TLBL in the case where half the pair is in the TLB, but tlb_enter didn't update the TLB. I like this. I don't like what I did to the code, but the comments go in to that more than I should here. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#19 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#19 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/exception.S#18 $ + * $P4: //depot/projects/mips/sys/mips/mips/exception.S#19 $ */ #include "opt_ddb.h" @@ -49,8 +49,8 @@ ExceptionHandlerTable: .dword GenericException /* Int */ .dword GenericException /* TLBMod */ - .dword XTLBMissVector /* TLBL */ - .dword XTLBMissVector /* TLBS */ + .dword XTLBReload /* TLBL */ + .dword XTLBReload /* TLBS */ .dword GenericException /* AdEL */ .dword GenericException /* AdES */ .dword GenericException /* IBE */ @@ -168,6 +168,65 @@ /* * XXX kernel only. For now that makes sense. */ +LEAF(XTLBReload) + .set noat + tlbp + nop + mfc0 k0, MIPS_COP_0_TLB_INDEX + nop + blezl k0, 1f + nop + /* We have an index, it's a reload. XXX Copying from XTLBMiss + * because I can't make that tlbwi, unless I pick a random + * Index for it, and somehow that doesn't feel good. XXX2 Note + * that TLBS is just a degenerate case of Mod, it's where the + * mapping needs set up into the TLB, as well, cause it was + * created after the other entry in the TLB, and is invalid + * in the TLB. It actually could go through the Mod code and + * work fine, but I'd rather take two exceptions. The other + * side of this argument is that tlb_enter should update the + * TLB. This is possibly true, but I like lazy loading, since + * we have to reload a lot in theory, anyway. + */ + dmfc0 k0, MIPS_COP_0_BAD_VADDR + dli k1, MIPS_XKSEG_START + tltu k0, k1 + dsubu k0, k1 + /* + * Shift right logical to get a page index, but leaving + * enough bits to index an array of 64 bit values, plus + * align for the even/odd TLB stuff. + */ + dsrl k0, PAGE_SHIFT + 1 + dsll k0, 3 + 1 + dla k1, kptmap + /* + * Find the page table, and index it. + */ + ld k1, 0(k1) + addu k1, k0 + /* + * Write the pair. + */ + ld k0, 0(k1) /* Even PTE. */ + ld k1, 8(k1) /* Odd PTE. */ + /* + * Write TLB entry. + */ + dmtc0 k0, MIPS_COP_0_TLB_LO0 + dmtc0 k1, MIPS_COP_0_TLB_LO1 + nop + tlbwi + eret + /* Not in TLB, it's a miss. */ +1: j XTLBMissVector + nop + .set at +END(XTLBReload) + +/* + * XXX kernel only. For now that makes sense. + */ LEAF(XTLBMissVector) .set noat dmfc0 k0, MIPS_COP_0_BAD_VADDR From owner-p4-projects@FreeBSD.ORG Fri Mar 12 11:30:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8BF416A4D1; Fri, 12 Mar 2004 11:30: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 B2E7F16A4CF for ; Fri, 12 Mar 2004 11:30:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA06E43D49 for ; Fri, 12 Mar 2004 11:30:49 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CJUnGe061408 for ; Fri, 12 Mar 2004 11:30:49 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CJUngL061405 for perforce@freebsd.org; Fri, 12 Mar 2004 11:30:49 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 11:30:49 -0800 (PST) Message-Id: <200403121930.i2CJUngL061405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48810 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 Mar 2004 19:30:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=48810 Change 48810 by jmallett@jmallett_oingo on 2004/03/12 11:30:05 Take out re-dirty WAR now that the TLB is kept coherent with half-valid entries. Affected files ... .. //depot/projects/mips/sys/mips/mips/tlb.c#24 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/tlb.c#24 (text+ko) ==== @@ -224,15 +224,6 @@ /* * PTE was not dirty and is being written to. XXX kernel only for now. - * - * XXX So it looks like something is broken above, because we end up - * with duplicate EntryHi's in the TLB, and that's how we get here. - * I think maybe the TLBL/TLBS routing is wrong, but I'm not prepared - * to bet on that. I will probably do a brief indirection though, and - * check tlbp. I guess ideally the TLBMiss handler would be called with - * an Index, since we can obviously just choose a Random one, and so - * forth, rather than using tlbwr, that'd make overloading said handler - * a lot easier. But I'm probably just a bad person. */ void tlb_modified(void *badvaddr) @@ -250,10 +241,8 @@ panic("write to invalid page"); if (pte_ro(pte)) panic("write to ro page"); - if (pte_dirty(pte)) { - tlb_invalidate_all(); - printf("dirty page caused a TLBMod\n"); - } + if (pte_dirty(pte)) + panic("dirty page caused a TLBMod"); /* * Mark the page dirty. From owner-p4-projects@FreeBSD.ORG Fri Mar 12 11:35:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA21C16A4D0; Fri, 12 Mar 2004 11: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 A491616A4CE for ; Fri, 12 Mar 2004 11:35:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C1ED43D39 for ; Fri, 12 Mar 2004 11:35:56 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CJZuGe063274 for ; Fri, 12 Mar 2004 11:35:56 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CJZuo1063271 for perforce@freebsd.org; Fri, 12 Mar 2004 11:35:56 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 12 Mar 2004 11:35:56 -0800 (PST) Message-Id: <200403121935.i2CJZuo1063271@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 48811 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 Mar 2004 19:35:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=48811 Change 48811 by jhb@jhb_slimer on 2004/03/12 11:35:28 Possibly fix ithread preemption on alpha. I don't have the DS20 fired up to test this, but I can send it to the list. When I've tried preemption in the past on alpha it would lock up under load on an SMP machine. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#24 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#24 (text+ko) ==== @@ -447,8 +447,16 @@ "alpha_dispatch_intr: disabling vector 0x%x", i->vector); ithd->it_disable(ithd->it_vector); } - error = ithread_schedule(ithd, 0 /* !cold */); + + /* + * It seems that we need to return from an interrupt back to PAL + * on the same CPU that received the interrupt, so pin the interrupted + * thread to the current CPU until we return from the interrupt. + */ + sched_pin(); + error = ithread_schedule(ithd, !cold); KASSERT(error == 0, ("got an impossible stray interrupt")); + sched_unpin(); } static void From owner-p4-projects@FreeBSD.ORG Fri Mar 12 12:29:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1CB816A4D0; Fri, 12 Mar 2004 12:29: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 871B916A4CE for ; Fri, 12 Mar 2004 12:29:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E71F43D1D for ; Fri, 12 Mar 2004 12:29:02 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CKT2Ge074700 for ; Fri, 12 Mar 2004 12:29:02 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CKT2U7074696 for perforce@freebsd.org; Fri, 12 Mar 2004 12:29:02 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 12 Mar 2004 12:29:02 -0800 (PST) Message-Id: <200403122029.i2CKT2U7074696@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 48814 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 Mar 2004 20:29:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=48814 Change 48814 by jhb@jhb_slimer on 2004/03/12 12:28:04 Mark ptrace as MP safe again. Need to get someone with an Alpha to test and make sure. Affected files ... .. //depot/projects/smpng/sys/kern/syscalls.master#40 edit Differences ... ==== //depot/projects/smpng/sys/kern/syscalls.master#40 (text+ko) ==== @@ -76,7 +76,7 @@ 23 MSTD { int setuid(uid_t uid); } 24 MSTD { uid_t getuid(void); } 25 MSTD { uid_t geteuid(void); } -26 STD { int ptrace(int req, pid_t pid, caddr_t addr, int data); } +26 MSTD { int ptrace(int req, pid_t pid, caddr_t addr, int data); } 27 MSTD { int recvmsg(int s, struct msghdr *msg, int flags); } 28 MSTD { int sendmsg(int s, struct msghdr *msg, int flags); } 29 MSTD { int recvfrom(int s, caddr_t buf, size_t len, int flags, \ From owner-p4-projects@FreeBSD.ORG Fri Mar 12 12:30:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7923A16A4D0; Fri, 12 Mar 2004 12:30:04 -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 4B2E316A4CE for ; Fri, 12 Mar 2004 12:30:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41C7D43D1F for ; Fri, 12 Mar 2004 12:30:04 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CKU4Ge074748 for ; Fri, 12 Mar 2004 12:30:04 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CKU3U4074745 for perforce@freebsd.org; Fri, 12 Mar 2004 12:30:03 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 12 Mar 2004 12:30:03 -0800 (PST) Message-Id: <200403122030.i2CKU3U4074745@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 48815 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 Mar 2004 20:30:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=48815 Change 48815 by jhb@jhb_slimer on 2004/03/12 12:29:22 Oops, wrong branch. Affected files ... .. //depot/projects/smpng/sys/kern/syscalls.master#41 edit .. //depot/user/jhb/proc/kern/syscalls.master#43 edit Differences ... ==== //depot/projects/smpng/sys/kern/syscalls.master#41 (text+ko) ==== @@ -76,7 +76,7 @@ 23 MSTD { int setuid(uid_t uid); } 24 MSTD { uid_t getuid(void); } 25 MSTD { uid_t geteuid(void); } -26 MSTD { int ptrace(int req, pid_t pid, caddr_t addr, int data); } +26 STD { int ptrace(int req, pid_t pid, caddr_t addr, int data); } 27 MSTD { int recvmsg(int s, struct msghdr *msg, int flags); } 28 MSTD { int sendmsg(int s, struct msghdr *msg, int flags); } 29 MSTD { int recvfrom(int s, caddr_t buf, size_t len, int flags, \ ==== //depot/user/jhb/proc/kern/syscalls.master#43 (text+ko) ==== @@ -76,7 +76,7 @@ 23 MSTD { int setuid(uid_t uid); } 24 MSTD { uid_t getuid(void); } 25 MSTD { uid_t geteuid(void); } -26 STD { int ptrace(int req, pid_t pid, caddr_t addr, int data); } +26 MSTD { int ptrace(int req, pid_t pid, caddr_t addr, int data); } 27 MSTD { int recvmsg(int s, struct msghdr *msg, int flags); } 28 MSTD { int sendmsg(int s, struct msghdr *msg, int flags); } 29 MSTD { int recvfrom(int s, caddr_t buf, size_t len, int flags, \ From owner-p4-projects@FreeBSD.ORG Fri Mar 12 12:33:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFDF016A4D0; Fri, 12 Mar 2004 12:33: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 9866216A4CE for ; Fri, 12 Mar 2004 12:33:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FAF143D2D for ; Fri, 12 Mar 2004 12:33:08 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CKX8Ge076573 for ; Fri, 12 Mar 2004 12:33:08 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CKX8Fo076570 for perforce@freebsd.org; Fri, 12 Mar 2004 12:33:08 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 12 Mar 2004 12:33:08 -0800 (PST) Message-Id: <200403122033.i2CKX8Fo076570@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 48816 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 Mar 2004 20:33:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=48816 Change 48816 by jhb@jhb_slimer on 2004/03/12 12:32:31 IFproc: no longer need Giant for kthread_exit(). Affected files ... .. //depot/projects/smpng/sys/modules/crash/crash.c#11 integrate .. //depot/projects/smpng/sys/modules/evtest/evtest.c#20 integrate Differences ... ==== //depot/projects/smpng/sys/modules/crash/crash.c#11 (text+ko) ==== @@ -126,7 +126,6 @@ printf("crash: %s\n", event_names[ev]); switch (ev) { case -1: - mtx_lock(&Giant); kthread_exit(0); break; case 0: ==== //depot/projects/smpng/sys/modules/evtest/evtest.c#20 (text+ko) ==== @@ -313,7 +313,6 @@ mtx_unlock(&event_mtx); printf("%s: thread %d dying\n", __func__, evtest_lookupthread()); - mtx_lock(&Giant); kthread_exit(0); break; case 0: From owner-p4-projects@FreeBSD.ORG Fri Mar 12 15:02:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A60F116A4D0; Fri, 12 Mar 2004 15:02: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 722F716A4CE for ; Fri, 12 Mar 2004 15:02:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 687A543D45 for ; Fri, 12 Mar 2004 15:02:17 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CN2GGe015707 for ; Fri, 12 Mar 2004 15:02:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CN2Faw015683 for perforce@freebsd.org; Fri, 12 Mar 2004 15:02:15 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 15:02:15 -0800 (PST) Message-Id: <200403122302.i2CN2Faw015683@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48824 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 Mar 2004 23:02:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=48824 Change 48824 by jmallett@jmallett_oingo on 2004/03/12 15:02:01 shuffle. Affected files ... .. //depot/projects/mips/sys/mips/mips/support.S#10 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/support.S#10 (text+ko) ==== @@ -45,12 +45,12 @@ ENTRY(bcopy) beqz a2, 2f nop -1: lbu t0, (a0) - addu a0, 1 - sb t0, (a1) - subu a2, 1 +1: dsubu a2, 1 + lbu t0, 0(a0) + daddu a0, 1 + sb t0, 0(a1) bnezl a2, 1b - addu a1, 1 + daddu a1, 1 2: jr ra nop END(bcopy) @@ -62,10 +62,10 @@ ENTRY(bzero) beqz a1, 2f nop -1: sb zero, (a0) - subu a1, 1 +1: dsubu a1, 1 + sb zero, 0(a0) bnezl a1, 1b - addu a0, 1 + daddu a0, 1 2: jr ra nop END(bzero) @@ -77,12 +77,12 @@ ENTRY(memcpy) beqz a2, 2f move v0, a0 -1: lbu t0, (a1) - addu a1, 1 - sb t0, (a0) - subu a2, 1 +1: dsubu a2, 1 + lbu t0, 0(a1) + daddu a1, 1 + sb t0, 0(a0) bnezl a2, 1b - addu a0, 1 + daddu a0, 1 2: jr ra nop END(memcpy) From owner-p4-projects@FreeBSD.ORG Fri Mar 12 15:05:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAA7516A4D0; Fri, 12 Mar 2004 15:05:21 -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 C539716A4CE for ; Fri, 12 Mar 2004 15:05:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A701643D31 for ; Fri, 12 Mar 2004 15:05:21 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CN5LGe017099 for ; Fri, 12 Mar 2004 15:05:21 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CN5Lkx017096 for perforce@freebsd.org; Fri, 12 Mar 2004 15:05:21 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 15:05:21 -0800 (PST) Message-Id: <200403122305.i2CN5Lkx017096@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48825 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 Mar 2004 23:05:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=48825 Change 48825 by jmallett@jmallett_oingo on 2004/03/12 15:05:10 Have a go at context switch stuff. Affected files ... .. //depot/projects/mips/sys/mips/mips/swtch.S#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Mar 12 15:06:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA72A16A4D0; Fri, 12 Mar 2004 15:06: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 B35FD16A4CE for ; Fri, 12 Mar 2004 15:06:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 933D343D2D for ; Fri, 12 Mar 2004 15:06:23 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CN6NGe017186 for ; Fri, 12 Mar 2004 15:06:23 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CN6NDe017178 for perforce@freebsd.org; Fri, 12 Mar 2004 15:06:23 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 15:06:23 -0800 (PST) Message-Id: <200403122306.i2CN6NDe017178@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48826 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 Mar 2004 23:06:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=48826 Change 48826 by jmallett@jmallett_oingo on 2004/03/12 15:05:43 Prototype pmap_deactivate. Affected files ... .. //depot/projects/mips/sys/mips/include/pmap.h#13 edit Differences ... ==== //depot/projects/mips/sys/mips/include/pmap.h#13 (text+ko) ==== @@ -81,6 +81,7 @@ vm_offset_t pmap_steal_memory(vm_size_t); void *pmap_mapdev(vm_offset_t, vm_size_t); void pmap_unmapdev(vm_offset_t, vm_size_t); +void pmap_deactivate(struct thread *); #define pmap_resident_count(pm) ((pm)->pm_stats.resident_count) #define vtophys(va) pmap_kextract((vm_offset_t)(va)) From owner-p4-projects@FreeBSD.ORG Fri Mar 12 15:06:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DCB316A4D1; Fri, 12 Mar 2004 15:06: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 0F73616A4EB for ; Fri, 12 Mar 2004 15:06:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06F0A43D1D for ; Fri, 12 Mar 2004 15:06:24 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CN6NGe017197 for ; Fri, 12 Mar 2004 15:06:23 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CN6NGw017191 for perforce@freebsd.org; Fri, 12 Mar 2004 15:06:23 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 15:06:23 -0800 (PST) Message-Id: <200403122306.i2CN6NGw017191@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48827 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 Mar 2004 23:06:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=48827 Change 48827 by jmallett@jmallett_oingo on 2004/03/12 15:06:22 Set up PCB, remove savectx. Affected files ... .. //depot/projects/mips/sys/mips/mips/machdep.c#41 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/machdep.c#41 (text+ko) ==== @@ -220,6 +220,7 @@ thread0.td_kstack = kstack0; pcpu_init(pcpup, 0, sizeof(struct pcpu)); pcpup->pc_curthread = &thread0; + cpu_thread_setup(curthread); mutex_init(); #ifdef DDB kdb_init(); @@ -342,12 +343,6 @@ { } -int -savectx(struct pcb *pcb) -{ - return (0); -} - intptr_t casuptr(intptr_t *p, intptr_t old, intptr_t new) { From owner-p4-projects@FreeBSD.ORG Fri Mar 12 15:07:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 788F516A4D1; Fri, 12 Mar 2004 15:07: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 37C2116A4CE for ; Fri, 12 Mar 2004 15:07:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FA4843D45 for ; Fri, 12 Mar 2004 15:07:26 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CN7PGe017225 for ; Fri, 12 Mar 2004 15:07:25 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CN7PM2017222 for perforce@freebsd.org; Fri, 12 Mar 2004 15:07:25 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 15:07:25 -0800 (PST) Message-Id: <200403122307.i2CN7PM2017222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48828 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 Mar 2004 23:07:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=48828 Change 48828 by jmallett@jmallett_oingo on 2004/03/12 15:06:34 add swtch.S to build. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#30 edit Differences ... ==== //depot/projects/mips/sys/conf/files.mips#30 (text+ko) ==== @@ -21,6 +21,7 @@ mips/mips/pmap.c standard mips/mips/sig_machdep.c standard mips/mips/support.S standard +mips/mips/swtch.S standard mips/mips/sys_machdep.c standard mips/mips/syscall.c standard mips/mips/tlb.c standard From owner-p4-projects@FreeBSD.ORG Fri Mar 12 15:07:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E95916A4DB; Fri, 12 Mar 2004 15:07:27 -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 EA73E16A4FC for ; Fri, 12 Mar 2004 15:07:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D86A343D45 for ; Fri, 12 Mar 2004 15:07:26 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CN7QGe017232 for ; Fri, 12 Mar 2004 15:07:26 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CN7Q2o017228 for perforce@freebsd.org; Fri, 12 Mar 2004 15:07:26 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 15:07:26 -0800 (PST) Message-Id: <200403122307.i2CN7Q2o017228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48829 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 Mar 2004 23:07:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=48829 Change 48829 by jmallett@jmallett_oingo on 2004/03/12 15:06:56 A nicely lame PCB. Affected files ... .. //depot/projects/mips/sys/mips/include/pcb.h#5 edit Differences ... ==== //depot/projects/mips/sys/mips/include/pcb.h#5 (text+ko) ==== @@ -34,14 +34,11 @@ * Process Control Block. */ struct pcb { - struct fpreg pcb_fpregs; /* Saved floating point registers */ - register_t pcb_context[12]; /* kernel context for resume */ - char *pcb_onfault; /* for copyin/copyout faults */ - u_int32_t pcb_ppl; /* previous priority level */ + __register_t pcb_regs[12]; }; #ifdef _KERNEL -#define PCB_FSR(pcb) ((pcb)->pcb_fpregs.r_regs[FSR - FPBASE]) +#define PCB_FSR(pcb) (0) int savectx(struct pcb *pcb); #endif From owner-p4-projects@FreeBSD.ORG Fri Mar 12 15:07:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12F7916A529; Fri, 12 Mar 2004 15:07:28 -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 5726816A503 for ; Fri, 12 Mar 2004 15:07:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 347B043D45 for ; Fri, 12 Mar 2004 15:07:27 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CN7QGe017238 for ; Fri, 12 Mar 2004 15:07:26 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CN7Q80017235 for perforce@freebsd.org; Fri, 12 Mar 2004 15:07:26 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 15:07:26 -0800 (PST) Message-Id: <200403122307.i2CN7Q80017235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48830 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 Mar 2004 23:07:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=48830 Change 48830 by jmallett@jmallett_oingo on 2004/03/12 15:07:12 fork_trampoline Affected files ... .. //depot/projects/mips/sys/mips/include/cpu.h#14 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpu.h#14 (text+ko) ==== @@ -136,6 +136,7 @@ #define MIPS_NOT_SUPP 0x8000 #endif +void fork_trampoline(void); void cpu_halt(void); void cpu_reset(void); void swi_vm(void *); From owner-p4-projects@FreeBSD.ORG Fri Mar 12 15:09:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2200B16A4D1; Fri, 12 Mar 2004 15:09: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 BCD1D16A4CE for ; Fri, 12 Mar 2004 15:09:30 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C07143D2F for ; Fri, 12 Mar 2004 15:09:30 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CN9UGe017296 for ; Fri, 12 Mar 2004 15:09:30 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CN9ToM017293 for perforce@freebsd.org; Fri, 12 Mar 2004 15:09:29 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 15:09:29 -0800 (PST) Message-Id: <200403122309.i2CN9ToM017293@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48831 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 Mar 2004 23:09:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=48831 Change 48831 by jmallett@jmallett_oingo on 2004/03/12 15:08:44 Attempt to do cpu_fork, remove stuff now in swtch.S... Note that cpu_fork has two debugging printfs that i can't be bothered to clean out right now, until i have time to look at some other weirdness. Affected files ... .. //depot/projects/mips/sys/mips/mips/vm_machdep.c#9 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/vm_machdep.c#9 (text+ko) ==== @@ -33,9 +33,11 @@ #include #include #include +#include #include #include #include +#include #include #include @@ -54,78 +56,114 @@ void cpu_exit(struct thread *td) { + panic("%s", __func__); } void cpu_fork(struct thread *td, struct proc *p2, struct thread *td2, int flags) { -} + struct trapframe *tf; + + if ((flags & RFPROC) == 0) + return; + + cpu_thread_setup(td2); + + /* Copy the pcb */ + printf("cpu_fork: copy from %p to %p\n", td->td_pcb, td2->td_pcb); + bcopy(td->td_pcb, td2->td_pcb, sizeof(struct pcb)); + + /* + * Create a fresh stack for the new process. + * Copy the trap frame for the return to user mode as if from a + * syscall. This copies most of the user mode register values. + */ + tf = (struct trapframe *)td2->td_pcb - 1; + printf("cpu_fork: copy from fr %p to tf %p\n", td->td_frame, tf); + bcopy(td->td_frame, tf, sizeof(*tf)); + + /* Set up trap frame. */ + td2->td_frame = tf; -void -cpu_sched_exit(struct thread *td) -{ -} + /* + * Call fork_trampoline into fork_return via the pcb. + */ + td2->td_pcb->pcb_regs[10] = (register_t)fork_trampoline; + td2->td_pcb->pcb_regs[0] = (register_t)fork_return; + td2->td_pcb->pcb_regs[1] = (register_t)td2; + td2->td_pcb->pcb_regs[2] = (register_t)tf; -void -cpu_switch(struct thread *old, struct thread *new) -{ + /* + * Now cpu_switch() can schedule the new process. + */ } void -cpu_throw(struct thread *old, struct thread *new) +cpu_sched_exit(struct thread *td) { - panic("cpu_throw"); + panic("%s", __func__); } void cpu_thread_exit(struct thread *td) { + panic("%s", __func__); } void cpu_thread_clean(struct thread *td) { + panic("%s", __func__); } void cpu_thread_setup(struct thread *td) { + td->td_pcb = + (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; } void cpu_set_fork_handler(struct thread *td, void (*func)(void *), void *arg) { + panic("%s", __func__); } void cpu_thread_swapin(struct thread *td) { + panic("%s", __func__); } void cpu_thread_swapout(struct thread *td) { + panic("%s", __func__); } void cpu_set_upcall(struct thread *td, struct thread *td0) { + panic("%s", __func__); } void cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) { + panic("%s", __func__); } struct sf_buf * sf_buf_alloc(struct vm_page *m) { + panic("%s", __func__); return (NULL); } void sf_buf_free(void *addr, void *args) { + panic("%s", __func__); } void From owner-p4-projects@FreeBSD.ORG Fri Mar 12 15:09:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 674CD16A4F7; Fri, 12 Mar 2004 15:09: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 0D88D16A4CF for ; Fri, 12 Mar 2004 15:09:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0513A43D2F for ; Fri, 12 Mar 2004 15:09:31 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CN9UGe017302 for ; Fri, 12 Mar 2004 15:09:30 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CN9Uho017299 for perforce@freebsd.org; Fri, 12 Mar 2004 15:09:30 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 15:09:30 -0800 (PST) Message-Id: <200403122309.i2CN9Uho017299@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48832 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 Mar 2004 23:09:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=48832 Change 48832 by jmallett@jmallett_oingo on 2004/03/12 15:09:10 initialize pm->lev1 in the forking case, also implement deactivate. from Alpha. Affected files ... .. //depot/projects/mips/sys/mips/mips/pmap.c#32 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/pmap.c#32 (text+ko) ==== @@ -707,6 +707,8 @@ /* install self-referential address mapping entry (not PG_ASM) */ pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg)) | PG_V | PG_KRE | PG_KWE; +#else + pmap->pm_lev1 = NULL; #endif pmap->pm_ptphint = NULL; pmap->pm_active = 0; @@ -1694,6 +1696,16 @@ } } +void +pmap_deactivate(struct thread *td) +{ + pmap_t pmap; + + pmap = vmspace_pmap(td->td_proc->p_vmspace); + atomic_clear_int(&pmap->pm_active, PCPU_GET(cpumask)); + pmap_active = 0; +} + /* * XXX ? */ From owner-p4-projects@FreeBSD.ORG Fri Mar 12 15:11:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DBD816A4D0; Fri, 12 Mar 2004 15:11: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 06E2016A4CE for ; Fri, 12 Mar 2004 15:11:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F2AA743D1D for ; Fri, 12 Mar 2004 15:11:33 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CNBXGe018411 for ; Fri, 12 Mar 2004 15:11:33 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CNBXlB018405 for perforce@freebsd.org; Fri, 12 Mar 2004 15:11:33 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 15:11:33 -0800 (PST) Message-Id: <200403122311.i2CNBXlB018405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48833 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 Mar 2004 23:11:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=48833 Change 48833 by jmallett@jmallett_oingo on 2004/03/12 15:11:16 Er, fix bug with pre-submit cosmetic fix. Affected files ... .. //depot/projects/mips/sys/mips/mips/swtch.S#2 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/swtch.S#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/swtch.S#1 $ + * $P4: //depot/projects/mips/sys/mips/mips/swtch.S#2 $ */ #include @@ -115,7 +115,7 @@ ENTRY(fork_trampoline) move a0, s0 move a1, s1 - move a2, s1 + move a2, s2 j fork_exit nop END(fork_trampoline) From owner-p4-projects@FreeBSD.ORG Fri Mar 12 16:17:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F3AB16A4D0; Fri, 12 Mar 2004 16:17: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 4DA6316A4CE for ; Fri, 12 Mar 2004 16:17:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 462C343D2F for ; Fri, 12 Mar 2004 16:17:55 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2D0HtGe032479 for ; Fri, 12 Mar 2004 16:17:55 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D0HsKR032476 for perforce@freebsd.org; Fri, 12 Mar 2004 16:17:54 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 16:17:54 -0800 (PST) Message-Id: <200403130017.i2D0HsKR032476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48835 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 Mar 2004 00:17:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=48835 Change 48835 by jmallett@jmallett_oingo on 2004/03/12 16:16:53 The direct-mapped region accesses must match those which go through the TLB. So load the kernel Uncached. Yes this does make the boot time HUGE, but it also makes it possible for us to boot SOMEWHERE. Affected files ... .. //depot/projects/mips/sys/mips/conf/INDY#6 edit Differences ... ==== //depot/projects/mips/sys/mips/conf/INDY#6 (text+ko) ==== @@ -10,7 +10,7 @@ makeoptions MIPSOPTS=-mips3 #Build for a MIPS III -makeoptions TEXTADDR=0x88069000 #Indy +makeoptions TEXTADDR=0xA8069000 #Indy # Platform support platform sgimips #SGI MIPS systems. @@ -29,9 +29,15 @@ options FFS options INET -options INET6 +options NFSCLIENT +options NFSSERVER +options PROCFS +options PSEUDOFS +device random +device md device ether device loop +device pty options SCHED_4BSD #A scheduler, if you please From owner-p4-projects@FreeBSD.ORG Fri Mar 12 16:24:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0736316A4D0; Fri, 12 Mar 2004 16:24:05 -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 C9AD616A4CE for ; Fri, 12 Mar 2004 16:24:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7B2D43D2D for ; Fri, 12 Mar 2004 16:24:04 -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.10/8.12.10) with ESMTP id i2D0O4Ge034324 for ; Fri, 12 Mar 2004 16:24:04 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D0O2mH034321 for perforce@freebsd.org; Fri, 12 Mar 2004 16:24:02 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 12 Mar 2004 16:24:02 -0800 (PST) Message-Id: <200403130024.i2D0O2mH034321@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 48836 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 Mar 2004 00:24:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=48836 Change 48836 by rwatson@rwatson_paprika on 2004/03/12 16:23:14 Integrate netperf_socket: FreeBSD now compiles (and runs) with ICC. vfinddev() API change (no need to specify VCHR) More mad NDIS hackery. Less pf debugging output. md deadlock removal. phk provided a clone_setup() API, so I can now fix up locking in cloned device drivers. Various GEOM bugfixes relating to teardown. NULL argv no longer allowed by execve() sparc64 boot kludge relating to cpu_driver mnt_reservedvnlist goes away. Affected files ... .. //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/include/cpufunc.h#5 integrate .. //depot/projects/netperf_socket/sys/boot/arc/include/arcfuncs.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/netperf_socket/sys/conf/files#8 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#4 integrate .. //depot/projects/netperf_socket/sys/conf/kern.mk#4 integrate .. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#4 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/advmcode.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/cx/machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/hifn/hifn7751reg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/mcd/mcdreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/mpt/mpilib/mpi_type.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/patm/if_patm.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/patm/if_patm_ioctl.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/patm/if_patm_rtables.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/patm/if_patm_tx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/scd/scdreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/snp/snp.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumconfig.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumio.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/specfs/spec_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom.h#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom_dump.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_event.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom_int.h#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_subr.c#4 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_lookup.c#3 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/db_interface.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/trap.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/_types.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/atomic.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/bus_at386.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/critical.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/endian.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/ieeefp.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/in_cksum.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/ioctl_bt848.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/ioctl_meteor.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/profile.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/stdarg.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/npx.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_conf.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exec.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_synch.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/subr_prof.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/subr_smp.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/netperf_socket/sys/libkern/quad.h#2 integrate .. //depot/projects/netperf_socket/sys/net/if_tap.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_tun.c#3 integrate .. //depot/projects/netperf_socket/sys/netatm/atm_ioctl.h#2 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_de.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_pcn.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_rl.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_sf.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_sis.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_sk.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_ste.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_ti.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_tl.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_vr.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_wb.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_xl.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/_types.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/assym.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/buf.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/cdefs.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/conf.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/dir.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/ioctl.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/kernel.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/linker_set.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/mdioctl.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/mount.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/queue.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/syslimits.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/vnode.h#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.h#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.273 2004/03/08 00:17:27 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.274 2004/03/11 00:17:45 marcel Exp $"); /* * AMD64 Trap and System call handling @@ -629,10 +629,6 @@ printf("Idle\n"); } -#ifdef KDB - if (kdb_trap(&psl)) - return; -#endif #ifdef DDB if ((debugger_on_panic || db_active) && kdb_trap(type, 0, frame)) return; ==== //depot/projects/netperf_socket/sys/amd64/include/cpufunc.h#5 (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.141 2004/03/08 00:24:15 peter Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.142 2004/03/11 13:38:54 bde Exp $ */ /* @@ -119,6 +119,8 @@ __asm __volatile("sti"); } +#ifdef _KERNEL + #define HAVE_INLINE_FFS static __inline int @@ -162,6 +164,8 @@ return (mask == 0 ? mask : (int)bsrq((u_long)mask) + 1); } +#endif /* _KERNEL */ + static __inline void halt(void) { ==== //depot/projects/netperf_socket/sys/boot/arc/include/arcfuncs.h#2 (text+ko) ==== @@ -23,11 +23,11 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/arc/include/arcfuncs.h,v 1.2 1999/08/28 00:39:34 peter Exp $ + * $FreeBSD: src/sys/boot/arc/include/arcfuncs.h,v 1.3 2004/03/12 21:45:25 trhodes Exp $ * */ -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) #define INLINE inline #else #define INLINE /**/ ==== //depot/projects/netperf_socket/sys/boot/common/load_elf.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.29 2003/08/25 23:30:41 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.30 2004/03/11 10:07:24 bde Exp $"); #include #include @@ -492,7 +492,7 @@ ef->strsz = 0; for (i = 0; i < ndp; i++) { - if (dp[i].d_tag == NULL) + if (dp[i].d_tag == 0) break; switch (dp[i].d_tag) { case DT_HASH: ==== //depot/projects/netperf_socket/sys/boot/i386/boot2/boot2.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.67 2003/11/15 10:04:06 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.68 2004/03/12 21:45:25 trhodes Exp $"); #include #include @@ -139,7 +139,17 @@ static int xgetc(int); static int getc(int); +#if defined(__GNUC__) || defined(__INTEL_COMPILER) #define memcpy __builtin_memcpy +#else +static void memcpy(char *, const char *, int); +static void +memcpy(char *dst, const char *src, int len) +{ + while (len--) + *dst++ = *src++; +} +#endif static inline int strcmp(const char *s1, const char *s2) ==== //depot/projects/netperf_socket/sys/compat/linux/linux_stats.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.57 2004/02/21 21:32:14 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.58 2004/03/11 16:33:10 phk Exp $"); #include "opt_mac.h" @@ -366,7 +366,7 @@ * ustat in that case. */ dev = udev2dev(makeudev(args->dev >> 8, args->dev & 0xFF)); - if (dev != NODEV && vfinddev(dev, VCHR, &vp)) { + if (dev != NODEV && vfinddev(dev, &vp)) { if (vp->v_mount == NULL) return (EINVAL); #ifdef MAC ==== //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.41 2004/03/07 02:49:06 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.42 2004/03/11 09:50:00 wpaul Exp $"); #include #include @@ -1293,7 +1293,7 @@ adapter = sc->ndis_block.nmb_miniportadapterctx; intrdisfunc = sc->ndis_chars.nmc_disable_interrupts_func; NDIS_UNLOCK(sc); - if (adapter == NULL || intrdisfunc) + if (adapter == NULL || intrdisfunc == NULL) return; intrdisfunc(adapter); ==== //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.49 2004/03/04 00:17:14 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.51 2004/03/11 09:40:00 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -472,6 +472,7 @@ block = (ndis_miniport_block *)adapter_handle; block->nmb_miniportadapterctx = adapter_ctx; block->nmb_checkforhangsecs = hangsecs; + block->nmb_flags = flags; return(NDIS_STATUS_SUCCESS); } @@ -1045,10 +1046,6 @@ timer = arg; - timerfunc = (ndis_timer_function)timer->nmt_dpc.nk_deferedfunc; - timerfunc(NULL, timer->nmt_dpc.nk_deferredctx, NULL, NULL); - ntoskrnl_wakeup(&timer->nmt_ktimer.nk_header); - /* Automatically reload timer. */ tv.tv_sec = 0; @@ -1058,6 +1055,10 @@ timer->nmt_dpc.nk_sysarg2 = ndis_tick; callout_reset(ch, tvtohz(&tv), timer->nmt_dpc.nk_sysarg2, timer); + timerfunc = (ndis_timer_function)timer->nmt_dpc.nk_deferedfunc; + timerfunc(NULL, timer->nmt_dpc.nk_deferredctx, NULL, NULL); + ntoskrnl_wakeup(&timer->nmt_ktimer.nk_header); + return; } ==== //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.26 2004/03/04 23:04:02 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.27 2004/03/10 07:43:11 wpaul Exp $"); #include #include @@ -431,12 +431,12 @@ */ __stdcall static uint32_t -ntoskrnl_waitforobj(obj, reason, mode, alertable, timeout) +ntoskrnl_waitforobj(obj, reason, mode, alertable, duetime) nt_dispatch_header *obj; uint32_t reason; uint32_t mode; uint8_t alertable; - int64_t *timeout; + int64_t *duetime; { struct thread *td = curthread; kmutant *km; @@ -485,22 +485,26 @@ /* * The timeout value is specified in 100 nanosecond units * and can be a positive or negative number. If it's positive, - * then the timeout is absolute, and we need to convert it + * then the duetime is absolute, and we need to convert it * to an absolute offset relative to now in order to use it. - * If it's negative, then the timeout is relative and we + * If it's negative, then the duetime is relative and we * just have to convert the units. */ - if (timeout != NULL) { - if (*timeout < 0) { - tv.tv_sec = - (*timeout) / 10000000 ; - tv.tv_usec = (- (*timeout) / 10) - + if (duetime != NULL) { + if (*duetime < 0) { + tv.tv_sec = - (*duetime) / 10000000; + tv.tv_usec = (- (*duetime) / 10) - (tv.tv_sec * 1000000); } else { ntoskrnl_time(&curtime); - tv.tv_sec = ((*timeout) - curtime) / 10000000 ; - tv.tv_usec = ((*timeout) - curtime) / 10 - - (tv.tv_sec * 1000000); + if (*duetime < curtime) + tv.tv_sec = tv.tv_usec = 0; + else { + tv.tv_sec = ((*duetime) - curtime) / 10000000; + tv.tv_usec = ((*duetime) - curtime) / 10 - + (tv.tv_sec * 1000000); + } } } @@ -508,10 +512,10 @@ if (td->td_proc->p_flag & P_KTHREAD) error = kthread_suspend(td->td_proc, - timeout == NULL ? 0 : tvtohz(&tv)); + duetime == NULL ? 0 : tvtohz(&tv)); else error = tsleep(td, PPAUSE|PDROP, "ndisws", - timeout == NULL ? 0 : tvtohz(&tv)); + duetime == NULL ? 0 : tvtohz(&tv)); mtx_pool_lock(ndis_mtxpool, ntoskrnl_dispatchlock); @@ -549,14 +553,14 @@ __stdcall static uint32_t ntoskrnl_waitforobjs(cnt, obj, wtype, reason, mode, - alertable, timeout, wb_array) + alertable, duetime, wb_array) uint32_t cnt; nt_dispatch_header *obj[]; uint32_t wtype; uint32_t reason; uint32_t mode; uint8_t alertable; - int64_t *timeout; + int64_t *duetime; wait_block *wb_array; { struct thread *td = curthread; @@ -622,16 +626,20 @@ wcnt++; } - if (timeout != NULL) { - if (*timeout < 0) { - tv.tv_sec = - (*timeout) / 10000000 ; - tv.tv_usec = (- (*timeout) / 10) - + if (duetime != NULL) { + if (*duetime < 0) { + tv.tv_sec = - (*duetime) / 10000000; + tv.tv_usec = (- (*duetime) / 10) - (tv.tv_sec * 1000000); } else { ntoskrnl_time(&curtime); - tv.tv_sec = ((*timeout) - curtime) / 10000000 ; - tv.tv_usec = ((*timeout) - curtime) / 10 - - (tv.tv_sec * 1000000); + if (*duetime < curtime) + tv.tv_sec = tv.tv_usec = 0; + else { + tv.tv_sec = ((*duetime) - curtime) / 10000000; + tv.tv_usec = ((*duetime) - curtime) / 10 - + (tv.tv_sec * 1000000); + } } } @@ -641,10 +649,10 @@ if (td->td_proc->p_flag & P_KTHREAD) error = kthread_suspend(td->td_proc, - timeout == NULL ? 0 : tvtohz(&tv)); + duetime == NULL ? 0 : tvtohz(&tv)); else error = tsleep(td, PPAUSE|PDROP, "ndisws", - timeout == NULL ? 0 : tvtohz(&tv)); + duetime == NULL ? 0 : tvtohz(&tv)); mtx_pool_lock(ndis_mtxpool, ntoskrnl_dispatchlock); nanotime(&t2); @@ -670,7 +678,7 @@ if (error || wtype == WAITTYPE_ANY) break; - if (timeout != NULL) { + if (duetime != NULL) { tv.tv_sec -= (t2.tv_sec - t1.tv_sec); tv.tv_usec -= (t2.tv_nsec - t1.tv_nsec) / 1000; } @@ -1658,11 +1666,7 @@ timer = arg; dpc = timer->k_dpc; - timerfunc = (kdpc_func)dpc->k_deferedfunc; - timerfunc(dpc, dpc->k_deferredctx, dpc->k_sysarg1, dpc->k_sysarg2); - ntoskrnl_wakeup(&timer->k_header); - /* * If this is a periodic timer, re-arm it * so it will fire again. @@ -1675,6 +1679,14 @@ timeout(ntoskrnl_timercall, timer, tvtohz(&tv)); } + if (dpc != NULL) { + timerfunc = (kdpc_func)dpc->k_deferedfunc; + timerfunc(dpc, dpc->k_deferredctx, + dpc->k_sysarg1, dpc->k_sysarg2); + } + + ntoskrnl_wakeup(&timer->k_header); + return; } @@ -1741,9 +1753,10 @@ return(FALSE); if (timer->k_handle.callout != NULL && - callout_pending(timer->k_handle.callout)) + callout_pending(timer->k_handle.callout)) { + untimeout(ntoskrnl_timercall, timer, timer->k_handle); pending = TRUE; - else + } else pending = FALSE; timer->k_duetime = duetime; @@ -1752,14 +1765,18 @@ timer->k_dpc = dpc; if (duetime < 0) { - tv.tv_sec = - (duetime) / 10000000 ; + tv.tv_sec = - (duetime) / 10000000; tv.tv_usec = (- (duetime) / 10) - (tv.tv_sec * 1000000); } else { ntoskrnl_time(&curtime); - tv.tv_sec = ((duetime) - curtime) / 10000000 ; - tv.tv_usec = ((duetime) - curtime) / 10 - - (tv.tv_sec * 1000000); + if (duetime < curtime) + tv.tv_sec = tv.tv_usec = 0; + else { + tv.tv_sec = ((duetime) - curtime) / 10000000; + tv.tv_usec = ((duetime) - curtime) / 10 - + (tv.tv_sec * 1000000); + } } timer->k_handle = timeout(ntoskrnl_timercall, timer, tvtohz(&tv)); ==== //depot/projects/netperf_socket/sys/conf/files#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.873 2004/03/08 10:54:35 benno Exp $ +# $FreeBSD: src/sys/conf/files,v 1.874 2004/03/12 21:36:12 trhodes Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -6,12 +6,12 @@ # aicasm optional ahc \ dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ - compile-with "${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ + compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ no-obj no-implicit-rule \ clean "aicasm* y.tab.h" aicasm optional ahd \ dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ - compile-with "${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ + compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ no-obj no-implicit-rule \ clean "aicasm* y.tab.h" aic7xxx_{seq.h,reg.h,reg_print.c} optional ahc \ ==== //depot/projects/netperf_socket/sys/conf/files.i386#4 (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.467 2004/03/02 16:48:19 rik Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.468 2004/03/12 17:31:29 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,11 +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/ndis/kern_ndis.c optional ndisapi pci +compat/ndis/subr_hal.c optional ndisapi pci +compat/ndis/subr_ndis.c optional ndisapi pci +compat/ndis/subr_ntoskrnl.c optional ndisapi pci +compat/ndis/subr_pe.c optional ndisapi pci compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 @@ -136,6 +136,9 @@ 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/if_ndis/if_ndis_pci.c optional ndis pci +dev/if_ndis/if_ndis_pccard.c optional ndis card +dev/if_ndis/if_ndis_pccard.c optional ndis pccard dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd ==== //depot/projects/netperf_socket/sys/conf/kern.mk#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.40 2004/03/03 09:35:06 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.41 2004/03/12 21:36:12 trhodes Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -6,9 +6,14 @@ # Note that the newly added -Wcast-qual is responsible for generating # most of the remaining warnings. Warnings introduced with -Wall will # also pop up, but are easier to fix. +.if ${CC} == "icc" +#CWARNFLAGS= -w2 # use this if you are terribly bored +CWARNFLAGS= +.else CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ -fformat-extensions -std=c99 +.endif # # The following flags are next up for working on: # -W @@ -22,7 +27,7 @@ # use of code cache tag lines) and uses more stack (less efficient use of data # cache tag lines) # -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_ARCH} == "i386" && ${CC} != "icc" CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 INLINE_LIMIT?= 8000 .endif @@ -80,4 +85,12 @@ # GCC 3.0 and above like to do certain optimizations based on the # assumption that the program is linked against libc. Stop this. # +.if ${CC} == "icc" +CFLAGS+= -nolib_inline +.else CFLAGS+= -ffreestanding +.endif + +.if ${CC} == "icc" +CFLAGS+= -restrict +.endif ==== //depot/projects/netperf_socket/sys/conf/kern.pre.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.42 2004/02/26 03:53:52 mlaier Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.43 2004/03/12 21:36:12 trhodes Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -16,14 +16,28 @@ OBJCOPY?= objcopy SIZE?= size +.if ${CC} == "icc" +COPTFLAGS?=-O +.else COPTFLAGS?=-O -pipe -.if ${COPTFLAGS:M-O[23s]} != "" +. if ${COPTFLAGS:M-O[23s]} != "" COPTFLAGS+= -fno-strict-aliasing +. endif .endif .if !defined(NO_CPU_COPTFLAGS) +. if ${CC} == "icc" +COPTFLAGS+= ${_ICC_CPUCFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/} +. else COPTFLAGS+= ${_CPUCFLAGS} +. endif .endif -INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S +.if ${CC} == "icc" +NOSTDINC= -X +.else +NOSTDINC= -nostdinc +.endif + +INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S # This hack lets us use the Intel ACPICA code without spamming a new # include path into 100+ source files. @@ -43,19 +57,34 @@ COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} +.if ${CC} != "icc" CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} WERROR?= -Werror +.endif # XXX LOCORE means "don't declare C stuff" not "for locore.s". ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 +. if ${CC} == "icc" +CFLAGS+= -DGPROF +. else CFLAGS+= -DGPROF -falign-functions=16 +. endif .if ${PROFLEVEL} >= 2 CFLAGS+= -DGPROF4 -DGUPROF +. if ${CC} == "icc" +# XXX doesn't work yet +#PROF= -prof_gen +. else PROF= -finstrument-functions +. endif .else +. if ${CC} == "icc" +PROF= -p +. else PROF= -pg +. endif .endif .endif DEFINED_PROF= ${PROF} ==== //depot/projects/netperf_socket/sys/conf/kmod.mk#4 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.154 2004/03/06 21:23:56 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.155 2004/03/12 21:36:12 trhodes Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -70,6 +70,10 @@ .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S +.if ${CC} == "icc" +_ICC_CFLAGS:= ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/} +CFLAGS= ${_ICC_CFLAGS} +.endif CFLAGS+= ${COPTS} -D_KERNEL CFLAGS+= -DKLD_MODULE @@ -78,7 +82,12 @@ # such paths after -nostdinc. It doesn't seem to be possible to # add to the front of `make' variable. _ICFLAGS:= ${CFLAGS:M-I*} -CFLAGS+= -nostdinc -I- ${INCLMAGIC} ${_ICFLAGS} +.if ${CC} == "icc" +NOSTDINC= -X +.else +NOSTDINC= -nostdinc +.endif +CFLAGS+= ${NOSTDINC} -I- ${INCLMAGIC} ${_ICFLAGS} .if defined(KERNBUILDDIR) CFLAGS+= -include ${KERNBUILDDIR}/opt_global.h .endif @@ -102,11 +111,15 @@ CFLAGS+= -I@/../include -I${DESTDIR}/usr/include .endif # @ +.if ${CC} != "icc" CFLAGS+= -finline-limit=${INLINE_LIMIT} +.endif # Disallow common variables, and if we end up with commons from # somewhere unexpected, allocate storage for them in the module itself. +.if ${CC} != "icc" CFLAGS+= -fno-common +.endif LDFLAGS+= -d -warn-common CFLAGS+= ${DEBUG_FLAGS} ==== //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.2 2004/02/26 02:34:12 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.3 2004/03/10 15:08:21 mlaier Exp $ */ /* $OpenBSD: if_pflog.c,v 1.9 2003/05/14 08:42:00 canacar Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -363,7 +363,6 @@ case MOD_LOAD: LIST_INIT(&pflog_list); if_clone_attach(&pflog_cloner); - printf("pflog: $Name: $\n"); break; case MOD_UNLOAD: ==== //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.2 2004/02/26 02:34:12 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.3 2004/03/10 15:08:21 mlaier Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.6 2003/06/21 09:07:01 djm Exp $ */ /* @@ -527,7 +527,6 @@ case MOD_LOAD: LIST_INIT(&pfsync_list); if_clone_attach(&pfsync_cloner); - printf("pfsync: $Name: $\n"); break; case MOD_UNLOAD: ==== //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.2 2004/02/26 02:34:12 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.3 2004/03/10 15:08:21 mlaier Exp $ */ /* $OpenBSD: pf_ioctl.c,v 1.81 2003/08/22 21:50:34 david Exp $ */ /* @@ -3221,7 +3221,6 @@ ++pfaltq_ref; mtx_unlock(&pf_altq_mtx); #endif - printf("pf: $Name: $\n"); return (0); } ==== //depot/projects/netperf_socket/sys/dev/advansys/advmcode.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* * Exported interface to downloadable microcode for AdvanSys SCSI Adapters * - * $FreeBSD: src/sys/dev/advansys/advmcode.h,v 1.6 2000/01/14 03:33:38 gibbs Exp $ + * $FreeBSD: src/sys/dev/advansys/advmcode.h,v 1.7 2004/03/10 20:52:47 phk Exp $ * * Obtained from: * @@ -14,6 +14,6 @@ * modification. */ -extern u_int16_t adv_mcode[]; +extern u_int8_t adv_mcode[]; extern u_int16_t adv_mcode_size; extern u_int32_t adv_mcode_chksum; ==== //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/Makefile#3 (text+ko) ==== @@ -1,6 +1,7 @@ +# # $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aicasm/Makefile#2 $ # -# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.17 2004/02/05 22:44:24 ru Exp $ +# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.18 2004/03/12 21:36:12 trhodes Exp $ PROG= aicasm @@ -22,7 +23,13 @@ DEPENDFILE= .endif -CFLAGS+= -nostdinc -I/usr/include -I. +.if ${CC} == "icc" +CFLAGS+= -restrict +NOSTDINC= -X +.else +NOSTDINC= -nostdinc +.endif +CFLAGS+= ${NOSTDINC} -I/usr/include -I. .ifdef MAKESRCPATH CFLAGS+= -I${MAKESRCPATH} .endif ==== //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/aicasm.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ * * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#23 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.c,v 1.36 2003/12/17 00:01:11 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.c,v 1.37 2004/03/12 21:45:25 trhodes Exp $ */ #include #include @@ -143,7 +143,7 @@ yydebug = 0; mmdebug = 0; #endif - while ((ch = getopt(argc, argv, "d:i:l:n:o:p:r:I:")) != -1) { + while ((ch = getopt(argc, argv, "d:i:l:n:o:p:r:I:X")) != -1) { switch(ch) { case 'd': #if DEBUG @@ -244,6 +244,9 @@ } break; } + case 'X': + /* icc version of -nostdinc */ + break; case '?': default: usage(); @@ -309,7 +312,7 @@ { (void)fprintf(stderr, -"usage: %-16s [-nostdinc] [-I-] [-I directory] [-o output_file]\n" +"usage: %-16s [-nostdinc|-X] [-I-] [-I directory] [-o output_file]\n" " [-r register_output_file [-p register_diag_file -i includefile]]\n" " [-l program_list_file]\n" " input_file\n", appname); ==== //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.63 2004/03/04 16:39:59 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.64 2004/03/11 14:08:10 sos Exp $"); #include "opt_ata.h" #include @@ -2138,7 +2138,8 @@ { ATA_VIA8237, 0x00, VIA133, 0x00, ATA_UDMA6, "VIA 8237" }, { 0, 0, 0, 0, 0, 0 }}; static struct ata_chip_id new_ids[] = - {{ ATA_VIA8237_1, 0x00, 0x00, 0x00, ATA_SA150, "VIA 8237" }, + {{ ATA_VIA6410, 0x00, 0x00, 0x00, ATA_UDMA6, "VIA 6410" }, + { ATA_VIA6420, 0x00, 0x00, 0x00, ATA_SA150, "VIA 6420" }, { 0, 0, 0, 0, 0, 0 }}; char buffer[64]; ==== //depot/projects/netperf_socket/sys/dev/ata/ata-pci.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/dev/ata/ata-pci.h,v 1.25 2004/02/25 09:55:49 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.26 2004/03/11 14:08:11 sos Exp $ */ /* structure holding chipset config info */ @@ -224,11 +224,12 @@ #define ATA_VIA8233C 0x31091106 #define ATA_VIA8235 0x31771106 #define ATA_VIA8237 0x32271106 -#define ATA_VIA8237_1 0x31491106 #define ATA_VIA8361 0x31121106 #define ATA_VIA8363 0x03051106 #define ATA_VIA8371 0x03911106 #define ATA_VIA8662 0x31021106 +#define ATA_VIA6410 0x31641106 +#define ATA_VIA6420 0x31491106 /* chipset setup related defines */ #define ATPOLD 1 ==== //depot/projects/netperf_socket/sys/dev/cx/machdep.h#2 (text+ko) ==== @@ -15,7 +15,7 @@ * all derivative works or modified versions. * * Cronyx Id: machdep.h,v 1.3.4.3 2003/11/27 14:21:58 rik Exp $ - * $FreeBSD: src/sys/dev/cx/machdep.h,v 1.1 2003/12/03 07:29:38 imp Exp $ + * $FreeBSD: src/sys/dev/cx/machdep.h,v 1.2 2004/03/12 21:45:26 trhodes Exp $ */ /* @@ -84,7 +84,7 @@ #endif #ifndef inline -# if __GNUC__ >= 2 +# if __GNUC__ >= 2 || defined(__INTEL_COMPILER) # define inline __inline__ # else # define inline /**/ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 12 16:26:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24F5816A4D0; Fri, 12 Mar 2004 16:26: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 F177416A4CE for ; Fri, 12 Mar 2004 16:26:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E9FE343D1D for ; Fri, 12 Mar 2004 16:26:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2D0Q7Ge034418 for ; Fri, 12 Mar 2004 16:26:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D0Q7Vq034415 for perforce@freebsd.org; Fri, 12 Mar 2004 16:26:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 16:26:07 -0800 (PST) Message-Id: <200403130026.i2D0Q7Vq034415@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48837 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 Mar 2004 00:26:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=48837 Change 48837 by jmallett@jmallett_oingo on 2004/03/12 16:25:37 Set up frame, set up the upcall stuff, GC some printfs. Affected files ... .. //depot/projects/mips/sys/mips/mips/vm_machdep.c#10 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/vm_machdep.c#10 (text+ko) ==== @@ -70,7 +70,6 @@ cpu_thread_setup(td2); /* Copy the pcb */ - printf("cpu_fork: copy from %p to %p\n", td->td_pcb, td2->td_pcb); bcopy(td->td_pcb, td2->td_pcb, sizeof(struct pcb)); /* @@ -79,7 +78,6 @@ * syscall. This copies most of the user mode register values. */ tf = (struct trapframe *)td2->td_pcb - 1; - printf("cpu_fork: copy from fr %p to tf %p\n", td->td_frame, tf); bcopy(td->td_frame, tf, sizeof(*tf)); /* Set up trap frame. */ @@ -121,12 +119,14 @@ { td->td_pcb = (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + td->td_frame = (struct trapframe *)td->td_pcb - 1; } void cpu_set_fork_handler(struct thread *td, void (*func)(void *), void *arg) { - panic("%s", __func__); + td->td_pcb->pcb_regs[10] = (register_t)func; + td->td_pcb->pcb_regs[0] = (register_t)arg; } void From owner-p4-projects@FreeBSD.ORG Fri Mar 12 16:28:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6356116A4D0; Fri, 12 Mar 2004 16:28: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 3950F16A4CE for ; Fri, 12 Mar 2004 16:28:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30D1043D3F for ; Fri, 12 Mar 2004 16:28:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2D0SAGe034493 for ; Fri, 12 Mar 2004 16:28:10 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D0SA2Q034490 for perforce@freebsd.org; Fri, 12 Mar 2004 16:28:10 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 16:28:10 -0800 (PST) Message-Id: <200403130028.i2D0SA2Q034490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48838 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 Mar 2004 00:28:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=48838 Change 48838 by jmallett@jmallett_oingo on 2004/03/12 16:27:10 Go back to panicky Cache Vector now that I'm not switching between cached and uncached accesses like an idiot. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#20 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#20 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/exception.S#19 $ + * $P4: //depot/projects/mips/sys/mips/mips/exception.S#20 $ */ #include "opt_ddb.h" @@ -142,14 +142,17 @@ LEAF(CacheVector) .set noat - mfc0 k0, MIPS_COP_0_CONFIG - li k1, MIPS_SR_DIAG_PE - and k0, k1 - mtc0 k0, MIPS_COP_0_CONFIG - nop + dla k0, __panic + li a0, 0 + li a1, 0 + dmtc0 k0, MIPS_COP_0_EXC_PC + dla a2, 1f eret .set at VEND(CacheVector) + .data +1: .asciiz "Cache Vector" + .text LEAF(TLBMissVector) .set noat From owner-p4-projects@FreeBSD.ORG Fri Mar 12 16:52:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A00616A4D0; Fri, 12 Mar 2004 16:52: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 4F22816A4CE for ; Fri, 12 Mar 2004 16:52:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46B5943D2F for ; Fri, 12 Mar 2004 16:52:43 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2D0qhGe046374 for ; Fri, 12 Mar 2004 16:52:43 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D0qg5m046371 for perforce@freebsd.org; Fri, 12 Mar 2004 16:52:42 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 16:52:42 -0800 (PST) Message-Id: <200403130052.i2D0qg5m046371@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48841 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 Mar 2004 00:52:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=48841 Change 48841 by jmallett@jmallett_oingo on 2004/03/12 16:52:22 Write cpu_switch in C. Affected files ... .. //depot/projects/mips/sys/mips/mips/swtch.S#3 edit .. //depot/projects/mips/sys/mips/mips/vm_machdep.c#11 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/swtch.S#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/swtch.S#2 $ + * $P4: //depot/projects/mips/sys/mips/mips/swtch.S#3 $ */ #include @@ -85,28 +85,6 @@ END(cpu_throw) /* - * a0: struct thread *old - * a1: struct thread *new - */ -ENTRY(cpu_switch) - dsubu sp, 8 - sd ra, 0(sp) - jal savectx - nop - bnez v0, restore - nop - jal pmap_deactivate - nop - jal cpu_throw - nop - /* NOTREACHED */ -restore: - ld ra, 0(sp) - j ra - daddu sp, 8 -END(cpu_switch) - -/* * s0: Routine to call. * s1: a0 for said routine. * s2: a1 for said routine. ==== //depot/projects/mips/sys/mips/mips/vm_machdep.c#11 (text+ko) ==== @@ -103,6 +103,16 @@ } void +cpu_switch(struct thread *old, struct thread *new) +{ + if (!savectx(old->td_pcb)) { + pmap_deactivate(old); + cpu_throw(old, new); + panic("%s: should not be reached", __func__); + } +} + +void cpu_thread_exit(struct thread *td) { panic("%s", __func__); From owner-p4-projects@FreeBSD.ORG Fri Mar 12 17:45:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06E1916A4D0; Fri, 12 Mar 2004 17:45: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 B166B16A4CE for ; Fri, 12 Mar 2004 17:45:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FCCD43D2F for ; Fri, 12 Mar 2004 17:45:51 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2D1jpGe057465 for ; Fri, 12 Mar 2004 17:45:51 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D1jmAl057462 for perforce@freebsd.org; Fri, 12 Mar 2004 17:45:48 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 17:45:48 -0800 (PST) Message-Id: <200403130145.i2D1jmAl057462@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48843 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 Mar 2004 01:45:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=48843 Change 48843 by jmallett@jmallett_oingo on 2004/03/12 17:44:55 IFC Affected files ... .. //depot/projects/mips/Makefile.inc1#23 integrate .. //depot/projects/mips/UPDATING#16 integrate .. //depot/projects/mips/UPDATING.64BTT#2 integrate .. //depot/projects/mips/bin/dd/Makefile#5 integrate .. //depot/projects/mips/bin/df/df.c#9 integrate .. //depot/projects/mips/contrib/openpam/lib/openpam_impl.h#6 integrate .. //depot/projects/mips/contrib/pf/pfctl/parse.y#2 integrate .. //depot/projects/mips/contrib/pf/pfctl/pfctl_altq.c#2 integrate .. //depot/projects/mips/etc/Makefile#14 integrate .. //depot/projects/mips/etc/group#4 integrate .. //depot/projects/mips/etc/inetd.conf#6 integrate .. //depot/projects/mips/etc/master.passwd#3 integrate .. //depot/projects/mips/etc/pf.conf#1 branch .. //depot/projects/mips/etc/pf.os#1 branch .. //depot/projects/mips/etc/protocols#3 integrate .. //depot/projects/mips/etc/rc#8 integrate .. //depot/projects/mips/etc/rc.d/abi#3 integrate .. //depot/projects/mips/etc/rc.d/accounting#5 integrate .. //depot/projects/mips/etc/rc.d/addswap#3 integrate .. //depot/projects/mips/etc/rc.d/adjkerntz#3 integrate .. //depot/projects/mips/etc/rc.d/amd#5 integrate .. //depot/projects/mips/etc/rc.d/apm#4 integrate .. //depot/projects/mips/etc/rc.d/apmd#6 integrate .. //depot/projects/mips/etc/rc.d/archdep#4 integrate .. //depot/projects/mips/etc/rc.d/atm1#4 integrate .. //depot/projects/mips/etc/rc.d/atm2#2 integrate .. //depot/projects/mips/etc/rc.d/atm3#2 integrate .. //depot/projects/mips/etc/rc.d/bgfsck#4 integrate .. //depot/projects/mips/etc/rc.d/bootparams#3 integrate .. //depot/projects/mips/etc/rc.d/ccd#3 integrate .. //depot/projects/mips/etc/rc.d/devd#5 integrate .. //depot/projects/mips/etc/rc.d/devfs#5 integrate .. //depot/projects/mips/etc/rc.d/dhclient#7 integrate .. //depot/projects/mips/etc/rc.d/diskless#7 integrate .. //depot/projects/mips/etc/rc.d/dmesg#2 integrate .. //depot/projects/mips/etc/rc.d/dumpon#3 integrate .. //depot/projects/mips/etc/rc.d/fsck#4 integrate .. //depot/projects/mips/etc/rc.d/gbde#3 integrate .. //depot/projects/mips/etc/rc.d/gbde_swap#2 integrate .. //depot/projects/mips/etc/rc.d/ike#2 integrate .. //depot/projects/mips/etc/rc.d/initdiskless#6 integrate .. //depot/projects/mips/etc/rc.d/initrandom#2 integrate .. //depot/projects/mips/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/mips/etc/rc.d/ip6fw#5 integrate .. //depot/projects/mips/etc/rc.d/ipfilter#12 integrate .. //depot/projects/mips/etc/rc.d/ipfs#4 integrate .. //depot/projects/mips/etc/rc.d/ipfw#6 integrate .. //depot/projects/mips/etc/rc.d/ipmon#6 integrate .. //depot/projects/mips/etc/rc.d/ipnat#8 integrate .. //depot/projects/mips/etc/rc.d/ipsec#6 integrate .. //depot/projects/mips/etc/rc.d/ipxrouted#2 integrate .. //depot/projects/mips/etc/rc.d/isdnd#7 integrate .. //depot/projects/mips/etc/rc.d/jail#6 integrate .. //depot/projects/mips/etc/rc.d/kldxref#3 integrate .. //depot/projects/mips/etc/rc.d/lomac#3 integrate .. //depot/projects/mips/etc/rc.d/mountcritlocal#5 integrate .. //depot/projects/mips/etc/rc.d/mountcritremote#6 integrate .. //depot/projects/mips/etc/rc.d/mountd#5 integrate .. //depot/projects/mips/etc/rc.d/moused#3 integrate .. //depot/projects/mips/etc/rc.d/mroute6d#3 integrate .. //depot/projects/mips/etc/rc.d/mrouted#6 integrate .. //depot/projects/mips/etc/rc.d/netif#4 integrate .. //depot/projects/mips/etc/rc.d/netoptions#2 integrate .. //depot/projects/mips/etc/rc.d/network_ipv6#5 integrate .. //depot/projects/mips/etc/rc.d/nfsclient#3 integrate .. //depot/projects/mips/etc/rc.d/nfsd#5 integrate .. //depot/projects/mips/etc/rc.d/nfslocking#5 integrate .. //depot/projects/mips/etc/rc.d/nfsserver#3 integrate .. //depot/projects/mips/etc/rc.d/ntpd#4 integrate .. //depot/projects/mips/etc/rc.d/ntpdate#4 integrate .. //depot/projects/mips/etc/rc.d/pccard#4 integrate .. //depot/projects/mips/etc/rc.d/pcvt#3 integrate .. //depot/projects/mips/etc/rc.d/power_profile#2 integrate .. //depot/projects/mips/etc/rc.d/ppp-user#5 integrate .. //depot/projects/mips/etc/rc.d/pppoed#2 integrate .. //depot/projects/mips/etc/rc.d/quota#3 integrate .. //depot/projects/mips/etc/rc.d/random#5 integrate .. //depot/projects/mips/etc/rc.d/rarpd#3 integrate .. //depot/projects/mips/etc/rc.d/root#6 integrate .. //depot/projects/mips/etc/rc.d/route6d#4 integrate .. //depot/projects/mips/etc/rc.d/routed#7 integrate .. //depot/projects/mips/etc/rc.d/routing#2 integrate .. //depot/projects/mips/etc/rc.d/rtadvd#5 integrate .. //depot/projects/mips/etc/rc.d/savecore#3 integrate .. //depot/projects/mips/etc/rc.d/serial#4 integrate .. //depot/projects/mips/etc/rc.d/sppp#3 integrate .. //depot/projects/mips/etc/rc.d/swap1#3 integrate .. //depot/projects/mips/etc/rc.d/syscons#3 integrate .. //depot/projects/mips/etc/rc.d/timed#3 integrate .. //depot/projects/mips/etc/rc.d/usbd#2 integrate .. //depot/projects/mips/etc/rc.d/vinum#2 integrate .. //depot/projects/mips/etc/rc.d/watchdogd#2 integrate .. //depot/projects/mips/lib/Makefile#13 integrate .. //depot/projects/mips/lib/libarchive/Makefile#2 integrate .. //depot/projects/mips/lib/libarchive/archive.h#3 integrate .. //depot/projects/mips/lib/libarchive/archive_check_magic.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_platform.h#1 branch .. //depot/projects/mips/lib/libarchive/archive_private.h#2 integrate .. //depot/projects/mips/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_read_data_into_buffer.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_read_data_into_fd.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_read_open_file.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_compression_all.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_format_gnutar.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/mips/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_write_open_file.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_write_set_format.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_write_set_format_by_name.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/mips/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/mips/lib/libarchive/archive_write_set_format_shar.c#3 integrate .. //depot/projects/mips/lib/libarchive/archive_write_set_format_ustar.c#3 integrate .. //depot/projects/mips/lib/libc/stdio/_flock_stub.c#2 integrate .. //depot/projects/mips/lib/libc/stdio/fgetln.c#2 integrate .. //depot/projects/mips/lib/libc/stdio/fputc.c#2 integrate .. //depot/projects/mips/lib/libc/stdio/getchar.c#2 integrate .. //depot/projects/mips/lib/libc/stdio/local.h#4 integrate .. //depot/projects/mips/lib/libc/stdio/puts.c#2 integrate .. //depot/projects/mips/lib/libc/stdio/ungetc.c#2 integrate .. //depot/projects/mips/lib/libgeom/geom_xml2tree.c#3 integrate .. //depot/projects/mips/lib/libgeom/libgeom.h#7 integrate .. //depot/projects/mips/lib/libugidfw/ugidfw.c#4 integrate .. //depot/projects/mips/lib/msun/src/math.h#10 integrate .. //depot/projects/mips/libexec/Makefile#7 integrate .. //depot/projects/mips/rescue/rescue/Makefile#4 integrate .. //depot/projects/mips/sbin/Makefile#14 integrate .. //depot/projects/mips/sbin/gconcat/gconcat.c#2 integrate .. //depot/projects/mips/sbin/ifconfig/ifconfig.c#10 integrate .. //depot/projects/mips/sbin/init/init.c#4 integrate .. //depot/projects/mips/sbin/ldconfig/ldconfig.c#2 integrate .. //depot/projects/mips/sbin/mdconfig/mdconfig.8#8 integrate .. //depot/projects/mips/sbin/mdconfig/mdconfig.c#8 integrate .. //depot/projects/mips/share/examples/etc/make.conf#14 integrate .. //depot/projects/mips/share/man/man4/Makefile#24 integrate .. //depot/projects/mips/share/man/man4/man4.i386/ct.4#2 integrate .. //depot/projects/mips/share/man/man4/man4.i386/cx.4#7 integrate .. //depot/projects/mips/share/man/man4/ng_atmllc.4#1 branch .. //depot/projects/mips/share/man/man4/ng_eiface.4#1 branch .. //depot/projects/mips/share/man/man5/Makefile#7 integrate .. //depot/projects/mips/share/man/man9/Makefile#18 integrate .. //depot/projects/mips/share/man/man9/condvar.9#2 integrate .. //depot/projects/mips/share/man/man9/g_access.9#1 branch .. //depot/projects/mips/share/man/man9/g_attach.9#2 integrate .. //depot/projects/mips/share/man/man9/g_bio.9#2 integrate .. //depot/projects/mips/share/man/man9/g_consumer.9#2 integrate .. //depot/projects/mips/share/man/man9/g_data.9#2 integrate .. //depot/projects/mips/share/man/man9/g_event.9#2 integrate .. //depot/projects/mips/share/man/man9/g_geom.9#2 integrate .. //depot/projects/mips/share/man/man9/g_provider.9#2 integrate .. //depot/projects/mips/share/man/man9/g_provider_by_name.9#2 integrate .. //depot/projects/mips/share/man/man9/g_wither_geom.9#2 integrate .. //depot/projects/mips/share/man/man9/pmap_pinit.9#2 integrate .. //depot/projects/mips/share/man/man9/sleepqueue.9#2 integrate .. //depot/projects/mips/share/mk/bsd.cpu.mk#9 integrate .. //depot/projects/mips/share/mk/bsd.dep.mk#6 integrate .. //depot/projects/mips/share/mk/bsd.lib.mk#6 integrate .. //depot/projects/mips/share/mk/bsd.sys.mk#9 integrate .. //depot/projects/mips/share/termcap/termcap.src#6 integrate .. //depot/projects/mips/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/mips/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/mips/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/mips/sys/amd64/include/cpufunc.h#6 integrate .. //depot/projects/mips/sys/boot/arc/include/arcfuncs.h#3 integrate .. //depot/projects/mips/sys/boot/common/load_elf.c#6 integrate .. //depot/projects/mips/sys/boot/efi/libefi/efi_console.c#4 integrate .. //depot/projects/mips/sys/boot/i386/boot2/boot2.c#7 integrate .. //depot/projects/mips/sys/compat/linux/linux_stats.c#8 integrate .. //depot/projects/mips/sys/compat/ndis/kern_ndis.c#8 integrate .. //depot/projects/mips/sys/compat/ndis/subr_ndis.c#7 integrate .. //depot/projects/mips/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/mips/sys/conf/NOTES#24 integrate .. //depot/projects/mips/sys/conf/files#28 integrate .. //depot/projects/mips/sys/conf/files.i386#20 integrate .. //depot/projects/mips/sys/conf/kern.mk#11 integrate .. //depot/projects/mips/sys/conf/kern.pre.mk#11 integrate .. //depot/projects/mips/sys/conf/kmod.mk#13 integrate .. //depot/projects/mips/sys/conf/options#24 integrate .. //depot/projects/mips/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/mips/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/mips/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/mips/sys/dev/acpica/acpi.c#17 integrate .. //depot/projects/mips/sys/dev/acpica/acpivar.h#12 integrate .. //depot/projects/mips/sys/dev/advansys/advmcode.h#2 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aicasm/Makefile#3 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aicasm/aicasm.c#3 integrate .. //depot/projects/mips/sys/dev/ata/ata-chipset.c#13 integrate .. //depot/projects/mips/sys/dev/ata/ata-pci.h#11 integrate .. //depot/projects/mips/sys/dev/cx/machdep.h#2 integrate .. //depot/projects/mips/sys/dev/hifn/hifn7751reg.h#3 integrate .. //depot/projects/mips/sys/dev/ichsmb/ichsmb.c#3 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndis.c#8 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/mips/sys/dev/iir/iir.h#5 integrate .. //depot/projects/mips/sys/dev/isp/ispvar.h#5 integrate .. //depot/projects/mips/sys/dev/mcd/mcdreg.h#2 integrate .. //depot/projects/mips/sys/dev/md/md.c#20 integrate .. //depot/projects/mips/sys/dev/mpt/mpilib/mpi_type.h#2 integrate .. //depot/projects/mips/sys/dev/nmdm/nmdm.c#8 integrate .. //depot/projects/mips/sys/dev/patm/if_patm.c#3 integrate .. //depot/projects/mips/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/mips/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/mips/sys/dev/patm/if_patm_ioctl.c#2 integrate .. //depot/projects/mips/sys/dev/patm/if_patm_rtables.c#2 integrate .. //depot/projects/mips/sys/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/mips/sys/dev/patm/if_patm_tx.c#2 integrate .. //depot/projects/mips/sys/dev/scd/scdreg.h#3 integrate .. //depot/projects/mips/sys/dev/snp/snp.c#9 integrate .. //depot/projects/mips/sys/dev/vinum/vinumconfig.c#9 integrate .. //depot/projects/mips/sys/dev/vinum/vinumext.h#6 integrate .. //depot/projects/mips/sys/dev/vinum/vinumio.c#10 integrate .. //depot/projects/mips/sys/dev/vinum/vinumrequest.c#8 integrate .. //depot/projects/mips/sys/fs/specfs/spec_vnops.c#12 integrate .. //depot/projects/mips/sys/geom/concat/g_concat.c#3 integrate .. //depot/projects/mips/sys/geom/concat/g_concat.h#3 integrate .. //depot/projects/mips/sys/geom/geom.h#19 integrate .. //depot/projects/mips/sys/geom/geom_dump.c#14 integrate .. //depot/projects/mips/sys/geom/geom_event.c#14 integrate .. //depot/projects/mips/sys/geom/geom_int.h#8 integrate .. //depot/projects/mips/sys/geom/geom_subr.c#21 integrate .. //depot/projects/mips/sys/gnu/ext2fs/ext2_lookup.c#7 integrate .. //depot/projects/mips/sys/gnu/ext2fs/ext2_vfsops.c#9 integrate .. //depot/projects/mips/sys/gnu/ext2fs/ext2_vnops.c#8 integrate .. //depot/projects/mips/sys/i386/acpica/acpi_wakeup.c#7 integrate .. //depot/projects/mips/sys/i386/conf/NOTES#21 integrate .. //depot/projects/mips/sys/i386/i386/db_interface.c#7 integrate .. //depot/projects/mips/sys/i386/i386/elan-mmcr.c#10 integrate .. //depot/projects/mips/sys/i386/i386/identcpu.c#11 integrate .. //depot/projects/mips/sys/i386/i386/in_cksum.c#3 integrate .. //depot/projects/mips/sys/i386/i386/trap.c#15 integrate .. //depot/projects/mips/sys/i386/i386/vm_machdep.c#17 integrate .. //depot/projects/mips/sys/i386/include/_types.h#5 integrate .. //depot/projects/mips/sys/i386/include/atomic.h#4 integrate .. //depot/projects/mips/sys/i386/include/bus_at386.h#6 integrate .. //depot/projects/mips/sys/i386/include/cpufunc.h#5 integrate .. //depot/projects/mips/sys/i386/include/critical.h#4 integrate .. //depot/projects/mips/sys/i386/include/endian.h#3 integrate .. //depot/projects/mips/sys/i386/include/ieeefp.h#3 integrate .. //depot/projects/mips/sys/i386/include/in_cksum.h#2 integrate .. //depot/projects/mips/sys/i386/include/ioctl_bt848.h#3 integrate .. //depot/projects/mips/sys/i386/include/pcpu.h#4 integrate .. //depot/projects/mips/sys/i386/include/profile.h#4 integrate .. //depot/projects/mips/sys/i386/include/stdarg.h#4 integrate .. //depot/projects/mips/sys/i386/isa/npx.c#9 integrate .. //depot/projects/mips/sys/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/mips/sys/ia64/ia64/machdep.c#17 integrate .. //depot/projects/mips/sys/isofs/cd9660/cd9660_vfsops.c#8 integrate .. //depot/projects/mips/sys/kern/kern_condvar.c#15 integrate .. //depot/projects/mips/sys/kern/kern_conf.c#10 integrate .. //depot/projects/mips/sys/kern/kern_exec.c#21 integrate .. //depot/projects/mips/sys/kern/kern_fork.c#23 integrate .. //depot/projects/mips/sys/kern/kern_synch.c#19 integrate .. //depot/projects/mips/sys/kern/subr_prof.c#10 integrate .. //depot/projects/mips/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/mips/sys/kern/subr_smp.c#9 integrate .. //depot/projects/mips/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/mips/sys/kern/vfs_bio.c#21 integrate .. //depot/projects/mips/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/mips/sys/kern/vfs_subr.c#19 integrate .. //depot/projects/mips/sys/kern/vfs_syscalls.c#16 integrate .. //depot/projects/mips/sys/libkern/quad.h#4 integrate .. //depot/projects/mips/sys/modules/Makefile#21 integrate .. //depot/projects/mips/sys/modules/netgraph/atmllc/Makefile#1 branch .. //depot/projects/mips/sys/net/if_disc.c#8 integrate .. //depot/projects/mips/sys/net/if_ethersubr.c#16 integrate .. //depot/projects/mips/sys/net/if_faith.c#10 integrate .. //depot/projects/mips/sys/net/if_fddisubr.c#10 integrate .. //depot/projects/mips/sys/net/if_loop.c#12 integrate .. //depot/projects/mips/sys/net/if_stf.c#11 integrate .. //depot/projects/mips/sys/net/if_tap.c#11 integrate .. //depot/projects/mips/sys/net/if_tun.c#12 integrate .. //depot/projects/mips/sys/netatm/atm_ioctl.h#3 integrate .. //depot/projects/mips/sys/netgraph/ng_atmllc.c#1 branch .. //depot/projects/mips/sys/netgraph/ng_atmllc.h#1 branch .. //depot/projects/mips/sys/netinet/in_pcb.c#13 integrate .. //depot/projects/mips/sys/netinet/in_var.h#5 integrate .. //depot/projects/mips/sys/netinet/ip_encap.c#7 integrate .. //depot/projects/mips/sys/netinet/ip_mroute.c#12 integrate .. //depot/projects/mips/sys/netinet/pim.h#2 integrate .. //depot/projects/mips/sys/netinet6/ah_core.c#6 integrate .. //depot/projects/mips/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/mips/sys/nfsclient/bootp_subr.c#6 integrate .. //depot/projects/mips/sys/nfsclient/nfs_bio.c#8 integrate .. //depot/projects/mips/sys/nfsclient/nfs_subs.c#7 integrate .. //depot/projects/mips/sys/nfsclient/nfs_vnops.c#12 integrate .. //depot/projects/mips/sys/nfsserver/nfs_serv.c#10 integrate .. //depot/projects/mips/sys/pci/if_de.c#8 integrate .. //depot/projects/mips/sys/pci/if_pcn.c#10 integrate .. //depot/projects/mips/sys/pci/if_rl.c#15 integrate .. //depot/projects/mips/sys/pci/if_sf.c#10 integrate .. //depot/projects/mips/sys/pci/if_sis.c#13 integrate .. //depot/projects/mips/sys/pci/if_sk.c#10 integrate .. //depot/projects/mips/sys/pci/if_ste.c#10 integrate .. //depot/projects/mips/sys/pci/if_ti.c#13 integrate .. //depot/projects/mips/sys/pci/if_tl.c#10 integrate .. //depot/projects/mips/sys/pci/if_vr.c#12 integrate .. //depot/projects/mips/sys/pci/if_wb.c#10 integrate .. //depot/projects/mips/sys/pci/if_xl.c#14 integrate .. //depot/projects/mips/sys/sparc64/include/_types.h#4 integrate .. //depot/projects/mips/sys/sys/assym.h#2 integrate .. //depot/projects/mips/sys/sys/buf.h#9 integrate .. //depot/projects/mips/sys/sys/cdefs.h#6 integrate .. //depot/projects/mips/sys/sys/conf.h#11 integrate .. //depot/projects/mips/sys/sys/dir.h#2 integrate .. //depot/projects/mips/sys/sys/ioctl.h#2 integrate .. //depot/projects/mips/sys/sys/kernel.h#6 integrate .. //depot/projects/mips/sys/sys/linker_set.h#2 integrate .. //depot/projects/mips/sys/sys/mdioctl.h#5 integrate .. //depot/projects/mips/sys/sys/mount.h#10 integrate .. //depot/projects/mips/sys/sys/param.h#17 integrate .. //depot/projects/mips/sys/sys/pcpu.h#4 integrate .. //depot/projects/mips/sys/sys/queue.h#3 integrate .. //depot/projects/mips/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/mips/sys/sys/syslimits.h#6 integrate .. //depot/projects/mips/sys/sys/vnode.h#13 integrate .. //depot/projects/mips/sys/ufs/ffs/ffs_softdep.c#10 integrate .. //depot/projects/mips/sys/ufs/ufs/ufs_lookup.c#4 integrate .. //depot/projects/mips/sys/ufs/ufs/ufs_vnops.c#12 integrate .. //depot/projects/mips/sys/vm/uma_core.c#18 integrate .. //depot/projects/mips/sys/vm/vm_fault.c#13 integrate .. //depot/projects/mips/sys/vm/vm_map.h#6 integrate .. //depot/projects/mips/sys/vm/vm_object.c#21 integrate .. //depot/projects/mips/tools/test/ppsapi/ppsapitest.c#2 integrate .. //depot/projects/mips/tools/tools/nanobsd/Makefile#1 branch .. //depot/projects/mips/tools/tools/nanobsd/i386.diskimage#1 branch .. //depot/projects/mips/tools/tools/nanobsd/make.conf#1 branch .. //depot/projects/mips/usr.bin/calendar/calendars/calendar.freebsd#16 integrate .. //depot/projects/mips/usr.bin/doscmd/xms.c#2 integrate .. //depot/projects/mips/usr.bin/lex/FlexLexer.h#2 integrate .. //depot/projects/mips/usr.bin/mail/mail.1#4 integrate .. //depot/projects/mips/usr.bin/make/for.c#4 integrate .. //depot/projects/mips/usr.bin/make/nonints.h#4 integrate .. //depot/projects/mips/usr.bin/make/parse.c#5 integrate .. //depot/projects/mips/usr.bin/msgs/msgs.c#3 integrate .. //depot/projects/mips/usr.bin/netstat/inet.c#5 integrate .. //depot/projects/mips/usr.bin/netstat/mbuf.c#6 integrate .. //depot/projects/mips/usr.bin/rpcinfo/rpcinfo.c#4 integrate .. //depot/projects/mips/usr.bin/systat/convtbl.c#2 integrate .. //depot/projects/mips/usr.bin/systat/convtbl.h#2 integrate .. //depot/projects/mips/usr.bin/systat/extern.h#4 integrate .. //depot/projects/mips/usr.bin/systat/ifcmds.c#2 integrate .. //depot/projects/mips/usr.bin/systat/ifstat.c#2 integrate .. //depot/projects/mips/usr.bin/systat/main.c#2 integrate .. //depot/projects/mips/usr.bin/usbhidaction/usbhidaction.c#2 integrate .. //depot/projects/mips/usr.bin/vmstat/vmstat.c#8 integrate .. //depot/projects/mips/usr.sbin/Makefile#17 integrate .. //depot/projects/mips/usr.sbin/ac/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/ac/ac.c#4 integrate .. //depot/projects/mips/usr.sbin/gstat/gstat.c#3 integrate .. //depot/projects/mips/usr.sbin/newsyslog/Makefile#4 integrate .. //depot/projects/mips/usr.sbin/newsyslog/newsyslog.8#7 integrate .. //depot/projects/mips/usr.sbin/newsyslog/newsyslog.conf.5#1 branch .. //depot/projects/mips/usr.sbin/pw/edgroup.c#2 integrate .. //depot/projects/mips/usr.sbin/pw/fileupd.c#2 integrate .. //depot/projects/mips/usr.sbin/rtadvd/rrenum.c#3 integrate .. //depot/projects/mips/usr.sbin/setkey/token.l#4 integrate .. //depot/projects/mips/usr.sbin/sysinstall/anonFTP.c#2 integrate .. //depot/projects/mips/usr.sbin/sysinstall/dhcp.c#2 integrate .. //depot/projects/mips/usr.sbin/sysinstall/dist.c#10 integrate .. //depot/projects/mips/usr.sbin/sysinstall/install.c#14 integrate .. //depot/projects/mips/usr.sbin/sysinstall/menus.c#13 integrate .. //depot/projects/mips/usr.sbin/sysinstall/sysinstall.h#13 integrate .. //depot/projects/mips/usr.sbin/sysinstall/system.c#4 integrate .. //depot/projects/mips/usr.sbin/sysinstall/tcpip.c#6 integrate .. //depot/projects/mips/usr.sbin/sysinstall/user.c#3 integrate .. //depot/projects/mips/usr.sbin/sysinstall/variable.c#4 integrate Differences ... ==== //depot/projects/mips/Makefile.inc1#23 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.410 2004/03/05 18:16:28 gad Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.415 2004/03/12 13:24:17 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -407,17 +407,29 @@ # # Checks to be sure system is ready for installworld # +CHECK_UIDS= +CHECK_GIDS= +.if !defined(NO_SENDMAIL) +CHECK_UIDS+= smmsp +CHECK_GIDS+= smmsp +.endif +.if !defined(NO_PF) +CHECK_UIDS+= proxy +CHECK_GIDS+= proxy authpf +.endif installcheck: ${SPECIAL_INSTALLCHECKS} -.if !defined(NO_SENDMAIL) - @if ! `id -u smmsp > /dev/null`; then \ - echo "ERROR: Required smmsp user is missing, see /usr/src/UPDATING."; \ +.for uid in ${CHECK_UIDS} + @if ! `id -u ${uid} >/dev/null 2>&1`; then \ + echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \ false; \ fi - @if ! `id -g smmsp > /dev/null`; then \ - echo "ERROR: Required smmsp group is missing, see /usr/src/UPDATING."; \ +.endfor +.for gid in ${CHECK_GIDS} + @if ! `find / -prune -group ${gid} >/dev/null 2>&1`; then \ + echo "ERROR: Required ${gid} group is missing, see /usr/src/UPDATING."; \ false; \ fi -.endif +.endfor # # distributeworld ==== //depot/projects/mips/UPDATING#16 (text+ko) ==== @@ -17,7 +17,25 @@ developers choose to disable these features on build machines to maximize performance. -20040303: +20040310: + The FreeBSD/sparc64 platform is changing time_t from 32-bits to + 64-bits. This is a very major incompatible change, so people + using FreeBSD/sparc64 *must* read the UPDATING.64BTT file for + detailed instructions on how to make this upgrade. People + upgrading FreeBSD on other platforms can ignore this event. + +20040308: + The packet filter (pf) is now installed with the base system. Make + sure to run mergemaster -p before installworld to create required + user accounts. If you do not want to build pf with your system you + can use the NO_PF knob in make.conf. + Also note that pf requires "options PFIL_HOOKS" in the kernel. The + pf system consists of the following three devices: + device pf # required + device pflog # optional + device pfsync # optional + +20040303: If you are having trouble with the libc_r -> libpthread transition (see the 20040130 entry), place the following lines at the top of /etc/libmap.conf: @@ -1530,4 +1548,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.297 2004/03/03 09:17:06 des Exp $ +$FreeBSD: src/UPDATING,v 1.299 2004/03/10 17:39:05 gad Exp $ ==== //depot/projects/mips/UPDATING.64BTT#2 (text+ko) ==== @@ -1,6 +1,6 @@ # -------+---------+---------+---------+---------+---------+---------+---------+ - The FreeBSD/sparc64 port is going to change time_t from 32-bits to 64-bits. + The FreeBSD/sparc64 port has now changed time_t from 32-bits to 64-bits. This file explains the exact steps that users should follow to update their sparc64 systems for this change. People running FreeBSD on other types of hardware, such as CPU's from Intel or AMD, can ignore this file. For now, @@ -28,7 +28,7 @@ # POSSIBILITY OF SUCH DAMAGE. # # -------+---------+---------+---------+---------+---------+---------+---------+ -# $FreeBSD: src/UPDATING.64BTT,v 1.3 2004/03/05 23:10:49 gad Exp $ +# $FreeBSD: src/UPDATING.64BTT,v 1.4 2004/03/10 17:39:05 gad Exp $ # -------+---------+---------+---------+---------+---------+---------+---------+ If you are in too much of a hurry to read this file, then this is not the @@ -43,7 +43,16 @@ Do not start this update unless you have the extra time. -* READ THIS ENTIRE DOCUMENT at least once before starting the upgrade. * +As of March 10th, the official value for time_t on sparc64 has changed to +be 64-bits. If you really must build system with 32-bit time_t's, then it +would be best to stick with a snapshot of current from before March 10th. +With src snapshots after that point, there will soon be ports which assume +you have a 64-bit time_t based on the value of __FreeBSD_version. + +If you are ready to upgrade, then *READ THIS ENTIRE DOCUMENT* at least +once before starting the upgrade. + +# -------+---------+---------+---------+---------+---------+---------+---------+ This is a major change. This change will *not* be backwards-compatible. Any programs which call system-routines for handling time-values will @@ -60,8 +69,12 @@ problems, but if you ignore these steps you are very likely to run into some very painful and time-consuming headaches when upgrading. -Step Pre-1: Update to a recent snapshot of -current, keeping it as - a system with 32-bit time_t. +Step Pre-1: Update to a recent snapshot of -current, and first build + that as a system with 32-bit time_t. To do this, edit + the file /usr/src/sys/sparc64/include/_types.h + find the line: + typedef __int64_t __time_t; /* time()... */ + and change '__int64_t' to '__int32_t' Step Pre-2: Install that system, using whatever steps you normally use, and make sure that installation seems to work okay. Step Pre-3: While still running that 32-bit time_t system, it would @@ -78,17 +91,17 @@ The 'dhclient' in the base system is known to be unreliable on a system which is upgraded to 64-bit time_t's. It may work for you, but it probably will not. - As of March 3rd 2004, we have no fix for that. + As of March 10th 2004, we have no fix for that. However, the net/isc-dhcp3-client port does seem to work. IF your machine needs DHCP, then you should probably install that port and make sure you can get it working *before* you make the change to use 64-bit time_t's. - +After you have built and installed that src-snapshot with 32-bit time_t's, edit the file /usr/src/sys/sparc64/include/_types.h find the line: typedef __int32_t __time_t; /* time()... */ - and change '__int32_t' to '__int64_t' + and change '__int32_t' back to '__int64_t' For best results, do NOT make any other changes. Do NOT cvsup the source tree trying to pick up any other changes. At this point you @@ -104,8 +117,9 @@ I am not suggesting that you have to do two whole buildworld/ installworld cycles in a single day. You could easily wait a few days, or even a week between them. What I am suggesting is that - you should not 'cvsup' your sources inbetween the two buildworlds. - + you should not 'cvsup' your sources inbetween the two buildworlds. + +And then follow these steps to build and install the 64-bit time_t system: cd /usr/src #- 1. make cleanworld #- 2. or 'rm -Rf /usr/obj/usr/src/*' @@ -299,9 +313,9 @@ and log back in after recompiling that shell. portupgrade -Rr -f ezm3 cvsup-without-gui #- Ports 3 (maybe). If you want to rebuild a 64-bit time_t version of cvsup. - Note: ezm3 (modula-3) needs a patch to work correctly after - the change to 64-BTT. That fix has not been commited to the - port yet [as of Mar 3rd], but it should be commited soon. + Note: ezm3 (modula-3) needs a patch to work correctly after the + change to 64-BTT. That fix has not been commited to the port + yet [as of Mar 10th], but hopefully it will be commited soon. There are pre-built packages available for ezm3 and cvsup-without-gui on the new 64-bTT systems. This ezm3 package *does* include the necessarily @@ -325,10 +339,11 @@ "Now look over all the other ports you have installed, and re-compile everything that probably needs to be recompiled". -If you are going to do it piecemeal, the next ports to force-recompile -would probably be languages like perl and python, if you have them -installed. Or you might want to play it safe at this point, and simply -recompile *every* port that you have installed. +If you are going to do it piecemeal, the next ports to force-rebuild would +probably be languages like perl and python, if you have them installed. +After that, force-rebuild the ports like autoconf and automake, if you +have them installed. Or you might want to play it safe at this point, +and simply recompile *every* port that you have installed. A different tactic to use for ports is to remove *all* ports before you do the installkernel/installworld step (while you're still on a 32-bTT @@ -342,20 +357,5 @@ the mailing list freebsd-sparc64@FreeBSD.org . # -------+---------+---------+---------+---------+---------+---------+---------+ - - - For people who are helping out by testing these instructions, note - that once you make this change, you must remember to KEEP changing - __time_t in _types.h after every time you 'cvs update' or cvsup - your /usr/src tree. If you forget, and end up building a world - with 32-bit time_t's, you will probably have a very very bad day. - Once this change is committed for real (which is scheduled for - March 10th), you will not need to care about this issue as much. - - Also, a change has been committed to /usr/src/Makefile.inc1 which - does try to protect you from making this mistake. - - -# -------+---------+---------+---------+---------+---------+---------+---------+ # Notice that the following command can be useful in some settings: grep '#\- ' UPDATING.64BTT ==== //depot/projects/mips/bin/dd/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/dd/Makefile,v 1.16 2004/03/06 06:54:58 ache Exp $ +# $FreeBSD: src/bin/dd/Makefile,v 1.17 2004/03/08 18:09:33 ache Exp $ PROG= dd SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c @@ -8,7 +8,6 @@ .include -CLEANFILES+= a.out # # Test the character conversion functions. We have to be explicit about # which LC_LANG we use because the definition of upper and lower case @@ -24,3 +23,4 @@ /usr/bin/env -i LC_CTYPE=en_US.US-ASCII hexdump -C | \ diff -IFreeBSD - ${.CURDIR}/ref.${conv} .endfor + @rm -f a.out ==== //depot/projects/mips/bin/df/df.c#9 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.55 2004/03/05 08:10:16 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.56 2004/03/09 10:02:44 le Exp $"); #include #include @@ -400,7 +400,8 @@ */ #define fsbtoblk(num, fsbs, bs) \ (((fsbs) != 0 && (fsbs) < (bs)) ? \ - (num) / ((bs) / (fsbs)) : (num) * ((fsbs) / (bs))) + (num) / (intmax_t)((bs) / (fsbs)) : \ + (num) * (intmax_t)((fsbs) / (bs))) /* * Print out status about a file system. ==== //depot/projects/mips/contrib/openpam/lib/openpam_impl.h#6 (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_impl.h#28 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#29 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -137,45 +137,52 @@ #ifdef DEBUG #define ENTER() openpam_log(PAM_LOG_DEBUG, "entering") #define ENTERI(i) do { \ - if ((i) > 0 && (i) < PAM_NUM_ITEMS) \ - openpam_log(PAM_LOG_DEBUG, "entering: %s", _pam_item_name[i]); \ + int _i = (i); \ + if (_i > 0 && _i < PAM_NUM_ITEMS) \ + openpam_log(PAM_LOG_DEBUG, "entering: %s", _pam_item_name[_i]); \ else \ - openpam_log(PAM_LOG_DEBUG, "entering: %d", (i)); \ + openpam_log(PAM_LOG_DEBUG, "entering: %d", _i); \ } while (0) #define ENTERN(n) do { \ - openpam_log(PAM_LOG_DEBUG, "entering: %d", (n)); \ + int _n = (n); \ + openpam_log(PAM_LOG_DEBUG, "entering: %d", _n); \ } while (0) #define ENTERS(s) do { \ - if ((s) == NULL) \ + const char *_s = (s); \ + if (_s == NULL) \ openpam_log(PAM_LOG_DEBUG, "entering: NULL"); \ else \ - openpam_log(PAM_LOG_DEBUG, "entering: '%s'", (s)); \ + openpam_log(PAM_LOG_DEBUG, "entering: '%s'", _s); \ } while (0) #define RETURNV() openpam_log(PAM_LOG_DEBUG, "returning") #define RETURNC(c) do { \ - if ((c) >= 0 && (c) < PAM_NUM_ERRORS) \ - openpam_log(PAM_LOG_DEBUG, "returning %s", _pam_err_name[c]); \ + int _c = (c); \ + if (_c >= 0 && _c < PAM_NUM_ERRORS) \ + openpam_log(PAM_LOG_DEBUG, "returning %s", _pam_err_name[_c]); \ else \ - openpam_log(PAM_LOG_DEBUG, "returning %d!", (c)); \ - return (c); \ + openpam_log(PAM_LOG_DEBUG, "returning %d!", _c); \ + return (_c); \ } while (0) #define RETURNN(n) do { \ - openpam_log(PAM_LOG_DEBUG, "returning %d", (n)); \ - return (n); \ + int _n = (n); \ + openpam_log(PAM_LOG_DEBUG, "returning %d", _n); \ + return (_n); \ } while (0) #define RETURNP(p) do { \ - if ((p) == NULL) \ + const void *_p = (p); \ + if (_p == NULL) \ openpam_log(PAM_LOG_DEBUG, "returning NULL"); \ else \ - openpam_log(PAM_LOG_DEBUG, "returning %p", (p)); \ + openpam_log(PAM_LOG_DEBUG, "returning %p", _p); \ return (p); \ } while (0) #define RETURNS(s) do { \ - if ((s) == NULL) \ + const char *_s = (s); \ + if (_s == NULL) \ openpam_log(PAM_LOG_DEBUG, "returning NULL"); \ else \ - openpam_log(PAM_LOG_DEBUG, "returning '%s'", (s)); \ - return (s); \ + openpam_log(PAM_LOG_DEBUG, "returning '%s'", _s); \ + return (_s); \ } while (0) #else #define ENTER() ==== //depot/projects/mips/contrib/pf/pfctl/parse.y#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.2 2004/02/28 18:41:43 mlaier Exp $ */ +/* $FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.3 2004/03/08 15:19:55 mlaier Exp $ */ /* $OpenBSD: parse.y,v 1.415 2003/09/01 15:07:40 henning Exp $ */ /* @@ -2737,7 +2737,7 @@ memcpy(&r.rpool.key, $8.key, sizeof(struct pf_poolhashkey)); - if ($9 != NULL) { + if ($9 != 0) { if (r.action != PF_NAT) { yyerror("the 'static-port' option is " "only valid with nat rules"); ==== //depot/projects/mips/contrib/pf/pfctl/pfctl_altq.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ +/* $FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.3 2004/03/08 15:19:55 mlaier Exp $ */ /* $OpenBSD: pfctl_altq.c,v 1.77 2003/08/22 21:50:34 david Exp $ */ /* @@ -165,7 +165,7 @@ print_altq(const struct pf_altq *a, unsigned level, struct node_queue_bw *bw, struct node_queue_opt *qopts) { - if (a->qname[0] != NULL) { + if (a->qname[0] != '\0') { print_queue(a, level, bw, 0, qopts); return; } ==== //depot/projects/mips/etc/Makefile#14 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.324 2004/01/22 08:18:37 ru Exp $ +# $FreeBSD: src/etc/Makefile,v 1.325 2004/03/08 22:03:27 mlaier Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -11,7 +11,7 @@ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ - phones profile protocols \ + pf.conf pf.os phones profile protocols \ rc rc.firewall rc.firewall6 rc.sendmail rc.shutdown \ rc.subr remote rpc services \ shells sysctl.conf syslog.conf usbd.conf \ ==== //depot/projects/mips/etc/group#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/group,v 1.28 2003/04/27 05:49:53 imp Exp $ +# $FreeBSD: src/etc/group,v 1.30 2004/03/10 15:04:29 mlaier Exp $ # wheel:*:0:root daemon:*:1: @@ -17,6 +17,8 @@ mailnull:*:26: guest:*:31: bind:*:53: +proxy:*:62: +authpf:*:63: uucp:*:66: dialer:*:68: network:*:69: ==== //depot/projects/mips/etc/inetd.conf#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.63 2003/06/09 21:04:30 markm Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.67 2004/03/11 22:15:28 des Exp $ # # Internet server configuration database # @@ -26,8 +26,8 @@ # # ntalk is required for the 'talk' utility to work correctly #ntalk dgram udp wait tty:tty /usr/libexec/ntalkd ntalkd -#tftp dgram udp wait root /usr/libexec/tftpd tftpd -s /tftpboot -#tftp dgram udp6 wait root /usr/libexec/tftpd tftpd -s /tftpboot +#tftp dgram udp wait root /usr/libexec/tftpd tftpd -l -s /tftpboot +#tftp dgram udp6 wait root /usr/libexec/tftpd tftpd -l -s /tftpboot #bootps dgram udp wait root /usr/libexec/bootpd bootpd # # "Small servers" -- used to be standard on, but we're more conservative @@ -117,3 +117,9 @@ #netbios-ssn stream tcp nowait root /usr/local/sbin/smbd smbd #netbios-ns dgram udp wait root /usr/local/sbin/nmbd nmbd #swat stream tcp nowait/400 root /usr/local/sbin/swat swat +# +# Enable the following entry to enable ftp-proxy to NAT ftp sessions with pf +# N.B.: inetd binds to * in the default installation so you should add +# an appropriate block rule to your pf.conf +# +#ftp-proxy stream tcp nowait root /usr/libexec/ftp-proxy ftp-proxy ==== //depot/projects/mips/etc/master.passwd#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/master.passwd,v 1.34 2003/04/27 05:45:29 imp Exp $ +# $FreeBSD: src/etc/master.passwd,v 1.35 2004/03/08 22:03:27 mlaier Exp $ # root::0:0::0:0:Charlie &:/root:/bin/csh toor:*:0:0::0:0:Bourne-again Superuser:/root: @@ -14,6 +14,7 @@ smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/sbin/nologin mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/sbin/nologin bind:*:53:53::0:0:Bind Sandbox:/:/sbin/nologin +proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/sbin/nologin uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico pop:*:68:6::0:0:Post Office Owner:/nonexistent:/sbin/nologin www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/sbin/nologin ==== //depot/projects/mips/etc/protocols#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # Internet protocols # -# $FreeBSD: src/etc/protocols,v 1.18 2002/12/13 09:18:09 fenner Exp $ +# $FreeBSD: src/etc/protocols,v 1.19 2004/03/08 22:03:27 mlaier Exp $ # from: @(#)protocols 5.1 (Berkeley) 4/17/89 # # See also http://www.iana.org/assignments/protocol-numbers @@ -65,7 +65,7 @@ mobile 55 MOBILE # IP Mobility tlsp 56 TLSP # Transport Layer Security Protocol skip 57 SKIP # SKIP -ipv6-icmp 58 IPV6-ICMP # ICMP for IPv6 +ipv6-icmp 58 IPV6-ICMP icmp6 # ICMP for IPv6 ipv6-nonxt 59 IPV6-NONXT # no next header for ipv6 ipv6-opts 60 IPV6-OPTS # destination options for ipv6 # 61 # any host internal protocol ==== //depot/projects/mips/etc/rc#8 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.330 2004/02/27 10:44:33 mtm Exp $ +# $FreeBSD: src/etc/rc,v 1.331 2004/03/08 12:02:07 pjd Exp $ # # System startup script run by init on autoboot @@ -66,9 +66,9 @@ fi os=`eval ${CMD_OSTYPE}` -skip="nostart" -[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip nojail" -files=`rcorder -k ${os} -s ${skip} /etc/rc.d/* 2>/dev/null` +skip="-s nostart" +[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip -s nojail" +files=`rcorder -k ${os} ${skip} /etc/rc.d/* 2>/dev/null` for _rc_elem in ${files}; do run_rc_script ${_rc_elem} ${_boot} ==== //depot/projects/mips/etc/rc.d/abi#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.2 2003/05/05 15:38:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.3 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: abi # REQUIRE: LOGIN # BEFORE: securelevel -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/mips/etc/rc.d/accounting#5 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/accounting,v 1.7 2004/03/05 07:43:38 mtm Exp $ +# $FreeBSD: src/etc/rc.d/accounting,v 1.8 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: accounting # REQUIRE: mountcritremote # BEFORE: DAEMON -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/mips/etc/rc.d/addswap#3 (text+ko) ==== @@ -2,13 +2,13 @@ # # Add additional swap files # -# $FreeBSD: src/etc/rc.d/addswap,v 1.2 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/addswap,v 1.3 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: addswap # REQUIRE: mountcritlocal # BEFORE: sysctl -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/mips/etc/rc.d/adjkerntz#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.2 2003/04/18 17:55:05 mtm Exp $ +# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.3 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: adjkerntz # REQUIRE: diskless mountcritlocal random # BEFORE: netif -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/mips/etc/rc.d/amd#5 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.12 2004/03/05 07:43:38 mtm Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.13 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: amd # REQUIRE: rpcbind ypbind nfsclient # BEFORE: DAEMON -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/mips/etc/rc.d/apm#4 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/apm,v 1.4 2003/06/09 17:44:30 mtm Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 12 18:58:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28A5716A4D0; Fri, 12 Mar 2004 18:58: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 ED38016A4CE for ; Fri, 12 Mar 2004 18:58:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E560843D31 for ; Fri, 12 Mar 2004 18:58:23 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2D2wNGe073018 for ; Fri, 12 Mar 2004 18:58:23 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D2wNGN073015 for perforce@freebsd.org; Fri, 12 Mar 2004 18:58:23 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 18:58:23 -0800 (PST) Message-Id: <200403130258.i2D2wNGN073015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48849 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 Mar 2004 02:58:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=48849 Change 48849 by jmallett@jmallett_oingo on 2004/03/12 18:57:48 Attach platform busses... Affected files ... .. //depot/projects/mips/sys/mips/include/hwfunc.h#3 edit .. //depot/projects/mips/sys/mips/mips/autoconf.c#2 edit Differences ... ==== //depot/projects/mips/sys/mips/include/hwfunc.h#3 (text+ko) ==== @@ -32,6 +32,7 @@ * Hooks downward into hardware functionality. */ +void platform_configure(void); void platform_halt(void); void platform_reset(void); void platform_start(int, char *[]); ==== //depot/projects/mips/sys/mips/mips/autoconf.c#2 (text+ko) ==== @@ -29,6 +29,7 @@ #include #include #include +#include static device_t nexusdev; @@ -40,5 +41,6 @@ configure(void *arg) { nexusdev = device_add_child(root_bus, "nexus", 0); + platform_configure(); root_bus_configure(); } From owner-p4-projects@FreeBSD.ORG Fri Mar 12 18:58:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3C4116A4D4; Fri, 12 Mar 2004 18:58: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 97F1116A4D7 for ; Fri, 12 Mar 2004 18:58:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F77D43D31 for ; Fri, 12 Mar 2004 18:58:24 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2D2wOGe073025 for ; Fri, 12 Mar 2004 18:58:24 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D2wNxP073021 for perforce@freebsd.org; Fri, 12 Mar 2004 18:58:23 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Fri, 12 Mar 2004 18:58:23 -0800 (PST) Message-Id: <200403130258.i2D2wNxP073021@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48850 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 Mar 2004 02:58:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=48850 Change 48850 by jmallett@jmallett_oingo on 2004/03/12 18:57:58 Attach IMC :D Affected files ... .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#26 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#26 (text+ko) ==== @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -191,6 +192,19 @@ } #endif +void +platform_configure(void) +{ + switch (mach_type) { + case MACH_SGI_IP22: + device_add_child(root_bus, "imc", 0); + break; + default: + panic("cannot autoconfigure type %d", mach_type); + break; + } +} + /* * XXX Maybe return the state of the watchdog in enter, and pass it to * exit? Like spl(). From owner-p4-projects@FreeBSD.ORG Fri Mar 12 22:25:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E52416A4D0; Fri, 12 Mar 2004 22:25:27 -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 46FB416A4CE for ; Fri, 12 Mar 2004 22:25:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 358BE43D45 for ; Fri, 12 Mar 2004 22:25:27 -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.10/8.12.10) with ESMTP id i2D6PQGe026140 for ; Fri, 12 Mar 2004 22:25:26 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D6PQE2026130 for perforce@freebsd.org; Fri, 12 Mar 2004 22:25:26 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 12 Mar 2004 22:25:26 -0800 (PST) Message-Id: <200403130625.i2D6PQE2026130@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 48870 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 Mar 2004 06:25:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=48870 Change 48870 by rwatson@rwatson_paprika on 2004/03/12 22:24:28 Integrate netperf_socket from FreeBSD CVS HEAD: - Someone added punctuation to NOTES. - Loop back of comments that poll() and kern_select() exert Giant painfully. - bde makes core dumping fast(er). - if_withname() removed; no empty ifnet renames. - Loop back constify iso88025_broadcastaddr, atmulticastaddr, aarp_org_code. - Loop back remove tap_unit, tun_unit. Affected files ... .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#8 integrate .. //depot/projects/netperf_socket/sys/kern/sys_generic.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_tapvar.h#3 integrate .. //depot/projects/netperf_socket/sys/net/if_tun.c#4 integrate .. //depot/projects/netperf_socket/sys/net/if_var.h#3 integrate .. //depot/projects/netperf_socket/sys/netatalk/aarp.c#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/i386/conf/NOTES#8 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1134 2004/03/06 06:54:54 scottl Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1136 2004/03/13 00:56:11 bde Exp $ # # @@ -15,7 +15,7 @@ machine i386 # -# We want LINT to cover profiling as well +# We want LINT to cover profiling as well. profile 2 @@ -95,20 +95,20 @@ # CPU_DIRECT_MAPPED_CACHE sets L1 cache of Cyrix 486DLC CPU in direct # mapped mode. Default is 2-way set associative mode. # -# CPU_DISABLE_5X86_LSSER disables load store serialize (i.e. enables +# CPU_DISABLE_5X86_LSSER disables load store serialize (i.e., enables # reorder). This option should not be used if you use memory mapped # I/O device(s). # # CPU_DISABLE_CMPXCHG disables the CMPXCHG instruction on > i386 IA32 # machines. VmWare seems to emulate this instruction poorly, causing -# the guest OS to run very slowly. Enabling this with a SMP kernel +# the guest OS to run very slowly. Enabling this with an SMP kernel # will cause the kernel to be unusable. # -# CPU_DISABLE_SSE explicitly prevent I686_CPU from turning on SSE. +# CPU_DISABLE_SSE explicitly prevents I686_CPU from turning on SSE. # # CPU_ELAN enables support for AMDs ElanSC520 CPU. # CPU_ELAN_PPS enables precision timestamp code. -# CPU_ELAN_XTAL sets the clock crystal frequency in Hz +# CPU_ELAN_XTAL sets the clock crystal frequency in Hz. # # CPU_ENABLE_LONGRUN enables support for Transmeta Crusoe LongRun # technology which allows to restrict power consumption of the CPU by @@ -119,7 +119,7 @@ # # CPU_ENABLE_TCC enables Thermal Control Circuitry (TCC) found in some # Pentium(tm) 4 and (possibly) later CPUs. When enabled and detected, -# TCC allows to restrict power consumption by using group of hw.p4tcc.* +# TCC supports restricting power consumption using the hw.p4tcc.* # sysctls. This operates independently of SpeedStep and is useful on # systems where other mechanisms such as apm(4) or acpi(4) don't work. # @@ -495,10 +495,11 @@ # ar: Arnet SYNC/570i hdlc sync 2/4 port V.35/X.21 serial driver # (requires sppp) # ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) -# ctau: Cronyx/Tau sync dual port V.35/RS-232/RS-530/RS-449/X.21/G.703/E1 serial -# adapter (requires sppp or NETGRAPH, depends on NETGRAPH_CRONYX option) -# cx: Cronyx/Sigma multiport sync/async adapter (requires sppp or NETGRAPH; -# NETGRAPH support depends on NETGRAPH_CRONYX option) +# ctau: Cronyx/Tau sync dual port V.35/RS-232/RS-530/RS-449/X.21/G.703/E1 +# serial adaptor (requires sppp (default), or NETGRAPH if +# NETGRAPH_CRONYX is configured) +# cx: Cronyx/Sigma multiport sync/async adapter (requires sppp (default), +# or NETGRAPH if NETGRAPH_CRONYX is configured) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) # (requires miibus) @@ -637,7 +638,7 @@ # cy: Cyclades serial driver # digi: Digiboard driver # gp: National Instruments AT-GPIB and AT-GPIB/TNT board, PCMCIA-GPIB -# asc: GI1904-based hand scanners, e.g. the Trust Amiscan Grey +# asc: GI1904-based hand scanners, e.g., the Trust Amiscan Grey # gsc: Genius GS-4500 hand scanner. # spic: Sony Programmable I/O controller (VAIO notebooks) # stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based) ==== //depot/projects/netperf_socket/sys/kern/sys_generic.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sys_generic.c,v 1.129 2004/02/27 18:52:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sys_generic.c,v 1.130 2004/03/13 05:58:57 rwatson Exp $"); #include "opt_ktrace.h" @@ -746,6 +746,10 @@ if (nd < 0) return (EINVAL); fdp = td->td_proc->p_fd; + /* + * XXX: kern_select() currently requires that we acquire Giant + * even if none of the file descriptors we poll requires Giant. + */ mtx_lock(&Giant); FILEDESC_LOCK(fdp); @@ -954,6 +958,10 @@ nfds = uap->nfds; + /* + * XXX: poll() currently requires that we acquire Giant even if + * none of the file descriptors we poll requires Giant. + */ mtx_lock(&Giant); /* * This is kinda bogus. We have fd limits, but that is not ==== //depot/projects/netperf_socket/sys/kern/vfs_vnops.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.196 2003/12/28 09:12:56 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.197 2004/03/13 02:56:27 bde Exp $"); #include "opt_mac.h" @@ -476,8 +476,18 @@ int error = 0; do { - int chunk = (len > MAXBSIZE) ? MAXBSIZE : len; + int chunk; + + /* + * Force `offset' to a multiple of MAXBSIZE except possibly + * for the first chunk, so that filesystems only need to + * write full blocks except possibly for the first and last + * chunks. + */ + chunk = MAXBSIZE - (uoff_t)offset % MAXBSIZE; + if (chunk > len) + chunk = len; if (rw != UIO_READ && vp->v_type == VREG) bwillwrite(); error = vn_rdwr(rw, vp, base, chunk, offset, segflg, ==== //depot/projects/netperf_socket/sys/net/if.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.183 2004/02/26 04:27:54 mlaier Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.185 2004/03/13 02:35:03 brooks Exp $ */ #include "opt_compat.h" @@ -1247,32 +1247,6 @@ } /* - * Map interface name in a sockaddr_dl to - * interface structure pointer. - */ -struct ifnet * -if_withname(struct sockaddr *sa) -{ - char ifname[IFNAMSIZ+1]; - struct sockaddr_dl *sdl = (struct sockaddr_dl *)sa; - - if ( (sa->sa_family != AF_LINK) || (sdl->sdl_nlen == 0) || - (sdl->sdl_nlen > IFNAMSIZ) ) - return NULL; - - /* - * ifunit wants a NUL-terminated string. It may not be NUL-terminated - * in the sockaddr, and we don't want to change the caller's sockaddr - * (there might not be room to add the trailing NUL anyway), so we make - * a local copy that we know we can NUL-terminate safely. - */ - - bcopy(sdl->sdl_data, ifname, sdl->sdl_nlen); - ifname[sdl->sdl_nlen] = '\0'; - return ifunit(ifname); -} - -/* * Hardware specific interface ioctls. */ static int @@ -1374,11 +1348,13 @@ case SIOCSIFNAME: error = suser(td); - if (error) + if (error != 0) return (error); error = copyinstr(ifr->ifr_data, new_name, IFNAMSIZ, NULL); - if (error) + if (error != 0) return (error); + if (new_name[0] == '\0') + return (EINVAL); if (ifunit(new_name) != NULL) return (EEXIST); ==== //depot/projects/netperf_socket/sys/net/if_iso88025subr.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_iso88025subr.c,v 1.58 2003/11/14 21:02:22 andre Exp $ + * $FreeBSD: src/sys/net/if_iso88025subr.c,v 1.59 2004/03/13 05:46:26 rwatson Exp $ * */ @@ -79,7 +79,7 @@ #include #endif -static u_char iso88025_broadcastaddr[ISO88025_ADDR_LEN] = +static const u_char iso88025_broadcastaddr[ISO88025_ADDR_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; static int iso88025_resolvemulti (struct ifnet *, struct sockaddr **, @@ -498,8 +498,8 @@ * Set mbuf flags for bcast/mcast. */ if (th->iso88025_dhost[0] & 1) { - if (bcmp((caddr_t)iso88025_broadcastaddr, - (caddr_t)th->iso88025_dhost, ISO88025_ADDR_LEN) == 0) + if (bcmp(iso88025_broadcastaddr, th->iso88025_dhost, + ISO88025_ADDR_LEN) == 0) m->m_flags |= M_BCAST; else m->m_flags |= M_MCAST; ==== //depot/projects/netperf_socket/sys/net/if_tapvar.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ /* - * $FreeBSD: src/sys/net/if_tapvar.h,v 1.5 2004/02/21 20:29:52 phk Exp $ + * $FreeBSD: src/sys/net/if_tapvar.h,v 1.6 2004/03/13 05:51:06 rwatson Exp $ * $Id: if_tapvar.h,v 0.6 2000/07/11 02:16:08 max Exp $ */ @@ -44,8 +44,6 @@ struct tap_softc { struct arpcom arpcom; /* ethernet common data */ #define tap_if arpcom.ac_if - struct resource *tap_unit; /* unit */ - u_short tap_flags; /* misc flags */ #define TAP_OPEN (1 << 0) #define TAP_INITED (1 << 1) ==== //depot/projects/netperf_socket/sys/net/if_tun.c#4 (text+ko) ==== @@ -13,7 +13,7 @@ * UCL. This driver is based much more on read/write/poll mode of * operation though. * - * $FreeBSD: src/sys/net/if_tun.c,v 1.135 2004/03/11 12:58:55 phk Exp $ + * $FreeBSD: src/sys/net/if_tun.c,v 1.136 2004/03/13 05:51:06 rwatson Exp $ */ #include "opt_atalk.h" @@ -57,7 +57,6 @@ struct tun_softc { TAILQ_ENTRY(tun_softc) tun_list; - int tun_unit; dev_t tun_dev; u_short tun_flags; /* misc flags */ #define TUN_OPEN 0x0001 ==== //depot/projects/netperf_socket/sys/net/if_var.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)if.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_var.h,v 1.64 2004/02/26 04:27:54 mlaier Exp $ + * $FreeBSD: src/sys/net/if_var.h,v 1.65 2004/03/13 02:31:40 brooks Exp $ */ #ifndef _NET_IF_VAR_H_ @@ -477,7 +477,6 @@ int ifioctl(struct socket *, u_long, caddr_t, struct thread *); int ifpromisc(struct ifnet *, int); struct ifnet *ifunit(const char *); -struct ifnet *if_withname(struct sockaddr *); int if_poll_recv_slow(struct ifnet *ifp, int *quotap); void if_poll_xmit_slow(struct ifnet *ifp, int *quotap); ==== //depot/projects/netperf_socket/sys/netatalk/aarp.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. * - * $FreeBSD: src/sys/netatalk/aarp.c,v 1.24 2003/11/08 22:28:39 sam Exp $ + * $FreeBSD: src/sys/netatalk/aarp.c,v 1.25 2004/03/13 05:27:17 rwatson Exp $ */ #include "opt_atalk.h" @@ -58,14 +58,17 @@ extern u_char etherbroadcastaddr[6]; # endif /* __FreeBSD__ */ -static u_char atmulticastaddr[ 6 ] = { +static const u_char atmulticastaddr[ 6 ] = { 0x09, 0x00, 0x07, 0xff, 0xff, 0xff, }; +/* + * Not used? + */ u_char at_org_code[ 3 ] = { 0x08, 0x00, 0x07, }; -u_char aarp_org_code[ 3 ] = { +const u_char aarp_org_code[ 3 ] = { 0x00, 0x00, 0x00, }; @@ -163,8 +166,7 @@ eh = (struct ether_header *)sa.sa_data; if ( aa->aa_flags & AFA_PHASE2 ) { - bcopy((caddr_t)atmulticastaddr, (caddr_t)eh->ether_dhost, - sizeof( eh->ether_dhost )); + bcopy(atmulticastaddr, eh->ether_dhost, sizeof( eh->ether_dhost )); eh->ether_type = htons(sizeof(struct llc) + sizeof(struct ether_aarp)); M_PREPEND( m, sizeof( struct llc ), M_TRYWAIT ); if ( m == NULL ) { @@ -173,7 +175,7 @@ llc = mtod( m, struct llc *); llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP; llc->llc_control = LLC_UI; - bcopy( aarp_org_code, llc->llc_org_code, sizeof( aarp_org_code )); + bcopy(aarp_org_code, llc->llc_org_code, sizeof(aarp_org_code)); llc->llc_ether_type = htons( ETHERTYPE_AARP ); bcopy( &AA_SAT( aa )->sat_addr.s_net, ea->aarp_spnet, @@ -221,8 +223,7 @@ return( 0 ); } if ( aa->aa_flags & AFA_PHASE2 ) { - bcopy( (caddr_t)atmulticastaddr, (caddr_t)desten, - sizeof( atmulticastaddr )); + bcopy(atmulticastaddr, (caddr_t)desten, sizeof(atmulticastaddr)); } else { bcopy( ac->ac_if.if_broadcastaddr, (caddr_t)desten, sizeof( ac->ac_if.if_addrlen )); @@ -581,8 +582,7 @@ eh = (struct ether_header *)sa.sa_data; if ( aa->aa_flags & AFA_PHASE2 ) { - bcopy((caddr_t)atmulticastaddr, (caddr_t)eh->ether_dhost, - sizeof( eh->ether_dhost )); + bcopy(atmulticastaddr, eh->ether_dhost, sizeof( eh->ether_dhost )); eh->ether_type = htons( sizeof( struct llc ) + sizeof( struct ether_aarp )); M_PREPEND( m, sizeof( struct llc ), M_TRYWAIT ); From owner-p4-projects@FreeBSD.ORG Sat Mar 13 00:36:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E05E016A4D0; Sat, 13 Mar 2004 00:36: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 BC29F16A4CE for ; Sat, 13 Mar 2004 00:36:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B608D43D2F for ; Sat, 13 Mar 2004 00:36:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2D8a7Ge054519 for ; Sat, 13 Mar 2004 00:36:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D8a7r3054516 for perforce@freebsd.org; Sat, 13 Mar 2004 00:36:07 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 13 Mar 2004 00:36:07 -0800 (PST) Message-Id: <200403130836.i2D8a7r3054516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48875 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 Mar 2004 08:36:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=48875 Change 48875 by jmallett@jmallett_oingo on 2004/03/13 00:35:23 Attempt to get some clock code here.. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/clock.c#4 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/clock.c#4 (text+ko) ==== @@ -28,10 +28,39 @@ #include #include #include +#include + +#include +#include +static unsigned +sgimips_get_timecount(struct timecounter *tc) +{ + return (mips_rd_count()); +} + +static struct timecounter sgimips_timecounter = { + sgimips_get_timecount, + NULL, + ~0, + 0, + "Uninitialized SGIMIPS", + 1000 +}; + void cpu_initclocks(void) { + switch (mach_type) { + case MACH_SGI_IP22: + sgimips_timecounter.tc_frequency = curcpu()->ci_cpu_freq; + sgimips_timecounter.tc_name = "SGI IP22"; + break; + default: + panic("cannot init clock for type %d", mach_type); + } + tc_init(&sgimips_timecounter); + mips_wr_status(mips_rd_status() | MIPS_SR_INT_IE | MIPS_INT_MASK_5); } void From owner-p4-projects@FreeBSD.ORG Sat Mar 13 00:37:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCA7616A4D0; Sat, 13 Mar 2004 00:37:09 -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 B863216A4CE for ; Sat, 13 Mar 2004 00:37:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2AF043D3F for ; Sat, 13 Mar 2004 00:37:09 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2D8b9Ge054558 for ; Sat, 13 Mar 2004 00:37:09 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D8b9wv054555 for perforce@freebsd.org; Sat, 13 Mar 2004 00:37:09 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 13 Mar 2004 00:37:09 -0800 (PST) Message-Id: <200403130837.i2D8b9wv054555@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48876 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 Mar 2004 08:37:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=48876 Change 48876 by jmallett@jmallett_oingo on 2004/03/13 00:36:14 Interrupt? Sure, why not. Affected files ... .. //depot/projects/mips/sys/mips/include/hwfunc.h#4 edit .. //depot/projects/mips/sys/mips/mips/trap.c#17 edit Differences ... ==== //depot/projects/mips/sys/mips/include/hwfunc.h#4 (text+ko) ==== @@ -28,12 +28,15 @@ #ifndef _MACHINE_HWFUNC_H_ #define _MACHINE_HWFUNC_H_ +struct trapframe; + /* * Hooks downward into hardware functionality. */ void platform_configure(void); void platform_halt(void); +void platform_intr(struct trapframe *); void platform_reset(void); void platform_start(int, char *[]); ==== //depot/projects/mips/sys/mips/mips/trap.c#17 (text+ko) ==== @@ -40,6 +40,7 @@ #include #include #include +#include #ifdef DDB #include @@ -108,6 +109,12 @@ tlb_modified(badvaddr); platform_trap_exit(); return; + case TrInt: + platform_trap_exit(); + atomic_add_int(&curthread->td_intr_nesting_level, 1); + platform_intr(tf); + atomic_subtract_int(&curthread->td_intr_nesting_level, 1); + return; default: /* Fatal! */ break; From owner-p4-projects@FreeBSD.ORG Sat Mar 13 00:38:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D97C816A4D0; Sat, 13 Mar 2004 00: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 B31E016A4CE for ; Sat, 13 Mar 2004 00:38:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD9F643D2D for ; Sat, 13 Mar 2004 00:38:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2D8cBGe054578 for ; Sat, 13 Mar 2004 00:38:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D8cB85054575 for perforce@freebsd.org; Sat, 13 Mar 2004 00:38:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 13 Mar 2004 00:38:11 -0800 (PST) Message-Id: <200403130838.i2D8cB85054575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48877 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 Mar 2004 08:38:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=48877 Change 48877 by jmallett@jmallett_oingo on 2004/03/13 00:37:13 Save new thread when calling into pmap... Affected files ... .. //depot/projects/mips/sys/mips/mips/swtch.S#4 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/swtch.S#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/swtch.S#3 $ + * $P4: //depot/projects/mips/sys/mips/mips/swtch.S#4 $ */ #include @@ -63,11 +63,15 @@ * a1: struct thread *new */ ENTRY(cpu_throw) + dsubu sp, 8 + sd a1, 0(sp) jal pmap_activate move a0, a1 dla k0, pcpup ld k0, 0(k0) + ld a0, 0(sp) sd a0, PC_CURTHREAD(k0) + daddu sp, 8 ld t0, TD_PCB(a0) ld s0, SF_REG_S0(t0) ld s1, SF_REG_S1(t0) From owner-p4-projects@FreeBSD.ORG Sat Mar 13 00:40:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 226A616A4D0; Sat, 13 Mar 2004 00:40:15 -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 D782F16A4CE for ; Sat, 13 Mar 2004 00:40:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF70C43D1F for ; Sat, 13 Mar 2004 00:40:14 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2D8eEGe054671 for ; Sat, 13 Mar 2004 00:40:14 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D8eECb054668 for perforce@freebsd.org; Sat, 13 Mar 2004 00:40:14 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 13 Mar 2004 00:40:14 -0800 (PST) Message-Id: <200403130840.i2D8eECb054668@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48878 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 Mar 2004 08:40:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=48878 Change 48878 by jmallett@jmallett_oingo on 2004/03/13 00:39:31 Go nuts with using KSEG1 instead of KSEG0. This fixes some incoherent issues. This mess needs fixed in the future, but I can't figure out now where we have problems. Affected files ... .. //depot/projects/mips/sys/mips/mips/pmap.c#33 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/pmap.c#33 (text+ko) ==== @@ -247,7 +247,7 @@ pa = phys_avail[0]; phys_avail[0] += size; - va = MIPS_PHYS_TO_KSEG0(pa); + va = MIPS_PHYS_TO_KSEG1(pa); bzero((caddr_t) va, size); return va; } @@ -332,7 +332,7 @@ break; } - va = (void *)MIPS_PHYS_TO_KSEG0(m->phys_addr); + va = (void *)MIPS_PHYS_TO_KSEG1(m->phys_addr); if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) bzero(va, PAGE_SIZE); return (va); @@ -343,7 +343,7 @@ { vm_page_t m; - m = PHYS_TO_VM_PAGE(MIPS_KSEG0_TO_PHYS((vm_offset_t)mem)); + m = PHYS_TO_VM_PAGE(MIPS_KSEG1_TO_PHYS((vm_offset_t)mem)); vm_page_lock_queues(); vm_page_free(m); vm_page_unlock_queues(); @@ -520,8 +520,8 @@ { vm_offset_t pa; - if (va >= MIPS_KSEG0_START && va <= MIPS_KSEG0_END) - pa = MIPS_KSEG0_TO_PHYS(va); + if (va >= MIPS_KSEG1_START && va <= MIPS_KSEG1_END) + pa = MIPS_KSEG1_TO_PHYS(va); else pa = pmap_extract(kernel_pmap, va); return pa; @@ -649,7 +649,7 @@ #if 0 /* XXX notyet, need pmap_extract etc., to love us. */ return MIPS_PHYS_TO_XKPHYS(MIPS_XKPHYS_UC, start); #endif - return MIPS_PHYS_TO_KSEG0(start); + return MIPS_PHYS_TO_KSEG1(start); } void @@ -699,7 +699,7 @@ vm_page_unlock_queues(); VM_OBJECT_UNLOCK(pmap->pm_pteobj); - pmap->pm_lev1 = (pt_entry_t*) MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(lev1pg)); + pmap->pm_lev1 = (pt_entry_t*) MIPS_PHYS_TO_KSEG1(VM_PAGE_TO_PHYS(lev1pg)); if ((lev1pg->flags & PG_ZERO) == 0) bzero(pmap->pm_lev1, PAGE_SIZE); @@ -1181,7 +1181,7 @@ void * pmap_kenter_temporary(vm_offset_t pa, int i) { - return (void *) MIPS_PHYS_TO_KSEG0(pa - (i * PAGE_SIZE)); + return (void *) MIPS_PHYS_TO_KSEG1(pa - (i * PAGE_SIZE)); } vm_page_t @@ -1266,7 +1266,7 @@ void pmap_zero_page(vm_page_t m) { - vm_offset_t va = MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(m)); + vm_offset_t va = MIPS_PHYS_TO_KSEG1(VM_PAGE_TO_PHYS(m)); bzero((caddr_t) va, PAGE_SIZE); } @@ -1282,7 +1282,7 @@ void pmap_zero_page_area(vm_page_t m, int off, int size) { - vm_offset_t va = MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(m)); + vm_offset_t va = MIPS_PHYS_TO_KSEG1(VM_PAGE_TO_PHYS(m)); bzero((char *)(caddr_t)va + off, size); } @@ -1296,7 +1296,7 @@ void pmap_zero_page_idle(vm_page_t m) { - vm_offset_t va = MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(m)); + vm_offset_t va = MIPS_PHYS_TO_KSEG1(VM_PAGE_TO_PHYS(m)); bzero((caddr_t) va, PAGE_SIZE); } @@ -1310,8 +1310,8 @@ void pmap_copy_page(vm_page_t msrc, vm_page_t mdst) { - vm_offset_t src = MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(msrc)); - vm_offset_t dst = MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(mdst)); + vm_offset_t src = MIPS_PHYS_TO_KSEG1(VM_PAGE_TO_PHYS(msrc)); + vm_offset_t dst = MIPS_PHYS_TO_KSEG1(VM_PAGE_TO_PHYS(mdst)); bcopy((caddr_t) src, (caddr_t) dst, PAGE_SIZE); } From owner-p4-projects@FreeBSD.ORG Sat Mar 13 00:44:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D82D116A4D0; Sat, 13 Mar 2004 00:44: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 82EDF16A4CE for ; Sat, 13 Mar 2004 00:44:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6442243D3F for ; Sat, 13 Mar 2004 00:44:20 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2D8iKGe056521 for ; Sat, 13 Mar 2004 00:44:20 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D8iJVp056518 for perforce@freebsd.org; Sat, 13 Mar 2004 00:44:19 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 13 Mar 2004 00:44:19 -0800 (PST) Message-Id: <200403130844.i2D8iJVp056518@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48879 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 Mar 2004 08:44:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=48879 Change 48879 by jmallett@jmallett_oingo on 2004/03/13 00:43:45 Attempt to handle interrupts and do some fun with clock ticks. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#27 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#27 (text+ko) ==== @@ -33,8 +33,11 @@ #include #include +#include #include +#include #include +#include #include #include #include @@ -93,7 +96,7 @@ arcs_attach((void *)MIPS_PHYS_TO_KSEG1(0x00001000)); arcs_cnattach(); - bootverbose = 1; /* XXX */ + bootverbose = 1; cpufreq = ARCS_GetEnvironmentVariable("cpufreq"); if (cpufreq == NULL) @@ -145,7 +148,7 @@ * kernel memory. */ if (j > 0 && phys_avail[j - 1] >= kend) - kend = MIPS_PHYS_TO_KSEG0(last); + kend = MIPS_PHYS_TO_KSEG1(last); lpmem += btoc(size); break; case ARCS_Mem_Type_FreeContiguous: @@ -181,16 +184,38 @@ ctob(availmem) / (1024 * 1024)); } -#if notyet void -cpu_intr(u_int32_t status, u_int32_t cause, u_int32_t pc, u_int32_t ipending) +platform_intr(struct trapframe *tf) { - if (ipending & MIPS_HARD_INT_MASK) - (*platform.iointr)(status, cause, pc, ipending); - else - panic("Soft interrupt!?\n"); + static u_register_t next, last; + register_t cause; + + cause = mips_rd_cause(); + + if (cause & MIPS_INT_MASK_5) { + struct clockframe cf; + u_register_t now; + + /* + * Set next clock edge. + */ + if (next == 0) + next = mips_rd_count(); + last = next; + next += curcpu()->ci_cycles_per_hz; + now = mips_rd_count(); + if (last < next) { + while (now > next) + next += curcpu()->ci_cycles_per_hz; + } + mips_wr_compare(next); + cf.sr = tf->tf_regs[TF_SR]; + cf.pc = tf->tf_regs[TF_EPC]; + hardclock(&cf); + } else { + printf("stray intr cause %lx\n", cause); + } } -#endif void platform_configure(void) From owner-p4-projects@FreeBSD.ORG Sat Mar 13 00:45:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B306616A4D6; Sat, 13 Mar 2004 00:45:22 -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 8CF0516A4CF for ; Sat, 13 Mar 2004 00:45:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 865E943D39 for ; Sat, 13 Mar 2004 00:45:22 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2D8jMGe056624 for ; Sat, 13 Mar 2004 00:45:22 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D8jL38056621 for perforce@freebsd.org; Sat, 13 Mar 2004 00:45:21 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 13 Mar 2004 00:45:21 -0800 (PST) Message-Id: <200403130845.i2D8jL38056621@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48880 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 Mar 2004 08:45:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=48880 Change 48880 by jmallett@jmallett_oingo on 2004/03/13 00:45:05 Attach GIO. XXX GIO support non-existant, right now, though. It's fairly complex in NetBSD, ditto HPC, which is what we really want to get at, because that's where the interesting devices are on i.e. the Indigo2. I have to do some DMA, etc., infrastructure and figure out this "*devs" crud before I go into that. I'm not sure it's worth it immediately. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/imc/imc.c#3 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/imc/imc.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#2 $ + * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#3 $ */ #include @@ -69,7 +69,7 @@ { switch (mach_type) { case MACH_SGI_IP22: - /* Attach GIO. */ + device_add_child(dev, "gio", 0); return (0); default: return (ENOENT); From owner-p4-projects@FreeBSD.ORG Sat Mar 13 00:46:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D40A016A4D0; Sat, 13 Mar 2004 00:46: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 AFE7416A4CE for ; Sat, 13 Mar 2004 00:46:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA59D43D3F for ; Sat, 13 Mar 2004 00:46:24 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2D8kOGe056678 for ; Sat, 13 Mar 2004 00:46:24 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D8kONr056674 for perforce@freebsd.org; Sat, 13 Mar 2004 00:46:24 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 13 Mar 2004 00:46:24 -0800 (PST) Message-Id: <200403130846.i2D8kONr056674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48882 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 Mar 2004 08:46:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=48882 Change 48882 by jmallett@jmallett_oingo on 2004/03/13 00:46:05 Try two ways of dealing with an interrupty world, neither perfect. One is to not rely on k0 (err, k1?) staying the same across the long call to trap(). One is to twiddle IE. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#21 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#21 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/exception.S#20 $ + * $P4: //depot/projects/mips/sys/mips/mips/exception.S#21 $ */ #include "opt_ddb.h" @@ -112,6 +112,11 @@ move k1, sp 1: + mfc0 t0, MIPS_COP_0_STATUS + li t1, ~MIPS_SR_IE + and t0, t1 + mtc0 t0, MIPS_COP_0_STATUS + /* * A generic exception may result in DDB being invoked. If we * are using the kernel debugger, then set up is auxillary @@ -133,6 +138,7 @@ jal trap move a0, k1 + move k1, sp jal exception_restore_registers nop daddu sp, sp, TF_SIZE From owner-p4-projects@FreeBSD.ORG Sat Mar 13 11:08:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A019016A4D0; Sat, 13 Mar 2004 11:08:22 -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 6AC1616A4CE for ; Sat, 13 Mar 2004 11:08:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5EEF543D41 for ; Sat, 13 Mar 2004 11:08:22 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DJ8MGe014066 for ; Sat, 13 Mar 2004 11:08:22 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DJ8KAb014063 for perforce@freebsd.org; Sat, 13 Mar 2004 11:08:20 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 13 Mar 2004 11:08:20 -0800 (PST) Message-Id: <200403131908.i2DJ8KAb014063@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 48899 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 Mar 2004 19:08:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=48899 Change 48899 by peter@peter_overcee on 2004/03/13 11:07:19 IFC @48898 Affected files ... .. //depot/projects/hammer/Makefile.inc1#42 integrate .. //depot/projects/hammer/UPDATING#34 integrate .. //depot/projects/hammer/UPDATING.64BTT#3 integrate .. //depot/projects/hammer/bin/dd/Makefile#6 integrate .. //depot/projects/hammer/bin/df/df.c#13 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_impl.h#7 integrate .. //depot/projects/hammer/contrib/pf/pfctl/parse.y#2 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_altq.c#2 integrate .. //depot/projects/hammer/etc/Makefile#23 integrate .. //depot/projects/hammer/etc/devd.conf#9 integrate .. //depot/projects/hammer/etc/group#4 integrate .. //depot/projects/hammer/etc/inetd.conf#5 integrate .. //depot/projects/hammer/etc/master.passwd#3 integrate .. //depot/projects/hammer/etc/pf.conf#1 branch .. //depot/projects/hammer/etc/pf.os#1 branch .. //depot/projects/hammer/etc/protocols#3 integrate .. //depot/projects/hammer/etc/rc#12 integrate .. //depot/projects/hammer/etc/rc.d/abi#3 integrate .. //depot/projects/hammer/etc/rc.d/accounting#6 integrate .. //depot/projects/hammer/etc/rc.d/addswap#3 integrate .. //depot/projects/hammer/etc/rc.d/adjkerntz#3 integrate .. //depot/projects/hammer/etc/rc.d/amd#7 integrate .. //depot/projects/hammer/etc/rc.d/apm#5 integrate .. //depot/projects/hammer/etc/rc.d/apmd#8 integrate .. //depot/projects/hammer/etc/rc.d/archdep#6 integrate .. //depot/projects/hammer/etc/rc.d/atm1#5 integrate .. //depot/projects/hammer/etc/rc.d/atm2#2 integrate .. //depot/projects/hammer/etc/rc.d/atm3#3 integrate .. //depot/projects/hammer/etc/rc.d/bgfsck#4 integrate .. //depot/projects/hammer/etc/rc.d/bootparams#4 integrate .. //depot/projects/hammer/etc/rc.d/ccd#3 integrate .. //depot/projects/hammer/etc/rc.d/devd#3 integrate .. //depot/projects/hammer/etc/rc.d/devfs#7 integrate .. //depot/projects/hammer/etc/rc.d/dhclient#10 integrate .. //depot/projects/hammer/etc/rc.d/diskless#9 integrate .. //depot/projects/hammer/etc/rc.d/dmesg#2 integrate .. //depot/projects/hammer/etc/rc.d/dumpon#3 integrate .. //depot/projects/hammer/etc/rc.d/fsck#5 integrate .. //depot/projects/hammer/etc/rc.d/gbde#3 integrate .. //depot/projects/hammer/etc/rc.d/gbde_swap#2 integrate .. //depot/projects/hammer/etc/rc.d/ike#2 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#9 integrate .. //depot/projects/hammer/etc/rc.d/initrandom#2 integrate .. //depot/projects/hammer/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/hammer/etc/rc.d/ip6fw#5 integrate .. //depot/projects/hammer/etc/rc.d/ipfilter#16 integrate .. //depot/projects/hammer/etc/rc.d/ipfs#4 integrate .. //depot/projects/hammer/etc/rc.d/ipfw#6 integrate .. //depot/projects/hammer/etc/rc.d/ipmon#7 integrate .. //depot/projects/hammer/etc/rc.d/ipnat#10 integrate .. //depot/projects/hammer/etc/rc.d/ipsec#7 integrate .. //depot/projects/hammer/etc/rc.d/ipxrouted#2 integrate .. //depot/projects/hammer/etc/rc.d/isdnd#8 integrate .. //depot/projects/hammer/etc/rc.d/jail#7 integrate .. //depot/projects/hammer/etc/rc.d/kldxref#3 integrate .. //depot/projects/hammer/etc/rc.d/lomac#3 integrate .. //depot/projects/hammer/etc/rc.d/mountcritlocal#8 integrate .. //depot/projects/hammer/etc/rc.d/mountcritremote#7 integrate .. //depot/projects/hammer/etc/rc.d/mountd#6 integrate .. //depot/projects/hammer/etc/rc.d/moused#5 integrate .. //depot/projects/hammer/etc/rc.d/mroute6d#3 integrate .. //depot/projects/hammer/etc/rc.d/mrouted#6 integrate .. //depot/projects/hammer/etc/rc.d/netif#5 integrate .. //depot/projects/hammer/etc/rc.d/netoptions#4 integrate .. //depot/projects/hammer/etc/rc.d/network_ipv6#6 integrate .. //depot/projects/hammer/etc/rc.d/nfsclient#4 integrate .. //depot/projects/hammer/etc/rc.d/nfsd#6 integrate .. //depot/projects/hammer/etc/rc.d/nfslocking#6 integrate .. //depot/projects/hammer/etc/rc.d/nfsserver#3 integrate .. //depot/projects/hammer/etc/rc.d/ntpd#5 integrate .. //depot/projects/hammer/etc/rc.d/ntpdate#5 integrate .. //depot/projects/hammer/etc/rc.d/pccard#4 integrate .. //depot/projects/hammer/etc/rc.d/pcvt#3 integrate .. //depot/projects/hammer/etc/rc.d/power_profile#2 integrate .. //depot/projects/hammer/etc/rc.d/ppp-user#5 integrate .. //depot/projects/hammer/etc/rc.d/pppoed#2 integrate .. //depot/projects/hammer/etc/rc.d/quota#3 integrate .. //depot/projects/hammer/etc/rc.d/random#5 integrate .. //depot/projects/hammer/etc/rc.d/rarpd#3 integrate .. //depot/projects/hammer/etc/rc.d/root#7 integrate .. //depot/projects/hammer/etc/rc.d/route6d#5 integrate .. //depot/projects/hammer/etc/rc.d/routed#8 integrate .. //depot/projects/hammer/etc/rc.d/routing#4 integrate .. //depot/projects/hammer/etc/rc.d/rtadvd#6 integrate .. //depot/projects/hammer/etc/rc.d/savecore#4 integrate .. //depot/projects/hammer/etc/rc.d/serial#4 integrate .. //depot/projects/hammer/etc/rc.d/sppp#3 integrate .. //depot/projects/hammer/etc/rc.d/swap1#4 integrate .. //depot/projects/hammer/etc/rc.d/syscons#4 integrate .. //depot/projects/hammer/etc/rc.d/timed#3 integrate .. //depot/projects/hammer/etc/rc.d/usbd#2 integrate .. //depot/projects/hammer/etc/rc.d/vinum#2 integrate .. //depot/projects/hammer/etc/rc.d/watchdogd#2 integrate .. //depot/projects/hammer/lib/Makefile#32 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#2 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_check_magic.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_platform.h#1 branch .. //depot/projects/hammer/lib/libarchive/archive_private.h#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_buffer.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_fd.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_file.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_all.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_gnutar.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_by_name.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_shar.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ustar.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/_flock_stub.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetln.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fputc.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/getchar.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/local.h#9 integrate .. //depot/projects/hammer/lib/libc/stdio/puts.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/ungetc.c#3 integrate .. //depot/projects/hammer/lib/libgeom/geom_xml2tree.c#3 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.h#5 integrate .. //depot/projects/hammer/lib/libugidfw/ugidfw.c#6 integrate .. //depot/projects/hammer/lib/msun/src/math.h#10 integrate .. //depot/projects/hammer/libexec/Makefile#21 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#58 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#14 integrate .. //depot/projects/hammer/sbin/Makefile#23 integrate .. //depot/projects/hammer/sbin/gconcat/gconcat.c#2 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#14 integrate .. //depot/projects/hammer/sbin/init/init.c#5 integrate .. //depot/projects/hammer/sbin/ldconfig/ldconfig.c#3 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#12 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#9 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#17 integrate .. //depot/projects/hammer/share/man/man4/Makefile#36 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ct.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#8 integrate .. //depot/projects/hammer/share/man/man4/ng_atmllc.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_eiface.4#1 branch .. //depot/projects/hammer/share/man/man4/uscanner.4#8 integrate .. //depot/projects/hammer/share/man/man5/Makefile#8 integrate .. //depot/projects/hammer/share/man/man9/Makefile#30 integrate .. //depot/projects/hammer/share/man/man9/condvar.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_access.9#1 branch .. //depot/projects/hammer/share/man/man9/g_attach.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_bio.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_consumer.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_data.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_event.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_geom.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_provider.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_provider_by_name.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_wither_geom.9#2 integrate .. //depot/projects/hammer/share/man/man9/pmap_pinit.9#2 integrate .. //depot/projects/hammer/share/man/man9/sleepqueue.9#2 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#13 integrate .. //depot/projects/hammer/share/mk/bsd.dep.mk#9 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#14 integrate .. //depot/projects/hammer/share/mk/bsd.sys.mk#12 integrate .. //depot/projects/hammer/share/termcap/termcap.src#9 integrate .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#42 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#22 integrate .. //depot/projects/hammer/sys/boot/arc/include/arcfuncs.h#2 integrate .. //depot/projects/hammer/sys/boot/common/load_elf.c#14 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/efi_console.c#4 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/boot2.c#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#9 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#9 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#8 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/hammer/sys/conf/NOTES#35 integrate .. //depot/projects/hammer/sys/conf/files#48 integrate .. //depot/projects/hammer/sys/conf/files.i386#23 integrate .. //depot/projects/hammer/sys/conf/kern.mk#17 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#18 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#20 integrate .. //depot/projects/hammer/sys/conf/options#32 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#25 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#21 integrate .. //depot/projects/hammer/sys/dev/advansys/advmcode.h#2 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/Makefile#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm.c#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#29 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#18 integrate .. //depot/projects/hammer/sys/dev/cx/machdep.h#2 integrate .. //depot/projects/hammer/sys/dev/hifn/hifn7751reg.h#4 integrate .. //depot/projects/hammer/sys/dev/ichsmb/ichsmb.c#3 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/iir/iir.h#5 integrate .. //depot/projects/hammer/sys/dev/isp/ispvar.h#7 integrate .. //depot/projects/hammer/sys/dev/mcd/mcdreg.h#2 integrate .. //depot/projects/hammer/sys/dev/md/md.c#24 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_type.h#2 integrate .. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#7 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm.c#4 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_attach.c#4 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_intr.c#3 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_ioctl.c#3 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_rtables.c#3 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_rx.c#3 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_tx.c#4 integrate .. //depot/projects/hammer/sys/dev/scd/scdreg.h#3 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#30 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#29 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#29 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#13 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#13 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumext.h#7 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumio.c#13 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrequest.c#11 integrate .. //depot/projects/hammer/sys/fs/specfs/spec_vnops.c#17 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.c#4 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.h#4 integrate .. //depot/projects/hammer/sys/geom/geom.h#24 integrate .. //depot/projects/hammer/sys/geom/geom_dump.c#16 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#18 integrate .. //depot/projects/hammer/sys/geom/geom_int.h#9 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#25 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_lookup.c#6 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#13 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#9 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#15 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#35 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#14 integrate .. //depot/projects/hammer/sys/i386/i386/db_interface.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#12 integrate .. //depot/projects/hammer/sys/i386/i386/in_cksum.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#24 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#23 integrate .. //depot/projects/hammer/sys/i386/include/_types.h#5 integrate .. //depot/projects/hammer/sys/i386/include/atomic.h#4 integrate .. //depot/projects/hammer/sys/i386/include/bus_at386.h#5 integrate .. //depot/projects/hammer/sys/i386/include/cpufunc.h#8 integrate .. //depot/projects/hammer/sys/i386/include/critical.h#5 integrate .. //depot/projects/hammer/sys/i386/include/endian.h#6 integrate .. //depot/projects/hammer/sys/i386/include/ieeefp.h#3 integrate .. //depot/projects/hammer/sys/i386/include/in_cksum.h#2 integrate .. //depot/projects/hammer/sys/i386/include/ioctl_bt848.h#3 integrate .. //depot/projects/hammer/sys/i386/include/ioctl_meteor.h#3 integrate .. //depot/projects/hammer/sys/i386/include/pcpu.h#8 integrate .. //depot/projects/hammer/sys/i386/include/profile.h#6 integrate .. //depot/projects/hammer/sys/i386/include/stdarg.h#6 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#15 integrate .. //depot/projects/hammer/sys/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/busdma_machdep.c#12 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#35 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#28 integrate .. //depot/projects/hammer/sys/kern/subr_prof.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#15 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#7 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#13 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#28 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#22 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#34 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#22 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#13 integrate .. //depot/projects/hammer/sys/libkern/quad.h#4 integrate .. //depot/projects/hammer/sys/modules/Makefile#37 integrate .. //depot/projects/hammer/sys/modules/netgraph/atmllc/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.c#16 integrate .. //depot/projects/hammer/sys/net/if_disc.c#8 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#21 integrate .. //depot/projects/hammer/sys/net/if_faith.c#9 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#9 integrate .. //depot/projects/hammer/sys/net/if_iso88025subr.c#8 integrate .. //depot/projects/hammer/sys/net/if_loop.c#15 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/hammer/sys/net/if_stf.c#11 integrate .. //depot/projects/hammer/sys/net/if_tap.c#10 integrate .. //depot/projects/hammer/sys/net/if_tapvar.h#3 integrate .. //depot/projects/hammer/sys/net/if_tun.c#12 integrate .. //depot/projects/hammer/sys/net/if_var.h#12 integrate .. //depot/projects/hammer/sys/netatalk/aarp.c#8 integrate .. //depot/projects/hammer/sys/netatm/atm_ioctl.h#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_atmllc.c#1 branch .. //depot/projects/hammer/sys/netgraph/ng_atmllc.h#1 branch .. //depot/projects/hammer/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/hammer/sys/netinet/in_var.h#5 integrate .. //depot/projects/hammer/sys/netinet/ip_encap.c#5 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#14 integrate .. //depot/projects/hammer/sys/netinet/pim.h#2 integrate .. //depot/projects/hammer/sys/netinet6/ah_core.c#7 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/hammer/sys/nfsclient/bootp_subr.c#11 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#14 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#10 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#16 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#11 integrate .. //depot/projects/hammer/sys/pci/agp_intel.c#10 integrate .. //depot/projects/hammer/sys/pci/if_de.c#11 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#15 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#28 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#16 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#22 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#20 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#16 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#17 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#14 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#15 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#15 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#30 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#10 integrate .. //depot/projects/hammer/sys/sparc64/include/_types.h#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/bus_machdep.c#14 integrate .. //depot/projects/hammer/sys/sys/assym.h#2 integrate .. //depot/projects/hammer/sys/sys/buf.h#10 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#13 integrate .. //depot/projects/hammer/sys/sys/conf.h#9 integrate .. //depot/projects/hammer/sys/sys/dir.h#2 integrate .. //depot/projects/hammer/sys/sys/ioctl.h#2 integrate .. //depot/projects/hammer/sys/sys/kernel.h#8 integrate .. //depot/projects/hammer/sys/sys/linker_set.h#4 integrate .. //depot/projects/hammer/sys/sys/mdioctl.h#4 integrate .. //depot/projects/hammer/sys/sys/mount.h#12 integrate .. //depot/projects/hammer/sys/sys/param.h#28 integrate .. //depot/projects/hammer/sys/sys/pcpu.h#5 integrate .. //depot/projects/hammer/sys/sys/queue.h#3 integrate .. //depot/projects/hammer/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/hammer/sys/sys/syslimits.h#6 integrate .. //depot/projects/hammer/sys/sys/vnode.h#21 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#12 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#6 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#15 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#23 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#15 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#17 integrate .. //depot/projects/hammer/sys/vm/vm_map.h#11 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#36 integrate .. //depot/projects/hammer/tools/test/ppsapi/ppsapitest.c#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/Makefile#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/i386.diskimage#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#16 integrate .. //depot/projects/hammer/usr.bin/doscmd/xms.c#2 integrate .. //depot/projects/hammer/usr.bin/lex/FlexLexer.h#2 integrate .. //depot/projects/hammer/usr.bin/mail/mail.1#4 integrate .. //depot/projects/hammer/usr.bin/make/for.c#5 integrate .. //depot/projects/hammer/usr.bin/make/nonints.h#5 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#9 integrate .. //depot/projects/hammer/usr.bin/msgs/msgs.c#4 integrate .. //depot/projects/hammer/usr.bin/netstat/inet.c#7 integrate .. //depot/projects/hammer/usr.bin/netstat/mbuf.c#6 integrate .. //depot/projects/hammer/usr.bin/rpcinfo/rpcinfo.c#5 integrate .. //depot/projects/hammer/usr.bin/systat/convtbl.c#2 integrate .. //depot/projects/hammer/usr.bin/systat/convtbl.h#2 integrate .. //depot/projects/hammer/usr.bin/systat/extern.h#4 integrate .. //depot/projects/hammer/usr.bin/systat/ifcmds.c#2 integrate .. //depot/projects/hammer/usr.bin/systat/ifstat.c#2 integrate .. //depot/projects/hammer/usr.bin/systat/main.c#2 integrate .. //depot/projects/hammer/usr.bin/usbhidaction/usbhidaction.c#2 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#12 integrate .. //depot/projects/hammer/usr.sbin/Makefile#43 integrate .. //depot/projects/hammer/usr.sbin/ac/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ac/ac.c#4 integrate .. //depot/projects/hammer/usr.sbin/gstat/gstat.c#3 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.8#7 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.conf.5#1 branch .. //depot/projects/hammer/usr.sbin/nologin/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/nologin/nologin.c#2 integrate .. //depot/projects/hammer/usr.sbin/ntp/doc/ntp.conf.5#3 integrate .. //depot/projects/hammer/usr.sbin/pw/edgroup.c#2 integrate .. //depot/projects/hammer/usr.sbin/pw/fileupd.c#2 integrate .. //depot/projects/hammer/usr.sbin/rtadvd/rrenum.c#3 integrate .. //depot/projects/hammer/usr.sbin/setkey/token.l#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/anonFTP.c#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dhcp.c#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#13 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/install.c#18 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#21 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#15 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/system.c#4 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/tcpip.c#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/user.c#3 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/variable.c#4 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#42 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.410 2004/03/05 18:16:28 gad Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.416 2004/03/13 15:46:34 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -407,17 +407,29 @@ # # Checks to be sure system is ready for installworld # +CHECK_UIDS= +CHECK_GIDS= +.if !defined(NO_SENDMAIL) +CHECK_UIDS+= smmsp +CHECK_GIDS+= smmsp +.endif +.if !defined(NO_PF) +CHECK_UIDS+= proxy +CHECK_GIDS+= proxy authpf +.endif installcheck: ${SPECIAL_INSTALLCHECKS} -.if !defined(NO_SENDMAIL) - @if ! `id -u smmsp > /dev/null`; then \ - echo "ERROR: Required smmsp user is missing, see /usr/src/UPDATING."; \ +.for uid in ${CHECK_UIDS} + @if ! `id -u ${uid} >/dev/null 2>&1`; then \ + echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \ false; \ fi - @if ! `id -g smmsp > /dev/null`; then \ - echo "ERROR: Required smmsp group is missing, see /usr/src/UPDATING."; \ +.endfor +.for gid in ${CHECK_GIDS} + @if ! `find / -prune -group ${gid} >/dev/null 2>&1`; then \ + echo "ERROR: Required ${gid} group is missing, see /usr/src/UPDATING."; \ false; \ fi -.endif +.endfor # # distributeworld @@ -569,6 +581,15 @@ @echo "ERROR: No kernel \"${KERNCONF}\" to install." false .endif + @echo "--------------------------------------------------------------" + @echo ">>> Making hierarchy" + @echo "--------------------------------------------------------------" + cd ${.CURDIR}; \ + ${CROSSENV} PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 hierarchy + @echo + @echo "--------------------------------------------------------------" + @echo ">>> Installing kernel" + @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} ==== //depot/projects/hammer/UPDATING#34 (text+ko) ==== @@ -17,7 +17,25 @@ developers choose to disable these features on build machines to maximize performance. -20040303: +20040310: + The FreeBSD/sparc64 platform is changing time_t from 32-bits to + 64-bits. This is a very major incompatible change, so people + using FreeBSD/sparc64 *must* read the UPDATING.64BTT file for + detailed instructions on how to make this upgrade. People + upgrading FreeBSD on other platforms can ignore this event. + +20040308: + The packet filter (pf) is now installed with the base system. Make + sure to run mergemaster -p before installworld to create required + user accounts. If you do not want to build pf with your system you + can use the NO_PF knob in make.conf. + Also note that pf requires "options PFIL_HOOKS" in the kernel. The + pf system consists of the following three devices: + device pf # required + device pflog # optional + device pfsync # optional + +20040303: If you are having trouble with the libc_r -> libpthread transition (see the 20040130 entry), place the following lines at the top of /etc/libmap.conf: @@ -1530,4 +1548,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.297 2004/03/03 09:17:06 des Exp $ +$FreeBSD: src/UPDATING,v 1.299 2004/03/10 17:39:05 gad Exp $ ==== //depot/projects/hammer/UPDATING.64BTT#3 (text+ko) ==== @@ -1,6 +1,6 @@ # -------+---------+---------+---------+---------+---------+---------+---------+ - The FreeBSD/sparc64 port is going to change time_t from 32-bits to 64-bits. + The FreeBSD/sparc64 port has now changed time_t from 32-bits to 64-bits. This file explains the exact steps that users should follow to update their sparc64 systems for this change. People running FreeBSD on other types of hardware, such as CPU's from Intel or AMD, can ignore this file. For now, @@ -28,7 +28,7 @@ # POSSIBILITY OF SUCH DAMAGE. # # -------+---------+---------+---------+---------+---------+---------+---------+ -# $FreeBSD: src/UPDATING.64BTT,v 1.3 2004/03/05 23:10:49 gad Exp $ +# $FreeBSD: src/UPDATING.64BTT,v 1.4 2004/03/10 17:39:05 gad Exp $ # -------+---------+---------+---------+---------+---------+---------+---------+ If you are in too much of a hurry to read this file, then this is not the @@ -43,7 +43,16 @@ Do not start this update unless you have the extra time. -* READ THIS ENTIRE DOCUMENT at least once before starting the upgrade. * +As of March 10th, the official value for time_t on sparc64 has changed to +be 64-bits. If you really must build system with 32-bit time_t's, then it +would be best to stick with a snapshot of current from before March 10th. +With src snapshots after that point, there will soon be ports which assume +you have a 64-bit time_t based on the value of __FreeBSD_version. + +If you are ready to upgrade, then *READ THIS ENTIRE DOCUMENT* at least +once before starting the upgrade. + +# -------+---------+---------+---------+---------+---------+---------+---------+ This is a major change. This change will *not* be backwards-compatible. Any programs which call system-routines for handling time-values will @@ -60,8 +69,12 @@ problems, but if you ignore these steps you are very likely to run into some very painful and time-consuming headaches when upgrading. -Step Pre-1: Update to a recent snapshot of -current, keeping it as - a system with 32-bit time_t. +Step Pre-1: Update to a recent snapshot of -current, and first build + that as a system with 32-bit time_t. To do this, edit + the file /usr/src/sys/sparc64/include/_types.h + find the line: + typedef __int64_t __time_t; /* time()... */ + and change '__int64_t' to '__int32_t' Step Pre-2: Install that system, using whatever steps you normally use, and make sure that installation seems to work okay. Step Pre-3: While still running that 32-bit time_t system, it would @@ -78,17 +91,17 @@ The 'dhclient' in the base system is known to be unreliable on a system which is upgraded to 64-bit time_t's. It may work for you, but it probably will not. - As of March 3rd 2004, we have no fix for that. + As of March 10th 2004, we have no fix for that. However, the net/isc-dhcp3-client port does seem to work. IF your machine needs DHCP, then you should probably install that port and make sure you can get it working *before* you make the change to use 64-bit time_t's. - +After you have built and installed that src-snapshot with 32-bit time_t's, edit the file /usr/src/sys/sparc64/include/_types.h find the line: typedef __int32_t __time_t; /* time()... */ - and change '__int32_t' to '__int64_t' + and change '__int32_t' back to '__int64_t' For best results, do NOT make any other changes. Do NOT cvsup the source tree trying to pick up any other changes. At this point you @@ -104,8 +117,9 @@ I am not suggesting that you have to do two whole buildworld/ installworld cycles in a single day. You could easily wait a few days, or even a week between them. What I am suggesting is that - you should not 'cvsup' your sources inbetween the two buildworlds. - + you should not 'cvsup' your sources inbetween the two buildworlds. + +And then follow these steps to build and install the 64-bit time_t system: cd /usr/src #- 1. make cleanworld #- 2. or 'rm -Rf /usr/obj/usr/src/*' @@ -299,9 +313,9 @@ and log back in after recompiling that shell. portupgrade -Rr -f ezm3 cvsup-without-gui #- Ports 3 (maybe). If you want to rebuild a 64-bit time_t version of cvsup. - Note: ezm3 (modula-3) needs a patch to work correctly after - the change to 64-BTT. That fix has not been commited to the - port yet [as of Mar 3rd], but it should be commited soon. + Note: ezm3 (modula-3) needs a patch to work correctly after the + change to 64-BTT. That fix has not been commited to the port + yet [as of Mar 10th], but hopefully it will be commited soon. There are pre-built packages available for ezm3 and cvsup-without-gui on the new 64-bTT systems. This ezm3 package *does* include the necessarily @@ -325,10 +339,11 @@ "Now look over all the other ports you have installed, and re-compile everything that probably needs to be recompiled". -If you are going to do it piecemeal, the next ports to force-recompile -would probably be languages like perl and python, if you have them -installed. Or you might want to play it safe at this point, and simply -recompile *every* port that you have installed. +If you are going to do it piecemeal, the next ports to force-rebuild would +probably be languages like perl and python, if you have them installed. +After that, force-rebuild the ports like autoconf and automake, if you +have them installed. Or you might want to play it safe at this point, +and simply recompile *every* port that you have installed. A different tactic to use for ports is to remove *all* ports before you do the installkernel/installworld step (while you're still on a 32-bTT @@ -342,20 +357,5 @@ the mailing list freebsd-sparc64@FreeBSD.org . # -------+---------+---------+---------+---------+---------+---------+---------+ - - - For people who are helping out by testing these instructions, note - that once you make this change, you must remember to KEEP changing - __time_t in _types.h after every time you 'cvs update' or cvsup - your /usr/src tree. If you forget, and end up building a world - with 32-bit time_t's, you will probably have a very very bad day. - Once this change is committed for real (which is scheduled for - March 10th), you will not need to care about this issue as much. - - Also, a change has been committed to /usr/src/Makefile.inc1 which - does try to protect you from making this mistake. - - -# -------+---------+---------+---------+---------+---------+---------+---------+ # Notice that the following command can be useful in some settings: grep '#\- ' UPDATING.64BTT ==== //depot/projects/hammer/bin/dd/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/dd/Makefile,v 1.16 2004/03/06 06:54:58 ache Exp $ +# $FreeBSD: src/bin/dd/Makefile,v 1.17 2004/03/08 18:09:33 ache Exp $ PROG= dd SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c @@ -8,7 +8,6 @@ .include -CLEANFILES+= a.out # # Test the character conversion functions. We have to be explicit about # which LC_LANG we use because the definition of upper and lower case @@ -24,3 +23,4 @@ /usr/bin/env -i LC_CTYPE=en_US.US-ASCII hexdump -C | \ diff -IFreeBSD - ${.CURDIR}/ref.${conv} .endfor + @rm -f a.out ==== //depot/projects/hammer/bin/df/df.c#13 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.55 2004/03/05 08:10:16 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.56 2004/03/09 10:02:44 le Exp $"); #include #include @@ -400,7 +400,8 @@ */ #define fsbtoblk(num, fsbs, bs) \ (((fsbs) != 0 && (fsbs) < (bs)) ? \ - (num) / ((bs) / (fsbs)) : (num) * ((fsbs) / (bs))) + (num) / (intmax_t)((bs) / (fsbs)) : \ + (num) * (intmax_t)((fsbs) / (bs))) /* * Print out status about a file system. ==== //depot/projects/hammer/contrib/openpam/lib/openpam_impl.h#7 (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_impl.h#28 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#29 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -137,45 +137,52 @@ #ifdef DEBUG #define ENTER() openpam_log(PAM_LOG_DEBUG, "entering") #define ENTERI(i) do { \ - if ((i) > 0 && (i) < PAM_NUM_ITEMS) \ - openpam_log(PAM_LOG_DEBUG, "entering: %s", _pam_item_name[i]); \ + int _i = (i); \ + if (_i > 0 && _i < PAM_NUM_ITEMS) \ + openpam_log(PAM_LOG_DEBUG, "entering: %s", _pam_item_name[_i]); \ else \ - openpam_log(PAM_LOG_DEBUG, "entering: %d", (i)); \ + openpam_log(PAM_LOG_DEBUG, "entering: %d", _i); \ } while (0) #define ENTERN(n) do { \ - openpam_log(PAM_LOG_DEBUG, "entering: %d", (n)); \ + int _n = (n); \ + openpam_log(PAM_LOG_DEBUG, "entering: %d", _n); \ } while (0) #define ENTERS(s) do { \ - if ((s) == NULL) \ + const char *_s = (s); \ + if (_s == NULL) \ openpam_log(PAM_LOG_DEBUG, "entering: NULL"); \ else \ - openpam_log(PAM_LOG_DEBUG, "entering: '%s'", (s)); \ + openpam_log(PAM_LOG_DEBUG, "entering: '%s'", _s); \ } while (0) #define RETURNV() openpam_log(PAM_LOG_DEBUG, "returning") #define RETURNC(c) do { \ - if ((c) >= 0 && (c) < PAM_NUM_ERRORS) \ - openpam_log(PAM_LOG_DEBUG, "returning %s", _pam_err_name[c]); \ + int _c = (c); \ + if (_c >= 0 && _c < PAM_NUM_ERRORS) \ + openpam_log(PAM_LOG_DEBUG, "returning %s", _pam_err_name[_c]); \ else \ - openpam_log(PAM_LOG_DEBUG, "returning %d!", (c)); \ - return (c); \ + openpam_log(PAM_LOG_DEBUG, "returning %d!", _c); \ + return (_c); \ } while (0) #define RETURNN(n) do { \ - openpam_log(PAM_LOG_DEBUG, "returning %d", (n)); \ - return (n); \ + int _n = (n); \ + openpam_log(PAM_LOG_DEBUG, "returning %d", _n); \ + return (_n); \ } while (0) #define RETURNP(p) do { \ - if ((p) == NULL) \ + const void *_p = (p); \ + if (_p == NULL) \ openpam_log(PAM_LOG_DEBUG, "returning NULL"); \ else \ - openpam_log(PAM_LOG_DEBUG, "returning %p", (p)); \ + openpam_log(PAM_LOG_DEBUG, "returning %p", _p); \ return (p); \ } while (0) #define RETURNS(s) do { \ - if ((s) == NULL) \ + const char *_s = (s); \ + if (_s == NULL) \ openpam_log(PAM_LOG_DEBUG, "returning NULL"); \ else \ - openpam_log(PAM_LOG_DEBUG, "returning '%s'", (s)); \ - return (s); \ + openpam_log(PAM_LOG_DEBUG, "returning '%s'", _s); \ + return (_s); \ } while (0) #else #define ENTER() ==== //depot/projects/hammer/contrib/pf/pfctl/parse.y#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.2 2004/02/28 18:41:43 mlaier Exp $ */ +/* $FreeBSD: src/contrib/pf/pfctl/parse.y,v 1.3 2004/03/08 15:19:55 mlaier Exp $ */ /* $OpenBSD: parse.y,v 1.415 2003/09/01 15:07:40 henning Exp $ */ /* @@ -2737,7 +2737,7 @@ memcpy(&r.rpool.key, $8.key, sizeof(struct pf_poolhashkey)); - if ($9 != NULL) { + if ($9 != 0) { if (r.action != PF_NAT) { yyerror("the 'static-port' option is " "only valid with nat rules"); ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl_altq.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.2 2004/02/28 17:32:52 mlaier Exp $ */ +/* $FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.3 2004/03/08 15:19:55 mlaier Exp $ */ /* $OpenBSD: pfctl_altq.c,v 1.77 2003/08/22 21:50:34 david Exp $ */ /* @@ -165,7 +165,7 @@ print_altq(const struct pf_altq *a, unsigned level, struct node_queue_bw *bw, struct node_queue_opt *qopts) { - if (a->qname[0] != NULL) { + if (a->qname[0] != '\0') { print_queue(a, level, bw, 0, qopts); return; } ==== //depot/projects/hammer/etc/Makefile#23 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.324 2004/01/22 08:18:37 ru Exp $ +# $FreeBSD: src/etc/Makefile,v 1.325 2004/03/08 22:03:27 mlaier Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -11,7 +11,7 @@ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ - phones profile protocols \ + pf.conf pf.os phones profile protocols \ rc rc.firewall rc.firewall6 rc.sendmail rc.shutdown \ rc.subr remote rpc services \ shells sysctl.conf syslog.conf usbd.conf \ ==== //depot/projects/hammer/etc/devd.conf#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.11 2004/02/03 04:18:55 njl Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.12 2004/03/13 05:16:42 cperciva Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -31,7 +31,7 @@ # # For ethernet like devices, the default is to run dhclient. Due to -# a historical accident, the name of this script it called pccard_ether +# a historical accident, this script is called pccard_ether. # attach 0 { device-name "$ethernet-nic-regex"; ==== //depot/projects/hammer/etc/group#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/group,v 1.28 2003/04/27 05:49:53 imp Exp $ +# $FreeBSD: src/etc/group,v 1.30 2004/03/10 15:04:29 mlaier Exp $ # wheel:*:0:root daemon:*:1: @@ -17,6 +17,8 @@ mailnull:*:26: guest:*:31: bind:*:53: +proxy:*:62: +authpf:*:63: uucp:*:66: dialer:*:68: network:*:69: ==== //depot/projects/hammer/etc/inetd.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.63 2003/06/09 21:04:30 markm Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.67 2004/03/11 22:15:28 des Exp $ # # Internet server configuration database # @@ -26,8 +26,8 @@ # # ntalk is required for the 'talk' utility to work correctly #ntalk dgram udp wait tty:tty /usr/libexec/ntalkd ntalkd -#tftp dgram udp wait root /usr/libexec/tftpd tftpd -s /tftpboot -#tftp dgram udp6 wait root /usr/libexec/tftpd tftpd -s /tftpboot +#tftp dgram udp wait root /usr/libexec/tftpd tftpd -l -s /tftpboot +#tftp dgram udp6 wait root /usr/libexec/tftpd tftpd -l -s /tftpboot #bootps dgram udp wait root /usr/libexec/bootpd bootpd # # "Small servers" -- used to be standard on, but we're more conservative @@ -117,3 +117,9 @@ #netbios-ssn stream tcp nowait root /usr/local/sbin/smbd smbd #netbios-ns dgram udp wait root /usr/local/sbin/nmbd nmbd #swat stream tcp nowait/400 root /usr/local/sbin/swat swat +# +# Enable the following entry to enable ftp-proxy to NAT ftp sessions with pf +# N.B.: inetd binds to * in the default installation so you should add +# an appropriate block rule to your pf.conf +# +#ftp-proxy stream tcp nowait root /usr/libexec/ftp-proxy ftp-proxy ==== //depot/projects/hammer/etc/master.passwd#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/master.passwd,v 1.34 2003/04/27 05:45:29 imp Exp $ +# $FreeBSD: src/etc/master.passwd,v 1.35 2004/03/08 22:03:27 mlaier Exp $ # root::0:0::0:0:Charlie &:/root:/bin/csh toor:*:0:0::0:0:Bourne-again Superuser:/root: @@ -14,6 +14,7 @@ smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/sbin/nologin mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/sbin/nologin bind:*:53:53::0:0:Bind Sandbox:/:/sbin/nologin +proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/sbin/nologin uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico pop:*:68:6::0:0:Post Office Owner:/nonexistent:/sbin/nologin www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/sbin/nologin ==== //depot/projects/hammer/etc/protocols#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # Internet protocols # -# $FreeBSD: src/etc/protocols,v 1.18 2002/12/13 09:18:09 fenner Exp $ +# $FreeBSD: src/etc/protocols,v 1.19 2004/03/08 22:03:27 mlaier Exp $ # from: @(#)protocols 5.1 (Berkeley) 4/17/89 # # See also http://www.iana.org/assignments/protocol-numbers @@ -65,7 +65,7 @@ mobile 55 MOBILE # IP Mobility tlsp 56 TLSP # Transport Layer Security Protocol skip 57 SKIP # SKIP -ipv6-icmp 58 IPV6-ICMP # ICMP for IPv6 +ipv6-icmp 58 IPV6-ICMP icmp6 # ICMP for IPv6 ipv6-nonxt 59 IPV6-NONXT # no next header for ipv6 ipv6-opts 60 IPV6-OPTS # destination options for ipv6 # 61 # any host internal protocol ==== //depot/projects/hammer/etc/rc#12 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.330 2004/02/27 10:44:33 mtm Exp $ +# $FreeBSD: src/etc/rc,v 1.331 2004/03/08 12:02:07 pjd Exp $ # # System startup script run by init on autoboot @@ -66,9 +66,9 @@ fi os=`eval ${CMD_OSTYPE}` -skip="nostart" -[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip nojail" -files=`rcorder -k ${os} -s ${skip} /etc/rc.d/* 2>/dev/null` +skip="-s nostart" +[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip -s nojail" +files=`rcorder -k ${os} ${skip} /etc/rc.d/* 2>/dev/null` for _rc_elem in ${files}; do run_rc_script ${_rc_elem} ${_boot} ==== //depot/projects/hammer/etc/rc.d/abi#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.2 2003/05/05 15:38:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.3 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: abi # REQUIRE: LOGIN # BEFORE: securelevel -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/accounting#6 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/accounting,v 1.7 2004/03/05 07:43:38 mtm Exp $ +# $FreeBSD: src/etc/rc.d/accounting,v 1.8 2004/03/08 12:25:05 pjd Exp $ # # PROVIDE: accounting # REQUIRE: mountcritremote # BEFORE: DAEMON -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/addswap#3 (text+ko) ==== @@ -2,13 +2,13 @@ # >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 13 12:03:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4833B16A4D0; Sat, 13 Mar 2004 12:03: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 19B6116A4CE for ; Sat, 13 Mar 2004 12:03:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EAA243D31 for ; Sat, 13 Mar 2004 12:03:34 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DK3XGe028145 for ; Sat, 13 Mar 2004 12:03:33 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DK3XhG028142 for perforce@freebsd.org; Sat, 13 Mar 2004 12:03:33 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 13 Mar 2004 12:03:33 -0800 (PST) Message-Id: <200403132003.i2DK3XhG028142@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 48904 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 Mar 2004 20:03:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=48904 Change 48904 by peter@peter_overcee on 2004/03/13 12:02:53 integ -I -b i386_hammer. AARGH! __INTEL_COMPILER spammage! Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#16 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#21 integrate .. //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#43 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#30 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#19 integrate .. //depot/projects/hammer/sys/amd64/include/_types.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#23 integrate .. //depot/projects/hammer/sys/amd64/include/critical.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/endian.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/in_cksum.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/pcpu.h#18 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/stdarg.h#7 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/db_interface.c#16 (text+ko) ==== @@ -61,9 +61,10 @@ rss(void) { u_short ss; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile("mov %%ss,%0" : "=r" (ss)); #else +#error Function rss() needs to get ported to this compiler. ss = 0; /* XXXX Fix for other compilers. */ #endif return ss; ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#9 (text+ko) ==== @@ -68,7 +68,7 @@ * Floating point support. */ -#if defined(__GNUC__) && !defined(lint) +#if (defined(__GNUC__) && !defined(lint)) || defined(__INTEL_COMPILER) #define fldcw(addr) __asm("fldcw %0" : : "m" (*(addr))) #define fnclex() __asm("fnclex") @@ -81,7 +81,7 @@ : : "n" (CR0_TS) : "ax") #define stop_emulating() __asm("clts") -#else /* not __GNUC__ */ +#else /* !((__GNUC__ && !lint ) || __INTEL_COMPILER) */ void fldcw(caddr_t addr); void fnclex(void); @@ -93,7 +93,7 @@ void start_emulating(void); void stop_emulating(void); -#endif /* __GNUC__ */ +#endif /* (__GNUC__ && !lint ) || __INTEL_COMPILER */ #define GET_FPU_CW(thread) ((thread)->td_pcb->pcb_save.sv_env.en_cw) #define GET_FPU_SW(thread) ((thread)->td_pcb->pcb_save.sv_env.en_sw) ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#21 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#43 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#30 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#19 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1134) +# (XXX from i386:NOTES,v 1.1136) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.10 2004/03/05 08:04:10 obrien Exp $ # @@ -18,7 +18,7 @@ machine amd64 # -# We want LINT to cover profiling as well +# We want LINT to cover profiling as well. #XXX#profile 2 @@ -232,7 +232,7 @@ # Network interfaces: # -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) # (requires miibus) ==== //depot/projects/hammer/sys/amd64/include/_types.h#7 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/atomic.h#10 (text+ko) ==== @@ -76,7 +76,7 @@ #else /* !KLD_MODULE */ -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) /* * For userland, assume the SMP case and use lock prefixes so that @@ -102,12 +102,12 @@ } \ struct __hack -#else /* !__GNUC__ */ +#else /* !(__GNUC__ || __INTEL_COMPILER) */ #define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ extern void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v) -#endif /* __GNUC__ */ +#endif /* __GNUC__ || __INTEL_COMPILER */ /* * Atomic compare and set, used by the mutex functions @@ -117,7 +117,7 @@ * Returns 0 on failure, non-zero on success */ -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__INTEL_COMPILER) static __inline int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) @@ -158,9 +158,9 @@ return (res); } -#endif /* defined(__GNUC__) */ +#endif /* defined(__GNUC__) || defined(__INTEL_COMPILER) */ -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__INTEL_COMPILER) #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ static __inline u_##TYPE \ @@ -189,7 +189,7 @@ } \ struct __hack -#else /* !defined(__GNUC__) */ +#else /* !(defined(__GNUC__) || defined(__INTEL_COMPILER)) */ extern int atomic_cmpset_int(volatile u_int *, u_int, u_int); extern int atomic_cmpset_long(volatile u_long *, u_long, u_long); @@ -198,7 +198,7 @@ extern u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ extern void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) -#endif /* defined(__GNUC__) */ +#endif /* defined(__GNUC__) || defined(__INTEL_COMPILER) */ #endif /* KLD_MODULE */ @@ -371,7 +371,7 @@ #undef ATOMIC_PTR -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__INTEL_COMPILER) static __inline u_int atomic_readandclear_int(volatile u_int *addr) @@ -403,12 +403,12 @@ return (result); } -#else /* !defined(__GNUC__) */ +#else /* !(defined(__GNUC__) || defined(__INTEL_COMPILER)) */ extern u_long atomic_readandclear_long(volatile u_long *); extern u_int atomic_readandclear_int(volatile u_int *); -#endif /* defined(__GNUC__) */ +#endif /* defined(__GNUC__) || defined(__INTEL_COMPILER) */ #endif /* !defined(WANT_FUNCTIONS) */ #endif /* ! _MACHINE_ATOMIC_H_ */ ==== //depot/projects/hammer/sys/amd64/include/bus_amd64.h#7 (text+ko) ==== @@ -284,7 +284,7 @@ else #endif { -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ 1: movb (%2),%%al \n\ @@ -293,6 +293,10 @@ "=D" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -313,7 +317,7 @@ else #endif { -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ 1: movw (%2),%%ax \n\ @@ -322,6 +326,10 @@ "=D" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -342,7 +350,7 @@ else #endif { -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ 1: movl (%2),%%eax \n\ @@ -351,6 +359,10 @@ "=D" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -391,7 +403,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ 1: inb %w2,%%al \n\ @@ -401,6 +413,10 @@ "=D" (addr), "=c" (count), "=d" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -409,8 +425,7 @@ else #endif { - bus_space_handle_t _port_ = bsh + offset; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ repne \n\ @@ -418,6 +433,10 @@ "=D" (addr), "=c" (count), "=S" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -433,7 +452,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ 1: inw %w2,%%ax \n\ @@ -443,6 +462,10 @@ "=D" (addr), "=c" (count), "=d" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -452,7 +475,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ repne \n\ @@ -460,6 +483,10 @@ "=D" (addr), "=c" (count), "=S" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -475,7 +502,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ 1: inl %w2,%%eax \n\ @@ -485,6 +512,10 @@ "=D" (addr), "=c" (count), "=d" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -494,7 +525,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ repne \n\ @@ -502,6 +533,10 @@ "=D" (addr), "=c" (count), "=S" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -623,7 +658,7 @@ else #endif { -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ 1: lodsb \n\ @@ -632,6 +667,10 @@ "=S" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -652,7 +691,7 @@ else #endif { -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ 1: lodsw \n\ @@ -661,6 +700,10 @@ "=S" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -681,7 +724,7 @@ else #endif { -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ 1: lodsl \n\ @@ -690,6 +733,10 @@ "=S" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -731,7 +778,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ 1: lodsb \n\ @@ -741,6 +788,10 @@ "=d" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -750,7 +801,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ repne \n\ @@ -758,6 +809,10 @@ "=D" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -773,7 +828,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ 1: lodsw \n\ @@ -783,6 +838,10 @@ "=d" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -792,7 +851,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ repne \n\ @@ -800,6 +859,10 @@ "=D" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -815,7 +878,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ 1: lodsl \n\ @@ -825,6 +888,10 @@ "=d" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -834,7 +901,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ repne \n\ @@ -842,6 +909,10 @@ "=D" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } #endif @@ -1213,11 +1284,15 @@ bus_space_barrier(bus_space_tag_t tag __unused, bus_space_handle_t bsh __unused, bus_size_t offset __unused, bus_size_t len __unused, int flags) { -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) if (flags & BUS_SPACE_BARRIER_READ) __asm __volatile("lock; addl $0,0(%%rsp)" : : : "memory"); else __asm __volatile("" : : : "memory"); +#else +# ifndef lint +# error "no assembler code for your compiler" +# endif #endif } ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#23 (text+ko) ==== @@ -55,7 +55,7 @@ #define writel(va, d) (*(volatile u_int32_t *) (va) = (d)) #define writeq(va, d) (*(volatile u_int64_t *) (va) = (d)) -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) static __inline void breakpoint(void) @@ -708,7 +708,7 @@ write_rflags(rflags); } -#else /* !__GNUC__ */ +#else /* !(__GNUC__ || __INTEL_COMPILER) */ int breakpoint(void); u_int bsfl(u_int mask); @@ -773,7 +773,7 @@ void write_rflags(u_int rf); void wrmsr(u_int msr, u_int64_t newval); -#endif /* __GNUC__ */ +#endif /* __GNUC__ || __INTEL_COMPILER */ void reset_dbregs(void); ==== //depot/projects/hammer/sys/amd64/include/critical.h#14 (text+ko) ==== @@ -46,7 +46,7 @@ */ void cpu_critical_fork_exit(void); -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) /* * cpu_critical_enter: @@ -73,12 +73,12 @@ intr_restore(curthread->td_md.md_savecrit); } -#else /* !__GNUC__ */ +#else /* !(__GNUC__ || __INTEL_COMPILER) */ void cpu_critical_enter(void); void cpu_critical_exit(void); -#endif /* __GNUC__ */ +#endif /* __GNUC__ || __INTEL_COMPILER */ __END_DECLS ==== //depot/projects/hammer/sys/amd64/include/endian.h#6 (text+ko) ==== @@ -40,6 +40,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + /* * Define the order of 32-bit words in 64-bit words. */ @@ -67,7 +71,17 @@ #define BYTE_ORDER _BYTE_ORDER #endif -#ifdef __GNUC__ +#if defined(__INTEL_COMPILER) +#if defined(__cplusplus) +#if __INTEL_COMPILER >= 800 +#define __INTEL_COMPILER_with_FreeBSD_endian 1 +#endif +#else +#define __INTEL_COMPILER_with_FreeBSD_endian 1 +#endif +#endif + +#if defined(__GNUC__) || defined(__INTEL_COMPILER_with_FreeBSD_endian) #define __word_swap_int_var(x) \ __extension__ ({ register __uint32_t __X = (x); \ @@ -181,7 +195,7 @@ #define __ntohl(x) __bswap32(x) #define __ntohs(x) __bswap16(x) -#else /* !__GNUC__ */ +#else /* !(__GNUC__ || __INTEL_COMPILER_with_FreeBSD_endian) */ /* * No optimizations are available for this compiler. Fall back to @@ -190,6 +204,10 @@ */ #define _BYTEORDER_FUNC_DEFINED -#endif /* __GNUC__ */ +#endif /* __GNUC__ || __INTEL_COMPILER_with_FreeBSD_endian */ + +#ifdef __cplusplus +} +#endif #endif /* !_MACHINE_ENDIAN_H_ */ ==== //depot/projects/hammer/sys/amd64/include/ieeefp.h#11 (text+ko) ==== @@ -117,7 +117,7 @@ #define SSE_RND_OFF 13 /* rounding control offset */ #define SSE_FZ_OFF 15 /* flush to zero offset */ -#if defined(__GNUC__) && !defined(__cplusplus) +#if (defined(__GNUC__) || defined(__INTEL_COMPILER)) && !defined(__cplusplus) #define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr))) #define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr))) @@ -263,7 +263,7 @@ return (_p); } -#endif /* __GNUC__ && !__cplusplus */ +#endif /* (__GNUC__ || __INTEL_COMPILER) && !__cplusplus */ #if !defined(__IEEEFP_NOINLINES__) && !defined(__cplusplus) && defined(__GNUC__) ==== //depot/projects/hammer/sys/amd64/include/in_cksum.h#7 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#18 (text+ko) ==== @@ -55,7 +55,7 @@ #define PCPU_PTR(member) (&pcpup->pc_ ## member) #define PCPU_SET(member,value) (pcpup->pc_ ## member = (value)) -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined (__INTEL_COMPILER) /* * Evaluates to the byte offset of the per-cpu variable name. ==== //depot/projects/hammer/sys/amd64/include/profile.h#10 (text+ko) ==== @@ -82,7 +82,7 @@ #define _MCOUNT_DECL static __inline void _mcount -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) #define MCOUNT \ void \ mcount() \ @@ -105,13 +105,13 @@ frompc = ((uintfptr_t *)frompc)[1]; \ _mcount(frompc, selfpc); \ } -#else /* __GNUC__ */ +#else /* !(__GNUC__ || __INTEL_COMPILER) */ #define MCOUNT \ void \ mcount() \ { \ } -#endif /* __GNUC__ */ +#endif /* __GNUC__ || __INTEL_COMPILER */ typedef unsigned long uintfptr_t; @@ -145,7 +145,7 @@ #include __BEGIN_DECLS -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__INTEL_COMPILER) void mcount(void) __asm(".mcount"); #endif __END_DECLS ==== //depot/projects/hammer/sys/amd64/include/stdarg.h#7 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Mar 13 12:05:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B787C16A4D0; Sat, 13 Mar 2004 12:05: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 92CF716A4CE for ; Sat, 13 Mar 2004 12:05:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A30043D1D for ; Sat, 13 Mar 2004 12:05:37 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DK5bGe028311 for ; Sat, 13 Mar 2004 12:05:37 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DK5akG028308 for perforce@freebsd.org; Sat, 13 Mar 2004 12:05:36 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 13 Mar 2004 12:05:36 -0800 (PST) Message-Id: <200403132005.i2DK5akG028308@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 48905 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 Mar 2004 20:05:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=48905 Change 48905 by peter@peter_overcee on 2004/03/13 12:05:30 IFC @48903 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/trap.c#44 integrate .. //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#9 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#16 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#13 integrate .. //depot/projects/hammer/sys/dev/ct/bshw_machdep.c#4 integrate .. //depot/projects/hammer/sys/dev/ct/ct.c#4 integrate .. //depot/projects/hammer/sys/dev/ct/ct_isa.c#7 integrate .. //depot/projects/hammer/sys/dev/ncv/ncr53c500.c#4 integrate .. //depot/projects/hammer/sys/dev/ncv/ncr53c500_pccard.c#8 integrate .. //depot/projects/hammer/sys/dev/ncv/ncr53c500hw.h#3 integrate .. //depot/projects/hammer/sys/dev/nsp/nsp.c#5 integrate .. //depot/projects/hammer/sys/dev/nsp/nsp_pccard.c#7 integrate .. //depot/projects/hammer/sys/dev/stg/tmc18c30.c#5 integrate .. //depot/projects/hammer/sys/dev/stg/tmc18c30_pccard.c#8 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#44 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.274 2004/03/11 00:17:45 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.275 2004/03/13 19:15:43 peter Exp $"); /* * AMD64 Trap and System call handling ==== //depot/projects/hammer/sys/amd64/include/pci_cfgreg.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/sys/amd64/include/pci_cfgreg.h,v 1.11 2003/09/22 22:21:21 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.12 2004/03/13 19:19:13 peter Exp $ * */ ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.106 2003/12/06 23:19:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.107 2004/03/13 19:21:35 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.105 2004/01/28 20:46:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.106 2004/03/13 19:19:13 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/dev/ct/bshw_machdep.c#4 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NecBSD: bshw_machdep.c,v 1.8.12.6 2001/06/29 06:28:05 honda Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ct/bshw_machdep.c,v 1.5 2003/08/24 17:46:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ct/bshw_machdep.c,v 1.6 2004/03/13 19:46:27 peter Exp $"); /* $NetBSD$ */ /* ==== //depot/projects/hammer/sys/dev/ct/ct.c#4 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NecBSD: ct.c,v 1.13.12.5 2001/06/26 07:31:53 honda Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ct/ct.c,v 1.7 2003/08/24 17:46:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ct/ct.c,v 1.8 2004/03/13 19:46:27 peter Exp $"); /* $NetBSD$ */ #define CT_DEBUG ==== //depot/projects/hammer/sys/dev/ct/ct_isa.c#7 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NecBSD: ct_isa.c,v 1.6 1999/07/26 06:32:01 honda Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.9 2003/08/24 17:46:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.10 2004/03/13 19:46:27 peter Exp $"); /* $NetBSD$ */ /* ==== //depot/projects/hammer/sys/dev/ncv/ncr53c500.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.8 2003/08/24 17:54:12 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.9 2004/03/13 19:46:27 peter Exp $"); #include "opt_ddb.h" #include ==== //depot/projects/hammer/sys/dev/ncv/ncr53c500_pccard.c#8 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.18 2003/10/26 00:51:40 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.19 2004/03/13 19:46:27 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/dev/ncv/ncr53c500hw.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ncv/ncr53c500hw.h,v 1.2 2001/07/14 00:38:50 non Exp $ */ +/* $FreeBSD: src/sys/dev/ncv/ncr53c500hw.h,v 1.3 2004/03/13 19:46:27 peter Exp $ */ /* $NecBSD: ncr53c500hw.h,v 1.6.18.1 2001/06/08 06:27:44 honda Exp $ */ /* $NetBSD$ */ ==== //depot/projects/hammer/sys/dev/nsp/nsp.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.10 2003/08/24 17:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.11 2004/03/13 19:46:27 peter Exp $"); #include "opt_ddb.h" #include ==== //depot/projects/hammer/sys/dev/nsp/nsp_pccard.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.16 2003/08/24 17:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.17 2004/03/13 19:46:27 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/dev/stg/tmc18c30.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.10 2003/12/17 16:12:01 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.11 2004/03/13 19:46:27 peter Exp $"); #include "opt_ddb.h" #include ==== //depot/projects/hammer/sys/dev/stg/tmc18c30_pccard.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_pccard.c,v 1.18 2003/08/24 18:17:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_pccard.c,v 1.19 2004/03/13 19:46:27 peter Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Sat Mar 13 12:32:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5998B16A4D0; Sat, 13 Mar 2004 12:32: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 2D3C516A4CE for ; Sat, 13 Mar 2004 12:32:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26BF343D39 for ; Sat, 13 Mar 2004 12:32:13 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DKWCGe034244 for ; Sat, 13 Mar 2004 12:32:12 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DKWCmO034235 for perforce@freebsd.org; Sat, 13 Mar 2004 12:32:12 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 13 Mar 2004 12:32:12 -0800 (PST) Message-Id: <200403132032.i2DKWCmO034235@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 48909 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 Mar 2004 20:32:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=48909 Change 48909 by peter@peter_overcee on 2004/03/13 12:32:04 integrate missing files from last run Affected files ... .. //depot/projects/hammer/sys/compat/netbsd/dvcfg.h#3 integrate .. //depot/projects/hammer/sys/compat/netbsd/physio_proc.h#3 integrate Differences ... ==== //depot/projects/hammer/sys/compat/netbsd/dvcfg.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/amd64/include/dvcfg.h,v 1.1 2004/03/03 07:00:47 obrien Exp $ */ +/* $FreeBSD: src/sys/compat/netbsd/dvcfg.h,v 1.5 2004/03/13 19:46:26 peter Exp $ */ /* $NetBSD$ */ /* * [NetBSD for NEC PC98 series] ==== //depot/projects/hammer/sys/compat/netbsd/physio_proc.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/amd64/include/physio_proc.h,v 1.1 2004/03/03 07:00:48 obrien Exp $ */ +/* $FreeBSD: src/sys/compat/netbsd/physio_proc.h,v 1.6 2004/03/13 19:46:26 peter Exp $ */ /* $NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $ */ /* $NetBSD$ */ From owner-p4-projects@FreeBSD.ORG Sat Mar 13 12:44:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9F9416A4D0; Sat, 13 Mar 2004 12:44:28 -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 B0E5F16A4CE for ; Sat, 13 Mar 2004 12:44:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 923F543D2F for ; Sat, 13 Mar 2004 12:44:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DKiSGe036751 for ; Sat, 13 Mar 2004 12:44:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DKiSDx036748 for perforce@freebsd.org; Sat, 13 Mar 2004 12:44:28 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 13 Mar 2004 12:44:28 -0800 (PST) Message-Id: <200403132044.i2DKiSDx036748@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 48910 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 Mar 2004 20:44:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=48910 Change 48910 by peter@peter_overcee on 2004/03/13 12:43:59 fix merge breakage Affected files ... .. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#8 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/bus_amd64.h#8 (text+ko) ==== @@ -425,6 +425,7 @@ else #endif { + bus_space_handle_t _port_ = bsh + offset; #if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm __volatile(" \n\ cld \n\ From owner-p4-projects@FreeBSD.ORG Sat Mar 13 12:48:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 631B116A4D0; Sat, 13 Mar 2004 12:48: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 23FB516A4CE for ; Sat, 13 Mar 2004 12:48:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CE4B43D39 for ; Sat, 13 Mar 2004 12:48:34 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DKmXGe042806 for ; Sat, 13 Mar 2004 12:48:33 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DKmXBc042803 for perforce@freebsd.org; Sat, 13 Mar 2004 12:48:33 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 13 Mar 2004 12:48:33 -0800 (PST) Message-Id: <200403132048.i2DKmXBc042803@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 48911 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 Mar 2004 20:48:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=48911 Change 48911 by peter@peter_overcee on 2004/03/13 12:47:38 change creation of kld's from shared libs to .o files Affected files ... .. //depot/projects/hammer/sys/conf/kmod.mk#21 edit Differences ... ==== //depot/projects/hammer/sys/conf/kmod.mk#21 (text+ko) ==== @@ -138,18 +138,12 @@ ${OBJCOPY} --strip-debug ${FULLPROG} ${PROG} .endif -${FULLPROG}: ${KMOD}.kld - ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld -.if !defined(DEBUG_FLAGS) - ${OBJCOPY} --strip-debug ${.TARGET} -.endif - EXPORT_SYMS?= NO .if ${EXPORT_SYMS} != YES CLEANFILES+= ${.OBJDIR}/export_syms .endif -${KMOD}.kld: ${OBJS} +${FULLPROG}: ${OBJS} ${LD} ${LDFLAGS} -r -d -o ${.TARGET} ${OBJS} .if defined(EXPORT_SYMS) .if ${EXPORT_SYMS} != YES @@ -165,6 +159,9 @@ xargs -J% ${OBJCOPY} % ${.TARGET} .endif .endif +.if !defined(DEBUG_FLAGS) + ${OBJCOPY} --strip-debug ${.TARGET} +.endif _ILINKS=@ machine From owner-p4-projects@FreeBSD.ORG Sat Mar 13 14:11:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E0D116A4D0; Sat, 13 Mar 2004 14:11:15 -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 5247B16A4CE for ; Sat, 13 Mar 2004 14:11:15 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 476CD43D1D for ; Sat, 13 Mar 2004 14:11:15 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DMBFGe061821 for ; Sat, 13 Mar 2004 14:11:15 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DMBERV061813 for perforce@freebsd.org; Sat, 13 Mar 2004 14:11:14 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 13 Mar 2004 14:11:14 -0800 (PST) Message-Id: <200403132211.i2DMBERV061813@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 48913 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 Mar 2004 22:11:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=48913 Change 48913 by peter@peter_overcee on 2004/03/13 14:10:47 On second throughts, I'm not going to commit this. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#17 edit .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#10 edit .. //depot/projects/hammer/sys/amd64/include/atomic.h#11 edit .. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#9 edit .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#24 edit .. //depot/projects/hammer/sys/amd64/include/critical.h#15 edit .. //depot/projects/hammer/sys/amd64/include/endian.h#7 edit .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#12 edit .. //depot/projects/hammer/sys/amd64/include/pcpu.h#19 edit .. //depot/projects/hammer/sys/amd64/include/profile.h#11 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/db_interface.c#17 (text+ko) ==== @@ -61,10 +61,9 @@ rss(void) { u_short ss; -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile("mov %%ss,%0" : "=r" (ss)); #else -#error Function rss() needs to get ported to this compiler. ss = 0; /* XXXX Fix for other compilers. */ #endif return ss; ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#10 (text+ko) ==== @@ -68,7 +68,7 @@ * Floating point support. */ -#if (defined(__GNUC__) && !defined(lint)) || defined(__INTEL_COMPILER) +#if defined(__GNUC__) && !defined(lint) #define fldcw(addr) __asm("fldcw %0" : : "m" (*(addr))) #define fnclex() __asm("fnclex") @@ -81,7 +81,7 @@ : : "n" (CR0_TS) : "ax") #define stop_emulating() __asm("clts") -#else /* !((__GNUC__ && !lint ) || __INTEL_COMPILER) */ +#else /* not __GNUC__ */ void fldcw(caddr_t addr); void fnclex(void); @@ -93,7 +93,7 @@ void start_emulating(void); void stop_emulating(void); -#endif /* (__GNUC__ && !lint ) || __INTEL_COMPILER */ +#endif /* __GNUC__ */ #define GET_FPU_CW(thread) ((thread)->td_pcb->pcb_save.sv_env.en_cw) #define GET_FPU_SW(thread) ((thread)->td_pcb->pcb_save.sv_env.en_sw) ==== //depot/projects/hammer/sys/amd64/include/atomic.h#11 (text+ko) ==== @@ -76,7 +76,7 @@ #else /* !KLD_MODULE */ -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ /* * For userland, assume the SMP case and use lock prefixes so that @@ -102,12 +102,12 @@ } \ struct __hack -#else /* !(__GNUC__ || __INTEL_COMPILER) */ +#else /* !__GNUC__ */ #define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ extern void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v) -#endif /* __GNUC__ || __INTEL_COMPILER */ +#endif /* __GNUC__ */ /* * Atomic compare and set, used by the mutex functions @@ -117,7 +117,7 @@ * Returns 0 on failure, non-zero on success */ -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#if defined(__GNUC__) static __inline int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) @@ -158,9 +158,9 @@ return (res); } -#endif /* defined(__GNUC__) || defined(__INTEL_COMPILER) */ +#endif /* defined(__GNUC__) */ -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#if defined(__GNUC__) #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ static __inline u_##TYPE \ @@ -189,7 +189,7 @@ } \ struct __hack -#else /* !(defined(__GNUC__) || defined(__INTEL_COMPILER)) */ +#else /* !defined(__GNUC__) */ extern int atomic_cmpset_int(volatile u_int *, u_int, u_int); extern int atomic_cmpset_long(volatile u_long *, u_long, u_long); @@ -198,7 +198,7 @@ extern u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ extern void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) -#endif /* defined(__GNUC__) || defined(__INTEL_COMPILER) */ +#endif /* defined(__GNUC__) */ #endif /* KLD_MODULE */ @@ -371,7 +371,7 @@ #undef ATOMIC_PTR -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#if defined(__GNUC__) static __inline u_int atomic_readandclear_int(volatile u_int *addr) @@ -403,12 +403,12 @@ return (result); } -#else /* !(defined(__GNUC__) || defined(__INTEL_COMPILER)) */ +#else /* !defined(__GNUC__) */ extern u_long atomic_readandclear_long(volatile u_long *); extern u_int atomic_readandclear_int(volatile u_int *); -#endif /* defined(__GNUC__) || defined(__INTEL_COMPILER) */ +#endif /* defined(__GNUC__) */ #endif /* !defined(WANT_FUNCTIONS) */ #endif /* ! _MACHINE_ATOMIC_H_ */ ==== //depot/projects/hammer/sys/amd64/include/bus_amd64.h#9 (text+ko) ==== @@ -284,7 +284,7 @@ else #endif { -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: movb (%2),%%al \n\ @@ -293,10 +293,6 @@ "=D" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -317,7 +313,7 @@ else #endif { -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: movw (%2),%%ax \n\ @@ -326,10 +322,6 @@ "=D" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -350,7 +342,7 @@ else #endif { -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: movl (%2),%%eax \n\ @@ -359,10 +351,6 @@ "=D" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -403,7 +391,7 @@ #endif { int _port_ = bsh + offset; -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: inb %w2,%%al \n\ @@ -413,10 +401,6 @@ "=D" (addr), "=c" (count), "=d" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -426,7 +410,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -434,10 +418,6 @@ "=D" (addr), "=c" (count), "=S" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -453,7 +433,7 @@ #endif { int _port_ = bsh + offset; -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: inw %w2,%%ax \n\ @@ -463,10 +443,6 @@ "=D" (addr), "=c" (count), "=d" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -476,7 +452,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -484,10 +460,6 @@ "=D" (addr), "=c" (count), "=S" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -503,7 +475,7 @@ #endif { int _port_ = bsh + offset; -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: inl %w2,%%eax \n\ @@ -513,10 +485,6 @@ "=D" (addr), "=c" (count), "=d" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "%eax", "memory", "cc"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -526,7 +494,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -534,10 +502,6 @@ "=D" (addr), "=c" (count), "=S" (_port_) : "0" (addr), "1" (count), "2" (_port_) : "memory", "cc"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -659,7 +623,7 @@ else #endif { -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsb \n\ @@ -668,10 +632,6 @@ "=S" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -692,7 +652,7 @@ else #endif { -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsw \n\ @@ -701,10 +661,6 @@ "=S" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -725,7 +681,7 @@ else #endif { -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsl \n\ @@ -734,10 +690,6 @@ "=S" (addr), "=c" (count) : "r" (bsh + offset), "0" (addr), "1" (count) : "%eax", "memory", "cc"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -779,7 +731,7 @@ #endif { int _port_ = bsh + offset; -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsb \n\ @@ -789,10 +741,6 @@ "=d" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -802,7 +750,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -810,10 +758,6 @@ "=D" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -829,7 +773,7 @@ #endif { int _port_ = bsh + offset; -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsw \n\ @@ -839,10 +783,6 @@ "=d" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -852,7 +792,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -860,10 +800,6 @@ "=D" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -879,7 +815,7 @@ #endif { int _port_ = bsh + offset; -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ 1: lodsl \n\ @@ -889,10 +825,6 @@ "=d" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "%eax", "memory", "cc"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -902,7 +834,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ __asm __volatile(" \n\ cld \n\ repne \n\ @@ -910,10 +842,6 @@ "=D" (_port_), "=S" (addr), "=c" (count) : "0" (_port_), "1" (addr), "2" (count) : "memory", "cc"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } #endif @@ -1285,15 +1213,11 @@ bus_space_barrier(bus_space_tag_t tag __unused, bus_space_handle_t bsh __unused, bus_size_t offset __unused, bus_size_t len __unused, int flags) { -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ if (flags & BUS_SPACE_BARRIER_READ) __asm __volatile("lock; addl $0,0(%%rsp)" : : : "memory"); else __asm __volatile("" : : : "memory"); -#else -# ifndef lint -# error "no assembler code for your compiler" -# endif #endif } ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#24 (text+ko) ==== @@ -55,7 +55,7 @@ #define writel(va, d) (*(volatile u_int32_t *) (va) = (d)) #define writeq(va, d) (*(volatile u_int64_t *) (va) = (d)) -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ static __inline void breakpoint(void) @@ -708,7 +708,7 @@ write_rflags(rflags); } -#else /* !(__GNUC__ || __INTEL_COMPILER) */ +#else /* !__GNUC__ */ int breakpoint(void); u_int bsfl(u_int mask); @@ -773,7 +773,7 @@ void write_rflags(u_int rf); void wrmsr(u_int msr, u_int64_t newval); -#endif /* __GNUC__ || __INTEL_COMPILER */ +#endif /* __GNUC__ */ void reset_dbregs(void); ==== //depot/projects/hammer/sys/amd64/include/critical.h#15 (text+ko) ==== @@ -46,7 +46,7 @@ */ void cpu_critical_fork_exit(void); -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ /* * cpu_critical_enter: @@ -73,12 +73,12 @@ intr_restore(curthread->td_md.md_savecrit); } -#else /* !(__GNUC__ || __INTEL_COMPILER) */ +#else /* !__GNUC__ */ void cpu_critical_enter(void); void cpu_critical_exit(void); -#endif /* __GNUC__ || __INTEL_COMPILER */ +#endif /* __GNUC__ */ __END_DECLS ==== //depot/projects/hammer/sys/amd64/include/endian.h#7 (text+ko) ==== @@ -40,10 +40,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - /* * Define the order of 32-bit words in 64-bit words. */ @@ -71,17 +67,7 @@ #define BYTE_ORDER _BYTE_ORDER #endif -#if defined(__INTEL_COMPILER) -#if defined(__cplusplus) -#if __INTEL_COMPILER >= 800 -#define __INTEL_COMPILER_with_FreeBSD_endian 1 -#endif -#else -#define __INTEL_COMPILER_with_FreeBSD_endian 1 -#endif -#endif - -#if defined(__GNUC__) || defined(__INTEL_COMPILER_with_FreeBSD_endian) +#ifdef __GNUC__ #define __word_swap_int_var(x) \ __extension__ ({ register __uint32_t __X = (x); \ @@ -195,7 +181,7 @@ #define __ntohl(x) __bswap32(x) #define __ntohs(x) __bswap16(x) -#else /* !(__GNUC__ || __INTEL_COMPILER_with_FreeBSD_endian) */ +#else /* !__GNUC__ */ /* * No optimizations are available for this compiler. Fall back to @@ -204,10 +190,6 @@ */ #define _BYTEORDER_FUNC_DEFINED -#endif /* __GNUC__ || __INTEL_COMPILER_with_FreeBSD_endian */ - -#ifdef __cplusplus -} -#endif +#endif /* __GNUC__ */ #endif /* !_MACHINE_ENDIAN_H_ */ ==== //depot/projects/hammer/sys/amd64/include/ieeefp.h#12 (text+ko) ==== @@ -117,7 +117,7 @@ #define SSE_RND_OFF 13 /* rounding control offset */ #define SSE_FZ_OFF 15 /* flush to zero offset */ -#if (defined(__GNUC__) || defined(__INTEL_COMPILER)) && !defined(__cplusplus) +#if defined(__GNUC__) && !defined(__cplusplus) #define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr))) #define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr))) @@ -263,7 +263,7 @@ return (_p); } -#endif /* (__GNUC__ || __INTEL_COMPILER) && !__cplusplus */ +#endif /* __GNUC__ && !__cplusplus */ #if !defined(__IEEEFP_NOINLINES__) && !defined(__cplusplus) && defined(__GNUC__) ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#19 (text+ko) ==== @@ -55,7 +55,7 @@ #define PCPU_PTR(member) (&pcpup->pc_ ## member) #define PCPU_SET(member,value) (pcpup->pc_ ## member = (value)) -#elif defined(__GNUC__) || defined (__INTEL_COMPILER) +#elif defined(__GNUC__) /* * Evaluates to the byte offset of the per-cpu variable name. ==== //depot/projects/hammer/sys/amd64/include/profile.h#11 (text+ko) ==== @@ -82,7 +82,7 @@ #define _MCOUNT_DECL static __inline void _mcount -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ #define MCOUNT \ void \ mcount() \ @@ -105,13 +105,13 @@ frompc = ((uintfptr_t *)frompc)[1]; \ _mcount(frompc, selfpc); \ } -#else /* !(__GNUC__ || __INTEL_COMPILER) */ +#else /* __GNUC__ */ #define MCOUNT \ void \ mcount() \ { \ } -#endif /* __GNUC__ || __INTEL_COMPILER */ +#endif /* __GNUC__ */ typedef unsigned long uintfptr_t; @@ -145,7 +145,7 @@ #include __BEGIN_DECLS -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUC__ void mcount(void) __asm(".mcount"); #endif __END_DECLS From owner-p4-projects@FreeBSD.ORG Sat Mar 13 14:38:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5016D16A4D0; Sat, 13 Mar 2004 14:38: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 2866E16A4CE for ; Sat, 13 Mar 2004 14:38:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D77443D2F for ; Sat, 13 Mar 2004 14:38:52 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DMcpGe068254 for ; Sat, 13 Mar 2004 14:38:51 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DMcob8068251 for perforce@freebsd.org; Sat, 13 Mar 2004 14:38:50 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 13 Mar 2004 14:38:50 -0800 (PST) Message-Id: <200403132238.i2DMcob8068251@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 48917 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 Mar 2004 22:38:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=48917 Change 48917 by peter@peter_overcee on 2004/03/13 14:37:55 IFC @48916 Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#20 integrate .. //depot/projects/hammer/sys/conf/options.amd64#28 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#44 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#20 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#25 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#26 integrate .. //depot/projects/hammer/sys/sys/syscall.h#25 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#25 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#25 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#20 (text+ko) ==== @@ -232,7 +232,7 @@ # Network interfaces: # -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) # (requires miibus) ==== //depot/projects/hammer/sys/conf/options.amd64#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.amd64,v 1.13 2004/03/05 07:56:23 obrien Exp $ +# $FreeBSD: src/sys/conf/options.amd64,v 1.14 2004/03/13 22:16:34 peter Exp $ # Options specific to AMD64 platform kernels AUTO_EOI_1 opt_auto_eoi.h ==== //depot/projects/hammer/sys/kern/init_sysent.c#26 (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.165 2004/02/03 05:11:31 deischen Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.166 2004/02/03 05:08:32 deischen Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.166 2004/03/13 22:32:17 peter Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.167 2004/03/13 22:31:39 peter Exp */ #include "opt_compat.h" ==== //depot/projects/hammer/sys/kern/kern_exec.c#22 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.238 2004/03/12 21:06:20 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.239 2004/03/13 22:31:38 peter Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" ==== //depot/projects/hammer/sys/kern/kern_exit.c#21 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.224 2004/03/05 22:39:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.225 2004/03/13 22:31:39 peter Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" ==== //depot/projects/hammer/sys/kern/kern_fork.c#32 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.221 2004/03/10 00:27:36 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.222 2004/03/13 22:31:39 peter Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" ==== //depot/projects/hammer/sys/kern/kern_thread.c#44 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.172 2004/03/01 23:07:58 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.173 2004/03/13 22:31:39 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/kern/subr_trap.c#20 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_trap.c,v 1.264 2004/03/05 17:35:28 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_trap.c,v 1.265 2004/03/13 22:31:39 peter Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" ==== //depot/projects/hammer/sys/kern/syscalls.c#25 (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.151 2004/02/03 05:11:31 deischen Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.166 2004/02/03 05:08:32 deischen Exp + * $FreeBSD: src/sys/kern/syscalls.c,v 1.152 2004/03/13 22:32:17 peter Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.167 2004/03/13 22:31:39 peter Exp */ const char *syscallnames[] = { ==== //depot/projects/hammer/sys/kern/syscalls.master#26 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.166 2004/02/03 05:08:32 deischen Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.167 2004/03/13 22:31:39 peter Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. ==== //depot/projects/hammer/sys/sys/syscall.h#25 (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.149 2004/02/03 05:11:31 deischen Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.166 2004/02/03 05:08:32 deischen Exp + * $FreeBSD: src/sys/sys/syscall.h,v 1.150 2004/03/13 22:32:17 peter Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.167 2004/03/13 22:31:39 peter Exp */ #define SYS_syscall 0 ==== //depot/projects/hammer/sys/sys/syscall.mk#25 (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.104 2004/02/03 05:11:31 deischen Exp $ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.166 2004/02/03 05:08:32 deischen Exp +# $FreeBSD: src/sys/sys/syscall.mk,v 1.105 2004/03/13 22:32:17 peter Exp $ +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.167 2004/03/13 22:31:39 peter Exp MIASM = \ syscall.o \ exit.o \ ==== //depot/projects/hammer/sys/sys/sysproto.h#25 (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.148 2004/02/03 05:11:31 deischen Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.166 2004/02/03 05:08:32 deischen Exp + * $FreeBSD: src/sys/sys/sysproto.h,v 1.149 2004/03/13 22:32:17 peter Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.167 2004/03/13 22:31:39 peter Exp */ #ifndef _SYS_SYSPROTO_H_ From owner-p4-projects@FreeBSD.ORG Sat Mar 13 14:45:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F38AA16A4D0; Sat, 13 Mar 2004 14:45: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 CCF0C16A4CE for ; Sat, 13 Mar 2004 14:45:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AFEE743D39 for ; Sat, 13 Mar 2004 14:45:00 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DMj0Ge070194 for ; Sat, 13 Mar 2004 14:45:00 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DMj0s5070191 for perforce@freebsd.org; Sat, 13 Mar 2004 14:45:00 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 13 Mar 2004 14:45:00 -0800 (PST) Message-Id: <200403132245.i2DMj0s5070191@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 48919 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 Mar 2004 22:45:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=48919 Change 48919 by peter@peter_overcee on 2004/03/13 14:44:56 IFC @48918 Affected files ... .. //depot/projects/hammer/usr.sbin/Makefile#44 integrate Differences ... ==== //depot/projects/hammer/usr.sbin/Makefile#44 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.289 2004/03/13 11:02:37 cperciva Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.290 2004/03/13 22:18:34 peter Exp $ # XXX MISSING: mkproto SUBDIR= ac \ From owner-p4-projects@FreeBSD.ORG Sat Mar 13 14:49:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1F5516A4D0; Sat, 13 Mar 2004 14:49: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 57BE016A4CF for ; Sat, 13 Mar 2004 14:49:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5128343D2F for ; Sat, 13 Mar 2004 14:49:06 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DMn6Ge070363 for ; Sat, 13 Mar 2004 14:49:06 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DMn5iQ070360 for perforce@freebsd.org; Sat, 13 Mar 2004 14:49:05 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 13 Mar 2004 14:49:05 -0800 (PST) Message-Id: <200403132249.i2DMn5iQ070360@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 48920 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 Mar 2004 22:49:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=48920 Change 48920 by peter@peter_overcee on 2004/03/13 14:48:32 converge with current Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#21 edit .. //depot/projects/hammer/sys/conf/options.amd64#29 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#21 (text+ko) ==== @@ -295,8 +295,6 @@ # The Rev 2 host cards use a 32K chunk, on a 32K boundary. # The cards can use an IRQ of 11, 12 or 15. -#XXX#device cy 1 -#XXX#options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared device digi hint.digi.0.at="isa" hint.digi.0.port="0x104" @@ -495,10 +493,6 @@ options FB_INSTALL_CDEV # install a CDEV entry in /dev -# PECOFF module (Win32 Execution Format) -#XXX#options PECOFF_SUPPORT # only knows 32 bit file format -#XXX#options PECOFF_DEBUG - options ENABLE_ALART # Control alarm on Intel intpm driver options KBDIO_DEBUG=2 options KBD_MAXRETRY=4 ==== //depot/projects/hammer/sys/conf/options.amd64#29 (text+ko) ==== @@ -15,8 +15,6 @@ #COMPAT_SVR4 opt_dontuse.h #DEBUG_SVR4 opt_svr4.h #NDISAPI opt_dontuse.h -#PECOFF_DEBUG opt_pecoff.h -#PECOFF_SUPPORT opt_dontuse.h CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h From owner-p4-projects@FreeBSD.ORG Sat Mar 13 14:50:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F5B216A4D0; Sat, 13 Mar 2004 14:50: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 5798D16A4CE for ; Sat, 13 Mar 2004 14:50:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39A1A43D1D for ; Sat, 13 Mar 2004 14:50:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DMo8Ge070409 for ; Sat, 13 Mar 2004 14:50:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DMo7a9070406 for perforce@freebsd.org; Sat, 13 Mar 2004 14:50:07 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 13 Mar 2004 14:50:07 -0800 (PST) Message-Id: <200403132250.i2DMo7a9070406@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 48921 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 Mar 2004 22:50:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=48921 Change 48921 by peter@peter_overcee on 2004/03/13 14:49:12 fix mis-merge Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#22 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#22 (text+ko) ==== @@ -5,7 +5,7 @@ # machine independent notes, look in /sys/conf/NOTES. # # (XXX from i386:NOTES,v 1.1136) -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.10 2004/03/05 08:04:10 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.12 2004/03/13 22:16:34 peter Exp $ # # We don't have modules on amd64. From owner-p4-projects@FreeBSD.ORG Sat Mar 13 15:12:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A2DB16A4D0; Sat, 13 Mar 2004 15:12: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 00E4316A4CE for ; Sat, 13 Mar 2004 15:12:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D841943D1D for ; Sat, 13 Mar 2004 15:12:35 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DNCZGe077246 for ; Sat, 13 Mar 2004 15:12:35 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DNCZT8077243 for perforce@freebsd.org; Sat, 13 Mar 2004 15:12:35 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 13 Mar 2004 15:12:35 -0800 (PST) Message-Id: <200403132312.i2DNCZT8077243@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 48922 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 Mar 2004 23:12:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=48922 Change 48922 by peter@peter_overcee on 2004/03/13 15:12:03 GRRR. Stupid F*cked up bios! Affected files ... .. //depot/projects/hammer/sys/dev/sio/sio_isa.c#6 edit Differences ... ==== //depot/projects/hammer/sys/dev/sio/sio_isa.c#6 (text+ko) ==== @@ -168,4 +168,4 @@ } DRIVER_MODULE(sio, isa, sio_isa_driver, sio_devclass, 0, 0); -DRIVER_MODULE(sio, acpi, sio_isa_driver, sio_devclass, 0, 0); +/* DRIVER_MODULE(sio, acpi, sio_isa_driver, sio_devclass, 0, 0); */ From owner-p4-projects@FreeBSD.ORG Sat Mar 13 17:57:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1471E16A4D0; Sat, 13 Mar 2004 17:57: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 D5F2216A4CE for ; Sat, 13 Mar 2004 17:57:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE47543D2D for ; Sat, 13 Mar 2004 17:57:02 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2E1v2Ge019281 for ; Sat, 13 Mar 2004 17:57:02 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2E1v24S019278 for perforce@freebsd.org; Sat, 13 Mar 2004 17:57:02 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 13 Mar 2004 17:57:02 -0800 (PST) Message-Id: <200403140157.i2E1v24S019278@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48933 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 Mar 2004 01:57:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=48933 Change 48933 by jmallett@jmallett_oingo on 2004/03/13 17:56:46 Fumble around looking for what could be wrong... Affected files ... .. //depot/projects/mips/sys/mips/mips/vm_machdep.c#12 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/vm_machdep.c#12 (text+ko) ==== @@ -62,7 +62,6 @@ void cpu_fork(struct thread *td, struct proc *p2, struct thread *td2, int flags) { - struct trapframe *tf; if ((flags & RFPROC) == 0) return; @@ -73,15 +72,13 @@ bcopy(td->td_pcb, td2->td_pcb, sizeof(struct pcb)); /* - * Create a fresh stack for the new process. * Copy the trap frame for the return to user mode as if from a * syscall. This copies most of the user mode register values. */ - tf = (struct trapframe *)td2->td_pcb - 1; - bcopy(td->td_frame, tf, sizeof(*tf)); + bcopy(td->td_frame, td2->td_frame, sizeof *td2->td_frame); - /* Set up trap frame. */ - td2->td_frame = tf; + /* And lastly, stack pointer, begin a trapframe below frame. */ + td2->td_pcb->pcb_regs[8] = (register_t)_ALIGN(td2->td_frame - 1); /* * Call fork_trampoline into fork_return via the pcb. @@ -89,7 +86,7 @@ td2->td_pcb->pcb_regs[10] = (register_t)fork_trampoline; td2->td_pcb->pcb_regs[0] = (register_t)fork_return; td2->td_pcb->pcb_regs[1] = (register_t)td2; - td2->td_pcb->pcb_regs[2] = (register_t)tf; + td2->td_pcb->pcb_regs[2] = (register_t)td2->td_frame; /* * Now cpu_switch() can schedule the new process. @@ -135,8 +132,9 @@ void cpu_set_fork_handler(struct thread *td, void (*func)(void *), void *arg) { - td->td_pcb->pcb_regs[10] = (register_t)func; - td->td_pcb->pcb_regs[0] = (register_t)arg; + if (savectx(td->td_pcb)) { + (*func)(arg); + } } void From owner-p4-projects@FreeBSD.ORG Sat Mar 13 17:58:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 607F816A4D0; Sat, 13 Mar 2004 17:58:05 -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 3887916A4CF for ; Sat, 13 Mar 2004 17:58:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C43643D2D for ; Sat, 13 Mar 2004 17:58:05 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2E1w4Ge019332 for ; Sat, 13 Mar 2004 17:58:04 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2E1w4vF019329 for perforce@freebsd.org; Sat, 13 Mar 2004 17:58:04 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 13 Mar 2004 17:58:04 -0800 (PST) Message-Id: <200403140158.i2E1w4vF019329@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48934 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 Mar 2004 01:58:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=48934 Change 48934 by jmallett@jmallett_oingo on 2004/03/13 17:57:13 Shuffle. Affected files ... .. //depot/projects/mips/sys/mips/mips/swtch.S#5 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/swtch.S#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/swtch.S#4 $ + * $P4: //depot/projects/mips/sys/mips/mips/swtch.S#5 $ */ #include @@ -51,8 +51,8 @@ sd s5, SF_REG_S5(a0) sd s6, SF_REG_S6(a0) sd s7, SF_REG_S7(a0) + sd s8, SF_REG_S8(a0) sd sp, SF_REG_SP(a0) - sd s8, SF_REG_S8(a0) sd ra, SF_REG_RA(a0) jr ra li v0, 0 @@ -65,14 +65,14 @@ ENTRY(cpu_throw) dsubu sp, 8 sd a1, 0(sp) + move a0, a1 jal pmap_activate - move a0, a1 - dla k0, pcpup - ld k0, 0(k0) - ld a0, 0(sp) - sd a0, PC_CURTHREAD(k0) - daddu sp, 8 - ld t0, TD_PCB(a0) + nop + ld k1, 0(sp) + ld k0, pcpup + sd k1, PC_CURTHREAD(k0) + ld t0, TD_PCB(k1) + sd t0, PC_CURPCB(k0) ld s0, SF_REG_S0(t0) ld s1, SF_REG_S1(t0) ld s2, SF_REG_S2(t0) @@ -81,9 +81,14 @@ ld s5, SF_REG_S5(t0) ld s6, SF_REG_S6(t0) ld s7, SF_REG_S7(t0) + ld s8, SF_REG_S8(t0) ld sp, SF_REG_SP(t0) - ld s8, SF_REG_S8(t0) ld ra, SF_REG_RA(t0) + /* Copy s0-s3 into a0-s3 so we can just pass args. */ + move a0, s0 + move a1, s1 + move a2, s2 + move a3, s3 jr ra li v0, 1 END(cpu_throw) From owner-p4-projects@FreeBSD.ORG Sat Mar 13 17:58:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 398CB16A4D8; Sat, 13 Mar 2004 17:58: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 146F216A4D0 for ; Sat, 13 Mar 2004 17:58:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB0E143D2D for ; Sat, 13 Mar 2004 17:58:05 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2E1w5Ge019339 for ; Sat, 13 Mar 2004 17:58:05 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2E1w5qG019335 for perforce@freebsd.org; Sat, 13 Mar 2004 17:58:05 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 13 Mar 2004 17:58:05 -0800 (PST) Message-Id: <200403140158.i2E1w5qG019335@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48935 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 Mar 2004 01:58:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=48935 Change 48935 by jmallett@jmallett_oingo on 2004/03/13 17:57:31 Set up curpcb. Affected files ... .. //depot/projects/mips/sys/mips/mips/machdep.c#42 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/machdep.c#42 (text+ko) ==== @@ -221,6 +221,7 @@ pcpu_init(pcpup, 0, sizeof(struct pcpu)); pcpup->pc_curthread = &thread0; cpu_thread_setup(curthread); + pcpup->pc_curpcb = curthread->td_pcb; mutex_init(); #ifdef DDB kdb_init(); From owner-p4-projects@FreeBSD.ORG Sat Mar 13 18:12:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 360A516A4D1; Sat, 13 Mar 2004 18:12: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 07C3416A4CE for ; Sat, 13 Mar 2004 18:12:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DED7343D31 for ; Sat, 13 Mar 2004 18:12:24 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2E2COGe024360 for ; Sat, 13 Mar 2004 18:12:24 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2E2COEr024357 for perforce@freebsd.org; Sat, 13 Mar 2004 18:12:24 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 13 Mar 2004 18:12:24 -0800 (PST) Message-Id: <200403140212.i2E2COEr024357@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 48937 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 Mar 2004 02:12:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=48937 Change 48937 by peter@peter_overcee on 2004/03/13 18:11:37 IFC @48936 Affected files ... .. //depot/projects/hammer/share/mk/bsd.cpu.mk#14 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#15 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#19 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#22 integrate .. //depot/projects/hammer/sys/dev/md/md.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#23 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#33 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#17 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#10 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#8 integrate .. //depot/projects/hammer/sys/netncp/ncp_subr.c#5 integrate .. //depot/projects/hammer/sys/sys/eventhandler.h#5 integrate .. //depot/projects/hammer/sys/sys/socket.h#9 integrate .. //depot/projects/hammer/tools/tools/nanobsd/i386.diskimage#2 integrate Differences ... ==== //depot/projects/hammer/share/mk/bsd.cpu.mk#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.34 2004/03/12 21:36:12 trhodes Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.35 2004/03/14 01:29:05 trhodes Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -44,7 +44,7 @@ . if ${MACHINE_ARCH} == "i386" . if ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \ - ${CPUTYPE} == "athlon-4" || ${CPUTYPE} == "athlon-tbird" + ${CPUTYPE} == "athlon-4" _ICC_CPUCFLAGS = -tpp6 -xiMK _CPUCFLAGS = -march=${CPUTYPE} . elif ${CPUTYPE} == "athlon-tbird" || ${CPUTYPE} == "athlon" ==== //depot/projects/hammer/share/mk/bsd.lib.mk#15 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.157 2004/03/12 21:36:12 trhodes Exp $ +# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.158 2004/03/14 01:29:05 trhodes Exp $ # .include @@ -60,9 +60,6 @@ PO_FLAG=-pg .endif -.c.o: - ${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} - .c.po: ${CC} ${PO_FLAG} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} @@ -172,7 +169,7 @@ ${LINT} ${LINTLIBFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC} .endif -.endif #!defined(INTERNALLIB) +.endif !defined(INTERNALLIB) all: ${_LIBS} ==== //depot/projects/hammer/sys/conf/kern.pre.mk#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.43 2004/03/12 21:36:12 trhodes Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.44 2004/03/14 01:29:05 trhodes Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -39,7 +39,7 @@ INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S -# This hack lets us use the Intel ACPICA code without spamming a new +# This hack lets us use the Intel ACPICA code without spamming a new # include path into 100+ source files. INCLUDES+= -I$S/contrib/dev/acpica @@ -66,11 +66,11 @@ ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 -. if ${CC} == "icc" -CFLAGS+= -DGPROF -. else +.if ${CC} == "icc" +.error Profiling doesn't work with ICC yet. +.else CFLAGS+= -DGPROF -falign-functions=16 -. endif +.endif .if ${PROFLEVEL} >= 2 CFLAGS+= -DGPROF4 -DGUPROF . if ${CC} == "icc" ==== //depot/projects/hammer/sys/conf/kmod.mk#22 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.155 2004/03/12 21:36:12 trhodes Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.156 2004/03/14 01:29:05 trhodes Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -71,8 +71,7 @@ .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S .if ${CC} == "icc" -_ICC_CFLAGS:= ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/} -CFLAGS= ${_ICC_CFLAGS} +CFLAGS:= ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/} .endif CFLAGS+= ${COPTS} -D_KERNEL CFLAGS+= -DKLD_MODULE ==== //depot/projects/hammer/sys/dev/md/md.c#25 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.115 2004/03/10 20:41:08 phk Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.116 2004/03/14 00:24:30 alc Exp $ * */ @@ -542,7 +542,6 @@ lastp = (bp->bio_offset + bp->bio_length - 1) / PAGE_SIZE; lastend = (bp->bio_offset + bp->bio_length - 1) % PAGE_SIZE + 1; - mtx_lock(&Giant); kva = kmem_alloc_nofault(kernel_map, PAGE_SIZE); VM_OBJECT_LOCK(sc->object); @@ -602,7 +601,6 @@ vm_object_set_writeable_dirty(sc->object); VM_OBJECT_UNLOCK(sc->object); kmem_free(kernel_map, kva, sc->secsize); - mtx_unlock(&Giant); return (0); } } @@ -618,13 +616,13 @@ curthread->td_base_pri = PRIBIO; switch (sc->type) { - case MD_SWAP: case MD_VNODE: mtx_lock(&Giant); hasgiant = 1; break; case MD_MALLOC: case MD_PRELOAD: + case MD_SWAP: default: hasgiant = 0; break; ==== //depot/projects/hammer/sys/kern/kern_exec.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.239 2004/03/13 22:31:38 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.240 2004/03/14 02:06:27 peter Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -843,6 +843,7 @@ imgp->vmspace_destroyed = 1; + /* Called with Giant held, do not depend on it! */ EVENTHANDLER_INVOKE(process_exec, p); /* ==== //depot/projects/hammer/sys/kern/kern_exit.c#22 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.225 2004/03/13 22:31:39 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.226 2004/03/14 02:06:27 peter Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -214,9 +214,7 @@ * e.g. SYSV IPC stuff * XXX what if one of these generates an error? */ - mtx_lock(&Giant); EVENTHANDLER_INVOKE(process_exit, p); - mtx_unlock(&Giant); MALLOC(p->p_ru, struct rusage *, sizeof(struct rusage), M_ZOMBIE, M_WAITOK); ==== //depot/projects/hammer/sys/kern/kern_fork.c#33 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.222 2004/03/13 22:31:39 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.224 2004/03/14 02:06:27 peter Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -689,6 +689,7 @@ cnt.v_rforkpages += p2->p_vmspace->vm_dsize + p2->p_vmspace->vm_ssize; } + mtx_unlock(&Giant); /* * Both processes are set up, now check if any loadable modules want @@ -696,7 +697,6 @@ * What if they have an error? XXX */ EVENTHANDLER_INVOKE(process_fork, p1, p2, flags); - mtx_unlock(&Giant); /* * Set the child start time and mark the process as being complete. ==== //depot/projects/hammer/sys/kern/vfs_aio.c#17 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.168 2003/11/15 09:28:08 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.169 2004/03/14 02:06:27 peter Exp $"); #include #include @@ -543,6 +543,7 @@ if (ki == NULL) return; + mtx_lock(&Giant); ki->kaio_flags |= LIOJ_SIGNAL_POSTED; while ((ki->kaio_active_count > 0) || (ki->kaio_buffer_count > ki->kaio_buffer_finished_count)) { @@ -643,6 +644,7 @@ uma_zfree(kaio_zone, ki); p->p_aioinfo = NULL; + mtx_unlock(&Giant); } /* ==== //depot/projects/hammer/sys/net/if_spppsubr.c#10 (text+ko) ==== @@ -17,7 +17,7 @@ * * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997 * - * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.106 2004/03/13 06:16:59 rwatson Exp $ + * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.107 2004/03/14 01:32:44 rwatson Exp $ */ #include @@ -961,7 +961,7 @@ struct sppp *sp = (struct sppp*) ifp; /* Initialize keepalive handler. */ - if (! spppq) + if (spppq != NULL) TIMEOUT(sppp_keepalive, 0, hz * 10, keepalive_ch); /* Insert new entry into the keepalive list. */ @@ -1020,7 +1020,7 @@ } /* Stop keepalive handler. */ - if (! spppq) + if (spppq != NULL) UNTIMEOUT(sppp_keepalive, 0, keepalive_ch); for (i = 0; i < IDX_COUNT; i++) ==== //depot/projects/hammer/sys/netinet/if_ether.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ether.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/if_ether.c,v 1.117 2003/12/23 14:08:50 ru Exp $ + * $FreeBSD: src/sys/netinet/if_ether.c,v 1.118 2004/03/14 00:44:11 mdodd Exp $ */ /* @@ -163,11 +163,11 @@ static void arp_rtrequest(req, rt, info) int req; - register struct rtentry *rt; + struct rtentry *rt; struct rt_addrinfo *info; { - register struct sockaddr *gate; - register struct llinfo_arp *la; + struct sockaddr *gate; + struct llinfo_arp *la; static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK}; RT_LOCK_ASSERT(rt); @@ -302,14 +302,14 @@ */ static void arprequest(ifp, sip, tip, enaddr) - register struct ifnet *ifp; - register struct in_addr *sip, *tip; - register u_char *enaddr; + struct ifnet *ifp; + struct in_addr *sip, *tip; + u_char *enaddr; { - register struct mbuf *m; - register struct ether_header *eh; - register struct arc_header *arh; - register struct arphdr *ah; + struct mbuf *m; + struct ether_header *eh; + struct arc_header *arh; + struct arphdr *ah; struct sockaddr sa; static u_char llcx[] = { 0x82, 0x40, LLC_SNAP_LSAP, LLC_SNAP_LSAP, LLC_UI, 0x00, 0x00, 0x00, 0x08, 0x06 }; @@ -403,11 +403,11 @@ */ int arpresolve(ifp, rt, m, dst, desten, rt0) - register struct ifnet *ifp; - register struct rtentry *rt; + struct ifnet *ifp; + struct rtentry *rt; struct mbuf *m; - register struct sockaddr *dst; - register u_char *desten; + struct sockaddr *dst; + u_char *desten; struct rtentry *rt0; { struct llinfo_arp *la = 0; @@ -579,14 +579,14 @@ in_arpinput(m) struct mbuf *m; { - register struct arphdr *ah; - register struct ifnet *ifp = m->m_pkthdr.rcvif; + struct arphdr *ah; + struct ifnet *ifp = m->m_pkthdr.rcvif; struct ether_header *eh; struct arc_header *arh; struct iso88025_header *th = (struct iso88025_header *)0; struct iso88025_sockaddr_dl_data *trld; - register struct llinfo_arp *la = 0; - register struct rtentry *rt; + struct llinfo_arp *la = 0; + struct rtentry *rt; struct ifaddr *ifa; struct in_ifaddr *ia; struct sockaddr_dl *sdl; @@ -890,10 +890,10 @@ */ static void arptfree(la) - register struct llinfo_arp *la; + struct llinfo_arp *la; { - register struct rtentry *rt = la->la_rt; - register struct sockaddr_dl *sdl; + struct rtentry *rt = la->la_rt; + struct sockaddr_dl *sdl; if (rt == 0) panic("arptfree"); @@ -917,7 +917,7 @@ u_long addr; int create, proxy; { - register struct rtentry *rt; + struct rtentry *rt; struct sockaddr_inarp sin; const char *why = 0; ==== //depot/projects/hammer/sys/netncp/ncp_subr.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netncp/ncp_subr.c,v 1.12 2003/06/11 05:30:35 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netncp/ncp_subr.c,v 1.13 2004/03/14 02:06:28 peter Exp $"); #include #include @@ -85,6 +85,7 @@ struct ncp_conn *ncp, *nncp; struct thread *td; + mtx_lock(&Giant); FOREACH_THREAD_IN_PROC(p, td) { if (ncp_conn_putprochandles(td) == 0) continue; @@ -100,6 +101,7 @@ } ncp_conn_unlocklist(td); } + mtx_unlock(&Giant); } int ==== //depot/projects/hammer/sys/sys/eventhandler.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/eventhandler.h,v 1.30 2004/03/01 22:36:58 phk Exp $ + * $FreeBSD: src/sys/sys/eventhandler.h,v 1.32 2004/03/14 02:06:28 peter Exp $ */ #ifndef SYS_EVENTHANDLER_H @@ -156,7 +156,11 @@ #define LOWMEM_PRI_DEFAULT EVENTHANDLER_PRI_FIRST EVENTHANDLER_DECLARE(vm_lowmem, vm_lowmem_handler_t); -/* Process events */ +/* + * Process events + * process_fork and exit handlers are called without Giant. + * exec handlers are called with Giant, but that is by accident. + */ struct proc; typedef void (*exitlist_fn)(void *, struct proc *); ==== //depot/projects/hammer/sys/sys/socket.h#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)socket.h 8.4 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/sys/socket.h,v 1.76 2004/02/08 07:35:48 silby Exp $ + * $FreeBSD: src/sys/sys/socket.h,v 1.77 2004/03/14 00:49:09 mdodd Exp $ */ #ifndef _SYS_SOCKET_H_ @@ -207,7 +207,8 @@ #define AF_NETGRAPH 32 /* Netgraph sockets */ #define AF_SLOW 33 /* 802.3ad slow protocol */ #define AF_SCLUSTER 34 /* Sitara cluster protocol */ -#define AF_MAX 35 +#define AF_ARP 35 +#define AF_MAX 36 #endif /* @@ -290,6 +291,7 @@ #define PF_NETGRAPH AF_NETGRAPH #define PF_SLOW AF_SLOW #define PF_SCLUSTER AF_SCLUSTER +#define PF_ARP AF_ARP #define PF_MAX AF_MAX ==== //depot/projects/hammer/tools/tools/nanobsd/i386.diskimage#2 (text+ko) ==== @@ -4,7 +4,7 @@ # # See /usr/share/examples/etc/bsd-style-copyright for license terms. # -# $FreeBSD: src/tools/tools/nanobsd/i386.diskimage,v 1.2 2004/03/11 18:12:48 simon Exp $ +# $FreeBSD: src/tools/tools/nanobsd/i386.diskimage,v 1.3 2004/03/13 23:01:08 phk Exp $ # # Called as: # @@ -23,7 +23,7 @@ TMPFILE0=`mktemp -t nanobsd` TMPFILE1=`mktemp -t nanobsd` -TMPDIR=`mktemp -d -t nanobsd` +TMPMNT=`mktemp -d -t nanobsd` dd if=/dev/zero of=${TMPFILE0} count=${SECTS} MD=`mdconfig -a -t vnode -f ${TMPFILE0} -x ${SC} -y ${HD}` @@ -42,10 +42,10 @@ bsdlabel -w -B ${MD}s1 newfs -O1 -U ${MD}s1a newfs -O1 -U ${MD}s3 -mount /dev/${MD}s1a ${TMPDIR} -(cd ${WD} && find . -print | cpio -dump ${TMPDIR}) || true -df ${TMPDIR} -umount ${TMPDIR} +mount /dev/${MD}s1a ${TMPMNT} +(cd ${WD} && find . -print | cpio -dump ${TMPMNT}) || true +df ${TMPMNT} +umount ${TMPMNT} dd if=/dev/${MD}s1 of=/dev/${MD}s2 bs=64k dd if=/dev/${MD} of=${IMG} bs=64k dd if=/dev/${MD}s1 of=${6}.s1 bs=64k From owner-p4-projects@FreeBSD.ORG Sat Mar 13 21:48:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1413E16A4D0; Sat, 13 Mar 2004 21:48: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 E0A5416A4CE for ; Sat, 13 Mar 2004 21:48:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D36B543D3F for ; Sat, 13 Mar 2004 21:48:53 -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.10/8.12.10) with ESMTP id i2E5mrGe077907 for ; Sat, 13 Mar 2004 21:48:53 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2E5mrik077904 for perforce@freebsd.org; Sat, 13 Mar 2004 21:48:53 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 13 Mar 2004 21:48:53 -0800 (PST) Message-Id: <200403140548.i2E5mrik077904@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 48949 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 Mar 2004 05:48:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=48949 Change 48949 by rwatson@rwatson_tislabs on 2004/03/13 21:48:40 Integrate netperf_socket: - Giant not required for contigfree() - Hold Giant for less time when running non-MPSAFE system calls - Support for non-Giant requiring swap backend for md device - Beginning of driver removal from ISA compat shims: wt, ctx, gp, asc - Giant no longer held for process_exec event handler, so Giant is not generally grabbed in exec as much. - Less Giant in exec, exit, fork, thread operations. - AF_ARP address family - Loopback of const interactive_ports, NULL changes in if_spppsubr.c - Register removal. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/busdma_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/netperf_socket/sys/amd64/include/dvcfg.h#2 delete .. //depot/projects/netperf_socket/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pcvt_ioctl.h#2 delete .. //depot/projects/netperf_socket/sys/amd64/include/physio_proc.h#2 delete .. //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/netperf_socket/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/netperf_socket/sys/conf/files.i386#5 integrate .. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#5 integrate .. //depot/projects/netperf_socket/sys/conf/options.amd64#5 integrate .. //depot/projects/netperf_socket/sys/dev/ct/bshw_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ct/ct.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500hw.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/nsp/nsp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/nsp/nsp_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/stg/tmc18c30.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/stg/tmc18c30_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#9 integrate .. //depot/projects/netperf_socket/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/dvcfg.h#2 delete .. //depot/projects/netperf_socket/sys/i386/include/physio_proc.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/asc.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/ascreg.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/ctx.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/ctxreg.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/gpib.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/gpib.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/gpibreg.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/wt.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/wtreg.h#2 delete .. //depot/projects/netperf_socket/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/init_sysent.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exec.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_fork.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/subr_trap.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.master#3 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if_fddisubr.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_iso88025subr.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/if_ether.c#2 integrate .. //depot/projects/netperf_socket/sys/netncp/ncp_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/agp_intel.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/bus_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/sys/eventhandler.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/socket.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.mk#3 integrate .. //depot/projects/netperf_socket/sys/sys/sysproto.h#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_contig.c#5 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.43 2003/07/27 13:52:09 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.44 2004/03/13 15:42:59 scottl Exp $"); #include #include @@ -458,9 +458,7 @@ if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) free(vaddr, M_DEVBUF); else { - mtx_lock(&Giant); contigfree(vaddr, dmat->maxsize, M_DEVBUF); - mtx_unlock(&Giant); } } ==== //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.54 2003/09/22 23:11:42 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.55 2004/03/13 15:42:59 scottl Exp $"); #include #include @@ -453,9 +453,7 @@ && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) free(vaddr, M_DEVBUF); else { - mtx_lock(&Giant); contigfree(vaddr, dmat->maxsize, M_DEVBUF); - mtx_unlock(&Giant); } } ==== //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.274 2004/03/11 00:17:45 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.275 2004/03/13 19:15:43 peter Exp $"); /* * AMD64 Trap and System call handling @@ -754,13 +754,6 @@ ktrsyscall(code, narg, argp); #endif - /* - * Try to run the syscall without Giant if the syscall - * is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); - if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = frame.tf_rdx; @@ -769,7 +762,12 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - error = (*callp->sy_call)(td, argp); + if ((callp->sy_narg & SYF_MPSAFE) == 0) { + mtx_lock(&Giant); + error = (*callp->sy_call)(td, argp); + mtx_unlock(&Giant); + } else + error = (*callp->sy_call)(td, argp); } switch (error) { @@ -807,12 +805,6 @@ } /* - * Release Giant if we previously set it. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Traced syscall. */ if (orig_tf_rflags & PSL_T) { ==== //depot/projects/netperf_socket/sys/amd64/conf/NOTES#5 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.10 2004/03/05 08:04:10 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.12 2004/03/13 22:16:34 peter Exp $ # # We don't have modules on amd64. @@ -17,7 +17,7 @@ machine amd64 # -# We want LINT to cover profiling as well +# We want LINT to cover profiling as well. #XXX#profile 2 @@ -231,17 +231,17 @@ # Network interfaces: # +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) +# (requires miibus) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) -#XXX# Needs to be busdma'ed. +#XXX# still calls MD i386 kvtop function instead of vtophys etc #XXX#device ed #XXX#device lnc -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) - #XXX#device ath #XXX#device ath_hal # Atheros HAL (includes binary component) device wlan # 802.11 layer @@ -477,7 +477,7 @@ # (whether static or dynamic). # #XXX#options COMPAT_SVR4 # build emulator statically -options DEBUG_SVR4 # enable verbose debugging +#XXX#options DEBUG_SVR4 # enable verbose debugging #XXX#device streams # STREAMS network driver (required for svr4). ==== //depot/projects/netperf_socket/sys/amd64/include/pci_cfgreg.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.11 2003/09/22 22:21:21 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.12 2004/03/13 19:19:13 peter Exp $ * */ @@ -45,4 +45,3 @@ int pci_cfgregopen(void); u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); -int pci_cfgintr(int bus, int device, int pin, int oldirq); ==== //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.106 2003/12/06 23:19:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.107 2004/03/13 19:21:35 peter Exp $"); #include "opt_cpu.h" @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -42,9 +41,6 @@ #include #include #include -#include -#include -#include #include "pcib_if.h" @@ -88,210 +84,10 @@ u_int8_t *busnum) { const char *s = NULL; - static u_int8_t pxb[4]; /* hack for 450nx */ *busnum = 0; - - switch (id) { - case 0x12258086: - s = "Intel 824?? host to PCI bridge"; - /* XXX This is a guess */ - /* *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x41, 1); */ - *busnum = bus; - break; - case 0x71208086: - s = "Intel 82810 (i810 GMCH) Host To Hub bridge"; - break; - case 0x71228086: - s = "Intel 82810-DC100 (i810-DC100 GMCH) Host To Hub bridge"; - break; - case 0x71248086: - s = "Intel 82810E (i810E GMCH) Host To Hub bridge"; - break; - case 0x11308086: - s = "Intel 82815 (i815 GMCH) Host To Hub bridge"; - break; - case 0x71808086: - s = "Intel 82443LX (440 LX) host to PCI bridge"; - break; - case 0x71908086: - s = "Intel 82443BX (440 BX) host to PCI bridge"; - break; - case 0x71928086: - s = "Intel 82443BX host to PCI bridge (AGP disabled)"; - break; - case 0x71948086: - s = "Intel 82443MX host to PCI bridge"; - break; - case 0x71a08086: - s = "Intel 82443GX host to PCI bridge"; - break; - case 0x71a18086: - s = "Intel 82443GX host to AGP bridge"; - break; - case 0x71a28086: - s = "Intel 82443GX host to PCI bridge (AGP disabled)"; - break; - case 0x84c48086: - s = "Intel 82454KX/GX (Orion) host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x4a, 1); - break; - case 0x84ca8086: - /* - * For the 450nx chipset, there is a whole bundle of - * things pretending to be host bridges. The MIOC will - * be seen first and isn't really a pci bridge (the - * actual busses are attached to the PXB's). We need to - * read the registers of the MIOC to figure out the - * bus numbers for the PXB channels. - * - * Since the MIOC doesn't have a pci bus attached, we - * pretend it wasn't there. - */ - pxb[0] = legacy_pcib_read_config(0, bus, slot, func, - 0xd0, 1); /* BUSNO[0] */ - pxb[1] = legacy_pcib_read_config(0, bus, slot, func, - 0xd1, 1) + 1; /* SUBA[0]+1 */ - pxb[2] = legacy_pcib_read_config(0, bus, slot, func, - 0xd3, 1); /* BUSNO[1] */ - pxb[3] = legacy_pcib_read_config(0, bus, slot, func, - 0xd4, 1) + 1; /* SUBA[1]+1 */ - return NULL; - case 0x84cb8086: - switch (slot) { - case 0x12: - s = "Intel 82454NX PXB#0, Bus#A"; - *busnum = pxb[0]; - break; - case 0x13: - s = "Intel 82454NX PXB#0, Bus#B"; - *busnum = pxb[1]; - break; - case 0x14: - s = "Intel 82454NX PXB#1, Bus#A"; - *busnum = pxb[2]; - break; - case 0x15: - s = "Intel 82454NX PXB#1, Bus#B"; - *busnum = pxb[3]; - break; - } - break; - - /* AMD -- vendor 0x1022 */ - case 0x30001022: - s = "AMD Elan SC520 host to PCI bridge"; -#ifdef CPU_ELAN - init_AMD_Elan_sc520(); -#else - printf( -"*** WARNING: missing CPU_ELAN -- timekeeping may be wrong\n"); -#endif - break; - case 0x70061022: - s = "AMD-751 host to PCI bridge"; - break; - case 0x700e1022: - s = "AMD-761 host to PCI bridge"; - break; - - /* SiS -- vendor 0x1039 */ - case 0x04961039: - s = "SiS 85c496"; - break; - case 0x04061039: - s = "SiS 85c501"; - break; - case 0x06011039: - s = "SiS 85c601"; - break; - case 0x55911039: - s = "SiS 5591 host to PCI bridge"; - break; - case 0x00011039: - s = "SiS 5591 host to AGP bridge"; - break; - - /* VLSI -- vendor 0x1004 */ - case 0x00051004: - s = "VLSI 82C592 Host to PCI bridge"; - break; - - /* XXX Here is MVP3, I got the datasheet but NO M/B to test it */ - /* totally. Please let me know if anything wrong. -F */ - /* XXX need info on the MVP3 -- any takers? */ - case 0x05981106: - s = "VIA 82C598MVP (Apollo MVP3) host bridge"; - break; - - /* AcerLabs -- vendor 0x10b9 */ - /* Funny : The datasheet told me vendor id is "10b8",sub-vendor */ - /* id is '10b9" but the register always shows "10b9". -Foxfair */ - case 0x154110b9: - s = "AcerLabs M1541 (Aladdin-V) PCI host bridge"; - break; - - /* OPTi -- vendor 0x1045 */ - case 0xc7011045: - s = "OPTi 82C700 host to PCI bridge"; - break; - case 0xc8221045: - s = "OPTi 82C822 host to PCI Bridge"; - break; - - /* ServerWorks -- vendor 0x1166 */ - case 0x00051166: - s = "ServerWorks NB6536 2.0HE host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00061166: - /* FALLTHROUGH */ - case 0x00081166: - /* FALLTHROUGH */ - case 0x02011166: - /* FALLTHROUGH */ - case 0x010f1014: /* IBM re-badged ServerWorks chipset */ - s = "ServerWorks host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00091166: - s = "ServerWorks NB6635 3.0LE host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00101166: - s = "ServerWorks CIOB30 host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00111166: - /* FALLTHROUGH */ - case 0x03021014: /* IBM re-badged ServerWorks chipset */ - s = "ServerWorks CMIC-HE host to PCI-X bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - /* XXX unknown chipset, but working */ - case 0x00171166: - /* FALLTHROUGH */ - case 0x01011166: - s = "ServerWorks host to PCI bridge(unknown chipset)"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - /* Integrated Micro Solutions -- vendor 0x10e0 */ - case 0x884910e0: - s = "Integrated Micro Solutions VL Bridge"; - break; - - default: - if (class == PCIC_BRIDGE && subclass == PCIS_BRIDGE_HOST) - s = "Host to PCI bridge"; - break; - } - + if (class == PCIC_BRIDGE && subclass == PCIS_BRIDGE_HOST) + s = "Host to PCI bridge"; return s; } @@ -432,9 +228,10 @@ int legacy_pcib_attach(device_t dev) { + int bus; - device_add_child(dev, "pci", pcib_get_bus(dev)); - + bus = pcib_get_bus(dev); + device_add_child(dev, "pci", bus); return bus_generic_attach(dev); } ==== //depot/projects/netperf_socket/sys/amd64/pci/pci_cfgreg.c#3 (text+ko) ==== @@ -27,26 +27,17 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.105 2004/01/28 20:46:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.106 2004/03/13 19:19:13 peter Exp $"); -#include /* XXX trim includes */ +#include #include #include -#include -#include -#include #include #include -#include -#include -#include #include #include -#include #include -#include "pcib_if.h" - static int cfgmech; static int devmax; @@ -108,18 +99,6 @@ pcireg_cfgwrite(bus, slot, func, reg, data, bytes); } -/* - * Route a PCI interrupt - */ -int -pci_cfgintr(int bus, int device, int pin, int oldirq) -{ - - printf("pci_cfgintr: can't route an interrupt to %d:%d INT%c without ACPI\n", bus, - device, 'A' + pin - 1); - return (PCI_INVALID_IRQ); -} - /* * Configuration space access using direct register operations */ ==== //depot/projects/netperf_socket/sys/conf/files.i386#5 (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.468 2004/03/12 17:31:29 wpaul Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.472 2004/03/14 05:31:40 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -258,15 +258,12 @@ i386/ibcs2/ibcs2_xenix.c optional ibcs2 i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 -i386/isa/asc.c count asc i386/isa/atpic.c standard i386/isa/atpic_vector.s standard i386/isa/clock.c standard -i386/isa/ctx.c optional ctx i386/isa/cy.c count cy i386/isa/elink.c optional ep i386/isa/elink.c optional ie -i386/isa/gpib.c optional gp i386/isa/gsc.c count gsc i386/isa/if_el.c count el i386/isa/if_le.c count le @@ -293,7 +290,6 @@ i386/isa/spkr.c optional speaker i386/isa/stallion.c optional stl nowerror i386/isa/vesa.c optional vga vesa -i386/isa/wt.c count wt i386/linux/imgact_linux.c optional compat_linux i386/linux/linux_dummy.c optional compat_linux i386/linux/linux_locore.s optional compat_linux \ ==== //depot/projects/netperf_socket/sys/conf/kern.pre.mk#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.43 2004/03/12 21:36:12 trhodes Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.44 2004/03/14 01:29:05 trhodes Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -39,7 +39,7 @@ INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S -# This hack lets us use the Intel ACPICA code without spamming a new +# This hack lets us use the Intel ACPICA code without spamming a new # include path into 100+ source files. INCLUDES+= -I$S/contrib/dev/acpica @@ -66,11 +66,11 @@ ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 -. if ${CC} == "icc" -CFLAGS+= -DGPROF -. else +.if ${CC} == "icc" +.error Profiling doesn't work with ICC yet. +.else CFLAGS+= -DGPROF -falign-functions=16 -. endif +.endif .if ${PROFLEVEL} >= 2 CFLAGS+= -DGPROF4 -DGUPROF . if ${CC} == "icc" ==== //depot/projects/netperf_socket/sys/conf/kmod.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.155 2004/03/12 21:36:12 trhodes Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.156 2004/03/14 01:29:05 trhodes Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -71,8 +71,7 @@ .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S .if ${CC} == "icc" -_ICC_CFLAGS:= ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/} -CFLAGS= ${_ICC_CFLAGS} +CFLAGS:= ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/} .endif CFLAGS+= ${COPTS} -D_KERNEL CFLAGS+= -DKLD_MODULE ==== //depot/projects/netperf_socket/sys/conf/options.amd64#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.amd64,v 1.13 2004/03/05 07:56:23 obrien Exp $ +# $FreeBSD: src/sys/conf/options.amd64,v 1.14 2004/03/13 22:16:34 peter Exp $ # Options specific to AMD64 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -10,14 +10,11 @@ # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems # (see src/sys/conf/options), except for broken debugging options. -IBCS2 opt_dontuse.h -COMPAT_LINUX opt_dontuse.h -COMPAT_SVR4 opt_dontuse.h -DEBUG_SVR4 opt_svr4.h -NDISAPI opt_dontuse.h - -# Change KVM size. Changes things all over the kernel. -KVA_PAGES opt_global.h +#IBCS2 opt_dontuse.h +#COMPAT_LINUX opt_dontuse.h +#COMPAT_SVR4 opt_dontuse.h +#DEBUG_SVR4 opt_svr4.h +#NDISAPI opt_dontuse.h CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h ==== //depot/projects/netperf_socket/sys/dev/ct/bshw_machdep.c#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NecBSD: bshw_machdep.c,v 1.8.12.6 2001/06/29 06:28:05 honda Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ct/bshw_machdep.c,v 1.5 2003/08/24 17:46:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ct/bshw_machdep.c,v 1.6 2004/03/13 19:46:27 peter Exp $"); /* $NetBSD$ */ /* @@ -78,8 +78,8 @@ #include #include -#include -#include +#include +#include #include ==== //depot/projects/netperf_socket/sys/dev/ct/ct.c#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NecBSD: ct.c,v 1.13.12.5 2001/06/26 07:31:53 honda Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ct/ct.c,v 1.7 2003/08/24 17:46:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ct/ct.c,v 1.8 2004/03/13 19:46:27 peter Exp $"); /* $NetBSD$ */ #define CT_DEBUG @@ -76,8 +76,8 @@ #ifdef __FreeBSD__ #include -#include -#include +#include +#include #include ==== //depot/projects/netperf_socket/sys/dev/ct/ct_isa.c#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NecBSD: ct_isa.c,v 1.6 1999/07/26 06:32:01 honda Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.9 2003/08/24 17:46:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.10 2004/03/13 19:46:27 peter Exp $"); /* $NetBSD$ */ /* @@ -81,8 +81,8 @@ #include #include -#include -#include +#include +#include #include ==== //depot/projects/netperf_socket/sys/dev/md/md.c#7 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.115 2004/03/10 20:41:08 phk Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.116 2004/03/14 00:24:30 alc Exp $ * */ @@ -542,7 +542,6 @@ lastp = (bp->bio_offset + bp->bio_length - 1) / PAGE_SIZE; lastend = (bp->bio_offset + bp->bio_length - 1) % PAGE_SIZE + 1; - mtx_lock(&Giant); kva = kmem_alloc_nofault(kernel_map, PAGE_SIZE); VM_OBJECT_LOCK(sc->object); @@ -602,7 +601,6 @@ vm_object_set_writeable_dirty(sc->object); VM_OBJECT_UNLOCK(sc->object); kmem_free(kernel_map, kva, sc->secsize); - mtx_unlock(&Giant); return (0); } } @@ -618,13 +616,13 @@ curthread->td_base_pri = PRIBIO; switch (sc->type) { - case MD_SWAP: case MD_VNODE: mtx_lock(&Giant); hasgiant = 1; break; case MD_MALLOC: case MD_PRELOAD: + case MD_SWAP: default: hasgiant = 0; break; ==== //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.8 2003/08/24 17:54:12 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.9 2004/03/13 19:46:27 peter Exp $"); #include "opt_ddb.h" #include @@ -79,8 +79,8 @@ #include #include -#include -#include +#include +#include #include ==== //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500_pccard.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.18 2003/10/26 00:51:40 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.19 2004/03/13 19:46:27 peter Exp $"); #include #include @@ -46,7 +46,7 @@ #include #include -#include +#include #include ==== //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500hw.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ncv/ncr53c500hw.h,v 1.2 2001/07/14 00:38:50 non Exp $ */ +/* $FreeBSD: src/sys/dev/ncv/ncr53c500hw.h,v 1.3 2004/03/13 19:46:27 peter Exp $ */ /* $NecBSD: ncr53c500hw.h,v 1.6.18.1 2001/06/08 06:27:44 honda Exp $ */ /* $NetBSD$ */ @@ -36,7 +36,7 @@ #ifndef __NCR53C500HW_H_ #define __NCR53C500HW_H_ -#include +#include #define NCV_HOSTID 7 #define NCV_NTARGETS 8 ==== //depot/projects/netperf_socket/sys/dev/nsp/nsp.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.10 2003/08/24 17:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.11 2004/03/13 19:46:27 peter Exp $"); #include "opt_ddb.h" #include @@ -79,8 +79,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/netperf_socket/sys/dev/nsp/nsp_pccard.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.16 2003/08/24 17:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.17 2004/03/13 19:46:27 peter Exp $"); #include #include @@ -45,7 +45,7 @@ #include #include -#include +#include #include ==== //depot/projects/netperf_socket/sys/dev/stg/tmc18c30.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.10 2003/12/17 16:12:01 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.11 2004/03/13 19:46:27 peter Exp $"); #include "opt_ddb.h" #include @@ -77,8 +77,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/netperf_socket/sys/dev/stg/tmc18c30_pccard.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_pccard.c,v 1.18 2003/08/24 18:17:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_pccard.c,v 1.19 2004/03/13 19:46:27 peter Exp $"); #include #include @@ -48,7 +48,7 @@ #include #include -#include +#include #include ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs#6 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.166 2004/03/07 05:33:09 sanpei Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.167 2004/03/13 08:21:22 tjr Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -659,6 +659,7 @@ product EPSON 3200 0x011c Perfection 3200 scanner product EPSON 1260 0x011d Perfection 1260 scanner product EPSON 1660 0x011e Perfection 1660 scanner +product EPSON 1670 0x011f Perfection 1670 scanner /* e-TEK Labs products */ product ETEK 1COM 0x8007 Serial port ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#6 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.173 2004/03/07 05:34:36 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.174 2004/03/13 08:25:51 tjr Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.166 2004/03/07 05:33:09 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.167 2004/03/13 08:21:22 tjr Exp */ /* @@ -666,6 +666,7 @@ #define USB_PRODUCT_EPSON_3200 0x011c /* Perfection 3200 scanner */ #define USB_PRODUCT_EPSON_1260 0x011d /* Perfection 1260 scanner */ #define USB_PRODUCT_EPSON_1660 0x011e /* Perfection 1660 scanner */ +#define USB_PRODUCT_EPSON_1670 0x011f /* Perfection 1670 scanner */ /* e-TEK Labs products */ #define USB_PRODUCT_ETEK_1COM 0x8007 /* Serial port */ ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#6 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.173 2004/03/07 05:34:36 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.174 2004/03/13 08:25:51 tjr Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.166 2004/03/07 05:33:09 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.167 2004/03/13 08:21:22 tjr Exp */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 13 22:50:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AA0416A4D1; Sat, 13 Mar 2004 22:50: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 6E98816A4CF for ; Sat, 13 Mar 2004 22:50:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65B1E43D31 for ; Sat, 13 Mar 2004 22:50:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2E6oCGe008618 for ; Sat, 13 Mar 2004 22:50:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2E6oBZ7008615 for perforce@freebsd.org; Sat, 13 Mar 2004 22:50:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 13 Mar 2004 22:50:11 -0800 (PST) Message-Id: <200403140650.i2E6oBZ7008615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48954 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 Mar 2004 06:50:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=48954 Change 48954 by jmallett@jmallett_oingo on 2004/03/13 22:49:21 Disabling interrupts here saves me no headaches. It looks like v0 has "status" in the low 32 bits, and IForgetWhatElse in the upper 32. Hurgle. Not making sense. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#22 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#22 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/exception.S#21 $ + * $P4: //depot/projects/mips/sys/mips/mips/exception.S#22 $ */ #include "opt_ddb.h" @@ -112,11 +112,6 @@ move k1, sp 1: - mfc0 t0, MIPS_COP_0_STATUS - li t1, ~MIPS_SR_IE - and t0, t1 - mtc0 t0, MIPS_COP_0_STATUS - /* * A generic exception may result in DDB being invoked. If we * are using the kernel debugger, then set up is auxillary From owner-p4-projects@FreeBSD.ORG Sat Mar 13 22:50:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5465016A4D6; Sat, 13 Mar 2004 22:50: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 2C98016A4D5 for ; Sat, 13 Mar 2004 22:50:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2315443D31 for ; Sat, 13 Mar 2004 22:50:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2E6oCGe008625 for ; Sat, 13 Mar 2004 22:50:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2E6oCi5008621 for perforce@freebsd.org; Sat, 13 Mar 2004 22:50:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 13 Mar 2004 22:50:12 -0800 (PST) Message-Id: <200403140650.i2E6oCi5008621@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48955 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 Mar 2004 06:50:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=48955 Change 48955 by jmallett@jmallett_oingo on 2004/03/13 22:49:38 Save SR. Affected files ... .. //depot/projects/mips/sys/mips/mips/swtch.S#6 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/swtch.S#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/swtch.S#5 $ + * $P4: //depot/projects/mips/sys/mips/mips/swtch.S#6 $ */ #include @@ -43,6 +43,7 @@ * a0: struct pcb *pcb */ ENTRY(savectx) + mfc0 t0, MIPS_COP_0_STATUS sd s0, SF_REG_S0(a0) sd s1, SF_REG_S1(a0) sd s2, SF_REG_S2(a0) @@ -53,6 +54,7 @@ sd s7, SF_REG_S7(a0) sd s8, SF_REG_S8(a0) sd sp, SF_REG_SP(a0) + sd t0, SF_REG_SR(a0) sd ra, SF_REG_RA(a0) jr ra li v0, 0 @@ -84,11 +86,13 @@ ld s8, SF_REG_S8(t0) ld sp, SF_REG_SP(t0) ld ra, SF_REG_RA(t0) + ld t0, SF_REG_SR(t0) /* Copy s0-s3 into a0-s3 so we can just pass args. */ move a0, s0 move a1, s1 move a2, s2 move a3, s3 + mtc0 t0, MIPS_COP_0_STATUS jr ra li v0, 1 END(cpu_throw) From owner-p4-projects@FreeBSD.ORG Sat Mar 13 23:07:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F9E516A4D0; Sat, 13 Mar 2004 23:07: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 D17A916A4CE for ; Sat, 13 Mar 2004 23:07:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C407543D2F for ; Sat, 13 Mar 2004 23:07:36 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2E77aGe013835 for ; Sat, 13 Mar 2004 23:07:36 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2E77ZgJ013832 for perforce@freebsd.org; Sat, 13 Mar 2004 23:07:35 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Sat, 13 Mar 2004 23:07:35 -0800 (PST) Message-Id: <200403140707.i2E77ZgJ013832@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48957 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 Mar 2004 07:07:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=48957 Change 48957 by jmallett@jmallett_oingo on 2004/03/13 23:06:37 IFC. Affected files ... .. //depot/projects/mips/Makefile.inc1#24 integrate .. //depot/projects/mips/etc/devd.conf#7 integrate .. //depot/projects/mips/games/number/number.c#2 integrate .. //depot/projects/mips/lib/libkiconv/xlat16_iconv.c#3 integrate .. //depot/projects/mips/lib/libncp/ncpl_nls.c#2 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_concurrency.c#4 integrate .. //depot/projects/mips/libexec/getty/chat.c#3 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#30 integrate .. //depot/projects/mips/sbin/Makefile#15 integrate .. //depot/projects/mips/share/man/man4/man4.i386/Makefile#13 integrate .. //depot/projects/mips/share/man/man4/man4.i386/wt.4#2 delete .. //depot/projects/mips/share/man/man4/uscanner.4#8 integrate .. //depot/projects/mips/share/mk/bsd.cpu.mk#10 integrate .. //depot/projects/mips/share/mk/bsd.lib.mk#7 integrate .. //depot/projects/mips/sys/alpha/alpha/busdma_machdep.c#11 integrate .. //depot/projects/mips/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/mips/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/mips/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/mips/sys/amd64/include/dvcfg.h#2 delete .. //depot/projects/mips/sys/amd64/include/pci_cfgreg.h#3 integrate .. //depot/projects/mips/sys/amd64/include/pcvt_ioctl.h#2 delete .. //depot/projects/mips/sys/amd64/include/physio_proc.h#2 delete .. //depot/projects/mips/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/mips/sys/amd64/pci/pci_cfgreg.c#5 integrate .. //depot/projects/mips/sys/boot/i386/loader/main.c#4 integrate .. //depot/projects/mips/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/mips/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/mips/sys/conf/files.i386#21 integrate .. //depot/projects/mips/sys/conf/kern.pre.mk#12 integrate .. //depot/projects/mips/sys/conf/kmod.mk#14 integrate .. //depot/projects/mips/sys/conf/options.amd64#5 integrate .. //depot/projects/mips/sys/dev/ct/bshw_machdep.c#3 integrate .. //depot/projects/mips/sys/dev/ct/ct.c#3 integrate .. //depot/projects/mips/sys/dev/ct/ct_isa.c#4 integrate .. //depot/projects/mips/sys/dev/md/md.c#21 integrate .. //depot/projects/mips/sys/dev/ncv/ncr53c500.c#3 integrate .. //depot/projects/mips/sys/dev/ncv/ncr53c500_pccard.c#6 integrate .. //depot/projects/mips/sys/dev/ncv/ncr53c500hw.h#2 integrate .. //depot/projects/mips/sys/dev/nsp/nsp.c#3 integrate .. //depot/projects/mips/sys/dev/nsp/nsp_pccard.c#4 integrate .. //depot/projects/mips/sys/dev/stg/tmc18c30.c#4 integrate .. //depot/projects/mips/sys/dev/stg/tmc18c30_pccard.c#5 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs.h#19 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs_data.h#19 integrate .. //depot/projects/mips/sys/dev/usb/uscanner.c#9 integrate .. //depot/projects/mips/sys/i386/conf/NOTES#22 integrate .. //depot/projects/mips/sys/i386/i386/busdma_machdep.c#11 integrate .. //depot/projects/mips/sys/i386/i386/vm_machdep.c#18 integrate .. //depot/projects/mips/sys/i386/include/asc_ioctl.h#2 delete .. //depot/projects/mips/sys/i386/include/dvcfg.h#2 delete .. //depot/projects/mips/sys/i386/include/ioctl_ctx.h#2 delete .. //depot/projects/mips/sys/i386/include/physio_proc.h#3 delete .. //depot/projects/mips/sys/i386/include/wtio.h#2 delete .. //depot/projects/mips/sys/i386/isa/asc.c#6 delete .. //depot/projects/mips/sys/i386/isa/ascreg.h#2 delete .. //depot/projects/mips/sys/i386/isa/ctx.c#7 delete .. //depot/projects/mips/sys/i386/isa/ctxreg.h#2 delete .. //depot/projects/mips/sys/i386/isa/gpib.c#9 delete .. //depot/projects/mips/sys/i386/isa/gpib.h#2 delete .. //depot/projects/mips/sys/i386/isa/gpibreg.h#2 delete .. //depot/projects/mips/sys/i386/isa/wt.c#7 delete .. //depot/projects/mips/sys/i386/isa/wtreg.h#2 delete .. //depot/projects/mips/sys/ia64/ia64/busdma_machdep.c#10 integrate .. //depot/projects/mips/sys/kern/init_sysent.c#14 integrate .. //depot/projects/mips/sys/kern/kern_exec.c#22 integrate .. //depot/projects/mips/sys/kern/kern_exit.c#21 integrate .. //depot/projects/mips/sys/kern/kern_fork.c#24 integrate .. //depot/projects/mips/sys/kern/kern_thread.c#24 integrate .. //depot/projects/mips/sys/kern/subr_param.c#3 integrate .. //depot/projects/mips/sys/kern/subr_trap.c#18 integrate .. //depot/projects/mips/sys/kern/sys_generic.c#9 integrate .. //depot/projects/mips/sys/kern/syscalls.c#14 integrate .. //depot/projects/mips/sys/kern/syscalls.master#17 integrate .. //depot/projects/mips/sys/kern/vfs_aio.c#15 integrate .. //depot/projects/mips/sys/kern/vfs_vnops.c#10 integrate .. //depot/projects/mips/sys/net/if.c#12 integrate .. //depot/projects/mips/sys/net/if_ethersubr.c#17 integrate .. //depot/projects/mips/sys/net/if_fddisubr.c#11 integrate .. //depot/projects/mips/sys/net/if_iso88025subr.c#9 integrate .. //depot/projects/mips/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/mips/sys/net/if_tapvar.h#3 integrate .. //depot/projects/mips/sys/net/if_tun.c#13 integrate .. //depot/projects/mips/sys/net/if_var.h#7 integrate .. //depot/projects/mips/sys/netatalk/aarp.c#8 integrate .. //depot/projects/mips/sys/netinet/if_ether.c#9 integrate .. //depot/projects/mips/sys/netncp/ncp_subr.c#6 integrate .. //depot/projects/mips/sys/nfsclient/nfs.h#5 integrate .. //depot/projects/mips/sys/nfsserver/nfs.h#4 integrate .. //depot/projects/mips/sys/pci/agp_intel.c#7 integrate .. //depot/projects/mips/sys/powerpc/powerpc/busdma_machdep.c#12 integrate .. //depot/projects/mips/sys/rpc/rpcclnt.h#2 integrate .. //depot/projects/mips/sys/sparc64/sparc64/bus_machdep.c#12 integrate .. //depot/projects/mips/sys/sys/eventhandler.h#6 integrate .. //depot/projects/mips/sys/sys/socket.h#9 integrate .. //depot/projects/mips/sys/sys/syscall.h#14 integrate .. //depot/projects/mips/sys/sys/syscall.mk#14 integrate .. //depot/projects/mips/sys/sys/sysproto.h#16 integrate .. //depot/projects/mips/sys/vm/vm_contig.c#10 integrate .. //depot/projects/mips/tools/tools/nanobsd/i386.diskimage#2 integrate .. //depot/projects/mips/usr.bin/Makefile#15 integrate .. //depot/projects/mips/usr.bin/finger/finger.c#4 integrate .. //depot/projects/mips/usr.bin/mkstr/mkstr.c#3 integrate .. //depot/projects/mips/usr.bin/sasc/INSTALL#2 delete .. //depot/projects/mips/usr.bin/sasc/Makefile#2 delete .. //depot/projects/mips/usr.bin/sasc/README#2 delete .. //depot/projects/mips/usr.bin/sasc/sasc.1#2 delete .. //depot/projects/mips/usr.bin/sasc/sasc.c#2 delete .. //depot/projects/mips/usr.bin/tip/tip/vars.c#2 integrate .. //depot/projects/mips/usr.sbin/Makefile#18 integrate .. //depot/projects/mips/usr.sbin/nologin/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/nologin/nologin.c#2 integrate .. //depot/projects/mips/usr.sbin/ntp/doc/ntp.conf.5#4 integrate Differences ... ==== //depot/projects/mips/Makefile.inc1#24 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.415 2004/03/12 13:24:17 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.416 2004/03/13 15:46:34 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -585,6 +585,15 @@ @echo "ERROR: No kernel \"${KERNCONF}\" to install." false .endif + @echo "--------------------------------------------------------------" + @echo ">>> Making hierarchy" + @echo "--------------------------------------------------------------" + cd ${.CURDIR}; \ + ${CROSSENV} PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 hierarchy + @echo + @echo "--------------------------------------------------------------" + @echo ">>> Installing kernel" + @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} ==== //depot/projects/mips/etc/devd.conf#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.11 2004/02/03 04:18:55 njl Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.12 2004/03/13 05:16:42 cperciva Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -31,7 +31,7 @@ # # For ethernet like devices, the default is to run dhclient. Due to -# a historical accident, the name of this script it called pccard_ether +# a historical accident, this script is called pccard_ether. # attach 0 { device-name "$ethernet-nic-regex"; ==== //depot/projects/mips/games/number/number.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)number.c 8.3 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/games/number/number.c,v 1.13 2002/02/18 05:15:16 imp Exp $"; + "$FreeBSD: src/games/number/number.c,v 1.14 2004/03/14 05:28:29 bde Exp $"; #endif /* not lint */ #include @@ -133,7 +133,7 @@ int flen, len, rval; char *p, *fraction; - flen = NULL; + flen = 0; fraction = NULL; for (p = line; *p != '\0' && *p != '\n'; ++p) { if (isblank(*p)) { ==== //depot/projects/mips/lib/libkiconv/xlat16_iconv.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkiconv/xlat16_iconv.c,v 1.2 2003/12/08 08:32:19 fjoe Exp $ + * $FreeBSD: src/lib/libkiconv/xlat16_iconv.c,v 1.3 2004/03/14 05:14:00 bde Exp $ */ /* @@ -146,8 +146,8 @@ xt.data = NULL; xt.size = 0; - src[2] = NULL; - dst[3] = NULL; + src[2] = '\0'; + dst[3] = '\0'; ret = my_iconv_init(); if (ret) ==== //depot/projects/mips/lib/libncp/ncpl_nls.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libncp/ncpl_nls.c,v 1.4 2002/04/20 05:35:02 bp Exp $"); +__FBSDID("$FreeBSD: src/lib/libncp/ncpl_nls.c,v 1.5 2004/03/14 05:19:38 bde Exp $"); /* * Languages support. Currently is very primitive. @@ -228,7 +228,7 @@ {NCP_NLS_SE, NCP_NLS_SE_NAME, {def2lower, def2upper, se_nw2unix, se_unix2nw, 0} }, - {NULL, 0} + {0} }; struct ncp_nlstables ncp_nls; ==== //depot/projects/mips/lib/libpthread/thread/thr_concurrency.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_concurrency.c,v 1.7 2003/08/30 12:09:16 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_concurrency.c,v 1.8 2004/03/14 05:24:27 bde Exp $ */ #include #include @@ -157,7 +157,7 @@ int ret; len = sizeof(vcpu); - ret = sysctlbyname("kern.threads.virtual_cpu", &vcpu, &len, NULL, NULL); + ret = sysctlbyname("kern.threads.virtual_cpu", &vcpu, &len, NULL, 0); if (ret == 0 && vcpu > 0) ret = _thr_setconcurrency(vcpu); return (ret); ==== //depot/projects/mips/libexec/getty/chat.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/libexec/getty/chat.c,v 1.9 2002/12/30 21:18:03 schweikh Exp $"; + "$FreeBSD: src/libexec/getty/chat.c,v 1.10 2004/03/14 05:27:26 bde Exp $"; #endif /* not lint */ #include @@ -355,7 +355,7 @@ /* See if we can resync on a * partial match in our buffer */ - while (j < i && memcmp(got + j, str, i - j) != NULL) + while (j < i && memcmp(got + j, str, i - j) != 0) j++; if (j < i) memcpy(got, got + j, i - j); ==== //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#30 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.686 2004/03/04 17:06:30 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.688 2004/03/13 16:45:05 hrs Exp $ 2000 @@ -144,7 +144,7 @@ has been fixed. This error could allow a process with superuser privileges inside a &man.jail.8; environment to change its root directory to that of a different jail, and thus gain full read - and write acecss to files and directories within the target + and write access to files and directories within the target jail. More information can be found in security advisory FreeBSD-SA-04:03. @@ -195,6 +195,21 @@ The kernel's file descriptor allocation code has been updated, and is now derived from similar code in OpenBSD. + On &os;/sparc64 time_t + has been changed from a 32-bit value to a 64-bit value. + + + Since this change is not backward-compatible, + any programs which are built on the older system using + the 32-bit time_t as well as + call system-routines for handling + time_t values, will have to be recompiled. + More detail information and notice on upgrading from + the source can be found in + /usr/src/UPDATING.64BTT. + + + @@ -232,6 +247,9 @@ driver has been removed due to breakage. Its functionality has been subsumed into the &man.en.4; driver. + A short hiccup in the &man.em.4; during parameter + reconfiguration, has been fixed. &merged; + The lmc (LAN Media Corp. PCI WAN adapter) driver has been removed due to breakage and lack of maintainership. @@ -246,6 +264,9 @@ For more information, see the &man.ndis.4; and &man.ndiscvt.8; manual pages. + The &man.ng.vlan.4; NetGraph node type, which supports + IEEE 802.1Q VLAN tagging has been added. &merged; + Several bugs related to multicast and promiscuous mode handling in the &man.sk.4; driver have been fixed. @@ -295,7 +316,6 @@ for authenticating TCP sessions. &man.setkey.8; now includes support for the TCP-MD5 class of security associations. &merged; - @@ -306,6 +326,8 @@ work better, and some problems with timeouts should be resolved. + The &man.umass.4; driver now supports the missing + ATAPI MMC commands and handles the timeout properly. @@ -339,6 +361,16 @@ if the server requires it; this may eventually become an option to &man.mount.smbfs.8;. + A support for gbde-enabled swap devices has been added. + When gbde_swap_enable is specified + in &man.rc.conf.5;, a swap device named + /dev/foo.bde in &man.fstab.5; + is automatically attached at boot time with the device + /dev/foo and a random key, which + generated by computing the MD5 checksum of 512 bytes read + from /dev/random. + Note that this prevents recovery of kernel dumps. + @@ -412,11 +444,18 @@ + &man.mountd.8; now supports the option, + which allows users to specify a known port for use + in firewall rulesets. + &man.newfs.8; and &man.mdmfs.8; now support a flag to enable them to set the MAC multilabel flag on new filesystems without requiring the use of &man.tunefs.8;. + &man.nologin.8; now support reporting login attempts via + &man.syslogd.8;. + A bugfix has been applied to NSS support, which fixes problems when using third-party NSS modules (such as net/nss_ldap) and groups with large @@ -507,6 +546,31 @@ + pf, OpenBSD's packet filter as of + OpenBSD 3.4 has been imported into &os; source tree and installed + by default. A new user proxy, and two new + groups authpf and proxy, + which pf needs are added as well. + + + On upgrading from the source, these user accounts must be + added in advance. And, the NO_PF variable + in make.conf can be used to prevent + pf from building. + + + Several userland utilities of OpenBSD's + pf have been imported. + libexec/ftp-proxy is an ftp proxy for + pf, + sbin/pfctl is an equivalent to + sbin/ipf, + sbin/pflogd + is a daemon logging packets via if_pflog + in pcap format, and + usr.sbin/authpf is an authentication shell + to modify pf rulesets. + routed has been updated from release 2.22 to release 2.27 from rhyolite.com. Note that for users relying on RIP's MD5 authentication feature, @@ -522,8 +586,14 @@ Ports/Packages Collection Infrastructure - - + The SIZE attribute for distfiles + which can be used for checking file size before fetching, + has been added and enabled by default. + DISABLE_SIZE is a user control knob + to disable the distfile size checking. This is especially + useful on old &os; versions which didn't have &man.fetch.1; + support for this, and for some FTP proxies which always + report incorrect or bogus size. ==== //depot/projects/mips/sbin/Makefile#15 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.135 2004/03/08 22:03:28 mlaier Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.136 2004/03/13 11:02:37 cperciva Exp $ # XXX MISSING: icheck ncheck @@ -68,7 +68,6 @@ newfs \ newfs_msdos \ nfsiod \ - nologin \ nos-tun \ ${_pfctl} \ ${_pflogd} \ ==== //depot/projects/mips/share/man/man4/man4.i386/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.158 2004/03/03 13:26:18 rik Exp $ +# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.160 2004/03/14 05:01:04 imp Exp $ MAN= acpi_toshiba.4 \ aic.4 \ @@ -6,7 +6,6 @@ amdpm.4 \ apm.4 \ ar.4 \ - asc.4 \ CPU_ELAN.4 \ cs.4 \ ct.4 \ @@ -45,8 +44,7 @@ vpd.4 \ vx.4 \ wd.4 \ - wl.4 \ - wt.4 + wl.4 MLINKS= CPU_ELAN.4 CPU_SOEKRIS.4 MLINKS+=ct.4 ctau.4 ==== //depot/projects/mips/share/man/man4/uscanner.4#8 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uscanner.4,v 1.12 2004/02/20 09:54:32 wilko Exp $ +.\" $FreeBSD: src/share/man/man4/uscanner.4,v 1.13 2004/03/13 13:54:07 simon Exp $ .\" .Dd October 26, 2000 .Dt USCANNER 4 @@ -79,6 +79,7 @@ .It Epson Perfection 1640SU .It Epson Perfection 1650 .It Epson Perfection 1660 +.It Epson Perfection 1670 .It Epson Perfection 3200 .It Epson GT-9300UF .It Epson GT-9700F ==== //depot/projects/mips/share/mk/bsd.cpu.mk#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.34 2004/03/12 21:36:12 trhodes Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.35 2004/03/14 01:29:05 trhodes Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -44,7 +44,7 @@ . if ${MACHINE_ARCH} == "i386" . if ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \ - ${CPUTYPE} == "athlon-4" || ${CPUTYPE} == "athlon-tbird" + ${CPUTYPE} == "athlon-4" _ICC_CPUCFLAGS = -tpp6 -xiMK _CPUCFLAGS = -march=${CPUTYPE} . elif ${CPUTYPE} == "athlon-tbird" || ${CPUTYPE} == "athlon" ==== //depot/projects/mips/share/mk/bsd.lib.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.157 2004/03/12 21:36:12 trhodes Exp $ +# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.158 2004/03/14 01:29:05 trhodes Exp $ # .include @@ -54,9 +54,6 @@ PO_FLAG=-pg .endif -.c.o: - ${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} - .c.po: ${CC} ${PO_FLAG} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} @@ -166,7 +163,7 @@ ${LINT} ${LINTLIBFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC} .endif -.endif #!defined(INTERNALLIB) +.endif !defined(INTERNALLIB) all: ${_LIBS} ==== //depot/projects/mips/sys/alpha/alpha/busdma_machdep.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.43 2003/07/27 13:52:09 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.44 2004/03/13 15:42:59 scottl Exp $"); #include #include @@ -458,9 +458,7 @@ if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) free(vaddr, M_DEVBUF); else { - mtx_lock(&Giant); contigfree(vaddr, dmat->maxsize, M_DEVBUF); - mtx_unlock(&Giant); } } ==== //depot/projects/mips/sys/amd64/amd64/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.54 2003/09/22 23:11:42 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.55 2004/03/13 15:42:59 scottl Exp $"); #include #include @@ -453,9 +453,7 @@ && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) free(vaddr, M_DEVBUF); else { - mtx_lock(&Giant); contigfree(vaddr, dmat->maxsize, M_DEVBUF); - mtx_unlock(&Giant); } } ==== //depot/projects/mips/sys/amd64/amd64/trap.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.274 2004/03/11 00:17:45 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.275 2004/03/13 19:15:43 peter Exp $"); /* * AMD64 Trap and System call handling @@ -754,13 +754,6 @@ ktrsyscall(code, narg, argp); #endif - /* - * Try to run the syscall without Giant if the syscall - * is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); - if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = frame.tf_rdx; @@ -769,7 +762,12 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - error = (*callp->sy_call)(td, argp); + if ((callp->sy_narg & SYF_MPSAFE) == 0) { + mtx_lock(&Giant); + error = (*callp->sy_call)(td, argp); + mtx_unlock(&Giant); + } else + error = (*callp->sy_call)(td, argp); } switch (error) { @@ -807,12 +805,6 @@ } /* - * Release Giant if we previously set it. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Traced syscall. */ if (orig_tf_rflags & PSL_T) { ==== //depot/projects/mips/sys/amd64/conf/NOTES#3 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.10 2004/03/05 08:04:10 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.12 2004/03/13 22:16:34 peter Exp $ # # We don't have modules on amd64. @@ -17,7 +17,7 @@ machine amd64 # -# We want LINT to cover profiling as well +# We want LINT to cover profiling as well. #XXX#profile 2 @@ -231,17 +231,17 @@ # Network interfaces: # +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) +# (requires miibus) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) -#XXX# Needs to be busdma'ed. +#XXX# still calls MD i386 kvtop function instead of vtophys etc #XXX#device ed #XXX#device lnc -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) - #XXX#device ath #XXX#device ath_hal # Atheros HAL (includes binary component) device wlan # 802.11 layer @@ -477,7 +477,7 @@ # (whether static or dynamic). # #XXX#options COMPAT_SVR4 # build emulator statically -options DEBUG_SVR4 # enable verbose debugging +#XXX#options DEBUG_SVR4 # enable verbose debugging #XXX#device streams # STREAMS network driver (required for svr4). ==== //depot/projects/mips/sys/amd64/include/pci_cfgreg.h#3 (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/sys/amd64/include/pci_cfgreg.h,v 1.11 2003/09/22 22:21:21 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.12 2004/03/13 19:19:13 peter Exp $ * */ @@ -45,4 +45,3 @@ int pci_cfgregopen(void); u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); -int pci_cfgintr(int bus, int device, int pin, int oldirq); ==== //depot/projects/mips/sys/amd64/pci/pci_bus.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.106 2003/12/06 23:19:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.107 2004/03/13 19:21:35 peter Exp $"); #include "opt_cpu.h" @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -42,9 +41,6 @@ #include #include #include -#include -#include -#include #include "pcib_if.h" @@ -88,210 +84,10 @@ u_int8_t *busnum) { const char *s = NULL; - static u_int8_t pxb[4]; /* hack for 450nx */ *busnum = 0; - - switch (id) { - case 0x12258086: - s = "Intel 824?? host to PCI bridge"; - /* XXX This is a guess */ - /* *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x41, 1); */ - *busnum = bus; - break; - case 0x71208086: - s = "Intel 82810 (i810 GMCH) Host To Hub bridge"; - break; - case 0x71228086: - s = "Intel 82810-DC100 (i810-DC100 GMCH) Host To Hub bridge"; - break; - case 0x71248086: - s = "Intel 82810E (i810E GMCH) Host To Hub bridge"; - break; - case 0x11308086: - s = "Intel 82815 (i815 GMCH) Host To Hub bridge"; - break; - case 0x71808086: - s = "Intel 82443LX (440 LX) host to PCI bridge"; - break; - case 0x71908086: - s = "Intel 82443BX (440 BX) host to PCI bridge"; - break; - case 0x71928086: - s = "Intel 82443BX host to PCI bridge (AGP disabled)"; - break; - case 0x71948086: - s = "Intel 82443MX host to PCI bridge"; - break; - case 0x71a08086: - s = "Intel 82443GX host to PCI bridge"; - break; - case 0x71a18086: - s = "Intel 82443GX host to AGP bridge"; - break; - case 0x71a28086: - s = "Intel 82443GX host to PCI bridge (AGP disabled)"; - break; - case 0x84c48086: - s = "Intel 82454KX/GX (Orion) host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x4a, 1); - break; - case 0x84ca8086: - /* - * For the 450nx chipset, there is a whole bundle of - * things pretending to be host bridges. The MIOC will - * be seen first and isn't really a pci bridge (the - * actual busses are attached to the PXB's). We need to - * read the registers of the MIOC to figure out the - * bus numbers for the PXB channels. - * - * Since the MIOC doesn't have a pci bus attached, we - * pretend it wasn't there. - */ - pxb[0] = legacy_pcib_read_config(0, bus, slot, func, - 0xd0, 1); /* BUSNO[0] */ - pxb[1] = legacy_pcib_read_config(0, bus, slot, func, - 0xd1, 1) + 1; /* SUBA[0]+1 */ - pxb[2] = legacy_pcib_read_config(0, bus, slot, func, - 0xd3, 1); /* BUSNO[1] */ - pxb[3] = legacy_pcib_read_config(0, bus, slot, func, - 0xd4, 1) + 1; /* SUBA[1]+1 */ - return NULL; - case 0x84cb8086: - switch (slot) { - case 0x12: - s = "Intel 82454NX PXB#0, Bus#A"; - *busnum = pxb[0]; - break; - case 0x13: - s = "Intel 82454NX PXB#0, Bus#B"; - *busnum = pxb[1]; - break; - case 0x14: - s = "Intel 82454NX PXB#1, Bus#A"; - *busnum = pxb[2]; - break; - case 0x15: - s = "Intel 82454NX PXB#1, Bus#B"; - *busnum = pxb[3]; - break; - } - break; - - /* AMD -- vendor 0x1022 */ - case 0x30001022: - s = "AMD Elan SC520 host to PCI bridge"; -#ifdef CPU_ELAN - init_AMD_Elan_sc520(); -#else - printf( -"*** WARNING: missing CPU_ELAN -- timekeeping may be wrong\n"); -#endif - break; - case 0x70061022: - s = "AMD-751 host to PCI bridge"; - break; - case 0x700e1022: - s = "AMD-761 host to PCI bridge"; - break; - - /* SiS -- vendor 0x1039 */ - case 0x04961039: - s = "SiS 85c496"; - break; - case 0x04061039: - s = "SiS 85c501"; - break; - case 0x06011039: - s = "SiS 85c601"; - break; - case 0x55911039: - s = "SiS 5591 host to PCI bridge"; - break; - case 0x00011039: - s = "SiS 5591 host to AGP bridge"; - break; - - /* VLSI -- vendor 0x1004 */ - case 0x00051004: - s = "VLSI 82C592 Host to PCI bridge"; - break; - - /* XXX Here is MVP3, I got the datasheet but NO M/B to test it */ - /* totally. Please let me know if anything wrong. -F */ - /* XXX need info on the MVP3 -- any takers? */ - case 0x05981106: - s = "VIA 82C598MVP (Apollo MVP3) host bridge"; - break; - - /* AcerLabs -- vendor 0x10b9 */ - /* Funny : The datasheet told me vendor id is "10b8",sub-vendor */ - /* id is '10b9" but the register always shows "10b9". -Foxfair */ - case 0x154110b9: - s = "AcerLabs M1541 (Aladdin-V) PCI host bridge"; - break; - - /* OPTi -- vendor 0x1045 */ - case 0xc7011045: - s = "OPTi 82C700 host to PCI bridge"; - break; - case 0xc8221045: - s = "OPTi 82C822 host to PCI Bridge"; - break; - - /* ServerWorks -- vendor 0x1166 */ - case 0x00051166: - s = "ServerWorks NB6536 2.0HE host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00061166: - /* FALLTHROUGH */ - case 0x00081166: - /* FALLTHROUGH */ - case 0x02011166: - /* FALLTHROUGH */ - case 0x010f1014: /* IBM re-badged ServerWorks chipset */ - s = "ServerWorks host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00091166: - s = "ServerWorks NB6635 3.0LE host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00101166: - s = "ServerWorks CIOB30 host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00111166: - /* FALLTHROUGH */ - case 0x03021014: /* IBM re-badged ServerWorks chipset */ - s = "ServerWorks CMIC-HE host to PCI-X bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - /* XXX unknown chipset, but working */ - case 0x00171166: - /* FALLTHROUGH */ - case 0x01011166: - s = "ServerWorks host to PCI bridge(unknown chipset)"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - /* Integrated Micro Solutions -- vendor 0x10e0 */ - case 0x884910e0: - s = "Integrated Micro Solutions VL Bridge"; - break; - - default: - if (class == PCIC_BRIDGE && subclass == PCIS_BRIDGE_HOST) - s = "Host to PCI bridge"; - break; - } - + if (class == PCIC_BRIDGE && subclass == PCIS_BRIDGE_HOST) + s = "Host to PCI bridge"; return s; } @@ -432,9 +228,10 @@ int legacy_pcib_attach(device_t dev) { + int bus; - device_add_child(dev, "pci", pcib_get_bus(dev)); - + bus = pcib_get_bus(dev); + device_add_child(dev, "pci", bus); return bus_generic_attach(dev); } ==== //depot/projects/mips/sys/amd64/pci/pci_cfgreg.c#5 (text+ko) ==== @@ -27,26 +27,17 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.105 2004/01/28 20:46:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.106 2004/03/13 19:19:13 peter Exp $"); -#include /* XXX trim includes */ +#include #include #include -#include -#include -#include #include #include -#include -#include -#include #include #include -#include #include -#include "pcib_if.h" - static int cfgmech; >>> TRUNCATED FOR MAIL (1000 lines) <<<