From owner-p4-projects@FreeBSD.ORG Sun Nov 5 00:02:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD6A916A47C; Sun, 5 Nov 2006 00:02:24 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 880B316A49E for ; Sun, 5 Nov 2006 00:02:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D90F43D49 for ; Sun, 5 Nov 2006 00:02:24 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA502OBE081044 for ; Sun, 5 Nov 2006 00:02:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA502CiN081034 for perforce@freebsd.org; Sun, 5 Nov 2006 00:02:12 GMT (envelope-from sam@freebsd.org) Date: Sun, 5 Nov 2006 00:02:12 GMT Message-Id: <200611050002.kA502CiN081034@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109248 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 00:02:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=109248 Change 109248 by sam@sam_ebb on 2006/11/05 00:01:41 IFC @ 109247 Approved by: cognet Affected files ... .. //depot/projects/arm/src/Makefile#7 integrate .. //depot/projects/arm/src/ObsoleteFiles.inc#9 integrate .. //depot/projects/arm/src/UPDATING#6 integrate .. //depot/projects/arm/src/bin/cp/cp.1#5 integrate .. //depot/projects/arm/src/bin/rm/rm.1#2 integrate .. //depot/projects/arm/src/bin/rm/rm.c#3 integrate .. //depot/projects/arm/src/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/arm/src/contrib/bsnmp/snmpd/action.c#2 integrate .. //depot/projects/arm/src/contrib/bsnmp/snmpd/tree.def#2 integrate .. //depot/projects/arm/src/contrib/gcc/function.c#2 integrate .. //depot/projects/arm/src/contrib/pf/man/pf.conf.5#2 integrate .. //depot/projects/arm/src/etc/defaults/rc.conf#8 integrate .. //depot/projects/arm/src/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/arm/src/etc/network.subr#5 integrate .. //depot/projects/arm/src/etc/rc.d/ppp#2 integrate .. //depot/projects/arm/src/etc/rc.firewall#2 integrate .. //depot/projects/arm/src/etc/snmpd.config#2 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/arm/src/gnu/usr.bin/send-pr/send-pr.sh#2 integrate .. //depot/projects/arm/src/include/Makefile#5 integrate .. //depot/projects/arm/src/lib/libc/gmon/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libc/net/inet.3#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/sys/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/sys/__sparc_utrap_gen.S#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getpid.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/statfs.2#2 integrate .. //depot/projects/arm/src/lib/libcam/camlib.c#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/arm/src/lib/libtacplus/libtacplus.3#2 integrate .. //depot/projects/arm/src/lib/libufs/Makefile#2 integrate .. //depot/projects/arm/src/lib/libufs/cgread.3#2 integrate .. //depot/projects/arm/src/lib/libufs/cgroup.c#2 integrate .. //depot/projects/arm/src/lib/libufs/libufs.3#2 integrate .. //depot/projects/arm/src/lib/libufs/libufs.h#2 integrate .. //depot/projects/arm/src/sbin/camcontrol/camcontrol.c#3 integrate .. //depot/projects/arm/src/sbin/dumpfs/dumpfs.c#2 integrate .. //depot/projects/arm/src/sbin/dumpon/dumpon.c#2 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/Makefile#2 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/fsck.h#2 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/fsutil.c#2 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/gjournal.c#1 branch .. //depot/projects/arm/src/sbin/fsck_ffs/inode.c#2 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/pass5.c#2 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/setup.c#2 integrate .. //depot/projects/arm/src/sbin/fsdb/fsdb.c#3 integrate .. //depot/projects/arm/src/sbin/fsdb/fsdb.h#2 integrate .. //depot/projects/arm/src/sbin/geom/class/Makefile#3 integrate .. //depot/projects/arm/src/sbin/geom/class/cache/geom_cache.c#2 integrate .. //depot/projects/arm/src/sbin/geom/class/journal/Makefile#1 branch .. //depot/projects/arm/src/sbin/geom/class/journal/geom_journal.c#1 branch .. //depot/projects/arm/src/sbin/geom/class/journal/geom_journal.h#1 branch .. //depot/projects/arm/src/sbin/geom/class/journal/geom_journal_ufs.c#1 branch .. //depot/projects/arm/src/sbin/geom/class/mirror/geom_mirror.c#4 integrate .. //depot/projects/arm/src/sbin/geom/class/mirror/gmirror.8#3 integrate .. //depot/projects/arm/src/sbin/geom/class/raid3/geom_raid3.c#4 integrate .. //depot/projects/arm/src/sbin/geom/class/raid3/graid3.8#2 integrate .. //depot/projects/arm/src/sbin/ggate/shared/ggate.c#2 integrate .. //depot/projects/arm/src/sbin/growfs/debug.c#2 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifbridge.c#2 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#6 integrate .. //depot/projects/arm/src/sbin/mdmfs/mdmfs.8#4 integrate .. //depot/projects/arm/src/sbin/mdmfs/mdmfs.c#2 integrate .. //depot/projects/arm/src/sbin/mount/mount.c#3 integrate .. //depot/projects/arm/src/sbin/newfs/mkfs.c#3 integrate .. //depot/projects/arm/src/sbin/newfs/newfs.8#2 integrate .. //depot/projects/arm/src/sbin/newfs/newfs.c#2 integrate .. //depot/projects/arm/src/sbin/newfs/newfs.h#2 integrate .. //depot/projects/arm/src/sbin/tunefs/tunefs.8#2 integrate .. //depot/projects/arm/src/sbin/tunefs/tunefs.c#2 integrate .. //depot/projects/arm/src/share/man/man3/pthread_create.3#3 integrate .. //depot/projects/arm/src/share/man/man4/aac.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ddb.4#5 integrate .. //depot/projects/arm/src/share/man/man4/fdc.4#2 integrate .. //depot/projects/arm/src/share/man/man4/man4.i386/acpi_sony.4#2 integrate .. //depot/projects/arm/src/share/man/man4/sis.4#4 integrate .. //depot/projects/arm/src/share/man/man5/elf.5#2 integrate .. //depot/projects/arm/src/share/man/man5/fs.5#2 integrate .. //depot/projects/arm/src/share/man/man9/disk.9#2 integrate .. //depot/projects/arm/src/share/man/man9/g_bio.9#2 integrate .. //depot/projects/arm/src/share/man/man9/kobj.9#2 integrate .. //depot/projects/arm/src/share/misc/bsd-family-tree#4 integrate .. //depot/projects/arm/src/share/misc/usb_hid_usages#2 integrate .. //depot/projects/arm/src/share/mk/bsd.lib.mk#5 integrate .. //depot/projects/arm/src/share/mk/bsd.own.mk#5 integrate .. //depot/projects/arm/src/share/snmp/mibs/FREEBSD-MIB.txt#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#15 integrate .. //depot/projects/arm/src/sys/amd64/amd64/prof_machdep.c#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/trap.c#13 integrate .. //depot/projects/arm/src/sys/amd64/conf/DEFAULTS#6 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#16 integrate .. //depot/projects/arm/src/sys/amd64/include/asmacros.h#4 integrate .. //depot/projects/arm/src/sys/amd64/include/profile.h#4 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux.h#6 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_dummy.c#6 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#15 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#15 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#15 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#11 integrate .. //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#15 integrate .. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#14 integrate .. //depot/projects/arm/src/sys/arm/arm/genassym.c#4 integrate .. //depot/projects/arm/src/sys/arm/arm/nexus.c#4 integrate .. //depot/projects/arm/src/sys/arm/arm/trap.c#13 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_sscreg.h#8 integrate .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#62 integrate .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#38 integrate .. //depot/projects/arm/src/sys/arm/at91/std.at91#4 integrate .. //depot/projects/arm/src/sys/arm/at91/std.kb920x#6 integrate .. //depot/projects/arm/src/sys/arm/conf/EP80219#2 integrate .. //depot/projects/arm/src/sys/arm/conf/IQ31244#5 integrate .. //depot/projects/arm/src/sys/arm/conf/KB920X#40 integrate .. //depot/projects/arm/src/sys/arm/conf/SIMICS#5 integrate .. //depot/projects/arm/src/sys/arm/conf/SKYEYE#7 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/assabet_machdep.c#7 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/iq31244_machdep.c#12 integrate .. //depot/projects/arm/src/sys/boot/common/Makefile.inc#3 integrate .. //depot/projects/arm/src/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/arm/src/sys/boot/common/devopen.c#2 integrate .. //depot/projects/arm/src/sys/boot/common/load_elf.c#4 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efi.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efi_nii.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efiapi.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/eficon.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efidebug.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efidef.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efidevp.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efierr.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efifs.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efinet.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efipart.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efiprot.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efipxebc.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efiser.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efistdarg.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/i386/efibind.h#3 integrate .. //depot/projects/arm/src/sys/boot/efi/include/i386/pe.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/ia64/efibind.h#4 integrate .. //depot/projects/arm/src/sys/boot/efi/include/ia64/pe.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/libefi/devicename.c#2 integrate .. //depot/projects/arm/src/sys/boot/efi/libefi/efiboot.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/libefi/efifs.c#2 integrate .. //depot/projects/arm/src/sys/boot/efi/libefi/libefi.c#2 integrate .. //depot/projects/arm/src/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/bioscd.c#3 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/bootinfo32.c#2 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/devicename.c#3 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/elf64_freebsd.c#3 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/libi386.h#7 integrate .. //depot/projects/arm/src/sys/boot/i386/loader/Makefile#4 integrate .. //depot/projects/arm/src/sys/boot/i386/loader/main.c#6 integrate .. //depot/projects/arm/src/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/arm/src/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/arm/src/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/arm/src/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/arm/src/sys/boot/ia64/efi/main.c#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/ski/devicename.c#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/ski/libski.h#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/ski/main.c#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/common/main.c#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/libofw.h#3 integrate .. //depot/projects/arm/src/sys/boot/pc98/boot2/boot.c#3 integrate .. //depot/projects/arm/src/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/libpc98/biosdisk.c#4 integrate .. //depot/projects/arm/src/sys/boot/pc98/loader/Makefile#4 integrate .. //depot/projects/arm/src/sys/boot/pc98/loader/main.c#5 integrate .. //depot/projects/arm/src/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/arm/src/sys/cam/cam_ccb.h#5 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.c#10 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_all.h#4 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#13 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_low.c#3 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#19 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#19 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#19 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#19 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#20 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_aio.c#2 delete .. //depot/projects/arm/src/sys/compat/linux/linux_aio.h#2 delete .. //depot/projects/arm/src/sys/compat/linux/linux_emul.c#6 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_emul.h#3 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#16 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.h#1 branch .. //depot/projects/arm/src/sys/conf/NOTES#36 integrate .. //depot/projects/arm/src/sys/conf/files#51 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#19 integrate .. //depot/projects/arm/src/sys/conf/files.i386#21 integrate .. //depot/projects/arm/src/sys/conf/files.pc98#12 integrate .. //depot/projects/arm/src/sys/conf/files.sparc64#8 integrate .. //depot/projects/arm/src/sys/conf/kern.post.mk#13 integrate .. //depot/projects/arm/src/sys/conf/kern.pre.mk#8 integrate .. //depot/projects/arm/src/sys/conf/options#32 integrate .. //depot/projects/arm/src/sys/conf/options.sparc64#3 integrate .. //depot/projects/arm/src/sys/ddb/db_command.c#8 integrate .. //depot/projects/arm/src/sys/ddb/db_ps.c#5 integrate .. //depot/projects/arm/src/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/arm/src/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_aiboost.c#1 branch .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_sony.c#4 integrate .. //depot/projects/arm/src/sys/dev/advansys/advansys.c#4 integrate .. //depot/projects/arm/src/sys/dev/advansys/advlib.c#4 integrate .. //depot/projects/arm/src/sys/dev/advansys/adwcam.c#4 integrate .. //depot/projects/arm/src/sys/dev/aha/aha.c#3 integrate .. //depot/projects/arm/src/sys/dev/ahb/ahb.c#4 integrate .. //depot/projects/arm/src/sys/dev/aic/aic.c#3 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx_osm.h#5 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx_osm.c#5 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx_osm.h#5 integrate .. //depot/projects/arm/src/sys/dev/amd/amd.c#4 integrate .. //depot/projects/arm/src/sys/dev/amr/amr.c#12 integrate .. //depot/projects/arm/src/sys/dev/amr/amr_cam.c#4 integrate .. //depot/projects/arm/src/sys/dev/amr/amr_disk.c#4 integrate .. //depot/projects/arm/src/sys/dev/arcmsr/arcmsr.c#5 integrate .. //depot/projects/arm/src/sys/dev/asr/asr.c#9 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-disk.c#10 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.c#13 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/arm/src/sys/dev/atkbdc/atkbd.c#4 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bce.c#10 integrate .. //depot/projects/arm/src/sys/dev/buslogic/bt.c#3 integrate .. //depot/projects/arm/src/sys/dev/ciss/ciss.c#9 integrate .. //depot/projects/arm/src/sys/dev/dc/if_dc.c#10 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_scsi.c#5 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#31 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.h#12 integrate .. //depot/projects/arm/src/sys/dev/em/if_em_hw.c#9 integrate .. //depot/projects/arm/src/sys/dev/em/if_em_hw.h#8 integrate .. //depot/projects/arm/src/sys/dev/em/if_em_osdep.h#6 integrate .. //depot/projects/arm/src/sys/dev/esp/ncr53c9x.c#5 integrate .. //depot/projects/arm/src/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/arm/src/sys/dev/iir/iir.c#5 integrate .. //depot/projects/arm/src/sys/dev/isp/isp.c#12 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#16 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.h#13 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_library.c#6 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_library.h#3 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#15 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_sbus.c#9 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_stds.h#1 branch .. //depot/projects/arm/src/sys/dev/isp/isp_target.c#8 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_target.h#6 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_tpublic.h#7 integrate .. //depot/projects/arm/src/sys/dev/isp/ispmbox.h#7 integrate .. //depot/projects/arm/src/sys/dev/isp/ispreg.h#5 integrate .. //depot/projects/arm/src/sys/dev/isp/ispvar.h#11 integrate .. //depot/projects/arm/src/sys/dev/ispfw/asm_2300.h#3 integrate .. //depot/projects/arm/src/sys/dev/md/md.c#7 integrate .. //depot/projects/arm/src/sys/dev/mly/mly.c#4 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#25 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_raid.c#9 integrate .. //depot/projects/arm/src/sys/dev/pci/pci.c#15 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/pci/pcivar.h#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#11 integrate .. //depot/projects/arm/src/sys/dev/sym/sym_hipd.c#7 integrate .. //depot/projects/arm/src/sys/dev/trm/trm.c#5 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_kbd_sun.c#5 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_kbd_sun.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/ukbd.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/umass.c#13 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#21 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_status.c#4 integrate .. //depot/projects/arm/src/sys/geom/concat/g_concat.c#6 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli.c#14 integrate .. //depot/projects/arm/src/sys/geom/geom.h#7 integrate .. //depot/projects/arm/src/sys/geom/geom_disk.c#5 integrate .. //depot/projects/arm/src/sys/geom/geom_disk.h#4 integrate .. //depot/projects/arm/src/sys/geom/geom_gpt.c#9 integrate .. //depot/projects/arm/src/sys/geom/geom_io.c#6 integrate .. //depot/projects/arm/src/sys/geom/geom_slice.c#5 integrate .. //depot/projects/arm/src/sys/geom/journal/g_journal.c#1 branch .. //depot/projects/arm/src/sys/geom/journal/g_journal.h#1 branch .. //depot/projects/arm/src/sys/geom/journal/g_journal_ufs.c#1 branch .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#19 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.h#9 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror_ctl.c#8 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#24 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.h#9 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3_ctl.c#9 integrate .. //depot/projects/arm/src/sys/geom/shsec/g_shsec.c#5 integrate .. //depot/projects/arm/src/sys/geom/stripe/g_stripe.c#5 integrate .. //depot/projects/arm/src/sys/i386/conf/DEFAULTS#6 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#16 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#21 integrate .. //depot/projects/arm/src/sys/i386/i386/genassym.c#5 integrate .. //depot/projects/arm/src/sys/i386/i386/machdep.c#19 integrate .. //depot/projects/arm/src/sys/i386/i386/trap.c#10 integrate .. //depot/projects/arm/src/sys/i386/include/asmacros.h#3 integrate .. //depot/projects/arm/src/sys/i386/include/profile.h#3 integrate .. //depot/projects/arm/src/sys/i386/isa/prof_machdep.c#4 integrate .. //depot/projects/arm/src/sys/i386/linux/linux.h#7 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_dummy.c#7 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#18 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#18 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#18 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.master#18 integrate .. //depot/projects/arm/src/sys/ia64/conf/DEFAULTS#6 integrate .. //depot/projects/arm/src/sys/ia64/conf/GENERIC#11 integrate .. //depot/projects/arm/src/sys/ia64/ia64/genassym.c#3 integrate .. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/arm/src/sys/ia64/ia64/trap.c#8 integrate .. //depot/projects/arm/src/sys/kern/init_main.c#10 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#19 integrate .. //depot/projects/arm/src/sys/kern/kern_clock.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#19 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#12 integrate .. //depot/projects/arm/src/sys/kern/kern_idle.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_intr.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_kse.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_malloc.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_poll.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_proc.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_resource.c#10 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#16 integrate .. //depot/projects/arm/src/sys/kern/kern_subr.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_switch.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#12 integrate .. //depot/projects/arm/src/sys/kern/kern_thr.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_thread.c#12 integrate .. //depot/projects/arm/src/sys/kern/kern_umtx.c#12 integrate .. //depot/projects/arm/src/sys/kern/sched_4bsd.c#10 integrate .. //depot/projects/arm/src/sys/kern/sched_ule.c#10 integrate .. //depot/projects/arm/src/sys/kern/subr_disk.c#5 integrate .. //depot/projects/arm/src/sys/kern/subr_prf.c#7 integrate .. //depot/projects/arm/src/sys/kern/subr_trap.c#7 integrate .. //depot/projects/arm/src/sys/kern/sys_process.c#9 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#19 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#22 integrate .. //depot/projects/arm/src/sys/kern/systrace_args.c#7 integrate .. //depot/projects/arm/src/sys/kern/tty.c#9 integrate .. //depot/projects/arm/src/sys/kern/tty_cons.c#5 integrate .. //depot/projects/arm/src/sys/kern/tty_pts.c#6 integrate .. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#15 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#26 integrate .. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#17 integrate .. //depot/projects/arm/src/sys/kern/vfs_bio.c#14 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#27 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#21 integrate .. //depot/projects/arm/src/sys/modules/acpi/Makefile#5 integrate .. //depot/projects/arm/src/sys/modules/acpi/acpi_aiboost/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/ath_rate_amrr/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/bge/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/geom/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/geom/geom_journal/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/linux/Makefile#8 integrate .. //depot/projects/arm/src/sys/modules/nfe/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/powermac_nvram/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/ufs/Makefile#3 integrate .. //depot/projects/arm/src/sys/net/bridgestp.c#10 integrate .. //depot/projects/arm/src/sys/net/bridgestp.h#4 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#25 integrate .. //depot/projects/arm/src/sys/net/if_bridgevar.h#9 integrate .. //depot/projects/arm/src/sys/net/if_tap.c#8 integrate .. //depot/projects/arm/src/sys/net/if_tun.c#7 integrate .. //depot/projects/arm/src/sys/net/ppp_tty.c#3 integrate .. //depot/projects/arm/src/sys/net/rtsock.c#8 integrate .. //depot/projects/arm/src/sys/netgraph/ng_device.c#4 integrate .. //depot/projects/arm/src/sys/netinet/in_proto.c#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_dummynet.c#9 integrate .. //depot/projects/arm/src/sys/netinet/sctp.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_asconf.c#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_asconf.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_auth.c#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_auth.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.c#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_constants.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_crc32.c#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_crc32.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_header.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_indata.c#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_indata.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_input.c#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_input.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_lock_bsd.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_os.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_os_bsd.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_output.c#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_output.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_pcb.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_peeloff.c#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_peeloff.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_structs.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_timer.c#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_timer.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_uio.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#1 branch .. //depot/projects/arm/src/sys/netinet/sctp_var.h#1 branch .. //depot/projects/arm/src/sys/netinet/sctputil.c#1 branch .. //depot/projects/arm/src/sys/netinet/sctputil.h#1 branch .. //depot/projects/arm/src/sys/netinet6/in6_proto.c#6 integrate .. //depot/projects/arm/src/sys/netinet6/sctp6_usrreq.c#1 branch .. //depot/projects/arm/src/sys/netinet6/sctp6_var.h#1 branch .. //depot/projects/arm/src/sys/nfsclient/nfs_socket.c#14 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#9 integrate .. //depot/projects/arm/src/sys/pc98/conf/DEFAULTS#6 integrate .. //depot/projects/arm/src/sys/pc98/conf/GENERIC#10 integrate .. //depot/projects/arm/src/sys/pc98/pc98/machdep.c#10 integrate .. //depot/projects/arm/src/sys/pci/if_sis.c#6 integrate .. //depot/projects/arm/src/sys/pci/ncr.c#5 integrate .. //depot/projects/arm/src/sys/posix4/ksched.c#6 integrate .. //depot/projects/arm/src/sys/powerpc/conf/DEFAULTS#4 integrate .. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#12 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/machdep.c#9 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/trap.c#7 integrate .. //depot/projects/arm/src/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/conf/DEFAULTS#5 integrate .. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#19 integrate .. //depot/projects/arm/src/sys/sparc64/conf/NOTES#10 integrate .. //depot/projects/arm/src/sys/sparc64/include/endian.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/genassym.c#5 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/machdep.c#6 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/trap.c#9 integrate .. //depot/projects/arm/src/sys/sun4v/conf/DEFAULTS#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/elf.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/endian.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/hypervisor_api.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/hypervisorvar.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/utrap.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/exception.S#3 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/hcall.S#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/wbuf.S#2 integrate .. //depot/projects/arm/src/sys/sys/bio.h#5 integrate .. //depot/projects/arm/src/sys/sys/cons.h#3 integrate .. //depot/projects/arm/src/sys/sys/libkern.h#5 integrate .. //depot/projects/arm/src/sys/sys/mac_policy.h#9 integrate .. //depot/projects/arm/src/sys/sys/mbuf.h#15 integrate .. //depot/projects/arm/src/sys/sys/mount.h#14 integrate .. //depot/projects/arm/src/sys/sys/param.h#19 integrate .. //depot/projects/arm/src/sys/sys/pcpu.h#4 integrate .. //depot/projects/arm/src/sys/sys/proc.h#16 integrate .. //depot/projects/arm/src/sys/sys/rtprio.h#3 integrate .. //depot/projects/arm/src/sys/sys/sched.h#6 integrate .. //depot/projects/arm/src/sys/sys/socket.h#5 integrate .. //depot/projects/arm/src/sys/sys/soundcard.h#4 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#19 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#19 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#20 integrate .. //depot/projects/arm/src/sys/sys/vnode.h#12 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_extern.h#5 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#13 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#18 integrate .. //depot/projects/arm/src/sys/ufs/ffs/fs.h#3 integrate .. //depot/projects/arm/src/sys/ufs/ufs/gjournal.h#1 branch .. //depot/projects/arm/src/sys/ufs/ufs/ufs_gjournal.c#1 branch .. //depot/projects/arm/src/sys/ufs/ufs/ufs_inode.c#8 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#11 integrate .. //depot/projects/arm/src/sys/vm/uma_core.c#9 integrate .. //depot/projects/arm/src/sys/vm/vm_glue.c#6 integrate .. //depot/projects/arm/src/sys/vm/vm_zeroidle.c#6 integrate .. //depot/projects/arm/src/tools/build/options/WITHOUT_CDDL#1 branch .. //depot/projects/arm/src/tools/tools/find-sb/mini_ufs.h#2 integrate .. //depot/projects/arm/src/tools/tools/nanobsd/nanobsd.sh#4 integrate .. //depot/projects/arm/src/tools/tools/tinybsd/README#2 integrate .. //depot/projects/arm/src/tools/tools/tinybsd/conf/bridge/tinybsd.ports#1 branch .. //depot/projects/arm/src/tools/tools/tinybsd/conf/default/tinybsd.ports#1 branch .. //depot/projects/arm/src/tools/tools/tinybsd/conf/firewall/tinybsd.ports#1 branch .. //depot/projects/arm/src/tools/tools/tinybsd/conf/minimal/tinybsd.ports#1 branch .. //depot/projects/arm/src/tools/tools/tinybsd/conf/vpn/tinybsd.ports#1 branch .. //depot/projects/arm/src/tools/tools/tinybsd/conf/wireless/tinybsd.ports#1 branch .. //depot/projects/arm/src/tools/tools/tinybsd/conf/wrap/tinybsd.ports#1 branch .. //depot/projects/arm/src/tools/tools/tinybsd/tinybsd#3 integrate .. //depot/projects/arm/src/usr.bin/awk/Makefile#3 integrate .. //depot/projects/arm/src/usr.bin/awk/tran.c.diff#1 branch .. //depot/projects/arm/src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik#2 integrate .. //depot/projects/arm/src/usr.bin/lorder/lorder.1#3 integrate .. //depot/projects/arm/src/usr.bin/tar/getdate.y#2 integrate .. //depot/projects/arm/src/usr.bin/vmstat/vmstat.8#4 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidcontrol/hid.c#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/client.c#4 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/fdcontrol/fdcontrol.8#2 integrate .. //depot/projects/arm/src/usr.sbin/fwcontrol/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/fwcontrol/fwcontrol.8#2 integrate .. //depot/projects/arm/src/usr.sbin/fwcontrol/fwcontrol.c#2 integrate .. //depot/projects/arm/src/usr.sbin/fwcontrol/fwdv.c#2 integrate .. //depot/projects/arm/src/usr.sbin/fwcontrol/fwmethods.h#1 branch .. //depot/projects/arm/src/usr.sbin/fwcontrol/fwmpegts.c#1 branch .. //depot/projects/arm/src/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8#2 integrate .. //depot/projects/arm/src/usr.sbin/smbmsg/smbmsg.8#2 integrate Differences ... ==== //depot/projects/arm/src/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.336 2006/10/16 22:18:59 jb Exp $ +# $FreeBSD: src/Makefile,v 1.337 2006/11/01 09:05:40 jb Exp $ # # The user-driven targets are: # @@ -242,7 +242,7 @@ MMAKE= ${MMAKEENV} make \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ - -DNO_CPU_CFLAGS -DNO_WERROR + -DNO_CPU_CFLAGS -DNO_WERROR -DNO_CTF make: .PHONY @echo ==== //depot/projects/arm/src/ObsoleteFiles.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.56 2006/10/21 14:19:52 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.57 2006/10/31 21:05:35 jmg Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -628,7 +628,9 @@ OLD_FILES+=usr/lib/libpam_ssh_p.a OLD_FILES+=usr/bin/help OLD_FILES+=usr/bin/sccs +.if ${TARGET_ARCH} != "i386" OLD_FILES+=usr/bin/gdbserver +.endif OLD_FILES+=usr/bin/ssh-keysign OLD_FILES+=usr/sbin/gifconfig OLD_FILES+=usr/sbin/prefix ==== //depot/projects/arm/src/UPDATING#6 (text+ko) ==== @@ -21,6 +21,14 @@ developers choose to disable these features on build machines to maximize performance. +20061026: + KSE in the kernel has now been made optional and turned on by + default. Use 'nooption KSE' in your kernel config to turn it + off. All kernel modules *must* be recompiled after this change. + There-after, modules from a KSE kernel should be compatible with + modules from a NOKSE kernel due to the temporary padding fields + added to 'struct proc'. + 20060929: mrouted and its utilities have been removed from the base system. @@ -631,4 +639,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.460 2006/09/30 20:01:15 ru Exp $ +$FreeBSD: src/UPDATING,v 1.462 2006/10/26 22:05:24 jb Exp $ ==== //depot/projects/arm/src/bin/cp/cp.1#5 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.37 2006/10/24 18:42:42 trhodes Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ .\" -.Dd October 24, 2006 +.Dd October 27, 2006 .Dt CP 1 .Os .Sh NAME @@ -255,23 +255,19 @@ is different from historical .Fx behavior. -Use -of this option +Use of this option is strongly discouraged as the behavior is implementation-dependent. -In this implementation of -.Nm , +In +.Fx , .Fl r -works alike +is a synonym for .Fl RL -thus all files, including special files, are copied -in a manner similar to normal files. -Data within these special files -will not be copied, only the file itself. -Historical implemenations +and works the same unless modified by other flags. +Historical implementations of .Fl r -differ as they could copy the internal contents of special +differ as they copy special files as normal files while recreating a hierarchy. .Pp The ==== //depot/projects/arm/src/bin/rm/rm.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.39 2005/11/17 12:15:23 ru Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.41 2006/10/31 02:22:36 delphij Exp $ .\" -.Dd September 29, 2005 +.Dd October 30, 2006 .Dt RM 1 .Os .Sh NAME @@ -88,6 +88,10 @@ Overwrite regular files before deleting them. Files are overwritten three times, first with the byte pattern 0xff, then 0x00, and then 0xff again, before they are deleted. +Files with multiple links will not be overwritten nor deleted unless +.Fl f +is specified, a warning is generated instead. +.Pp Specifying this flag for a read only file will cause .Nm to generate an error message and exit. @@ -168,6 +172,12 @@ For example: .Dl rm /home/user/-filename .Dl rm ./-filename +.Pp +When +.Fl P +is specified with +.Fl f +the file will be overwritten and removed even if it has hard links. .Sh COMPATIBILITY The .Nm ==== //depot/projects/arm/src/bin/rm/rm.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.56 2006/10/18 13:16:06 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.58 2006/10/31 02:22:36 delphij Exp $"); #include #include @@ -400,6 +400,11 @@ } if (!S_ISREG(sbp->st_mode)) return (1); + if (sbp->st_nlink > 1 && !fflag) { + warnx("%s (inode %u): not overwritten due to multiple links", + file, sbp->st_ino); + return (0); + } if ((fd = open(file, O_WRONLY, 0)) == -1) goto err; if (fstatfs(fd, &fsb) == -1) ==== //depot/projects/arm/src/contrib/bsnmp/snmp_mibII/mibII.c#2 (text+ko) ==== @@ -26,12 +26,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.24 2006/02/14 09:04:18 brandt_h Exp $ + * $Begemot: mibII.c 516 2006-10-27 15:54:02Z brandt_h $ * * Implementation of the standard interfaces and ip MIB. */ #include "mibII.h" #include "mibII_oid.h" +#include #include @@ -376,16 +377,16 @@ u_int ticks; if ((ticks = mibif_force_hc_update_interval) == 0) { - if (mibif_maxspeed <= 10000000) { + if (mibif_maxspeed <= IF_Mbps(10)) { /* at 10Mbps overflow needs 3436 seconds */ ticks = 3000 * 100; /* 50 minutes */ - } else if (mibif_maxspeed <= 100000000) { + } else if (mibif_maxspeed <= IF_Mbps(100)) { /* at 100Mbps overflow needs 343 seconds */ ticks = 300 * 100; /* 5 minutes */ - } else if (mibif_maxspeed < 650000000) { + } else if (mibif_maxspeed < IF_Mbps(622)) { /* at 622Mbps overflow needs 53 seconds */ ticks = 40 * 100; /* 40 seconds */ - } else if (mibif_maxspeed <= 1000000000) { + } else if (mibif_maxspeed <= IF_Mbps(1000)) { /* at 1Gbps overflow needs 34 seconds */ ticks = 20 * 100; /* 20 seconds */ } else { ==== //depot/projects/arm/src/contrib/bsnmp/snmpd/action.c#2 (text+ko) ==== @@ -2,6 +2,9 @@ * Copyright (c) 2001-2003 * Fraunhofer Institute for Open Communication Systems (FhG Fokus). * All rights reserved. + * Copyright (c) 2004-2006 + * Hartmut Brandt. + * All rights reserved. * * Author: Harti Brandt * @@ -26,13 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmpd/action.c,v 1.58 2004/08/06 08:47:09 brandt Exp $ + * $Begemot: action.c 517 2006-10-31 08:52:04Z brandt_h $ * * Variable access for SNMPd */ #include #include #include +#include #include #include #include @@ -48,6 +52,11 @@ static const struct asn_oid oid_begemotSnmpdModuleTable = OIDX_begemotSnmpdModuleTable; +#ifdef __FreeBSD__ +static const struct asn_oid + oid_freeBSDVersion = OIDX_freeBSDVersion; +#endif + /* * Get a string value from the KERN sysctl subtree. */ @@ -100,39 +109,57 @@ int init_actvals(void) { - char *v[4]; - u_int i; + struct utsname uts; + char *hostid; size_t len; +#ifdef __FreeBSD__ + char *rel, *p, *end; + u_long num; +#endif - if ((systemg.name = act_getkernstring(KERN_HOSTNAME)) == NULL) + if (uname(&uts) == -1) + return (-1); + + if ((systemg.name = strdup(uts.nodename)) == NULL) + return (-1); + + if ((hostid = act_getkernint(KERN_HOSTID)) == NULL) return (-1); - for (i = 0; i < 4; i++) - v[1] = NULL; + len = strlen(uts.nodename) + 1; + len += strlen(hostid) + 1; + len += strlen(uts.sysname) + 1; + len += strlen(uts.release) + 1; - if ((v[0] = act_getkernstring(KERN_HOSTNAME)) == NULL) - goto err; - if ((v[1] = act_getkernint(KERN_HOSTID)) == NULL) - goto err; - if ((v[2] = act_getkernstring(KERN_OSTYPE)) == NULL) - goto err; - if ((v[3] = act_getkernstring(KERN_OSRELEASE)) == NULL) - goto err; + if ((systemg.descr = malloc(len)) == NULL) { + free(hostid); + return (-1); + } + sprintf(systemg.descr, "%s %s %s %s", uts.nodename, hostid, uts.sysname, + uts.release); - for (i = 0, len = 0; i < 4; i++) - len += strlen(v[i]) + 1; +#ifdef __FreeBSD__ + /* + * Construct a FreeBSD oid + */ + systemg.object_id = oid_freeBSDVersion; + rel = uts.release; + while ((p = strsep(&rel, ".")) != NULL && + systemg.object_id.len < ASN_MAXOIDLEN) { + systemg.object_id.subs[systemg.object_id.len] = 0; + if (*p != '\0') { + num = strtoul(p, &end, 10); + if (end == p) + break; + systemg.object_id.subs[systemg.object_id.len] = num; + } + systemg.object_id.len++; + } +#endif - if ((systemg.descr = malloc(len)) == NULL) - goto err; - sprintf(systemg.descr, "%s %s %s %s", v[0], v[1], v[2], v[3]); + free(hostid); return (0); - - err: - for (i = 0; i < 4; i++) - if (v[i] != NULL) - free(v[i]); - return (-1); } ==== //depot/projects/arm/src/contrib/bsnmp/snmpd/tree.def#2 (text+ko) ==== @@ -26,7 +26,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Begemot: bsnmp/snmpd/tree.def,v 1.38 2004/08/06 08:47:17 brandt Exp $ +# $Begemot: tree.def 517 2006-10-31 08:52:04Z brandt_h $ # # System group and private Begemot SNMPd MIB. # @@ -64,11 +64,19 @@ (32 snmpProxyDrops COUNTER op_snmp GET) ) )) + + (4 private + (1 enterprises +# +# FreeBSD stuff # + (2238 freeBSD + (4 freeBSDVersion) + ) + +# # Private Begemot Stuff # - (4 private - (1 enterprises (12325 fokus (1 begemot ==== //depot/projects/arm/src/contrib/gcc/function.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/function.c,v 1.22 2005/06/03 04:02:19 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/function.c,v 1.23 2006/10/25 07:29:22 bde Exp $ */ /* This file handles the generation of rtl code from tree structure at the level of the function as a whole. @@ -7129,7 +7129,9 @@ if (!initialized) { mexitcount_libfunc = init_one_libfunc (".mexitcount"); +#if 0 /* Turn this off to prevent erroneous garbage collection. */ initialized = 1; +#endif } emit_library_call (mexitcount_libfunc, LCT_NORMAL, VOIDmode, 0); } ==== //depot/projects/arm/src/contrib/pf/man/pf.conf.5#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.9 2005/09/28 08:11:15 mlaier Exp $ +.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.10 2006/10/30 15:15:37 mlaier Exp $ .\" $OpenBSD: pf.conf.5,v 1.292 2004/02/24 05:44:48 mcbride Exp $ .\" .\" Copyright (c) 2002, Daniel Hartmeier @@ -28,7 +28,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 7, 2005 +.Dd October 30, 2006 .Dt PF.CONF 5 .Os .Sh NAME @@ -2851,6 +2851,12 @@ for the moment. This workaround will still produce the LOR, but Giant will protect from the deadlock. +.Pp +Route labels are not supported by the +.Fx +.Xr route 4 +system. +Rules with a route label do not match any traffic. .Sh SEE ALSO .Xr altq 4 , .Xr icmp 4 , ==== //depot/projects/arm/src/etc/defaults/rc.conf#8 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.300 2006/10/15 15:55:00 ceri Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.301 2006/10/28 20:08:12 phk Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -104,6 +104,16 @@ firewall_quiet="NO" # Set to YES to suppress rule display firewall_logging="NO" # Set to YES to enable events logging firewall_flags="" # Flags passed to ipfw when type is a file +firewall_myservices="" # List of TCP ports on which this host + # offers services +firewall_allowservices="" # List of IPs which has access to + # $firewall_myservices +firewall_trusted="" # List of IPs which has full access to this host +firewall_logdeny="NO" # Set to YES to log default denied incoming + # packets. +firewall_nologports="135-139,445 1026,1027 1433,1434" # List of TCP/UDP ports + # for which denied incoming packets are not + # logged. ip_portrange_first="NO" # Set first dynamically allocated port ip_portrange_last="NO" # Set last dynamically allocated port ike_enable="NO" # Enable IKE daemon (usually racoon or isakmpd) ==== //depot/projects/arm/src/etc/mtree/BSD.include.dist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.109 2006/10/06 08:27:07 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.110 2006/10/31 22:22:29 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -108,6 +108,8 @@ .. gate .. + journal + .. label .. mirror ==== //depot/projects/arm/src/etc/network.subr#5 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.175 2006/10/07 15:45:56 ume Exp $ +# $FreeBSD: src/etc/network.subr,v 1.176 2006/10/29 13:29:49 mlaier Exp $ # # @@ -690,7 +690,7 @@ if [ ${rtsol_available} = yes -a ${rtsol_interface} = yes ] then case ${i} in - lo0|gif[0-9]*|stf[0-9]*|faith[0-9]*|lp[0-9]*|sl[0-9]*|tun[0-9]*) + lo0|gif[0-9]*|stf[0-9]*|faith[0-9]*|lp[0-9]*|sl[0-9]*|tun[0-9]*|pflog[0-9]*|pfsync[0-9]*) ;; *) rtsol_interfaces="${rtsol_interfaces} ${i}" ==== //depot/projects/arm/src/etc/rc.d/ppp#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 5 00:44:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FCAB16A416; Sun, 5 Nov 2006 00:44:19 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 182C516A40F for ; Sun, 5 Nov 2006 00:44:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D884A43D53 for ; Sun, 5 Nov 2006 00:44:18 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA50iIhM092466 for ; Sun, 5 Nov 2006 00:44:18 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA50iI9w092463 for perforce@freebsd.org; Sun, 5 Nov 2006 00:44:18 GMT (envelope-from jb@freebsd.org) Date: Sun, 5 Nov 2006 00:44:18 GMT Message-Id: <200611050044.kA50iI9w092463@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 00:44:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=109251 Change 109251 by jb@jb_freebsd8 on 2006/11/05 00:43:18 Merge the DTrace stuff back in. Affected files ... .. //depot/projects/dtrace/src/sys/i386/i386/trap.c#15 edit Differences ... ==== //depot/projects/dtrace/src/sys/i386/i386/trap.c#15 (text+ko) ==== @@ -102,6 +102,35 @@ #include #endif +#ifdef KDTRACE +#include +#include + +/* + * These are hooks which are initialised by the dtrace module + * when it is loaded. This keeps the DTrace implementation + * opaque. + * + * All that the trap() function below needs to determine + * is how many instruction bytes to offset the instruction + * pointer before returning from a trap that occured durin a + * 'no-fault' DTrace probe. + */ +dtrace_instr_size_func_t dtrace_instr_size_func; + +/* + * This hook handles invalid opcodes. + */ +dtrace_invop_func_t dtrace_invop_func; + +/* + * This is a hook which is initialised by the systrace module + * when it is loaded. This keeps the DTrace syscall provider + * implementation opaque. + */ +systrace_probe_func_t systrace_probe_func; +#endif + extern void trap(struct trapframe frame); extern void syscall(struct trapframe frame); @@ -216,6 +245,69 @@ goto out; #endif +#ifdef KDTRACE + /* + * If DTrace support is compiled into the kernel, a trap can + * occur while DTrace executes a probe. Before executing the + * probe, DTrace disables interrupts and sets a flag in it's + * per-cpu flags to indicate that it doesn't want to fault. + * On returning from the the probe, the no-fault flag is + * cleared and finally interrupts are re-enabled. + * + * Check if DTrace has enabled 'no-fault' mode: + * + */ + if ((cpu_core[curcpu].cpuc_dtrace_flags & CPU_DTRACE_NOFAULT) != 0) { + /* + * When the dtrace module was loaded (or initialised + * if linked into the kernel), it should have set it's + * machine dependent instruction size function pointer + * for use here. If not, the trap will just end up + * being processed as a panic like any other. + */ + if (dtrace_instr_size_func != NULL) { + /* + * There are only a couple of trap types that + * are expected. All the rest will be handled + * in the usual way. + */ + switch (type) { + /* General protection fault. */ + case T_PROTFLT: + /* Flag an illegal operation. */ + cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_ILLOP; + + /* + * Offset the instruction pointer + * to the instruction following the + * one casing the fault. + */ + frame.tf_eip += (*dtrace_instr_size_func)((u_char *) frame.tf_eip); + goto out; + /* Page fault. */ + case T_PAGEFLT: + /* Flag a bad address. */ + cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_BADADDR; + cpu_core[curcpu].cpuc_dtrace_illval = rcr2(); + + /* + * Offset the instruction pointer + * to the instruction following the + * one casing the fault. + */ + frame.tf_eip += (*dtrace_instr_size_func)((u_char *) frame.tf_eip); + goto out; + default: + /* + * Handle all other traps in the usual + * way. + */ + break; + } + } + } +#endif + if ((frame.tf_eflags & PSL_I) == 0) { /* * Buggy application or kernel code has disabled @@ -1006,9 +1098,34 @@ PTRACESTOP_SC(p, td, S_PT_SCE); +#ifdef KDTRACE + /* + * If the systrace module has registered it's probe + * callback and if there is a probe active for the + * syscall 'entry', process the probe. + */ + if (systrace_probe_func != NULL && callp->sy_entry != 0) + (*systrace_probe_func)(callp->sy_entry, code, callp, + args); +#endif + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args); AUDIT_SYSCALL_EXIT(error, td); + +#ifdef KDTRACE + /* Save the error return variable for DTrace to reference. */ + td->td_errno = error; + + /* + * If the systrace module has registered it's probe + * callback and if there is a probe active for the + * syscall 'return', process the probe. + */ + if (systrace_probe_func != NULL && callp->sy_return != 0) + (*systrace_probe_func)(callp->sy_return, code, callp, + args); +#endif } switch (error) { From owner-p4-projects@FreeBSD.ORG Sun Nov 5 00:49:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8802C16A417; Sun, 5 Nov 2006 00:49:26 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 30FA216A415 for ; Sun, 5 Nov 2006 00:49:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0038943D45 for ; Sun, 5 Nov 2006 00:49:25 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA50nPdq000896 for ; Sun, 5 Nov 2006 00:49:25 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA50nPwo000893 for perforce@freebsd.org; Sun, 5 Nov 2006 00:49:25 GMT (envelope-from jb@freebsd.org) Date: Sun, 5 Nov 2006 00:49:25 GMT Message-Id: <200611050049.kA50nPwo000893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109252 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 00:49:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=109252 Change 109252 by jb@jb_freebsd8 on 2006/11/05 00:49:02 Merge the DTrace code back in. This is an example of a DTrace support function required to allow the dtrace module to load. It is coded here so that it can be maintained with other similar code. The function is named with the dtrace_ prefix so that the DTrace FBT (function boundary trace) provider knows not to try to trace it because it is called from the DTrace probe context and tracing it would mean a recursive trap. Affected files ... .. //depot/projects/dtrace/src/sys/i386/i386/tsc.c#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/i386/i386/tsc.c#7 (text+ko) ==== @@ -153,3 +153,18 @@ { return (rdtsc()); } + +/* + * DTrace needs a high resolution time function which can + * be called from a probe context and guaranteed not to have + * instrumented with probes itself. + * + * Returns nanoseconds since boot. + */ +#ifdef KDTRACE +uint64_t +dtrace_gethrtime() +{ + return (rdtsc() * (uint64_t) 1000000000 / tsc_freq); +} +#endif From owner-p4-projects@FreeBSD.ORG Sun Nov 5 01:04:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA14F16A412; Sun, 5 Nov 2006 01:04:46 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 91FA516A407 for ; Sun, 5 Nov 2006 01:04:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5259B43D46 for ; Sun, 5 Nov 2006 01:04:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA514kaM004885 for ; Sun, 5 Nov 2006 01:04:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA514jII004882 for perforce@freebsd.org; Sun, 5 Nov 2006 01:04:45 GMT (envelope-from jb@freebsd.org) Date: Sun, 5 Nov 2006 01:04:45 GMT Message-Id: <200611050104.kA514jII004882@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109253 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 01:04:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=109253 Change 109253 by jb@jb_freebsd8 on 2006/11/05 01:04:21 Merge the DTrace code back in. Affected files ... .. //depot/projects/dtrace/src/sys/i386/i386/exception.s#9 edit .. //depot/projects/dtrace/src/sys/i386/i386/local_apic.c#9 edit Differences ... ==== //depot/projects/dtrace/src/sys/i386/i386/exception.s#9 (text+ko) ==== @@ -30,16 +30,27 @@ * $FreeBSD: src/sys/i386/i386/exception.s,v 1.116 2006/04/04 02:26:45 jkoshy Exp $ */ +/* + * The DTrace parts of this file are: + * + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + #include "opt_apic.h" #include "opt_npx.h" #include #include #include +#ifdef KDTRACE +#include +#endif #include "assym.s" #define SEL_RPL_MASK 0x0003 +#define GSEL_KPL 0x0020 /* GSEL(GCODE_SEL, SEL_KPL) */ .text @@ -88,8 +99,6 @@ pushl $0; TRAP(T_OFLOW) IDTVEC(bnd) pushl $0; TRAP(T_BOUND) -IDTVEC(ill) - pushl $0; TRAP(T_PRIVINFLT) IDTVEC(dna) pushl $0; TRAP(T_DNA) IDTVEC(fpusegm) @@ -144,6 +153,164 @@ jmp doreti /* + * Privileged instruction fault. + */ + SUPERALIGN_TEXT +IDTVEC(ill) +#ifdef KDTRACE + /* + * DTrace uses invalid instructions to hook itself into + * the executable code. A privileged instruction fault in + * kernel code probably is the result of a 'Function Boundary + * Tracing' (FBT) or 'Statically Defined Tracing' (SDT) + * probe. + * + * Check if there is an invalid instruction function registered. + * (see trap.c for the global variable referenced) + */ + cmpl $0, (dtrace_invop_func) + + /* If not, just handle it as a normal trap. */ + jz norm_ill + + /* Check if this is a user fault. */ + cmpl $GSEL_KPL, 4(%esp) /* Check the code segment. */ + + /* If so, just handle it as a normal trap. */ + jne norm_ill + + /* + * This is a kernel instruction fault that might have been caused + * by a DTrace provider. + */ + pushal /* Push all registers onto the stack. */ + + /* + * Setup the stack to contain the arguments to: + * int dtrace_invop(uintptr_t addr, uintptr_t *stack, uintptr_t eax); + */ + pushl %eax /* Push %eax -- may contain the return value. */ + pushl %esp /* Push the stack pointer. */ + addl $48, (%esp) /* Adjust to incoming args. */ + pushl 40(%esp) /* Push the calling EIP. */ + + /* Call the registered function (dtrace_invop). */ + call *dtrace_invop_func /* Call the registered function. */ + +ALTENTRY(dtrace_invop_callsite) + /* + * Drop the arguments to dtrace_invop from the stack, leaving + * the registers. + */ + addl $12, %esp + + /* Process according to the return value from dtrace_invop. */ + cmpl $DTRACE_INVOP_PUSHL_EBP, %eax + je __dtrace_invop_pushl_ebp + cmpl $DTRACE_INVOP_POPL_EBP, %eax + je __dtrace_invop_popl_ebp + cmpl $DTRACE_INVOP_LEAVE, %eax + je __dtrace_invop_leave + cmpl $DTRACE_INVOP_NOP, %eax + je __dtrace_invop_nop + + /* + * The registered DTrace invalid instruction functions didn't + * match the fault address to a probe, so process the trap in + * the normal way. + &/ + * normal way because the registered DTrace invalid instruction + * functions didn't match it to a probe. + */ + jmp norm_ill + + /* case DTRACE_INVOP_PUSHL_EBP: */ +__dtrace_invop_pushl_ebp: + /* + * We must emulate a "pushl %ebp". To do this, we pull the stack + * down 4 bytes, and then store the base pointer. + */ + popal + subl $4, %esp /* make room for %ebp */ + pushl %eax /* push temp */ + movl 8(%esp), %eax /* load calling EIP */ + incl %eax /* increment over LOCK prefix */ + movl %eax, 4(%esp) /* store calling EIP */ + movl 12(%esp), %eax /* load calling CS */ + movl %eax, 8(%esp) /* store calling CS */ + movl 16(%esp), %eax /* load calling EFLAGS */ + movl %eax, 12(%esp) /* store calling EFLAGS */ + movl %ebp, 16(%esp) /* push %ebp */ + popl %eax /* pop off temp */ + iret /* return from interrupt */ + + /* case DTRACE_INVOP_POPL_EBP: */ +__dtrace_invop_popl_ebp: + /* + * We must emulate a "popl %ebp". To do this, we do the opposite of + * the above: we remove the %ebp from the stack, and squeeze up the + * saved state from the trap. + */ + popal + pushl %eax /* push temp */ + movl 16(%esp), %ebp /* pop %ebp */ + movl 12(%esp), %eax /* load calling EFLAGS */ + movl %eax, 16(%esp) /* store calling EFLAGS */ + movl 8(%esp), %eax /* load calling CS */ + movl %eax, 12(%esp) /* store calling CS */ + movl 4(%esp), %eax /* load calling EIP */ + incl %eax /* increment over LOCK prefix */ + movl %eax, 8(%esp) /* store calling EIP */ + popl %eax /* pop off temp */ + addl $4, %esp /* adjust stack pointer */ + iret /* return from interrupt */ + + /* case DTRACE_INVOP_LEAVE: */ +__dtrace_invop_leave: + /* + * We must emulate a "leave", which is the same as a "movl %ebp, %esp" + * followed by a "popl %ebp". This looks similar to the above, but + * requires two temporaries: one for the new base pointer, and one + * for the staging register. + */ + popal + pushl %eax /* push temp */ + pushl %ebx /* push temp */ + movl %ebp, %ebx /* set temp to old %ebp */ + movl (%ebx), %ebp /* pop %ebp */ + movl 16(%esp), %eax /* load calling EFLAGS */ + movl %eax, (%ebx) /* store calling EFLAGS */ + movl 12(%esp), %eax /* load calling CS */ + movl %eax, -4(%ebx) /* store calling CS */ + movl 8(%esp), %eax /* load calling EIP */ + incl %eax /* increment over LOCK prefix */ + movl %eax, -8(%ebx) /* store calling EIP */ + movl %ebx, -4(%esp) /* temporarily store new %esp */ + popl %ebx /* pop off temp */ + popl %eax /* pop off temp */ + movl -12(%esp), %esp /* set stack pointer */ + subl $8, %esp /* adjust for three pushes, one pop */ + iret /* return from interrupt */ + + /* case DTRACE_INVOP_NOP: */ +__dtrace_invop_nop: + /* + * We must emulate a "nop". This is obviously not hard: we need only + * advance the %eip by one. + */ + popal + incl (%esp) + iret + +norm_ill: +#endif + /* + * Process the instruction fault in the normal way. + */ + pushl $0 + TRAP(T_PRIVINFLT) + +/* * SYSCALL CALL GATE (old entry point for a.out binaries) * * The intersegment call has been set up to specify one dummy parameter. ==== //depot/projects/dtrace/src/sys/i386/i386/local_apic.c#9 (text+ko) ==== @@ -36,6 +36,7 @@ #include "opt_hwpmc_hooks.h" +#include "opt_cyclic.h" #include "opt_ddb.h" #include @@ -65,6 +66,10 @@ #include #endif +#if defined(CYCLIC) || defined(KDTRACE) +cyclic_clock_func_t lapic_cyclic_clock_func; +#endif + /* * We can handle up to 60 APICs via our logical cluster IDs, but currently * the physical IDs on Intel processors up to the Pentium 4 are limited to @@ -659,6 +664,19 @@ hardclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); else hardclock_cpu(TRAPF_USERMODE(&frame)); + + /* + * If the cyclic subsystem is configured and a callback + * function has been registered, then call it to process + * the high speed timers. If this function is registered + * here, then there mustn't be a High Performance Event + * Timer (HPET) on the CPU. A HPET provides higher + * performance timer interrupts. + */ +#if defined(CYCLIC) || defined(KDTRACE) + if (lapic_cyclic_clock_func != NULL) + (*lapic_cyclic_clock_func)(); +#endif } /* Fire statclock at stathz. */ From owner-p4-projects@FreeBSD.ORG Sun Nov 5 05:04:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABC0E16A4A0; Sun, 5 Nov 2006 05:04:13 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 37FF516A492 for ; Sun, 5 Nov 2006 05:04:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F366C43D45 for ; Sun, 5 Nov 2006 05:04:12 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA554CEd061192 for ; Sun, 5 Nov 2006 05:04:12 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA554CPj061182 for perforce@freebsd.org; Sun, 5 Nov 2006 05:04:12 GMT (envelope-from jb@freebsd.org) Date: Sun, 5 Nov 2006 05:04:12 GMT Message-Id: <200611050504.kA554CPj061182@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 05:04:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=109260 Change 109260 by jb@jb_freebsd8 on 2006/11/05 04:52:38 A new branch to experiment with importing binutils via p4. This IFC brings in all but src/contrib/binutils which will be fed from //depot/vendor/gnu/binutils instead. Affected files ... .. //depot/projects/binutils/src/COPYRIGHT#1 branch .. //depot/projects/binutils/src/LOCKS#1 branch .. //depot/projects/binutils/src/MAINTAINERS#1 branch .. //depot/projects/binutils/src/Makefile#1 branch .. //depot/projects/binutils/src/Makefile.inc1#1 branch .. //depot/projects/binutils/src/ObsoleteFiles.inc#1 branch .. //depot/projects/binutils/src/README#1 branch .. //depot/projects/binutils/src/UPDATING#1 branch .. //depot/projects/binutils/src/bin/Makefile#1 branch .. //depot/projects/binutils/src/bin/Makefile.inc#1 branch .. //depot/projects/binutils/src/bin/cat/Makefile#1 branch .. //depot/projects/binutils/src/bin/cat/cat.1#1 branch .. //depot/projects/binutils/src/bin/cat/cat.c#1 branch .. //depot/projects/binutils/src/bin/chflags/Makefile#1 branch .. //depot/projects/binutils/src/bin/chflags/chflags.1#1 branch .. //depot/projects/binutils/src/bin/chflags/chflags.c#1 branch .. //depot/projects/binutils/src/bin/chio/Makefile#1 branch .. //depot/projects/binutils/src/bin/chio/chio.1#1 branch .. //depot/projects/binutils/src/bin/chio/chio.c#1 branch .. //depot/projects/binutils/src/bin/chio/defs.h#1 branch .. //depot/projects/binutils/src/bin/chio/pathnames.h#1 branch .. //depot/projects/binutils/src/bin/chmod/Makefile#1 branch .. //depot/projects/binutils/src/bin/chmod/chmod.1#1 branch .. //depot/projects/binutils/src/bin/chmod/chmod.c#1 branch .. //depot/projects/binutils/src/bin/cp/Makefile#1 branch .. //depot/projects/binutils/src/bin/cp/cp.1#1 branch .. //depot/projects/binutils/src/bin/cp/cp.c#1 branch .. //depot/projects/binutils/src/bin/cp/extern.h#1 branch .. //depot/projects/binutils/src/bin/cp/utils.c#1 branch .. //depot/projects/binutils/src/bin/csh/Makefile#1 branch .. //depot/projects/binutils/src/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/binutils/src/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/binutils/src/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/binutils/src/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/binutils/src/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/binutils/src/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/binutils/src/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/binutils/src/bin/csh/config.h#1 branch .. //depot/projects/binutils/src/bin/csh/config_p.h#1 branch .. //depot/projects/binutils/src/bin/csh/host.defs#1 branch .. //depot/projects/binutils/src/bin/csh/iconv.h#1 branch .. //depot/projects/binutils/src/bin/csh/iconv_stub.c#1 branch .. //depot/projects/binutils/src/bin/date/Makefile#1 branch .. //depot/projects/binutils/src/bin/date/date.1#1 branch .. //depot/projects/binutils/src/bin/date/date.c#1 branch .. //depot/projects/binutils/src/bin/date/extern.h#1 branch .. //depot/projects/binutils/src/bin/date/netdate.c#1 branch .. //depot/projects/binutils/src/bin/date/vary.c#1 branch .. //depot/projects/binutils/src/bin/date/vary.h#1 branch .. //depot/projects/binutils/src/bin/dd/Makefile#1 branch .. //depot/projects/binutils/src/bin/dd/args.c#1 branch .. //depot/projects/binutils/src/bin/dd/conv.c#1 branch .. //depot/projects/binutils/src/bin/dd/conv_tab.c#1 branch .. //depot/projects/binutils/src/bin/dd/dd.1#1 branch .. //depot/projects/binutils/src/bin/dd/dd.c#1 branch .. //depot/projects/binutils/src/bin/dd/dd.h#1 branch .. //depot/projects/binutils/src/bin/dd/extern.h#1 branch .. //depot/projects/binutils/src/bin/dd/gen.c#1 branch .. //depot/projects/binutils/src/bin/dd/misc.c#1 branch .. //depot/projects/binutils/src/bin/dd/position.c#1 branch .. //depot/projects/binutils/src/bin/dd/ref.ascii#1 branch .. //depot/projects/binutils/src/bin/dd/ref.ebcdic#1 branch .. //depot/projects/binutils/src/bin/dd/ref.ibm#1 branch .. //depot/projects/binutils/src/bin/dd/ref.lcase#1 branch .. //depot/projects/binutils/src/bin/dd/ref.oldascii#1 branch .. //depot/projects/binutils/src/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/binutils/src/bin/dd/ref.oldibm#1 branch .. //depot/projects/binutils/src/bin/dd/ref.pareven#1 branch .. //depot/projects/binutils/src/bin/dd/ref.parnone#1 branch .. //depot/projects/binutils/src/bin/dd/ref.parodd#1 branch .. //depot/projects/binutils/src/bin/dd/ref.parset#1 branch .. //depot/projects/binutils/src/bin/dd/ref.swab#1 branch .. //depot/projects/binutils/src/bin/dd/ref.ucase#1 branch .. //depot/projects/binutils/src/bin/df/Makefile#1 branch .. //depot/projects/binutils/src/bin/df/df.1#1 branch .. //depot/projects/binutils/src/bin/df/df.c#1 branch .. //depot/projects/binutils/src/bin/domainname/Makefile#1 branch .. //depot/projects/binutils/src/bin/domainname/domainname.1#1 branch .. //depot/projects/binutils/src/bin/domainname/domainname.c#1 branch .. //depot/projects/binutils/src/bin/echo/Makefile#1 branch .. //depot/projects/binutils/src/bin/echo/echo.1#1 branch .. //depot/projects/binutils/src/bin/echo/echo.c#1 branch .. //depot/projects/binutils/src/bin/ed/Makefile#1 branch .. //depot/projects/binutils/src/bin/ed/POSIX#1 branch .. //depot/projects/binutils/src/bin/ed/README#1 branch .. //depot/projects/binutils/src/bin/ed/buf.c#1 branch .. //depot/projects/binutils/src/bin/ed/cbc.c#1 branch .. //depot/projects/binutils/src/bin/ed/ed.1#1 branch .. //depot/projects/binutils/src/bin/ed/ed.h#1 branch .. //depot/projects/binutils/src/bin/ed/glbl.c#1 branch .. //depot/projects/binutils/src/bin/ed/io.c#1 branch .. //depot/projects/binutils/src/bin/ed/main.c#1 branch .. //depot/projects/binutils/src/bin/ed/re.c#1 branch .. //depot/projects/binutils/src/bin/ed/sub.c#1 branch .. //depot/projects/binutils/src/bin/ed/test/=.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/Makefile#1 branch .. //depot/projects/binutils/src/bin/ed/test/README#1 branch .. //depot/projects/binutils/src/bin/ed/test/TODO#1 branch .. //depot/projects/binutils/src/bin/ed/test/a.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/a.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/a.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/a1.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/a2.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/addr.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/addr.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/addr.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/addr1.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/addr2.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/binutils/src/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/binutils/src/bin/ed/test/ascii.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/bang1.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/bang1.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/bang1.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/bang1.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/bang2.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/c.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/c.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/c.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/c1.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/c2.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/binutils/src/bin/ed/test/d.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/d.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/d.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/d.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/e1.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/e1.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/e1.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/e1.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/e2.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/e2.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/e2.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/e2.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/e3.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/e3.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/e3.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/e3.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/e4.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/e4.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/e4.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/f1.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/f2.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/g1.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/g1.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/g1.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/g1.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/g2.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/g2.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/g2.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/g2.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/g3.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/g3.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/g3.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/g3.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/g4.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/g4.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/g4.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/g5.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/g5.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/g5.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/h.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/i.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/i.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/i.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/i1.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/i2.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/i3.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/j.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/j.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/j.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/k.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/k.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/k.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/k1.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/k2.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/k3.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/k4.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/l.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/l.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/l.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/m.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/m.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/m.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/m.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/binutils/src/bin/ed/test/n.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/n.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/n.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/nl.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/nl1.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/nl1.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/nl1.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/nl2.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/nl2.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/nl2.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/p.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/p.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/p.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/q.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/q.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/q.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/q1.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/r1.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/r1.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/r1.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/r1.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/r2.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/r2.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/r2.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/r2.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/r3.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/r3.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/r3.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/s1.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/s1.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/s1.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/s1.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/s10.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/s2.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/s2.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/s2.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/s2.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/s3.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/s3.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/s3.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/s3.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/s4.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/s5.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/s6.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/s7.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/s8.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/s9.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/t.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/t.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/t1.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/t1.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/t1.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/t1.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/t2.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/t2.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/t2.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/t2.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/u.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/u.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/u.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/u.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/v.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/v.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/v.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/w.d#1 branch .. //depot/projects/binutils/src/bin/ed/test/w.r#1 branch .. //depot/projects/binutils/src/bin/ed/test/w.t#1 branch .. //depot/projects/binutils/src/bin/ed/test/w1.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/w2.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/w3.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/x.err#1 branch .. //depot/projects/binutils/src/bin/ed/test/z.err#1 branch .. //depot/projects/binutils/src/bin/ed/undo.c#1 branch .. //depot/projects/binutils/src/bin/expr/Makefile#1 branch .. //depot/projects/binutils/src/bin/expr/expr.1#1 branch .. //depot/projects/binutils/src/bin/expr/expr.y#1 branch .. //depot/projects/binutils/src/bin/getfacl/Makefile#1 branch .. //depot/projects/binutils/src/bin/getfacl/getfacl.1#1 branch .. //depot/projects/binutils/src/bin/getfacl/getfacl.c#1 branch .. //depot/projects/binutils/src/bin/hostname/Makefile#1 branch .. //depot/projects/binutils/src/bin/hostname/hostname.1#1 branch .. //depot/projects/binutils/src/bin/hostname/hostname.c#1 branch .. //depot/projects/binutils/src/bin/kenv/Makefile#1 branch .. //depot/projects/binutils/src/bin/kenv/kenv.1#1 branch .. //depot/projects/binutils/src/bin/kenv/kenv.c#1 branch .. //depot/projects/binutils/src/bin/kill/Makefile#1 branch .. //depot/projects/binutils/src/bin/kill/kill.1#1 branch .. //depot/projects/binutils/src/bin/kill/kill.c#1 branch .. //depot/projects/binutils/src/bin/ln/Makefile#1 branch .. //depot/projects/binutils/src/bin/ln/ln.1#1 branch .. //depot/projects/binutils/src/bin/ln/ln.c#1 branch .. //depot/projects/binutils/src/bin/ln/symlink.7#1 branch .. //depot/projects/binutils/src/bin/ls/Makefile#1 branch .. //depot/projects/binutils/src/bin/ls/cmp.c#1 branch .. //depot/projects/binutils/src/bin/ls/extern.h#1 branch .. //depot/projects/binutils/src/bin/ls/ls.1#1 branch .. //depot/projects/binutils/src/bin/ls/ls.c#1 branch .. //depot/projects/binutils/src/bin/ls/ls.h#1 branch .. //depot/projects/binutils/src/bin/ls/print.c#1 branch .. //depot/projects/binutils/src/bin/ls/util.c#1 branch .. //depot/projects/binutils/src/bin/mkdir/Makefile#1 branch .. //depot/projects/binutils/src/bin/mkdir/mkdir.1#1 branch .. //depot/projects/binutils/src/bin/mkdir/mkdir.c#1 branch .. //depot/projects/binutils/src/bin/mv/Makefile#1 branch .. //depot/projects/binutils/src/bin/mv/mv.1#1 branch .. //depot/projects/binutils/src/bin/mv/mv.c#1 branch .. //depot/projects/binutils/src/bin/pax/Makefile#1 branch .. //depot/projects/binutils/src/bin/pax/ar_io.c#1 branch .. //depot/projects/binutils/src/bin/pax/ar_subs.c#1 branch .. //depot/projects/binutils/src/bin/pax/buf_subs.c#1 branch .. //depot/projects/binutils/src/bin/pax/cache.c#1 branch .. //depot/projects/binutils/src/bin/pax/cache.h#1 branch .. //depot/projects/binutils/src/bin/pax/cpio.1#1 branch .. //depot/projects/binutils/src/bin/pax/cpio.c#1 branch .. //depot/projects/binutils/src/bin/pax/cpio.h#1 branch .. //depot/projects/binutils/src/bin/pax/extern.h#1 branch .. //depot/projects/binutils/src/bin/pax/file_subs.c#1 branch .. //depot/projects/binutils/src/bin/pax/ftree.c#1 branch .. //depot/projects/binutils/src/bin/pax/ftree.h#1 branch .. //depot/projects/binutils/src/bin/pax/gen_subs.c#1 branch .. //depot/projects/binutils/src/bin/pax/getoldopt.c#1 branch .. //depot/projects/binutils/src/bin/pax/options.c#1 branch .. //depot/projects/binutils/src/bin/pax/options.h#1 branch .. //depot/projects/binutils/src/bin/pax/pat_rep.c#1 branch .. //depot/projects/binutils/src/bin/pax/pat_rep.h#1 branch .. //depot/projects/binutils/src/bin/pax/pax.1#1 branch .. //depot/projects/binutils/src/bin/pax/pax.c#1 branch .. //depot/projects/binutils/src/bin/pax/pax.h#1 branch .. //depot/projects/binutils/src/bin/pax/sel_subs.c#1 branch .. //depot/projects/binutils/src/bin/pax/sel_subs.h#1 branch .. //depot/projects/binutils/src/bin/pax/tables.c#1 branch .. //depot/projects/binutils/src/bin/pax/tables.h#1 branch .. //depot/projects/binutils/src/bin/pax/tar.1#1 branch .. //depot/projects/binutils/src/bin/pax/tar.c#1 branch .. //depot/projects/binutils/src/bin/pax/tar.h#1 branch .. //depot/projects/binutils/src/bin/pax/tty_subs.c#1 branch .. //depot/projects/binutils/src/bin/ps/Makefile#1 branch .. //depot/projects/binutils/src/bin/ps/extern.h#1 branch .. //depot/projects/binutils/src/bin/ps/fmt.c#1 branch .. //depot/projects/binutils/src/bin/ps/keyword.c#1 branch .. //depot/projects/binutils/src/bin/ps/nlist.c#1 branch .. //depot/projects/binutils/src/bin/ps/print.c#1 branch .. //depot/projects/binutils/src/bin/ps/ps.1#1 branch .. //depot/projects/binutils/src/bin/ps/ps.c#1 branch .. //depot/projects/binutils/src/bin/ps/ps.h#1 branch .. //depot/projects/binutils/src/bin/pwd/Makefile#1 branch .. //depot/projects/binutils/src/bin/pwd/pwd.1#1 branch .. //depot/projects/binutils/src/bin/pwd/pwd.c#1 branch .. //depot/projects/binutils/src/bin/rcp/Makefile#1 branch .. //depot/projects/binutils/src/bin/rcp/extern.h#1 branch .. //depot/projects/binutils/src/bin/rcp/rcp.1#1 branch .. //depot/projects/binutils/src/bin/rcp/rcp.c#1 branch .. //depot/projects/binutils/src/bin/rcp/util.c#1 branch .. //depot/projects/binutils/src/bin/realpath/Makefile#1 branch .. //depot/projects/binutils/src/bin/realpath/realpath.1#1 branch .. //depot/projects/binutils/src/bin/realpath/realpath.c#1 branch .. //depot/projects/binutils/src/bin/rm/Makefile#1 branch .. //depot/projects/binutils/src/bin/rm/rm.1#1 branch .. //depot/projects/binutils/src/bin/rm/rm.c#1 branch .. //depot/projects/binutils/src/bin/rmail/Makefile#1 branch .. //depot/projects/binutils/src/bin/rmdir/Makefile#1 branch .. //depot/projects/binutils/src/bin/rmdir/rmdir.1#1 branch .. //depot/projects/binutils/src/bin/rmdir/rmdir.c#1 branch .. //depot/projects/binutils/src/bin/setfacl/Makefile#1 branch .. //depot/projects/binutils/src/bin/setfacl/file.c#1 branch .. //depot/projects/binutils/src/bin/setfacl/mask.c#1 branch .. //depot/projects/binutils/src/bin/setfacl/merge.c#1 branch .. //depot/projects/binutils/src/bin/setfacl/remove.c#1 branch .. //depot/projects/binutils/src/bin/setfacl/setfacl.1#1 branch .. //depot/projects/binutils/src/bin/setfacl/setfacl.c#1 branch .. //depot/projects/binutils/src/bin/setfacl/setfacl.h#1 branch .. //depot/projects/binutils/src/bin/setfacl/util.c#1 branch .. //depot/projects/binutils/src/bin/sh/Makefile#1 branch .. //depot/projects/binutils/src/bin/sh/TOUR#1 branch .. //depot/projects/binutils/src/bin/sh/alias.c#1 branch .. //depot/projects/binutils/src/bin/sh/alias.h#1 branch .. //depot/projects/binutils/src/bin/sh/arith.h#1 branch .. //depot/projects/binutils/src/bin/sh/arith.y#1 branch .. //depot/projects/binutils/src/bin/sh/arith_lex.l#1 branch .. //depot/projects/binutils/src/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/binutils/src/bin/sh/bltin/echo.1#1 branch .. //depot/projects/binutils/src/bin/sh/bltin/echo.c#1 branch .. //depot/projects/binutils/src/bin/sh/builtins.def#1 branch .. //depot/projects/binutils/src/bin/sh/cd.c#1 branch .. //depot/projects/binutils/src/bin/sh/cd.h#1 branch .. //depot/projects/binutils/src/bin/sh/error.c#1 branch .. //depot/projects/binutils/src/bin/sh/error.h#1 branch .. //depot/projects/binutils/src/bin/sh/eval.c#1 branch .. //depot/projects/binutils/src/bin/sh/eval.h#1 branch .. //depot/projects/binutils/src/bin/sh/exec.c#1 branch .. //depot/projects/binutils/src/bin/sh/exec.h#1 branch .. //depot/projects/binutils/src/bin/sh/expand.c#1 branch .. //depot/projects/binutils/src/bin/sh/expand.h#1 branch .. //depot/projects/binutils/src/bin/sh/funcs/cmv#1 branch .. //depot/projects/binutils/src/bin/sh/funcs/dirs#1 branch .. //depot/projects/binutils/src/bin/sh/funcs/kill#1 branch .. //depot/projects/binutils/src/bin/sh/funcs/login#1 branch .. //depot/projects/binutils/src/bin/sh/funcs/newgrp#1 branch .. //depot/projects/binutils/src/bin/sh/funcs/popd#1 branch .. //depot/projects/binutils/src/bin/sh/funcs/pushd#1 branch .. //depot/projects/binutils/src/bin/sh/funcs/suspend#1 branch .. //depot/projects/binutils/src/bin/sh/histedit.c#1 branch .. //depot/projects/binutils/src/bin/sh/init.h#1 branch .. //depot/projects/binutils/src/bin/sh/input.c#1 branch .. //depot/projects/binutils/src/bin/sh/input.h#1 branch .. //depot/projects/binutils/src/bin/sh/jobs.c#1 branch .. //depot/projects/binutils/src/bin/sh/jobs.h#1 branch .. //depot/projects/binutils/src/bin/sh/mail.c#1 branch .. //depot/projects/binutils/src/bin/sh/mail.h#1 branch .. //depot/projects/binutils/src/bin/sh/main.c#1 branch .. //depot/projects/binutils/src/bin/sh/main.h#1 branch .. //depot/projects/binutils/src/bin/sh/memalloc.c#1 branch .. //depot/projects/binutils/src/bin/sh/memalloc.h#1 branch .. //depot/projects/binutils/src/bin/sh/miscbltin.c#1 branch .. //depot/projects/binutils/src/bin/sh/mkbuiltins#1 branch .. //depot/projects/binutils/src/bin/sh/mkinit.c#1 branch .. //depot/projects/binutils/src/bin/sh/mknodes.c#1 branch .. //depot/projects/binutils/src/bin/sh/mksyntax.c#1 branch .. //depot/projects/binutils/src/bin/sh/mktokens#1 branch .. //depot/projects/binutils/src/bin/sh/myhistedit.h#1 branch .. //depot/projects/binutils/src/bin/sh/mystring.c#1 branch .. //depot/projects/binutils/src/bin/sh/mystring.h#1 branch .. //depot/projects/binutils/src/bin/sh/nodes.c.pat#1 branch .. //depot/projects/binutils/src/bin/sh/nodetypes#1 branch .. //depot/projects/binutils/src/bin/sh/options.c#1 branch .. //depot/projects/binutils/src/bin/sh/options.h#1 branch .. //depot/projects/binutils/src/bin/sh/output.c#1 branch .. //depot/projects/binutils/src/bin/sh/output.h#1 branch .. //depot/projects/binutils/src/bin/sh/parser.c#1 branch .. //depot/projects/binutils/src/bin/sh/parser.h#1 branch .. //depot/projects/binutils/src/bin/sh/redir.c#1 branch .. //depot/projects/binutils/src/bin/sh/redir.h#1 branch .. //depot/projects/binutils/src/bin/sh/sh.1#1 branch .. //depot/projects/binutils/src/bin/sh/shell.h#1 branch .. //depot/projects/binutils/src/bin/sh/show.c#1 branch .. //depot/projects/binutils/src/bin/sh/show.h#1 branch .. //depot/projects/binutils/src/bin/sh/trap.c#1 branch .. //depot/projects/binutils/src/bin/sh/trap.h#1 branch .. //depot/projects/binutils/src/bin/sh/var.c#1 branch .. //depot/projects/binutils/src/bin/sh/var.h#1 branch .. //depot/projects/binutils/src/bin/sleep/Makefile#1 branch .. //depot/projects/binutils/src/bin/sleep/sleep.1#1 branch .. //depot/projects/binutils/src/bin/sleep/sleep.c#1 branch .. //depot/projects/binutils/src/bin/stty/Makefile#1 branch .. //depot/projects/binutils/src/bin/stty/cchar.c#1 branch .. //depot/projects/binutils/src/bin/stty/extern.h#1 branch .. //depot/projects/binutils/src/bin/stty/gfmt.c#1 branch .. //depot/projects/binutils/src/bin/stty/key.c#1 branch .. //depot/projects/binutils/src/bin/stty/modes.c#1 branch .. //depot/projects/binutils/src/bin/stty/print.c#1 branch .. //depot/projects/binutils/src/bin/stty/stty.1#1 branch .. //depot/projects/binutils/src/bin/stty/stty.c#1 branch .. //depot/projects/binutils/src/bin/stty/stty.h#1 branch .. //depot/projects/binutils/src/bin/stty/util.c#1 branch .. //depot/projects/binutils/src/bin/sync/Makefile#1 branch .. //depot/projects/binutils/src/bin/sync/sync.8#1 branch .. //depot/projects/binutils/src/bin/sync/sync.c#1 branch .. //depot/projects/binutils/src/bin/test/Makefile#1 branch .. //depot/projects/binutils/src/bin/test/TEST.README#1 branch .. //depot/projects/binutils/src/bin/test/TEST.csh#1 branch .. //depot/projects/binutils/src/bin/test/TEST.sh#1 branch .. //depot/projects/binutils/src/bin/test/test.1#1 branch .. //depot/projects/binutils/src/bin/test/test.c#1 branch .. //depot/projects/binutils/src/contrib/amd/AUTHORS#1 branch .. //depot/projects/binutils/src/contrib/amd/BUGS#1 branch .. //depot/projects/binutils/src/contrib/amd/COPYING#1 branch .. //depot/projects/binutils/src/contrib/amd/ChangeLog#1 branch .. //depot/projects/binutils/src/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/binutils/src/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/binutils/src/contrib/amd/INSTALL#1 branch .. //depot/projects/binutils/src/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/binutils/src/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/binutils/src/contrib/amd/NEWS#1 branch .. //depot/projects/binutils/src/contrib/amd/README#1 branch .. //depot/projects/binutils/src/contrib/amd/README.ldap#1 branch .. //depot/projects/binutils/src/contrib/amd/README.y2k#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amd.8#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amd.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amd.h#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/autil.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/clock.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/conf.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/map.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/opts.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/restart.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/sched.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amq/amq.8#1 branch .. //depot/projects/binutils/src/contrib/amd/amq/amq.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amq/amq.h#1 branch .. //depot/projects/binutils/src/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/binutils/src/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/binutils/src/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/binutils/src/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/binutils/src/contrib/amd/bootstrap#1 branch .. //depot/projects/binutils/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/binutils/src/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/binutils/src/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/binutils/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/binutils/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/binutils/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/binutils/src/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/binutils/src/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/binutils/src/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/binutils/src/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/binutils/src/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/binutils/src/contrib/amd/doc/version.texi#1 branch .. //depot/projects/binutils/src/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/binutils/src/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/binutils/src/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/binutils/src/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/binutils/src/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/binutils/src/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/binutils/src/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/binutils/src/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/binutils/src/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/binutils/src/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/binutils/src/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/binutils/src/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/binutils/src/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/binutils/src/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/binutils/src/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/binutils/src/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/binutils/src/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/binutils/src/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/binutils/src/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/binutils/src/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/binutils/src/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/binutils/src/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/binutils/src/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/binutils/src/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/binutils/src/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/binutils/src/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/binutils/src/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/binutils/src/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/binutils/src/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/binutils/src/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/binutils/src/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/binutils/src/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/binutils/src/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/binutils/src/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/binutils/src/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/binutils/src/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/binutils/src/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/binutils/src/contrib/amd/libamu/util.c#1 branch .. //depot/projects/binutils/src/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/binutils/src/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/binutils/src/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/binutils/src/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/binutils/src/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/binutils/src/contrib/amd/m4/amindent#1 branch .. //depot/projects/binutils/src/contrib/amd/m4/autopat#1 branch .. //depot/projects/binutils/src/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/binutils/src/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/binutils/src/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/binutils/src/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/binutils/src/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/binutils/src/contrib/amd/m4/mkconf#1 branch .. //depot/projects/binutils/src/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/binutils/src/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/binutils/src/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/binutils/src/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/binutils/src/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/binutils/src/contrib/amd/tasks#1 branch .. //depot/projects/binutils/src/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/binutils/src/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/binutils/src/contrib/bc/AUTHORS#1 branch .. //depot/projects/binutils/src/contrib/bc/ChangeLog#1 branch .. //depot/projects/binutils/src/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/binutils/src/contrib/bc/FAQ#1 branch .. //depot/projects/binutils/src/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/binutils/src/contrib/bc/INSTALL#1 branch .. //depot/projects/binutils/src/contrib/bc/Makefile.am#1 branch .. //depot/projects/binutils/src/contrib/bc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bc/NEWS#1 branch .. //depot/projects/binutils/src/contrib/bc/README#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/array.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/atan.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/div.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/exp.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/fact.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/jn.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/ln.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/mul.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/raise.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/signum#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/sine.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/binutils/src/contrib/bc/Test/timetest#1 branch .. //depot/projects/binutils/src/contrib/bc/acconfig.h#1 branch .. //depot/projects/binutils/src/contrib/bc/aclocal.m4#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/bc.y#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/const.h#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/execute.c#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/global.c#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/global.h#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/load.c#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/main.c#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/proto.h#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/scan.l#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/storage.c#1 branch .. //depot/projects/binutils/src/contrib/bc/bc/util.c#1 branch .. //depot/projects/binutils/src/contrib/bc/config.h.in#1 branch .. //depot/projects/binutils/src/contrib/bc/configure#1 branch .. //depot/projects/binutils/src/contrib/bc/configure.in#1 branch .. //depot/projects/binutils/src/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/binutils/src/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bc/dc/array.c#1 branch .. //depot/projects/binutils/src/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/binutils/src/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/binutils/src/contrib/bc/dc/dc.c#1 branch .. //depot/projects/binutils/src/contrib/bc/dc/dc.h#1 branch .. //depot/projects/binutils/src/contrib/bc/dc/eval.c#1 branch .. //depot/projects/binutils/src/contrib/bc/dc/misc.c#1 branch .. //depot/projects/binutils/src/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/binutils/src/contrib/bc/dc/stack.c#1 branch .. //depot/projects/binutils/src/contrib/bc/dc/string.c#1 branch .. //depot/projects/binutils/src/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/binutils/src/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bc/doc/bc.1#1 branch .. //depot/projects/binutils/src/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/binutils/src/contrib/bc/doc/dc.1#1 branch .. //depot/projects/binutils/src/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/binutils/src/contrib/bc/h/number.h#1 branch .. //depot/projects/binutils/src/contrib/bc/install-sh#1 branch .. //depot/projects/binutils/src/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/binutils/src/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bc/lib/number.c#1 branch .. //depot/projects/binutils/src/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/binutils/src/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/binutils/src/contrib/bc/missing#1 branch .. //depot/projects/binutils/src/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/binutils/src/contrib/bc/stamp-h.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/CHANGES#1 branch .. //depot/projects/binutils/src/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/binutils/src/contrib/bind9/FAQ#1 branch .. //depot/projects/binutils/src/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/binutils/src/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/binutils/src/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/binutils/src/contrib/bind9/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/README#1 branch .. //depot/projects/binutils/src/contrib/bind9/acconfig.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/binutils/src/contrib/bind9/config.guess#1 branch .. //depot/projects/binutils/src/contrib/bind9/config.sub#1 branch .. //depot/projects/binutils/src/contrib/bind9/config.threads.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/configure.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc3363.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 5 05:20:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 283C916A494; Sun, 5 Nov 2006 05:20:34 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 CD8B016A407 for ; Sun, 5 Nov 2006 05:20:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9468343D4C for ; Sun, 5 Nov 2006 05:20:33 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA55KXf8064111 for ; Sun, 5 Nov 2006 05:20:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA55KX0B064108 for perforce@freebsd.org; Sun, 5 Nov 2006 05:20:33 GMT (envelope-from jb@freebsd.org) Date: Sun, 5 Nov 2006 05:20:33 GMT Message-Id: <200611050520.kA55KX0B064108@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 05:20:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=109261 Change 109261 by jb@jb_freebsd8 on 2006/11/05 05:19:48 Integrate binutils-2.17. Affected files ... .. //depot/projects/binutils/src/contrib/binutils/COPYING#1 branch .. //depot/projects/binutils/src/contrib/binutils/COPYING.LIB#1 branch .. //depot/projects/binutils/src/contrib/binutils/Makefile.def#1 branch .. //depot/projects/binutils/src/contrib/binutils/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/Makefile.tpl#1 branch .. //depot/projects/binutils/src/contrib/binutils/README#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/COPYING#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ChangeLog#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ChangeLog-0001#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ChangeLog-0203#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ChangeLog-2004#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ChangeLog-2005#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ChangeLog-9193#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ChangeLog-9495#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ChangeLog-9697#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ChangeLog-9899#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/MAINTAINERS#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/Makefile.am#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/PORTING#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/README#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/TODO#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/acinclude.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/aclocal.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/aix386-core.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/aix5ppc-core.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/aout-adobe.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/aout-arm.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/aout-cris.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/aout-ns32k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/aout-sparcle.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/aout-target.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/aout-tic30.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/aout0.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/aout32.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/aout64.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/aoutf1.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/aoutx.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/archive.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/archive64.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/archures.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/armnetbsd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/bfd-in.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/bfd-in2.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/bfd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/bfd.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/bfdio.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/bfdwin.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/binary.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/bout.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cache.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cf-i386lynx.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cf-sparclynx.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cisco-core.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-alpha.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-apollo.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-arm.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-aux.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-go32.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-h8300.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-h8500.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-i386.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-i860.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-i960.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-ia64.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-m68k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-m88k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-maxq.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-mcore.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-mips.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-or32.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-pmac.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-ppc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-rs6000.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-sh.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-sparc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-stgo32.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-svm68k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-tic30.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-tic4x.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-tic54x.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-tic80.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-u68k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-w65.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-we32k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-z80.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff-z8k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coff64-rs6000.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coffcode.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coffgen.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cofflink.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/coffswap.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/config.bfd#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/config.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/configure#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/configure.com#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/configure.host#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/configure.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/corefile.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-alpha.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-arc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-arm.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-avr.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-bfin.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-cr16c.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-cris.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-crx.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-d10v.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-d30v.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-dlx.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-fr30.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-frv.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-h8300.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-h8500.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-hppa.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-i370.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-i386.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-i860.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-i960.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-ia64-opc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-ia64.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-ip2k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-iq2000.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-m10200.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-m10300.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-m32c.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-m32r.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-m68hc11.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-m68hc12.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-m68k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-m88k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-maxq.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-mcore.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-mips.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-mmix.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-msp430.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-mt.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-ns32k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-openrisc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-or32.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-pdp11.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-pj.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-powerpc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-rs6000.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-s390.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-sh.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-sparc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-tic30.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-tic4x.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-tic54x.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-tic80.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-v850.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-vax.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-w65.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-we32k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-xc16x.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-xstormy16.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-xtensa.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-z80.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/cpu-z8k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/demo64.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/dep-in.sed#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/ChangeLog#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/ChangeLog-9103#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/Makefile.am#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/aoutx.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/archive.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/archures.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/bfd.info#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/bfd.texinfo#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/bfdint.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/bfdio.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/bfdsumm.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/bfdt.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/bfdwin.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/cache.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/chew.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/coffcode.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/core.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/doc.str#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/elf.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/elfcode.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/fdl.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/format.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/hash.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/header.sed#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/init.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/libbfd.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/linker.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/makefile.vms#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/mmo.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/opncls.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/proto.str#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/reloc.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/section.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/syms.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/doc/targets.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/dwarf1.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/dwarf2.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ecoff.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ecofflink.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ecoffswap.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/efi-app-ia32.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/efi-app-ia64.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf-bfd.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf-eh-frame.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf-hppa.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf-m10200.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf-m10300.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf-strtab.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf-vxworks.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf-vxworks.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-am33lin.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-arc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-arm.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-avr.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-bfin.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-cr16c.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-cris.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-crx.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-d10v.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-d30v.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-dlx.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-fr30.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-frv.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-gen.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-h8300.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-hppa.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-hppa.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-i370.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-i386.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-i860.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-i960.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-ip2k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-iq2000.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-m32c.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-m32r.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-m68hc11.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-m68hc12.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-m68hc1x.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-m68hc1x.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-m68k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-m88k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-mcore.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-mips.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-msp430.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-mt.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-openrisc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-or32.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-pj.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-ppc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-ppc.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-s390.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-sh-symbian.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-sh.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-sh64-com.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-sh64.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-sh64.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-sparc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-v850.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-vax.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-xc16x.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-xstormy16.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32-xtensa.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf32.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf64-alpha.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf64-gen.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf64-hppa.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf64-hppa.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf64-mips.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf64-mmix.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf64-ppc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf64-ppc.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf64-s390.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf64-sh64.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf64-sparc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf64-x86-64.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elf64.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elfcode.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elfcore.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elflink.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elfn32-mips.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elfxx-ia64.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elfxx-mips.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elfxx-mips.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elfxx-sparc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elfxx-sparc.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/elfxx-target.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/epoc-pe-arm.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/epoc-pei-arm.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/format.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/freebsd.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/gen-aout.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/genlink.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/go32stub.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hash.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/host-aout.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/alphalinux.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/alphavms.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/decstation.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/delta68.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/dpx2.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/hp300bsd.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/i386bsd.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/i386linux.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/i386mach3.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/i386sco.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/i860mach3.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/m68kaux.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/m68klinux.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/m88kmach3.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/mipsbsd.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/mipsmach3.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/news-mips.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/news.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/pc532mach.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/riscos.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/symmetry.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/tahoe.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/vaxbsd.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/vaxlinux.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/vaxult.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hosts/vaxult2.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hp300bsd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hp300hpux.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hppabsd-core.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/hpux-core.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/i386aout.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/i386bsd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/i386dynix.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/i386freebsd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/i386linux.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/i386lynx.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/i386mach3.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/i386msdos.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/i386netbsd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/i386os9k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ieee.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ihex.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/init.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/irix-core.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/libaout.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/libbfd-in.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/libbfd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/libbfd.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/libcoff-in.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/libcoff.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/libecoff.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/libhppa.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/libieee.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/libnlm.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/liboasys.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/libpei.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/libxcoff.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/linker.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/lynx-core.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/m68k4knetbsd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/m68klinux.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/m68knetbsd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/m88kmach3.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/m88kopenbsd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/mach-o-target.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/mach-o.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/mach-o.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/makefile.vms#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/merge.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/mipsbsd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/mmo.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/netbsd-core.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/netbsd.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/newsos3.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/nlm-target.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/nlm.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/nlm32-alpha.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/nlm32-i386.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/nlm32-ppc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/nlm32-sparc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/nlm32.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/nlm64.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/nlmcode.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/nlmswap.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ns32k.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ns32knetbsd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/oasys.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/opncls.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/osf-core.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pc532-mach.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pdp11.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pe-arm.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pe-i386.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pe-mcore.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pe-mips.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pe-ppc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pe-sh.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/peXXigen.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pef-traceback.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pef.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pef.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pei-arm.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pei-i386.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pei-mcore.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pei-mips.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pei-ppc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/pei-sh.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/peicode.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/BLD-POTFILES.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/Make-in#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/SRC-POTFILES.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/bfd.pot#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/da.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/da.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/es.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/es.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/fr.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/fr.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/ja.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/ja.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/ro.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/ro.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/rw.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/rw.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/sv.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/sv.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/tr.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/tr.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/vi.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/vi.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/zh_CN.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/po/zh_CN.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ppcboot.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ptrace-core.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/reloc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/reloc16.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/riscix.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/rs6000-core.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/sco5-core.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/section.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/simple.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/som.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/som.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/sparclinux.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/sparclynx.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/sparcnetbsd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/srec.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/stab-syms.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/stabs.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/stamp-h.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/sunos.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/syms.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/sysdep.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/targets.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/targmatch.sed#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/tekhex.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/ticoff.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/trad-core.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/vax1knetbsd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/vaxbsd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/vaxnetbsd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/versados.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/version.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/vms-gsd.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/vms-hdr.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/vms-misc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/vms-tir.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/vms.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/vms.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/warning.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/xcoff-target.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/xcofflink.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/xsym.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/xsym.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/xtensa-isa.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/bfd/xtensa-modules.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/BRANCHES#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/ChangeLog#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/ChangeLog-0001#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/ChangeLog-0203#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/ChangeLog-2004#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/ChangeLog-2005#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/ChangeLog-9197#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/ChangeLog-9899#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/MAINTAINERS#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/Makefile.am#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/NEWS#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/README#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/acinclude.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/aclocal.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/addr2line.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/ar.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/arlex.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/arlex.l#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/arparse.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/arparse.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/arparse.y#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/arsup.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/arsup.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/binemul.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/binemul.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/bucomm.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/bucomm.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/budbg.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/budemang.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/budemang.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/coffdump.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/coffgrok.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/coffgrok.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/config.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/configure#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/configure.com#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/configure.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/configure.tgt#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/cxxfilt.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/debug.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/debug.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/deflex.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/deflex.l#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/defparse.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/defparse.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/defparse.y#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/dep-in.sed#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/dlltool.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/dlltool.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/dllwrap.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/Makefile.am#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/addr2line.1#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/ar.1#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/binutils.info#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/binutils.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/config.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/cxxfilt.man#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/dlltool.1#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/fdl.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/nlmconv.1#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/nm.1#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/objcopy.1#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/objdump.1#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/ranlib.1#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/readelf.1#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/size.1#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/strings.1#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/strip.1#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/doc/windres.1#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/dwarf.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/dwarf.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/emul_aix.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/emul_vanilla.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/filemode.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/ieee.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/is-ranlib.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/is-strip.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/makefile.vms-in#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/maybe-ranlib.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/maybe-strip.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/nlmconv.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/nlmconv.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/nlmheader.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/nlmheader.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/nlmheader.y#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/nm.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/not-ranlib.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/not-strip.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/objcopy.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/objdump.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/Make-in#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/POTFILES.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/binutils.pot#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/da.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/da.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/es.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/es.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/fi.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/fi.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/fr.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/fr.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/ja.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/ja.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/ro.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/ro.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/ru.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/ru.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/rw.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/rw.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/sv.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/sv.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/tr.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/tr.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/vi.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/vi.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/zh_CN.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/zh_CN.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/zh_TW.gmo#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/po/zh_TW.po#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/prdbg.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/ranlib.sh#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/rclex.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/rclex.l#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/rcparse.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/rcparse.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/rcparse.y#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/rdcoff.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/rddbg.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/readelf.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/rename.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/resbin.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/rescoff.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/resrc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/resres.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/sanity.sh#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/size.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/srconv.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/stabs.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/stamp-h.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/strings.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/sysdump.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/sysinfo.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/sysinfo.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/sysinfo.y#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/syslex.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/syslex.l#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/sysroff.info#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/ChangeLog#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/ChangeLog-9303#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/alias.def#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/ar.exp#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/bintest.s#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/dlltool.exp#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/fastcall.def#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/group.s#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/hppa/addendbug.s#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/hppa/freg.s#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/hppa/objdump.exp#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/link-order.s#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/m68k/movem.s#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/m68k/objdump.exp#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/nm.exp#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/objcopy.exp#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/objdump.exp#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/readelf.exp#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/readelf.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/readelf.r#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/readelf.r-64#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/readelf.s#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/readelf.s-64#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/readelf.ss#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/readelf.ss-64#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/readelf.ss-mips#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/readelf.ss-tmips#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/size.exp#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/testprog.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/unknown.s#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/vax/entrymask.s#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/vax/objdump.exp#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/README#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/bmp1.bmp#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/bmpalign.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/bmpalign.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/capstyle.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/capstyle.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/checkbox.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/checkbox.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/combobox.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/combobox.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/deflang.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/deflang.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/dialog0.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/dialog0.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/dialog1.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/dialog1.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/dialogid.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/dialogid.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/dialogsignature.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/dialogsignature.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/dlgfont.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/dlgfont.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/edittext.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/edittext.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/escapea.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/escapea.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/escapex-2.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/escapex-2.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/escapex.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/escapex.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/lang.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/lang.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/listbox.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/listbox.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/msupdate#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/nocaption.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/nocaption.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/printstyle.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/printstyle.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/quoteclass.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/scrollbar.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/scrollbar.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/strtab1.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/strtab1.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/sublang.rc#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/sublang.rsd#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/binutils-all/windres/windres.exp#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/config/default.exp#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/config/hppa.sed#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/testsuite/lib/utils-lib.exp#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/unwind-ia64.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/unwind-ia64.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/version.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/windres.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/windres.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/winduni.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/winduni.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/binutils/wrstabs.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/config-ml.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/config.guess#1 branch .. //depot/projects/binutils/src/contrib/binutils/config.sub#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/ChangeLog#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/acinclude.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/acx.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/codeset.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/depstand.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/enable.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/gettext-sister.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/gettext.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/glibc21.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/gxx-include-dir.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/iconv.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/intdiv0.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/inttypes-pri.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/inttypes.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/inttypes_h.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/lcmessage.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/lead-dot.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/lib-ld.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/lib-link.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/lib-prefix.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-armpic#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-cxux#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-cygwin#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-decstation#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-dgux386#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-djgpp#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-elfalphapic#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-i370pic#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-ia64pic#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-interix#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-lynxrs6k#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-m68kpic#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-ncr3000#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-necv4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-papic#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-ppc-aix#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-ppc-darwin#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-ppcpic#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-s390pic#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-sco#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-solaris#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-sparcpic#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-sysv4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-sysv5#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-x86omitfp#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mh-x86pic#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mt-alphaieee#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mt-d30v#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mt-gnu#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mt-netware#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mt-ospace#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mt-v810#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/mt-wince#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/nls.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/no-executables.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/po.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/progtest.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/stdint.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/stdint_h.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/tls.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/uintmax_t.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/ulonglong.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/config/warnings.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/configure#1 branch .. //depot/projects/binutils/src/contrib/binutils/configure.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/ChangeLog#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/cris.cpu#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/frv.cpu#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/frv.opc#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/iq10.cpu#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/iq2000.cpu#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/iq2000.opc#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/iq2000m.cpu#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/m32c.cpu#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/m32c.opc#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/m32r.cpu#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/m32r.opc#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/mt.cpu#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/mt.opc#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/sh.cpu#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/sh.opc#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/sh64-compact.cpu#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/sh64-media.cpu#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/simplify.inc#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/xc16x.cpu#1 branch .. //depot/projects/binutils/src/contrib/binutils/cpu/xc16x.opc#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/configbuild.ein#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/configbuild.fig#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/configbuild.jin#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/configbuild.tin#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/configdev.ein#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/configdev.fig#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/configdev.jin#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/configdev.tin#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/configure#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/configure.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/configure.info#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/configure.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/fdl.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/make-stds.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/standards.info#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/standards.texi#1 branch .. //depot/projects/binutils/src/contrib/binutils/etc/texi2pod.pl#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/CONTRIBUTORS#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/COPYING#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/ChangeLog#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/ChangeLog-0001#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/ChangeLog-0203#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/ChangeLog-2004#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/ChangeLog-2005#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/ChangeLog-9295#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/ChangeLog-9697#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/ChangeLog-9899#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/MAINTAINERS#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/Makefile.am#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/NEWS#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/README#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/acinclude.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/aclocal.m4#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/app.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/as.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/as.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/asintl.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/atof-generic.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/bfin-lex.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/bfin-parse.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/bfin-parse.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/bignum.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/bit_fix.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/cgen.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/cgen.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/cond.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config.in#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/aout_gnu.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/atof-ieee.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/atof-vax.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/bfin-aux.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/bfin-defs.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/bfin-lex.l#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/bfin-parse.y#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/e-crisaout.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/e-criself.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/e-i386aout.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/e-i386coff.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/e-i386elf.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/e-mipsecoff.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/e-mipself.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/itbl-mips.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/m68k-parse.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/m68k-parse.y#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-aout.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-aout.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-coff.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-coff.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-ecoff.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-ecoff.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-elf.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-elf.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-evax.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-evax.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-ieee.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-ieee.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-multi.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-multi.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-som.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/obj-som.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-alpha.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-alpha.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-arc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-arc.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-arm.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-arm.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-avr.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-avr.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-bfin.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-bfin.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-cris.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-cris.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-crx.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-crx.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-d10v.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-d10v.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-d30v.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-d30v.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-dlx.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-dlx.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-fr30.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-fr30.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-frv.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-frv.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-generic.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-generic.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-h8300.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-h8300.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-hppa.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-hppa.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-i370.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-i370.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-i386.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-i386.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-i860.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-i860.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-i960.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-i960.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-ia64.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-ia64.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-ip2k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-ip2k.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-iq2000.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-iq2000.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-m32c.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-m32c.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-m32r.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-m32r.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-m68851.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-m68hc11.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-m68hc11.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-m68k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-m68k.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-maxq.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-maxq.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-mcore.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-mcore.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-mips.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-mips.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-mmix.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-mmix.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-mn10200.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-mn10200.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-mn10300.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-mn10300.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-msp430.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-msp430.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-mt.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-mt.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-ns32k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-ns32k.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-openrisc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-openrisc.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-or32.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-or32.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-pdp11.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-pdp11.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-pj.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-pj.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-ppc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-ppc.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-s390.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-s390.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-sh.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-sh.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-sh64.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-sh64.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-sparc.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-sparc.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-tic30.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-tic30.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-tic4x.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-tic4x.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-tic54x.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-tic54x.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-v850.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-v850.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-vax.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-vax.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-xc16x.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-xc16x.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-xstormy16.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-xstormy16.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-xtensa.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-xtensa.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-z80.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-z80.h#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-z8k.c#1 branch .. //depot/projects/binutils/src/contrib/binutils/gas/config/tc-z8k.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 5 05:46:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7664B16A4B3; Sun, 5 Nov 2006 05:46:07 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 459ED16A415 for ; Sun, 5 Nov 2006 05:46:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0090043D49 for ; Sun, 5 Nov 2006 05:46:06 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA55k6Ls068563 for ; Sun, 5 Nov 2006 05:46:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA55k63Y068560 for perforce@freebsd.org; Sun, 5 Nov 2006 05:46:06 GMT (envelope-from jb@freebsd.org) Date: Sun, 5 Nov 2006 05:46:06 GMT Message-Id: <200611050546.kA55k63Y068560@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109263 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 05:46:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=109263 Change 109263 by jb@jb_freebsd8 on 2006/11/05 05:45:23 Update the version to reflect what we're building. Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/binutils/Makefile.inc0#2 edit Differences ... ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/Makefile.inc0#2 (text+ko) ==== @@ -4,7 +4,7 @@ # use the normal "Makefile.inc" mechanism, because we need some of these # definitions before the sub-Makefile is processed. -VERSION= "2.15 [FreeBSD] 2004-05-23" +VERSION= "2.17 [FreeBSD] 2006-06-23" TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == "amd64" From owner-p4-projects@FreeBSD.ORG Sun Nov 5 06:35:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E84516A417; Sun, 5 Nov 2006 06:35:21 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8B0FF16A40F for ; Sun, 5 Nov 2006 06:35:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A35143D45 for ; Sun, 5 Nov 2006 06:35:20 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA56ZKg9080027 for ; Sun, 5 Nov 2006 06:35:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA56ZKTT080024 for perforce@freebsd.org; Sun, 5 Nov 2006 06:35:20 GMT (envelope-from sam@freebsd.org) Date: Sun, 5 Nov 2006 06:35:20 GMT Message-Id: <200611050635.kA56ZKTT080024@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 06:35:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=109267 Change 109267 by sam@sam_ebb on 2006/11/05 06:35:16 merge work from sam_avila branch Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/IxNpeMicrocode.dat#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#4 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#5 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npereg.h#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#13 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.h#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#15 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#7 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#4 (text+ko) ==== @@ -195,6 +195,54 @@ VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + /* NPE-A Memory Space */ + { + IXP425_NPE_A_VBASE, + IXP425_NPE_A_HWBASE, + IXP425_NPE_A_SIZE, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + /* NPE-B Memory Space */ + { + IXP425_NPE_B_VBASE, + IXP425_NPE_B_HWBASE, + IXP425_NPE_B_SIZE, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + /* NPE-C Memory Space */ + { + IXP425_NPE_C_VBASE, + IXP425_NPE_C_HWBASE, + IXP425_NPE_C_SIZE, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + /* MAC-A Memory Space */ + { + IXP425_MAC_A_VBASE, + IXP425_MAC_A_HWBASE, + IXP425_MAC_A_SIZE, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + /* MAC-B Memory Space */ + { + IXP425_MAC_B_VBASE, + IXP425_MAC_B_HWBASE, + IXP425_MAC_B_SIZE, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + /* Q-Mgr Memory Space */ + { + IXP425_QMGR_VBASE, + IXP425_QMGR_HWBASE, + IXP425_QMGR_SIZE, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, { 0, ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#5 (text+ko) ==== @@ -14,3 +14,26 @@ arm/xscale/ixp425/ixp425_a4x_space.c optional uart arm/xscale/ixp425/ixp425_a4x_io.S optional uart dev/uart/uart_dev_ns8250.c optional uart +# +# NPE-based Ethernet support (requires qmgr also) +# +arm/xscale/ixp425/if_npe.c optional npe +arm/xscale/ixp425/ixp425_npe.c optional npe +ixp425_npe_fw.c optional npe_fw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk IxNpeMicrocode.dat:npe_fw -mnpe -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "ixp425_npe_fw.c" +# +# NB: ld encodes the path in the binary symbols generated for the +# firmware image so link the file to the object directory to +# get known values for reference in the _fw.c file. +# +IxNpeMicrocode.fwo optional npe_fw \ + dependency "$S/arm/xscale/ixp425/IxNpeMicrocode.dat" \ + compile-with "ln -s $S/arm/xscale/ixp425/IxNpeMicrocode.dat ${.OBJDIR}; ${LD} -b binary -d -warn-common -r -d -o ${.TARGET} IxNpeMicrocode.dat" \ + no-implicit-rule \ + clean "IxNpeMicrocode.dat IxNpeMicrocode.fwo" +# +# Q-Manager support +# +arm/xscale/ixp425/ixp425_qmgr.c optional qmgr ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#13 (text+ko) ==== @@ -78,6 +78,7 @@ { IXP425_QMGR_HWBASE, IXP425_QMGR_SIZE, IXP425_QMGR_VBASE }, { IXP425_NPE_A_HWBASE, IXP425_NPE_A_SIZE, IXP425_NPE_A_VBASE }, { IXP425_NPE_B_HWBASE, IXP425_NPE_B_SIZE, IXP425_NPE_B_VBASE }, + { IXP425_NPE_C_HWBASE, IXP425_NPE_C_SIZE, IXP425_NPE_C_VBASE }, { IXP425_MAC_A_HWBASE, IXP425_MAC_A_SIZE, IXP425_MAC_A_VBASE }, { IXP425_MAC_B_HWBASE, IXP425_MAC_B_SIZE, IXP425_MAC_B_VBASE }, }; ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#15 (text+ko) ==== @@ -287,7 +287,6 @@ } rv = rman_reserve_resource(rmanp, start, end, count, flags, child); - device_printf(bus, "start: %#lx, end: %#lx, count: %#lx, flags: %#x, rv: %p\n", start, end, count, flags, rv); if (rv != NULL) { rman_set_rid(rv, *rid); if (type == SYS_RES_IOPORT) { ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#7 (text+ko) ==== @@ -295,7 +295,7 @@ u_int32_t data; data = _bs_r(v, ioh, off, 0); - return (data); + return data; } #ifdef __ARMEB__ @@ -329,7 +329,7 @@ u_int32_t data; data = _bs_r(v, ioh, off, 0); - return data; + return le32toh(data); } #endif /* __ARMEB__ */ @@ -372,7 +372,6 @@ _pci_io_bs_w_4(void *v, bus_space_handle_t ioh, bus_size_t off, u_int32_t val) { - _bs_w(v, ioh, off, 0, val); } @@ -405,7 +404,7 @@ _pci_io_bs_w_4_s(void *v, bus_space_handle_t ioh, bus_size_t off, u_int32_t val) { - _bs_w(v, ioh, off, 0, val); + _bs_w(v, ioh, off, 0, htole32(val)); } #endif /* __ARMEB__ */ ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#3 (text+ko) ==== @@ -108,9 +108,9 @@ #define IXP425_INTR_OFFSET 0x00003000UL #define IXP425_GPIO_OFFSET 0x00004000UL #define IXP425_TIMER_OFFSET 0x00005000UL -#define IXP425_HSS_OFFSET 0x00006000UL /* Not User Programmable */ -#define IXP425_NPE_A_OFFSET 0x00007000UL /* Not User Programmable */ -#define IXP425_NPE_B_OFFSET 0x00008000UL /* Not User Programmable */ +#define IXP425_NPE_A_OFFSET 0x00006000UL /* Not User Programmable */ +#define IXP425_NPE_B_OFFSET 0x00007000UL /* Not User Programmable */ +#define IXP425_NPE_C_OFFSET 0x00008000UL /* Not User Programmable */ #define IXP425_MAC_A_OFFSET 0x00009000UL #define IXP425_MAC_B_OFFSET 0x0000a000UL #define IXP425_USB_OFFSET 0x0000b000UL @@ -216,9 +216,9 @@ #define IXP425_INT_TMR0 5 /* General-Purpose Timer0 */ #define IXP425_INT_QUE33_64 4 /* Queue Manager 33-64 */ #define IXP425_INT_QUE1_32 3 /* Queue Manager 1-32 */ -#define IXP425_INT_NPE_B 2 /* Ethernet NPE B */ -#define IXP425_INT_NPE_A 1 /* Ethernet NPE A */ -#define IXP425_INT_HSS 0 /* WAN/HSS NPE */ +#define IXP425_INT_NPE_C 2 /* NPE C */ +#define IXP425_INT_NPE_B 1 /* NPE B */ +#define IXP425_INT_NPE_A 0 /* NPE A */ /* * software interrupt @@ -291,6 +291,7 @@ #define EXP_TIMING_CS7_OFFSET 0x001c #define EXP_CNFG0_OFFSET 0x0020 #define EXP_CNFG1_OFFSET 0x0024 +#define EXP_FCTRL_OFFSET 0x0028 #define IXP425_EXP_RECOVERY_SHIFT 16 #define IXP425_EXP_HOLD_SHIFT 20 @@ -305,7 +306,7 @@ #define IXP425_EXP_SETUP_T(x) (((x) & 3) << IXP425_EXP_SETUP_SHIFT) #define IXP425_EXP_ADDR_T(x) (((x) & 3) << IXP425_EXP_ADDR_SHIFT) -// EXP_CSn bits +/* EXP_CSn bits */ #define EXP_BYTE_EN (1 << 0) #define EXP_WR_EN (1 << 1) #define EXP_SPLT_EN (1 << 3) @@ -332,17 +333,34 @@ #define EXP_CYC_MOTO (1 << 14) #define EXP_CYC_HPI (2 << 14) -// EXP_CNFG0 bits +/* EXP_CNFG0 bits */ #define EXP_CNFG0_8BIT (1 << 0) #define EXP_CNFG0_PCI_HOST (1 << 1) #define EXP_CNFG0_PCI_ARB (1 << 2) #define EXP_CNFG0_PCI_66MHZ (1 << 4) #define EXP_CNFG0_MEM_MAP (1 << 31) -// EXP_CNFG1 bits +/* EXP_CNFG1 bits */ #define EXP_CNFG1_SW_INT0 (1 << 0) #define EXP_CNFG1_SW_INT1 (1 << 1) +#define EXP_FCTRL_RCOMP (1<<0) +#define EXP_FCTRL_USB (1<<1) +#define EXP_FCTRL_HASH (1<<2) +#define EXP_FCTRL_AES (1<<3) +#define EXP_FCTRL_DES (1<<4) +#define EXP_FCTRL_HDLC (1<<5) +#define EXP_FCTRL_AAL (1<<6) +#define EXP_FCTRL_HSS (1<<7) +#define EXP_FCTRL_UTOPIA (1<<8) +#define EXP_FCTRL_ETH0 (1<<9) +#define EXP_FCTRL_ETH1 (1<<10) +#define EXP_FCTRL_NPEA (1<<11) +#define EXP_FCTRL_NPEB (1<<12) +#define EXP_FCTRL_NPEC (1<<13) +#define EXP_FCTRL_PCI (1<<14) +/* XXX more stuff we don't care about */ + /* * PCI */ @@ -500,8 +518,7 @@ */ #define IXP425_QMGR_HWBASE 0x60000000UL #define IXP425_QMGR_VBASE (IXP425_PCI_VBASE + IXP425_PCI_SIZE) -/* NB: really only 0x4000 */ -#define IXP425_QMGR_SIZE IXP425_IO_SIZE +#define IXP425_QMGR_SIZE 0x4000 /* * Network Processing Engines (NPE's) and associated Ethernet MAC's. From owner-p4-projects@FreeBSD.ORG Sun Nov 5 06:37:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E57F16A492; Sun, 5 Nov 2006 06:37:27 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 759FA16A47C for ; Sun, 5 Nov 2006 06:37:27 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74F0043D5F for ; Sun, 5 Nov 2006 06:37:23 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA56bNcA080116 for ; Sun, 5 Nov 2006 06:37:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA56bNGM080113 for perforce@freebsd.org; Sun, 5 Nov 2006 06:37:23 GMT (envelope-from sam@freebsd.org) Date: Sun, 5 Nov 2006 06:37:23 GMT Message-Id: <200611050637.kA56bNGM080113@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 06:37:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=109268 Change 109268 by sam@sam_ebb on 2006/11/05 06:36:31 merge from sam_avila Affected files ... .. //depot/projects/arm/src/sys/arm/conf/AVILA#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/AVILA#3 (text+ko) ==== @@ -29,7 +29,7 @@ #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. -#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale options HZ=100 #options DEVICE_POLLING @@ -59,43 +59,40 @@ options BOOTP_NFSROOT options BOOTP_NFSV3 options BOOTP_WIRED_TO=npe0 +#options BOOTP_WIRED_TO=ath0 options BOOTP_COMPAT #options PREEMPTION +#options VERBOSE_SYSINIT + device genclock -device loop -device ether device nexus device mem # Memory and kernel memory devices #device saarm -device miibus -device rl -device em + +device pci device uart -device pci + +# I2C Bus +device iicbus +device iicbb +device iic + +device ixpiic device ata device atadisk # ATA disk drives -device ataraid # ATA RAID drives -device atapicd # ATAPI CDROM drives -device atapifd # ATAPI floppy drives -device atapist # ATAPI tape drives options ATA_STATIC_ID # Static device numbering -# SCSI Controllers +device npe # Network Processing Engine +device npe_fw # NPE firmware +device firmware # firmware support for npe_fw +device qmgr # Q Manager +device miibus # NB: required by npe +device ether device pty -#options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -#options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. - -# I2C Bus -device iicbus -device iicbb -device iic +device loop -device ixpiic - # Debugging for use in -current options KDB options DDB #Enable the kernel debugger @@ -109,9 +106,18 @@ #options SMP # Symmetric MultiProcessor Kernel #options APIC_IO # Symmetric (APIC) I/O options XSCALE_CACHE_READ_WRITE_ALLOCATE -device md +device md device random # Entropy device #options ARM_USE_SMALL_ALLOC # Floppy drives +# Wireless NIC cards +device wlan # 802.11 support +#device wlan_wep # 802.11 WEP support +#device wlan_ccmp # 802.11 CCMP support +#device wlan_tkip # 802.11 TKIP support +device ath # Atheros pci/cardbus NIC's +device ath_hal # Atheros HAL (Hardware Access Layer) +device ath_rate_sample # SampleRate tx rate control for ath +options ATH_DEBUG From owner-p4-projects@FreeBSD.ORG Sun Nov 5 06:39:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB6FF16A417; Sun, 5 Nov 2006 06:39:26 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A970A16A40F for ; Sun, 5 Nov 2006 06:39:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60DCD43D55 for ; Sun, 5 Nov 2006 06:39:26 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA56dQni080208 for ; Sun, 5 Nov 2006 06:39:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA56dQfN080205 for perforce@freebsd.org; Sun, 5 Nov 2006 06:39:26 GMT (envelope-from sam@freebsd.org) Date: Sun, 5 Nov 2006 06:39:26 GMT Message-Id: <200611050639.kA56dQfN080205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109269 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 06:39:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=109269 Change 109269 by sam@sam_ebb on 2006/11/05 06:39:08 merge from sam_avila: identify steppings a la intel docs Affected files ... .. //depot/projects/arm/src/sys/arm/arm/identcpu.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/identcpu.c#8 (text+ko) ==== @@ -134,7 +134,7 @@ }; static const char * const ixp425_steppings[16] = { - "step 0", "rev 1", "rev 2", "rev 3", + "step 0 (A0)", "rev 1 (ARMv5TE)", "rev 2", "rev 3", "rev 4", "rev 5", "rev 6", "rev 7", "rev 8", "rev 9", "rev 10", "rev 11", "rev 12", "rev 13", "rev 14", "rev 15", From owner-p4-projects@FreeBSD.ORG Sun Nov 5 06:56:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85A9416A4A0; Sun, 5 Nov 2006 06:56:54 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3ECE216A492 for ; Sun, 5 Nov 2006 06:56:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 35FC543D6A for ; Sun, 5 Nov 2006 06:56:50 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA56uo7H083245 for ; Sun, 5 Nov 2006 06:56:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA56uoa1083242 for perforce@freebsd.org; Sun, 5 Nov 2006 06:56:50 GMT (envelope-from jb@freebsd.org) Date: Sun, 5 Nov 2006 06:56:50 GMT Message-Id: <200611050656.kA56uoa1083242@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 06:56:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=109272 Change 109272 by jb@jb_freebsd8 on 2006/11/05 06:56:12 Merge the DTrace files back in. Affected files ... .. //depot/projects/dtrace/src/sys/conf/files#38 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/files#38 (text+ko) ==== @@ -102,6 +102,20 @@ cam/scsi/scsi_ses.c optional ses cam/scsi/scsi_targ_bh.c optional targbh cam/scsi/scsi_target.c optional targ +cddl/dev/dtrace/dtrace.c optional dtrace | fasttrap \ + compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" +cddl/dev/dtrace/dtrace_mutex.c optional dtrace | fasttrap \ + compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" +cddl/dev/fasttrap/fasttrap.c optional dtrace | fasttrap \ + compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" +cddl/kern/cyclic.c optional cyclic \ + compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" +cddl/kern/kern_cyclic.c optional cyclic \ + compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" +cddl/kern/kmem.c optional cyclic | kdtrace \ + compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" +cddl/kern/vmem.c optional cyclic | kdtrace \ + compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat" coda/coda_fbsd.c optional vcoda coda/coda_namecache.c optional vcoda coda/coda_psdev.c optional vcoda From owner-p4-projects@FreeBSD.ORG Sun Nov 5 06:58:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8F2D16A515; Sun, 5 Nov 2006 06:58:53 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 85A4816A513 for ; Sun, 5 Nov 2006 06:58:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4171B43D46 for ; Sun, 5 Nov 2006 06:58:53 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA56wrt4083340 for ; Sun, 5 Nov 2006 06:58:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA56wqet083337 for perforce@freebsd.org; Sun, 5 Nov 2006 06:58:52 GMT (envelope-from jb@freebsd.org) Date: Sun, 5 Nov 2006 06:58:52 GMT Message-Id: <200611050658.kA56wqet083337@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 06:58:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=109273 Change 109273 by jb@jb_freebsd8 on 2006/11/05 06:57:55 Add the CYCLIC option. Affected files ... .. //depot/projects/dtrace/src/sys/conf/options#24 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/options#24 (text+ko) ==== @@ -70,6 +70,7 @@ COMPAT_FREEBSD6 opt_compat.h COMPILING_LINT opt_global.h CY_PCI_FASTINTR +CYCLIC opt_cyclic.h DIRECTIO FULL_PREEMPTION opt_sched.h IPI_PREEMPTION opt_sched.h From owner-p4-projects@FreeBSD.ORG Sun Nov 5 08:22:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE4DA16A512; Sun, 5 Nov 2006 08:22:43 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7FB7D16A4F3 for ; Sun, 5 Nov 2006 08:22:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 812A243D7D for ; Sun, 5 Nov 2006 08:22:38 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA58Mc49099567 for ; Sun, 5 Nov 2006 08:22:38 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA58McMg099564 for perforce@freebsd.org; Sun, 5 Nov 2006 08:22:38 GMT (envelope-from jb@freebsd.org) Date: Sun, 5 Nov 2006 08:22:38 GMT Message-Id: <200611050822.kA58McMg099564@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109275 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 08:22:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=109275 Change 109275 by jb@jb_freebsd8 on 2006/11/05 08:21:53 Add a method to list names and values. Affected files ... .. //depot/projects/dtrace/src/sys/kern/linker_if.m#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/linker_if.m#5 (text+ko) ==== @@ -64,6 +64,17 @@ }; # +# Call the callback with each specified function and it's value +# defined in the file. +# Stop and return the error if the callback returns an error. +# +METHOD int each_function_nameval { + linker_file_t file; + linker_function_nameval_callback_t callback; + void* opaque; +}; + +# # Search for a linker set in a file. Return a pointer to the first # entry (which is itself a pointer), and the number of entries. # "stop" points to the entry beyond the last valid entry. From owner-p4-projects@FreeBSD.ORG Sun Nov 5 13:23:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BEB516A4E5; Sun, 5 Nov 2006 13:23:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 45A4616A4C8 for ; Sun, 5 Nov 2006 13:23:57 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28B0D43D7E for ; Sun, 5 Nov 2006 13:23:56 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA5DNuBa074196 for ; Sun, 5 Nov 2006 13:23:56 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA5DNtcW074192 for perforce@freebsd.org; Sun, 5 Nov 2006 13:23:55 GMT (envelope-from als@FreeBSD.org) Date: Sun, 5 Nov 2006 13:23:55 GMT Message-Id: <200611051323.kA5DNtcW074192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 109281 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 13:23:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=109281 Change 109281 by als@als_head on 2006/11/05 13:23:36 add prison id for separate posix semaphore between context. Affected files ... .. //depot/projects/jail2/sys/posix4/ksem.h#2 edit Differences ... ==== //depot/projects/jail2/sys/posix4/ksem.h#2 (text+ko) ==== @@ -54,6 +54,7 @@ int ks_waiters; /* number of waiters */ LIST_HEAD(, kuser) ks_users; /* pids using this sem */ struct label *ks_label; /* MAC label */ + int32_t pr_id; /* prison owner id */ }; #endif /* !_POSIX4_KSEM_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Nov 5 15:01:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC94516A407; Sun, 5 Nov 2006 15:01:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 7C65E16A416 for ; Sun, 5 Nov 2006 15:01:01 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9119643D66 for ; Sun, 5 Nov 2006 15:01:00 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA5F10f4090667 for ; Sun, 5 Nov 2006 15:01:00 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA5F10Vn090660 for perforce@freebsd.org; Sun, 5 Nov 2006 15:01:00 GMT (envelope-from als@FreeBSD.org) Date: Sun, 5 Nov 2006 15:01:00 GMT Message-Id: <200611051501.kA5F10Vn090660@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 109286 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 15:01:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=109286 Change 109286 by als@als_head on 2006/11/05 15:00:14 add prof of concept code to allow modules corectly init from jails. each jail must call kldload "name", and kernel fake this. Affected files ... .. //depot/projects/jail2/sys/kern/kern_jail2_init.c#2 edit .. //depot/projects/jail2/sys/kern/kern_linker.c#6 edit .. //depot/projects/jail2/sys/kern/uipc_sem.c#4 edit .. //depot/projects/jail2/sys/sys/jail.h#6 edit .. //depot/projects/jail2/sys/sys/jail2_init.h#3 edit .. //depot/projects/jail2/sys/sys/linker.h#3 edit Differences ... ==== //depot/projects/jail2/sys/kern/kern_jail2_init.c#2 (text+ko) ==== @@ -3,59 +3,76 @@ #include #include -#include -#include +#include #include #include #include -static struct jail_sysinitlist j_sysinit; -static struct rwlock j_sysinit_lock; -RW_SYSINIT(jsysinit, &j_sysinit_lock, "Jail2 sys[un]init lock"); +static struct jail_initlist j_sysinit; + +static struct sx j_sysinit_lock; +SX_SYSINIT(jsysinit, &j_sysinit_lock, "Jail2 sys[un]init lock"); + +#define jprint(a...) printf(a) -void jailsysinit_add(struct jail_sysinit *sinit) +void jailsysinit_add(struct jailinit *sinit) { - struct jail_sysinit *cur; + struct jailinit *cur; - rw_wlock(&j_sysinit_lock); - TAILQ_FOREACH(cur, &j_sysinit, list) { - if (cur->subsystem < sinit->subsystem || - (cur->subsystem == sinit->subsystem && - cur->order <= sinit->order)) { - TAILQ_INSERT_AFTER(&j_sysinit, cur, sinit, list); - break; + jprint("jail add init %p - %d/%d\n", sinit, + sinit->subsystem, sinit->order); + sx_xlock(&j_sysinit_lock); + if (TAILQ_EMPTY(&j_sysinit)) { + TAILQ_INSERT_HEAD(&j_sysinit, sinit, list); + } else { + TAILQ_FOREACH(cur, &j_sysinit, list) { + if (cur->subsystem < sinit->subsystem || + (cur->subsystem == sinit->subsystem && + cur->order <= sinit->order)) { + TAILQ_INSERT_AFTER(&j_sysinit, cur, sinit, list); + break; + } } } - rw_wunlock(&j_sysinit_lock); + sx_xunlock(&j_sysinit_lock); } -void jailsysinit_del(struct jail_sysinit *sinit) +void jailsysinit_del(struct jailinit *sinit) { - rw_wlock(&j_sysinit_lock); + jprint("jail del init %p - %d/%d\n", sinit, + sinit->subsystem, sinit->order); + + sx_xlock(&j_sysinit_lock); TAILQ_REMOVE(&j_sysinit, sinit, list); - rw_wunlock(&j_sysinit_lock); + sx_xunlock(&j_sysinit_lock); } void prison_init(struct prison *pr) { - struct jail_sysinit *cur; + struct jailinit *cur; - rw_rlock(&j_sysinit_lock); + jprint("start jail init\n"); + sx_slock(&j_sysinit_lock); TAILQ_FOREACH(cur, &j_sysinit, list) { + jprint("jail init %p - %d/%d\n", cur, + cur->subsystem, cur->order); cur->init(pr); } - rw_runlock(&j_sysinit_lock); + sx_sunlock(&j_sysinit_lock); } void prinson_fini(struct prison *pr) { - struct jail_sysinit *cur; + struct jailinit *cur; - rw_rlock(&j_sysinit_lock); - TAILQ_FOREACH_REVERSE(cur, &j_sysinit, jail_sysinitlist, list) { + jprint("start jail fini\n"); + sx_slock(&j_sysinit_lock); + TAILQ_FOREACH_REVERSE(cur, &j_sysinit, jail_initlist, list) { + jprint("jail fini %p - %d/%d\n", cur, + cur->subsystem, cur->order); cur->fini(pr); } - rw_runlock(&j_sysinit_lock); + sx_sunlock(&j_sysinit_lock); } ==== //depot/projects/jail2/sys/kern/kern_linker.c#6 (text+ko) ==== @@ -31,6 +31,8 @@ #include "opt_hwpmc_hooks.h" #include "opt_mac.h" +#define KLD_DEBUG + #include #include #include @@ -55,14 +57,17 @@ #include "linker_if.h" +#ifdef JAIL #include +#include +#endif #ifdef HWPMC_HOOKS #include #endif #ifdef KLD_DEBUG -int kld_debug = 0; +int kld_debug = 1; #endif #define KLD_LOCK() sx_xlock(&kld_sx) @@ -138,6 +143,13 @@ struct mod_depend *verinfo, struct linker_file **lfpp); static modlist_t modlist_lookup2(const char *name, struct mod_depend *verinfo); +#ifdef JAIL +static int jail_load_module(struct thread *td, const char *kldname, const char *modname); +static int jail_unload_module(struct thread *td, linker_file_t lf); +static int jail_kldnext(struct thread *td, struct kldnext_args *uap); +#endif + + static char * linker_strdup(const char *str) { @@ -310,6 +322,127 @@ mtx_unlock(&Giant); } +#ifdef JAIL + +static void +linker_file_register_jailinit(linker_file_t lf, struct prison *pr) +{ + struct jailinit **start, **stop, **sipp, **xipp, *save; + + KLD_DPF(FILE, + ("linker_file_register_jailinit: registering jailinit for %s\n", + lf->filename)); + + if (linker_file_lookup_set(lf, "jailinit_set", &start, &stop, NULL) != 0) + return; + + lf->flags |= LINKER_ALLOW_JAIL; + /* perform sorting - get from liker_file_sysuninit */ + for (sipp = start; sipp < stop; sipp++) { + for (xipp = sipp + 1; xipp < stop; xipp++) { + if ((*sipp)->subsystem < (*xipp)->subsystem || + ((*sipp)->subsystem == (*xipp)->subsystem && + (*sipp)->order >= (*xipp)->order)) + continue; /* skip */ + save = *sipp; + *sipp = *xipp; + *xipp = save; + } + } + + mtx_lock(&Giant); + for (sipp = start; sipp < stop; sipp++) { + if ((*sipp)->subsystem == SI_SUB_DUMMY) + continue; /* skip dummy task(s) */ + + if (!pr_jailed(pr)) + jailsysinit_add(*sipp); + /* Call function */ + (*((*sipp)->init)) (pr); + } + mtx_unlock(&Giant); + +} + +static void +linker_file_jailuninit(linker_file_t lf, struct prison *pr) +{ + struct jailinit **start, **stop, **sipp, **xipp, *save; + + KLD_DPF(FILE, + ("linker_file_jailuninit: unregistering jailinit for %s\n", + lf->filename)); + + if (linker_file_lookup_set(lf, "jailinit_set", &start, &stop, NULL) != 0) + return; + + /* perform sorting - get from liker_file_sysuninit */ + for (sipp = start; sipp < stop; sipp++) { + for (xipp = sipp + 1; xipp < stop; xipp++) { + if ((*sipp)->subsystem > (*xipp)->subsystem || + ((*sipp)->subsystem == (*xipp)->subsystem && + (*sipp)->order >= (*xipp)->order)) + continue; /* skip */ + save = *sipp; + *sipp = *xipp; + *xipp = save; + } + } + + mtx_lock(&Giant); + for (sipp = start; sipp < stop; sipp++) { + if ((*sipp)->subsystem == SI_SUB_DUMMY) + continue; /* skip dummy task(s) */ + + if (!pr_jailed(pr)) + jailsysinit_del(*sipp); + /* Call function */ + (*((*sipp)->fini)) (pr); + } + mtx_unlock(&Giant); +} + +static int +linker_file_canshow(linker_file_t lf, struct prison *pr) +{ + struct jailinit **start, **stop, **sipp, **xipp, *save; + int show = 1; + + KLD_DPF(FILE, + ("linker_file_can show: for %s\n", lf->filename)); + + if (linker_file_lookup_set(lf, "jailinit_set", &start, &stop, NULL) != 0) + return (0); + + /* perform sorting - get from liker_file_sysuninit */ + for (sipp = start; sipp < stop; sipp++) { + for (xipp = sipp + 1; xipp < stop; xipp++) { + if ((*sipp)->subsystem > (*xipp)->subsystem || + ((*sipp)->subsystem == (*xipp)->subsystem && + (*sipp)->order >= (*xipp)->order)) + continue; /* skip */ + save = *sipp; + *sipp = *xipp; + *xipp = save; + } + } + + mtx_lock(&Giant); + for (sipp = start; sipp < stop; sipp++) { + if ((*sipp)->subsystem == SI_SUB_DUMMY) + continue; /* skip dummy task(s) */ + /* Call function */ + show &= (*((*sipp)->is_show))(pr); + if (show == 0) + break; + } + mtx_unlock(&Giant); + + return (show); +} + +#endif + static int linker_file_register_modules(linker_file_t lf) { @@ -356,6 +489,9 @@ { linker_file_register_modules(linker_kernel_file); +#ifdef JAIL + linker_file_register_jailinit(linker_kernel_file, &jail_0); +#endif } SYSINIT(linker_kernel, SI_SUB_KLD, SI_ORDER_ANY, linker_init_kernel_modules, 0) @@ -406,6 +542,9 @@ } linker_file_register_sysctls(lf); linker_file_sysinit(lf); +#ifdef JAIL + linker_file_register_jailinit(lf, &jail_0); +#endif lf->flags |= LINKER_FILE_LINKED; *result = lf; return (0); @@ -612,6 +751,7 @@ * link error. */ if (file->flags & LINKER_FILE_LINKED) { + linker_file_jailuninit(file, &jail_0); linker_file_sysuninit(file); linker_file_unregister_sysctls(file); } @@ -837,6 +977,7 @@ } #endif + /* * Syscalls. */ @@ -849,14 +990,15 @@ #ifdef HWPMC_HOOKS struct pmckern_map_in pkm; #endif + struct ucred *tdcred = td->td_ucred; const char *kldname, *modname; linker_file_t lf; int error; - if ((error = securelevel_gt(td->td_ucred, 0)) != 0) + if ((error = securelevel_gt(tdcred, 0)) != 0) return (error); - if ((error = suser(td)) != 0) + if ((error = suser_cred(tdcred, SUSER_ALLOWJAIL)) != 0) return (error); /* @@ -871,8 +1013,15 @@ kldname = NULL; modname = file; } + KLD_LOCK(); +#ifdef JAIL + if (jailed(tdcred)) { + error = jail_load_module(td, kldname, modname); + goto unlock; + } +#endif + - KLD_LOCK(); error = linker_load_module(kldname, modname, NULL, NULL, &lf); if (error) goto unlock; @@ -917,17 +1066,25 @@ #ifdef HWPMC_HOOKS struct pmckern_map_out pkm; #endif + struct ucred *tdcred = td->td_ucred; linker_file_t lf; int error = 0; - if ((error = securelevel_gt(td->td_ucred, 0)) != 0) + if ((error = securelevel_gt(tdcred, 0)) != 0) return (error); - if ((error = suser(td)) != 0) + if ((error = suser_cred(tdcred, SUSER_ALLOWJAIL)) != 0) return (error); KLD_LOCK(); lf = linker_find_file_by_id(fileid); +#ifdef JAIL + if (jailed(tdcred)) { + error = jail_unload_module(td, lf); + goto unlock; + } +#endif + if (lf) { KLD_DPF(FILE, ("kldunload: lf->userrefs=%d\n", lf->userrefs)); if (lf->userrefs == 0) { @@ -955,6 +1112,9 @@ if (error == 0) PMC_CALL_HOOK(td, PMC_FN_KLD_UNLOAD, (void *) &pkm); #endif +#ifdef JAIL +unlock: +#endif KLD_UNLOCK(); return (error); } @@ -1032,6 +1192,10 @@ if (error) return (error); #endif +#ifdef JAIL + if (pr_jailed(td_prison(td))) + return jail_kldnext(td, uap); +#endif KLD_LOCK(); if (uap->fileid == 0) { @@ -1466,6 +1630,7 @@ &si_stop, NULL) == 0) sysinit_add(si_start, si_stop); linker_file_register_sysctls(lf); + linker_file_register_jailinit(lf, &jail_0); lf->flags |= LINKER_FILE_LINKED; } /* woohoo! we made it! */ @@ -1820,6 +1985,101 @@ } #endif +#ifdef JAIL +static int +jail_load_module(struct thread *td, const char *kldname, const char *modname) +{ + struct prison *pr = td_prison(td); + linker_file_t lf; + const char *filename; + char *pathname; + + KLD_LOCK_ASSERT(); + + if (modname == NULL) { + /* + * We have to load KLD + */ + pathname = linker_search_kld(kldname); + } else { +#if 0 + /* XXX ? */ + if (modlist_lookup2(modname, verinfo) != NULL) + return (EEXIST); +#endif + if (kldname != NULL) + pathname = linker_strdup(kldname); + else if (rootvnode == NULL) + pathname = NULL; + else + /* + * Need to find a KLD with required module + */ + pathname = linker_search_module(modname, + strlen(modname), NULL); + } + if (pathname == NULL) + return (ENOENT); + + + /* + * Can't load more than one file with the same basename XXX: + * Actually it should be possible to have multiple KLDs with + * the same basename but different path because they can + * provide different versions of the same modules. + */ + filename = linker_basename(pathname); + lf = linker_find_file_by_name(filename); + if (lf == NULL) + return (ESRCH); + + if ((lf->flags & LINKER_ALLOW_JAIL) == 0) + return (EPERM); + + lf->refs++; + linker_file_register_jailinit(lf, pr); + + return (0); +} + +static int +jail_unload_module(struct thread *td, linker_file_t lf) +{ + struct prison *pr = td_prison(td); + + if ((lf->flags & LINKER_ALLOW_JAIL) == 0) + return (EPERM); + + linker_file_jailuninit(lf, pr); + lf->refs--; + + return (0); +} + +int jail_kldnext(struct thread *td, struct kldnext_args *uap) +{ + linker_file_t lftmp; + struct prison *pr = td_prison(td); + int tmp = uap->fileid; + + KLD_LOCK(); + TAILQ_FOREACH(lftmp, &linker_files, link) { + if ((lftmp->id > tmp) && (linker_file_canshow(lftmp, pr))) { + td->td_retval[0] = lftmp->id; + tmp = 0; + goto exit; + } + } + td->td_retval[0] = 0; + tmp = ENOENT; +exit: + KLD_UNLOCK(); + + return (tmp); +} + +#endif + /* * Find a file which contains given module and load it, if "parent" is not * NULL, register a reference to it. ==== //depot/projects/jail2/sys/kern/uipc_sem.c#4 (text+ko) ==== @@ -64,6 +64,11 @@ #include +#ifdef JAIL +#include +#include +#endif + static int sem_count_proc(struct proc *p); static struct ksem *sem_lookup_byname(const char *name); static int sem_create(struct thread *td, const char *name, @@ -285,7 +290,7 @@ int oflag; mode_t mode; unsigned int value; - semid_t *idp; + semid_t *idp; }; int ksem_open(struct thread *td, struct ksem_open_args *uap); #endif @@ -374,7 +379,7 @@ } } else { DP(("sem_create: about to add to list...\n")); - LIST_INSERT_HEAD(&ksem_head, ksnew, ks_entry); + LIST_INSERT_HEAD(&ksem_head, ksnew, ks_entry); DP(("sem_create: setting list bit...\n")); ksnew->ks_onlist = 1; DP(("sem_create: done, about to unlock...\n")); @@ -424,7 +429,7 @@ ks->ks_uid, ks->ks_gid, ks->ks_mode)); if (uc->cr_prison->pr_id != ks->pr_id) return (EPERM); - + if ((uc->cr_uid == ks->ks_uid && (ks->ks_mode & S_IWUSR) != 0) || (uc->cr_gid == ks->ks_gid && (ks->ks_mode & S_IWGRP) != 0) || (ks->ks_mode & S_IWOTH) != 0 || suser(td) == 0) @@ -461,7 +466,7 @@ static int sem_hasopen(struct thread *td, struct ksem *ks) { - + return ((ks->ks_name == NULL && sem_perm(td, ks) == 0) || sem_getuser(td->td_proc, ks) != NULL); } @@ -512,7 +517,7 @@ }; int ksem_unlink(struct thread *td, struct ksem_unlink_args *uap); #endif - + int ksem_unlink(struct thread *td, struct ksem_unlink_args *uap) { @@ -547,7 +552,7 @@ DP(("sem_unlink: '%s' ks = %p, error = %d\n", name, ks, error)); if (error == 0) { LIST_REMOVE(ks, ks_entry); - LIST_INSERT_HEAD(&ksem_deadhead, ks, ks_entry); + LIST_INSERT_HEAD(&ksem_deadhead, ks, ks_entry); sem_rel(ks); } mtx_unlock(&sem_lock); @@ -925,7 +930,7 @@ static void sem_exechook(void *arg, struct proc *p, struct image_params *imgp __unused) { - sem_exithook(arg, p); + sem_exithook(arg, p); } static void @@ -1003,3 +1008,36 @@ DECLARE_MODULE(sem, sem_mod, SI_SUB_SYSV_SEM, SI_ORDER_FIRST); MODULE_VERSION(sem, 1); + +#ifdef JAIL +static void +ksem_jinit(void *data) +{ + struct prison *pr = data; + + printf("ksem jailinit\n"); + + pr->mod_data[JMODULE_KSEM] = (void *)0xdeadc0de; +} + +static void +ksem_juninit(void *data) +{ + struct prison *pr = data; + + printf("ksem jailuninit\n"); + + pr->mod_data[JMODULE_KSEM] = NULL; +} + +static int +ksem_jshow(struct prison *pr) +{ + printf("ksem checkshow %p\n", pr->mod_data[JMODULE_KSEM]); + + return (pr->mod_data[JMODULE_KSEM] != NULL); +} + +JAILINIT(ksem, SI_SUB_SYSV_SEM, SI_ORDER_FIRST, &ksem_jinit, &ksem_juninit, &ksem_jshow); + +#endif ==== //depot/projects/jail2/sys/sys/jail.h#6 (text+ko) ==== @@ -29,7 +29,7 @@ }; #define XPRISON_VERSION 1 -#define JMODULE_COUNT 3 +#define JMODULE_COUNT 4 #ifndef _KERNEL @@ -146,6 +146,8 @@ void prison_remote_ip(struct ucred *cred, uint32_t *ip); /* INLINES */ +#define td_prison(td) ((td)->td_ucred->cr_prison) + /* * Return 1 if the passed credential is in a jail, otherwise 0. */ ==== //depot/projects/jail2/sys/sys/jail2_init.h#3 (text+ko) ==== @@ -6,26 +6,49 @@ JMODULE_NODATA = -1, JMODULE_SYSVMSQ = 0, JMODULE_SYSVSEM = 1, - JMODULE_SYSVSHM = 2 + JMODULE_SYSVSHM = 2, + JMODULE_KSEM = 3 }; #ifdef _KERNEL #include -struct jail_sysinit { - TAILQ_ENTRY(jail_sysinit) list; /* */ - uint32_t id; +struct prison; +typedef int (*jailinit_sfunc_t)(struct prison *pr); + +struct jailinit { + TAILQ_ENTRY(jailinit) list; /* */ + uint32_t id; /* XXX ? */ enum sysinit_sub_id subsystem; /* subsystem identifier*/ enum sysinit_elem_order order; /* init order within subsystem*/ sysinit_nfunc_t init; /* init per jail data */ sysinit_nfunc_t fini; /* detroy per jail */ + jailinit_sfunc_t is_show; /* is module show for prison ?*/ }; -TAILQ_HEAD(jail_sysinitlist, jail_sysinit); +TAILQ_HEAD(jail_initlist, jailinit); + +/* + * Copy from SYSINIT/SYSUNINIT + */ +#define C_JAILINIT(uniquifier, subsys, suborder, initfunc, finifunc, showfunc) \ + static struct jailinit uniquifier ## _jailinit = { \ + subsystem : (subsys), \ + order : (suborder), \ + init : (initfunc), \ + fini : (finifunc), \ + is_show : (showfunc), \ + }; \ + DATA_SET(jailinit_set,uniquifier ## _jailinit); + +#define JAILINIT(uniquifier, subsystem, order, func_init, func_fini, func_show) \ + C_JAILINIT(uniquifier, subsystem, order, \ + (sysinit_nfunc_t)func_init, (sysinit_nfunc_t)func_fini, (jailinit_sfunc_t)func_show) + -extern void jailsysinit_add(struct jail_sysinit *sinit); -extern void jailsysinit_del(struct jail_sysinit *sinit); +extern void jailsysinit_add(struct jailinit *sinit); +extern void jailsysinit_del(struct jailinit *sinit); extern void prison_init(struct prison *pr); extern void prinson_fini(struct prison *pr); ==== //depot/projects/jail2/sys/sys/linker.h#3 (text+ko) ==== @@ -71,6 +71,8 @@ int userrefs; /* kldload(2) count */ int flags; #define LINKER_FILE_LINKED 0x1 /* file has been fully linked */ +#define LINKER_ALLOW_JAIL 0x2 /* file has been allow to "load" in jail */ + TAILQ_ENTRY(linker_file) link; /* list of all loaded files */ char* filename; /* file which was loaded */ int id; /* unique id */ From owner-p4-projects@FreeBSD.ORG Sun Nov 5 17:01:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB4B916A417; Sun, 5 Nov 2006 17:01:32 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9AF1A16A412 for ; Sun, 5 Nov 2006 17:01:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64AF043D53 for ; Sun, 5 Nov 2006 17:01:32 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA5H1WhZ019715 for ; Sun, 5 Nov 2006 17:01:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA5H1WAK019700 for perforce@freebsd.org; Sun, 5 Nov 2006 17:01:32 GMT (envelope-from sam@freebsd.org) Date: Sun, 5 Nov 2006 17:01:32 GMT Message-Id: <200611051701.kA5H1WAK019700@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109287 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 17:01:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=109287 Change 109287 by sam@sam_ebb on 2006/11/05 17:01:15 fix build when KSE is not defined Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#5 (text+ko) ==== @@ -494,7 +494,11 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); +#ifdef KSE proc_linkup(&proc0, &ksegrp0, &thread0); +#else + proc_linkup(&proc0, &thread0); +#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; From owner-p4-projects@FreeBSD.ORG Sun Nov 5 17:30:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0783916A4E9; Sun, 5 Nov 2006 17:30:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 D77E316A4D8 for ; Sun, 5 Nov 2006 17:30:24 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E309443D58 for ; Sun, 5 Nov 2006 17:30:19 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA5HU8QF028118 for ; Sun, 5 Nov 2006 17:30:08 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA5HU82p028109 for perforce@freebsd.org; Sun, 5 Nov 2006 17:30:08 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 5 Nov 2006 17:30:08 GMT Message-Id: <200611051730.kA5HU82p028109@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 109288 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 17:30:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=109288 Change 109288 by rdivacky@rdivacky_witten on 2006/11/05 17:29:24 Forced commit to note that during last IFC I commited local change to linux_file.c introducing LINUX_O_DIRECT handling. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#8 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#8 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Nov 5 17:32:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E06416A4A7; Sun, 5 Nov 2006 17:32:43 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 305C016A40F for ; Sun, 5 Nov 2006 17:32:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 431AE43D8B for ; Sun, 5 Nov 2006 17:32:25 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA5HWBBs028955 for ; Sun, 5 Nov 2006 17:32:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA5HWBsL028952 for perforce@freebsd.org; Sun, 5 Nov 2006 17:32:11 GMT (envelope-from sam@freebsd.org) Date: Sun, 5 Nov 2006 17:32:11 GMT Message-Id: <200611051732.kA5HWBsL028952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109289 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 17:32:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=109289 Change 109289 by sam@sam_ebb on 2006/11/05 17:32:08 o inherit initial debug setting from tunable (as intended) o use device_printf instead of if_printf so debug msgs prior to ifp setup don't crash Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#2 (text+ko) ==== @@ -194,10 +194,10 @@ 0, "IXP425 NPE network interface debug msgs"); TUNABLE_INT("debug.npe", &npe_debug); #define DPRINTF(sc, fmt, ...) do { \ - if (sc->debug) if_printf(sc->sc_ifp, fmt, __VA_ARGS__); \ + if (sc->debug) device_printf(sc->sc_dev, fmt, __VA_ARGS__); \ } while (0) #define DPRINTFn(n, sc, fmt, ...) do { \ - if (sc->debug >= n) if_printf(sc->sc_ifp, fmt, __VA_ARGS__); \ + if (sc->debug >= n) device_printf(sc->sc_dev, fmt, __VA_ARGS__);\ } while (0) static int @@ -229,6 +229,7 @@ sc->sc_iot = sa->sc_iot; NPE_LOCK_INIT(sc); callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); + sc->debug = npe_debug; sc->sc_npe = ixpnpe_attach(dev); if (sc->sc_npe == NULL) { From owner-p4-projects@FreeBSD.ORG Sun Nov 5 19:55:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC29E16A4CA; Sun, 5 Nov 2006 19:55:24 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7D3EF16A494 for ; Sun, 5 Nov 2006 19:55:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B580243D5F for ; Sun, 5 Nov 2006 19:55:15 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA5JtF9S056360 for ; Sun, 5 Nov 2006 19:55:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA5JtFQQ056357 for perforce@freebsd.org; Sun, 5 Nov 2006 19:55:15 GMT (envelope-from sam@freebsd.org) Date: Sun, 5 Nov 2006 19:55:15 GMT Message-Id: <200611051955.kA5JtFQQ056357@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109295 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 19:55:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=109295 Change 109295 by sam@sam_ebb on 2006/11/05 19:54:18 Fix uart input: enable IX_IER_RTOIE so we get rx interrupts when data is received but the FIFO is not full. The ns8250 uart class code does not handle this for us. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#4 (text+ko) ==== @@ -73,8 +73,16 @@ sc->sc_sysdev = SLIST_FIRST(&uart_sysdevs); sc->sc_class = &uart_ns8250_class; bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); + /* + * XXX set UART Unit Enable (0x40) AND + * receiver timeout int enable (0x10). + * The first turns on the UART. The second is necessary to get + * interrupts when the FIFO has data but is not full. Note that + * uart_ns8250 carefully avoids touching these bits so we can + * just set them here and proceed. But this is fragile... + */ bus_space_write_4(&ixp425_a4x_bs_tag, device_get_unit(dev) == 0 ? - IXP425_UART0_VBASE : IXP425_UART1_VBASE, REG_IER, 0x40); + IXP425_UART0_VBASE : IXP425_UART1_VBASE, REG_IER, 0x50); return(uart_bus_probe(dev, 0, IXP425_UART_FREQ, 0, 0)); } From owner-p4-projects@FreeBSD.ORG Sun Nov 5 21:55:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D95C16A417; Sun, 5 Nov 2006 21:55:01 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 6278416A403 for ; Sun, 5 Nov 2006 21:55:01 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1188A43D79 for ; Sun, 5 Nov 2006 21:54:54 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA5Lsrx8091701 for ; Sun, 5 Nov 2006 21:54:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA5LsrT3091698 for perforce@freebsd.org; Sun, 5 Nov 2006 21:54:53 GMT (envelope-from sam@freebsd.org) Date: Sun, 5 Nov 2006 21:54:53 GMT Message-Id: <200611052154.kA5LsrT3091698@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109303 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 21:55:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=109303 Change 109303 by sam@sam_ebb on 2006/11/05 21:54:11 Fix crash after ifconfig npe1; mii requires that a pointer to the ifnet be the FIRST element in the softc. This is truly gross and horrible; never knew mii required this. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#3 (text+ko) ==== @@ -82,13 +82,14 @@ }; struct npe_softc { + /* XXX mii requires this be first; do not move! */ + struct ifnet *sc_ifp; /* ifnet pointer */ struct mtx sc_mtx; /* basically a perimeter lock */ device_t sc_dev; bus_space_tag_t sc_iot; bus_space_handle_t sc_ioh; /* MAC register window */ device_t sc_mii; /* child miibus */ bus_space_handle_t sc_miih; /* MII register window */ - struct ifnet *sc_ifp; /* ifnet pointer */ struct ixpnpe_softc *sc_npe; /* NPE support */ int sc_portid; struct callout tick_ch; /* Tick callout */ @@ -243,6 +244,7 @@ npe_getmac(sc, eaddr); + /* NB: must be setup prior to invoking mii code */ sc->sc_ifp = ifp = if_alloc(IFT_ETHER); if (mii_phy_probe(dev, &sc->sc_mii, npe_ifmedia_update, npe_ifmedia_status)) { device_printf(dev, "Cannot find my PHY.\n"); From owner-p4-projects@FreeBSD.ORG Sun Nov 5 23:10:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED78E16A47B; Sun, 5 Nov 2006 23:10:29 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C741716A416 for ; Sun, 5 Nov 2006 23:10:29 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 80A0743D4C for ; Sun, 5 Nov 2006 23:10:29 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA5NATC4006341 for ; Sun, 5 Nov 2006 23:10:29 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA5NATKG006338 for perforce@freebsd.org; Sun, 5 Nov 2006 23:10:29 GMT (envelope-from cognet@freebsd.org) Date: Sun, 5 Nov 2006 23:10:29 GMT Message-Id: <200611052310.kA5NATKG006338@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 109308 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 23:10:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=109308 Change 109308 by cognet@cognet on 2006/11/05 23:10:09 Disable the instruction and data caches before attempting to reset the cpu. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#14 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#14 (text+ko) ==== @@ -47,6 +47,8 @@ #include #include +#include +#include #include #include #include @@ -180,6 +182,10 @@ bus_space_write_4(&ixp425_bs_tag, IXP425_EXP_VBASE, EXP_CNFG0_OFFSET, reg); cpu_idcache_wbinv_all(); + cpu_control(CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE + | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE + , 0xffffffff); + /* Jump into the bootcode's reset vector. */ __asm __volatile( "mrc p15, 0, %0, c1, c0, 0\n" From owner-p4-projects@FreeBSD.ORG Sun Nov 5 23:30:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DE5516A416; Sun, 5 Nov 2006 23:30:57 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5EC8516A403 for ; Sun, 5 Nov 2006 23:30:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C50543D58 for ; Sun, 5 Nov 2006 23:30:56 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA5NUuJM009535 for ; Sun, 5 Nov 2006 23:30:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA5NUupw009532 for perforce@freebsd.org; Sun, 5 Nov 2006 23:30:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Nov 2006 23:30:56 GMT Message-Id: <200611052330.kA5NUupw009532@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 Cc: Subject: PERFORCE change 109311 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 23:30:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=109311 Change 109311 by rwatson@rwatson_fledge on 2006/11/05 23:30:33 Support for printing BSM records as XML in praudit. Reviewed by: Martin Voros Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#43 edit .. //depot/projects/trustedbsd/openbsm/README#21 edit .. //depot/projects/trustedbsd/openbsm/TODO#9 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#12 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#11 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#31 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#42 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#43 (text+ko) ==== @@ -3,6 +3,7 @@ - compat/clock_gettime.h now provides a compatibility implementation of clock_gettime(), which fixes building on Mac OS X. - Countless man page fixes. +- praudit XML support via "praudit -x". OpenBSM 1.0 alpha 12 @@ -270,4 +271,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#42 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#43 $ ==== //depot/projects/trustedbsd/openbsm/README#21 (text+ko) ==== @@ -77,6 +77,7 @@ Pawel Worach Martin Englund Ruslan Ermilov + Martin Voros In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -98,4 +99,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#20 $ +$P4: //depot/projects/trustedbsd/openbsm/README#21 $ ==== //depot/projects/trustedbsd/openbsm/TODO#9 (text+ko) ==== @@ -1,4 +1,3 @@ -- Teach praudit how to general XML format BSM streams. - Teach libbsm about any additional 64-bit token types that are present in more recent Solaris versions. - Build a regression test suite for libbsm that generates each token @@ -20,4 +19,4 @@ - Put hostname in trail file name. - Document audit_warn event arguments. -$P4: //depot/projects/trustedbsd/openbsm/TODO#8 $ +$P4: //depot/projects/trustedbsd/openbsm/TODO#9 $ ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#12 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#11 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#12 $ .\" -.Dd October 3, 2006 +.Dd November 5, 2006 .Dt PRAUDIT 1 .Os .Sh NAME @@ -35,7 +35,7 @@ .Nd "print the contents of audit trail files" .Sh SYNOPSIS .Nm -.Op Fl lp +.Op Fl lpx .Op Fl r | s .Op Fl d Ar del .Op Ar @@ -77,6 +77,8 @@ record and event type are displayed. This option is exclusive from .Fl r . +.It Fl x +Print audit records in the XML output format. .El .Pp If the raw or short forms are not specified, the default is to print the tokens ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#11 (text+ko) ==== @@ -1,5 +1,6 @@ /* * Copyright (c) 2004 Apple Computer, Inc. + * Copyright (c) 2006 Martin Voros * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#11 $ */ /* @@ -34,7 +35,7 @@ */ /* - * praudit [-lp] [-r | -s] [-d del] [file ...] + * praudit [-lpx] [-r | -s] [-d del] [file ...] */ #include @@ -51,12 +52,14 @@ static int raw = 0; static int shortfrm = 0; static int partial = 0; +static int xml = 0; static void usage(void) { - fprintf(stderr, "usage: praudit [-lp] [-r | -s] [-d del] [file ...]\n"); + fprintf(stderr, "usage: praudit [-lpx] [-r | -s] [-d del] " + "[file ...]\n"); exit(1); } @@ -88,11 +91,17 @@ if (-1 == au_fetch_tok(&tok, buf + bytesread, reclen - bytesread)) break; - au_print_tok(stdout, &tok, del, raw, shortfrm); + if (xml) + au_print_tok_xml(stdout, &tok, del, raw, + shortfrm); + else + au_print_tok(stdout, &tok, del, raw, + shortfrm); bytesread += tok.len; - if (oneline) - printf("%s", del); - else + if (oneline) { + if (!xml) + printf("%s", del); + } else printf("\n"); } free(buf); @@ -109,7 +118,7 @@ int i; FILE *fp; - while ((ch = getopt(argc, argv, "d:lprs")) != -1) { + while ((ch = getopt(argc, argv, "d:lprsx")) != -1) { switch(ch) { case 'd': del = optarg; @@ -135,12 +144,19 @@ shortfrm = 1; break; + case 'x': + xml = 1; + break; + case '?': default: usage(); } } + if (xml) + au_print_xml_header(stdout); + /* For each of the files passed as arguments dump the contents. */ if (optind == argc) { print_tokens(stdin); @@ -153,5 +169,9 @@ if (fp != NULL) fclose(fp); } + + if (xml) + au_print_xml_footer(stdout); + return (1); } ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#31 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#30 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#31 $ */ #ifndef _LIBBSM_H_ @@ -771,6 +771,14 @@ //XXX The following interface has different prototype from BSM void au_print_tok(FILE *outfp, tokenstr_t *tok, char *del, char raw, char sfrm); +void au_print_tok_xml(FILE *outfp, tokenstr_t *tok, + char *del, char raw, char sfrm); + +/* + * Functions relating to XML output. + */ +void au_print_xml_header(FILE *outfp); +void au_print_xml_footer(FILE *outfp); __END_DECLS /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#42 (text+ko) ==== @@ -2,6 +2,7 @@ * Copyright (c) 2004 Apple Computer, Inc. * Copyright (c) 2005 SPARTA, Inc. * Copyright (c) 2006 Robert N. M. Watson + * Copyright (c) 2006 Martin Voros * All rights reserved. * * This code was developed in part by Robert N. M. Watson, Senior Principal @@ -31,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#41 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#42 $ */ #include @@ -126,6 +127,12 @@ } while (0) /* + * XML option. + */ +#define AU_PLAIN 0 +#define AU_XML 1 + +/* * Prints the delimiter string. */ static void @@ -207,16 +214,334 @@ } /* + * Prints the beggining of attribute. + */ +static void +open_attr(FILE *fp, u_char *str) +{ + + fprintf(fp,"%s=\"", str); +} + +/* + * Prints the end of attribute. + */ +static void +close_attr(FILE *fp) +{ + + fprintf(fp,"\" "); +} + +/* + * Prints the end of tag. + */ +static void +close_tag(FILE *fp, u_char type) +{ + + switch(type) { + case AUT_HEADER32: + fprintf(fp, ">"); + break; + + case AUT_HEADER32_EX: + fprintf(fp, ">"); + break; + + case AUT_HEADER64: + fprintf(fp, ">"); + break; + + case AUT_HEADER64_EX: + fprintf(fp, ">"); + break; + + case AUT_ARG32: + fprintf(fp, "/>"); + break; + + case AUT_ARG64: + fprintf(fp, "/>"); + break; + + case AUT_ATTR32: + fprintf(fp, "/>"); + break; + + case AUT_ATTR64: + fprintf(fp, "/>"); + break; + + case AUT_EXIT: + fprintf(fp, "/>"); + break; + + case AUT_EXEC_ARGS: + fprintf(fp, ""); + break; + + case AUT_EXEC_ENV: + fprintf(fp, ""); + break; + + case AUT_OTHER_FILE32: + fprintf(fp, ""); + break; + + case AUT_NEWGROUPS: + fprintf(fp, ""); + break; + + case AUT_IN_ADDR: + fprintf(fp, ""); + break; + + case AUT_IN_ADDR_EX: + fprintf(fp, ""); + break; + + case AUT_IP: + fprintf(fp, "/>"); + break; + + case AUT_IPC: + fprintf(fp, "/>"); + break; + + case AUT_IPC_PERM: + fprintf(fp, "/>"); + break; + + case AUT_IPORT: + fprintf(fp, ""); + break; + + case AUT_OPAQUE: + fprintf(fp, ""); + break; + + case AUT_PATH: + fprintf(fp, ""); + break; + + case AUT_PROCESS32: + fprintf(fp, "/>"); + break; + + case AUT_PROCESS32_EX: + fprintf(fp, "/>"); + break; + + case AUT_RETURN32: + fprintf(fp, "/>"); + break; + + case AUT_RETURN64: + fprintf(fp, "/>"); + break; + + case AUT_SEQ: + fprintf(fp, "/>"); + break; + + case AUT_SOCKET: + fprintf(fp, "/>"); + break; + + case AUT_SOCKINET32: + fprintf(fp, "/>"); + break; + + case AUT_SOCKUNIX: + fprintf(fp, "/>"); + break; + + case AUT_SUBJECT32: + fprintf(fp, "/>"); + break; + + case AUT_SUBJECT64: + fprintf(fp, "/>"); + break; + + case AUT_SUBJECT32_EX: + fprintf(fp, "/>"); + break; + + case AUT_TEXT: + fprintf(fp, ""); + break; + + case AUT_SOCKET_EX: + fprintf(fp, "/>"); + break; + + case AUT_DATA: + fprintf(fp, ""); + break; + } +} + +/* * Prints the token type in either the raw or the default form. */ static void -print_tok_type(FILE *fp, u_char type, const char *tokname, char raw) +print_tok_type(FILE *fp, u_char type, const char *tokname, char raw, int xml) { - if (raw) - fprintf(fp, "%u", type); - else - fprintf(fp, "%s", tokname); + if (xml) { + switch(type) { + case AUT_HEADER32: + fprintf(fp, ""); + break; + + case AUT_ARG32: + fprintf(fp, ""); + break; + + case AUT_EXEC_ENV: + fprintf(fp, ""); + break; + + case AUT_OTHER_FILE32: + fprintf(fp, ""); + break; + + case AUT_IN_ADDR: + fprintf(fp, ""); + break; + + case AUT_IN_ADDR_EX: + fprintf(fp, ""); + break; + + case AUT_IP: + fprintf(fp, ""); + break; + + case AUT_OPAQUE: + fprintf(fp, ""); + break; + + case AUT_PATH: + fprintf(fp, ""); + break; + + case AUT_PROCESS32: + fprintf(fp, ""); + break; + + case AUT_SOCKET_EX: + fprintf(fp, "\n"); + fprintf(outfp, "\n"); +} + +/* + * Print XML footer. + */ +void +au_print_xml_footer(FILE *outfp) +{ + + fprintf(outfp, "\n"); +} + +/* * record byte count 4 bytes * version # 1 byte [2] * event type 2 bytes @@ -495,22 +841,42 @@ } static void -print_header32_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, char sfrm) +print_header32_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, char sfrm, + int xml) { - print_tok_type(fp, tok->id, "header", raw); - print_delim(fp, del); - print_4_bytes(fp, tok->tt.hdr32.size, "%u"); - print_delim(fp, del); - print_1_byte(fp, tok->tt.hdr32.version, "%u"); - print_delim(fp, del); - print_event(fp, tok->tt.hdr32.e_type, raw, sfrm); - print_delim(fp, del); - print_evmod(fp, tok->tt.hdr32.e_mod, raw); - print_delim(fp, del); - print_sec32(fp, tok->tt.hdr32.s, raw); - print_delim(fp, del); - print_msec32(fp, tok->tt.hdr32.ms, raw); + print_tok_type(fp, tok->id, "header", raw, xml); + if (xml) { + open_attr(fp, "version"); + print_1_byte(fp, tok->tt.hdr32.version, "%u"); + close_attr(fp); + open_attr(fp, "event"); + print_event(fp, tok->tt.hdr32.e_type, raw, sfrm); + close_attr(fp); + open_attr(fp, "modifier"); + print_evmod(fp, tok->tt.hdr32.e_mod, raw); + close_attr(fp); + open_attr(fp, "time"); + print_sec32(fp, tok->tt.hdr32.s, raw); + close_attr(fp); + open_attr(fp, "msec"); + print_msec32(fp, tok->tt.hdr32.ms, 1); + close_attr(fp); + close_tag(fp, tok->id); + } else { + print_delim(fp, del); + print_4_bytes(fp, tok->tt.hdr32.size, "%u"); + print_delim(fp, del); + print_1_byte(fp, tok->tt.hdr32.version, "%u"); + print_delim(fp, del); + print_event(fp, tok->tt.hdr32.e_type, raw, sfrm); + print_delim(fp, del); + print_evmod(fp, tok->tt.hdr32.e_mod, raw); + print_delim(fp, del); + print_sec32(fp, tok->tt.hdr32.s, raw); + print_delim(fp, del); + print_msec32(fp, tok->tt.hdr32.ms, raw); + } } /* @@ -584,25 +950,50 @@ static void print_header32_ex_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, - char sfrm) + char sfrm, int xml) { - print_tok_type(fp, tok->id, "header_ex", raw); - print_delim(fp, del); - print_4_bytes(fp, tok->tt.hdr32_ex.size, "%u"); - print_delim(fp, del); - print_1_byte(fp, tok->tt.hdr32_ex.version, "%u"); - print_delim(fp, del); - print_event(fp, tok->tt.hdr32_ex.e_type, raw, sfrm); - print_delim(fp, del); - print_evmod(fp, tok->tt.hdr32_ex.e_mod, raw); - print_delim(fp, del); - print_ip_ex_address(fp, tok->tt.hdr32_ex.ad_type, - tok->tt.hdr32_ex.addr); - print_delim(fp, del); - print_sec32(fp, tok->tt.hdr32_ex.s, raw); - print_delim(fp, del); - print_msec32(fp, tok->tt.hdr32_ex.ms, raw); + print_tok_type(fp, tok->id, "header_ex", raw, xml); + if (xml) { + open_attr(fp, "version"); + print_1_byte(fp, tok->tt.hdr32_ex.version, "%u"); + close_attr(fp); + open_attr(fp, "event"); + print_event(fp, tok->tt.hdr32_ex.e_type, raw, sfrm); + close_attr(fp); + open_attr(fp, "modifier"); + print_evmod(fp, tok->tt.hdr32_ex.e_mod, raw); + close_attr(fp); + /* + * No attribute for additional types. + * + print_ip_ex_address(fp, tok->tt.hdr32_ex.ad_type, + tok->tt.hdr32_ex.addr); + */ + open_attr(fp, "time"); + print_sec32(fp, tok->tt.hdr32_ex.s, raw); + close_attr(fp); + open_attr(fp, "msec"); + print_msec32(fp, tok->tt.hdr32_ex.ms, raw); + close_attr(fp); + close_tag(fp, tok->id); + } else { + print_delim(fp, del); + print_4_bytes(fp, tok->tt.hdr32_ex.size, "%u"); + print_delim(fp, del); + print_1_byte(fp, tok->tt.hdr32_ex.version, "%u"); + print_delim(fp, del); + print_event(fp, tok->tt.hdr32_ex.e_type, raw, sfrm); + print_delim(fp, del); + print_evmod(fp, tok->tt.hdr32_ex.e_mod, raw); + print_delim(fp, del); + print_ip_ex_address(fp, tok->tt.hdr32_ex.ad_type, + tok->tt.hdr32_ex.addr); + print_delim(fp, del); + print_sec32(fp, tok->tt.hdr32_ex.s, raw); + print_delim(fp, del); + print_msec32(fp, tok->tt.hdr32_ex.ms, raw); + } } /* @@ -646,23 +1037,44 @@ } static void -print_header64_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, char sfrm) +print_header64_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, char sfrm, + int xml) { + + print_tok_type(fp, tok->id, "header", raw, xml); + if (xml) { + open_attr(fp, "version"); + print_1_byte(fp, tok->tt.hdr64.version, "%u"); + close_attr(fp); + open_attr(fp, "event"); + print_event(fp, tok->tt.hdr64.e_type, raw, sfrm); + close_attr(fp); + open_attr(fp, "modifier"); + print_evmod(fp, tok->tt.hdr64.e_mod, raw); + close_attr(fp); + open_attr(fp, "time"); + print_sec64(fp, tok->tt.hdr64.s, raw); + close_attr(fp); + open_attr(fp, "msec"); + print_msec64(fp, tok->tt.hdr64.ms, raw); + close_attr(fp); + close_tag(fp, tok->id); + } else { + print_delim(fp, del); + print_4_bytes(fp, tok->tt.hdr64.size, "%u"); + print_delim(fp, del); + print_1_byte(fp, tok->tt.hdr64.version, "%u"); + print_delim(fp, del); + print_event(fp, tok->tt.hdr64.e_type, raw, sfrm); + print_delim(fp, del); + print_evmod(fp, tok->tt.hdr64.e_mod, raw); + print_delim(fp, del); + print_sec64(fp, tok->tt.hdr64.s, raw); + print_delim(fp, del); + print_msec64(fp, tok->tt.hdr64.ms, raw); + } +} - print_tok_type(fp, tok->id, "header", raw); - print_delim(fp, del); - print_4_bytes(fp, tok->tt.hdr64.size, "%u"); - print_delim(fp, del); - print_1_byte(fp, tok->tt.hdr64.version, "%u"); - print_delim(fp, del); - print_event(fp, tok->tt.hdr64.e_type, raw, sfrm); - print_delim(fp, del); - print_evmod(fp, tok->tt.hdr64.e_mod, raw); - print_delim(fp, del); - print_sec64(fp, tok->tt.hdr64.s, raw); - print_delim(fp, del); - print_msec64(fp, tok->tt.hdr64.ms, raw); -} /* * record byte count 4 bytes * version # 1 byte [2] @@ -729,25 +1141,51 @@ } static void -print_header64_ex_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, char sfrm) +print_header64_ex_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, + char sfrm, int xml) { - print_tok_type(fp, tok->id, "header_ex", raw); - print_delim(fp, del); - print_4_bytes(fp, tok->tt.hdr64_ex.size, "%u"); - print_delim(fp, del); - print_1_byte(fp, tok->tt.hdr64_ex.version, "%u"); - print_delim(fp, del); - print_event(fp, tok->tt.hdr64_ex.e_type, raw, sfrm); - print_delim(fp, del); - print_evmod(fp, tok->tt.hdr64_ex.e_mod, raw); - print_delim(fp, del); - print_ip_ex_address(fp, tok->tt.hdr64_ex.ad_type, - tok->tt.hdr64_ex.addr); - print_delim(fp, del); - print_sec64(fp, tok->tt.hdr64_ex.s, raw); - print_delim(fp, del); - print_msec64(fp, tok->tt.hdr64_ex.ms, raw); + print_tok_type(fp, tok->id, "header_ex", raw, xml); + if (xml) { + open_attr(fp, "version"); + print_1_byte(fp, tok->tt.hdr64_ex.version, "%u"); + close_attr(fp); + open_attr(fp, "event"); + print_event(fp, tok->tt.hdr64_ex.e_type, raw, sfrm); + close_attr(fp); + open_attr(fp, "modifier"); + print_evmod(fp, tok->tt.hdr64_ex.e_mod, raw); + close_attr(fp); + /* + * No attribute for additional types. + * + print_ip_ex_address(fp, tok->tt.hdr64_ex.ad_type, + tok->tt.hdr64_ex.addr); + */ + open_attr(fp, "time"); + print_sec64(fp, tok->tt.hdr64_ex.s, raw); + close_attr(fp); + open_attr(fp, "msec"); + print_msec64(fp, tok->tt.hdr64_ex.ms, raw); + close_attr(fp); + close_tag(fp, tok->id); + } else { + print_delim(fp, del); + print_4_bytes(fp, tok->tt.hdr64_ex.size, "%u"); + print_delim(fp, del); + print_1_byte(fp, tok->tt.hdr64_ex.version, "%u"); + print_delim(fp, del); + print_event(fp, tok->tt.hdr64_ex.e_type, raw, sfrm); + print_delim(fp, del); + print_evmod(fp, tok->tt.hdr64_ex.e_mod, raw); + print_delim(fp, del); + print_ip_ex_address(fp, tok->tt.hdr64_ex.ad_type, + tok->tt.hdr64_ex.addr); + print_delim(fp, del); + print_sec64(fp, tok->tt.hdr64_ex.s, raw); + print_delim(fp, del); + print_msec64(fp, tok->tt.hdr64_ex.ms, raw); + } } /* @@ -772,12 +1210,14 @@ static void print_trailer_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, - __unused char sfrm) + __unused char sfrm, int xml) { - print_tok_type(fp, tok->id, "trailer", raw); - print_delim(fp, del); - print_4_bytes(fp, tok->tt.trail.count, "%u"); + print_tok_type(fp, tok->id, "trailer", raw, xml); + if (!xml) { + print_delim(fp, del); + print_4_bytes(fp, tok->tt.trail.count, "%u"); + } } /* @@ -813,16 +1253,28 @@ static void print_arg32_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, - __unused char sfrm) + __unused char sfrm, int xml) { - print_tok_type(fp, tok->id, "argument", raw); - print_delim(fp, del); - print_1_byte(fp, tok->tt.arg32.no, "%u"); - print_delim(fp, del); - print_4_bytes(fp, tok->tt.arg32.val, "0x%x"); - print_delim(fp, del); - print_string(fp, tok->tt.arg32.text, tok->tt.arg32.len); + print_tok_type(fp, tok->id, "argument", raw, xml); + if (xml) { + open_attr(fp, "arg-num"); + print_1_byte(fp, tok->tt.arg32.no, "%u"); + close_attr(fp); + open_attr(fp, "value"); + print_4_bytes(fp, tok->tt.arg32.val, "0x%x"); + close_attr(fp); + open_attr(fp, "desc"); + print_string(fp, tok->tt.arg32.text, tok->tt.arg32.len); + close_attr(fp); + close_tag(fp, tok->id); + } else { + print_delim(fp, del); + print_1_byte(fp, tok->tt.arg32.no, "%u"); + print_delim(fp, del); + print_4_bytes(fp, tok->tt.arg32.val, "0x%x"); + print_delim(fp, del); + } } static int @@ -852,16 +1304,29 @@ static void print_arg64_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, - __unused char sfrm) + __unused char sfrm, int xml) { - print_tok_type(fp, tok->id, "argument", raw); - print_delim(fp, del); - print_1_byte(fp, tok->tt.arg64.no, "%u"); - print_delim(fp, del); - print_8_bytes(fp, tok->tt.arg64.val, "0x%llx"); - print_delim(fp, del); - print_string(fp, tok->tt.arg64.text, tok->tt.arg64.len); + print_tok_type(fp, tok->id, "argument", raw, xml); + if (xml) { + open_attr(fp, "arg-num"); + print_1_byte(fp, tok->tt.arg64.no, "%u"); + close_attr(fp); + open_attr(fp, "value"); + print_8_bytes(fp, tok->tt.arg64.val, "0x%llx"); + close_attr(fp); + open_attr(fp, "desc"); + print_string(fp, tok->tt.arg64.text, tok->tt.arg64.len); + close_attr(fp); + close_tag(fp, tok->id); + } else { + print_delim(fp, del); + print_1_byte(fp, tok->tt.arg64.no, "%u"); + print_delim(fp, del); + print_8_bytes(fp, tok->tt.arg64.val, "0x%llx"); + print_delim(fp, del); + print_string(fp, tok->tt.arg64.text, tok->tt.arg64.len); + } } /* @@ -924,15 +1389,16 @@ static void print_arb_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, - __unused char sfrm) + __unused char sfrm, int xml) { char *str; char *format; size_t size; int i; - print_tok_type(fp, tok->id, "arbitrary", raw); - print_delim(fp, del); + print_tok_type(fp, tok->id, "arbitrary", raw, xml); + if (!xml) + print_delim(fp, del); switch(tok->tt.arb.howtopr) { case AUP_BINARY: @@ -964,56 +1430,125 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 5 23:47:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E41716A47C; Sun, 5 Nov 2006 23:47:18 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D019716A415 for ; Sun, 5 Nov 2006 23:47:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A44243D5D for ; Sun, 5 Nov 2006 23:47:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA5NlHTK012745 for ; Sun, 5 Nov 2006 23:47:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA5NlHgF012737 for perforce@freebsd.org; Sun, 5 Nov 2006 23:47:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Nov 2006 23:47:17 GMT Message-Id: <200611052347.kA5NlHgF012737@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 Cc: Subject: PERFORCE change 109313 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 23:47:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=109313 Change 109313 by rwatson@rwatson_fledge on 2006/11/05 23:47:03 Update HISTORY. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#44 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#44 (text+ko) ==== @@ -4,6 +4,7 @@ clock_gettime(), which fixes building on Mac OS X. - Countless man page fixes. - praudit XML support via "praudit -x". +- audit.log.5 expanded to include additional BSM token types. OpenBSM 1.0 alpha 12 @@ -271,4 +272,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#43 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#44 $ From owner-p4-projects@FreeBSD.ORG Sun Nov 5 23:47:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57FF616A562; Sun, 5 Nov 2006 23:47:18 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 DC90716A416 for ; Sun, 5 Nov 2006 23:47:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D59C43D53 for ; Sun, 5 Nov 2006 23:47:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA5NlH3U012728 for ; Sun, 5 Nov 2006 23:47:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA5NlG7P012719 for perforce@freebsd.org; Sun, 5 Nov 2006 23:47:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Nov 2006 23:47:16 GMT Message-Id: <200611052347.kA5NlG7P012719@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 Cc: Subject: PERFORCE change 109312 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Nov 2006 23:47:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=109312 Change 109312 by rwatson@rwatson_fledge on 2006/11/05 23:46:36 Document the format of some additional BSM tokens in audit.log.5. Submitted by: Martin Voros Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#16 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#16 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#15 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#16 $ .\" -.Dd May 1, 2005 +.Dd November 5, 2006 .Dt AUDIT.LOG 5 .Os .Sh NAME @@ -418,7 +418,10 @@ .Ss System V IPC Token The .Dq System V IPC -token ... +token contains the System V IPC message handle, semaphore handle or shared +memory handle. +A System V IPC token may be created using ++.Xr au_to_ipc 3 . .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" @@ -481,38 +484,60 @@ .Ss System V IPC Permission Token The .Dq System V IPC permission -token ... +token contains a System V IPC access permissions. +A System V IPC permission token may be created using +.Xr au_to_ipc_perm 3 . .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It XXXXX +.It Li "Owner user ID" Ta "4 bytes" Ta "User ID of IPC owner" +.It Li "Owner group ID" Ta "4 bytes" Ta "Group ID of IPC owner" +.It Li "Creator user ID" Ta "4 bytes" Ta "User ID of IPC creator" +.It Li "Creator group ID" Ta "4 bytes" Ta "Group ID of IPC creator" +.It Li "Access mode" Ta "4 bytes" Ta "Access mode" +.It Li "Sequnce number" Ta "4 bytes" Ta "Sequnce number" +.It Li "Key" Ta "4 bytes" Ta "IPC key" .El .Ss Arg Token The .Dq arg -token ... +token contains informations about arguments of the system call. +Depending on the size of the desired argument value, an Arg token may be +created using +.Xr au_to_arg32 3 +or +.Xr au_to_arg64 3 . .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It XXXXX +.It Li "Argument ID" Ta "1 byte" Ta "Argument ID" +.It Li "Argument value" Ta "4/8 bytes" Ta "Argument value" +.It Li "Length" Ta "2 bytes" Ta "Length of the text" +.It Li "Text" Ta "N bytes + 1 nul" Ta "The string including nul" .El .Ss exec_args Token The .Dq exec_args -token ... +token contains informations about arguements of the exec() system call. +An exec_args token may be created using +.Xr au_to_exec_args 3 . .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It XXXXX +.It Li "Count" Ta "4 bytes" Ta "Number of arguments" +.It Li "Text" Ta "* bytes" Ta "Count null-terminated strings" .El .Ss exec_env Token The .Dq exec_env -token ... +token contains current eviroment variables to an exec() system call. +An exec_args token may be created using +.Xr au_to_exec_env 3 . .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It XXXXX +.It Li "Count ID" Ta "4 bytes" Ta "Number of variables" +.It Li "Text" Ta "* bytes" Ta "Count nul-terminated strings" .El .Ss Exit Token The @@ -531,11 +556,29 @@ .Ss Socket Token The .Dq socket -token ... +token contains informations about UNIX domain and Internet sockets. +Each token has four or eight fields. +Depend on type of socket a socket token may be created using +.Xr au_to_sock_unix 3 , +.Xr au_to_sock_inet32 3 or +.Xr au_to_sock_inet128 3 . +.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" +.It Sy "Field" Ta Sy Bytes Ta Sy Description +.It Li "Token ID" Ta "1 byte" Ta "Token ID" +.It Li "Socket family" Ta "2 bytes" Ta "Socket family" +.It Li "Local port" Ta "2 bytes" Ta "Local port" +.It Li "Socket address" Ta "4 bytes" Ta "Socket address" +.El .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It XXXXX ++.It Li "Socket domain" Ta "4 bytes" Ta "Socket domain" ++.It Li "Socket family" Ta "2 bytes" Ta "Socket family" ++.It Li "Address type" Ta "1 byte" Ta "Address type (IPv4/IPv6)" ++.It Li "Local port" Ta "2 bytes" Ta "Local port" ++.It Li "Local IP address" Ta "4/16 bytes" Ta "Local IP address" ++.It Li "Remote port" Ta "2 bytes" Ta "Remote port" ++.It Li "Remote IP address" Ta "4/16 bytes" Ta "Remote IP address" .El .Ss Expanded Socket Token The From owner-p4-projects@FreeBSD.ORG Mon Nov 6 00:06:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D13616A417; Mon, 6 Nov 2006 00:06:42 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 57D4416A412 for ; Mon, 6 Nov 2006 00:06:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26B3F43D4C for ; Mon, 6 Nov 2006 00:06:42 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA606gwk017193 for ; Mon, 6 Nov 2006 00:06:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA606fgJ017190 for perforce@freebsd.org; Mon, 6 Nov 2006 00:06:41 GMT (envelope-from jb@freebsd.org) Date: Mon, 6 Nov 2006 00:06:41 GMT Message-Id: <200611060006.kA606fgJ017190@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109314 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 00:06:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=109314 Change 109314 by jb@jb_freebsd8 on 2006/11/06 00:05:52 Update the bfd.h with the version generated by a gmake of binutils-2.17 on FreeBSD. Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/bfd.h#2 edit Differences ... ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/bfd.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/bfd.h,v 1.3 2004/07/08 17:05:32 obrien Exp $ */ +/* $FreeBSD$ */ /* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c", @@ -10,7 +10,8 @@ /* Main header file for the bfd library -- portable access to object files. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Contributed by Cygnus Support. @@ -28,7 +29,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef __BFD_H_SEEN__ #define __BFD_H_SEEN__ @@ -54,28 +55,19 @@ /* The word size used by BFD on the host. This may be 64 with a 32 bit target if the host is 64 bit, or if other 64 bit targets have been selected with --enable-targets, or if --enable-64-bit-bfd. */ -#define BFD_ARCH_SIZE 64 - +#define BFD_ARCH_SIZE 32 -#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) /* The word size of the default bfd target. */ #define BFD_DEFAULT_TARGET_SIZE 32 + #define BFD_HOST_64BIT_LONG 0 +#define BFD_HOST_LONG_LONG 1 +#if 1 #define BFD_HOST_64_BIT long long #define BFD_HOST_U_64_BIT unsigned long long -#elif defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__ia64__) -/* The word size of the default bfd target. */ -#define BFD_DEFAULT_TARGET_SIZE 64 -#define BFD_HOST_64BIT_LONG 1 -#define BFD_HOST_64_BIT long -#define BFD_HOST_U_64_BIT unsigned long -#else -#error Unsupported architecture/platform. -#endif /* 64-bit host */ - -#define BFD_HOST_LONG_LONG 1 typedef BFD_HOST_64_BIT bfd_int64_t; typedef BFD_HOST_U_64_BIT bfd_uint64_t; +#endif #if BFD_ARCH_SIZE >= 64 #define BFD64 @@ -107,14 +99,6 @@ #define FALSE 0 #define TRUE 1 -#if 0 -/* Poison. */ -#undef false -#undef true -#define false dont_use_false_in_bfd -#define true dont_use_true_in_bfd -#endif - #ifdef BFD64 #ifndef BFD_HOST_64_BIT @@ -162,6 +146,9 @@ #endif /* not BFD64 */ +#define HALF_BFD_SIZE_TYPE \ + (((bfd_size_type) 1) << (8 * sizeof (bfd_size_type) / 2)) + #ifndef BFD_HOST_64_BIT /* Fall back on a 32 bit type. The idea is to make these types always available for function return types, but in the case that @@ -256,6 +243,10 @@ /* The sections in this BFD specify a memory page. */ #define HAS_LOAD_PAGE 0x1000 + +/* This BFD has been created by the linker and doesn't correspond + to any input file. */ +#define BFD_LINKER_CREATED 0x2000 /* Symbols and relocation. */ @@ -326,7 +317,8 @@ #define bfd_get_section_lma(bfd, ptr) ((ptr)->lma + 0) #define bfd_get_section_alignment(bfd, ptr) ((ptr)->alignment_power + 0) #define bfd_section_name(bfd, ptr) ((ptr)->name) -#define bfd_section_size(bfd, ptr) (bfd_get_section_size_before_reloc(ptr)) +#define bfd_section_size(bfd, ptr) ((ptr)->size) +#define bfd_get_section_size(ptr) ((ptr)->size) #define bfd_section_vma(bfd, ptr) ((ptr)->vma) #define bfd_section_lma(bfd, ptr) ((ptr)->lma) #define bfd_section_alignment(bfd, ptr) ((ptr)->alignment_power) @@ -338,6 +330,10 @@ #define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE) #define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE) #define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE) +/* Find the address one past the end of SEC. */ +#define bfd_get_section_limit(bfd, sec) \ + (((sec)->rawsize ? (sec)->rawsize : (sec)->size) \ + / bfd_octets_per_byte (bfd)) typedef struct stat stat_type; @@ -389,6 +385,8 @@ struct bfd_hash_entry **table; /* The number of slots in the hash table. */ unsigned int size; + /* The size of elements. */ + unsigned int entsize; /* A function used to create new elements in the hash table. The first entry is itself a pointer to an element. When this function is first invoked, this pointer will be NULL. However, @@ -408,7 +406,8 @@ (struct bfd_hash_table *, struct bfd_hash_entry *(*) (struct bfd_hash_entry *, struct bfd_hash_table *, - const char *)); + const char *), + unsigned int); /* Initialize a hash table specifying a size. */ extern bfd_boolean bfd_hash_table_init_n @@ -416,7 +415,7 @@ struct bfd_hash_entry *(*) (struct bfd_hash_entry *, struct bfd_hash_table *, const char *), - unsigned int size); + unsigned int, unsigned int); /* Free up a hash table. */ extern void bfd_hash_table_free @@ -451,6 +450,24 @@ bfd_boolean (*) (struct bfd_hash_entry *, void *), void *info); +/* Allows the default size of a hash table to be configured. New hash + tables allocated using bfd_hash_table_init will be created with + this size. */ +extern void bfd_hash_set_default_size (bfd_size_type); + +/* This structure is used to keep track of stabs in sections + information while linking. */ + +struct stab_info +{ + /* A hash table used to hold stabs strings. */ + struct bfd_strtab_hash *strings; + /* The header file hash table. */ + struct bfd_hash_table includes; + /* The first .stabstr section. */ + struct bfd_section *stabstr; +}; + #define COFF_SWAP_TABLE (void *) &bfd_coff_std_swap_table /* User program access to BFD facilities. */ @@ -523,6 +540,8 @@ (bfd *abfd); /* NB: This declaration should match the autogenerated one in libbfd.h. */ +extern bfd_boolean bfd_cache_close_all (void); + extern bfd_boolean bfd_record_phdr (bfd *, unsigned long, bfd_boolean, flagword, bfd_boolean, bfd_vma, bfd_boolean, bfd_boolean, unsigned int, struct bfd_section **); @@ -552,6 +571,9 @@ bfd_uint64_t bfd_get_bits (const void *, int, bfd_boolean); void bfd_put_bits (bfd_uint64_t, void *, int, bfd_boolean); + +extern bfd_boolean bfd_section_already_linked_table_init (void); +extern void bfd_section_already_linked_table_free (void); /* Externally visible ECOFF routines. */ @@ -605,8 +627,6 @@ (void *handle, bfd *abfd, struct ecoff_debug_info *debug, const struct ecoff_debug_swap *swap, struct bfd_link_info *info, file_ptr where); -extern bfd_boolean bfd_mips_ecoff_create_embedded_relocs - (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, char **); /* Externally visible ELF routines. */ @@ -620,28 +640,38 @@ enum dynamic_lib_link_class { DYN_NORMAL = 0, DYN_AS_NEEDED = 1, - DYN_DT_NEEDED = 2 + DYN_DT_NEEDED = 2, + DYN_NO_ADD_NEEDED = 4, + DYN_NO_NEEDED = 8 }; extern bfd_boolean bfd_elf_record_link_assignment - (bfd *, struct bfd_link_info *, const char *, bfd_boolean); + (bfd *, struct bfd_link_info *, const char *, bfd_boolean, + bfd_boolean); extern struct bfd_link_needed_list *bfd_elf_get_needed_list (bfd *, struct bfd_link_info *); extern bfd_boolean bfd_elf_get_bfd_needed_list (bfd *, struct bfd_link_needed_list **); extern bfd_boolean bfd_elf_size_dynamic_sections (bfd *, const char *, const char *, const char *, const char * const *, - struct bfd_link_info *, struct bfd_section **, struct bfd_elf_version_tree *); + struct bfd_link_info *, struct bfd_section **, + struct bfd_elf_version_tree *); +extern bfd_boolean bfd_elf_size_dynsym_hash_dynstr + (bfd *, struct bfd_link_info *); extern void bfd_elf_set_dt_needed_name (bfd *, const char *); extern const char *bfd_elf_get_dt_soname (bfd *); extern void bfd_elf_set_dyn_lib_class (bfd *, int); +extern int bfd_elf_get_dyn_lib_class + (bfd *); extern struct bfd_link_needed_list *bfd_elf_get_runpath_list (bfd *, struct bfd_link_info *); extern bfd_boolean bfd_elf_discard_info (bfd *, struct bfd_link_info *); +extern unsigned int _bfd_elf_default_action_discarded + (struct bfd_section *); /* Return an upper bound on the number of bytes required to store a copy of ABFD's program header table entries. Return -1 if an error @@ -673,7 +703,7 @@ the remote memory. */ extern bfd *bfd_elf_bfd_from_remote_memory (bfd *templ, bfd_vma ehdr_vma, bfd_vma *loadbasep, - int (*target_read_memory) (bfd_vma vma, char *myaddr, int len)); + int (*target_read_memory) (bfd_vma vma, bfd_byte *myaddr, int len)); /* Return the arch_size field of an elf bfd, or -1 if not elf. */ extern int bfd_get_arch_size @@ -686,10 +716,20 @@ extern struct bfd_section *_bfd_elf_tls_setup (bfd *, struct bfd_link_info *); +extern void _bfd_fix_excluded_sec_syms + (bfd *, struct bfd_link_info *); + +extern unsigned bfd_m68k_mach_to_features (int); + +extern int bfd_m68k_features_to_mach (unsigned); + extern bfd_boolean bfd_m68k_elf32_create_embedded_relocs - (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, char **); -extern bfd_boolean bfd_mips_elf32_create_embedded_relocs - (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, char **); + (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, + char **); + +extern bfd_boolean bfd_bfin_elf32_create_embedded_relocs + (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, + char **); /* SunOS shared library support routines for the linker. */ @@ -698,7 +738,8 @@ extern bfd_boolean bfd_sunos_record_link_assignment (bfd *, struct bfd_link_info *, const char *); extern bfd_boolean bfd_sunos_size_dynamic_sections - (bfd *, struct bfd_link_info *, struct bfd_section **, struct bfd_section **, struct bfd_section **); + (bfd *, struct bfd_link_info *, struct bfd_section **, + struct bfd_section **, struct bfd_section **); /* Linux shared library support routines for the linker. */ @@ -806,12 +847,19 @@ extern bfd_boolean bfd_elf32_arm_process_before_allocation (bfd *, struct bfd_link_info *, int); +void bfd_elf32_arm_set_target_relocs + (struct bfd_link_info *, int, char *, int, int); + extern bfd_boolean bfd_elf32_arm_get_bfd_for_interworking (bfd *, struct bfd_link_info *); extern bfd_boolean bfd_elf32_arm_add_glue_sections_to_bfd (bfd *, struct bfd_link_info *); +/* ELF ARM mapping symbol support */ +extern bfd_boolean bfd_is_arm_mapping_symbol_name + (const char * name); + /* ARM Note section processing. */ extern bfd_boolean bfd_arm_merge_machines (bfd *, bfd *); @@ -840,16 +888,51 @@ extern void bfd_elf64_ia64_after_parse (int); +/* This structure is used for a comdat section, as in PE. A comdat + section is associated with a particular symbol. When the linker + sees a comdat section, it keeps only one of the sections with a + given name and associated with a given symbol. */ + +struct coff_comdat_info +{ + /* The name of the symbol associated with a comdat section. */ + const char *name; + + /* The local symbol table index of the symbol associated with a + comdat section. This is only meaningful to the object file format + specific code; it is not an index into the list returned by + bfd_canonicalize_symtab. */ + long symbol; +}; + +extern struct coff_comdat_info *bfd_coff_get_comdat_section + (bfd *, struct bfd_section *); + /* Extracted from init.c. */ void bfd_init (void); /* Extracted from opncls.c. */ +bfd *bfd_fopen (const char *filename, const char *target, + const char *mode, int fd); + bfd *bfd_openr (const char *filename, const char *target); bfd *bfd_fdopenr (const char *filename, const char *target, int fd); bfd *bfd_openstreamr (const char *, const char *, void *); +bfd *bfd_openr_iovec (const char *filename, const char *target, + void *(*open) (struct bfd *nbfd, + void *open_closure), + void *open_closure, + file_ptr (*pread) (struct bfd *nbfd, + void *stream, + void *buf, + file_ptr nbytes, + file_ptr offset), + int (*close) (struct bfd *nbfd, + void *stream)); + bfd *bfd_openw (const char *filename, const char *target); bfd_boolean bfd_close (bfd *abfd); @@ -993,23 +1076,6 @@ /* Extracted from bfdwin.c. */ /* Extracted from section.c. */ -/* This structure is used for a comdat section, as in PE. A comdat - section is associated with a particular symbol. When the linker - sees a comdat section, it keeps only one of the sections with a - given name and associated with a given symbol. */ - -struct bfd_comdat_info -{ - /* The name of the symbol associated with a comdat section. */ - const char *name; - - /* The local symbol table index of the symbol associated with a - comdat section. This is only meaningful to the object file format - specific code; it is not an index into the list returned by - bfd_canonicalize_symtab. */ - long symbol; -}; - typedef struct bfd_section { /* The name of the section; the name isn't a copy, the pointer is @@ -1025,6 +1091,9 @@ /* The next section in the list belonging to the BFD, or NULL. */ struct bfd_section *next; + /* The previous section in the list belonging to the BFD, or NULL. */ + struct bfd_section *prev; + /* The field flags contains attributes of the section. Some flags are read in from the object file, and some are synthesized from other information. */ @@ -1044,23 +1113,17 @@ some relocation information too. */ #define SEC_RELOC 0x004 - /* ELF reserves 4 processor specific bits and 8 operating system - specific bits in sh_flags; at present we can get away with just - one in communicating between the assembler and BFD, but this - isn't a good long-term solution. */ -#define SEC_ARCH_BIT_0 0x008 - /* A signal to the OS that the section contains read only data. */ -#define SEC_READONLY 0x010 +#define SEC_READONLY 0x008 /* The section contains code only. */ -#define SEC_CODE 0x020 +#define SEC_CODE 0x010 /* The section contains data only. */ -#define SEC_DATA 0x040 +#define SEC_DATA 0x020 /* The section will reside in ROM. */ -#define SEC_ROM 0x080 +#define SEC_ROM 0x040 /* The section contains constructor information. This section type is used by the linker to create lists of constructors and @@ -1072,30 +1135,19 @@ sections called <<__CTOR_LIST__>> and relocate the data contained within - exactly the operations it would peform on standard data. */ -#define SEC_CONSTRUCTOR 0x100 +#define SEC_CONSTRUCTOR 0x080 /* The section has contents - a data section could be <> | <>; a debug section could be <> */ -#define SEC_HAS_CONTENTS 0x200 +#define SEC_HAS_CONTENTS 0x100 /* An instruction to the linker to not output the section even if it has information which would normally be written. */ -#define SEC_NEVER_LOAD 0x400 +#define SEC_NEVER_LOAD 0x200 - /* The section is a COFF shared library section. This flag is - only for the linker. If this type of section appears in - the input file, the linker must copy it to the output file - without changing the vma or size. FIXME: Although this - was originally intended to be general, it really is COFF - specific (and the flag was renamed to indicate this). It - might be cleaner to have some more general mechanism to - allow the back end to control what the linker does with - sections. */ -#define SEC_COFF_SHARED_LIBRARY 0x800 - /* The section contains thread local data. */ -#define SEC_THREAD_LOCAL 0x1000 +#define SEC_THREAD_LOCAL 0x400 /* The section has GOT references. This flag is only for the linker, and is currently only used by the elf32-hppa back end. @@ -1103,46 +1155,46 @@ in this section, which indicate to the linker that the section contains PIC code, and must be handled specially when doing a static link. */ -#define SEC_HAS_GOT_REF 0x4000 +#define SEC_HAS_GOT_REF 0x800 /* The section contains common symbols (symbols may be defined multiple times, the value of a symbol is the amount of space it requires, and the largest symbol value is the one used). Most targets have exactly one of these (which we translate to bfd_com_section_ptr), but ECOFF has two. */ -#define SEC_IS_COMMON 0x8000 +#define SEC_IS_COMMON 0x1000 /* The section contains only debugging information. For example, this is set for ELF .debug and .stab sections. strip tests this flag to see if a section can be discarded. */ -#define SEC_DEBUGGING 0x10000 +#define SEC_DEBUGGING 0x2000 /* The contents of this section are held in memory pointed to by the contents field. This is checked by bfd_get_section_contents, and the data is retrieved from memory if appropriate. */ -#define SEC_IN_MEMORY 0x20000 +#define SEC_IN_MEMORY 0x4000 /* The contents of this section are to be excluded by the linker for executable and shared objects unless those objects are to be further relocated. */ -#define SEC_EXCLUDE 0x40000 +#define SEC_EXCLUDE 0x8000 /* The contents of this section are to be sorted based on the sum of the symbol and addend values specified by the associated relocation entries. Entries without associated relocation entries will be appended to the end of the section in an unspecified order. */ -#define SEC_SORT_ENTRIES 0x80000 +#define SEC_SORT_ENTRIES 0x10000 /* When linking, duplicate sections of the same name should be discarded, rather than being combined into a single section as is usually done. This is similar to how common symbols are handled. See SEC_LINK_DUPLICATES below. */ -#define SEC_LINK_ONCE 0x100000 +#define SEC_LINK_ONCE 0x20000 /* If SEC_LINK_ONCE is set, this bitfield describes how the linker should handle duplicate sections. */ -#define SEC_LINK_DUPLICATES 0x600000 +#define SEC_LINK_DUPLICATES 0x40000 /* This value for SEC_LINK_DUPLICATES means that duplicate sections with the same name should simply be discarded. */ @@ -1151,55 +1203,69 @@ /* This value for SEC_LINK_DUPLICATES means that the linker should warn if there are any duplicate sections, although it should still only link one copy. */ -#define SEC_LINK_DUPLICATES_ONE_ONLY 0x200000 +#define SEC_LINK_DUPLICATES_ONE_ONLY 0x80000 /* This value for SEC_LINK_DUPLICATES means that the linker should warn if any duplicate sections are a different size. */ -#define SEC_LINK_DUPLICATES_SAME_SIZE 0x400000 +#define SEC_LINK_DUPLICATES_SAME_SIZE 0x100000 /* This value for SEC_LINK_DUPLICATES means that the linker should warn if any duplicate sections contain different contents. */ -#define SEC_LINK_DUPLICATES_SAME_CONTENTS 0x600000 +#define SEC_LINK_DUPLICATES_SAME_CONTENTS \ + (SEC_LINK_DUPLICATES_ONE_ONLY | SEC_LINK_DUPLICATES_SAME_SIZE) /* This section was created by the linker as part of dynamic relocation or other arcane processing. It is skipped when going through the first-pass output, trusting that someone else up the line will take care of it later. */ -#define SEC_LINKER_CREATED 0x800000 +#define SEC_LINKER_CREATED 0x200000 /* This section should not be subject to garbage collection. */ -#define SEC_KEEP 0x1000000 +#define SEC_KEEP 0x400000 /* This section contains "short" data, and should be placed "near" the GP. */ -#define SEC_SMALL_DATA 0x2000000 - - /* This section contains data which may be shared with other - executables or shared objects. */ -#define SEC_SHARED 0x4000000 - - /* When a section with this flag is being linked, then if the size of - the input section is less than a page, it should not cross a page - boundary. If the size of the input section is one page or more, it - should be aligned on a page boundary. */ -#define SEC_BLOCK 0x8000000 - - /* Conditionally link this section; do not link if there are no - references found to any symbol in the section. */ -#define SEC_CLINK 0x10000000 +#define SEC_SMALL_DATA 0x800000 /* Attempt to merge identical entities in the section. Entity size is given in the entsize field. */ -#define SEC_MERGE 0x20000000 +#define SEC_MERGE 0x1000000 /* If given with SEC_MERGE, entities to merge are zero terminated strings where entsize specifies character size instead of fixed size entries. */ -#define SEC_STRINGS 0x40000000 +#define SEC_STRINGS 0x2000000 /* This section contains data about section groups. */ -#define SEC_GROUP 0x80000000 +#define SEC_GROUP 0x4000000 + + /* The section is a COFF shared library section. This flag is + only for the linker. If this type of section appears in + the input file, the linker must copy it to the output file + without changing the vma or size. FIXME: Although this + was originally intended to be general, it really is COFF + specific (and the flag was renamed to indicate this). It + might be cleaner to have some more general mechanism to + allow the back end to control what the linker does with + sections. */ +#define SEC_COFF_SHARED_LIBRARY 0x10000000 + + /* This section contains data which may be shared with other + executables or shared objects. This is for COFF only. */ +#define SEC_COFF_SHARED 0x20000000 + + /* When a section with this flag is being linked, then if the size of + the input section is less than a page, it should not cross a page + boundary. If the size of the input section is one page or more, + it should be aligned on a page boundary. This is for TI + TMS320C54X only. */ +#define SEC_TIC54X_BLOCK 0x40000000 + + /* Conditionally link this section; do not link if there are no + references found to any symbol in the section. This is for TI + TMS320C54X only. */ +#define SEC_TIC54X_CLINK 0x80000000 /* End of section flags. */ @@ -1208,9 +1274,6 @@ /* See the vma field. */ unsigned int user_set_vma : 1; - /* Whether relocations have been processed. */ - unsigned int reloc_done : 1; - /* A mark flag used by some of the linker backends. */ unsigned int linker_mark : 1; @@ -1218,8 +1281,9 @@ output sections that have an input section. */ unsigned int linker_has_input : 1; - /* A mark flag used by some linker backends for garbage collection. */ + /* Mark flags used by some linker backends for garbage collection. */ unsigned int gc_mark : 1; + unsigned int gc_mark_from_eh : 1; /* The following flags are used by the ELF linker. */ @@ -1237,23 +1301,21 @@ /* Nonzero if this section uses RELA relocations, rather than REL. */ unsigned int use_rela_p:1; - /* Bits used by various backends. */ + /* Bits used by various backends. The generic code doesn't touch + these fields. */ + + /* Nonzero if this section has TLS related relocations. */ unsigned int has_tls_reloc:1; + /* Nonzero if this section has a gp reloc. */ + unsigned int has_gp_reloc:1; + /* Nonzero if this section needs the relax finalize pass. */ unsigned int need_finalize_relax:1; - /* Nonzero if this section has a gp reloc. */ - unsigned int has_gp_reloc:1; + /* Whether relocations have been processed. */ + unsigned int reloc_done : 1; - /* Unused bits. */ - unsigned int flag13:1; - unsigned int flag14:1; - unsigned int flag15:1; - unsigned int flag16:4; - unsigned int flag20:4; - unsigned int flag24:8; - /* End of internal packed boolean fields. */ /* The virtual memory address of the section - where it will be @@ -1271,13 +1333,18 @@ /* The size of the section in octets, as it will be output. Contains a value even if the section has no contents (e.g., the - size of <<.bss>>). This will be filled in after relocation. */ - bfd_size_type _cooked_size; + size of <<.bss>>). */ + bfd_size_type size; - /* The original size on disk of the section, in octets. Normally this - value is the same as the size, but if some relaxing has - been done, then this value will be bigger. */ - bfd_size_type _raw_size; + /* For input sections, the original size on disk of the section, in + octets. This field is used by the linker relaxation code. It is + currently only set for sections where the linker relaxation scheme + doesn't cache altered section and reloc contents (stabs, eh_frame, + SEC_MERGE, some coff relaxing targets), and thus the original size + needs to be kept to read the section multiple times. + For output sections, rawsize holds the section size calculated on + a previous linker relaxation pass. */ + bfd_size_type rawsize; /* If this section is going to be output, then this value is the offset in *bytes* into the output section of the first byte in the @@ -1334,9 +1401,6 @@ /* Entity size for merging purposes. */ unsigned int entsize; - /* Optional information about a COMDAT entry; NULL if not COMDAT. */ - struct bfd_comdat_info *comdat; - /* Points to the kept section if this section is a link-once section, and is discarded. */ struct bfd_section *kept_section; @@ -1361,8 +1425,14 @@ struct bfd_symbol *symbol; struct bfd_symbol **symbol_ptr_ptr; - struct bfd_link_order *link_order_head; - struct bfd_link_order *link_order_tail; + /* Early in the link process, map_head and map_tail are used to build + a list of input sections attached to an output section. Later, + output sections use these fields for a list of bfd_link_order + structs. */ + union { + struct bfd_link_order *link_order; + struct bfd_section *s; + } map_head, map_tail; } asection; /* These sections are global, and are managed by BFD. The application @@ -1401,48 +1471,161 @@ extern const struct bfd_symbol * const bfd_com_symbol; extern const struct bfd_symbol * const bfd_und_symbol; extern const struct bfd_symbol * const bfd_ind_symbol; -#define bfd_get_section_size_before_reloc(section) \ - ((section)->_raw_size) -#define bfd_get_section_size_after_reloc(section) \ - ((section)->reloc_done ? (section)->_cooked_size \ - : (abort (), (bfd_size_type) 1)) /* Macros to handle insertion and deletion of a bfd's sections. These only handle the list pointers, ie. do not adjust section_count, target_index etc. */ -#define bfd_section_list_remove(ABFD, PS) \ +#define bfd_section_list_remove(ABFD, S) \ + do \ + { \ + asection *_s = S; \ + asection *_next = _s->next; \ + asection *_prev = _s->prev; \ + if (_prev) \ + _prev->next = _next; \ + else \ + (ABFD)->sections = _next; \ + if (_next) \ + _next->prev = _prev; \ + else \ + (ABFD)->section_last = _prev; \ + } \ + while (0) +#define bfd_section_list_append(ABFD, S) \ + do \ + { \ + asection *_s = S; \ + bfd *_abfd = ABFD; \ + _s->next = NULL; \ + if (_abfd->section_last) \ + { \ + _s->prev = _abfd->section_last; \ + _abfd->section_last->next = _s; \ + } \ + else \ + { \ + _s->prev = NULL; \ + _abfd->sections = _s; \ + } \ + _abfd->section_last = _s; \ + } \ + while (0) +#define bfd_section_list_prepend(ABFD, S) \ + do \ + { \ + asection *_s = S; \ + bfd *_abfd = ABFD; \ + _s->prev = NULL; \ + if (_abfd->sections) \ + { \ + _s->next = _abfd->sections; \ + _abfd->sections->prev = _s; \ + } \ + else \ + { \ + _s->next = NULL; \ + _abfd->section_last = _s; \ + } \ + _abfd->sections = _s; \ + } \ + while (0) +#define bfd_section_list_insert_after(ABFD, A, S) \ do \ { \ - asection **_ps = PS; \ - asection *_s = *_ps; \ - *_ps = _s->next; \ - if (_s->next == NULL) \ - (ABFD)->section_tail = _ps; \ + asection *_a = A; \ + asection *_s = S; \ + asection *_next = _a->next; \ + _s->next = _next; \ + _s->prev = _a; \ + _a->next = _s; \ + if (_next) \ + _next->prev = _s; \ + else \ + (ABFD)->section_last = _s; \ } \ while (0) -#define bfd_section_list_insert(ABFD, PS, S) \ +#define bfd_section_list_insert_before(ABFD, B, S) \ do \ { \ - asection **_ps = PS; \ + asection *_b = B; \ asection *_s = S; \ - _s->next = *_ps; \ - *_ps = _s; \ - if (_s->next == NULL) \ - (ABFD)->section_tail = &_s->next; \ + asection *_prev = _b->prev; \ + _s->prev = _prev; \ + _s->next = _b; \ + _b->prev = _s; \ + if (_prev) \ + _prev->next = _s; \ + else \ + (ABFD)->sections = _s; \ } \ while (0) +#define bfd_section_removed_from_list(ABFD, S) \ + ((S)->next == NULL ? (ABFD)->section_last != (S) : (S)->next->prev != (S)) + +#define BFD_FAKE_SECTION(SEC, FLAGS, SYM, SYM_PTR, NAME, IDX) \ + /* name, id, index, next, prev, flags, user_set_vma, */ \ + { NAME, IDX, 0, NULL, NULL, FLAGS, 0, \ + \ + /* linker_mark, linker_has_input, gc_mark, gc_mark_from_eh, */ \ + 0, 0, 1, 0, \ + \ + /* segment_mark, sec_info_type, use_rela_p, has_tls_reloc, */ \ + 0, 0, 0, 0, \ + \ + /* has_gp_reloc, need_finalize_relax, reloc_done, */ \ + 0, 0, 0, \ + \ + /* vma, lma, size, rawsize */ \ + 0, 0, 0, 0, \ + \ + /* output_offset, output_section, alignment_power, */ \ + 0, (struct bfd_section *) &SEC, 0, \ + \ + /* relocation, orelocation, reloc_count, filepos, rel_filepos, */ \ + NULL, NULL, 0, 0, 0, \ + \ + /* line_filepos, userdata, contents, lineno, lineno_count, */ \ + 0, NULL, NULL, NULL, 0, \ + \ + /* entsize, kept_section, moving_line_filepos, */ \ + 0, NULL, 0, \ + \ + /* target_index, used_by_bfd, constructor_chain, owner, */ \ + 0, NULL, NULL, NULL, \ + \ + /* symbol, */ \ + (struct bfd_symbol *) SYM, \ + \ + /* symbol_ptr_ptr, */ \ + (struct bfd_symbol **) SYM_PTR, \ + \ + /* map_head, map_tail */ \ + { NULL }, { NULL } \ + } void bfd_section_list_clear (bfd *); asection *bfd_get_section_by_name (bfd *abfd, const char *name); +asection *bfd_get_section_by_name_if + (bfd *abfd, + const char *name, + bfd_boolean (*func) (bfd *abfd, asection *sect, void *obj), + void *obj); + char *bfd_get_unique_section_name (bfd *abfd, const char *templat, int *count); asection *bfd_make_section_old_way (bfd *abfd, const char *name); +asection *bfd_make_section_anyway_with_flags + (bfd *abfd, const char *name, flagword flags); + asection *bfd_make_section_anyway (bfd *abfd, const char *name); +asection *bfd_make_section_with_flags + (bfd *, const char *name, flagword flags); + asection *bfd_make_section (bfd *, const char *name); bfd_boolean bfd_set_section_flags @@ -1453,6 +1636,11 @@ void (*func) (bfd *abfd, asection *sect, void *obj), void *obj); +asection *bfd_sections_find_if + (bfd *abfd, + bfd_boolean (*operation) (bfd *abfd, asection *sect, void *obj), + void *obj); + bfd_boolean bfd_set_section_size (bfd *abfd, asection *sec, bfd_size_type val); @@ -1464,14 +1652,16 @@ (bfd *abfd, asection *section, void *location, file_ptr offset, bfd_size_type count); +bfd_boolean bfd_malloc_and_get_section + (bfd *abfd, asection *section, bfd_byte **buf); + bfd_boolean bfd_copy_private_section_data (bfd *ibfd, asection *isec, bfd *obfd, asection *osec); #define bfd_copy_private_section_data(ibfd, isection, obfd, osection) \ BFD_SEND (obfd, _bfd_copy_private_section_data, \ (ibfd, isection, obfd, osection)) -void _bfd_strip_section_from_output - (struct bfd_link_info *info, asection *section); +bfd_boolean bfd_generic_is_group_section (bfd *, const asection *sec); bfd_boolean bfd_generic_discard_group (bfd *abfd, asection *group); @@ -1489,11 +1679,22 @@ #define bfd_mach_m68040 6 #define bfd_mach_m68060 7 #define bfd_mach_cpu32 8 -#define bfd_mach_mcf5200 9 -#define bfd_mach_mcf5206e 10 -#define bfd_mach_mcf5307 11 -#define bfd_mach_mcf5407 12 -#define bfd_mach_mcf528x 13 +#define bfd_mach_mcf_isa_a_nodiv 9 +#define bfd_mach_mcf_isa_a 10 +#define bfd_mach_mcf_isa_a_mac 11 +#define bfd_mach_mcf_isa_a_emac 12 +#define bfd_mach_mcf_isa_aplus 13 +#define bfd_mach_mcf_isa_aplus_mac 14 +#define bfd_mach_mcf_isa_aplus_emac 15 +#define bfd_mach_mcf_isa_b_nousp 16 +#define bfd_mach_mcf_isa_b_nousp_mac 17 +#define bfd_mach_mcf_isa_b_nousp_emac 18 +#define bfd_mach_mcf_isa_b 19 +#define bfd_mach_mcf_isa_b_mac 20 +#define bfd_mach_mcf_isa_b_emac 21 +#define bfd_mach_mcf_isa_b_float 22 +#define bfd_mach_mcf_isa_b_float_mac 23 +#define bfd_mach_mcf_isa_b_float_emac 24 bfd_arch_vax, /* DEC Vax */ bfd_arch_i960, /* Intel 960 */ /* The order of the following is important. @@ -1515,7 +1716,6 @@ bfd_arch_or32, /* OpenRISC 32 */ - bfd_arch_a29k, /* AMD 29000 */ bfd_arch_sparc, /* SPARC */ #define bfd_mach_sparc 1 /* The difference between v8plus and v9 is that v9 is a true 64 bit env. */ @@ -1532,6 +1732,9 @@ #define bfd_mach_sparc_v9_p(mach) \ ((mach) >= bfd_mach_sparc_v8plus && (mach) <= bfd_mach_sparc_v9b \ && (mach) != bfd_mach_sparc_sparclite_le) +/* Nonzero if MACH is a 64 bit sparc architecture. */ +#define bfd_mach_sparc_64bit_p(mach) \ + ((mach) >= bfd_mach_sparc_v9 && (mach) != bfd_mach_sparc_v8plusb) bfd_arch_mips, /* MIPS Rxxxx */ #define bfd_mach_mips3000 3000 #define bfd_mach_mips3900 3900 @@ -1550,6 +1753,7 @@ #define bfd_mach_mips6000 6000 #define bfd_mach_mips7000 7000 #define bfd_mach_mips8000 8000 +#define bfd_mach_mips9000 9000 #define bfd_mach_mips10000 10000 #define bfd_mach_mips12000 12000 #define bfd_mach_mips16 16 @@ -1570,7 +1774,6 @@ bfd_arch_i860, /* Intel 860 */ bfd_arch_i370, /* IBM 360/370 Mainframes */ bfd_arch_romp, /* IBM ROMP PC/RT */ - bfd_arch_alliant, /* Alliant */ bfd_arch_convex, /* Convex */ bfd_arch_m88k, /* Motorola 88xxx */ bfd_arch_m98k, /* Motorola 98xxx */ @@ -1633,12 +1836,20 @@ #define bfd_mach_sh 1 #define bfd_mach_sh2 0x20 #define bfd_mach_sh_dsp 0x2d +#define bfd_mach_sh2a 0x2a +#define bfd_mach_sh2a_nofpu 0x2b +#define bfd_mach_sh2a_nofpu_or_sh4_nommu_nofpu 0x2a1 +#define bfd_mach_sh2a_nofpu_or_sh3_nommu 0x2a2 +#define bfd_mach_sh2a_or_sh4 0x2a3 +#define bfd_mach_sh2a_or_sh3e 0x2a4 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Nov 6 00:15:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C922116A51B; Mon, 6 Nov 2006 00:15:57 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 784A016A4F4 for ; Mon, 6 Nov 2006 00:15:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E00B843D67 for ; Mon, 6 Nov 2006 00:15:54 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA60FsuY021066 for ; Mon, 6 Nov 2006 00:15:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA60FsQ0021063 for perforce@freebsd.org; Mon, 6 Nov 2006 00:15:54 GMT (envelope-from jb@freebsd.org) Date: Mon, 6 Nov 2006 00:15:54 GMT Message-Id: <200611060015.kA60FsQ0021063@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109315 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 00:15:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=109315 Change 109315 by jb@jb_freebsd8 on 2006/11/06 00:15:30 Update the config.h generated by a gmake of binutils-2.17. Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbinutils/config.h#2 edit Differences ... ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libbinutils/config.h#2 (text+ko) ==== @@ -1,210 +1,269 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/config.h,v 1.12 2004/06/16 07:09:40 obrien Exp $ */ +/* $FreeBSD$ */ +/* config.h. Generated by configure. */ +/* config.in. Generated from configure.in by autoheader. */ -/* FreeBSD isn't any form of AIX. */ -#define bin_dummy_emulation bin_vanilla_emulation +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ -/* config.h. Generated automatically by configure. */ -/* config.in. Generated automatically from configure.in by autoheader. */ - -/* Define if using alloca.c. */ +/* Define to 1 if using `alloca.c'. */ /* #undef C_ALLOCA */ -/* Define to empty if the keyword does not work. */ -/* #undef const */ +/* Define to 1 if NLS is requested */ +#define ENABLE_NLS 1 -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -/* #undef CRAY_STACKSEG_END */ +/* Suffix used for executables, if any. */ +#define EXECUTABLE_SUFFIX "" -/* Define if you have alloca, as a function or macro. */ +/* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 -/* Define if you have and it should be used (not on Ultrix). */ +/* Define to 1 if you have and it should be used (not on Ultrix). + */ /* #undef HAVE_ALLOCA_H */ -/* Define if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ARGZ_H */ + +/* Define to 1 if you have the `dcgettext' function. */ +/* #undef HAVE_DCGETTEXT */ + +/* Define to 1 if you have the declaration of `environ', and to 0 if you + don't. */ +#define HAVE_DECL_ENVIRON 0 -/* Define if you have that is POSIX.1 compatible. */ -#define HAVE_SYS_WAIT_H 1 +/* Define to 1 if you have the declaration of `fprintf', and to 0 if you + don't. */ +#define HAVE_DECL_FPRINTF 1 -/* Define as __inline if that's what the C compiler calls it. */ -/* #undef inline */ +/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you + don't. */ +#define HAVE_DECL_GETC_UNLOCKED 1 -/* Define to `long' if doesn't define. */ -/* #undef off_t */ +/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. + */ +#define HAVE_DECL_GETENV 1 -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ +/* Is the prototype for getopt in in the expected format? */ +#define HAVE_DECL_GETOPT 1 -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown - */ -/* #undef STACK_DIRECTION */ +/* Define to 1 if you have the declaration of `sbrk', and to 0 if you don't. + */ +#define HAVE_DECL_SBRK 1 -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 +/* Define to 1 if you have the declaration of `snprintf', and to 0 if you + don't. */ +#define HAVE_DECL_SNPRINTF 1 -/* Define if lex declares yytext as a char * by default, not a char[]. */ -#define YYTEXT_POINTER 1 +/* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't. + */ +#define HAVE_DECL_STPCPY 1 -/* Define if you have the __argz_count function. */ -/* #undef HAVE___ARGZ_COUNT */ +/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't. + */ +#define HAVE_DECL_STRSTR 1 -/* Define if you have the __argz_next function. */ -/* #undef HAVE___ARGZ_NEXT */ +/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you + don't. */ +#define HAVE_DECL_VSNPRINTF 1 -/* Define if you have the __argz_stringify function. */ -/* #undef HAVE___ARGZ_STRINGIFY */ +/* Does the platform use an executable suffix? */ +/* #undef HAVE_EXECUTABLE_SUFFIX */ -/* Define if you have the dcgettext function. */ -/* #undef HAVE_DCGETTEXT */ +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 -/* Define if you have the getc_unlocked function. */ -#define HAVE_GETC_UNLOCKED 1 +/* Is fopen64 available? */ +/* #undef HAVE_FOPEN64 */ -/* Define if you have the getcwd function. */ +/* Define to 1 if you have the `getcwd' function. */ #define HAVE_GETCWD 1 -/* Define if you have the getpagesize function. */ +/* Define to 1 if you have the `getc_unlocked' function. */ +#define HAVE_GETC_UNLOCKED 1 + +/* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 -/* Define if you have the munmap function. */ +/* Define as 1 if you have gettext and don't want to use GNU gettext. */ +/* #undef HAVE_GETTEXT */ + +/* Does define struct utimbuf? */ +#define HAVE_GOOD_UTIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define if your locale.h file contains LC_MESSAGES. */ +#define HAVE_LC_MESSAGES 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MALLOC_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the `munmap' function. */ #define HAVE_MUNMAP 1 -/* Define if you have the putenv function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_NL_TYPES_H 1 + +/* Define to 1 if you have the `putenv' function. */ #define HAVE_PUTENV 1 -/* Define if you have the sbrk function. */ +/* Define to 1 if you have the `sbrk' function. */ #define HAVE_SBRK 1 -/* Define if you have the setenv function. */ +/* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 -/* Define if you have the setlocale function. */ +/* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 -/* Define if you have the setmode function. */ +/* Define to 1 if you have the `setmode' function. */ #define HAVE_SETMODE 1 -/* Define if you have the stpcpy function. */ +/* Is stat64 available? */ +/* #undef HAVE_STAT64 */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define if you have the stpcpy function */ #define HAVE_STPCPY 1 -/* Define if you have the strcasecmp function. */ +/* Define to 1 if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1 -/* Define if you have the strchr function. */ +/* Define to 1 if you have the `strchr' function. */ #define HAVE_STRCHR 1 -/* Define if you have the strcoll function. */ +/* Define to 1 if you have the `strcoll' function. */ #define HAVE_STRCOLL 1 -/* Define if you have the utimes function. */ -#define HAVE_UTIMES 1 +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 -/* Define if you have the header file. */ -/* #undef HAVE_ARGZ_H */ +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_FILE_H 1 -/* Define if you have the header file. */ -#define HAVE_FCNTL_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 -/* Define if you have the header file. */ -#define HAVE_LIMITS_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 -/* Define if you have the header file. */ -#define HAVE_LOCALE_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 -/* Define if you have the header file. */ -/* #undef HAVE_MALLOC_H */ +/* Define to 1 if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 -/* Define if you have the header file. */ -#define HAVE_NL_TYPES_H 1 +/* Is the type time_t defined in ? */ +#define HAVE_TIME_T_IN_TIME_H 1 -/* Define if you have the header file. */ -#define HAVE_STDLIB_H 1 +/* Is the type time_t defined in ? */ +#define HAVE_TIME_T_IN_TYPES_H 1 -/* Define if you have the header file. */ -#define HAVE_STRING_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 -/* Define if you have the header file. */ -#define HAVE_STRINGS_H 1 +/* Define to 1 if you have the `utimes' function. */ +#define HAVE_UTIMES 1 -/* Define if you have the header file. */ -#define HAVE_SYS_FILE_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALUES_H */ -/* Define if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 +/* Define to 1 if you have the `__argz_count' function. */ +/* #undef HAVE___ARGZ_COUNT */ -/* Define if you have the header file. */ -#define HAVE_UNISTD_H 1 +/* Define to 1 if you have the `__argz_next' function. */ +/* #undef HAVE___ARGZ_NEXT */ -/* Define if you have the header file. */ -/* #undef HAVE_VALUES_H */ +/* Define to 1 if you have the `__argz_stringify' function. */ +/* #undef HAVE___ARGZ_STRINGIFY */ /* Name of package */ #define PACKAGE "binutils" -/* Version number of package */ -/* #define VERSION "2.15" */ +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" -/* Define if you have the stpcpy function */ -#define HAVE_STPCPY 1 +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" -/* Define if your locale.h file contains LC_MESSAGES. */ -#define HAVE_LC_MESSAGES 1 +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" -/* Define to 1 if NLS is requested */ -/* #define ENABLE_NLS 1 */ +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" -/* Define as 1 if you have gettext and don't want to use GNU gettext. */ -/* #undef HAVE_GETTEXT */ +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" -/* Does the platform use an executable suffix? */ -/* #undef HAVE_EXECUTABLE_SUFFIX */ +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +/* #undef STACK_DIRECTION */ -/* Suffix used for executables, if any. */ -#define EXECUTABLE_SUFFIX "" +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 -/* Is fopen64 available? */ -/* #undef HAVE_FOPEN64 */ +/* Configured target name. */ +#define TARGET "i386-unknown-freebsd7.0" -/* Enable LFS */ -/* #undef _LARGEFILE64_SOURCE */ +/* Define to 1 if user symbol names have a leading underscore, 0 if not. */ +#define TARGET_PREPENDS_UNDERSCORE 0 -/* Is the type time_t defined in ? */ -#define HAVE_TIME_T_IN_TIME_H 1 +/* Use b modifier when opening binary files? */ +/* #undef USE_BINARY_FOPEN */ -/* Is the type time_t defined in ? */ -#define HAVE_TIME_T_IN_TYPES_H 1 +/* Version number of package */ +#define VERSION "2.17" -/* Does define struct utimbuf? */ -#define HAVE_GOOD_UTIME_H 1 +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ +#define YYTEXT_POINTER 1 -/* Define if fprintf is not declared in system header files. */ -/* #undef NEED_DECLARATION_FPRINTF */ +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif -/* Define if strstr is not declared in system header files. */ -/* #undef NEED_DECLARATION_STRSTR */ +/* Enable LFS */ +/* #undef _LARGEFILE64_SOURCE */ -/* Define if sbrk is not declared in system header files. */ -/* #undef NEED_DECLARATION_SBRK */ +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ -/* Define if getenv is not declared in system header files. */ -/* #undef NEED_DECLARATION_GETENV */ +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif -/* Define if environ is not declared in system header files. */ -#define NEED_DECLARATION_ENVIRON 1 +/* Define to `long' if does not define. */ +/* #undef off_t */ -/* Use b modifier when opening binary files? */ -/* #undef USE_BINARY_FOPEN */ - -/* Configured target name. */ -/* #define TARGET "amd64-unknown-freebsd5.2" */ - -/* Define to 1 if user symbol names have a leading underscore, 0 if not. */ -#define TARGET_PREPENDS_UNDERSCORE 0 - +/* Define to `unsigned' if does not define. */ +/* #undef size_t */ From owner-p4-projects@FreeBSD.ORG Mon Nov 6 00:27:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E9FA16A412; Mon, 6 Nov 2006 00:27:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 59D3216A407 for ; Mon, 6 Nov 2006 00:27:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F9A243D5E for ; Mon, 6 Nov 2006 00:27:10 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA60RAC0022954 for ; Mon, 6 Nov 2006 00:27:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA60R9E5022951 for perforce@freebsd.org; Mon, 6 Nov 2006 00:27:09 GMT (envelope-from jb@freebsd.org) Date: Mon, 6 Nov 2006 00:27:09 GMT Message-Id: <200611060027.kA60R9E5022951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109317 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 00:27:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=109317 Change 109317 by jb@jb_freebsd8 on 2006/11/06 00:26:18 Remove the TARGET definition. We do that in the compile commands. Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbinutils/config.h#3 edit Differences ... ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libbinutils/config.h#3 (text+ko) ==== @@ -229,9 +229,6 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* Configured target name. */ -#define TARGET "i386-unknown-freebsd7.0" - /* Define to 1 if user symbol names have a leading underscore, 0 if not. */ #define TARGET_PREPENDS_UNDERSCORE 0 From owner-p4-projects@FreeBSD.ORG Mon Nov 6 00:27:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEAA016A55C; Mon, 6 Nov 2006 00:27:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B466C16A55A for ; Mon, 6 Nov 2006 00:27:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A9A943D5E for ; Mon, 6 Nov 2006 00:27:10 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA60RAx3022960 for ; Mon, 6 Nov 2006 00:27:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA60RAMv022957 for perforce@freebsd.org; Mon, 6 Nov 2006 00:27:10 GMT (envelope-from jb@freebsd.org) Date: Mon, 6 Nov 2006 00:27:10 GMT Message-Id: <200611060027.kA60RAMv022957@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109318 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 00:27:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=109318 Change 109318 by jb@jb_freebsd8 on 2006/11/06 00:26:58 Replace a specific user name with a general one in the TARGET string. Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbinutils/Makefile#2 edit Differences ... ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libbinutils/Makefile#2 (text+ko) ==== @@ -9,7 +9,7 @@ ieee.c rdcoff.c rddbg.c rename.c stabs.c unwind-ia64.c \ wrstabs.c version.c binemul.c budemang.c emul_vanilla.c WARNS?= 0 -CFLAGS+= -DTARGET=\"${BINUTILS_ARCH}-obrien-freebsd\" +CFLAGS+= -DTARGET=\"${BINUTILS_ARCH}-user-freebsd\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${SRCDIR}/binutils From owner-p4-projects@FreeBSD.ORG Mon Nov 6 00:29:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3105416A6CC; Mon, 6 Nov 2006 00:29:15 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 CB9C116A6C9 for ; Mon, 6 Nov 2006 00:29:14 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8822543D5A for ; Mon, 6 Nov 2006 00:29:14 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA60TE5R023127 for ; Mon, 6 Nov 2006 00:29:14 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA60TE1M023124 for perforce@freebsd.org; Mon, 6 Nov 2006 00:29:14 GMT (envelope-from jb@freebsd.org) Date: Mon, 6 Nov 2006 00:29:14 GMT Message-Id: <200611060029.kA60TE1M023124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 00:29:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=109319 Change 109319 by jb@jb_freebsd8 on 2006/11/06 00:28:40 The binutils-2.17 gmake creates a symbolic link of this file name to libgettext.h, so just add a copy of that here for simplicity sake. Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbinutils/libintl.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Nov 6 00:43:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C197A16A417; Mon, 6 Nov 2006 00:43:33 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7283016A415 for ; Mon, 6 Nov 2006 00:43:33 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 45D2443D46 for ; Mon, 6 Nov 2006 00:43:33 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA60hXal025964 for ; Mon, 6 Nov 2006 00:43:33 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA60hXPs025960 for perforce@freebsd.org; Mon, 6 Nov 2006 00:43:33 GMT (envelope-from cognet@freebsd.org) Date: Mon, 6 Nov 2006 00:43:33 GMT Message-Id: <200611060043.kA60hXPs025960@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 109320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 00:43:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=109320 Change 109320 by cognet@cognet on 2006/11/06 00:43:18 Ok, change the way we do the reset to use the watchdog instead, by starting it up with a timeout of 0. The previous way of jumping into the address 0 of the rom didn't work everytime, I don't know why. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#15 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#15 (text+ko) ==== @@ -169,34 +169,14 @@ void cpu_reset(void) { - u_int32_t reg; - (void) disable_interrupts(I32_bit|F32_bit); - IXPREG(IXP425_INT_ENABLE) = 0; - /* - * Map the boot Flash device down at physical address 0. - */ - reg = bus_space_read_4(&ixp425_bs_tag, IXP425_EXP_VBASE, - EXP_CNFG0_OFFSET); - reg |= EXP_CNFG0_MEM_MAP; - bus_space_write_4(&ixp425_bs_tag, IXP425_EXP_VBASE, - EXP_CNFG0_OFFSET, reg); - cpu_idcache_wbinv_all(); - cpu_control(CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE - | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE - , 0xffffffff); - - /* Jump into the bootcode's reset vector. */ - __asm __volatile( - "mrc p15, 0, %0, c1, c0, 0\n" - "bic %0, %0, #1\n" /* Disable MMU */ - "mcr p15, 0, %0, c1, c0, 0\n" - "nop\n" - "nop\n" - "nop\n" - "mov pc, #0\n" - : "=r" (reg)); - + bus_space_write_4(&ixp425_bs_tag, IXP425_TIMER_VBASE, + IXP425_OST_WDOG_KEY, OST_WDOG_KEY_MAJICK); + bus_space_write_4(&ixp425_bs_tag, IXP425_TIMER_VBASE, + IXP425_OST_WDOG, 0); + bus_space_write_4(&ixp425_bs_tag, IXP425_TIMER_VBASE, + IXP425_OST_WDOG_ENAB, OST_WDOG_ENAB_RST_ENA | + OST_WDOG_ENAB_CNT_ENA); printf("Reset failed!\n"); for(;;); } From owner-p4-projects@FreeBSD.ORG Mon Nov 6 00:54:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FB1916A416; Mon, 6 Nov 2006 00:54:50 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2C99516A40F for ; Mon, 6 Nov 2006 00:54:50 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E71F443D49 for ; Mon, 6 Nov 2006 00:54:49 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA60sndA036144 for ; Mon, 6 Nov 2006 00:54:49 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA60slTe036114 for perforce@freebsd.org; Mon, 6 Nov 2006 00:54:47 GMT (envelope-from marcel@freebsd.org) Date: Mon, 6 Nov 2006 00:54:47 GMT Message-Id: <200611060054.kA60slTe036114@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 Cc: Subject: PERFORCE change 109321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 00:54:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=109321 Change 109321 by marcel@marcel_cluster on 2006/11/06 00:53:52 IFC @109316 Affected files ... .. //depot/projects/ia64/ObsoleteFiles.inc#11 integrate .. //depot/projects/ia64/contrib/bind9/CHANGES#6 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/query.c#4 integrate .. //depot/projects/ia64/contrib/bind9/configure.in#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/resolver.c#6 integrate .. //depot/projects/ia64/contrib/bind9/version#6 integrate .. //depot/projects/ia64/lib/libc/net/gethostbyname.3#12 integrate .. //depot/projects/ia64/lib/libc/net/resolver.3#11 integrate .. //depot/projects/ia64/lib/libc/sparc64/sys/Makefile.inc#9 integrate .. //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_utrap_gen.S#4 integrate .. //depot/projects/ia64/lib/libc/sys/clock_gettime.2#10 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#164 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.8#17 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.c#17 integrate .. //depot/projects/ia64/share/man/man3/pthread_cond_init.3#3 integrate .. //depot/projects/ia64/share/man/man3/pthread_create.3#5 integrate .. //depot/projects/ia64/share/man/man3/pthread_mutex_init.3#3 integrate .. //depot/projects/ia64/share/man/man4/aac.4#13 integrate .. //depot/projects/ia64/share/man/man9/VOP_REMOVE.9#6 integrate .. //depot/projects/ia64/share/man/man9/VOP_RENAME.9#8 integrate .. //depot/projects/ia64/share/mk/bsd.sys.mk#27 integrate .. //depot/projects/ia64/sys/amd64/conf/DEFAULTS#6 integrate .. //depot/projects/ia64/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/ia64/sys/boot/Makefile#21 integrate .. //depot/projects/ia64/sys/boot/efi/include/efilib.h#12 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/Makefile#17 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/efifs.c#18 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#10 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/errno.c#2 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/handles.c#2 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/libefi.c#9 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/time.c#5 integrate .. //depot/projects/ia64/sys/boot/ia64/Makefile#5 integrate .. //depot/projects/ia64/sys/boot/ia64/common/Makefile#2 integrate .. //depot/projects/ia64/sys/boot/ia64/common/autoload.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/common/bootinfo.c#4 integrate .. //depot/projects/ia64/sys/boot/ia64/common/copy.c#3 integrate .. //depot/projects/ia64/sys/boot/ia64/common/devicename.c#5 integrate .. //depot/projects/ia64/sys/boot/ia64/common/exec.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/common/libia64.h#2 integrate .. //depot/projects/ia64/sys/boot/ia64/efi/Makefile#9 integrate .. //depot/projects/ia64/sys/boot/ia64/efi/conf.c#6 integrate .. //depot/projects/ia64/sys/boot/ia64/efi/efimd.c#6 integrate .. //depot/projects/ia64/sys/boot/ia64/efi/main.c#9 integrate .. //depot/projects/ia64/sys/boot/ia64/efi/version#3 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/Makefile#9 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/efi_stub.c#4 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/libski.h#5 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/main.c#5 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/skifs.c#3 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/skimd.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/version#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.h#10 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_proto.h#22 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscall.h#22 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscalls.c#22 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_sysent.c#22 integrate .. //depot/projects/ia64/sys/compat/freebsd32/syscalls.master#22 integrate .. //depot/projects/ia64/sys/conf/NOTES#109 integrate .. //depot/projects/ia64/sys/conf/files#149 integrate .. //depot/projects/ia64/sys/conf/options#100 integrate .. //depot/projects/ia64/sys/dev/aac/aac_pci.c#38 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#60 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_node.c#21 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_smb.c#16 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#32 integrate .. //depot/projects/ia64/sys/i386/conf/DEFAULTS#6 integrate .. //depot/projects/ia64/sys/ia64/conf/DEFAULTS#6 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#56 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#57 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#58 integrate .. //depot/projects/ia64/sys/kern/systrace_args.c#3 integrate .. //depot/projects/ia64/sys/kern/tty_cons.c#28 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#65 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#93 integrate .. //depot/projects/ia64/sys/modules/ath_rate_amrr/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/bge/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/nfe/Makefile#2 integrate .. //depot/projects/ia64/sys/net/if_bridge.c#12 integrate .. //depot/projects/ia64/sys/net/if_tap.c#37 integrate .. //depot/projects/ia64/sys/net/rtsock.c#37 integrate .. //depot/projects/ia64/sys/netinet/in_proto.c#20 integrate .. //depot/projects/ia64/sys/netinet/sctp.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_asconf.c#1 branch .. //depot/projects/ia64/sys/netinet/sctp_asconf.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_auth.c#1 branch .. //depot/projects/ia64/sys/netinet/sctp_auth.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_bsd_addr.c#1 branch .. //depot/projects/ia64/sys/netinet/sctp_bsd_addr.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_constants.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_crc32.c#1 branch .. //depot/projects/ia64/sys/netinet/sctp_crc32.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_header.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_indata.c#1 branch .. //depot/projects/ia64/sys/netinet/sctp_indata.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_input.c#1 branch .. //depot/projects/ia64/sys/netinet/sctp_input.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_lock_bsd.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_os.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_os_bsd.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_output.c#1 branch .. //depot/projects/ia64/sys/netinet/sctp_output.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_pcb.c#1 branch .. //depot/projects/ia64/sys/netinet/sctp_pcb.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_peeloff.c#1 branch .. //depot/projects/ia64/sys/netinet/sctp_peeloff.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_structs.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_timer.c#1 branch .. //depot/projects/ia64/sys/netinet/sctp_timer.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_uio.h#1 branch .. //depot/projects/ia64/sys/netinet/sctp_usrreq.c#1 branch .. //depot/projects/ia64/sys/netinet/sctp_var.h#1 branch .. //depot/projects/ia64/sys/netinet/sctputil.c#1 branch .. //depot/projects/ia64/sys/netinet/sctputil.h#1 branch .. //depot/projects/ia64/sys/netinet6/in6_proto.c#17 integrate .. //depot/projects/ia64/sys/netinet6/sctp6_usrreq.c#1 branch .. //depot/projects/ia64/sys/netinet6/sctp6_var.h#1 branch .. //depot/projects/ia64/sys/netsmb/smb_subr.c#17 integrate .. //depot/projects/ia64/sys/pc98/conf/DEFAULTS#6 integrate .. //depot/projects/ia64/sys/powerpc/conf/DEFAULTS#4 integrate .. //depot/projects/ia64/sys/security/audit/audit_arg.c#5 integrate .. //depot/projects/ia64/sys/security/audit/audit_private.h#4 integrate .. //depot/projects/ia64/sys/sparc64/conf/DEFAULTS#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#31 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#63 integrate .. //depot/projects/ia64/sys/sun4v/conf/DEFAULTS#3 integrate .. //depot/projects/ia64/sys/sun4v/include/elf.h#2 integrate .. //depot/projects/ia64/sys/sun4v/include/hypervisor_api.h#2 integrate .. //depot/projects/ia64/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/ia64/sys/sun4v/include/utrap.h#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/exception.S#3 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/wbuf.S#2 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#45 integrate .. //depot/projects/ia64/sys/sys/socket.h#29 integrate .. //depot/projects/ia64/sys/sys/syscall.h#56 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#56 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#59 integrate Differences ... ==== //depot/projects/ia64/ObsoleteFiles.inc#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.57 2006/10/31 21:05:35 jmg Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.58 2006/11/05 00:39:56 trhodes Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -183,6 +183,17 @@ # 20041109: replaced by em(4) OLD_FILES+=usr/share/man/man4/gx.4.gz OLD_FILES+=usr/share/man/man4/if_gx.4.gz +# 20041017: rune interface removed +OLD_FILES+=usr/include/rune.h +OLD_FILES+=usr/share/man/man3/fgetrune.3.gz +OLD_FILES+=usr/share/man/man3/fputrune.3.gz +OLD_FILES+=usr/share/man/man3/fungetrune.3.gz +OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/mbrune.3.gz +OLD_FILES+=usr/share/man/man3/rune.3.gz +OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz +OLD_FILES+=usr/share/man/man3/sgetrune.3.gz +OLD_FILES+=usr/share/man/man3/sputrune.3.gz # 20040925: bind9 import OLD_FILES+=usr/bin/dnskeygen OLD_FILES+=usr/bin/dnsquery ==== //depot/projects/ia64/contrib/bind9/CHANGES#6 (text+ko) ==== @@ -1,4 +1,19 @@ + --- 9.3.2-P2 released --- + +2090. [port] win32: Visual C++ 2005 command line manifest support. + [RT #16417] + +2089. [security] Raise the minimum safe OpenSSL versions to + OpenSSL 0.9.7l and OpenSSL 0.9.8d. Versions + prior to these have known security flaws which + are (potentially) exploitable in named. [RT #16391] + +2088. [security] Change the default RSA exponent from 3 to 65537. + [RT #16391] + +2083. [port] win32: Visual C++ 2005 support. + --- 9.3.2-P1 released --- 2066. [security] Handle SIG queries gracefully. [RT #16300] ==== //depot/projects/ia64/contrib/bind9/bin/named/query.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.198.2.13.4.36.6.1 2006/08/17 07:12:31 marka Exp $ */ +/* $Id: query.c,v 1.198.2.13.4.36.6.2 2006/10/04 07:06:01 marka Exp $ */ #include ==== //depot/projects/ia64/contrib/bind9/configure.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2003 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any @@ -18,7 +18,7 @@ esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.294.2.23.2.51 $) +AC_REVISION($Revision: 1.294.2.23.2.51.4.3 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.13) @@ -357,6 +357,7 @@ # # was --with-openssl specified? # +OPENSSL_WARNING= AC_MSG_CHECKING(for OpenSSL library) AC_ARG_WITH(openssl, [ --with-openssl[=PATH] Build with OpenSSL [yes|no|path]. @@ -462,51 +463,38 @@ [AC_MSG_RESULT(assuming it does work on target platform)] ) -# -# OpenSSLDie is new with CERT CS-2002-23. If we see it we have may -# have a patched library otherwise check that we are greater than -# the fixed versions -# - AC_CHECK_FUNC(OpenSSLDie, +AC_ARG_ENABLE(openssl-version-check, +[AC_HELP_STRING([--enable-openssl-version-check], + [Check OpenSSL Version @<:@default=yes@:>@])]) +case "$enable_openssl_version_check" in +yes|'') AC_MSG_CHECKING(OpenSSL library version) AC_TRY_RUN([ #include #include int main() { - if (OPENSSL_VERSION_NUMBER >= 0x0090581fL) + if ((OPENSSL_VERSION_NUMBER >= 0x009070cfL && + OPENSSL_VERSION_NUMBER < 0x009080000L) || + OPENSSL_VERSION_NUMBER >= 0x0090804fL) return (0); printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n", OPENSSL_VERSION_NUMBER); - printf("Require OPENSSL_VERSION_NUMBER 0x0090581f or greater\n\n"); + printf("Require OPENSSL_VERSION_NUMBER 0x009070cf or greater (0.9.7l)\n" + "Require OPENSSL_VERSION_NUMBER 0x0090804f or greater (0.9.8d)\n\n"); return (1); } -], + ], [AC_MSG_RESULT(ok)], [AC_MSG_RESULT(not compatible) - AC_MSG_ERROR(you need OpenSSL 0.9.5a or newer)], + OPENSSL_WARNING=yes + ], [AC_MSG_RESULT(assuming target platform has compatible version)]) - , - AC_MSG_RESULT(did not find fixes for CERT CA-2002-23) - AC_MSG_CHECKING(OpenSSL library version) - AC_TRY_RUN([ -#include -#include -int main() { - if ((OPENSSL_VERSION_NUMBER >= 0x0090605fL && - OPENSSL_VERSION_NUMBER < 0x009070000L) || - OPENSSL_VERSION_NUMBER >= 0x00907003L) - return (0); - printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n", - OPENSSL_VERSION_NUMBER); - printf("Require OPENSSL_VERSION_NUMBER 0x0090605f or greater (0.9.6e)\n" - "Require OPENSSL_VERSION_NUMBER 0x00907003 or greater (0.9.7-beta2)\n\n"); - return (1); -} -], - [AC_MSG_RESULT(ok)], - [AC_MSG_RESULT(not compatible) - AC_MSG_ERROR(you need OpenSSL 0.9.6e/0.9.7-beta2 (or newer): CERT CA-2002-23)], - [AC_MSG_RESULT(assuming target platform has compatible version)])) +;; +no) + AC_MSG_RESULT(Skipped OpenSSL version check) +;; +esac + AC_MSG_CHECKING(for OpenSSL DSA support) if test -f $use_openssl/include/openssl/dsa.h then @@ -2116,6 +2104,30 @@ ) chmod a+x isc-config.sh +if test "X$OPENSSL_WARNING" != "X"; then +cat << \EOF +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +WARNING WARNING +WARNING Your OpenSSL crypto library may be vulnerable to WARNING +WARNING one or more of the the following known security WARNING +WARNING flaws: WARNING +WARNING WARNING +WARNING CAN-2002-0659, CAN-2006-4339, CVE-2006-2937 and WARNING +WARNING CVE-2006-2940. WARNING +WARNING WARNING +WARNING It is recommended that you upgrade to OpenSSL WARNING +WARNING version 0.9.8d/0.9.7l (or greater). WARNING +WARNING WARNING +WARNING You can disable this warning by specifying: WARNING +WARNING WARNING +WARNING --disable-openssl-version-check WARNING +WARNING WARNING +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +EOF +fi + # Tell Emacs to edit this file in shell mode. # Local Variables: # mode: sh ==== //depot/projects/ia64/contrib/bind9/lib/dns/opensslrsa_link.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -17,7 +17,7 @@ /* * Principal Author: Brian Wellington - * $Id: opensslrsa_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $ + * $Id: opensslrsa_link.c,v 1.1.4.1.10.5 2006/10/11 03:58:50 marka Exp $ */ #ifdef OPENSSL @@ -39,7 +39,23 @@ #include #include #include +#if OPENSSL_VERSION_NUMBER > 0x00908000L +#include +#endif + +/* + * We don't use configure for windows so enforce the OpenSSL version + * here. Unlike with configure we don't support overriding this test. + */ +#ifdef WIN32 +#if !((OPENSSL_VERSION_NUMBER >= 0x009070cfL && \ + OPENSSL_VERSION_NUMBER < 0x009080000L) || \ + OPENSSL_VERSION_NUMBER >= 0x0090804fL) +#error Please upgrade OpenSSL to 0.9.8d/0.9.7l or greater. +#endif +#endif + /* * XXXMPA Temporarially disable RSA_BLINDING as it requires * good quality random data that cannot currently be guarenteed. @@ -260,13 +276,47 @@ static isc_result_t opensslrsa_generate(dst_key_t *key, int exp) { +#if OPENSSL_VERSION_NUMBER > 0x00908000L + BN_GENCB cb; + RSA *rsa = RSA_new(); + BIGNUM *e = BN_new(); + + if (rsa == NULL || e == NULL) + goto err; + + if (exp == 0) { + /* RSA_F4 0x10001 */ + BN_set_bit(e, 0); + BN_set_bit(e, 16); + } else { + /* F5 0x100000001 */ + BN_set_bit(e, 0); + BN_set_bit(e, 32); + } + + BN_GENCB_set_old(&cb, NULL, NULL); + + if (RSA_generate_key_ex(rsa, key->key_size, e, &cb)) { + BN_free(e); + SET_FLAGS(rsa); + key->opaque = rsa; + return (ISC_R_SUCCESS); + } + + err: + if (e != NULL) + BN_free(e); + if (rsa != NULL) + RSA_free(rsa); + return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); +#else RSA *rsa; unsigned long e; if (exp == 0) - e = RSA_3; + e = RSA_F4; else - e = RSA_F4; + e = 0x40000003; rsa = RSA_generate_key(key->key_size, e, NULL, NULL); if (rsa == NULL) return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); @@ -274,6 +324,7 @@ key->opaque = rsa; return (ISC_R_SUCCESS); +#endif } static isc_boolean_t ==== //depot/projects/ia64/contrib/bind9/lib/dns/resolver.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.218.2.18.4.56.4.1 2006/08/17 07:12:31 marka Exp $ */ +/* $Id: resolver.c,v 1.218.2.18.4.56.4.2 2006/10/04 07:06:02 marka Exp $ */ #include ==== //depot/projects/ia64/contrib/bind9/version#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: version,v 1.26.2.17.2.21.4.1 2006/08/17 07:12:31 marka Exp $ +# $Id: version,v 1.26.2.17.2.21.4.2 2006/10/04 07:00:13 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -7,4 +7,4 @@ MINORVER=3 PATCHVER=2 RELEASETYPE=-P -RELEASEVER=1 +RELEASEVER=2 ==== //depot/projects/ia64/lib/libc/net/gethostbyname.3#12 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)gethostbyname.3 8.4 (Berkeley) 5/25/95 -.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.36 2006/09/17 21:27:33 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.37 2006/11/04 09:42:22 lawrance Exp $ .\" .Dd May 12, 2006 .Dt GETHOSTBYNAME 3 @@ -49,7 +49,7 @@ .Lb libc .Sh SYNOPSIS .In netdb.h -.Vt extern int h_errno ; +.Vt int h_errno ; .Ft struct hostent * .Fn gethostbyname "const char *name" .Ft struct hostent * @@ -261,7 +261,7 @@ is indicated by return of a .Dv NULL pointer. -The external integer +The integer .Va h_errno may then be checked to see whether this is a temporary failure or an invalid or unknown host. ==== //depot/projects/ia64/lib/libc/net/resolver.3#11 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)resolver.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.31 2006/07/17 09:27:26 stefanf Exp $ +.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.32 2006/11/04 09:42:22 lawrance Exp $ .\" -.Dd June 4, 1993 +.Dd November 4, 2006 .Dt RESOLVER 3 .Os .Sh NAME @@ -410,6 +410,20 @@ .Fn res_init function will return 0 on success, or \-1 in a threaded program if per-thread storage could not be allocated. +.Pp +The +.Fn res_mkquery , +.Fn res_search , +and +.Fn res_query +functions return the size of the response on success, or \-1 if an +error occurs. +The integer +.Vt h_errno +may be checked to determine the reason for error. +See +.Xr gethostbyname 3 +for more information. .Sh FILES .Bl -tag -width /etc/resolv.conf .It Pa /etc/resolv.conf ==== //depot/projects/ia64/lib/libc/sparc64/sys/Makefile.inc#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.9 2003/08/11 07:14:07 bms Exp $ +# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.10 2006/11/03 23:43:18 kmacy Exp $ SRCS+= __sparc_sigtramp_setup.c \ __sparc_utrap.c \ @@ -11,6 +11,9 @@ sigcode.S CFLAGS+= -I${.CURDIR}/sparc64/fpu +.if ${MACHINE} == "sun4v" +CFLAGS+= -DSUN4V +.endif MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S sigaction.S ==== //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_utrap_gen.S#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_gen.S,v 1.4 2002/06/30 05:36:49 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_gen.S,v 1.5 2006/11/03 23:43:18 kmacy Exp $"); .register %g2, #ignore .register %g3, #ignore @@ -38,6 +38,10 @@ #include "assym.s" ENTRY(__sparc_utrap_gen) +#ifdef SUN4V + save + ta %xcc, ST_FPEMU_CONTEXT +#endif sub %sp, UF_SIZEOF, %sp stx %o0, [%sp + SPOFF + CCFSZ + UF_TYPE] ==== //depot/projects/ia64/lib/libc/sys/clock_gettime.2#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.22 2006/09/17 21:27:34 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.23 2006/11/04 09:35:36 danger Exp $ .\" -.Dd November 18, 2005 +.Dd November 4, 2006 .Dt CLOCK_GETTIME 2 .Os .Sh NAME @@ -44,7 +44,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/time.h +.In time.h .Ft int .Fn clock_gettime "clockid_t clock_id" "struct timespec *tp" .Ft int @@ -82,7 +82,7 @@ The structure pointed to by .Fa tp is defined in -.In sys/time.h +.In sys/timespec.h as: .Pp .Bd -literal ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#164 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.981 2006/10/21 14:06:34 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.982 2006/11/04 02:01:52 bmah Exp $ 2000 @@ -619,7 +619,7 @@ architectures such as sparc64. &merged; The &man.em.4; driver has been updated to - version 6.1.4 from Intel. Among other changes, it now supports + version 6.2.9 from Intel. Among other changes, it now supports 80003, 82571, 82571EB and 82572 based adapters, as well as onboard-NICs on ICH8-based motherboards. &merged; ==== //depot/projects/ia64/sbin/mdmfs/mdmfs.8#17 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.25 2006/10/21 16:02:42 ru Exp $ +.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.26 2006/11/03 12:02:24 ru Exp $ .\" -.Dd October 1, 2006 +.Dd November 3, 2006 .Dt MDMFS 8 .Os .Sh NAME @@ -56,26 +56,6 @@ .Op Fl w Ar user : Ns Ar group .Ar md-device .Ar mount-point -.Nm -.Fl C -.Op Fl lNU -.Op Fl a Ar maxcontig -.Op Fl b Ar block-size -.Op Fl c Ar cylinders -.Op Fl d Ar rotdelay -.Op Fl E Ar path-mdconfig -.Op Fl e Ar maxbpg -.Op Fl F Ar file -.Op Fl f Ar frag-size -.Op Fl i Ar bytes -.Op Fl m Ar percent-free -.Op Fl n Ar rotational-positions -.Op Fl O Ar optimization -.Op Fl o Ar mount-options -.Op Fl s Ar size -.Op Fl v Ar version -.Ar md-device -.Ar mount-point .Sh DESCRIPTION The .Nm @@ -134,12 +114,6 @@ option). .It Fl b Ar block-size The block size of the file system, in bytes. -.It Fl C -Enable full compatibility mode with -.Xr mount_mfs 8 . -See the -.Sx COMPATIBILITY -section for more information. .It Fl c Ar cylinders The number of cylinders per cylinder group in the file system. .It Fl D @@ -250,7 +224,7 @@ .Pq Dv MD_MALLOC . .It Fl U Enable soft-updates on the file system. -This is the default, even in compatibility mode, and is accepted only +This is the default, and is accepted only for compatibility. It is only really useful to negate the .Fl S @@ -337,19 +311,16 @@ .Sh COMPATIBILITY The .Nm -utility, while designed to be fully compatible with +utility, while designed to be compatible with .Xr mount_mfs 8 , can be useful by itself. Since .Xr mount_mfs 8 had some silly defaults, a -.Dq full compatibility +.Dq compatibility mode is provided for the case where bug-to-bug compatibility is desired. .Pp -Full compatibility is enabled with the -.Fl C -flag, -or by starting +Compatibility is enabled by starting .Nm with the name .Li mount_mfs @@ -357,17 +328,14 @@ .Li mfs (as returned by .Xr getprogname 3 ) . -In this mode, only the options which would be accepted by -.Xr mount_mfs 8 -are valid. -Furthermore, the following behavior, as done by +In this mode, the following behavior, as done by .Xr mount_mfs 8 , is duplicated: .Bl -bullet -offset indent .It The file mode of .Ar mount-point -is set to +is set by default to .Li 01777 as if .Fl p Ar 1777 ==== //depot/projects/ia64/sbin/mdmfs/mdmfs.c#17 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/mdmfs/mdmfs.c,v 1.27 2006/02/16 21:28:54 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sbin/mdmfs/mdmfs.c,v 1.28 2006/11/03 12:02:24 ru Exp $"); #include #include @@ -61,7 +61,6 @@ bool mi_have_mode; }; -static bool compat; /* Full compatibility with mount_mfs? */ static bool debug; /* Emit debugging information? */ static bool loudsubs; /* Suppress output from helper programs? */ static bool norun; /* Actually run the helper programs? */ @@ -119,8 +118,11 @@ /* If we were started as mount_mfs or mfs, imply -C. */ if (strcmp(getprogname(), "mount_mfs") == 0 || - strcmp(getprogname(), "mfs") == 0) - compat = true; + strcmp(getprogname(), "mfs") == 0) { + /* Make compatibility assumptions. */ + mi.mi_mode = 01777; + mi.mi_have_mode = true; + } while ((ch = getopt(argc, argv, "a:b:Cc:Dd:E:e:F:f:hi:LlMm:Nn:O:o:Pp:Ss:t:Uv:w:X")) != -1) @@ -132,16 +134,12 @@ argappend(&newfs_arg, "-b %s", optarg); break; case 'C': - if (compat) - usage(); - compat = true; + /* Ignored for compatibility. */ break; case 'c': argappend(&newfs_arg, "-c %s", optarg); break; case 'D': - if (compat) - usage(); detach = false; break; case 'd': @@ -170,8 +168,6 @@ argappend(&newfs_arg, "-i %s", optarg); break; case 'L': - if (compat) - usage(); loudsubs = true; break; case 'l': @@ -187,8 +183,6 @@ argappend(&newfs_arg, "-m %s", optarg); break; case 'N': - if (compat) - usage(); norun = true; break; case 'n': @@ -201,13 +195,9 @@ argappend(&mount_arg, "-o %s", optarg); break; case 'P': - if (compat) - usage(); newfs = false; break; case 'p': - if (compat) - usage(); if ((set = setmode(optarg)) == NULL) usage(); mi.mi_mode = getmode(set, S_IRWXU | S_IRWXG | S_IRWXO); @@ -215,8 +205,6 @@ free(set); break; case 'S': - if (compat) - usage(); softdep = false; break; case 's': @@ -229,13 +217,9 @@ argappend(&newfs_arg, "-O %s", optarg); break; case 'w': - if (compat) - usage(); extract_ugid(optarg, &mi); break; case 'X': - if (compat) - usage(); debug = true; break; default: @@ -246,12 +230,6 @@ if (argc < 2) usage(); - /* Make compatibility assumptions. */ - if (compat) { - mi.mi_mode = 01777; - mi.mi_have_mode = true; - } - /* Derive 'unit' (global). */ unitstr = argv[0]; if (strncmp(unitstr, "/dev/", 5) == 0) @@ -671,23 +649,12 @@ static void usage(void) { - const char *name; - if (compat) - name = getprogname(); - else - name = "mdmfs"; - if (!compat) - fprintf(stderr, + fprintf(stderr, "usage: %s [-DLlMNPSUX] [-a maxcontig] [-b block-size] [-c cylinders]\n" "\t[-d rotdelay] [-E path-mdconfig] [-e maxbpg] [-F file] [-f frag-size]\n" "\t[-i bytes] [-m percent-free] [-n rotational-positions] [-O optimization]\n" "\t[-o mount-options] [-p permissions] [-s size] [-v version]\n" -"\t[-w user:group] md-device mount-point\n", name); - fprintf(stderr, -"usage: %s -C [-lNU] [-a maxcontig] [-b block-size] [-c cylinders]\n" -"\t[-d rotdelay] [-E path-mdconfig] [-e maxbpg] [-F file] [-f frag-size]\n" -"\t[-i bytes] [-m percent-free] [-n rotational-positions] [-O optimization]\n" -"\t[-o mount-options] [-s size] [-v version] md-device mount-point\n", name); +"\t[-w user:group] md-device mount-point\n", getprogname()); exit(1); } ==== //depot/projects/ia64/share/man/man3/pthread_cond_init.3#3 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread_cond_init.3,v 1.16 2006/09/30 11:22:25 ru Exp $ +.\" $FreeBSD: src/share/man/man3/pthread_cond_init.3,v 1.17 2006/11/04 10:08:16 trhodes Exp $ .\" -.Dd July 28, 1998 +.Dd November 4, 2006 .Dt PTHREAD_COND_INIT 3 .Os .Sh NAME @@ -71,6 +71,7 @@ variable. .El .Sh SEE ALSO +.Xr pthread_condattr 3 , .Xr pthread_cond_broadcast 3 , .Xr pthread_cond_destroy 3 , .Xr pthread_cond_signal 3 , ==== //depot/projects/ia64/share/man/man3/pthread_create.3#5 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread_create.3,v 1.22 2006/11/01 04:46:06 maxim Exp $ +.\" $FreeBSD: src/share/man/man3/pthread_create.3,v 1.23 2006/11/04 10:08:16 trhodes Exp $ .\" -.Dd November 1, 2006 +.Dd November 4, 2006 .Dt PTHREAD_CREATE 3 .Os .Sh NAME @@ -118,6 +118,7 @@ .El .Sh SEE ALSO .Xr fork 2 , +.Xr pthread_attr 3 , .Xr pthread_cleanup_pop 3 , .Xr pthread_cleanup_push 3 , .Xr pthread_exit 3 , ==== //depot/projects/ia64/share/man/man3/pthread_mutex_init.3#3 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread_mutex_init.3,v 1.16 2006/09/30 11:22:25 ru Exp $ +.\" $FreeBSD: src/share/man/man3/pthread_mutex_init.3,v 1.17 2006/11/04 10:08:16 trhodes Exp $ .\" -.Dd July 29, 1998 +.Dd November 4, 2006 .Dt PTHREAD_MUTEX_INIT 3 .Os .Sh NAME @@ -67,6 +67,7 @@ The process cannot allocate enough memory to create another mutex. .El .Sh SEE ALSO +.Xr pthread_mutexattr 3 , .Xr pthread_mutex_destroy 3 , .Xr pthread_mutex_lock 3 , .Xr pthread_mutex_trylock 3 , ==== //depot/projects/ia64/share/man/man4/aac.4#13 (text+ko) ==== @@ -22,8 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/aac.4,v 1.33 2006/06/18 07:33:51 brueffer Exp $ -.Dd June 17, 2006 +.\" $FreeBSD: src/share/man/man4/aac.4,v 1.34 2006/11/03 06:50:03 brueffer Exp $ +.Dd November 3, 2006 .Dt AAC 4 .Os .Sh NAME @@ -181,6 +181,8 @@ .It IBM ServeRAID 8i .It +IBM ServeRAID 8k +.It ICP ICP5085BR SAS RAID .It ICP ICP9085LI SAS RAID ==== //depot/projects/ia64/share/man/man9/VOP_REMOVE.9#6 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_REMOVE.9,v 1.14 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_REMOVE.9,v 1.15 2006/11/04 23:58:15 pjd Exp $ .\" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Nov 6 01:02:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D65B116A415; Mon, 6 Nov 2006 01:02:01 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 884E816A40F for ; Mon, 6 Nov 2006 01:02:01 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9830E43D4C for ; Mon, 6 Nov 2006 01:02:00 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA6120Yq037784 for ; Mon, 6 Nov 2006 01:02:00 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA6120HZ037779 for perforce@freebsd.org; Mon, 6 Nov 2006 01:02:00 GMT (envelope-from marcel@freebsd.org) Date: Mon, 6 Nov 2006 01:02:00 GMT Message-Id: <200611060102.kA6120HZ037779@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 Cc: Subject: PERFORCE change 109322 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 01:02:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=109322 Change 109322 by marcel@marcel_cluster on 2006/11/06 01:01:46 Resolve merge "conflicts". Affected files ... .. //depot/projects/ia64/sys/boot/efi/libefi/errno.c#3 edit .. //depot/projects/ia64/sys/boot/efi/libefi/handles.c#3 edit .. //depot/projects/ia64/sys/boot/ia64/common/Makefile#3 edit .. //depot/projects/ia64/sys/boot/ia64/common/autoload.c#3 edit .. //depot/projects/ia64/sys/boot/ia64/common/libia64.h#3 edit .. //depot/projects/ia64/sys/boot/ia64/efi/efimd.c#7 edit .. //depot/projects/ia64/sys/boot/ia64/ski/skimd.c#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/libefi/errno.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/errno.c,v 1.1 2006/11/05 22:03:03 marcel Exp $"); #include #include ==== //depot/projects/ia64/sys/boot/efi/libefi/handles.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/handles.c,v 1.1 2006/11/05 22:03:03 marcel Exp $"); #include #include ==== //depot/projects/ia64/sys/boot/ia64/common/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/sys/boot/ia64/common/Makefile,v 1.1 2006/11/05 22:03:03 marcel Exp $ .include ==== //depot/projects/ia64/sys/boot/ia64/common/autoload.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/common/autoload.c,v 1.1 2006/11/05 22:03:03 marcel Exp $"); int ia64_autoload(void) ==== //depot/projects/ia64/sys/boot/ia64/common/libia64.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$ + * $FreeBSD: src/sys/boot/ia64/common/libia64.h,v 1.1 2006/11/05 22:03:03 marcel Exp $ */ #ifndef _LIBIA64_H_ ==== //depot/projects/ia64/sys/boot/ia64/efi/efimd.c#7 (text+ko) ==== @@ -29,8 +29,6 @@ #include -#include - #include #include ==== //depot/projects/ia64/sys/boot/ia64/ski/skimd.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/skimd.c,v 1.1 2006/11/05 22:03:04 marcel Exp $"); #include From owner-p4-projects@FreeBSD.ORG Mon Nov 6 02:05:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5F0A16A417; Mon, 6 Nov 2006 02:05:22 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 91D1616A403 for ; Mon, 6 Nov 2006 02:05:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFA1D43D58 for ; Mon, 6 Nov 2006 02:05:21 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA625LrQ057714 for ; Mon, 6 Nov 2006 02:05:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA625Lgh057711 for perforce@freebsd.org; Mon, 6 Nov 2006 02:05:21 GMT (envelope-from jb@freebsd.org) Date: Mon, 6 Nov 2006 02:05:21 GMT Message-Id: <200611060205.kA625Lgh057711@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109323 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 02:05:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=109323 Change 109323 by jb@jb_freebsd8 on 2006/11/06 02:04:55 This doesn't belong here. We need to build libintl.a and it belongs with that. Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbinutils/libintl.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Nov 6 02:36:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58BBB16A415; Mon, 6 Nov 2006 02:36:01 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2E24016A407 for ; Mon, 6 Nov 2006 02:36:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB09043D4C for ; Mon, 6 Nov 2006 02:36:00 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA62a0Ab063212 for ; Mon, 6 Nov 2006 02:36:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA62a0jv063207 for perforce@freebsd.org; Mon, 6 Nov 2006 02:36:00 GMT (envelope-from jb@freebsd.org) Date: Mon, 6 Nov 2006 02:36:00 GMT Message-Id: <200611060236.kA62a0jv063207@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109325 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 02:36:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=109325 Change 109325 by jb@jb_freebsd8 on 2006/11/06 02:35:17 Don't need this now that we're using binutils-2.17 Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/binutils/as/tc-sparc-fixed.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Nov 6 03:29:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1309516A612; Mon, 6 Nov 2006 03:29:19 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E0E8416A600 for ; Mon, 6 Nov 2006 03:29:18 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A61D143D4C for ; Mon, 6 Nov 2006 03:29:18 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA63TIgh072760 for ; Mon, 6 Nov 2006 03:29:18 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA63THE9072757 for perforce@freebsd.org; Mon, 6 Nov 2006 03:29:17 GMT (envelope-from jb@freebsd.org) Date: Mon, 6 Nov 2006 03:29:17 GMT Message-Id: <200611060329.kA63THE9072757@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109328 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 03:29:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=109328 Change 109328 by jb@jb_freebsd8 on 2006/11/06 03:28:25 Update to build binutils-2.17 Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/binutils/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/Makefile.inc0#3 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/addr2line/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/ar/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/as/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/as/config.h#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/doc/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/gasp/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/gdb/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/config.h#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/config.h.fbsd#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbinutils/Makefile#3 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libiberty/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libiberty/config.h#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libintl/Makefile#1 add .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libintl/config.h#1 add .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libintl/libintl.h#1 add .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libopcodes/config.h#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/nm/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/objcopy/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/objdump/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/ranlib/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/readelf/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/size/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/strings/Makefile#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/strip/Makefile#2 edit Differences ... ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.29 2004/06/25 07:34:56 obrien Exp $ -SUBDIR= libiberty libbfd libopcodes libbinutils \ +SUBDIR= libiberty libbfd libopcodes libbinutils libintl \ addr2line ar as ld nm objcopy objdump ranlib readelf \ size strings strip doc ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/Makefile.inc0#3 (text+ko) ==== @@ -22,6 +22,10 @@ RELSRC= ${RELTOP}/../../../contrib/binutils SRCDIR= ${.CURDIR}/${RELSRC} +CFLAGS+= -DHAVE_CONFIG_H +CFLAGS+= -DLOCALEDIR=\"/usr/local/share/locale\" +CFLAGS+= -DGNULOCALEDIR=\"/usr/local/share/locale\" +CFLAGS+= -DLOCALE_ALIAS_PATH=\"/usr/local/share/locale:.\" CFLAGS+= -I. .if exists(${.CURDIR}/${TARGET_ARCH}) CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} @@ -29,6 +33,7 @@ CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd CFLAGS+= -I${.OBJDIR}/${RELTOP}/libbfd +CFLAGS+= -I${.CURDIR}/${RELTOP}/libintl CFLAGS+= -I${SRCDIR}/include .if exists(${.CURDIR}/${TARGET_ARCH}) ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/addr2line/Makefile#2 (text+ko) ==== @@ -13,6 +13,7 @@ DPADD= ${RELTOP}/libbinutils/libbinutils.a DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} .include ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/ar/Makefile#2 (text+ko) ==== @@ -14,6 +14,7 @@ DPADD= ${RELTOP}/libbinutils/libbinutils.a DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} .include ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/as/Makefile#2 (text+ko) ==== @@ -11,7 +11,7 @@ PROG= as MAN= doc/as.1 -SRCS+= app.c as.c atof-generic.c atof-ieee.c bignum-copy.c \ +SRCS+= app.c as.c atof-generic.c atof-ieee.c \ cond.c dwarf2dbg.c ecoff.c expr.c flonum-copy.c flonum-konst.c \ flonum-mult.c frags.c hash.c input-file.c \ input-scrub.c listing.c literal.c macro.c messages.c \ @@ -25,8 +25,7 @@ .elif ${TARGET_ARCH} == "powerpc" SRCS+= tc-ppc.c .elif ${TARGET_ARCH} == "sparc64" -# change back to tc-sparc.c when new binutils is imported -SRCS+= tc-sparc-fixed.c +SRCS+= tc-sparc.c .else SRCS+= tc-${TARGET_ARCH}.c .endif @@ -52,6 +51,7 @@ DPADD= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a DPADD+= ${RELTOP}/libopcodes/libopcodes.a +DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} .include ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/as/config.h#2 (text+ko) ==== @@ -1,194 +1,202 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/as/config.h,v 1.1 2004/07/08 17:05:30 obrien Exp $ */ +/* $FreeBSD$ */ +/* config.h. Generated by configure. */ +/* config.in. Generated from configure.in by autoheader. */ + +/* Define if using AIX 5.2 value for C_WEAKEXT. */ +/* #undef AIX_WEAK_SUPPORT */ -#define HAVE_DECL_GETOPT 1 +/* assert broken? */ +/* #undef BROKEN_ASSERT */ +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ -/* config.h. Generated by configure. */ -/* config.in. Generated automatically from configure.in by autoheader. */ +/* Compiling cross-assembler? */ +/* #undef CROSS_COMPILE */ -/* Define if using alloca.c. */ +/* Define to 1 if using `alloca.c'. */ /* #undef C_ALLOCA */ -/* Define to empty if the keyword does not work. */ -/* #undef const */ +/* Default CRIS architecture. */ +/* #undef DEFAULT_CRIS_ARCH */ + +/* Default emulation. */ +#define DEFAULT_EMULATION "i386elf" + +/* Supported emulations. */ +#define EMULATIONS &i386elf, -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -/* #undef CRAY_STACKSEG_END */ +/* Define to 1 if NLS is requested */ +#define ENABLE_NLS 1 -/* Define if you have alloca, as a function or macro. */ +/* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 -/* Define if you have and it should be used (not on Ultrix). */ +/* Define to 1 if you have and it should be used (not on Ultrix). + */ /* #undef HAVE_ALLOCA_H */ -/* Define if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ARGZ_H */ + +/* Define to 1 if you have the `dcgettext' function. */ +/* #undef HAVE_DCGETTEXT */ + +/* Is the prototype for getopt in in the expected format? */ +#define HAVE_DECL_GETOPT 1 -/* Define as __inline if that's what the C compiler calls it. */ -/* #undef inline */ +/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you + don't. */ +#define HAVE_DECL_VSNPRINTF 1 -/* Define to `long' if doesn't define. */ -/* #undef off_t */ +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown - */ -/* #undef STACK_DIRECTION */ +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 +/* Define as 1 if you have gettext and don't want to use GNU gettext. */ +/* #undef HAVE_GETTEXT */ -/* Define if lex declares yytext as a char * by default, not a char[]. */ -#define YYTEXT_POINTER 1 +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 -/* Define if you have the __argz_count function. */ -/* #undef HAVE___ARGZ_COUNT */ +/* Define if your locale.h file contains LC_MESSAGES. */ +#define HAVE_LC_MESSAGES 1 -/* Define if you have the __argz_next function. */ -/* #undef HAVE___ARGZ_NEXT */ +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 -/* Define if you have the __argz_stringify function. */ -/* #undef HAVE___ARGZ_STRINGIFY */ +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 -/* Define if you have the dcgettext function. */ -/* #undef HAVE_DCGETTEXT */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MALLOC_H */ -/* Define if you have the getcwd function. */ -#define HAVE_GETCWD 1 +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 -/* Define if you have the getpagesize function. */ -#define HAVE_GETPAGESIZE 1 +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 -/* Define if you have the munmap function. */ +/* Define to 1 if you have the `munmap' function. */ #define HAVE_MUNMAP 1 -/* Define if you have the putenv function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_NL_TYPES_H 1 + +/* Define to 1 if you have the `putenv' function. */ #define HAVE_PUTENV 1 -/* Define if you have the remove function. */ +/* Define to 1 if you have the `remove' function. */ /* #undef HAVE_REMOVE */ -/* Define if you have the sbrk function. */ +/* Define to 1 if you have the `sbrk' function. */ #define HAVE_SBRK 1 -/* Define if you have the setenv function. */ +/* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 -/* Define if you have the setlocale function. */ +/* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 -/* Define if you have the stpcpy function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_STDARG_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define if you have the stpcpy function */ #define HAVE_STPCPY 1 -/* Define if you have the strcasecmp function. */ +/* Define to 1 if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1 -/* Define if you have the strchr function. */ +/* Define to 1 if you have the `strchr' function. */ #define HAVE_STRCHR 1 -/* Define if you have the unlink function. */ -#define HAVE_UNLINK 1 +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 -/* Define if you have the header file. */ -/* #undef HAVE_ARGZ_H */ - -/* Define if you have the header file. */ -#define HAVE_ERRNO_H 1 - -/* Define if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define if you have the header file. */ -#define HAVE_LOCALE_H 1 - -/* Define if you have the header file. */ -/* #undef HAVE_MALLOC_H */ - -/* Define if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define if you have the header file. */ -#define HAVE_NL_TYPES_H 1 - -/* Define if you have the header file. */ -#define HAVE_STDARG_H 1 - -/* Define if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 -/* Define if you have the header file. */ -#define HAVE_STRINGS_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 -/* Define if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the `unlink' function. */ +#define HAVE_UNLINK 1 + +/* Define to 1 if you have the header file. */ /* #undef HAVE_VALUES_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_VARARGS_H */ -/* Name of package */ -#define PACKAGE "gas" +/* Define to 1 if you have the `__argz_count' function. */ +/* #undef HAVE___ARGZ_COUNT */ -/* Version number of package */ -/* #define VERSION "2.15" */ +/* Define to 1 if you have the `__argz_next' function. */ +/* #undef HAVE___ARGZ_NEXT */ -/* Define if defaulting to ELF on SCO 5. */ -/* #undef SCO_ELF */ +/* Define to 1 if you have the `__argz_stringify' function. */ +/* #undef HAVE___ARGZ_STRINGIFY */ -/* Using strict COFF? */ -/* #undef STRICTCOFF */ +/* Using i386 COFF? */ +/* #undef I386COFF */ -/* Define if default target is PowerPC Solaris. */ -/* #undef TARGET_SOLARIS_COMMENT */ +/* Using m68k COFF? */ +/* #undef M68KCOFF */ -/* Define as 1 if big endian. */ -/* #undef TARGET_BYTES_BIG_ENDIAN */ +/* Using m88k COFF? */ +/* #undef M88KCOFF */ -/* Default CPU for MIPS targets. */ +/* Default CPU for MIPS targets. */ /* #undef MIPS_CPU_STRING_DEFAULT */ -/* Allow use of E_MIPS_ABI_O32 on MIPS targets. */ -/* #undef USE_E_MIPS_ABI_O32 */ - -/* Generate 64-bit code by default on MIPS targets. */ +/* Generate 64-bit code by default on MIPS targets. */ /* #undef MIPS_DEFAULT_64BIT */ -/* Choose a default ABI for MIPS targets. */ +/* Choose a default ABI for MIPS targets. */ /* #undef MIPS_DEFAULT_ABI */ -/* Default architecture. */ -/* #define DEFAULT_ARCH "i386" */ +/* Define if environ is not declared in system header files. */ +#define NEED_DECLARATION_ENVIRON 1 + +/* Define if errno is not declared in system header files. */ +/* #undef NEED_DECLARATION_ERRNO */ + +/* Define if ffs is not declared in system header files. */ +/* #undef NEED_DECLARATION_FFS */ -/* Using cgen code? */ -/* #undef USING_CGEN */ +/* Define if free is not declared in system header files. */ +/* #undef NEED_DECLARATION_FREE */ -/* Using i386 COFF? */ -/* #undef I386COFF */ +/* Define if malloc is not declared in system header files. */ +/* #undef NEED_DECLARATION_MALLOC */ -/* Using m68k COFF? */ -/* #undef M68KCOFF */ +/* Define if sbrk is not declared in system header files. */ +/* #undef NEED_DECLARATION_SBRK */ -/* Using m88k COFF? */ -/* #undef M88KCOFF */ +/* Define if strstr is not declared in system header files. */ +/* #undef NEED_DECLARATION_STRSTR */ /* a.out support? */ /* #undef OBJ_MAYBE_AOUT */ @@ -208,80 +216,90 @@ /* generic support? */ /* #undef OBJ_MAYBE_GENERIC */ -/* HP300 support? */ -/* #undef OBJ_MAYBE_HP300 */ - /* IEEE support? */ /* #undef OBJ_MAYBE_IEEE */ /* SOM support? */ /* #undef OBJ_MAYBE_SOM */ -/* VMS support? */ -/* #undef OBJ_MAYBE_VMS */ +/* Name of package */ +#define PACKAGE "gas" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" -/* Use emulation support? */ -/* #undef USE_EMULATIONS */ +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" -/* Supported emulations. */ -/* #define EMULATIONS &i386elf, */ +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" -/* Default emulation. */ -/* #define DEFAULT_EMULATION "i386elf" */ +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" -/* old COFF support? */ -/* #undef MANY_SEGMENTS */ +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" -/* Use BFD interface? */ -#define BFD_ASSEMBLER 1 +/* Define if defaulting to ELF on SCO 5. */ +/* #undef SCO_ELF */ -/* Target alias. */ -/* #define TARGET_ALIAS "i386-obrien-freebsd5.2" */ +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +/* #undef STACK_DIRECTION */ -/* Canonical target. */ -/* #define TARGET_CANONICAL "i386-obrien-freebsd5.2" */ +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 -/* Target CPU. */ -/* #define TARGET_CPU "i386" */ +/* Using strict COFF? */ +/* #undef STRICTCOFF */ -/* Target vendor. */ -#define TARGET_VENDOR "obrien" +/* Define as 1 if big endian. */ +/* #undef TARGET_BYTES_BIG_ENDIAN */ /* Target OS. */ -#define TARGET_OS "freebsd5" +#define TARGET_OS "freebsd7.0" -/* Define if you have the stpcpy function */ -#define HAVE_STPCPY 1 +/* Define if default target is PowerPC Solaris. */ +/* #undef TARGET_SOLARIS_COMMENT */ -/* Define if your locale.h file contains LC_MESSAGES. */ -#define HAVE_LC_MESSAGES 1 +/* Define if target is Symbian OS. */ +/* #undef TARGET_SYMBIAN */ -/* Define to 1 if NLS is requested */ -/* #define ENABLE_NLS 1 */ +/* Target vendor. */ +#define TARGET_VENDOR "unknown" -/* Define as 1 if you have gettext and don't want to use GNU gettext. */ -/* #undef HAVE_GETTEXT */ +/* Use emulation support? */ +/* #undef USE_EMULATIONS */ -/* Compiling cross-assembler? */ -/* #undef CROSS_COMPILE */ +/* Allow use of E_MIPS_ABI_O32 on MIPS targets. */ +/* #undef USE_E_MIPS_ABI_O32 */ -/* assert broken? */ -/* #undef BROKEN_ASSERT */ +/* Using cgen code? */ +/* #undef USING_CGEN */ -/* Define if strstr is not declared in system header files. */ -/* #undef NEED_DECLARATION_STRSTR */ +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +/* #undef WORDS_BIGENDIAN */ -/* Define if malloc is not declared in system header files. */ -/* #undef NEED_DECLARATION_MALLOC */ +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ +#define YYTEXT_POINTER 1 -/* Define if free is not declared in system header files. */ -/* #undef NEED_DECLARATION_FREE */ +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ -/* Define if sbrk is not declared in system header files. */ -/* #undef NEED_DECLARATION_SBRK */ +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif -/* Define if environ is not declared in system header files. */ -#define NEED_DECLARATION_ENVIRON 1 +/* Define to `long' if does not define. */ +/* #undef off_t */ -/* Define if errno is not declared in system header files. */ -/* #undef NEED_DECLARATION_ERRNO */ +/* Define to `unsigned' if does not define. */ +/* #undef size_t */ ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/doc/Makefile#2 (text+ko) ==== @@ -4,16 +4,16 @@ .PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc -INFO= as ld gasp binutils +INFO= as ld binutils INFOSECTION= "Programming & development tools." INFOENTRY_as= "* As: (as). The GNU assembler." -INFOENTRY_gasp= "* Gasp: (gasp). The GNU Assembler Macro Preprocessor." INFOENTRY_ld= "* Ld: (ld). The GNU linker." INFOENTRY_binutils= "* Binutils: (binutils). The GNU Binary Utilities." MAKEINFOFLAGS+= --no-validate MAKEINFOFLAGS+= -I ${SRCDIR}/gas/doc -I ${SRCDIR}/ld -I ${SRCDIR}/bfd/doc MAKEINFOFLAGS+= -I ${SRCDIR}/binutils +MAKEINFOFLAGS+= -I ${SRCDIR}/libiberty CLEANFILES= configdoc.texi config.texi gasver.texi ldver.texi ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/gasp/Makefile#2 (text+ko) ==== @@ -12,6 +12,7 @@ CFLAGS+= -I${.CURDIR} CFLAGS+= -I${SRCDIR} -I${SRCDIR}/gas -I${SRCDIR}/gas/config DPADD= ${RELTOP}/libiberty/libiberty.a +DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} CLEANFILES= xregex.h ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/gdb/Makefile#2 (text+ko) ==== @@ -71,6 +71,7 @@ LDADD+= ${RELTOP}/libbfd/libbfd.a ${RELTOP}/libopcodes/libopcodes.a LDADD+= -lgnuregex LDADD+= ${RELTOP}/libiberty/libiberty.a +DPADD+= ${RELTOP}/libintl/libintl.a LDADD+= -lreadline -ltermcap CLEANFILES= init.c init.c-tmp nm.h tm.h xm.h gdbversion.c xregex.h kvm-fbsd-machine.h ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile#2 (text+ko) ==== @@ -22,6 +22,7 @@ NO_SHARED?= yes DPADD= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} CLEANDIRS+= ldscripts CLEANFILES+= ldemul-list.h stringify.sed ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/config.h#2 (text+ko) ==== @@ -1,180 +1,223 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/ld/config.h,v 1.8 2004/06/16 07:09:37 obrien Exp $ */ +/* config.h. Generated by configure. */ +/* config.in. Generated from configure.in by autoheader. */ -/* config.h. Generated automatically by configure. */ -/* config.in. Generated automatically from configure.in by autoheader. */ +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ -/* Define if using alloca.c. */ +/* Define to 1 if using `alloca.c'. */ /* #undef C_ALLOCA */ -/* Define to empty if the keyword does not work. */ -/* #undef const */ +/* Define to 1 if NLS is requested */ +#define ENABLE_NLS 1 -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -/* #undef CRAY_STACKSEG_END */ +/* Additional extension a shared object might have. */ +/* #undef EXTRA_SHLIB_EXTENSION */ -/* Define if you have alloca, as a function or macro. */ +/* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 -/* Define if you have and it should be used (not on Ultrix). */ +/* Define to 1 if you have and it should be used (not on Ultrix). + */ /* #undef HAVE_ALLOCA_H */ -/* Define if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ARGZ_H */ + +/* Define to 1 if you have the `dcgettext' function. */ +/* #undef HAVE_DCGETTEXT */ + +/* Define to 1 if you have the declaration of `environ', and to 0 if you + don't. */ +#define HAVE_DECL_ENVIRON 0 + +/* Define to 1 if you have the declaration of `free', and to 0 if you don't. + */ +#define HAVE_DECL_FREE 1 + +/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. + */ +#define HAVE_DECL_GETENV 1 + +/* Is the prototype for getopt in in the expected format? */ +#define HAVE_DECL_GETOPT 1 + +/* Define to 1 if you have the declaration of `sbrk', and to 0 if you don't. + */ +#define HAVE_DECL_SBRK 1 + +/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't. + */ +#define HAVE_DECL_STRSTR 1 -/* Define as __inline if that's what the C compiler calls it. */ -/* #undef inline */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 -/* Define to `long' if doesn't define. */ -/* #undef off_t */ +/* Define to 1 if you have the header file. */ +#define HAVE_ELF_HINTS_H 1 -/* Define if you need to in order for stat and other things to work. */ -/* #undef _POSIX_SOURCE */ +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown - */ -/* #undef STACK_DIRECTION */ +/* Define as 1 if you have gettext and don't want to use GNU gettext. */ +/* #undef HAVE_GETTEXT */ -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 +/* Define to 1 if you have the `glob' function. */ +#define HAVE_GLOB 1 -/* Define if lex declares yytext as a char * by default, not a char[]. */ -#define YYTEXT_POINTER 1 +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 -/* Define if you have the __argz_count function. */ -/* #undef HAVE___ARGZ_COUNT */ +/* Define if your locale.h file contains LC_MESSAGES. */ +#define HAVE_LC_MESSAGES 1 -/* Define if you have the __argz_next function. */ -/* #undef HAVE___ARGZ_NEXT */ +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 -/* Define if you have the __argz_stringify function. */ -/* #undef HAVE___ARGZ_STRINGIFY */ +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 -/* Define if you have the dcgettext function. */ -/* #undef HAVE_DCGETTEXT */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MALLOC_H */ -/* Define if you have the getcwd function. */ -#define HAVE_GETCWD 1 +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 -/* Define if you have the getpagesize function. */ -#define HAVE_GETPAGESIZE 1 +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 -/* Define if you have the munmap function. */ +/* Define to 1 if you have the `munmap' function. */ #define HAVE_MUNMAP 1 -/* Define if you have the putenv function. */ +/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NL_TYPES_H 1 + +/* Define to 1 if you have the `putenv' function. */ #define HAVE_PUTENV 1 -/* Define if you have the realpath function. */ +/* Define to 1 if you have the `realpath' function. */ #define HAVE_REALPATH 1 -/* Define if you have the sbrk function. */ +/* Define to 1 if you have the `sbrk' function. */ #define HAVE_SBRK 1 -/* Define if you have the setenv function. */ +/* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 -/* Define if you have the setlocale function. */ +/* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 -/* Define if you have the stpcpy function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define if you have the stpcpy function */ #define HAVE_STPCPY 1 -/* Define if you have the strcasecmp function. */ +/* Define to 1 if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1 -/* Define if you have the strchr function. */ +/* Define to 1 if you have the `strchr' function. */ #define HAVE_STRCHR 1 -/* Define if you have the header file. */ -/* #undef HAVE_ARGZ_H */ +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 -/* Define if you have the header file. */ -#define HAVE_DIRENT_H 1 - -/* Define if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define if you have the header file. */ -#define HAVE_LOCALE_H 1 - -/* Define if you have the header file. */ -/* #undef HAVE_MALLOC_H */ - -/* Define if you have the header file. */ -/* #undef HAVE_NDIR_H */ - -/* Define if you have the header file. */ -#define HAVE_NL_TYPES_H 1 - -/* Define if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 -/* Define if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define if you have the header file. */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ /* #undef HAVE_SYS_DIR_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ /* #undef HAVE_SYS_NDIR_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_PARAM_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_VALUES_H */ +/* Define to 1 if you have the `__argz_count' function. */ +/* #undef HAVE___ARGZ_COUNT */ + +/* Define to 1 if you have the `__argz_next' function. */ +/* #undef HAVE___ARGZ_NEXT */ + +/* Define to 1 if you have the `__argz_stringify' function. */ +/* #undef HAVE___ARGZ_STRINGIFY */ + /* Name of package */ #define PACKAGE "ld" -/* Version number of package */ -/* #define VERSION "2.15" */ +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" -/* Define if you have the stpcpy function */ -#define HAVE_STPCPY 1 +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" -/* Define if your locale.h file contains LC_MESSAGES. */ -#define HAVE_LC_MESSAGES 1 +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" -/* Define to 1 if NLS is requested */ -/* #define ENABLE_NLS 1 */ +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +/* #undef STACK_DIRECTION */ -/* Define as 1 if you have gettext and don't want to use GNU gettext. */ -/* #undef HAVE_GETTEXT */ +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 /* Use b modifier when opening binary files? */ /* #undef USE_BINARY_FOPEN */ -/* Define if strstr is not declared in system header files. */ -/* #undef NEED_DECLARATION_STRSTR */ +/* Version number of package */ +#define VERSION "2.17" -/* Define if free is not declared in system header files. */ -/* #undef NEED_DECLARATION_FREE */ +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ +#define YYTEXT_POINTER 1 -/* Define if sbrk is not declared in system header files. */ -/* #undef NEED_DECLARATION_SBRK */ +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ -/* Define if getenv is not declared in system header files. */ -/* #undef NEED_DECLARATION_GETENV */ +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif -/* Define if environ is not declared in system header files. */ -#define NEED_DECLARATION_ENVIRON 1 +/* Define to `long' if does not define. */ +/* #undef off_t */ -/* Additional extension a shared object might have. */ -/* #undef EXTRA_SHLIB_EXTENSION */ - +/* Define to `unsigned' if does not define. */ +/* #undef size_t */ ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/Makefile#2 (text+ko) ==== @@ -6,7 +6,8 @@ LIB= bfd SRCS+= archive.c archive64.c archures.c bfd.c bfdwin.c binary.c cache.c \ - coffgen.c corefile.c elf.c elf-eh-frame.c elf-strtab.c format.c \ + coffgen.c corefile.c elf.c elf-eh-frame.c elf-strtab.c \ + elf-vxworks.c format.c \ hash.c ihex.c init.c libbfd.c linker.c merge.c opncls.c reloc.c \ section.c srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \ targmatch.h dwarf1.c dwarf2.c config.h bfdver.h bfdio.c simple.c ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/config.h.fbsd#2 (text+ko) ==== @@ -1,291 +1,377 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/config.h.fbsd,v 1.6 2004/06/19 19:25:33 marcel Exp $ */ +/* $FreeBSD$ */ +/* config.h. Generated by configure. */ +/* config.in. Generated from configure.in by autoheader. */ -/* config.h. Generated automatically by configure. */ -/* config.in. Generated automatically from configure.in by autoheader. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Nov 6 03:34:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B73F16A47E; Mon, 6 Nov 2006 03:34:29 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 28B8D16A412 for ; Mon, 6 Nov 2006 03:34:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 373ED43D66 for ; Mon, 6 Nov 2006 03:34:28 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA63YS5S074217 for ; Mon, 6 Nov 2006 03:34:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA63YPRs074205 for perforce@freebsd.org; Mon, 6 Nov 2006 03:34:25 GMT (envelope-from jb@freebsd.org) Date: Mon, 6 Nov 2006 03:34:25 GMT Message-Id: <200611060334.kA63YPRs074205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109329 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 03:34:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=109329 Change 109329 by jb@jb_freebsd8 on 2006/11/06 03:33:26 IFC I hope 'make universe' works with this stuff. Affected files ... .. //depot/projects/binutils/src/ObsoleteFiles.inc#2 integrate .. //depot/projects/binutils/src/contrib/bind9/CHANGES#2 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/binutils/src/contrib/bind9/configure.in#2 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/binutils/src/contrib/bind9/version#2 integrate .. //depot/projects/binutils/src/lib/libc/net/gethostbyname.3#2 integrate .. //depot/projects/binutils/src/lib/libc/net/resolver.3#2 integrate .. //depot/projects/binutils/src/lib/libc/sys/clock_gettime.2#2 integrate .. //depot/projects/binutils/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/binutils/src/share/man/man3/pthread_cond_init.3#2 integrate .. //depot/projects/binutils/src/share/man/man3/pthread_create.3#2 integrate .. //depot/projects/binutils/src/share/man/man3/pthread_mutex_init.3#2 integrate .. //depot/projects/binutils/src/share/man/man9/VOP_REMOVE.9#2 integrate .. //depot/projects/binutils/src/share/man/man9/VOP_RENAME.9#2 integrate .. //depot/projects/binutils/src/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/binutils/src/sys/boot/Makefile#2 integrate .. //depot/projects/binutils/src/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/binutils/src/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/binutils/src/sys/boot/efi/libefi/bootinfo.c#2 delete .. //depot/projects/binutils/src/sys/boot/efi/libefi/copy.c#2 delete .. //depot/projects/binutils/src/sys/boot/efi/libefi/devicename.c#2 delete .. //depot/projects/binutils/src/sys/boot/efi/libefi/efiboot.h#2 delete .. //depot/projects/binutils/src/sys/boot/efi/libefi/efifpswa.c#2 delete .. //depot/projects/binutils/src/sys/boot/efi/libefi/efifs.c#2 integrate .. //depot/projects/binutils/src/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/binutils/src/sys/boot/efi/libefi/elf_freebsd.c#2 delete .. //depot/projects/binutils/src/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/binutils/src/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/binutils/src/sys/boot/efi/libefi/module.c#2 delete .. //depot/projects/binutils/src/sys/boot/efi/libefi/time.c#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/Makefile#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/binutils/src/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/binutils/src/sys/boot/ia64/common/bootinfo.c#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/common/copy.c#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/common/devicename.c#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/common/exec.c#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/binutils/src/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/efi/main.c#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/efi/version#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/ski/bootinfo.c#2 delete .. //depot/projects/binutils/src/sys/boot/ia64/ski/copy.c#2 delete .. //depot/projects/binutils/src/sys/boot/ia64/ski/devicename.c#2 delete .. //depot/projects/binutils/src/sys/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/ski/elf_freebsd.c#2 delete .. //depot/projects/binutils/src/sys/boot/ia64/ski/libski.h#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/ski/main.c#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/ski/skifs.c#2 integrate .. //depot/projects/binutils/src/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/binutils/src/sys/boot/ia64/ski/version#2 integrate .. //depot/projects/binutils/src/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/binutils/src/sys/fs/smbfs/smbfs_smb.c#2 integrate .. //depot/projects/binutils/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/binutils/src/sys/net/if_bridge.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_crc32.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/binutils/src/sys/netinet/sctputil.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/sctputil.h#2 integrate .. //depot/projects/binutils/src/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/binutils/src/sys/netsmb/smb_subr.c#2 integrate .. //depot/projects/binutils/src/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/binutils/src/sys/security/audit/audit_private.h#2 integrate Differences ... ==== //depot/projects/binutils/src/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.57 2006/10/31 21:05:35 jmg Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.58 2006/11/05 00:39:56 trhodes Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -183,6 +183,17 @@ # 20041109: replaced by em(4) OLD_FILES+=usr/share/man/man4/gx.4.gz OLD_FILES+=usr/share/man/man4/if_gx.4.gz +# 20041017: rune interface removed +OLD_FILES+=usr/include/rune.h +OLD_FILES+=usr/share/man/man3/fgetrune.3.gz +OLD_FILES+=usr/share/man/man3/fputrune.3.gz +OLD_FILES+=usr/share/man/man3/fungetrune.3.gz +OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/mbrune.3.gz +OLD_FILES+=usr/share/man/man3/rune.3.gz +OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz +OLD_FILES+=usr/share/man/man3/sgetrune.3.gz +OLD_FILES+=usr/share/man/man3/sputrune.3.gz # 20040925: bind9 import OLD_FILES+=usr/bin/dnskeygen OLD_FILES+=usr/bin/dnsquery ==== //depot/projects/binutils/src/contrib/bind9/CHANGES#2 (text+ko) ==== @@ -1,4 +1,19 @@ + --- 9.3.2-P2 released --- + +2090. [port] win32: Visual C++ 2005 command line manifest support. + [RT #16417] + +2089. [security] Raise the minimum safe OpenSSL versions to + OpenSSL 0.9.7l and OpenSSL 0.9.8d. Versions + prior to these have known security flaws which + are (potentially) exploitable in named. [RT #16391] + +2088. [security] Change the default RSA exponent from 3 to 65537. + [RT #16391] + +2083. [port] win32: Visual C++ 2005 support. + --- 9.3.2-P1 released --- 2066. [security] Handle SIG queries gracefully. [RT #16300] ==== //depot/projects/binutils/src/contrib/bind9/bin/named/query.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.198.2.13.4.36.6.1 2006/08/17 07:12:31 marka Exp $ */ +/* $Id: query.c,v 1.198.2.13.4.36.6.2 2006/10/04 07:06:01 marka Exp $ */ #include ==== //depot/projects/binutils/src/contrib/bind9/configure.in#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2003 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any @@ -18,7 +18,7 @@ esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.294.2.23.2.51 $) +AC_REVISION($Revision: 1.294.2.23.2.51.4.3 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.13) @@ -357,6 +357,7 @@ # # was --with-openssl specified? # +OPENSSL_WARNING= AC_MSG_CHECKING(for OpenSSL library) AC_ARG_WITH(openssl, [ --with-openssl[=PATH] Build with OpenSSL [yes|no|path]. @@ -462,51 +463,38 @@ [AC_MSG_RESULT(assuming it does work on target platform)] ) -# -# OpenSSLDie is new with CERT CS-2002-23. If we see it we have may -# have a patched library otherwise check that we are greater than -# the fixed versions -# - AC_CHECK_FUNC(OpenSSLDie, +AC_ARG_ENABLE(openssl-version-check, +[AC_HELP_STRING([--enable-openssl-version-check], + [Check OpenSSL Version @<:@default=yes@:>@])]) +case "$enable_openssl_version_check" in +yes|'') AC_MSG_CHECKING(OpenSSL library version) AC_TRY_RUN([ #include #include int main() { - if (OPENSSL_VERSION_NUMBER >= 0x0090581fL) + if ((OPENSSL_VERSION_NUMBER >= 0x009070cfL && + OPENSSL_VERSION_NUMBER < 0x009080000L) || + OPENSSL_VERSION_NUMBER >= 0x0090804fL) return (0); printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n", OPENSSL_VERSION_NUMBER); - printf("Require OPENSSL_VERSION_NUMBER 0x0090581f or greater\n\n"); + printf("Require OPENSSL_VERSION_NUMBER 0x009070cf or greater (0.9.7l)\n" + "Require OPENSSL_VERSION_NUMBER 0x0090804f or greater (0.9.8d)\n\n"); return (1); } -], + ], [AC_MSG_RESULT(ok)], [AC_MSG_RESULT(not compatible) - AC_MSG_ERROR(you need OpenSSL 0.9.5a or newer)], + OPENSSL_WARNING=yes + ], [AC_MSG_RESULT(assuming target platform has compatible version)]) - , - AC_MSG_RESULT(did not find fixes for CERT CA-2002-23) - AC_MSG_CHECKING(OpenSSL library version) - AC_TRY_RUN([ -#include -#include -int main() { - if ((OPENSSL_VERSION_NUMBER >= 0x0090605fL && - OPENSSL_VERSION_NUMBER < 0x009070000L) || - OPENSSL_VERSION_NUMBER >= 0x00907003L) - return (0); - printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n", - OPENSSL_VERSION_NUMBER); - printf("Require OPENSSL_VERSION_NUMBER 0x0090605f or greater (0.9.6e)\n" - "Require OPENSSL_VERSION_NUMBER 0x00907003 or greater (0.9.7-beta2)\n\n"); - return (1); -} -], - [AC_MSG_RESULT(ok)], - [AC_MSG_RESULT(not compatible) - AC_MSG_ERROR(you need OpenSSL 0.9.6e/0.9.7-beta2 (or newer): CERT CA-2002-23)], - [AC_MSG_RESULT(assuming target platform has compatible version)])) +;; +no) + AC_MSG_RESULT(Skipped OpenSSL version check) +;; +esac + AC_MSG_CHECKING(for OpenSSL DSA support) if test -f $use_openssl/include/openssl/dsa.h then @@ -2116,6 +2104,30 @@ ) chmod a+x isc-config.sh +if test "X$OPENSSL_WARNING" != "X"; then +cat << \EOF +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +WARNING WARNING +WARNING Your OpenSSL crypto library may be vulnerable to WARNING +WARNING one or more of the the following known security WARNING +WARNING flaws: WARNING +WARNING WARNING +WARNING CAN-2002-0659, CAN-2006-4339, CVE-2006-2937 and WARNING +WARNING CVE-2006-2940. WARNING +WARNING WARNING +WARNING It is recommended that you upgrade to OpenSSL WARNING +WARNING version 0.9.8d/0.9.7l (or greater). WARNING +WARNING WARNING +WARNING You can disable this warning by specifying: WARNING +WARNING WARNING +WARNING --disable-openssl-version-check WARNING +WARNING WARNING +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +EOF +fi + # Tell Emacs to edit this file in shell mode. # Local Variables: # mode: sh ==== //depot/projects/binutils/src/contrib/bind9/lib/dns/opensslrsa_link.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -17,7 +17,7 @@ /* * Principal Author: Brian Wellington - * $Id: opensslrsa_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $ + * $Id: opensslrsa_link.c,v 1.1.4.1.10.5 2006/10/11 03:58:50 marka Exp $ */ #ifdef OPENSSL @@ -39,7 +39,23 @@ #include #include #include +#if OPENSSL_VERSION_NUMBER > 0x00908000L +#include +#endif + +/* + * We don't use configure for windows so enforce the OpenSSL version + * here. Unlike with configure we don't support overriding this test. + */ +#ifdef WIN32 +#if !((OPENSSL_VERSION_NUMBER >= 0x009070cfL && \ + OPENSSL_VERSION_NUMBER < 0x009080000L) || \ + OPENSSL_VERSION_NUMBER >= 0x0090804fL) +#error Please upgrade OpenSSL to 0.9.8d/0.9.7l or greater. +#endif +#endif + /* * XXXMPA Temporarially disable RSA_BLINDING as it requires * good quality random data that cannot currently be guarenteed. @@ -260,13 +276,47 @@ static isc_result_t opensslrsa_generate(dst_key_t *key, int exp) { +#if OPENSSL_VERSION_NUMBER > 0x00908000L + BN_GENCB cb; + RSA *rsa = RSA_new(); + BIGNUM *e = BN_new(); + + if (rsa == NULL || e == NULL) + goto err; + + if (exp == 0) { + /* RSA_F4 0x10001 */ + BN_set_bit(e, 0); + BN_set_bit(e, 16); + } else { + /* F5 0x100000001 */ + BN_set_bit(e, 0); + BN_set_bit(e, 32); + } + + BN_GENCB_set_old(&cb, NULL, NULL); + + if (RSA_generate_key_ex(rsa, key->key_size, e, &cb)) { + BN_free(e); + SET_FLAGS(rsa); + key->opaque = rsa; + return (ISC_R_SUCCESS); + } + + err: + if (e != NULL) + BN_free(e); + if (rsa != NULL) + RSA_free(rsa); + return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); +#else RSA *rsa; unsigned long e; if (exp == 0) - e = RSA_3; + e = RSA_F4; else - e = RSA_F4; + e = 0x40000003; rsa = RSA_generate_key(key->key_size, e, NULL, NULL); if (rsa == NULL) return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); @@ -274,6 +324,7 @@ key->opaque = rsa; return (ISC_R_SUCCESS); +#endif } static isc_boolean_t ==== //depot/projects/binutils/src/contrib/bind9/lib/dns/resolver.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.218.2.18.4.56.4.1 2006/08/17 07:12:31 marka Exp $ */ +/* $Id: resolver.c,v 1.218.2.18.4.56.4.2 2006/10/04 07:06:02 marka Exp $ */ #include ==== //depot/projects/binutils/src/contrib/bind9/version#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: version,v 1.26.2.17.2.21.4.1 2006/08/17 07:12:31 marka Exp $ +# $Id: version,v 1.26.2.17.2.21.4.2 2006/10/04 07:00:13 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -7,4 +7,4 @@ MINORVER=3 PATCHVER=2 RELEASETYPE=-P -RELEASEVER=1 +RELEASEVER=2 ==== //depot/projects/binutils/src/lib/libc/net/gethostbyname.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)gethostbyname.3 8.4 (Berkeley) 5/25/95 -.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.36 2006/09/17 21:27:33 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.37 2006/11/04 09:42:22 lawrance Exp $ .\" .Dd May 12, 2006 .Dt GETHOSTBYNAME 3 @@ -49,7 +49,7 @@ .Lb libc .Sh SYNOPSIS .In netdb.h -.Vt extern int h_errno ; +.Vt int h_errno ; .Ft struct hostent * .Fn gethostbyname "const char *name" .Ft struct hostent * @@ -261,7 +261,7 @@ is indicated by return of a .Dv NULL pointer. -The external integer +The integer .Va h_errno may then be checked to see whether this is a temporary failure or an invalid or unknown host. ==== //depot/projects/binutils/src/lib/libc/net/resolver.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)resolver.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.31 2006/07/17 09:27:26 stefanf Exp $ +.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.32 2006/11/04 09:42:22 lawrance Exp $ .\" -.Dd June 4, 1993 +.Dd November 4, 2006 .Dt RESOLVER 3 .Os .Sh NAME @@ -410,6 +410,20 @@ .Fn res_init function will return 0 on success, or \-1 in a threaded program if per-thread storage could not be allocated. +.Pp +The +.Fn res_mkquery , +.Fn res_search , +and +.Fn res_query +functions return the size of the response on success, or \-1 if an +error occurs. +The integer +.Vt h_errno +may be checked to determine the reason for error. +See +.Xr gethostbyname 3 +for more information. .Sh FILES .Bl -tag -width /etc/resolv.conf .It Pa /etc/resolv.conf ==== //depot/projects/binutils/src/lib/libc/sys/clock_gettime.2#2 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.22 2006/09/17 21:27:34 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.23 2006/11/04 09:35:36 danger Exp $ .\" -.Dd November 18, 2005 +.Dd November 4, 2006 .Dt CLOCK_GETTIME 2 .Os .Sh NAME @@ -44,7 +44,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/time.h +.In time.h .Ft int .Fn clock_gettime "clockid_t clock_id" "struct timespec *tp" .Ft int @@ -82,7 +82,7 @@ The structure pointed to by .Fa tp is defined in -.In sys/time.h +.In sys/timespec.h as: .Pp .Bd -literal ==== //depot/projects/binutils/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.981 2006/10/21 14:06:34 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.982 2006/11/04 02:01:52 bmah Exp $ 2000 @@ -619,7 +619,7 @@ architectures such as sparc64. &merged; The &man.em.4; driver has been updated to - version 6.1.4 from Intel. Among other changes, it now supports + version 6.2.9 from Intel. Among other changes, it now supports 80003, 82571, 82571EB and 82572 based adapters, as well as onboard-NICs on ICH8-based motherboards. &merged; ==== //depot/projects/binutils/src/share/man/man3/pthread_cond_init.3#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread_cond_init.3,v 1.16 2006/09/30 11:22:25 ru Exp $ +.\" $FreeBSD: src/share/man/man3/pthread_cond_init.3,v 1.17 2006/11/04 10:08:16 trhodes Exp $ .\" -.Dd July 28, 1998 +.Dd November 4, 2006 .Dt PTHREAD_COND_INIT 3 .Os .Sh NAME @@ -71,6 +71,7 @@ variable. .El .Sh SEE ALSO +.Xr pthread_condattr 3 , .Xr pthread_cond_broadcast 3 , .Xr pthread_cond_destroy 3 , .Xr pthread_cond_signal 3 , ==== //depot/projects/binutils/src/share/man/man3/pthread_create.3#2 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread_create.3,v 1.22 2006/11/01 04:46:06 maxim Exp $ +.\" $FreeBSD: src/share/man/man3/pthread_create.3,v 1.23 2006/11/04 10:08:16 trhodes Exp $ .\" -.Dd November 1, 2006 +.Dd November 4, 2006 .Dt PTHREAD_CREATE 3 .Os .Sh NAME @@ -118,6 +118,7 @@ .El .Sh SEE ALSO .Xr fork 2 , +.Xr pthread_attr 3 , .Xr pthread_cleanup_pop 3 , .Xr pthread_cleanup_push 3 , .Xr pthread_exit 3 , ==== //depot/projects/binutils/src/share/man/man3/pthread_mutex_init.3#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread_mutex_init.3,v 1.16 2006/09/30 11:22:25 ru Exp $ +.\" $FreeBSD: src/share/man/man3/pthread_mutex_init.3,v 1.17 2006/11/04 10:08:16 trhodes Exp $ .\" -.Dd July 29, 1998 +.Dd November 4, 2006 .Dt PTHREAD_MUTEX_INIT 3 .Os .Sh NAME @@ -67,6 +67,7 @@ The process cannot allocate enough memory to create another mutex. .El .Sh SEE ALSO +.Xr pthread_mutexattr 3 , .Xr pthread_mutex_destroy 3 , .Xr pthread_mutex_lock 3 , .Xr pthread_mutex_trylock 3 , ==== //depot/projects/binutils/src/share/man/man9/VOP_REMOVE.9#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_REMOVE.9,v 1.14 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_REMOVE.9,v 1.15 2006/11/04 23:58:15 pjd Exp $ .\" .Dd July 24, 1996 .Os @@ -80,16 +80,6 @@ */ ...; - /* - * Careful about trying to remove ".". XXX this should be handled - * higher up. - */ - if (dvp == vp) - vrele(vp); - else - vput(vp); - vput(dvp); - return error; } .Ed ==== //depot/projects/binutils/src/share/man/man9/VOP_RENAME.9#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_RENAME.9,v 1.21 2005/01/28 10:43:05 ru Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_RENAME.9,v 1.22 2006/11/04 23:59:51 pjd Exp $ .\" .Dd July 24, 1996 .Os @@ -104,34 +104,13 @@ } /* - * Check if just deleting a link name. + * POSIX: "If the old argument and the new argument + * both refer to links to the same existing file, + * the rename() function shall return successfully + * and perform no other action." + * The upper layers already handle this case. */ - if (fvp == tvp) { - if (fvp->v_type == VDIR) { - error = EINVAL; - goto abortit; - } - - /* - * Release destination. - */ - vput(tdvp); - vput(tvp); - - /* - * Delete source. Pretty bizarre stuff. - */ - vrele(fdvp); - vrele(fvp); - fcnp->cn_flags &= ~MODMASK; - fcnp->cn_flags |= LOCKPARENT | LOCKLEAF; - fcnp->cn_nameiop = DELETE; - VREF(fdvp); - error = relookup(fdvp, &fvp, fcnp); - if (error == 0) - vrele(fdvp); - return VOP_REMOVE(fdvp, fvp, fcnp); - } + KASSERT(fvp != tvp, ("vop_rename: source and destination are the same")); if (fvp is immutable) { error = EPERM; ==== //depot/projects/binutils/src/share/mk/bsd.sys.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.38 2006/08/11 17:28:59 des Exp $ +# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.39 2006/11/04 04:39:05 jb Exp $ # # This file contains common settings used for building FreeBSD # sources. @@ -67,5 +67,9 @@ . endif .endif +.if defined(IGNORE_PRAGMA) +CWARNFLAGS += -Wno-unknown-pragmas +.endif + # Allow user-specified additional warning flags CFLAGS += ${CWARNFLAGS} ==== //depot/projects/binutils/src/sys/boot/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.31 2006/10/09 04:43:06 kmacy Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.32 2006/11/05 22:03:02 marcel Exp $ .include @@ -8,7 +8,7 @@ .endif # Build EFI library. -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "ia64" SUBDIR+= efi .endif ==== //depot/projects/binutils/src/sys/boot/efi/include/efilib.h#2 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2000 Doug Rabson + * Copyright (c) 2006 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,24 +24,31 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.5 2006/11/02 02:42:47 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.6 2006/11/05 22:03:02 marcel Exp $ */ -#include +#include extern EFI_HANDLE IH; extern EFI_SYSTEM_TABLE *ST; extern EFI_BOOT_SERVICES *BS; extern EFI_RUNTIME_SERVICES *RS; -/* DIG64 Headless Console & Debug Port Table. */ -#define HCDP_TABLE_GUID \ - {0xf951938d,0x620b,0x42ef,{0x82,0x79,0xa8,0x4b,0x79,0x61,0x78,0x98}} +extern struct devsw efifs_dev; +extern struct fs_ops efifs_fsops; + +extern struct devsw efinet_dev; +extern struct netif_driver efinetif; void *efi_get_table(EFI_GUID *tbl); void efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table); -EFI_PHYSICAL_ADDRESS efimd_va2pa(EFI_VIRTUAL_ADDRESS); +int efi_register_handles(struct devsw *, EFI_HANDLE *, int); +EFI_HANDLE efi_find_handle(struct devsw *, int); +int efi_handle_lookup(EFI_HANDLE, struct devsw **, int *); + +int efi_status_to_errno(EFI_STATUS); +time_t efi_time(EFI_TIME *); EFI_STATUS main(int argc, CHAR16 *argv[]); void exit(EFI_STATUS status); ==== //depot/projects/binutils/src/sys/boot/efi/libefi/Makefile#2 (text+ko) ==== @@ -1,27 +1,16 @@ -# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.16 2004/11/28 00:30:22 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.17 2006/11/05 22:03:03 marcel Exp $ -.PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} - LIB= efi INTERNALLIB= -SRCS= bootinfo.c copy.c delay.c devicename.c efi_console.c efifs.c efinet.c \ - elf_freebsd.c libefi.c module.c time.c +SRCS= delay.c efi_console.c efifs.c efinet.c errno.c handles.c libefi.c \ + time.c -.if ${MACHINE_ARCH} == "ia64" -SRCS+= efifpswa.c pal.S -.endif - CFLAGS+= -I${.CURDIR}/../include -CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} +CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH:S/amd64/i386/} CFLAGS+= -I${.CURDIR}/../../../../lib/libstand # Pick up the bootstrap header for some interface items CFLAGS+= -I${.CURDIR}/../../common -# Make the disk code more talkative -.if defined(BOOT_DISK_DEBUG) -CFLAGS+= -DDISK_DEBUG -.endif - .include ==== //depot/projects/binutils/src/sys/boot/efi/libefi/efifs.c#2 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2001 Doug Rabson + * Copyright (c) 2006 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,88 +23,100 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.9 2006/11/02 01:23:17 marcel Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.10 2006/11/05 22:03:03 marcel Exp $"); + #include #include #include -#include #include +#include + #include #include -#include "efiboot.h" +#include /* Perform I/O in blocks of size EFI_BLOCK_SIZE. */ #define EFI_BLOCK_SIZE (1024 * 1024) +union fileinfo { + EFI_FILE_INFO info; + char bytes[sizeof(EFI_FILE_INFO) + 508]; +}; + +static EFI_GUID sfs_guid = SIMPLE_FILE_SYSTEM_PROTOCOL; +static EFI_GUID fs_guid = EFI_FILE_SYSTEM_INFO_ID; +static EFI_GUID fi_guid = EFI_FILE_INFO_ID; + static int efifs_open(const char *upath, struct open_file *f) { - struct efi_devdesc *dev = f->f_devdata; - static EFI_GUID sfsid = SIMPLE_FILE_SYSTEM_PROTOCOL; - EFI_FILE_IO_INTERFACE *sfs; - EFI_FILE *root; - EFI_FILE *file; + struct devdesc *dev = f->f_devdata; + EFI_FILE_IO_INTERFACE *fsif; + EFI_FILE *file, *root; + EFI_HANDLE h; EFI_STATUS status; - CHAR16 *cp; - CHAR16 *path; + CHAR16 *cp, *path; + + if (f->f_dev != &efifs_dev || dev->d_unit < 0) + return (EINVAL); - /* - * We cannot blindly assume that f->f_devdata points to a - * efi_devdesc structure. Before we dereference 'dev', make - * sure that the underlying device is ours. - */ - if (f->f_dev != &efifs_dev || dev->d_handle == NULL) - return ENOENT; + h = efi_find_handle(f->f_dev, dev->d_unit); + if (h == NULL) + return (EINVAL); - status = BS->HandleProtocol(dev->d_handle, &sfsid, (VOID **)&sfs); + status = BS->HandleProtocol(h, &sfs_guid, (VOID **)&fsif); if (EFI_ERROR(status)) - return ENOENT; + return (efi_status_to_errno(status)); - /* - * Find the root directory. - */ - status = sfs->OpenVolume(sfs, &root); + /* Get the root directory. */ + status = fsif->OpenVolume(fsif, &root); + if (EFI_ERROR(status)) + return (efi_status_to_errno(status)); - /* - * Convert path to CHAR16, skipping leading separators. - */ while (*upath == '/') upath++; - if (!*upath) { - /* Opening the root directory, */ + + /* Special case: opening the root directory. */ + if (*upath == '\0') { f->f_fsdata = root; - return 0; + return (0); + } + + path = malloc((strlen(upath) + 1) * sizeof(CHAR16)); + if (path == NULL) { + root->Close(root); + return (ENOMEM); } - cp = path = malloc((strlen(upath) + 1) * sizeof(CHAR16)); - if (path == NULL) - return ENOMEM; - while (*upath) { - if (*upath == '/') + + cp = path; + while (*upath != '\0') { + if (*upath == '/') { *cp = '\\'; - else + while (upath[1] == '/') + upath++; + } else *cp = *upath; upath++; cp++; } - *cp++ = 0; + *cp = 0; - /* - * Try to open it. - */ - status = root->Open(root, &file, path, EFI_FILE_MODE_READ, 0); + /* Open the file. */ + status = root->Open(root, &file, path, + EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE, 0); + if (status == EFI_ACCESS_DENIED || status == EFI_WRITE_PROTECTED) + status = root->Open(root, &file, path, EFI_FILE_MODE_READ, 0); free(path); - if (EFI_ERROR(status)) { - root->Close(root); - return ENOENT; - } + root->Close(root); + if (EFI_ERROR(status)) + return (efi_status_to_errno(status)); - root->Close(root); f->f_fsdata = file; - return 0; + return (0); } static int @@ -111,8 +124,12 @@ { EFI_FILE *file = f->f_fsdata; + if (file == NULL) + return (EBADF); + file->Close(file); - return 0; + f->f_fsdata = NULL; + return (0); } static int @@ -123,15 +140,17 @@ UINTN sz = size; char *bufp; + if (file == NULL) + return (EBADF); + bufp = buf; while (size > 0) { sz = size; if (sz > EFI_BLOCK_SIZE) sz = EFI_BLOCK_SIZE; status = file->Read(file, &sz, bufp); - twiddle(); if (EFI_ERROR(status)) - return EIO; + return (efi_status_to_errno(status)); if (sz == 0) break; size -= sz; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Nov 6 05:51:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C582716A415; Mon, 6 Nov 2006 05:51:28 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 6851B16A403 for ; Mon, 6 Nov 2006 05:51:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 29E0D43D5D for ; Mon, 6 Nov 2006 05:51:28 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA65pS4m005576 for ; Mon, 6 Nov 2006 05:51:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA65pQop005557 for perforce@freebsd.org; Mon, 6 Nov 2006 05:51:26 GMT (envelope-from jb@freebsd.org) Date: Mon, 6 Nov 2006 05:51:26 GMT Message-Id: <200611060551.kA65pQop005557@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109338 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 05:51:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=109338 Change 109338 by jb@jb_freebsd8 on 2006/11/06 05:51:01 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#33 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#6 integrate .. //depot/projects/dtrace/ports/GIDs#8 integrate .. //depot/projects/dtrace/ports/MOVED#29 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#11 integrate .. //depot/projects/dtrace/ports/UIDs#9 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#15 integrate .. //depot/projects/dtrace/src/contrib/bind9/CHANGES#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/query.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/configure.in#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/opensslrsa_link.c#4 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/resolver.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/version#5 integrate .. //depot/projects/dtrace/src/lib/libc/net/gethostbyname.3#6 integrate .. //depot/projects/dtrace/src/lib/libc/net/resolver.3#5 integrate .. //depot/projects/dtrace/src/lib/libc/sys/clock_gettime.2#5 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#23 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_cond_init.3#5 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_create.3#6 integrate .. //depot/projects/dtrace/src/share/man/man3/pthread_mutex_init.3#5 integrate .. //depot/projects/dtrace/src/share/man/man9/VOP_REMOVE.9#4 integrate .. //depot/projects/dtrace/src/share/man/man9/VOP_RENAME.9#4 integrate .. //depot/projects/dtrace/src/share/mk/bsd.sys.mk#6 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/DEFAULTS#8 integrate .. //depot/projects/dtrace/src/sys/boot/Makefile#7 integrate .. //depot/projects/dtrace/src/sys/boot/efi/include/efilib.h#5 integrate .. //depot/projects/dtrace/src/sys/boot/efi/libefi/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/boot/efi/libefi/bootinfo.c#5 delete .. //depot/projects/dtrace/src/sys/boot/efi/libefi/copy.c#4 delete .. //depot/projects/dtrace/src/sys/boot/efi/libefi/devicename.c#5 delete .. //depot/projects/dtrace/src/sys/boot/efi/libefi/efiboot.h#5 delete .. //depot/projects/dtrace/src/sys/boot/efi/libefi/efifpswa.c#4 delete .. //depot/projects/dtrace/src/sys/boot/efi/libefi/efifs.c#5 integrate .. //depot/projects/dtrace/src/sys/boot/efi/libefi/efinet.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/efi/libefi/elf_freebsd.c#4 delete .. //depot/projects/dtrace/src/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/dtrace/src/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/dtrace/src/sys/boot/efi/libefi/module.c#4 delete .. //depot/projects/dtrace/src/sys/boot/efi/libefi/time.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/ia64/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/dtrace/src/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/dtrace/src/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/dtrace/src/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/dtrace/src/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/dtrace/src/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/dtrace/src/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/dtrace/src/sys/boot/ia64/efi/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/boot/ia64/efi/conf.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/ia64/efi/efimd.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/ia64/efi/main.c#5 integrate .. //depot/projects/dtrace/src/sys/boot/ia64/efi/version#4 integrate .. //depot/projects/dtrace/src/sys/boot/ia64/ski/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/boot/ia64/ski/bootinfo.c#5 delete .. //depot/projects/dtrace/src/sys/boot/ia64/ski/copy.c#4 delete .. //depot/projects/dtrace/src/sys/boot/ia64/ski/devicename.c#5 delete .. //depot/projects/dtrace/src/sys/boot/ia64/ski/efi_stub.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/ia64/ski/elf_freebsd.c#4 delete .. //depot/projects/dtrace/src/sys/boot/ia64/ski/libski.h#5 integrate .. //depot/projects/dtrace/src/sys/boot/ia64/ski/main.c#5 integrate .. //depot/projects/dtrace/src/sys/boot/ia64/ski/skifs.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/dtrace/src/sys/boot/ia64/ski/version#4 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci.c#11 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_smb.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/conf/DEFAULTS#8 integrate .. //depot/projects/dtrace/src/sys/ia64/conf/DEFAULTS#9 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#16 integrate .. //depot/projects/dtrace/src/sys/net/if_bridge.c#16 integrate .. //depot/projects/dtrace/src/sys/net/if_tap.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_crc32.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.h#2 integrate .. //depot/projects/dtrace/src/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/dtrace/src/sys/netsmb/smb_subr.c#4 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/DEFAULTS#8 integrate .. //depot/projects/dtrace/src/sys/powerpc/conf/DEFAULTS#7 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_arg.c#6 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_private.h#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/conf/DEFAULTS#7 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/DEFAULTS#7 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#10 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq216.sgml#4 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#9 integrate .. //depot/projects/dtrace/www/tools/portsgrowth/ports.log#5 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#33 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -360,9 +360,9 @@ SGML_ROOT=/usr/local/share/sgml SGML_CATALOG_FILES=${SGML_ROOT}/jade/catalog +SGML_CATALOG_FILES=${SGML_ROOT}/docbook/4.1/catalog:$SGML_CATALOG_FILES +SGML_CATALOG_FILES=${SGML_ROOT}/html/catalog:$SGML_CATALOG_FILES SGML_CATALOG_FILES=${SGML_ROOT}/iso8879/catalog:$SGML_CATALOG_FILES -SGML_CATALOG_FILES=${SGML_ROOT}/html/catalog:$SGML_CATALOG_FILES -SGML_CATALOG_FILES=${SGML_ROOT}/docbook/4.1/catalog:$SGML_CATALOG_FILES SGML_CATALOG_FILES=/usr/doc/share/sgml/catalog:$SGML_CATALOG_FILES SGML_CATALOG_FILES=/usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATALOG_FILES export SGML_CATALOG_FILES @@ -374,9 +374,9 @@ setenv SGML_ROOT /usr/local/share/sgml setenv SGML_CATALOG_FILES ${SGML_ROOT}/jade/catalog +setenv SGML_CATALOG_FILES ${SGML_ROOT}/docbook/4.1/catalog:$SGML_CATALOG_FILES +setenv SGML_CATALOG_FILES ${SGML_ROOT}/html/catalog:$SGML_CATALOG_FILES setenv SGML_CATALOG_FILES ${SGML_ROOT}/iso8879/catalog:$SGML_CATALOG_FILES -setenv SGML_CATALOG_FILES ${SGML_ROOT}/html/catalog:$SGML_CATALOG_FILES -setenv SGML_CATALOG_FILES ${SGML_ROOT}/docbook/4.1/catalog:$SGML_CATALOG_FILES setenv SGML_CATALOG_FILES /usr/doc/share/sgml/catalog:$SGML_CATALOG_FILES setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATALOG_FILES ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1209,11 +1209,8 @@ d Partition d used to have a special - meaning associated with it, although that is now gone. To - this day, some tools may operate oddly if told to work on - partition d, so - sysinstall will not normally create - partition d. + meaning associated with it, although that is now gone and + d may work as any normal partition. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -3414,7 +3414,7 @@ unauthorized data access. File permissions and Mandatory Access Control (MAC) (see ) help prevent unauthorized third-parties from accessing data while the operating - system is active and the computer is powered up. However, + system is active and the computer is powered up. However, the permissions enforced by the operating system are irrelevant if an attacker has physical access to a computer and can simply move the computer's hard drive to another system to copy and analyze @@ -3428,7 +3428,7 @@ highly-motivated attackers with significant resources. Unlike cumbersome encryption methods that encrypt only individual files, gbde and geli transparently - encrypt entire file systems. No cleartext ever touches the hard + encrypt entire file systems. No cleartext ever touches the hard drive's platter. @@ -3458,6 +3458,17 @@ Reboot into the new kernel. + + + An alternative to recompiling the kernel is to use + kldload to load &man.gbde.4;: + + &prompt.root; kldload geom_bde + + At this time there is no option in + /boot/loader.conf + to load the kernel module at boot time. + @@ -3478,7 +3489,7 @@ Install the new drive to the system as explained in . For the purposes of this example, a new hard drive partition has been added as - /dev/ad4s1c. The + /dev/ad4s1c. The /dev/ad0s1* devices represent existing standard FreeBSD partitions on the example system. @@ -3670,11 +3681,11 @@ It is possible to create a script to automatically attach, check, and mount an encrypted partition, but for security reasons - the script should not contain the &man.gbde.8; password. Instead, + the script should not contain the &man.gbde.8; password. Instead, it is recommended that such scripts be run manually while providing the password via the console or &man.ssh.1;. - As of &os; 5.2-RELEASE, there is a new rc.d script + As an alternative, an rc.d script is provided. Arguments for this script can be passed via &man.rc.conf.5;, for example: ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#6 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -37,7 +37,7 @@ , Configuration and Tuning, has been expanded with new information about the - ACPI power and resource management, the cron system utility, + ACPI power and resource management, the cron system utility, and more kernel tuning options. @@ -77,16 +77,16 @@ , Electronic Mail, has been expanded with new information about using alternative - transport agents, SMTP authentication, UUCP, fetchmail, - procmail, and other advanced topics. + transport agents, SMTP authentication, UUCP, fetchmail, + procmail, and other advanced topics. , Network Servers, is all new with this edition. This chapter includes - information about setting up the Apache HTTP Server, FTPd, - and setting up a server for Microsoft Windows clients with - Samba. Some sections from Apache HTTP Server, ftpd, + and setting up a server for µsoft; &windows; clients with + Samba. Some sections from , Advanced Networking, were moved here to improve the presentation. @@ -94,7 +94,7 @@ , Advanced Networking, has been expanded with new information about - using Bluetooth devices with FreeBSD, setting up wireless + using &bluetooth; devices with FreeBSD, setting up wireless networks, and Asynchronous Transfer Mode (ATM) networking. ==== //depot/projects/dtrace/ports/GIDs#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/GIDs,v 1.14 2006/11/04 00:30:02 rafan Exp $ +$FreeBSD: ports/GIDs,v 1.15 2006/11/05 17:07:03 alepulver Exp $ # Please keep this file sorted by GID! bind:*:53: rdfdb:*:55: @@ -84,6 +84,7 @@ realtime:*:557: avahi:*:558: tacacs:*:559: +_xsi:*:600: bnetd:*:700: bopm:*:717: openxpki:*:777: ==== //depot/projects/dtrace/ports/MOVED#29 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1174 2006/11/01 15:36:54 leeym Exp $ +# $FreeBSD: ports/MOVED,v 1.1176 2006/11/05 17:55:55 alepulver Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2514,3 +2514,5 @@ www/firefox-devel|www/firefox|2006-11-01|Firefox 2.0 is now stable graphics/php4-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion graphics/php5-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion +chinese/xcin25|chinese/xcin|2006-11-05|Reflect its real portname +mail/nail|mail/heirloom-mailx|2006-11-05|Project name changed ==== //depot/projects/dtrace/ports/Mk/bsd.sites.mk#11 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.400 2006/10/07 17:47:05 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.401 2006/11/05 12:27:42 sat Exp $ # # Where to put distfiles that don't have any other master site @@ -964,7 +964,7 @@ .endif .if !defined(IGNORE_MASTER_SITE_SOURCEFORGE) -.for mirror in heanet nchc kent easynews ufpr jaist umn +.for mirror in heanet nchc kent easynews ufpr umn MASTER_SITE_SOURCEFORGE+= \ http://${mirror}.dl.sourceforge.net/sourceforge/%SUBDIR%/ .endfor @@ -973,7 +973,7 @@ # official sf.net mirrors that don't mirror all projects, check # http://prdownloads.sourceforge.net/%SUBDIR%/ .if !defined(IGNORE_MASTER_SITE_SOURCEFORGE_EXTENDED) -.for mirror in easynews switch puzzle ovh peterhost citkit keihanna +.for mirror in easynews switch puzzle belnet osdn ovh keihanna MASTER_SITE_SOURCEFORGE_EXTENDED+= \ http://${mirror}.dl.sourceforge.net/sourceforge/%SUBDIR%/ .endfor ==== //depot/projects/dtrace/ports/UIDs#9 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/UIDs,v 1.16 2006/11/04 00:30:02 rafan Exp $ +$FreeBSD: ports/UIDs,v 1.17 2006/11/05 17:07:03 alepulver Exp $ # Please keep this file sorted by UID! bind:*:53:53:Bind Sandbox:/:/sbin/nologin majordom:*:54:54:Majordomo Pseudo User:/usr/local/majordomo:/nonexistent @@ -95,6 +95,7 @@ messagebus:*:556:556:D-BUS Daemon User:/nonexistent:/sbin/nologin avahi:*:558:558:Avahi Daemon User:/nonexistent:/sbin/nologin tacacs:*:559:559:TACACS+ Daemon User:/nonexistent:/sbin/nologin +_xsi:*:600:600:XMLSysInfo User:/nonexistent:/sbin/nologin bnetd:*:700:700:Bnetd user:/nonexistent:/sbin/nologin bopm:*:717:717:Blitzed Open Proxy Monitor:/nonexistent:/bin/sh openxpki:*:777:777:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin ==== //depot/projects/dtrace/src/ObsoleteFiles.inc#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.57 2006/10/31 21:05:35 jmg Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.58 2006/11/05 00:39:56 trhodes Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -183,6 +183,17 @@ # 20041109: replaced by em(4) OLD_FILES+=usr/share/man/man4/gx.4.gz OLD_FILES+=usr/share/man/man4/if_gx.4.gz +# 20041017: rune interface removed +OLD_FILES+=usr/include/rune.h +OLD_FILES+=usr/share/man/man3/fgetrune.3.gz +OLD_FILES+=usr/share/man/man3/fputrune.3.gz +OLD_FILES+=usr/share/man/man3/fungetrune.3.gz +OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/mbrune.3.gz +OLD_FILES+=usr/share/man/man3/rune.3.gz +OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz +OLD_FILES+=usr/share/man/man3/sgetrune.3.gz +OLD_FILES+=usr/share/man/man3/sputrune.3.gz # 20040925: bind9 import OLD_FILES+=usr/bin/dnskeygen OLD_FILES+=usr/bin/dnsquery ==== //depot/projects/dtrace/src/contrib/bind9/CHANGES#5 (text+ko) ==== @@ -1,4 +1,19 @@ + --- 9.3.2-P2 released --- + +2090. [port] win32: Visual C++ 2005 command line manifest support. + [RT #16417] + +2089. [security] Raise the minimum safe OpenSSL versions to + OpenSSL 0.9.7l and OpenSSL 0.9.8d. Versions + prior to these have known security flaws which + are (potentially) exploitable in named. [RT #16391] + +2088. [security] Change the default RSA exponent from 3 to 65537. + [RT #16391] + +2083. [port] win32: Visual C++ 2005 support. + --- 9.3.2-P1 released --- 2066. [security] Handle SIG queries gracefully. [RT #16300] ==== //depot/projects/dtrace/src/contrib/bind9/bin/named/query.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.198.2.13.4.36.6.1 2006/08/17 07:12:31 marka Exp $ */ +/* $Id: query.c,v 1.198.2.13.4.36.6.2 2006/10/04 07:06:01 marka Exp $ */ #include ==== //depot/projects/dtrace/src/contrib/bind9/configure.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2003 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any @@ -18,7 +18,7 @@ esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.294.2.23.2.51 $) +AC_REVISION($Revision: 1.294.2.23.2.51.4.3 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.13) @@ -357,6 +357,7 @@ # # was --with-openssl specified? # +OPENSSL_WARNING= AC_MSG_CHECKING(for OpenSSL library) AC_ARG_WITH(openssl, [ --with-openssl[=PATH] Build with OpenSSL [yes|no|path]. @@ -462,51 +463,38 @@ [AC_MSG_RESULT(assuming it does work on target platform)] ) -# -# OpenSSLDie is new with CERT CS-2002-23. If we see it we have may -# have a patched library otherwise check that we are greater than -# the fixed versions -# - AC_CHECK_FUNC(OpenSSLDie, +AC_ARG_ENABLE(openssl-version-check, +[AC_HELP_STRING([--enable-openssl-version-check], + [Check OpenSSL Version @<:@default=yes@:>@])]) +case "$enable_openssl_version_check" in +yes|'') AC_MSG_CHECKING(OpenSSL library version) AC_TRY_RUN([ #include #include int main() { - if (OPENSSL_VERSION_NUMBER >= 0x0090581fL) + if ((OPENSSL_VERSION_NUMBER >= 0x009070cfL && + OPENSSL_VERSION_NUMBER < 0x009080000L) || + OPENSSL_VERSION_NUMBER >= 0x0090804fL) return (0); printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n", OPENSSL_VERSION_NUMBER); - printf("Require OPENSSL_VERSION_NUMBER 0x0090581f or greater\n\n"); + printf("Require OPENSSL_VERSION_NUMBER 0x009070cf or greater (0.9.7l)\n" + "Require OPENSSL_VERSION_NUMBER 0x0090804f or greater (0.9.8d)\n\n"); return (1); } -], + ], [AC_MSG_RESULT(ok)], [AC_MSG_RESULT(not compatible) - AC_MSG_ERROR(you need OpenSSL 0.9.5a or newer)], + OPENSSL_WARNING=yes + ], [AC_MSG_RESULT(assuming target platform has compatible version)]) - , - AC_MSG_RESULT(did not find fixes for CERT CA-2002-23) - AC_MSG_CHECKING(OpenSSL library version) - AC_TRY_RUN([ -#include -#include -int main() { - if ((OPENSSL_VERSION_NUMBER >= 0x0090605fL && - OPENSSL_VERSION_NUMBER < 0x009070000L) || - OPENSSL_VERSION_NUMBER >= 0x00907003L) - return (0); - printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n", - OPENSSL_VERSION_NUMBER); - printf("Require OPENSSL_VERSION_NUMBER 0x0090605f or greater (0.9.6e)\n" - "Require OPENSSL_VERSION_NUMBER 0x00907003 or greater (0.9.7-beta2)\n\n"); - return (1); -} -], - [AC_MSG_RESULT(ok)], - [AC_MSG_RESULT(not compatible) - AC_MSG_ERROR(you need OpenSSL 0.9.6e/0.9.7-beta2 (or newer): CERT CA-2002-23)], - [AC_MSG_RESULT(assuming target platform has compatible version)])) +;; +no) + AC_MSG_RESULT(Skipped OpenSSL version check) +;; +esac + AC_MSG_CHECKING(for OpenSSL DSA support) if test -f $use_openssl/include/openssl/dsa.h then @@ -2116,6 +2104,30 @@ ) chmod a+x isc-config.sh +if test "X$OPENSSL_WARNING" != "X"; then +cat << \EOF +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +WARNING WARNING +WARNING Your OpenSSL crypto library may be vulnerable to WARNING +WARNING one or more of the the following known security WARNING +WARNING flaws: WARNING +WARNING WARNING +WARNING CAN-2002-0659, CAN-2006-4339, CVE-2006-2937 and WARNING +WARNING CVE-2006-2940. WARNING +WARNING WARNING +WARNING It is recommended that you upgrade to OpenSSL WARNING +WARNING version 0.9.8d/0.9.7l (or greater). WARNING +WARNING WARNING +WARNING You can disable this warning by specifying: WARNING +WARNING WARNING +WARNING --disable-openssl-version-check WARNING +WARNING WARNING +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +EOF +fi + # Tell Emacs to edit this file in shell mode. # Local Variables: # mode: sh ==== //depot/projects/dtrace/src/contrib/bind9/lib/dns/opensslrsa_link.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -17,7 +17,7 @@ /* * Principal Author: Brian Wellington - * $Id: opensslrsa_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $ + * $Id: opensslrsa_link.c,v 1.1.4.1.10.5 2006/10/11 03:58:50 marka Exp $ */ #ifdef OPENSSL @@ -39,7 +39,23 @@ #include #include #include +#if OPENSSL_VERSION_NUMBER > 0x00908000L +#include +#endif + +/* + * We don't use configure for windows so enforce the OpenSSL version + * here. Unlike with configure we don't support overriding this test. + */ +#ifdef WIN32 +#if !((OPENSSL_VERSION_NUMBER >= 0x009070cfL && \ + OPENSSL_VERSION_NUMBER < 0x009080000L) || \ + OPENSSL_VERSION_NUMBER >= 0x0090804fL) +#error Please upgrade OpenSSL to 0.9.8d/0.9.7l or greater. +#endif +#endif + /* * XXXMPA Temporarially disable RSA_BLINDING as it requires * good quality random data that cannot currently be guarenteed. @@ -260,13 +276,47 @@ static isc_result_t opensslrsa_generate(dst_key_t *key, int exp) { +#if OPENSSL_VERSION_NUMBER > 0x00908000L + BN_GENCB cb; + RSA *rsa = RSA_new(); + BIGNUM *e = BN_new(); + + if (rsa == NULL || e == NULL) + goto err; + + if (exp == 0) { + /* RSA_F4 0x10001 */ + BN_set_bit(e, 0); + BN_set_bit(e, 16); + } else { + /* F5 0x100000001 */ + BN_set_bit(e, 0); + BN_set_bit(e, 32); + } + + BN_GENCB_set_old(&cb, NULL, NULL); + + if (RSA_generate_key_ex(rsa, key->key_size, e, &cb)) { + BN_free(e); + SET_FLAGS(rsa); + key->opaque = rsa; + return (ISC_R_SUCCESS); + } + + err: + if (e != NULL) + BN_free(e); + if (rsa != NULL) + RSA_free(rsa); + return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); +#else RSA *rsa; unsigned long e; if (exp == 0) - e = RSA_3; + e = RSA_F4; else - e = RSA_F4; + e = 0x40000003; rsa = RSA_generate_key(key->key_size, e, NULL, NULL); if (rsa == NULL) return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); @@ -274,6 +324,7 @@ key->opaque = rsa; return (ISC_R_SUCCESS); +#endif } static isc_boolean_t ==== //depot/projects/dtrace/src/contrib/bind9/lib/dns/resolver.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.218.2.18.4.56.4.1 2006/08/17 07:12:31 marka Exp $ */ +/* $Id: resolver.c,v 1.218.2.18.4.56.4.2 2006/10/04 07:06:02 marka Exp $ */ #include ==== //depot/projects/dtrace/src/contrib/bind9/version#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: version,v 1.26.2.17.2.21.4.1 2006/08/17 07:12:31 marka Exp $ +# $Id: version,v 1.26.2.17.2.21.4.2 2006/10/04 07:00:13 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -7,4 +7,4 @@ MINORVER=3 PATCHVER=2 RELEASETYPE=-P -RELEASEVER=1 +RELEASEVER=2 ==== //depot/projects/dtrace/src/lib/libc/net/gethostbyname.3#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)gethostbyname.3 8.4 (Berkeley) 5/25/95 -.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.36 2006/09/17 21:27:33 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.37 2006/11/04 09:42:22 lawrance Exp $ .\" .Dd May 12, 2006 .Dt GETHOSTBYNAME 3 @@ -49,7 +49,7 @@ .Lb libc .Sh SYNOPSIS .In netdb.h -.Vt extern int h_errno ; +.Vt int h_errno ; .Ft struct hostent * .Fn gethostbyname "const char *name" .Ft struct hostent * @@ -261,7 +261,7 @@ is indicated by return of a .Dv NULL pointer. -The external integer +The integer .Va h_errno may then be checked to see whether this is a temporary failure or an invalid or unknown host. ==== //depot/projects/dtrace/src/lib/libc/net/resolver.3#5 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)resolver.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.31 2006/07/17 09:27:26 stefanf Exp $ +.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.32 2006/11/04 09:42:22 lawrance Exp $ .\" -.Dd June 4, 1993 +.Dd November 4, 2006 .Dt RESOLVER 3 .Os .Sh NAME @@ -410,6 +410,20 @@ .Fn res_init function will return 0 on success, or \-1 in a threaded program if per-thread storage could not be allocated. +.Pp +The +.Fn res_mkquery , +.Fn res_search , +and +.Fn res_query +functions return the size of the response on success, or \-1 if an +error occurs. +The integer +.Vt h_errno +may be checked to determine the reason for error. +See +.Xr gethostbyname 3 +for more information. .Sh FILES .Bl -tag -width /etc/resolv.conf .It Pa /etc/resolv.conf ==== //depot/projects/dtrace/src/lib/libc/sys/clock_gettime.2#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.22 2006/09/17 21:27:34 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.23 2006/11/04 09:35:36 danger Exp $ .\" -.Dd November 18, 2005 +.Dd November 4, 2006 .Dt CLOCK_GETTIME 2 .Os .Sh NAME @@ -44,7 +44,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/time.h +.In time.h .Ft int .Fn clock_gettime "clockid_t clock_id" "struct timespec *tp" .Ft int @@ -82,7 +82,7 @@ The structure pointed to by .Fa tp is defined in -.In sys/time.h +.In sys/timespec.h as: .Pp .Bd -literal ==== //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#23 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.981 2006/10/21 14:06:34 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.982 2006/11/04 02:01:52 bmah Exp $ 2000 @@ -619,7 +619,7 @@ architectures such as sparc64. &merged; The &man.em.4; driver has been updated to - version 6.1.4 from Intel. Among other changes, it now supports + version 6.2.9 from Intel. Among other changes, it now supports 80003, 82571, 82571EB and 82572 based adapters, as well as onboard-NICs on ICH8-based motherboards. &merged; ==== //depot/projects/dtrace/src/share/man/man3/pthread_cond_init.3#5 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread_cond_init.3,v 1.16 2006/09/30 11:22:25 ru Exp $ +.\" $FreeBSD: src/share/man/man3/pthread_cond_init.3,v 1.17 2006/11/04 10:08:16 trhodes Exp $ .\" -.Dd July 28, 1998 +.Dd November 4, 2006 .Dt PTHREAD_COND_INIT 3 .Os .Sh NAME @@ -71,6 +71,7 @@ variable. .El .Sh SEE ALSO +.Xr pthread_condattr 3 , .Xr pthread_cond_broadcast 3 , .Xr pthread_cond_destroy 3 , .Xr pthread_cond_signal 3 , ==== //depot/projects/dtrace/src/share/man/man3/pthread_create.3#6 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread_create.3,v 1.22 2006/11/01 04:46:06 maxim Exp $ +.\" $FreeBSD: src/share/man/man3/pthread_create.3,v 1.23 2006/11/04 10:08:16 trhodes Exp $ .\" -.Dd November 1, 2006 +.Dd November 4, 2006 .Dt PTHREAD_CREATE 3 .Os .Sh NAME @@ -118,6 +118,7 @@ .El .Sh SEE ALSO .Xr fork 2 , +.Xr pthread_attr 3 , .Xr pthread_cleanup_pop 3 , .Xr pthread_cleanup_push 3 , .Xr pthread_exit 3 , ==== //depot/projects/dtrace/src/share/man/man3/pthread_mutex_init.3#5 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread_mutex_init.3,v 1.16 2006/09/30 11:22:25 ru Exp $ +.\" $FreeBSD: src/share/man/man3/pthread_mutex_init.3,v 1.17 2006/11/04 10:08:16 trhodes Exp $ .\" -.Dd July 29, 1998 +.Dd November 4, 2006 .Dt PTHREAD_MUTEX_INIT 3 .Os .Sh NAME @@ -67,6 +67,7 @@ The process cannot allocate enough memory to create another mutex. .El .Sh SEE ALSO +.Xr pthread_mutexattr 3 , .Xr pthread_mutex_destroy 3 , .Xr pthread_mutex_lock 3 , .Xr pthread_mutex_trylock 3 , ==== //depot/projects/dtrace/src/share/man/man9/VOP_REMOVE.9#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_REMOVE.9,v 1.14 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_REMOVE.9,v 1.15 2006/11/04 23:58:15 pjd Exp $ .\" .Dd July 24, 1996 .Os @@ -80,16 +80,6 @@ */ ...; - /* - * Careful about trying to remove ".". XXX this should be handled - * higher up. - */ - if (dvp == vp) - vrele(vp); - else - vput(vp); - vput(dvp); - return error; } .Ed ==== //depot/projects/dtrace/src/share/man/man9/VOP_RENAME.9#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_RENAME.9,v 1.21 2005/01/28 10:43:05 ru Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_RENAME.9,v 1.22 2006/11/04 23:59:51 pjd Exp $ .\" .Dd July 24, 1996 .Os @@ -104,34 +104,13 @@ } /* - * Check if just deleting a link name. + * POSIX: "If the old argument and the new argument + * both refer to links to the same existing file, + * the rename() function shall return successfully + * and perform no other action." + * The upper layers already handle this case. */ - if (fvp == tvp) { - if (fvp->v_type == VDIR) { - error = EINVAL; - goto abortit; - } - - /* - * Release destination. - */ - vput(tdvp); - vput(tvp); - - /* - * Delete source. Pretty bizarre stuff. - */ - vrele(fdvp); - vrele(fvp); - fcnp->cn_flags &= ~MODMASK; - fcnp->cn_flags |= LOCKPARENT | LOCKLEAF; - fcnp->cn_nameiop = DELETE; - VREF(fdvp); - error = relookup(fdvp, &fvp, fcnp); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Nov 6 06:52:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9118216A415; Mon, 6 Nov 2006 06:52:49 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 51B5716A407 for ; Mon, 6 Nov 2006 06:52:49 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04B9543D58 for ; Mon, 6 Nov 2006 06:52:49 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA66qmQ8016132 for ; Mon, 6 Nov 2006 06:52:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA66qmaQ016129 for perforce@freebsd.org; Mon, 6 Nov 2006 06:52:48 GMT (envelope-from jb@freebsd.org) Date: Mon, 6 Nov 2006 06:52:48 GMT Message-Id: <200611060652.kA66qmaQ016129@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109343 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 06:52:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=109343 Change 109343 by jb@jb_freebsd8 on 2006/11/06 06:52:06 Link to the extra intl library. Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/gdb/gdb/Makefile#2 edit Differences ... ==== //depot/projects/binutils/src/gnu/usr.bin/gdb/gdb/Makefile#2 (text+ko) ==== @@ -4,7 +4,7 @@ SRCS= gdb.c BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ - ${OBJ_BU}/libiberty/libiberty.a + ${OBJ_BU}/libiberty/libiberty.a ${OBJ_BU}/libintl/libintl.a GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a # libthread_db.so calls back into gdb for the proc services. Make all the From owner-p4-projects@FreeBSD.ORG Mon Nov 6 08:23:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B49616A47E; Mon, 6 Nov 2006 08:23:45 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0E75916A403 for ; Mon, 6 Nov 2006 08:23:45 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDC3743D67 for ; Mon, 6 Nov 2006 08:23:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA68Nhet032528 for ; Mon, 6 Nov 2006 08:23:43 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA68NhoP032520 for perforce@freebsd.org; Mon, 6 Nov 2006 08:23:43 GMT (envelope-from imp@freebsd.org) Date: Mon, 6 Nov 2006 08:23:43 GMT Message-Id: <200611060823.kA68NhoP032520@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109346 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 08:23:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=109346 Change 109346 by imp@imp_lighthouse on 2006/11/06 08:23:26 Take a page from NetBSD and introduce MACHINE_CPU. This is the CPU family derived from the MACHINE_ARCH. MACHINE_ARCH necessarily includes endian information, because arm big endian and arm little endian binaries are different. mips64 and mips binaries are different, so MACHINE_ARCH might be "mips64el" and MACHINE_CPU would be plain old "mips". Basically, any family of cpus that one set of source files can support. Initially, this will be arm (little endian) and armeb (big endian) both mapping to arm for this. Likewise with mipsel and mipseb both mapping to mips (this is a favor for the mips branch). Affected files ... .. //depot/projects/arm/src/share/mk/bsd.own.mk#6 edit Differences ... ==== //depot/projects/arm/src/share/mk/bsd.own.mk#6 (text+ko) ==== @@ -109,6 +109,11 @@ .include "${SRCCONF}" .endif +# +# CPU model, derived from MACHINE_ARCH +# +MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:S/armeb/arm/} + # Binaries BINOWN?= root BINGRP?= wheel From owner-p4-projects@FreeBSD.ORG Mon Nov 6 08:30:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A30C16A492; Mon, 6 Nov 2006 08:30:53 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5F5BF16A415 for ; Mon, 6 Nov 2006 08:30:53 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9F8B43D80 for ; Mon, 6 Nov 2006 08:30:52 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA68Uqsn033201 for ; Mon, 6 Nov 2006 08:30:52 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA68UqS8033198 for perforce@freebsd.org; Mon, 6 Nov 2006 08:30:52 GMT (envelope-from imp@freebsd.org) Date: Mon, 6 Nov 2006 08:30:52 GMT Message-Id: <200611060830.kA68UqS8033198@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109347 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 08:30:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=109347 Change 109347 by imp@imp_lighthouse on 2006/11/06 08:30:32 Use the new MACHINE_CPU instead of MACHINE_ARCH as the basis for TARGET_ARCH. I'm unsure if the amd64 -> x86_64 translation should happen like it does in this file, or if that's another case for substitution in bsd.own.mk. I kinda think this is the right place, since it is a gnuism and the rest of the tree is setup so that amd64 is the right thing to do. The binultils infrastructure wants 'TARGET_BIG_ENDIAN' defined when we're building big endian architectures for those CPUs that can support many different byte sexes. Since I'm uneasy about doing a regular expression match against "*eb" I have listed the two cases where we have multi-endian architectures (mips and arm). powerpc may also be one, and some that NetBSD supports that FreeBSD does not. Note: armeb support isn't there yet, and I believe this will not break the present TARGET=arm TARGET_ARCH=arm TARGET_BIG_ENDIAN=t way of building for xscale based big endian boards. Affected files ... .. //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc0#2 edit Differences ... ==== //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc0#2 (text+ko) ==== @@ -6,13 +6,16 @@ VERSION= "2.15 [FreeBSD] 2004-05-23" -TARGET_ARCH?= ${MACHINE_ARCH} +TARGET_ARCH?= ${MACHINE_CPU} .if ${TARGET_ARCH} == "amd64" BINUTILS_ARCH=x86_64 .else BINUTILS_ARCH=${TARGET_ARCH} .endif TARGET_TUPLE?= ${BINUTILS_ARCH}-obrien-freebsd +.if ${MACHINE_ARCH} == "armeb" || ${MACHINE_ARCH} == "mipseb" +TARGET_BIG_ENDIAN=t +.endif # RELTOP is the relative path to this point in the source or object # tree, from any subdirectory of same. It gets extra "../" prefixes From owner-p4-projects@FreeBSD.ORG Mon Nov 6 08:41:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E683316A412; Mon, 6 Nov 2006 08:41:06 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 A971216A47C for ; Mon, 6 Nov 2006 08:41:06 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D21243D64 for ; Mon, 6 Nov 2006 08:41:06 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA68f6se035260 for ; Mon, 6 Nov 2006 08:41:06 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA68f5Yf035257 for perforce@freebsd.org; Mon, 6 Nov 2006 08:41:05 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 6 Nov 2006 08:41:05 GMT Message-Id: <200611060841.kA68f5Yf035257@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 109348 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 08:41:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=109348 Change 109348 by rdivacky@rdivacky_witten on 2006/11/06 08:40:19 Dont print the hostname argument in sethostname. We would have to copyin the string etc. which is too much work for not so interesting syscall. Noticed by: "Scot Hetzel" Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#28 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#28 (text+ko) ==== @@ -1543,7 +1543,7 @@ #ifdef DEBUG if (ldebug(sethostname)) - printf(ARGS(sethostname, "%s, %i"), args->hostname, args->len); + printf(ARGS(sethostname, "*, %i"), args->len); #endif name[0] = CTL_KERN; From owner-p4-projects@FreeBSD.ORG Mon Nov 6 08:45:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3760716A4C9; Mon, 6 Nov 2006 08:45:20 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 DDD9C16A4F4 for ; Mon, 6 Nov 2006 08:45:19 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4E1F43D9F for ; Mon, 6 Nov 2006 08:45:11 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA68jBuK036982 for ; Mon, 6 Nov 2006 08:45:11 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA68jBWH036979 for perforce@freebsd.org; Mon, 6 Nov 2006 08:45:11 GMT (envelope-from imp@freebsd.org) Date: Mon, 6 Nov 2006 08:45:11 GMT Message-Id: <200611060845.kA68jBWH036979@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109349 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 08:45:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=109349 Change 109349 by imp@imp_lighthouse on 2006/11/06 08:44:42 I forgot to grep for MACHINE_CPU, and it appears we use it for something else. Use MACHINE_CPU_ARCH instead. Affected files ... .. //depot/projects/arm/src/share/mk/bsd.own.mk#7 edit Differences ... ==== //depot/projects/arm/src/share/mk/bsd.own.mk#7 (text+ko) ==== @@ -112,7 +112,7 @@ # # CPU model, derived from MACHINE_ARCH # -MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:S/armeb/arm/} +MACHINE_CPU_ARCH= ${MACHINE_ARCH:C/mipse[bl]/mips/:S/armeb/arm/} # Binaries BINOWN?= root From owner-p4-projects@FreeBSD.ORG Mon Nov 6 15:41:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62C2216A47E; Mon, 6 Nov 2006 15:41:11 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 39DC416A403 for ; Mon, 6 Nov 2006 15:41:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4C3E43D49 for ; Mon, 6 Nov 2006 15:41:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA6Ff8jN030722 for ; Mon, 6 Nov 2006 15:41:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA6Fet9l030684 for perforce@freebsd.org; Mon, 6 Nov 2006 15:40:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Nov 2006 15:40:55 GMT Message-Id: <200611061540.kA6Fet9l030684@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 Cc: Subject: PERFORCE change 109358 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 15:41:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=109358 Change 109358 by rwatson@rwatson_zoo on 2006/11/06 15:40:25 Integrate TrustedBSD base tree from FreeBSD CVS: - BIND 9.3.2-P2 - bsnmp update - gjournal, BIO_FLUSH, VV_DELETED - De-ia64-ize EFI. - CAM_NEW_TRAN_CODE - SCTP - priv(9) - if_em update - kernel console output ordering - m_getm2(), sosend/sendfile optimization Affected files ... .. //depot/projects/trustedbsd/base/Makefile#48 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#16 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.1#15 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.1#15 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.c#20 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/CHANGES#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/query.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/configure.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/resolver.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/version#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/action.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/tree.def#4 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#39 integrate .. //depot/projects/trustedbsd/base/etc/snmpd.config#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/send-pr.sh#11 integrate .. //depot/projects/trustedbsd/base/include/Makefile#56 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbyname.3#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/resolver.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_utrap_gen.S#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/clock_gettime.2#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getpid.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/statfs.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libcam/camlib.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libufs/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/libufs/cgread.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libufs/cgroup.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libufs/libufs.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libufs/libufs.h#7 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#115 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/camcontrol.c#16 integrate .. //depot/projects/trustedbsd/base/sbin/dumpfs/dumpfs.c#18 integrate .. //depot/projects/trustedbsd/base/sbin/dumpon/dumpon.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/Makefile#9 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsck.h#16 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsutil.c#19 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/gjournal.c#1 branch .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/inode.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/main.c#19 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass5.c#19 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/setup.c#25 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.c#15 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.h#8 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/cache/geom_cache.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/journal/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/geom/class/journal/geom_journal.c#1 branch .. //depot/projects/trustedbsd/base/sbin/geom/class/journal/geom_journal.h#1 branch .. //depot/projects/trustedbsd/base/sbin/geom/class/journal/geom_journal_ufs.c#1 branch .. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/geom_mirror.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/gmirror.8#9 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/raid3/geom_raid3.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/raid3/graid3.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/growfs/debug.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifbridge.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#43 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.8#17 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.c#15 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#26 integrate .. //depot/projects/trustedbsd/base/sbin/newfs/mkfs.c#28 integrate .. //depot/projects/trustedbsd/base/sbin/newfs/newfs.8#22 integrate .. //depot/projects/trustedbsd/base/sbin/newfs/newfs.c#21 integrate .. //depot/projects/trustedbsd/base/sbin/newfs/newfs.h#13 integrate .. //depot/projects/trustedbsd/base/sbin/tunefs/tunefs.8#17 integrate .. //depot/projects/trustedbsd/base/sbin/tunefs/tunefs.c#15 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_init.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_create.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutex_init.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/aac.4#13 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_sony.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man5/elf.5#10 integrate .. //depot/projects/trustedbsd/base/share/man/man5/fs.5#10 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_REMOVE.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_RENAME.9#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/disk.9#5 integrate .. //depot/projects/trustedbsd/base/share/man/man9/g_bio.9#4 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#30 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#17 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.sys.mk#17 integrate .. //depot/projects/trustedbsd/base/share/snmp/mibs/FREEBSD-MIB.txt#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/genassym.c#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/io.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/DEFAULTS#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#13 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/elf_trampoline.c#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/genassym.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#11 integrate .. //depot/projects/trustedbsd/base/sys/boot/Makefile#19 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/bootstrap.h#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/devopen.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/load_elf.c#13 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/efi.h#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/efi_nii.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/efiapi.h#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/eficon.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/efidebug.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/efidef.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/efidevp.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/efierr.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/efifs.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/efilib.h#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/efinet.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/efipart.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/efiprot.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/efipxebc.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/efiser.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/efistdarg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/i386/efibind.h#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/i386/pe.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/ia64/efibind.h#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/include/ia64/pe.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/Makefile#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/bootinfo.c#11 delete .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/copy.c#5 delete .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/devicename.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/efiboot.h#6 delete .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/efifpswa.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/efifs.c#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/efinet.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/elf_freebsd.c#12 delete .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/libefi.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/module.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/time.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/boot2/boot2.c#27 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/bioscd.c#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/biosdisk.c#13 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/bootinfo32.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/devicename.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/elf32_freebsd.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/libi386.h#12 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/loader/Makefile#15 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/loader/main.c#12 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/ia64/efi/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/efi/main.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/efi/version#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/acpi_stub.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/bootinfo.c#5 delete .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/copy.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/devicename.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/efi_stub.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/elf_freebsd.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/libski.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/main.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/skifs.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/version#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/common/main.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/libofw.h#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/boot.c#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/biosdisk.c#11 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/loader/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/loader/main.c#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/main.c#17 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_ccb.h#10 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#28 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_all.h#10 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#58 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_low.c#14 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#29 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#29 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#29 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#29 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#29 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#50 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_uid16.c#12 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_fcntl.c#16 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#33 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#79 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#108 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#47 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#76 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.sparc64#14 integrate .. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_cbq.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_rio.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pfsync.c#16 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_command.c#24 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_main.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_cam.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_sony.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/advansys.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/advlib.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/adwcam.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/aha/aha.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/ahb/ahb.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic/aic.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.h#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/amd/amd.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr_cam.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr_disk.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/arcmsr/arcmsr.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/arl/if_arl.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/asr/asr.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#45 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#40 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/buslogic/bt.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/cnw/if_cnw.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/cp/if_cp.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ctau/if_ct.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/cx/if_cx.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dc.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/dcons/dcons_os.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/dpt/dpt_scsi.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drmP.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#61 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.h#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_osdep.h#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/esp/ncr53c9x.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/fdc/fdc.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#54 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_mod.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.h#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_library.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_library.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_sbus.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_stds.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_target.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_target.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_tpublic.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispmbox.h#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispreg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispvar.h#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/ispfw/asm_2300.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/kbd/kbd.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/lmc/if_lmc.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/lmc/if_lmc.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#50 integrate .. //depot/projects/trustedbsd/base/sys/dev/mly/mly.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_raid.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/nmdm/nmdm.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/null/null.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/ofw_console.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#52 integrate .. //depot/projects/trustedbsd/base/sys/dev/random/randomdev.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/sbni/if_sbni.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/sbsh/if_sbsh.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/si/si.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/sym/sym_hipd.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/sysmouse.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/trm/trm.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_osl_cam.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_kbd_sun.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_kbd_sun.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#48 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#57 integrate .. //depot/projects/trustedbsd/base/sys/dev/wl/if_wl.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/zs/zs.c#17 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_rule.c#15 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#47 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vnops.c#26 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#36 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vnops.c#28 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_ioctl.c#13 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_node.c#20 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_smb.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vnops.c#27 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#28 integrate .. //depot/projects/trustedbsd/base/sys/fs/umapfs/umap_vfsops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/geom/concat/g_concat.c#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.c#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom.h#43 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_disk.c#40 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_disk.h#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_gpt.c#27 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#32 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_slice.c#29 integrate .. //depot/projects/trustedbsd/base/sys/geom/journal/g_journal.c#1 branch .. //depot/projects/trustedbsd/base/sys/geom/journal/g_journal.h#1 branch .. //depot/projects/trustedbsd/base/sys/geom/journal/g_journal_ufs.c#1 branch .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#19 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.h#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror_ctl.c#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#19 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.h#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3_ctl.c#10 integrate .. //depot/projects/trustedbsd/base/sys/geom/shsec/g_shsec.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/stripe/g_stripe.c#9 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/reiserfs/reiserfs_fs.h#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#6 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/DEFAULTS#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/genassym.c#26 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/io.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#30 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm86.c#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_misc.c#20 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_socksys.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_sysi86.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#28 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_ipr.c#18 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/DEFAULTS#6 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/genassym.c#20 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#62 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/ssc.c#13 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vfsops.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#61 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#67 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_environment.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#63 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#59 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_jail.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#34 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ntptime.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_priv.c#1 branch .. //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_resource.c#34 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_shutdown.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#35 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thr.c#24 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_time.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_umtx.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_xxx.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_disk.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_firmware.c#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#39 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#60 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#61 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#62 integrate .. //depot/projects/trustedbsd/base/sys/kern/systrace_args.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_ipc.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_msg.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_cons.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_pts.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_pty.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_sem.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#63 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#59 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#54 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#83 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#74 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#61 integrate .. //depot/projects/trustedbsd/base/sys/modules/ath_rate_amrr/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/bge/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/geom/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sys/modules/geom/geom_journal/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/nfe/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/ufs/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.c#46 integrate .. //depot/projects/trustedbsd/base/sys/net/bridgestp.c#10 integrate .. //depot/projects/trustedbsd/base/sys/net/bridgestp.h#2 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#50 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#18 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridgevar.h#7 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gre.c#28 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ppp.c#34 integrate .. //depot/projects/trustedbsd/base/sys/net/if_sl.c#23 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tap.c#31 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tun.c#36 integrate .. //depot/projects/trustedbsd/base/sys/net/ppp_tty.c#16 integrate .. //depot/projects/trustedbsd/base/sys/net/raw_usrreq.c#20 integrate .. //depot/projects/trustedbsd/base/sys/net/rtsock.c#39 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.c#24 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/at_control.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/ddp_pcb.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_usrreq.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#20 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_device.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_socket.c#28 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_tty.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in.c#26 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#45 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_proto.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_carp.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#34 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#55 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_mroute.c#35 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#52 integrate .. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#43 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_asconf.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_asconf.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_auth.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_auth.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_bsd_addr.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_bsd_addr.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_constants.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_crc32.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_crc32.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_header.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_indata.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_indata.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_input.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_input.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_lock_bsd.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_os.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_os_bsd.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_peeloff.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_peeloff.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_structs.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_timer.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_timer.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_uio.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_usrreq.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_var.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#55 integrate .. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#45 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6.c#24 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_pcb.c#31 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_proto.c#17 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_src.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ipsec.c#23 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/sctp6_usrreq.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet6/sctp6_var.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet6/udp6_usrreq.c#30 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_osdep.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netipx/ipx_pcb.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netipx/ipx_usrreq.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_conn.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_mod.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_subr.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_conn.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_subr.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_subr.h#11 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_socket.c#39 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_syscalls.c#25 integrate .. //depot/projects/trustedbsd/base/sys/pc98/cbus/fdc.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/DEFAULTS#6 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#49 integrate .. //depot/projects/trustedbsd/base/sys/pci/ncr.c#19 integrate .. //depot/projects/trustedbsd/base/sys/posix4/p1003_1b.c#12 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/conf/DEFAULTS#4 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/genassym.c#18 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#13 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#6 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#8 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#8 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#7 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_internal.h#9 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_net.c#13 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_priv.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/mac/mac_system.c#7 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.c#23 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_lomac/mac_lomac.c#29 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_partition/mac_partition.c#11 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_portacl/mac_portacl.c#8 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_seeotheruids/mac_seeotheruids.c#9 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_stub/mac_stub.c#16 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/DEFAULTS#4 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/NOTES#19 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/genassym.c#31 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/machdep.c#51 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/include/elf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/include/hypervisor_api.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/include/hypervisorvar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/include/utrap.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/exception.S#2 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/hcall.S#2 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/wbuf.S#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/bio.h#22 integrate .. //depot/projects/trustedbsd/base/sys/sys/cons.h#12 integrate .. //depot/projects/trustedbsd/base/sys/sys/jail.h#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/libkern.h#21 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#51 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#51 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#42 integrate .. //depot/projects/trustedbsd/base/sys/sys/pcpu.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/priv.h#1 branch .. //depot/projects/trustedbsd/base/sys/sys/socket.h#24 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#61 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#61 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#62 integrate .. //depot/projects/trustedbsd/base/sys/sys/systm.h#42 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#64 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_alloc.c#34 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_extern.h#19 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#43 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#55 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#39 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/fs.h#17 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/gjournal.h#1 branch .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extattr.c#30 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_gjournal.c#1 branch .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_inode.c#21 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#30 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#51 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#50 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_mmap.c#36 integrate .. //depot/projects/trustedbsd/base/tools/build/options/WITHOUT_CDDL#1 branch .. //depot/projects/trustedbsd/base/tools/tools/find-sb/mini_ufs.h#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/nanobsd/nanobsd.sh#9 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/README#3 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/bridge/tinybsd.localfiles#2 delete .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/bridge/tinybsd.ports#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/default/tinybsd.localfiles#2 delete .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/default/tinybsd.ports#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/firewall/tinybsd.localfiles#2 delete .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/firewall/tinybsd.ports#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/minimal/tinybsd.localfiles#2 delete .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/minimal/tinybsd.ports#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/vpn/tinybsd.localfiles#2 delete .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/vpn/tinybsd.ports#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/wireless/tinybsd.localfiles#2 delete .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/wireless/tinybsd.ports#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/wrap/tinybsd.localfiles#2 delete .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/wrap/tinybsd.ports#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinybsd/tinybsd#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/getdate.y#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/vmstat/vmstat.8#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidcontrol/hid.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/client.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/bsnmpd/Makefile#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8#6 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile#48 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.336 2006/10/16 22:18:59 jb Exp $ +# $FreeBSD: src/Makefile,v 1.337 2006/11/01 09:05:40 jb Exp $ # # The user-driven targets are: # @@ -240,7 +240,7 @@ MMAKE= ${MMAKEENV} make \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ - -DNO_CPU_CFLAGS -DNO_WERROR + -DNO_CPU_CFLAGS -DNO_WERROR -DNO_CTF make: .PHONY @echo ==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.56 2006/10/21 14:19:52 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.58 2006/11/05 00:39:56 trhodes Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -183,6 +183,17 @@ # 20041109: replaced by em(4) OLD_FILES+=usr/share/man/man4/gx.4.gz OLD_FILES+=usr/share/man/man4/if_gx.4.gz +# 20041017: rune interface removed +OLD_FILES+=usr/include/rune.h +OLD_FILES+=usr/share/man/man3/fgetrune.3.gz +OLD_FILES+=usr/share/man/man3/fputrune.3.gz +OLD_FILES+=usr/share/man/man3/fungetrune.3.gz +OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/mbrune.3.gz +OLD_FILES+=usr/share/man/man3/rune.3.gz +OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz +OLD_FILES+=usr/share/man/man3/sgetrune.3.gz +OLD_FILES+=usr/share/man/man3/sputrune.3.gz # 20040925: bind9 import OLD_FILES+=usr/bin/dnskeygen OLD_FILES+=usr/bin/dnsquery @@ -628,7 +639,9 @@ OLD_FILES+=usr/lib/libpam_ssh_p.a OLD_FILES+=usr/bin/help OLD_FILES+=usr/bin/sccs +.if ${TARGET_ARCH} != "i386" OLD_FILES+=usr/bin/gdbserver +.endif OLD_FILES+=usr/bin/ssh-keysign OLD_FILES+=usr/sbin/gifconfig OLD_FILES+=usr/sbin/prefix ==== //depot/projects/trustedbsd/base/bin/cp/cp.1#15 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.38 2006/10/27 08:26:24 trhodes Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -264,7 +264,7 @@ is a synonym for .Fl RL and works the same unless modified by other flags. -Historical implemenations +Historical implementations of .Fl r differ as they copy special files as normal ==== //depot/projects/trustedbsd/base/bin/rm/rm.1#15 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.40 2006/10/30 03:32:09 delphij Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.41 2006/10/31 02:22:36 delphij Exp $ .\" .Dd October 30, 2006 .Dt RM 1 @@ -88,7 +88,9 @@ Overwrite regular files before deleting them. Files are overwritten three times, first with the byte pattern 0xff, then 0x00, and then 0xff again, before they are deleted. -Files with multiple links will not be overwritten. +Files with multiple links will not be overwritten nor deleted unless +.Fl f +is specified, a warning is generated instead. .Pp Specifying this flag for a read only file will cause .Nm @@ -170,6 +172,12 @@ For example: .Dl rm /home/user/-filename .Dl rm ./-filename +.Pp +When +.Fl P +is specified with +.Fl f +the file will be overwritten and removed even if it has hard links. .Sh COMPATIBILITY The .Nm ==== //depot/projects/trustedbsd/base/bin/rm/rm.c#20 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.57 2006/10/30 03:32:09 delphij Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.58 2006/10/31 02:22:36 delphij Exp $"); #include #include @@ -400,10 +400,10 @@ } if (!S_ISREG(sbp->st_mode)) return (1); - if (sbp->st_nlink > 1) { + if (sbp->st_nlink > 1 && !fflag) { warnx("%s (inode %u): not overwritten due to multiple links", file, sbp->st_ino); - return (1); + return (0); } if ((fd = open(file, O_WRONLY, 0)) == -1) goto err; ==== //depot/projects/trustedbsd/base/contrib/bind9/CHANGES#5 (text+ko) ==== @@ -1,4 +1,19 @@ + --- 9.3.2-P2 released --- + +2090. [port] win32: Visual C++ 2005 command line manifest support. + [RT #16417] + +2089. [security] Raise the minimum safe OpenSSL versions to + OpenSSL 0.9.7l and OpenSSL 0.9.8d. Versions + prior to these have known security flaws which + are (potentially) exploitable in named. [RT #16391] + +2088. [security] Change the default RSA exponent from 3 to 65537. + [RT #16391] + +2083. [port] win32: Visual C++ 2005 support. + --- 9.3.2-P1 released --- 2066. [security] Handle SIG queries gracefully. [RT #16300] ==== //depot/projects/trustedbsd/base/contrib/bind9/bin/named/query.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.198.2.13.4.36.6.1 2006/08/17 07:12:31 marka Exp $ */ +/* $Id: query.c,v 1.198.2.13.4.36.6.2 2006/10/04 07:06:01 marka Exp $ */ #include ==== //depot/projects/trustedbsd/base/contrib/bind9/configure.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2003 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any @@ -18,7 +18,7 @@ esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.294.2.23.2.51 $) +AC_REVISION($Revision: 1.294.2.23.2.51.4.3 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.13) @@ -357,6 +357,7 @@ # # was --with-openssl specified? # +OPENSSL_WARNING= AC_MSG_CHECKING(for OpenSSL library) AC_ARG_WITH(openssl, [ --with-openssl[=PATH] Build with OpenSSL [yes|no|path]. @@ -462,51 +463,38 @@ [AC_MSG_RESULT(assuming it does work on target platform)] ) -# -# OpenSSLDie is new with CERT CS-2002-23. If we see it we have may -# have a patched library otherwise check that we are greater than -# the fixed versions -# - AC_CHECK_FUNC(OpenSSLDie, +AC_ARG_ENABLE(openssl-version-check, +[AC_HELP_STRING([--enable-openssl-version-check], + [Check OpenSSL Version @<:@default=yes@:>@])]) +case "$enable_openssl_version_check" in +yes|'') AC_MSG_CHECKING(OpenSSL library version) AC_TRY_RUN([ #include #include int main() { - if (OPENSSL_VERSION_NUMBER >= 0x0090581fL) + if ((OPENSSL_VERSION_NUMBER >= 0x009070cfL && + OPENSSL_VERSION_NUMBER < 0x009080000L) || + OPENSSL_VERSION_NUMBER >= 0x0090804fL) return (0); printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n", OPENSSL_VERSION_NUMBER); - printf("Require OPENSSL_VERSION_NUMBER 0x0090581f or greater\n\n"); + printf("Require OPENSSL_VERSION_NUMBER 0x009070cf or greater (0.9.7l)\n" + "Require OPENSSL_VERSION_NUMBER 0x0090804f or greater (0.9.8d)\n\n"); return (1); } -], + ], [AC_MSG_RESULT(ok)], [AC_MSG_RESULT(not compatible) - AC_MSG_ERROR(you need OpenSSL 0.9.5a or newer)], + OPENSSL_WARNING=yes + ], [AC_MSG_RESULT(assuming target platform has compatible version)]) - , - AC_MSG_RESULT(did not find fixes for CERT CA-2002-23) - AC_MSG_CHECKING(OpenSSL library version) - AC_TRY_RUN([ -#include -#include -int main() { - if ((OPENSSL_VERSION_NUMBER >= 0x0090605fL && - OPENSSL_VERSION_NUMBER < 0x009070000L) || - OPENSSL_VERSION_NUMBER >= 0x00907003L) - return (0); - printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n", - OPENSSL_VERSION_NUMBER); - printf("Require OPENSSL_VERSION_NUMBER 0x0090605f or greater (0.9.6e)\n" - "Require OPENSSL_VERSION_NUMBER 0x00907003 or greater (0.9.7-beta2)\n\n"); - return (1); -} -], - [AC_MSG_RESULT(ok)], - [AC_MSG_RESULT(not compatible) - AC_MSG_ERROR(you need OpenSSL 0.9.6e/0.9.7-beta2 (or newer): CERT CA-2002-23)], - [AC_MSG_RESULT(assuming target platform has compatible version)])) +;; +no) + AC_MSG_RESULT(Skipped OpenSSL version check) +;; +esac + AC_MSG_CHECKING(for OpenSSL DSA support) if test -f $use_openssl/include/openssl/dsa.h then @@ -2116,6 +2104,30 @@ ) chmod a+x isc-config.sh +if test "X$OPENSSL_WARNING" != "X"; then +cat << \EOF +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +WARNING WARNING +WARNING Your OpenSSL crypto library may be vulnerable to WARNING +WARNING one or more of the the following known security WARNING +WARNING flaws: WARNING +WARNING WARNING +WARNING CAN-2002-0659, CAN-2006-4339, CVE-2006-2937 and WARNING +WARNING CVE-2006-2940. WARNING +WARNING WARNING +WARNING It is recommended that you upgrade to OpenSSL WARNING +WARNING version 0.9.8d/0.9.7l (or greater). WARNING +WARNING WARNING +WARNING You can disable this warning by specifying: WARNING +WARNING WARNING +WARNING --disable-openssl-version-check WARNING +WARNING WARNING +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +EOF +fi + # Tell Emacs to edit this file in shell mode. # Local Variables: # mode: sh ==== //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/opensslrsa_link.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -17,7 +17,7 @@ /* * Principal Author: Brian Wellington - * $Id: opensslrsa_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $ + * $Id: opensslrsa_link.c,v 1.1.4.1.10.5 2006/10/11 03:58:50 marka Exp $ */ #ifdef OPENSSL @@ -39,7 +39,23 @@ #include #include #include +#if OPENSSL_VERSION_NUMBER > 0x00908000L +#include +#endif + +/* + * We don't use configure for windows so enforce the OpenSSL version + * here. Unlike with configure we don't support overriding this test. + */ +#ifdef WIN32 +#if !((OPENSSL_VERSION_NUMBER >= 0x009070cfL && \ + OPENSSL_VERSION_NUMBER < 0x009080000L) || \ + OPENSSL_VERSION_NUMBER >= 0x0090804fL) +#error Please upgrade OpenSSL to 0.9.8d/0.9.7l or greater. +#endif +#endif + /* * XXXMPA Temporarially disable RSA_BLINDING as it requires * good quality random data that cannot currently be guarenteed. @@ -260,13 +276,47 @@ static isc_result_t opensslrsa_generate(dst_key_t *key, int exp) { +#if OPENSSL_VERSION_NUMBER > 0x00908000L + BN_GENCB cb; + RSA *rsa = RSA_new(); + BIGNUM *e = BN_new(); + + if (rsa == NULL || e == NULL) + goto err; + + if (exp == 0) { + /* RSA_F4 0x10001 */ + BN_set_bit(e, 0); + BN_set_bit(e, 16); + } else { + /* F5 0x100000001 */ + BN_set_bit(e, 0); + BN_set_bit(e, 32); + } + + BN_GENCB_set_old(&cb, NULL, NULL); + + if (RSA_generate_key_ex(rsa, key->key_size, e, &cb)) { + BN_free(e); + SET_FLAGS(rsa); + key->opaque = rsa; + return (ISC_R_SUCCESS); + } + + err: + if (e != NULL) + BN_free(e); + if (rsa != NULL) + RSA_free(rsa); + return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); +#else RSA *rsa; unsigned long e; if (exp == 0) - e = RSA_3; + e = RSA_F4; else - e = RSA_F4; + e = 0x40000003; rsa = RSA_generate_key(key->key_size, e, NULL, NULL); if (rsa == NULL) return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); @@ -274,6 +324,7 @@ key->opaque = rsa; return (ISC_R_SUCCESS); +#endif } static isc_boolean_t ==== //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/resolver.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Nov 6 17:00:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 860A816A537; Mon, 6 Nov 2006 17:00:51 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 5D15E16A530 for ; Mon, 6 Nov 2006 17:00:51 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D957643D8B for ; Mon, 6 Nov 2006 16:59:52 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA6Gxq53057291 for ; Mon, 6 Nov 2006 16:59:52 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA6GxnSF057283 for perforce@freebsd.org; Mon, 6 Nov 2006 16:59:49 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 6 Nov 2006 16:59:49 GMT Message-Id: <200611061659.kA6GxnSF057283@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 109362 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 17:00:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=109362 Change 109362 by rdivacky@rdivacky_witten on 2006/11/06 16:59:29 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/io.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/boot/common/load_elf.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/efi/include/efilib.h#3 integrate .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/bootinfo.c#2 delete .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/copy.c#2 delete .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/devicename.c#3 delete .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/efiboot.h#3 delete .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/efifpswa.c#2 delete .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/efifs.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/elf_freebsd.c#2 delete .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/libefi.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/module.c#2 delete .. //depot/projects/linuxolator/src/sys/boot/efi/libefi/time.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/boot2/boot2.c#4 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/elf32_freebsd.c#4 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/efi/main.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/efi/version#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/bootinfo.c#2 delete .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/copy.c#2 delete .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/devicename.c#3 delete .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/elf_freebsd.c#2 delete .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/libski.h#3 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/main.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/skifs.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/ia64/ski/version#2 integrate .. //depot/projects/linuxolator/src/sys/boot/pc98/boot2/boot.c#3 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#29 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#9 integrate .. //depot/projects/linuxolator/src/sys/conf/files#9 integrate .. //depot/projects/linuxolator/src/sys/conf/options#6 integrate .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_command.c#4 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_main.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/arl/if_arl.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/asr/asr.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/null/null.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/si/si.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/zs/zs.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs_ioctl.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/smbfs/smbfs_smb.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/linuxolator/src/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/io.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/vm86.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#11 integrate .. //depot/projects/linuxolator/src/sys/i4b/driver/i4b_ipr.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/linuxolator/src/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/init_sysent.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_acct.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_environment.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_fork.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_jail.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_linker.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_ntptime.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_priv.c#1 branch .. //depot/projects/linuxolator/src/sys/kern/kern_prot.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_resource.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_thr.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_time.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_umtx.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_prf.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/syscalls.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/syscalls.master#6 integrate .. //depot/projects/linuxolator/src/sys/kern/systrace_args.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_ipc.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_msg.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/tty.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/tty_cons.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/tty_pts.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/tty_pty.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/modules/ath_rate_amrr/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/modules/bge/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/nfe/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/net/bpf.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/bridgestp.c#4 integrate .. //depot/projects/linuxolator/src/sys/net/if.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridge.c#6 integrate .. //depot/projects/linuxolator/src/sys/net/if_gre.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_ppp.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_sl.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_tap.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_tun.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/ppp_tty.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/rtsock.c#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/linuxolator/src/sys/netatalk/at_control.c#2 integrate .. //depot/projects/linuxolator/src/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/linuxolator/src/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/in.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_proto.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_output.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_asconf.c#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_asconf.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_auth.c#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_auth.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_bsd_addr.c#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_bsd_addr.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_constants.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_crc32.c#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_crc32.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_header.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_indata.c#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_indata.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_input.c#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_input.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_lock_bsd.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_os.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_os_bsd.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_output.c#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_output.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.c#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_peeloff.c#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_peeloff.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_structs.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_timer.c#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_timer.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_uio.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_usrreq.c#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctp_var.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctputil.c#1 branch .. //depot/projects/linuxolator/src/sys/netinet/sctputil.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/sctp6_usrreq.c#1 branch .. //depot/projects/linuxolator/src/sys/netinet6/sctp6_var.h#1 branch .. //depot/projects/linuxolator/src/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/linuxolator/src/sys/netipsec/ipsec_osdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/netipx/ipx_pcb.c#2 integrate .. //depot/projects/linuxolator/src/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/linuxolator/src/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/linuxolator/src/sys/netncp/ncp_mod.c#2 integrate .. //depot/projects/linuxolator/src/sys/netncp/ncp_subr.h#2 integrate .. //depot/projects/linuxolator/src/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/linuxolator/src/sys/netsmb/smb_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/netsmb/smb_subr.h#2 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/linuxolator/src/sys/pc98/cbus/fdc.c#2 integrate .. //depot/projects/linuxolator/src/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/linuxolator/src/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/conf/DEFAULTS#3 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_internal.h#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_net.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_priv.c#1 branch .. //depot/projects/linuxolator/src/sys/security/mac/mac_system.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/DEFAULTS#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/elf.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/hypervisor_api.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/utrap.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/exception.S#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/wbuf.S#2 integrate .. //depot/projects/linuxolator/src/sys/sys/jail.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/libkern.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/mac_policy.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/mbuf.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/priv.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/socket.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.h#6 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.mk#6 integrate .. //depot/projects/linuxolator/src/sys/sys/sysproto.h#6 integrate .. //depot/projects/linuxolator/src/sys/sys/systm.h#4 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_quota.c#4 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/linuxolator/src/sys/vm/swap_pager.c#4 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_mmap.c#3 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/io.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.1 2004/08/01 11:40:50 markm Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.2 2006/11/06 13:41:49 rwatson Exp $"); #include #include @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -54,7 +55,7 @@ { int error; - error = suser(td); + error = priv_check(td, PRIV_IO); if (error != 0) return (error); error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/linuxolator/src/sys/amd64/conf/DEFAULTS#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.7 2006/10/26 22:05:24 jb Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.9 2006/11/04 23:50:11 jb Exp $ machine amd64 ==== //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#3 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.11 2006/10/20 07:04:56 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.12 2006/11/03 07:39:37 imp Exp $"); #include #include @@ -195,7 +195,6 @@ ate_get_mac(sc, eaddr); ate_set_mac(sc, eaddr); - sc->ifp = ifp = if_alloc(IFT_ETHER); if (mii_phy_probe(dev, &sc->miibus, ate_ifmedia_upd, ate_ifmedia_sts)) { device_printf(dev, "Cannot find my PHY.\n"); @@ -271,10 +270,12 @@ * For the last buffer, set the wrap bit so the controller * restarts from the first descriptor. */ + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); if (i == ATE_MAX_RX_BUFFERS - 1) sc->rx_descs[i].addr = segs[0].ds_addr | ETH_WRAP_BIT; else sc->rx_descs[i].addr = segs[0].ds_addr; + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_POSTWRITE); sc->rx_descs[i].status = 0; /* Flush the memory in the mbuf */ bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREREAD); @@ -489,11 +490,30 @@ } static void +ate_stat_update(struct ate_softc *sc, int active) +{ + /* + * The speed and full/half-duplex state needs to be reflected + * in the ETH_CFG register. + */ + if (IFM_SUBTYPE(active) == IFM_10_T) + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_SPD); + else + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_SPD); + if (active & IFM_FDX) + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_FD); + else + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_FD); +} + +static void ate_tick(void *xsc) { struct ate_softc *sc = xsc; + struct ifnet *ifp = sc->ifp; struct mii_data *mii; int active; + uint32_t c; /* * The KB920x boot loader tests ETH_SR & ETH_SR_LINK and will ask @@ -506,25 +526,8 @@ active = mii->mii_media_active; mii_tick(mii); if (mii->mii_media_status & IFM_ACTIVE && - active != mii->mii_media_active) { - /* - * The speed and full/half-duplex state needs - * to be reflected in the ETH_CFG register, it - * seems. - */ - if (IFM_SUBTYPE(mii->mii_media_active) == IFM_10_T) - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & - ~ETH_CFG_SPD); - else - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | - ETH_CFG_SPD); - if (mii->mii_media_active & IFM_FDX) - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | - ETH_CFG_FD); - else - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & - ~ETH_CFG_FD); - } + active != mii->mii_media_active) + ate_stat_update(sc, mii->mii_media_active); } /* @@ -535,16 +538,25 @@ * the dot3Stats mib, so for those we just count them as general * errors. Stats for iframes, ibutes, oframes and obytes are * collected elsewhere. These registers zero on a read to prevent - * races. + * races. For all the collision stats, also update the collision + * stats for the interface. */ sc->mibdata.dot3StatsAlignmentErrors += RD4(sc, ETH_ALE); sc->mibdata.dot3StatsFCSErrors += RD4(sc, ETH_SEQE); - sc->mibdata.dot3StatsSingleCollisionFrames += RD4(sc, ETH_SCOL); - sc->mibdata.dot3StatsMultipleCollisionFrames += RD4(sc, ETH_MCOL); + c = RD4(sc, ETH_SCOL); + ifp->if_collisions += c; + sc->mibdata.dot3StatsSingleCollisionFrames += c; + c = RD4(sc, ETH_MCOL); + sc->mibdata.dot3StatsMultipleCollisionFrames += c; + ifp->if_collisions += c; sc->mibdata.dot3StatsSQETestErrors += RD4(sc, ETH_SQEE); sc->mibdata.dot3StatsDeferredTransmissions += RD4(sc, ETH_DTE); - sc->mibdata.dot3StatsLateCollisions += RD4(sc, ETH_LCOL); - sc->mibdata.dot3StatsExcessiveCollisions += RD4(sc, ETH_ECOL); + c = RD4(sc, ETH_LCOL); + sc->mibdata.dot3StatsLateCollisions += c; + ifp->if_collisions += c; + c = RD4(sc, ETH_ECOL); + sc->mibdata.dot3StatsExcessiveCollisions += c; + ifp->if_collisions += c; sc->mibdata.dot3StatsCarrierSenseErrors += RD4(sc, ETH_CSE); sc->mibdata.dot3StatsFrameTooLongs += RD4(sc, ETH_ELR); sc->mibdata.dot3StatsInternalMacReceiveErrors += RD4(sc, ETH_DRFC); @@ -552,7 +564,7 @@ * not sure where to lump these, so count them against the errors * for the interface. */ - sc->ifp->if_oerrors += RD4(sc, ETH_CSE) + RD4(sc, ETH_TUE); + sc->ifp->if_oerrors += RD4(sc, ETH_TUE); sc->ifp->if_ierrors += RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) + RD4(sc, ETH_USF); @@ -577,9 +589,9 @@ uint32_t low, high; /* - * The KB920x loaders will setup the MAC with an address, if one - * is set in the loader. The TSC loader will also set the MAC address - * in a similar way. Grab the MAC address from the SA1[HL] registers. + * The boot loader setup the MAC with an address, if one is set in + * the loader. The TSC loader will also set the MAC address in a + * similar way. Grab the MAC address from the SA1[HL] registers. */ low = RD4(sc, ETH_SA1L); high = RD4(sc, ETH_SA1H); @@ -595,6 +607,7 @@ ate_intr(void *xsc) { struct ate_softc *sc = xsc; + struct ifnet *ifp = sc->ifp; int status; int i; void *bp; @@ -614,15 +627,18 @@ rx_stat = sc->rx_descs[i].status; if ((rx_stat & ETH_LEN_MASK) == 0) { printf("ignoring bogus 0 len packet\n"); + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, + BUS_DMASYNC_PREWRITE); sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, - BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_POSTWRITE); continue; } /* Flush memory for mbuf so we don't get stale bytes */ bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_POSTREAD); - WR4(sc, ETH_RSR, RD4(sc, ETH_RSR)); // XXX WHY? XXX imp + WR4(sc, ETH_RSR, RD4(sc, ETH_RSR)); + /* * The length returned by the device includes the * ethernet CRC calculation for the packet, but @@ -630,25 +646,37 @@ */ mb = m_devget(sc->rx_buf[i], (rx_stat & ETH_LEN_MASK) - ETHER_CRC_LEN, - ETHER_ALIGN, sc->ifp, NULL); + ETHER_ALIGN, ifp, NULL); + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, + BUS_DMASYNC_PREWRITE); sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, - BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_POSTWRITE); bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREREAD); - if (mb != NULL) - (*sc->ifp->if_input)(sc->ifp, mb); + if (mb != NULL) { + ifp->if_ipackets++; + (*ifp->if_input)(ifp, mb); + } + } } if (status & ETH_ISR_TCOM) { ATE_LOCK(sc); + /* XXX TSR register should be cleared */ if (sc->sent_mbuf[0]) { + bus_dmamap_sync(sc->rxtag, sc->tx_map[0], + BUS_DMASYNC_POSTWRITE); m_freem(sc->sent_mbuf[0]); + ifp->if_opackets++; sc->sent_mbuf[0] = NULL; } if (sc->sent_mbuf[1]) { if (RD4(sc, ETH_TSR) & ETH_TSR_IDLE) { + bus_dmamap_sync(sc->rxtag, sc->tx_map[1], + BUS_DMASYNC_POSTWRITE); m_freem(sc->sent_mbuf[1]); + ifp->if_opackets++; sc->txcur = 0; sc->sent_mbuf[0] = sc->sent_mbuf[1] = NULL; } else { @@ -684,6 +712,7 @@ { struct ate_softc *sc = xsc; struct ifnet *ifp = sc->ifp; + struct mii_data *mii; ATE_ASSERT_LOCKED(sc); @@ -731,6 +760,10 @@ */ ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + + mii = device_get_softc(sc->miibus); + mii_pollstat(mii); + ate_stat_update(sc, mii->mii_media_active); atestart_locked(ifp); callout_reset(&sc->tick_ch, hz, ate_tick, sc); @@ -745,7 +778,7 @@ struct ate_softc *sc = ifp->if_softc; struct mbuf *m, *mdefrag; bus_dma_segment_t segs[1]; - int nseg; + int nseg, e; ATE_ASSERT_LOCKED(sc); if (ifp->if_drv_flags & IFF_DRV_OACTIVE) @@ -767,14 +800,19 @@ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; return; } - mdefrag = m_defrag(m, M_DONTWAIT); - if (mdefrag == NULL) { - IFQ_DRV_PREPEND(&ifp->if_snd, m); - return; + e = bus_dmamap_load_mbuf_sg(sc->mtag, sc->tx_map[sc->txcur], m, + segs, &nseg, 0); + if (e == EFBIG) { + mdefrag = m_defrag(m, M_DONTWAIT); + if (mdefrag == NULL) { + IFQ_DRV_PREPEND(&ifp->if_snd, m); + return; + } + m = mdefrag; + e = bus_dmamap_load_mbuf_sg(sc->mtag, + sc->tx_map[sc->txcur], m, segs, &nseg, 0); } - m = mdefrag; - if (bus_dmamap_load_mbuf_sg(sc->mtag, sc->tx_map[sc->txcur], m, - segs, &nseg, 0) != 0) { + if (e != 0) { m_freem(m); continue; } ==== //depot/projects/linuxolator/src/sys/boot/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.31 2006/10/09 04:43:06 kmacy Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.32 2006/11/05 22:03:02 marcel Exp $ .include @@ -8,7 +8,7 @@ .endif # Build EFI library. -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "ia64" SUBDIR+= efi .endif ==== //depot/projects/linuxolator/src/sys/boot/common/load_elf.c#3 (text+ko) ==== @@ -26,12 +26,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.35 2006/10/29 14:50:57 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.37 2006/11/02 17:52:43 ru Exp $"); #include #include #include #include +#include #include #include #include @@ -263,7 +264,7 @@ #if __ELF_WORD_SIZE == 64 off = - (off & 0xffffffffff000000ull);/* x86_64 relocates after locore */ #else - off = - (off & 0xc0000000u); /* i386 relocates after locore */ + off = - (off & 0xff000000u); /* i386 relocates after locore */ #endif #else off = 0; /* other archs use direct mapped kernels */ @@ -400,9 +401,9 @@ lastaddr += sizeof(size); #ifdef ELF_VERBOSE - printf("\n%s: 0x%lx@0x%lx -> 0x%lx-0x%lx", secname, - shdr[i].sh_size, shdr[i].sh_offset, - lastaddr, lastaddr + shdr[i].sh_size); + printf("\n%s: 0x%jx@0x%jx -> 0x%jx-0x%jx", secname, + (uintmax_t)shdr[i].sh_size, (uintmax_t)shdr[i].sh_offset, + (uintmax_t)lastaddr, (uintmax_t)(lastaddr + shdr[i].sh_size)); #else if (i == symstrindex) printf("+"); ==== //depot/projects/linuxolator/src/sys/boot/efi/include/efilib.h#3 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2000 Doug Rabson + * Copyright (c) 2006 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,24 +24,31 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.5 2006/11/02 02:42:47 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.6 2006/11/05 22:03:02 marcel Exp $ */ -#include +#include extern EFI_HANDLE IH; extern EFI_SYSTEM_TABLE *ST; extern EFI_BOOT_SERVICES *BS; extern EFI_RUNTIME_SERVICES *RS; -/* DIG64 Headless Console & Debug Port Table. */ -#define HCDP_TABLE_GUID \ - {0xf951938d,0x620b,0x42ef,{0x82,0x79,0xa8,0x4b,0x79,0x61,0x78,0x98}} +extern struct devsw efifs_dev; +extern struct fs_ops efifs_fsops; + +extern struct devsw efinet_dev; +extern struct netif_driver efinetif; void *efi_get_table(EFI_GUID *tbl); void efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table); -EFI_PHYSICAL_ADDRESS efimd_va2pa(EFI_VIRTUAL_ADDRESS); +int efi_register_handles(struct devsw *, EFI_HANDLE *, int); +EFI_HANDLE efi_find_handle(struct devsw *, int); +int efi_handle_lookup(EFI_HANDLE, struct devsw **, int *); + +int efi_status_to_errno(EFI_STATUS); +time_t efi_time(EFI_TIME *); EFI_STATUS main(int argc, CHAR16 *argv[]); void exit(EFI_STATUS status); ==== //depot/projects/linuxolator/src/sys/boot/efi/libefi/Makefile#2 (text+ko) ==== @@ -1,27 +1,16 @@ -# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.16 2004/11/28 00:30:22 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.17 2006/11/05 22:03:03 marcel Exp $ -.PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} - LIB= efi INTERNALLIB= -SRCS= bootinfo.c copy.c delay.c devicename.c efi_console.c efifs.c efinet.c \ - elf_freebsd.c libefi.c module.c time.c +SRCS= delay.c efi_console.c efifs.c efinet.c errno.c handles.c libefi.c \ + time.c -.if ${MACHINE_ARCH} == "ia64" -SRCS+= efifpswa.c pal.S -.endif - CFLAGS+= -I${.CURDIR}/../include -CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} +CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH:S/amd64/i386/} CFLAGS+= -I${.CURDIR}/../../../../lib/libstand # Pick up the bootstrap header for some interface items CFLAGS+= -I${.CURDIR}/../../common -# Make the disk code more talkative -.if defined(BOOT_DISK_DEBUG) -CFLAGS+= -DDISK_DEBUG -.endif - .include ==== //depot/projects/linuxolator/src/sys/boot/efi/libefi/efifs.c#3 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2001 Doug Rabson + * Copyright (c) 2006 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,88 +23,100 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.9 2006/11/02 01:23:17 marcel Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.10 2006/11/05 22:03:03 marcel Exp $"); + #include #include #include -#include #include +#include + #include #include -#include "efiboot.h" +#include /* Perform I/O in blocks of size EFI_BLOCK_SIZE. */ #define EFI_BLOCK_SIZE (1024 * 1024) +union fileinfo { + EFI_FILE_INFO info; + char bytes[sizeof(EFI_FILE_INFO) + 508]; +}; + +static EFI_GUID sfs_guid = SIMPLE_FILE_SYSTEM_PROTOCOL; +static EFI_GUID fs_guid = EFI_FILE_SYSTEM_INFO_ID; +static EFI_GUID fi_guid = EFI_FILE_INFO_ID; + static int efifs_open(const char *upath, struct open_file *f) { - struct efi_devdesc *dev = f->f_devdata; - static EFI_GUID sfsid = SIMPLE_FILE_SYSTEM_PROTOCOL; - EFI_FILE_IO_INTERFACE *sfs; - EFI_FILE *root; - EFI_FILE *file; + struct devdesc *dev = f->f_devdata; + EFI_FILE_IO_INTERFACE *fsif; + EFI_FILE *file, *root; + EFI_HANDLE h; EFI_STATUS status; - CHAR16 *cp; - CHAR16 *path; + CHAR16 *cp, *path; + + if (f->f_dev != &efifs_dev || dev->d_unit < 0) + return (EINVAL); - /* - * We cannot blindly assume that f->f_devdata points to a - * efi_devdesc structure. Before we dereference 'dev', make - * sure that the underlying device is ours. - */ - if (f->f_dev != &efifs_dev || dev->d_handle == NULL) - return ENOENT; + h = efi_find_handle(f->f_dev, dev->d_unit); + if (h == NULL) + return (EINVAL); - status = BS->HandleProtocol(dev->d_handle, &sfsid, (VOID **)&sfs); + status = BS->HandleProtocol(h, &sfs_guid, (VOID **)&fsif); if (EFI_ERROR(status)) - return ENOENT; + return (efi_status_to_errno(status)); - /* - * Find the root directory. - */ - status = sfs->OpenVolume(sfs, &root); + /* Get the root directory. */ + status = fsif->OpenVolume(fsif, &root); + if (EFI_ERROR(status)) + return (efi_status_to_errno(status)); - /* - * Convert path to CHAR16, skipping leading separators. - */ while (*upath == '/') upath++; - if (!*upath) { - /* Opening the root directory, */ + + /* Special case: opening the root directory. */ + if (*upath == '\0') { f->f_fsdata = root; - return 0; + return (0); + } + + path = malloc((strlen(upath) + 1) * sizeof(CHAR16)); + if (path == NULL) { + root->Close(root); + return (ENOMEM); } - cp = path = malloc((strlen(upath) + 1) * sizeof(CHAR16)); - if (path == NULL) - return ENOMEM; - while (*upath) { - if (*upath == '/') + + cp = path; + while (*upath != '\0') { + if (*upath == '/') { *cp = '\\'; - else + while (upath[1] == '/') + upath++; + } else *cp = *upath; upath++; cp++; } - *cp++ = 0; + *cp = 0; - /* - * Try to open it. - */ - status = root->Open(root, &file, path, EFI_FILE_MODE_READ, 0); + /* Open the file. */ + status = root->Open(root, &file, path, + EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE, 0); + if (status == EFI_ACCESS_DENIED || status == EFI_WRITE_PROTECTED) + status = root->Open(root, &file, path, EFI_FILE_MODE_READ, 0); free(path); - if (EFI_ERROR(status)) { - root->Close(root); - return ENOENT; - } + root->Close(root); + if (EFI_ERROR(status)) + return (efi_status_to_errno(status)); - root->Close(root); f->f_fsdata = file; - return 0; + return (0); } static int @@ -111,8 +124,12 @@ { EFI_FILE *file = f->f_fsdata; + if (file == NULL) + return (EBADF); + file->Close(file); - return 0; + f->f_fsdata = NULL; + return (0); } static int @@ -123,15 +140,17 @@ UINTN sz = size; char *bufp; + if (file == NULL) + return (EBADF); + bufp = buf; while (size > 0) { sz = size; if (sz > EFI_BLOCK_SIZE) sz = EFI_BLOCK_SIZE; status = file->Read(file, &sz, bufp); - twiddle(); if (EFI_ERROR(status)) - return EIO; + return (efi_status_to_errno(status)); if (sz == 0) break; size -= sz; @@ -139,7 +158,7 @@ } if (resid) *resid = size; - return 0; + return (0); } static int @@ -150,15 +169,17 @@ UINTN sz = size; char *bufp; + if (file == NULL) + return (EBADF); + bufp = buf; while (size > 0) { sz = size; if (sz > EFI_BLOCK_SIZE) sz = EFI_BLOCK_SIZE; status = file->Write(file, &sz, bufp); - twiddle(); if (EFI_ERROR(status)) - return EIO; + return (efi_status_to_errno(status)); if (sz == 0) break; size -= sz; @@ -166,7 +187,7 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Nov 6 19:50:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3BCE16A527; Mon, 6 Nov 2006 19:50:31 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9045E16A522 for ; Mon, 6 Nov 2006 19:50:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 779D143D66 for ; Mon, 6 Nov 2006 19:50:30 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA6JoUgG088386 for ; Mon, 6 Nov 2006 19:50:30 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA6JoUHO088383 for perforce@freebsd.org; Mon, 6 Nov 2006 19:50:30 GMT (envelope-from sam@freebsd.org) Date: Mon, 6 Nov 2006 19:50:30 GMT Message-Id: <200611061950.kA6JoUHO088383@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109371 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 19:50:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=109371 Change 109371 by sam@sam_ebb on 2006/11/06 19:49:43 replace magic constants with symbolic names Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#4 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#4 (text+ko) ==== @@ -134,6 +134,10 @@ #define IXP425_UART_FREQ 14745600 +#define IXP425_UART_IER 0x01 /* interrupt enable register */ +#define IXP425_UART_IER_RTOIE 0x10 /* receiver timeout interrupt enable */ +#define IXP425_UART_IER_UUE 0x40 /* UART Unit enable */ + /*#define IXP4XX_COM_NPORTS 8*/ /* ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#5 (text+ko) ==== @@ -81,8 +81,9 @@ * uart_ns8250 carefully avoids touching these bits so we can * just set them here and proceed. But this is fragile... */ - bus_space_write_4(&ixp425_a4x_bs_tag, device_get_unit(dev) == 0 ? - IXP425_UART0_VBASE : IXP425_UART1_VBASE, REG_IER, 0x50); + bus_space_write_4(&ixp425_a4x_bs_tag, + device_get_unit(dev) == 0 ? IXP425_UART0_VBASE : IXP425_UART1_VBASE, + IXP425_UART_IER, IXP425_UART_IER_UUE | IXP425_UART_IER_RTOIE); return(uart_bus_probe(dev, 0, IXP425_UART_FREQ, 0, 0)); } From owner-p4-projects@FreeBSD.ORG Mon Nov 6 21:22:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B31C16A47E; Mon, 6 Nov 2006 21:22:50 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2F9D716A47B for ; Mon, 6 Nov 2006 21:22:50 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D35B943D8B for ; Mon, 6 Nov 2006 21:22:41 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA6LMfba014727 for ; Mon, 6 Nov 2006 21:22:41 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA6LMWhN014690 for perforce@freebsd.org; Mon, 6 Nov 2006 21:22:32 GMT (envelope-from cognet@freebsd.org) Date: Mon, 6 Nov 2006 21:22:32 GMT Message-Id: <200611062122.kA6LMWhN014690@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 109382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 21:22:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=109382 Change 109382 by cognet@cognet on 2006/11/06 21:22:26 IFC Affected files ... .. //depot/projects/arm/src/ObsoleteFiles.inc#10 integrate .. //depot/projects/arm/src/contrib/bind9/CHANGES#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/configure.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/version#3 integrate .. //depot/projects/arm/src/lib/libc/net/gethostbyname.3#3 integrate .. //depot/projects/arm/src/lib/libc/net/resolver.3#2 integrate .. //depot/projects/arm/src/lib/libc/sys/clock_gettime.2#3 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 integrate .. //depot/projects/arm/src/share/man/man3/pthread_cond_init.3#3 integrate .. //depot/projects/arm/src/share/man/man3/pthread_create.3#4 integrate .. //depot/projects/arm/src/share/man/man3/pthread_mutex_init.3#3 integrate .. //depot/projects/arm/src/share/man/man9/VOP_REMOVE.9#2 integrate .. //depot/projects/arm/src/share/man/man9/VOP_RENAME.9#2 integrate .. //depot/projects/arm/src/share/mk/bsd.sys.mk#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/io.c#2 integrate .. //depot/projects/arm/src/sys/boot/Makefile#7 integrate .. //depot/projects/arm/src/sys/boot/efi/include/efilib.h#3 integrate .. //depot/projects/arm/src/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/efi/libefi/bootinfo.c#4 delete .. //depot/projects/arm/src/sys/boot/efi/libefi/copy.c#2 delete .. //depot/projects/arm/src/sys/boot/efi/libefi/devicename.c#3 delete .. //depot/projects/arm/src/sys/boot/efi/libefi/efiboot.h#3 delete .. //depot/projects/arm/src/sys/boot/efi/libefi/efifpswa.c#2 delete .. //depot/projects/arm/src/sys/boot/efi/libefi/efifs.c#3 integrate .. //depot/projects/arm/src/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/arm/src/sys/boot/efi/libefi/elf_freebsd.c#2 delete .. //depot/projects/arm/src/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/arm/src/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/arm/src/sys/boot/efi/libefi/module.c#2 delete .. //depot/projects/arm/src/sys/boot/efi/libefi/time.c#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/arm/src/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/arm/src/sys/boot/ia64/common/bootinfo.c#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/common/copy.c#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/common/devicename.c#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/common/exec.c#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/arm/src/sys/boot/ia64/efi/Makefile#3 integrate .. //depot/projects/arm/src/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/efi/main.c#3 integrate .. //depot/projects/arm/src/sys/boot/ia64/efi/version#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/ski/Makefile#3 integrate .. //depot/projects/arm/src/sys/boot/ia64/ski/bootinfo.c#4 delete .. //depot/projects/arm/src/sys/boot/ia64/ski/copy.c#2 delete .. //depot/projects/arm/src/sys/boot/ia64/ski/devicename.c#3 delete .. //depot/projects/arm/src/sys/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/ski/elf_freebsd.c#2 delete .. //depot/projects/arm/src/sys/boot/ia64/ski/libski.h#3 integrate .. //depot/projects/arm/src/sys/boot/ia64/ski/main.c#3 integrate .. //depot/projects/arm/src/sys/boot/ia64/ski/skifs.c#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/arm/src/sys/boot/ia64/ski/version#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#17 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_uid16.c#3 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_fcntl.c#4 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_misc.c#8 integrate .. //depot/projects/arm/src/sys/conf/files#52 integrate .. //depot/projects/arm/src/sys/contrib/altq/altq/altq_cbq.c#3 integrate .. //depot/projects/arm/src/sys/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/arm/src/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/arm/src/sys/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/arm/src/sys/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/arm/src/sys/contrib/altq/altq/altq_rio.c#3 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/arm/src/sys/ddb/db_main.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/arm/src/sys/dev/an/if_an.c#6 integrate .. //depot/projects/arm/src/sys/dev/arl/if_arl.c#4 integrate .. //depot/projects/arm/src/sys/dev/asr/asr.c#10 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-cd.c#7 integrate .. //depot/projects/arm/src/sys/dev/ce/if_ce.c#4 integrate .. //depot/projects/arm/src/sys/dev/cnw/if_cnw.c#4 integrate .. //depot/projects/arm/src/sys/dev/cp/if_cp.c#5 integrate .. //depot/projects/arm/src/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/arm/src/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/arm/src/sys/dev/dcons/dcons_os.c#6 integrate .. //depot/projects/arm/src/sys/dev/drm/drmP.h#6 integrate .. //depot/projects/arm/src/sys/dev/fdc/fdc.c#8 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxp.c#12 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_mod.c#11 integrate .. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/arm/src/sys/dev/kbd/kbd.c#4 integrate .. //depot/projects/arm/src/sys/dev/lmc/if_lmc.c#5 integrate .. //depot/projects/arm/src/sys/dev/lmc/if_lmc.h#5 integrate .. //depot/projects/arm/src/sys/dev/nmdm/nmdm.c#4 integrate .. //depot/projects/arm/src/sys/dev/null/null.c#3 integrate .. //depot/projects/arm/src/sys/dev/ofw/ofw_console.c#5 integrate .. //depot/projects/arm/src/sys/dev/random/randomdev.c#3 integrate .. //depot/projects/arm/src/sys/dev/sbni/if_sbni.c#3 integrate .. //depot/projects/arm/src/sys/dev/sbsh/if_sbsh.c#5 integrate .. //depot/projects/arm/src/sys/dev/si/si.c#4 integrate .. //depot/projects/arm/src/sys/dev/syscons/syscons.c#11 integrate .. //depot/projects/arm/src/sys/dev/syscons/sysmouse.c#4 integrate .. //depot/projects/arm/src/sys/dev/wi/if_wi.c#8 integrate .. //depot/projects/arm/src/sys/dev/wl/if_wl.c#4 integrate .. //depot/projects/arm/src/sys/dev/zs/zs.c#4 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_rule.c#6 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#12 integrate .. //depot/projects/arm/src/sys/fs/hpfs/hpfs_vnops.c#7 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_ioctl.c#4 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_node.c#5 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_smb.c#4 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_vnops.c#6 integrate .. //depot/projects/arm/src/sys/fs/udf/udf_vfsops.c#10 integrate .. //depot/projects/arm/src/sys/fs/umapfs/umap_vfsops.c#4 integrate .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/arm/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#3 integrate .. //depot/projects/arm/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#5 integrate .. //depot/projects/arm/src/sys/i386/i386/io.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/sys_machdep.c#6 integrate .. //depot/projects/arm/src/sys/i386/i386/vm86.c#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_misc.c#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_sysi86.c#3 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_machdep.c#10 integrate .. //depot/projects/arm/src/sys/i4b/driver/i4b_ipr.c#3 integrate .. //depot/projects/arm/src/sys/ia64/ia64/ssc.c#6 integrate .. //depot/projects/arm/src/sys/isofs/cd9660/cd9660_vfsops.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_acct.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_descrip.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_environment.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#13 integrate .. //depot/projects/arm/src/sys/kern/kern_jail.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_ktrace.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_linker.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_ntptime.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_priv.c#1 branch .. //depot/projects/arm/src/sys/kern/kern_prot.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_resource.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_sysctl.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_thr.c#12 integrate .. //depot/projects/arm/src/sys/kern/kern_time.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_umtx.c#13 integrate .. //depot/projects/arm/src/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/arm/src/sys/kern/subr_acl_posix1e.c#3 integrate .. //depot/projects/arm/src/sys/kern/subr_firmware.c#6 integrate .. //depot/projects/arm/src/sys/kern/subr_prf.c#8 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#12 integrate .. //depot/projects/arm/src/sys/kern/sysv_ipc.c#2 integrate .. //depot/projects/arm/src/sys/kern/sysv_msg.c#5 integrate .. //depot/projects/arm/src/sys/kern/tty.c#10 integrate .. //depot/projects/arm/src/sys/kern/tty_cons.c#6 integrate .. //depot/projects/arm/src/sys/kern/tty_pts.c#7 integrate .. //depot/projects/arm/src/sys/kern/tty_pty.c#9 integrate .. //depot/projects/arm/src/sys/kern/uipc_mqueue.c#8 integrate .. //depot/projects/arm/src/sys/kern/uipc_sem.c#7 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#22 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#28 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#22 integrate .. //depot/projects/arm/src/sys/kern/vfs_vnops.c#12 integrate .. //depot/projects/arm/src/sys/net/bpf.c#15 integrate .. //depot/projects/arm/src/sys/net/if.c#16 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#26 integrate .. //depot/projects/arm/src/sys/net/if_gre.c#9 integrate .. //depot/projects/arm/src/sys/net/if_ppp.c#8 integrate .. //depot/projects/arm/src/sys/net/if_sl.c#4 integrate .. //depot/projects/arm/src/sys/net/if_tap.c#9 integrate .. //depot/projects/arm/src/sys/net/if_tun.c#8 integrate .. //depot/projects/arm/src/sys/net/ppp_tty.c#4 integrate .. //depot/projects/arm/src/sys/net/raw_usrreq.c#6 integrate .. //depot/projects/arm/src/sys/net/rtsock.c#9 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#13 integrate .. //depot/projects/arm/src/sys/netatalk/at_control.c#3 integrate .. //depot/projects/arm/src/sys/netatalk/ddp_pcb.c#4 integrate .. //depot/projects/arm/src/sys/netatm/atm_usrreq.c#5 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#6 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate .. //depot/projects/arm/src/sys/netgraph/ng_socket.c#9 integrate .. //depot/projects/arm/src/sys/netgraph/ng_tty.c#3 integrate .. //depot/projects/arm/src/sys/netinet/in.c#6 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#14 integrate .. //depot/projects/arm/src/sys/netinet/ip_carp.c#10 integrate .. //depot/projects/arm/src/sys/netinet/ip_divert.c#8 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#23 integrate .. //depot/projects/arm/src/sys/netinet/ip_mroute.c#10 integrate .. //depot/projects/arm/src/sys/netinet/ip_output.c#18 integrate .. //depot/projects/arm/src/sys/netinet/raw_ip.c#10 integrate .. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/arm/src/sys/netinet/sctp_crc32.c#2 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/arm/src/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/arm/src/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/arm/src/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#2 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.h#2 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#15 integrate .. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#15 integrate .. //depot/projects/arm/src/sys/netinet6/in6.c#9 integrate .. //depot/projects/arm/src/sys/netinet6/in6_pcb.c#10 integrate .. //depot/projects/arm/src/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/arm/src/sys/netinet6/ipsec.c#8 integrate .. //depot/projects/arm/src/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/udp6_usrreq.c#10 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec_osdep.h#3 integrate .. //depot/projects/arm/src/sys/netipx/ipx_pcb.c#3 integrate .. //depot/projects/arm/src/sys/netipx/ipx_usrreq.c#5 integrate .. //depot/projects/arm/src/sys/netncp/ncp_conn.c#4 integrate .. //depot/projects/arm/src/sys/netncp/ncp_mod.c#2 integrate .. //depot/projects/arm/src/sys/netncp/ncp_subr.h#2 integrate .. //depot/projects/arm/src/sys/netsmb/smb_conn.c#4 integrate .. //depot/projects/arm/src/sys/netsmb/smb_subr.c#4 integrate .. //depot/projects/arm/src/sys/netsmb/smb_subr.h#2 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_syscalls.c#6 integrate .. //depot/projects/arm/src/sys/pc98/cbus/fdc.c#6 integrate .. //depot/projects/arm/src/sys/posix4/p1003_1b.c#7 integrate .. //depot/projects/arm/src/sys/security/audit/audit.c#12 integrate .. //depot/projects/arm/src/sys/security/audit/audit_arg.c#6 integrate .. //depot/projects/arm/src/sys/security/audit/audit_pipe.c#6 integrate .. //depot/projects/arm/src/sys/security/audit/audit_private.h#8 integrate .. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#7 integrate .. //depot/projects/arm/src/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/arm/src/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/arm/src/sys/security/mac/mac_net.c#5 integrate .. //depot/projects/arm/src/sys/security/mac/mac_priv.c#1 branch .. //depot/projects/arm/src/sys/security/mac/mac_system.c#4 integrate .. //depot/projects/arm/src/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/arm/src/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/arm/src/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/arm/src/sys/security/mac_portacl/mac_portacl.c#4 integrate .. //depot/projects/arm/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/arm/src/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/hvcons.c#4 integrate .. //depot/projects/arm/src/sys/sys/jail.h#3 integrate .. //depot/projects/arm/src/sys/sys/mac_policy.h#10 integrate .. //depot/projects/arm/src/sys/sys/priv.h#1 branch .. //depot/projects/arm/src/sys/sys/systm.h#16 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_alloc.c#6 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#19 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_quota.c#11 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#12 integrate .. //depot/projects/arm/src/sys/vm/swap_pager.c#9 integrate .. //depot/projects/arm/src/sys/vm/vm_mmap.c#7 integrate Differences ... ==== //depot/projects/arm/src/ObsoleteFiles.inc#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.57 2006/10/31 21:05:35 jmg Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.58 2006/11/05 00:39:56 trhodes Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -183,6 +183,17 @@ # 20041109: replaced by em(4) OLD_FILES+=usr/share/man/man4/gx.4.gz OLD_FILES+=usr/share/man/man4/if_gx.4.gz +# 20041017: rune interface removed +OLD_FILES+=usr/include/rune.h +OLD_FILES+=usr/share/man/man3/fgetrune.3.gz +OLD_FILES+=usr/share/man/man3/fputrune.3.gz +OLD_FILES+=usr/share/man/man3/fungetrune.3.gz +OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/mbrune.3.gz +OLD_FILES+=usr/share/man/man3/rune.3.gz +OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz +OLD_FILES+=usr/share/man/man3/sgetrune.3.gz +OLD_FILES+=usr/share/man/man3/sputrune.3.gz # 20040925: bind9 import OLD_FILES+=usr/bin/dnskeygen OLD_FILES+=usr/bin/dnsquery ==== //depot/projects/arm/src/contrib/bind9/CHANGES#3 (text+ko) ==== @@ -1,4 +1,19 @@ + --- 9.3.2-P2 released --- + +2090. [port] win32: Visual C++ 2005 command line manifest support. + [RT #16417] + +2089. [security] Raise the minimum safe OpenSSL versions to + OpenSSL 0.9.7l and OpenSSL 0.9.8d. Versions + prior to these have known security flaws which + are (potentially) exploitable in named. [RT #16391] + +2088. [security] Change the default RSA exponent from 3 to 65537. + [RT #16391] + +2083. [port] win32: Visual C++ 2005 support. + --- 9.3.2-P1 released --- 2066. [security] Handle SIG queries gracefully. [RT #16300] ==== //depot/projects/arm/src/contrib/bind9/bin/named/query.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.198.2.13.4.36.6.1 2006/08/17 07:12:31 marka Exp $ */ +/* $Id: query.c,v 1.198.2.13.4.36.6.2 2006/10/04 07:06:01 marka Exp $ */ #include ==== //depot/projects/arm/src/contrib/bind9/configure.in#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2003 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any @@ -18,7 +18,7 @@ esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.294.2.23.2.51 $) +AC_REVISION($Revision: 1.294.2.23.2.51.4.3 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.13) @@ -357,6 +357,7 @@ # # was --with-openssl specified? # +OPENSSL_WARNING= AC_MSG_CHECKING(for OpenSSL library) AC_ARG_WITH(openssl, [ --with-openssl[=PATH] Build with OpenSSL [yes|no|path]. @@ -462,51 +463,38 @@ [AC_MSG_RESULT(assuming it does work on target platform)] ) -# -# OpenSSLDie is new with CERT CS-2002-23. If we see it we have may -# have a patched library otherwise check that we are greater than -# the fixed versions -# - AC_CHECK_FUNC(OpenSSLDie, +AC_ARG_ENABLE(openssl-version-check, +[AC_HELP_STRING([--enable-openssl-version-check], + [Check OpenSSL Version @<:@default=yes@:>@])]) +case "$enable_openssl_version_check" in +yes|'') AC_MSG_CHECKING(OpenSSL library version) AC_TRY_RUN([ #include #include int main() { - if (OPENSSL_VERSION_NUMBER >= 0x0090581fL) + if ((OPENSSL_VERSION_NUMBER >= 0x009070cfL && + OPENSSL_VERSION_NUMBER < 0x009080000L) || + OPENSSL_VERSION_NUMBER >= 0x0090804fL) return (0); printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n", OPENSSL_VERSION_NUMBER); - printf("Require OPENSSL_VERSION_NUMBER 0x0090581f or greater\n\n"); + printf("Require OPENSSL_VERSION_NUMBER 0x009070cf or greater (0.9.7l)\n" + "Require OPENSSL_VERSION_NUMBER 0x0090804f or greater (0.9.8d)\n\n"); return (1); } -], + ], [AC_MSG_RESULT(ok)], [AC_MSG_RESULT(not compatible) - AC_MSG_ERROR(you need OpenSSL 0.9.5a or newer)], + OPENSSL_WARNING=yes + ], [AC_MSG_RESULT(assuming target platform has compatible version)]) - , - AC_MSG_RESULT(did not find fixes for CERT CA-2002-23) - AC_MSG_CHECKING(OpenSSL library version) - AC_TRY_RUN([ -#include -#include -int main() { - if ((OPENSSL_VERSION_NUMBER >= 0x0090605fL && - OPENSSL_VERSION_NUMBER < 0x009070000L) || - OPENSSL_VERSION_NUMBER >= 0x00907003L) - return (0); - printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n", - OPENSSL_VERSION_NUMBER); - printf("Require OPENSSL_VERSION_NUMBER 0x0090605f or greater (0.9.6e)\n" - "Require OPENSSL_VERSION_NUMBER 0x00907003 or greater (0.9.7-beta2)\n\n"); - return (1); -} -], - [AC_MSG_RESULT(ok)], - [AC_MSG_RESULT(not compatible) - AC_MSG_ERROR(you need OpenSSL 0.9.6e/0.9.7-beta2 (or newer): CERT CA-2002-23)], - [AC_MSG_RESULT(assuming target platform has compatible version)])) +;; +no) + AC_MSG_RESULT(Skipped OpenSSL version check) +;; +esac + AC_MSG_CHECKING(for OpenSSL DSA support) if test -f $use_openssl/include/openssl/dsa.h then @@ -2116,6 +2104,30 @@ ) chmod a+x isc-config.sh +if test "X$OPENSSL_WARNING" != "X"; then +cat << \EOF +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +WARNING WARNING +WARNING Your OpenSSL crypto library may be vulnerable to WARNING +WARNING one or more of the the following known security WARNING +WARNING flaws: WARNING +WARNING WARNING +WARNING CAN-2002-0659, CAN-2006-4339, CVE-2006-2937 and WARNING +WARNING CVE-2006-2940. WARNING +WARNING WARNING +WARNING It is recommended that you upgrade to OpenSSL WARNING +WARNING version 0.9.8d/0.9.7l (or greater). WARNING +WARNING WARNING +WARNING You can disable this warning by specifying: WARNING +WARNING WARNING +WARNING --disable-openssl-version-check WARNING +WARNING WARNING +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +EOF +fi + # Tell Emacs to edit this file in shell mode. # Local Variables: # mode: sh ==== //depot/projects/arm/src/contrib/bind9/lib/dns/opensslrsa_link.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -17,7 +17,7 @@ /* * Principal Author: Brian Wellington - * $Id: opensslrsa_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $ + * $Id: opensslrsa_link.c,v 1.1.4.1.10.5 2006/10/11 03:58:50 marka Exp $ */ #ifdef OPENSSL @@ -39,7 +39,23 @@ #include #include #include +#if OPENSSL_VERSION_NUMBER > 0x00908000L +#include +#endif + +/* + * We don't use configure for windows so enforce the OpenSSL version + * here. Unlike with configure we don't support overriding this test. + */ +#ifdef WIN32 +#if !((OPENSSL_VERSION_NUMBER >= 0x009070cfL && \ + OPENSSL_VERSION_NUMBER < 0x009080000L) || \ + OPENSSL_VERSION_NUMBER >= 0x0090804fL) +#error Please upgrade OpenSSL to 0.9.8d/0.9.7l or greater. +#endif +#endif + /* * XXXMPA Temporarially disable RSA_BLINDING as it requires * good quality random data that cannot currently be guarenteed. @@ -260,13 +276,47 @@ static isc_result_t opensslrsa_generate(dst_key_t *key, int exp) { +#if OPENSSL_VERSION_NUMBER > 0x00908000L + BN_GENCB cb; + RSA *rsa = RSA_new(); + BIGNUM *e = BN_new(); + + if (rsa == NULL || e == NULL) + goto err; + + if (exp == 0) { + /* RSA_F4 0x10001 */ + BN_set_bit(e, 0); + BN_set_bit(e, 16); + } else { + /* F5 0x100000001 */ + BN_set_bit(e, 0); + BN_set_bit(e, 32); + } + + BN_GENCB_set_old(&cb, NULL, NULL); + + if (RSA_generate_key_ex(rsa, key->key_size, e, &cb)) { + BN_free(e); + SET_FLAGS(rsa); + key->opaque = rsa; + return (ISC_R_SUCCESS); + } + + err: + if (e != NULL) + BN_free(e); + if (rsa != NULL) + RSA_free(rsa); + return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); +#else RSA *rsa; unsigned long e; if (exp == 0) - e = RSA_3; + e = RSA_F4; else - e = RSA_F4; + e = 0x40000003; rsa = RSA_generate_key(key->key_size, e, NULL, NULL); if (rsa == NULL) return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); @@ -274,6 +324,7 @@ key->opaque = rsa; return (ISC_R_SUCCESS); +#endif } static isc_boolean_t ==== //depot/projects/arm/src/contrib/bind9/lib/dns/resolver.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.218.2.18.4.56.4.1 2006/08/17 07:12:31 marka Exp $ */ +/* $Id: resolver.c,v 1.218.2.18.4.56.4.2 2006/10/04 07:06:02 marka Exp $ */ #include ==== //depot/projects/arm/src/contrib/bind9/version#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: version,v 1.26.2.17.2.21.4.1 2006/08/17 07:12:31 marka Exp $ +# $Id: version,v 1.26.2.17.2.21.4.2 2006/10/04 07:00:13 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -7,4 +7,4 @@ MINORVER=3 PATCHVER=2 RELEASETYPE=-P -RELEASEVER=1 +RELEASEVER=2 ==== //depot/projects/arm/src/lib/libc/net/gethostbyname.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)gethostbyname.3 8.4 (Berkeley) 5/25/95 -.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.36 2006/09/17 21:27:33 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.37 2006/11/04 09:42:22 lawrance Exp $ .\" .Dd May 12, 2006 .Dt GETHOSTBYNAME 3 @@ -49,7 +49,7 @@ .Lb libc .Sh SYNOPSIS .In netdb.h -.Vt extern int h_errno ; +.Vt int h_errno ; .Ft struct hostent * .Fn gethostbyname "const char *name" .Ft struct hostent * @@ -261,7 +261,7 @@ is indicated by return of a .Dv NULL pointer. -The external integer +The integer .Va h_errno may then be checked to see whether this is a temporary failure or an invalid or unknown host. ==== //depot/projects/arm/src/lib/libc/net/resolver.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)resolver.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.31 2006/07/17 09:27:26 stefanf Exp $ +.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.32 2006/11/04 09:42:22 lawrance Exp $ .\" -.Dd June 4, 1993 +.Dd November 4, 2006 .Dt RESOLVER 3 .Os .Sh NAME @@ -410,6 +410,20 @@ .Fn res_init function will return 0 on success, or \-1 in a threaded program if per-thread storage could not be allocated. +.Pp +The +.Fn res_mkquery , +.Fn res_search , +and +.Fn res_query +functions return the size of the response on success, or \-1 if an +error occurs. +The integer +.Vt h_errno +may be checked to determine the reason for error. +See +.Xr gethostbyname 3 +for more information. .Sh FILES .Bl -tag -width /etc/resolv.conf .It Pa /etc/resolv.conf ==== //depot/projects/arm/src/lib/libc/sys/clock_gettime.2#3 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.22 2006/09/17 21:27:34 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.23 2006/11/04 09:35:36 danger Exp $ .\" -.Dd November 18, 2005 +.Dd November 4, 2006 .Dt CLOCK_GETTIME 2 .Os .Sh NAME @@ -44,7 +44,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/time.h +.In time.h .Ft int .Fn clock_gettime "clockid_t clock_id" "struct timespec *tp" .Ft int @@ -82,7 +82,7 @@ The structure pointed to by .Fa tp is defined in -.In sys/time.h +.In sys/timespec.h as: .Pp .Bd -literal ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.981 2006/10/21 14:06:34 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.982 2006/11/04 02:01:52 bmah Exp $ 2000 @@ -619,7 +619,7 @@ architectures such as sparc64. &merged; The &man.em.4; driver has been updated to - version 6.1.4 from Intel. Among other changes, it now supports + version 6.2.9 from Intel. Among other changes, it now supports 80003, 82571, 82571EB and 82572 based adapters, as well as onboard-NICs on ICH8-based motherboards. &merged; ==== //depot/projects/arm/src/share/man/man3/pthread_cond_init.3#3 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread_cond_init.3,v 1.16 2006/09/30 11:22:25 ru Exp $ +.\" $FreeBSD: src/share/man/man3/pthread_cond_init.3,v 1.17 2006/11/04 10:08:16 trhodes Exp $ .\" -.Dd July 28, 1998 +.Dd November 4, 2006 .Dt PTHREAD_COND_INIT 3 .Os .Sh NAME @@ -71,6 +71,7 @@ variable. .El .Sh SEE ALSO +.Xr pthread_condattr 3 , .Xr pthread_cond_broadcast 3 , .Xr pthread_cond_destroy 3 , .Xr pthread_cond_signal 3 , ==== //depot/projects/arm/src/share/man/man3/pthread_create.3#4 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread_create.3,v 1.22 2006/11/01 04:46:06 maxim Exp $ +.\" $FreeBSD: src/share/man/man3/pthread_create.3,v 1.23 2006/11/04 10:08:16 trhodes Exp $ .\" -.Dd November 1, 2006 +.Dd November 4, 2006 .Dt PTHREAD_CREATE 3 .Os .Sh NAME @@ -118,6 +118,7 @@ .El .Sh SEE ALSO .Xr fork 2 , +.Xr pthread_attr 3 , .Xr pthread_cleanup_pop 3 , .Xr pthread_cleanup_push 3 , .Xr pthread_exit 3 , ==== //depot/projects/arm/src/share/man/man3/pthread_mutex_init.3#3 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/pthread_mutex_init.3,v 1.16 2006/09/30 11:22:25 ru Exp $ +.\" $FreeBSD: src/share/man/man3/pthread_mutex_init.3,v 1.17 2006/11/04 10:08:16 trhodes Exp $ .\" -.Dd July 29, 1998 +.Dd November 4, 2006 .Dt PTHREAD_MUTEX_INIT 3 .Os .Sh NAME @@ -67,6 +67,7 @@ The process cannot allocate enough memory to create another mutex. .El .Sh SEE ALSO +.Xr pthread_mutexattr 3 , .Xr pthread_mutex_destroy 3 , .Xr pthread_mutex_lock 3 , .Xr pthread_mutex_trylock 3 , ==== //depot/projects/arm/src/share/man/man9/VOP_REMOVE.9#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_REMOVE.9,v 1.14 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_REMOVE.9,v 1.15 2006/11/04 23:58:15 pjd Exp $ .\" .Dd July 24, 1996 .Os @@ -80,16 +80,6 @@ */ ...; - /* - * Careful about trying to remove ".". XXX this should be handled - * higher up. - */ - if (dvp == vp) - vrele(vp); - else - vput(vp); - vput(dvp); - return error; } .Ed ==== //depot/projects/arm/src/share/man/man9/VOP_RENAME.9#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_RENAME.9,v 1.21 2005/01/28 10:43:05 ru Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_RENAME.9,v 1.22 2006/11/04 23:59:51 pjd Exp $ .\" .Dd July 24, 1996 .Os @@ -104,34 +104,13 @@ } /* - * Check if just deleting a link name. + * POSIX: "If the old argument and the new argument + * both refer to links to the same existing file, + * the rename() function shall return successfully + * and perform no other action." + * The upper layers already handle this case. */ - if (fvp == tvp) { - if (fvp->v_type == VDIR) { - error = EINVAL; - goto abortit; - } - - /* - * Release destination. - */ - vput(tdvp); - vput(tvp); - - /* - * Delete source. Pretty bizarre stuff. - */ - vrele(fdvp); - vrele(fvp); - fcnp->cn_flags &= ~MODMASK; - fcnp->cn_flags |= LOCKPARENT | LOCKLEAF; - fcnp->cn_nameiop = DELETE; - VREF(fdvp); - error = relookup(fdvp, &fvp, fcnp); - if (error == 0) - vrele(fdvp); - return VOP_REMOVE(fdvp, fvp, fcnp); - } + KASSERT(fvp != tvp, ("vop_rename: source and destination are the same")); if (fvp is immutable) { error = EPERM; ==== //depot/projects/arm/src/share/mk/bsd.sys.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.38 2006/08/11 17:28:59 des Exp $ +# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.39 2006/11/04 04:39:05 jb Exp $ # # This file contains common settings used for building FreeBSD # sources. @@ -67,5 +67,9 @@ . endif .endif +.if defined(IGNORE_PRAGMA) +CWARNFLAGS += -Wno-unknown-pragmas +.endif + # Allow user-specified additional warning flags CFLAGS += ${CWARNFLAGS} ==== //depot/projects/arm/src/sys/amd64/amd64/io.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.1 2004/08/01 11:40:50 markm Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.2 2006/11/06 13:41:49 rwatson Exp $"); #include #include @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -54,7 +55,7 @@ { int error; - error = suser(td); + error = priv_check(td, PRIV_IO); if (error != 0) return (error); error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/arm/src/sys/boot/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.31 2006/10/09 04:43:06 kmacy Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.32 2006/11/05 22:03:02 marcel Exp $ .include @@ -8,7 +8,7 @@ .endif # Build EFI library. -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "ia64" SUBDIR+= efi .endif ==== //depot/projects/arm/src/sys/boot/efi/include/efilib.h#3 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2000 Doug Rabson + * Copyright (c) 2006 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,24 +24,31 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.5 2006/11/02 02:42:47 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.6 2006/11/05 22:03:02 marcel Exp $ */ -#include +#include extern EFI_HANDLE IH; extern EFI_SYSTEM_TABLE *ST; extern EFI_BOOT_SERVICES *BS; extern EFI_RUNTIME_SERVICES *RS; -/* DIG64 Headless Console & Debug Port Table. */ -#define HCDP_TABLE_GUID \ - {0xf951938d,0x620b,0x42ef,{0x82,0x79,0xa8,0x4b,0x79,0x61,0x78,0x98}} +extern struct devsw efifs_dev; +extern struct fs_ops efifs_fsops; + +extern struct devsw efinet_dev; +extern struct netif_driver efinetif; void *efi_get_table(EFI_GUID *tbl); void efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table); -EFI_PHYSICAL_ADDRESS efimd_va2pa(EFI_VIRTUAL_ADDRESS); +int efi_register_handles(struct devsw *, EFI_HANDLE *, int); +EFI_HANDLE efi_find_handle(struct devsw *, int); +int efi_handle_lookup(EFI_HANDLE, struct devsw **, int *); + +int efi_status_to_errno(EFI_STATUS); +time_t efi_time(EFI_TIME *); EFI_STATUS main(int argc, CHAR16 *argv[]); void exit(EFI_STATUS status); ==== //depot/projects/arm/src/sys/boot/efi/libefi/Makefile#2 (text+ko) ==== @@ -1,27 +1,16 @@ -# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.16 2004/11/28 00:30:22 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.17 2006/11/05 22:03:03 marcel Exp $ -.PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} - LIB= efi INTERNALLIB= -SRCS= bootinfo.c copy.c delay.c devicename.c efi_console.c efifs.c efinet.c \ - elf_freebsd.c libefi.c module.c time.c +SRCS= delay.c efi_console.c efifs.c efinet.c errno.c handles.c libefi.c \ + time.c -.if ${MACHINE_ARCH} == "ia64" -SRCS+= efifpswa.c pal.S -.endif - CFLAGS+= -I${.CURDIR}/../include -CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} +CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH:S/amd64/i386/} CFLAGS+= -I${.CURDIR}/../../../../lib/libstand >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Nov 6 21:30:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9193516A47C; Mon, 6 Nov 2006 21:30:17 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 6BD8516A4CA for ; Mon, 6 Nov 2006 21:30:17 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD0BC43D88 for ; Mon, 6 Nov 2006 21:29:54 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA6LTpPx015420 for ; Mon, 6 Nov 2006 21:29:51 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA6LTojO015416 for perforce@freebsd.org; Mon, 6 Nov 2006 21:29:50 GMT (envelope-from cognet@freebsd.org) Date: Mon, 6 Nov 2006 21:29:50 GMT Message-Id: <200611062129.kA6LTojO015416@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 109383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 21:30:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=109383 Change 109383 by cognet@cognet on 2006/11/06 21:29:12 Use ln -sf to avoid getting an error if the symlink is already there. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#6 (text+ko) ==== @@ -30,7 +30,7 @@ # IxNpeMicrocode.fwo optional npe_fw \ dependency "$S/arm/xscale/ixp425/IxNpeMicrocode.dat" \ - compile-with "ln -s $S/arm/xscale/ixp425/IxNpeMicrocode.dat ${.OBJDIR}; ${LD} -b binary -d -warn-common -r -d -o ${.TARGET} IxNpeMicrocode.dat" \ + compile-with "ln -sf $S/arm/xscale/ixp425/IxNpeMicrocode.dat ${.OBJDIR}; ${LD} -b binary -d -warn-common -r -d -o ${.TARGET} IxNpeMicrocode.dat" \ no-implicit-rule \ clean "IxNpeMicrocode.dat IxNpeMicrocode.fwo" # From owner-p4-projects@FreeBSD.ORG Mon Nov 6 22:36:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAA8E16A47E; Mon, 6 Nov 2006 22:36:47 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 AB49516A407 for ; Mon, 6 Nov 2006 22:36:47 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF40C43D5E for ; Mon, 6 Nov 2006 22:36:43 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA6Mahu4028420 for ; Mon, 6 Nov 2006 22:36:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA6Mahb2028417 for perforce@freebsd.org; Mon, 6 Nov 2006 22:36:43 GMT (envelope-from sam@freebsd.org) Date: Mon, 6 Nov 2006 22:36:43 GMT Message-Id: <200611062236.kA6Mahb2028417@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109393 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 22:36:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=109393 Change 109393 by sam@sam_ebb on 2006/11/06 22:36:35 add ixpnpe_sendandrecvmsg idiom Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#2 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#2 (text+ko) ==== @@ -1282,3 +1282,15 @@ msg[1] = npe_reg_read(sc, IX_NPEFIFO); return 0; } + +int +ixpnpe_sendandrecvmsg(struct ixpnpe_softc *sc, + const uint32_t send[2], uint32_t recv[2]) +{ + int status; + + status = ixpnpe_sendmsg(sc, send); + if (status == 0) + status = ixpnpe_recvmsg(sc, recv); + return status; +} ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#2 (text+ko) ==== @@ -89,4 +89,6 @@ int ixpnpe_sendmsg(struct ixpnpe_softc *, const uint32_t msg[2]); int ixpnpe_recvmsg(struct ixpnpe_softc *, uint32_t msg[2]); +int ixpnpe_sendandrecvmsg(struct ixpnpe_softc *, const uint32_t send[2], + uint32_t recv[2]); #endif /* _IXP425_NPEVAR_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Nov 6 22:39:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9F0E16A40F; Mon, 6 Nov 2006 22:39:52 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9769116A417 for ; Mon, 6 Nov 2006 22:39:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 090A143D7D for ; Mon, 6 Nov 2006 22:39:49 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA6Mdmkd028702 for ; Mon, 6 Nov 2006 22:39:48 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA6Mdmg1028695 for perforce@freebsd.org; Mon, 6 Nov 2006 22:39:48 GMT (envelope-from sam@freebsd.org) Date: Mon, 6 Nov 2006 22:39:48 GMT Message-Id: <200611062239.kA6Mdmg1028695@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 22:39:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=109395 Change 109395 by sam@sam_ebb on 2006/11/06 22:39:06 minor cleanups: o fetch npe stats every second and update mib and ifnet stats o eliminate #defines for static q assignments; they did nothing but obscure what was going on o add some npe msg wrappers that will eventually get used but are dead code right now Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#4 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npereg.h#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#4 (text+ko) ==== @@ -92,6 +92,7 @@ bus_space_handle_t sc_miih; /* MII register window */ struct ixpnpe_softc *sc_npe; /* NPE support */ int sc_portid; + int debug; struct callout tick_ch; /* Tick callout */ struct npedma txdma; struct npebuf *tx_free; /* list of free tx buffers */ @@ -101,8 +102,11 @@ int rx_freeqid; /* rx free buffers qid */ int tx_qid; /* tx qid */ int tx_doneqid; /* tx completed qid */ - struct ifmib_iso_8802_3 mibdata;/* stuff for network mgmt */ - int debug; + struct ifmib_iso_8802_3 mibdata; + bus_dma_tag_t sc_stats_tag; /* bus dma tag for stats block */ + struct npestats *sc_stats; + bus_dmamap_t sc_stats_map; + bus_addr_t sc_stats_phys; /* phys addr of sc_stats */ }; /* @@ -128,10 +132,10 @@ .regsize = IXP425_MAC_A_SIZE, .miibase = IXP425_MAC_A_HWBASE, .miisize = IXP425_MAC_A_SIZE, - .rx_qid = NPE_B_RX_Q, - .rx_freeqid = NPE_B_RX_FREEQ, - .tx_qid = NPE_B_TX_Q, - .tx_doneqid = NPE_B_TX_DONEQ + .rx_qid = 4, + .rx_freeqid = 27, + .tx_qid = 24, + .tx_doneqid = 31 }, { .desc = "IXP NPE-C", .portid = 1, @@ -140,10 +144,10 @@ .regsize = IXP425_MAC_B_SIZE, .miibase = IXP425_MAC_A_HWBASE, .miisize = IXP425_MAC_A_SIZE, - .rx_qid = NPE_C_RX_Q, - .rx_freeqid = NPE_C_RX_FREEQ, - .tx_qid = NPE_C_TX_Q, - .tx_doneqid = NPE_C_TX_DONEQ + .rx_qid = 4, + .rx_freeqid = 28, + .tx_qid = 25, + .tx_doneqid = 31 }, }; @@ -187,8 +191,18 @@ static void npewatchdog(struct ifnet *); static int npeioctl(struct ifnet * ifp, u_long, caddr_t); -static int tx_doneqid = -1; -static int rx_qid = -1; +static int npe_setrxqosentry(struct npe_softc *, int classix, + int trafclass, int qid); +static int npe_updatestats(struct npe_softc *); +#if 0 +static int npe_getstats(struct npe_softc *); +static uint32_t npe_getimageid(struct npe_softc *); +static int npe_setloopback(struct npe_softc *, int ena); +#endif + +/* NB: all tx+rx traffic goes through one queue */ +static int tx_doneqid = -1; +static int rx_qid = -1; static int npe_debug = 0; SYSCTL_INT(_debug, OID_AUTO, npe, CTLFLAG_RW, &npe_debug, @@ -267,7 +281,7 @@ ifp->if_timer = 0; ifp->if_linkmib = &sc->mibdata; ifp->if_linkmiblen = sizeof(sc->mibdata); - sc->mibdata.dot3Compliance = DOT3COMPLIANCE_COLLS; + sc->mibdata.dot3Compliance = DOT3COMPLIANCE_STATS; ether_ifattach(ifp, eaddr); return 0; @@ -455,27 +469,12 @@ memset(dma, 0, sizeof(dma)); } -static void -npe_setrxqosentry(struct npe_softc *sc, int classix, int trafclass, int qid) -{ - uint32_t msg[2]; - - msg[0] = (NPE_SETRXQOSENTRY << 24) | (sc->sc_portid << 16) | classix; - msg[1] = (trafclass << 24) | (1 << 23) | (qid << 16) | (qid << 4); - if (ixpnpe_sendmsg(sc->sc_npe, msg) != 0) - device_printf(sc->sc_dev, "send setrxqosentry\n"); - else if (ixpnpe_recvmsg(sc->sc_npe, msg) != 0) - device_printf(sc->sc_dev, "recv setrxqosentry\n"); - else - DPRINTF(sc, "%s: 0x%x 0x%x\n", __func__, msg[0], msg[1]); -} - static int npe_activate(device_t dev) { struct npe_softc * sc = device_get_softc(dev); int unit = device_get_unit(dev); - int error; + int error, i; /* load NPE firmware and start it running */ error = ixpnpe_init(sc->sc_npe, "npe_fw", npeconfig[unit].imageid); @@ -483,19 +482,6 @@ return error; sc->sc_portid = npeconfig[unit].portid; -#if 0 -/* ask for firmware rev (really imageid) to check if npe is running properly */ -{ uint32_t msg[2]; - msg[0] = NPE_GETSTATUS<sc_npe, msg) != 0) - device_printf(dev, "error sending status msg\n"); - else if (ixpnpe_recvmsg(sc->sc_npe, msg) != 0) - device_printf(dev, "error recving status msg\n"); - else - device_printf(dev, "status: 0x%x 0x%x\n", msg[0], msg[1]); -} -#endif if (bus_space_map(sc->sc_iot, npeconfig[unit].regbase, npeconfig[unit].regsize, 0, &sc->sc_ioh)) { device_printf(dev, "Cannot map registers 0x%x:0x%x\n", @@ -525,6 +511,32 @@ if (error != 0) return error; + /* setup statistics block */ + error = bus_dma_tag_create(NULL, 4, 0, BUS_SPACE_MAXADDR_32BIT, + BUS_SPACE_MAXADDR, NULL, NULL, sizeof(struct npestats), 1, + sizeof(struct npestats), 0, + busdma_lock_mutex, &sc->sc_mtx, &sc->sc_stats_tag); + if (error != 0) { + device_printf(sc->sc_dev, "unable to create stats tag, " + "error %u\n", error); + return error; + } + if (bus_dmamem_alloc(sc->sc_stats_tag, (void **)&sc->sc_stats, + BUS_DMA_NOWAIT, &sc->sc_stats_map) != 0) { + device_printf(sc->sc_dev, + "unable to allocate memory for stats block, error %u\n", + error); + return error; + } + if (bus_dmamap_load(sc->sc_stats_tag, sc->sc_stats_map, + sc->sc_stats, sizeof(struct npestats), npe_getaddr, sc, 0) != 0) { + device_printf(sc->sc_dev, + "unable to load memory for stats block, error %u\n", + error); + return error; + } + sc->sc_stats_phys = sc->buf_phys; + /* XXX disable half-bridge LEARNING+FILTERING feature */ /* @@ -553,14 +565,8 @@ ixpqmgr_qconfig(sc->rx_freeqid, NPE_MAX_RX_BUFFERS, 0, NPE_MAX_RX_BUFFERS/2, 0, NULL, sc); /* tell the NPE to direct all traffic to rx_qid */ - npe_setrxqosentry(sc, 0, 0, sc->rx_qid); - npe_setrxqosentry(sc, 1, 0, sc->rx_qid); - npe_setrxqosentry(sc, 2, 0, sc->rx_qid); - npe_setrxqosentry(sc, 3, 0, sc->rx_qid); - npe_setrxqosentry(sc, 4, 0, sc->rx_qid); - npe_setrxqosentry(sc, 5, 0, sc->rx_qid); - npe_setrxqosentry(sc, 6, 0, sc->rx_qid); - npe_setrxqosentry(sc, 7, 0, sc->rx_qid); + for (i = 0; i < 8; i++) + npe_setrxqosentry(sc, i, 0, sc->rx_qid); sc->tx_qid = npeconfig[unit].tx_qid; sc->tx_doneqid = npeconfig[unit].tx_doneqid; @@ -583,6 +589,14 @@ /* XXX disable q's */ if (sc->sc_npe != NULL) ixpnpe_stop(sc->sc_npe); + if (sc->sc_stats != NULL) { + bus_dmamap_unload(sc->sc_stats_tag, sc->sc_stats_map); + bus_dmamem_free(sc->sc_stats_tag, sc->sc_stats, + sc->sc_stats_map); + bus_dmamap_destroy(sc->sc_stats_tag, sc->sc_stats_map); + } + if (sc->sc_stats_tag != NULL) + bus_dma_tag_destroy(sc->sc_stats_tag); npe_dma_destroy(sc, &sc->txdma); npe_dma_destroy(sc, &sc->rxdma); bus_generic_detach(sc->sc_dev); @@ -634,45 +648,51 @@ static void npe_tick(void *xsc) { +#define MIBADD(x) sc->mibdata.x += be32toh(ns->x) struct npe_softc *sc = xsc; + struct ifnet *ifp = sc->sc_ifp; + struct npestats *ns = sc->sc_stats; NPE_ASSERT_LOCKED(sc); -#if 0 - /* XXX intel driver uses the message send mechanism, to get stats... */ - /* - * Update the stats as best we can. When we're done, clear - * the status counters and start over. We're supposed to read these - * registers often enough that they won't overflow. Hopefully - * once a second is often enough. Some don't map well to - * the dot3Stats mib, so for those we just count them as general - * errors. Stats for iframes, ibutes, oframes and obytes are - * collected elsewhere. These registers zero on a read to prevent - * races. - */ - sc->mibdata.dot3StatsAlignmentErrors += RD4(sc, ETH_ALE); - sc->mibdata.dot3StatsFCSErrors += RD4(sc, ETH_SEQE); - sc->mibdata.dot3StatsSingleCollisionFrames += RD4(sc, ETH_SCOL); - sc->mibdata.dot3StatsMultipleCollisionFrames += RD4(sc, ETH_MCOL); - sc->mibdata.dot3StatsSQETestErrors += RD4(sc, ETH_SQEE); - sc->mibdata.dot3StatsDeferredTransmissions += RD4(sc, ETH_DTE); - sc->mibdata.dot3StatsLateCollisions += RD4(sc, ETH_LCOL); - sc->mibdata.dot3StatsExcessiveCollisions += RD4(sc, ETH_ECOL); - sc->mibdata.dot3StatsCarrierSenseErrors += RD4(sc, ETH_CSE); - sc->mibdata.dot3StatsFrameTooLongs += RD4(sc, ETH_ELR); - sc->mibdata.dot3StatsInternalMacReceiveErrors += RD4(sc, ETH_DRFC); - /* - * not sure where to lump these, so count them against the errors - * for the interface. - */ - sc->sc_ifp->if_oerrors += RD4(sc, ETH_CSE) + RD4(sc, ETH_TUE); - sc->sc_ifp->if_ierrors += RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) + - RD4(sc, ETH_USF); -#endif + npe_updatestats(sc); /* update + clear stats */ + bus_dmamap_sync(sc->sc_stats_tag, sc->sc_stats_map, + BUS_DMASYNC_POSTREAD); + + MIBADD(dot3StatsAlignmentErrors); + MIBADD(dot3StatsFCSErrors); + MIBADD(dot3StatsSingleCollisionFrames); + MIBADD(dot3StatsMultipleCollisionFrames); + /* XXX? */ + sc->mibdata.dot3StatsSQETestErrors += + be32toh(ns->dot3StatsCarrierSenseErrors); + MIBADD(dot3StatsDeferredTransmissions); + MIBADD(dot3StatsLateCollisions); + MIBADD(dot3StatsExcessiveCollisions); + MIBADD(dot3StatsInternalMacTransmitErrors); + MIBADD(dot3StatsCarrierSenseErrors); + sc->mibdata.dot3StatsFrameTooLongs += + be32toh(ns->RxLargeFramesDiscards) + + be32toh(ns->TxLargeFrameDiscards); + MIBADD(dot3StatsInternalMacReceiveErrors); + sc->mibdata.dot3StatsMissedFrames += + be32toh(ns->RxOverrunDiscards) + + be32toh(ns->RxUnderflowEntryDiscards); + + ifp->if_oerrors += be32toh(ns->dot3StatsCarrierSenseErrors) + + be32toh(ns->dot3StatsInternalMacTransmitErrors) + + be32toh(ns->TxVLANIdFilterDiscards) + ; + ifp->if_ierrors += be32toh(ns->dot3StatsFCSErrors) + + be32toh(ns->dot3StatsInternalMacReceiveErrors) + + be32toh(ns->RxOverrunDiscards) + + be32toh(ns->RxUnderflowEntryDiscards) + ; /* * Schedule another timeout one second from now. */ callout_reset(&sc->tick_ch, hz, npe_tick, sc); +#undef MIBADD } static void @@ -1188,6 +1208,73 @@ return error; } +/* + * Setup a traffic class -> rx queue mapping. + */ +static int +npe_setrxqosentry(struct npe_softc *sc, int classix, int trafclass, int qid) +{ + uint32_t msg[2]; + + msg[0] = (NPE_SETRXQOSENTRY << 24) | (sc->sc_portid << 16) | classix; + msg[1] = (trafclass << 24) | (1 << 23) | (qid << 16) | (qid << 4); + return ixpnpe_sendandrecvmsg(sc->sc_npe, msg, msg); +} + +/* + * Update and reset the statistics in the NPE. + */ +static int +npe_updatestats(struct npe_softc *sc) +{ + uint32_t msg[2]; + + msg[0] = NPE_RESETSTATS << NPE_MAC_MSGID_SHL; + msg[1] = sc->sc_stats_phys; /* physical address of stat block */ + return ixpnpe_sendandrecvmsg(sc->sc_npe, msg, msg); +} + +#if 0 +/* + * Get the current statistics block. + */ +static int +npe_getstats(struct npe_softc *sc) +{ + uint32_t msg[2]; + + msg[0] = NPE_GETSTATS << NPE_MAC_MSGID_SHL; + msg[1] = sc->sc_stats_phys; /* physical address of stat block */ + return ixpnpe_sendandrecvmsg(sc->sc_npe, msg, msg); +} + +/* + * Query the image id of the loaded firmware. + */ +static uint32_t +npe_getimageid(struct npe_softc *sc) +{ + uint32_t msg[2]; + + msg[0] = NPE_GETSTATUS << NPE_MAC_MSGID_SHL; + msg[1] = 0; + return ixpnpe_sendandrecvmsg(sc->sc_npe, msg, msg) == 0 ? msg[1] : 0; +} + +/* + * Enable/disable loopback. + */ +static int +npe_setloopback(struct npe_softc *sc, int ena) +{ + uint32_t msg[2]; + + msg[0] = (NPE_SETLOOPBACK << NPE_MAC_MSGID_SHL) | (ena != 0); + msg[1] = 0; + return ixpnpe_sendandrecvmsg(sc->sc_npe, msg, msg); +} +#endif + static void npe_child_detached(device_t dev, device_t child) { ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npereg.h#2 (text+ko) ==== @@ -79,25 +79,6 @@ #define ix_ne_data ix_ne[2] /* phys addr of data buffer */ }; -/* NB: these assume a ucode image that supports 4 ports, no QoS */ -#define NPE_A_RX_Q 11 -#define NPE_A_TX_Q 23 /* for submitting tx buffers to NPE-A */ -#define NPE_A_RX_FREEQ 26 /* for supplying rx buffers to NPE-A */ -#define NPE_A_TX_DONEQ 31 /* NB: shared */ - -#define NPE_B_RX_Q 4 -#define NPE_B_TX_Q 24 /* for submitting tx buffers to NPE-B */ -#define NPE_B_RX_FREEQ 27 /* for supplying rx buffers to NPE-B */ -#define NPE_B_TX_DONEQ 31 /* NB: shared */ - -#define NPE_C_RX_Q 4 -#define NPE_C_TX_Q 25 /* for submitting tx buffers to NPE-C */ -#define NPE_C_RX_FREEQ 28 /* for supplying rx buffers to NPE-C */ -#define NPE_C_TX_DONEQ 31 /* NB: shared */ - -#define NPE_MAX_TX_FRAMES_TO_SUBMIT 128 - -#define NPE_MAX_MULTICAST_ADDRESSES 256 #define NPE_PORTS_MAX 3 #define NPE_FRAME_SIZE_DEFAULT 1536 #define NPE_FRAME_SIZE_MAX (65536-64) @@ -128,6 +109,7 @@ #define NPE_SETRXTAGMODE 0x07 /* configure VLAN rx operating mode */ #define NPE_SETDEFRXVID 0x08 /* set def VLAN tag + traffic class */ #define NPE_SETRXQOSENTRY 0x0b /* map user pri -> QoS class+rx qid */ +#define NPE_SETLOOPBACK 0x12 /* enable/disable loopback */ /* ... XXX more */ /* @@ -219,6 +201,34 @@ #define NPE_ETH_MAC_BCAST_MCAST_BIT ( 1) /* + * Stat block returned by NPE with NPE_GETSTATS msg. + */ +struct npestats { + uint32_t dot3StatsAlignmentErrors; + uint32_t dot3StatsFCSErrors; + uint32_t dot3StatsInternalMacReceiveErrors; + uint32_t RxOverrunDiscards; + uint32_t RxLearnedEntryDiscards; + uint32_t RxLargeFramesDiscards; + uint32_t RxSTPBlockedDiscards; + uint32_t RxVLANTypeFilterDiscards; + uint32_t RxVLANIdFilterDiscards; + uint32_t RxInvalidSourceDiscards; + uint32_t RxBlackListDiscards; + uint32_t RxWhiteListDiscards; + uint32_t RxUnderflowEntryDiscards; + uint32_t dot3StatsSingleCollisionFrames; + uint32_t dot3StatsMultipleCollisionFrames; + uint32_t dot3StatsDeferredTransmissions; + uint32_t dot3StatsLateCollisions; + uint32_t dot3StatsExcessiveCollisions; + uint32_t dot3StatsInternalMacTransmitErrors; + uint32_t dot3StatsCarrierSenseErrors; + uint32_t TxLargeFrameDiscards; + uint32_t TxVLANIdFilterDiscards; +}; + +/* * Default values */ #define NPE_TX_CNTRL1_DEFAULT \ From owner-p4-projects@FreeBSD.ORG Mon Nov 6 22:41:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D7FB16A4A0; Mon, 6 Nov 2006 22:41:06 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 434D416A403 for ; Mon, 6 Nov 2006 22:41:06 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87B0F43D8B for ; Mon, 6 Nov 2006 22:40:51 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA6MepEt028946 for ; Mon, 6 Nov 2006 22:40:51 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA6MepdO028943 for perforce@freebsd.org; Mon, 6 Nov 2006 22:40:51 GMT (envelope-from sam@freebsd.org) Date: Mon, 6 Nov 2006 22:40:51 GMT Message-Id: <200611062240.kA6MepdO028943@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109397 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 22:41:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=109397 Change 109397 by sam@sam_ebb on 2006/11/06 22:40:02 nuke some dead code that's never going to get used Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#5 (text+ko) ==== @@ -862,14 +862,6 @@ int i; NPE_ASSERT_LOCKED(sc); -#if 0 - ixpqmgr_qconfig(sc->tx_qid, dma->nbuf, 0, dma->nbuf, 0, NULL, sc); - if (tx_doneqid == -1) { - ixpqmgr_qconfig(sc->tx_doneqid, dma->nbuf, 0, 2, - IX_QMGR_Q_SOURCE_ID_NOT_E, npe_txdone, sc); - tx_doneqid = sc->tx_doneqid; - } -#endif sc->tx_free = NULL; for (i = 0; i < dma->nbuf; i++) { struct npebuf *npe = &dma->buf[i]; @@ -893,14 +885,6 @@ int i; NPE_ASSERT_LOCKED(sc); -#if 0 - if (rx_qid == -1) { - ixpqmgr_qconfig(sc->rx_qid, dma->nbuf, 0, 1, - IX_QMGR_Q_SOURCE_ID_NOT_E, npe_rxdone, sc); - rx_qid = sc->rx_qid; - } - ixpqmgr_qconfig(sc->rx_freeqid, dma->nbuf, 0, dma->nbuf/2, 0, NULL, sc); -#endif for (i = 0; i < dma->nbuf; i++) { npe = &dma->buf[i]; npe_rxbuf_init(sc, npe, npe->ix_m); @@ -1145,10 +1129,6 @@ */ WR4(sc, NPE_MAC_CORE_CNTRL, NPE_CORE_RESET); DELAY(NPE_MAC_RESET_DELAY); -#if 0 - /* rewrite all parameters to their current value */ - ixEthAccMacStateUpdate(portId); -#endif WR4(sc, NPE_MAC_INT_CLK_THRESH, NPE_MAC_INT_CLK_THRESH_DEFAULT); WR4(sc, NPE_MAC_CORE_CNTRL, NPE_CORE_MDC_EN); } From owner-p4-projects@FreeBSD.ORG Mon Nov 6 22:42:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C5A016A4F0; Mon, 6 Nov 2006 22:42:11 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 99DD516A4A7 for ; Mon, 6 Nov 2006 22:42:10 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55F9643D8B for ; Mon, 6 Nov 2006 22:41:57 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA6MfrL7029594 for ; Mon, 6 Nov 2006 22:41:53 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA6MfrIR029591 for perforce@freebsd.org; Mon, 6 Nov 2006 22:41:53 GMT (envelope-from cognet@freebsd.org) Date: Mon, 6 Nov 2006 22:41:53 GMT Message-Id: <200611062241.kA6MfrIR029591@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 109399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 22:42:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=109399 Change 109399 by cognet@cognet on 2006/11/06 22:41:35 IFC arith.h, to get fp to work on BE. Affected files ... .. //depot/projects/arm/src/lib/libc/arm/arith.h#2 integrate Differences ... ==== //depot/projects/arm/src/lib/libc/arm/arith.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/arm/arith.h,v 1.1 2004/05/14 12:04:29 cognet Exp $ + * $FreeBSD: src/lib/libc/arm/arith.h,v 1.2 2006/11/06 20:49:23 cognet Exp $ */ /* @@ -11,6 +11,11 @@ * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ +#ifndef __ARMEB__ #define IEEE_8087 #define Arith_Kind_ASL 1 #define Sudden_Underflow +#else +#define IEEE_MC68k +#define Arith_Kind_ASL 2 +#endif From owner-p4-projects@FreeBSD.ORG Mon Nov 6 23:47:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 770AA16A4EA; Mon, 6 Nov 2006 23:47:26 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D04BC16A47E for ; Mon, 6 Nov 2006 23:47:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D861643D93 for ; Mon, 6 Nov 2006 23:46:31 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA6NkQPl060592 for ; Mon, 6 Nov 2006 23:46:26 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA6NkM0T060589 for perforce@freebsd.org; Mon, 6 Nov 2006 23:46:22 GMT (envelope-from jb@freebsd.org) Date: Mon, 6 Nov 2006 23:46:22 GMT Message-Id: <200611062346.kA6NkM0T060589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2006 23:47:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=109405 Change 109405 by jb@jb_freebsd8 on 2006/11/06 23:45:25 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#6 integrate .. //depot/projects/dtrace/ports/MOVED#30 integrate .. //depot/projects/dtrace/ports/Mk/bsd.php.mk#6 integrate .. //depot/projects/dtrace/ports/UPDATING#23 integrate .. //depot/projects/dtrace/src/bin/sh/expand.c#4 integrate .. //depot/projects/dtrace/src/bin/sh/parser.c#5 integrate .. //depot/projects/dtrace/src/bin/sh/parser.h#4 integrate .. //depot/projects/dtrace/src/etc/amd.map#4 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#20 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/libiberty/config.h#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/arm.md.diff#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/Makefile#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write.3#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write.c#6 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/net/Makefile.inc#4 delete .. //depot/projects/dtrace/src/lib/libc/amd64/net/htonl.S#4 delete .. //depot/projects/dtrace/src/lib/libc/amd64/net/htons.S#4 delete .. //depot/projects/dtrace/src/lib/libc/amd64/net/ntohl.S#4 delete .. //depot/projects/dtrace/src/lib/libc/amd64/net/ntohs.S#4 delete .. //depot/projects/dtrace/src/lib/libc/arm/arith.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/arm/net/htonl.S#5 delete .. //depot/projects/dtrace/src/lib/libc/arm/net/htons.S#5 delete .. //depot/projects/dtrace/src/lib/libc/arm/net/ntohl.S#5 delete .. //depot/projects/dtrace/src/lib/libc/arm/net/ntohs.S#5 delete .. //depot/projects/dtrace/src/lib/libc/i386/net/Makefile.inc#4 delete .. //depot/projects/dtrace/src/lib/libc/i386/net/htonl.S#4 delete .. //depot/projects/dtrace/src/lib/libc/i386/net/htons.S#4 delete .. //depot/projects/dtrace/src/lib/libc/i386/net/ntohl.S#4 delete .. //depot/projects/dtrace/src/lib/libc/i386/net/ntohs.S#4 delete .. //depot/projects/dtrace/src/lib/libc/ia64/net/Makefile.inc#4 delete .. //depot/projects/dtrace/src/lib/libc/ia64/net/byte_swap_2.S#4 delete .. //depot/projects/dtrace/src/lib/libc/ia64/net/byte_swap_4.S#4 delete .. //depot/projects/dtrace/src/lib/libc/ia64/net/htonl.S#4 delete .. //depot/projects/dtrace/src/lib/libc/ia64/net/htons.S#4 delete .. //depot/projects/dtrace/src/lib/libc/ia64/net/ntohl.S#4 delete .. //depot/projects/dtrace/src/lib/libc/ia64/net/ntohs.S#4 delete .. //depot/projects/dtrace/src/lib/libc/net/Makefile.inc#6 integrate .. //depot/projects/dtrace/src/lib/libc/net/ntoh.c#1 branch .. //depot/projects/dtrace/src/lib/libc/powerpc/net/Makefile.inc#4 delete .. //depot/projects/dtrace/src/lib/libc/powerpc/net/htonl.S#4 delete .. //depot/projects/dtrace/src/lib/libc/powerpc/net/htons.S#4 delete .. //depot/projects/dtrace/src/lib/libc/powerpc/net/ntohl.S#4 delete .. //depot/projects/dtrace/src/lib/libc/powerpc/net/ntohs.S#4 delete .. //depot/projects/dtrace/src/lib/libc/sparc64/net/Makefile.inc#4 delete .. //depot/projects/dtrace/src/lib/libc/sparc64/net/htonl.S#4 delete .. //depot/projects/dtrace/src/lib/libc/sparc64/net/htons.S#4 delete .. //depot/projects/dtrace/src/lib/libc/sparc64/net/ntohl.S#4 delete .. //depot/projects/dtrace/src/lib/libc/sparc64/net/ntohs.S#4 delete .. //depot/projects/dtrace/src/lib/libc/sys/extattr_get_file.2#4 integrate .. //depot/projects/dtrace/src/lib/libstand/Makefile#5 integrate .. //depot/projects/dtrace/src/lib/libutil/login_ok.3#4 integrate .. //depot/projects/dtrace/src/sbin/devfs/devfs.8#4 integrate .. //depot/projects/dtrace/src/sbin/routed/main.c#4 integrate .. //depot/projects/dtrace/src/share/man/man4/ips.4#4 integrate .. //depot/projects/dtrace/src/share/man/man8/nanobsd.8#3 integrate .. //depot/projects/dtrace/src/share/man/man9/Makefile#11 integrate .. //depot/projects/dtrace/src/share/man/man9/priv.9#1 branch .. //depot/projects/dtrace/src/share/man/man9/suser.9#5 integrate .. //depot/projects/dtrace/src/share/misc/bsd-family-tree#9 integrate .. //depot/projects/dtrace/src/share/mk/bsd.endian.mk#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/io.c#4 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_uid16.c#4 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_fcntl.c#5 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_misc.c#7 integrate .. //depot/projects/dtrace/src/sys/conf/files#39 integrate .. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_cbq.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_cdnr.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_hfsc.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_priq.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_red.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_rio.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/dtrace/src/sys/ddb/db_main.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/an/if_an.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/arl/if_arl.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/asr/asr.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ce/if_ce.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/cnw/if_cnw.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/dcons/dcons_os.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drmP.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/fdc/fdc.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_mod.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/kbd/kbd.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/lmc/if_lmc.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/lmc/if_lmc.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/nmdm/nmdm.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/null/null.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ofw/ofw_console.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/random/randomdev.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/sbni/if_sbni.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/sbsh/if_sbsh.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/si/si.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/syscons.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/sysmouse.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/wi/if_wi.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/wl/if_wl.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/zs/zs.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_rule.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#9 integrate .. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs_vnops.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/procfs/procfs_ioctl.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vnops.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/udf/udf_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/umapfs/umap_vfsops.c#5 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#4 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#5 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/i386/io.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/i386/sys_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/i386/i386/vm86.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_misc.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_socksys.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_sysi86.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_machdep.c#9 integrate .. //depot/projects/dtrace/src/sys/i4b/driver/i4b_ipr.c#4 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/ssc.c#5 integrate .. //depot/projects/dtrace/src/sys/isofs/cd9660/cd9660_vfsops.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_acct.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/kern_environment.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/kern_fork.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/kern_jail.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_linker.c#19 integrate .. //depot/projects/dtrace/src/sys/kern/kern_ntptime.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_priv.c#1 branch .. //depot/projects/dtrace/src/sys/kern/kern_prot.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_resource.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_sysctl.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_thr.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/kern_time.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/kern_umtx.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/kern_xxx.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/subr_acl_posix1e.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/subr_firmware.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/subr_prf.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/subr_witness.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/sysv_ipc.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/sysv_msg.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/tty.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/tty_cons.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/tty_pts.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/tty_pty.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_sem.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#15 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/net/bpf.c#11 integrate .. //depot/projects/dtrace/src/sys/net/if.c#8 integrate .. //depot/projects/dtrace/src/sys/net/if_bridge.c#17 integrate .. //depot/projects/dtrace/src/sys/net/if_gre.c#8 integrate .. //depot/projects/dtrace/src/sys/net/if_ppp.c#6 integrate .. //depot/projects/dtrace/src/sys/net/if_sl.c#4 integrate .. //depot/projects/dtrace/src/sys/net/if_tap.c#9 integrate .. //depot/projects/dtrace/src/sys/net/if_tun.c#8 integrate .. //depot/projects/dtrace/src/sys/net/ppp_tty.c#5 integrate .. //depot/projects/dtrace/src/sys/net/raw_usrreq.c#6 integrate .. //depot/projects/dtrace/src/sys/net/rtsock.c#7 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_ioctl.c#8 integrate .. //depot/projects/dtrace/src/sys/netatalk/at_control.c#4 integrate .. //depot/projects/dtrace/src/sys/netatalk/ddp_pcb.c#5 integrate .. //depot/projects/dtrace/src/sys/netatm/atm_usrreq.c#5 integrate .. //depot/projects/dtrace/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#6 integrate .. //depot/projects/dtrace/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_socket.c#7 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_tty.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/in.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_carp.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_divert.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_mroute.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_output.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet6/ipsec.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec_osdep.h#4 integrate .. //depot/projects/dtrace/src/sys/netipx/ipx_pcb.c#4 integrate .. //depot/projects/dtrace/src/sys/netipx/ipx_usrreq.c#6 integrate .. //depot/projects/dtrace/src/sys/netncp/ncp_conn.c#4 integrate .. //depot/projects/dtrace/src/sys/netncp/ncp_mod.c#4 integrate .. //depot/projects/dtrace/src/sys/netncp/ncp_subr.h#4 integrate .. //depot/projects/dtrace/src/sys/netsmb/smb_conn.c#5 integrate .. //depot/projects/dtrace/src/sys/netsmb/smb_subr.h#4 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_syscalls.c#6 integrate .. //depot/projects/dtrace/src/sys/pc98/cbus/fdc.c#7 integrate .. //depot/projects/dtrace/src/sys/posix4/p1003_1b.c#7 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit.c#7 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_pipe.c#6 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_syscalls.c#7 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#6 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_internal.h#5 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_net.c#6 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_priv.c#1 branch .. //depot/projects/dtrace/src/sys/security/mac/mac_system.c#5 integrate .. //depot/projects/dtrace/src/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/dtrace/src/sys/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/dtrace/src/sys/security/mac_partition/mac_partition.c#4 integrate .. //depot/projects/dtrace/src/sys/security/mac_portacl/mac_portacl.c#5 integrate .. //depot/projects/dtrace/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#4 integrate .. //depot/projects/dtrace/src/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hvcons.c#7 integrate .. //depot/projects/dtrace/src/sys/sys/jail.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/mac_policy.h#9 integrate .. //depot/projects/dtrace/src/sys/sys/priv.h#1 branch .. //depot/projects/dtrace/src/sys/sys/systm.h#11 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_alloc.c#5 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#13 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_quota.c#6 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#9 integrate .. //depot/projects/dtrace/src/sys/vm/swap_pager.c#11 integrate .. //depot/projects/dtrace/src/sys/vm/vm_mmap.c#6 integrate .. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp1.0#1 branch .. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp2.2#1 branch .. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp2.2.stderr#1 branch .. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp3.2#1 branch .. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp3.2.stderr#1 branch .. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp4.2#1 branch .. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp4.2.stderr#1 branch .. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp5.2#1 branch .. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp5.2.stderr#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.ascii.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.block.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.dddh.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.ddhd.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.ddhd2.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.ddhh.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.ddhh2.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.dhdd.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.dhdh.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.dhhd.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.dhhd2.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.dhhh.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.dhhh2.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.ed.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.grep.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hddd.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hddd2.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hddh.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hddh2.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hdhd.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hdhd2.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hdhh.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hdhh2.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhdd.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhdd2.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhdh.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhdh2.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhhd.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhhd2.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhhh.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhhh2.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.n21.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.out#4 delete .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.sh#4 integrate .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.stutter.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.tabs.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.x.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.xaa.out#1 branch .. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.yes.out#1 branch .. //depot/projects/dtrace/src/usr.bin/jot/jot.1#5 integrate .. //depot/projects/dtrace/src/usr.bin/jot/jot.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/ktrace/ktrace.1#4 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#11 integrate .. //depot/projects/dtrace/www/en/releases/6.2R/todo.sgml#5 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -269,8 +269,8 @@ want a graphical user interface. If you intend to install a lot of third party software as well, then you will need more space. - You can use a commercial tool such as &partitionmagic; - to resize your partitions to make space for + You can use a commercial tool such as &partitionmagic;, or a free tool such as GParted, + to resize your partitions and make space for FreeBSD. The tools directory on the CDROM contains two free software tools which can carry out this task, namely FIPS and ==== //depot/projects/dtrace/ports/MOVED#30 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1176 2006/11/05 17:55:55 alepulver Exp $ +# $FreeBSD: ports/MOVED,v 1.1177 2006/11/06 17:49:08 ale Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2516,3 +2516,4 @@ graphics/php5-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion chinese/xcin25|chinese/xcin|2006-11-05|Reflect its real portname mail/nail|mail/heirloom-mailx|2006-11-05|Project name changed +databases/php5-filepro||2006-11-06|Removed in 5.2 branch ==== //depot/projects/dtrace/ports/Mk/bsd.php.mk#6 (text+ko) ==== @@ -7,7 +7,7 @@ # Please send all suggested changes to the maintainer instead of committing # them to CVS yourself. # -# $FreeBSD: ports/Mk/bsd.php.mk,v 1.33 2006/09/11 21:10:07 ale Exp $ +# $FreeBSD: ports/Mk/bsd.php.mk,v 1.34 2006/11/06 17:43:10 ale Exp $ # # Adding 'USE_PHP=yes' to a port includes this Makefile after bsd.ports.pre.mk. # If the port requires a predefined set of PHP extensions, they can be @@ -43,7 +43,7 @@ .if ${PHP_VER} == 4 PHP_EXT_DIR= 20020429 .else -PHP_EXT_DIR= 20050922 +PHP_EXT_DIR= 20060613 .endif HTTPD?= ${LOCALBASE}/sbin/httpd @@ -228,7 +228,7 @@ .if ${USE_PHP:L} != "yes" # non-version specific components _USE_PHP_ALL= bcmath bz2 calendar ctype curl dba dbase \ - exif fileinfo filepro fribidi ftp gd gettext gmp \ + exif fileinfo fribidi ftp gd gettext gmp \ hash iconv imap interbase ldap mbstring mcrypt \ mhash ming mssql mysql ncurses odbc \ openssl panda pcntl pcre pdf pgsql posix \ @@ -236,7 +236,7 @@ sockets sybase_ct sysvmsg sysvsem sysvshm \ tokenizer wddx xml xmlrpc yaz zip zlib # version specific components -_USE_PHP_VER4= ${_USE_PHP_ALL} crack dbx dio domxml mcal mcve \ +_USE_PHP_VER4= ${_USE_PHP_ALL} crack dbx dio domxml filepro mcal mcve \ mnogosearch oracle overload pfpro xslt yp _USE_PHP_VER5= ${_USE_PHP_ALL} dom mysqli pdo simplexml soap sqlite \ tidy xmlreader xmlwriter xsl ==== //depot/projects/dtrace/ports/UPDATING#23 (text+ko) ==== @@ -6,6 +6,20 @@ time you update your ports collection, before attempting any port upgrades. +20061106 + AFFECTS: users of syutils/munin-* + AUTHOR: miwi@FreeBSD.org + + - The default install location has changed from + ${PREFIX}/www/data/munin to ${PREFIX}/www/munin. + +20061106 + AFFECTS: users of chinese/tatter-tools + AUTHOR: chinsan.tw@gmail.com + + - The default install location has changed from + ${PREFIX}/www/data/tatter to ${PREFIX}/www/tatter. + 20061102 AFFECTS: users of mail/fetchmail AUTHOR: barner@FreeBSD.org @@ -4333,4 +4347,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.419 2006/11/02 16:05:29 barner Exp $ +$FreeBSD: ports/UPDATING,v 1.421 2006/11/06 22:50:19 miwi Exp $ ==== //depot/projects/dtrace/src/bin/sh/expand.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.49 2006/02/04 14:37:50 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.50 2006/11/05 18:36:05 stefanf Exp $"); #include #include @@ -763,6 +763,11 @@ goto record; break; + case VSERROR: + c = p - var - 1; + error("${%.*s%s}: Bad substitution", c, var, + (c > 0 && *p != CTLENDVAR) ? "..." : ""); + default: abort(); } ==== //depot/projects/dtrace/src/bin/sh/parser.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.57 2006/07/31 11:32:12 yar Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.58 2006/11/05 18:36:05 stefanf Exp $"); #include #include @@ -1228,12 +1228,17 @@ c = pgetc(); } } else { - if (! is_special(c)) -badsub: synerror("Bad substitution"); - USTPUTC(c, out); - c = pgetc(); + if (! is_special(c)) { + subtype = VSERROR; + if (c == '}') + pungetc(); + else + USTPUTC(c, out); + } else { + USTPUTC(c, out); + c = pgetc(); + } } - STPUTC('=', out); flags = 0; if (subtype == 0) { switch (c) { @@ -1243,9 +1248,13 @@ /*FALLTHROUGH*/ default: p = strchr(types, c); - if (p == NULL) - goto badsub; - subtype = p - types + VSNORMAL; + if (p == NULL) { + if (flags == VSNUL) + STPUTC(':', out); + STPUTC(c, out); + subtype = VSERROR; + } else + subtype = p - types + VSNORMAL; break; case '%': case '#': @@ -1261,9 +1270,10 @@ break; } } - } else { + } else if (subtype != VSERROR) { pungetc(); } + STPUTC('=', out); if (subtype != VSLENGTH && (dblquote || arinest)) flags |= VSQUOTE; *(stackblock() + typeloc) = subtype | flags; ==== //depot/projects/dtrace/src/bin/sh/parser.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)parser.h 8.3 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/parser.h,v 1.10 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/parser.h,v 1.11 2006/11/05 18:36:05 stefanf Exp $ */ /* control characters in argument strings */ @@ -60,6 +60,7 @@ #define VSTRIMRIGHT 0x8 /* ${var%pattern} */ #define VSTRIMRIGHTMAX 0x9 /* ${var%%pattern} */ #define VSLENGTH 0xa /* ${#var} */ +#define VSERROR 0xb /* Syntax error, issue when expanded */ /* ==== //depot/projects/dtrace/src/etc/amd.map#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/amd.map,v 1.9 2002/05/15 22:24:29 obrien Exp $ +# $FreeBSD: src/etc/amd.map,v 1.10 2006/11/06 01:42:11 obrien Exp $ # /defaults type:=host;fs:=${autodir}/${rhost}/host;rhost:=${key} -* opts:=rw,grpid,resvport,vers=3,proto=udp,nosuid,nodev +* opts:=rw,grpid,resvport,vers=3,proto=tcp,nosuid,nodev ==== //depot/projects/dtrace/src/etc/defaults/rc.conf#20 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.301 2006/10/28 20:08:12 phk Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.302 2006/11/06 15:11:24 rwatson Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -478,6 +478,7 @@ ############################################################## auditd_enable="NO" # Run the audit daemon. +auditd_program="/usr/sbin/auditd" # Path to the audit daemon. auditd_flags="" # Which options to pass to the audit daemon. cached_enable="NO" # Run the nsswitch caching daemon. cron_enable="YES" # Run the periodic job daemon. ==== //depot/projects/dtrace/src/gnu/usr.bin/binutils/libiberty/config.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/libiberty/config.h,v 1.8 2006/09/14 06:36:13 imp Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/libiberty/config.h,v 1.9 2006/11/06 02:32:29 obrien Exp $ */ /* config.h. Generated by configure. */ /* config.in. Generated from configure.ac by autoheader. */ @@ -7,7 +7,7 @@ /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ -#if defined(__sparc64__) || defined(__ARMEB__) +#if defined(__sparc64__) || defined(__ARMEB__) || defined(TARGET_BIG_ENDIAN) #define BYTEORDER 4321 #else #define BYTEORDER 1234 @@ -325,7 +325,7 @@ /* Define if the host machine stores words of multi-word integers in big-endian order. */ -#if defined(__sparc64__) || defined(__ARMEB__) +#if defined(__sparc64__) || defined(__ARMEB__) || defined(TARGET_BIG_ENDIAN) #define HOST_WORDS_BIG_ENDIAN 1 #endif ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/arm.md.diff#3 (text+ko) ==== @@ -1,20 +1,13 @@ -$FreeBSD: src/gnu/usr.bin/cc/cc_tools/arm.md.diff,v 1.1 2006/09/18 17:08:32 imp Exp $ +$FreeBSD: src/gnu/usr.bin/cc/cc_tools/arm.md.diff,v 1.2 2006/11/06 02:49:19 obrien Exp $ Index: arm.md =================================================================== RCS file: /cognet/ncvs/src/contrib/gcc/config/arm/arm.md,v retrieving revision 1.1.1.7 diff -u -p -r1.1.1.7 arm.md --- arm.md 3 Jun 2005 03:28:42 -0000 1.1.1.7 -+++ arm.md 29 Aug 2005 12:39:39 -0000 -@@ -8836,12 +8836,12 @@ - ldm[2] = operands[4]; - } - if (GET_CODE (XEXP (operands[2], 0)) != REG) -- val1 = INTVAL (XEXP (XEXP (operands[2], 0), 1)); -+ val1 = INTVAL (XEXP (XEXP (operands[2], 0), 1)); - if (GET_CODE (XEXP (operands[3], 0)) != REG) -- val2 = INTVAL (XEXP (XEXP (operands[3], 0), 1)); -+ val2 = INTVAL (XEXP (XEXP (operands[3], 0), 1)); ++++ arm.md 6 Nov 2006 02:44:36 -0000 +@@ -8840,7 +8840,7 @@ + val2 = INTVAL (XEXP (XEXP (operands[3], 0), 1)); arith[0] = operands[0]; arith[3] = operands[1]; - if (val1 < val2) @@ -22,7 +15,7 @@ { arith[1] = ldm[1]; arith[2] = ldm[2]; -@@ -8871,7 +8871,7 @@ +@@ -8870,7 +8870,7 @@ else output_asm_insn (\"ldm%?ia\\t%0, {%1, %2}\", ldm); } @@ -31,7 +24,7 @@ { ldm[0] = XEXP (operands[2], 0); if (val1 < val2) -@@ -8879,6 +8879,14 @@ +@@ -8878,6 +8878,14 @@ else output_asm_insn (\"ldm%?da\\t%0, {%1, %2}\", ldm); } ==== //depot/projects/dtrace/src/lib/libarchive/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.50 2006/09/05 05:59:45 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.52 2006/11/06 00:28:46 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -13,12 +13,9 @@ ARCHIVE_API_MAJOR!= echo ${VERSION} | sed -e 's/\..*//' ARCHIVE_API_MINOR!= echo ${VERSION} | sed -e 's/[0-9]*\.//' | sed -e 's/\..*//' -# The FreeBSD SHLIB_MAJOR is computed from the above values. -# To bump SHLIB_MAJOR, increase the MINOR number in "version" file. -SHLIB_MAJOR!= echo $$((${ARCHIVE_API_MAJOR} + ${ARCHIVE_API_MINOR})) -# The SHLIB_MAJOR computation above attempts to match the -# version number generated by libtool. (This may change -# when the FreeBSD port of libtool gets fixed.) +# FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. +# It has no real relation to the version number above. +SHLIB_MAJOR= 3 CFLAGS+= -DPACKAGE_NAME=\"lib${LIB}\" CFLAGS+= -DPACKAGE_VERSION=\"${VERSION}\" @@ -187,7 +184,6 @@ MLINKS+= archive_write.3 archive_write_open.3 MLINKS+= archive_write.3 archive_write_open_fd.3 MLINKS+= archive_write.3 archive_write_open_file.3 -MLINKS+= archive_write.3 archive_write_prepare.3 MLINKS+= archive_write.3 archive_write_set_bytes_per_block.3 MLINKS+= archive_write.3 archive_write_set_bytes_in_last_block.3 MLINKS+= archive_write.3 archive_write_set_callbacks.3 ==== //depot/projects/dtrace/src/lib/libarchive/archive_write.3#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.13 2005/11/24 10:06:05 ru Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.14 2006/11/06 00:28:46 kientzle Exp $ .\" .Dd January 8, 2005 .Dt archive_write 3 @@ -42,7 +42,6 @@ .Nm archive_write_open , .Nm archive_write_open_fd , .Nm archive_write_open_file , -.Nm archive_write_prepare , .Nm archive_write_header , .Nm archive_write_data , .Nm archive_write_close , ==== //depot/projects/dtrace/src/lib/libarchive/archive_write.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.18 2006/09/05 05:59:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.19 2006/11/06 00:16:40 kientzle Exp $"); /* * This file contains the "essential" portions of the write API, that @@ -47,8 +47,6 @@ #include "archive_entry.h" #include "archive_private.h" -extern char **environ; - /* * Allocate, initialize and return an archive object. */ ==== //depot/projects/dtrace/src/lib/libc/arm/arith.h#4 (text+ko) ==== @@ -1,7 +1,7 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/arm/arith.h,v 1.1 2004/05/14 12:04:29 cognet Exp $ + * $FreeBSD: src/lib/libc/arm/arith.h,v 1.2 2006/11/06 20:49:23 cognet Exp $ */ /* @@ -11,6 +11,11 @@ * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ +#ifndef __ARMEB__ #define IEEE_8087 #define Arith_Kind_ASL 1 #define Sudden_Underflow +#else +#define IEEE_MC68k +#define Arith_Kind_ASL 2 +#endif ==== //depot/projects/dtrace/src/lib/libc/net/Makefile.inc#6 (text+ko) ==== @@ -1,17 +1,17 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.61 2006/07/26 08:36:46 yar Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.62 2006/11/06 22:07:47 cognet Exp $ # machine-independent net sources -.PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net +.PATH: ${.CURDIR}/net -SRCS+= addr2ascii.c ascii2addr.c base64.c ether_addr.c eui64.c \ +SRCS+= addr2ascii.c ascii2addr.c base64.c ether_addr.c eui64.c \ gai_strerror.c getaddrinfo.c \ gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \ getifaddrs.c getifmaddrs.c getnameinfo.c \ getnetbydns.c getnetbyht.c getnetbynis.c getnetnamadr.c \ getproto.c getprotoent.c getprotoname.c getservent.c \ if_indextoname.c if_nameindex.c if_nametoindex.c \ - ip6opt.c linkaddr.c map_v4v6.c name6.c \ + ip6opt.c linkaddr.c map_v4v6.c name6.c ntoh.c \ nsdispatch.c nslexer.c nsparser.c nss_compat.c \ rcmd.c rcmdsh.c recv.c rthdr.c send.c sockatmark.c vars.c @@ -42,11 +42,6 @@ ${LEX} ${LFLAGS} -o/dev/stdout ${.IMPSRC} | \ 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" -.endif - MAN+= addr2ascii.3 byteorder.3 ethers.3 eui64.3 \ getaddrinfo.3 gai_strerror.3 gethostbyname.3 \ getifaddrs.3 getifmaddrs.3 getipnodebyname.3 \ ==== //depot/projects/dtrace/src/lib/libc/sys/extattr_get_file.2#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/libc/sys/extattr_get_file.2,v 1.17 2005/06/10 16:54:17 rodrigc Exp $ +.\" $FreeBSD: src/lib/libc/sys/extattr_get_file.2,v 1.18 2006/11/06 15:12:43 rwatson Exp $ .\" .Dd February 23, 2005 .Dt EXTATTR 2 @@ -48,7 +48,6 @@ .Sh SYNOPSIS .In sys/types.h .In sys/extattr.h -.In sys/uio.h .Ft ssize_t .Fn extattr_get_fd "int fd" "int attrnamespace" "const char *attrname" "void *data" "size_t nbytes" .Ft int ==== //depot/projects/dtrace/src/lib/libstand/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libstand/Makefile,v 1.56 2006/08/22 08:03:01 ru Exp $ +# $FreeBSD: src/lib/libstand/Makefile,v 1.57 2006/11/06 22:07:45 cognet Exp $ # Originally from $NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $ # # Notes: @@ -37,13 +37,9 @@ # private (pruned) versions of libc string functions SRCS+= strcasecmp.c -# byte order functions from libc -.if ${MACHINE_ARCH} != "amd64" -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/net -.else -.PATH: ${.CURDIR}/../libc/i386/net -.endif -SRCS+= htons.S ntohs.S htonl.S ntohl.S +.PATH: ${.CURDIR}/../libc/net + +SRCS+= ntoh.c # string functions from libc .PATH: ${.CURDIR}/../libc/string ==== //depot/projects/dtrace/src/lib/libutil/login_ok.3#4 (text+ko) ==== @@ -17,7 +17,7 @@ .\" 5. Modifications may be freely made to this file providing the above .\" conditions are met. .\" -.\" $FreeBSD: src/lib/libutil/login_ok.3,v 1.14 2004/07/02 23:52:19 ru Exp $ +.\" $FreeBSD: src/lib/libutil/login_ok.3,v 1.15 2006/11/05 19:00:08 trhodes Exp $ .\" .Dd January 2, 1997 .Os @@ -56,7 +56,7 @@ An empty .Em ttys.allow list (or if no such capability exists for -the give login class) logins via any tty device are allowed unless +the given login class) logins via any tty device are allowed unless the .Em ttys.deny list exists and is non-empty, and the device or its ==== //depot/projects/dtrace/src/sbin/devfs/devfs.8#4 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.15 2005/06/14 11:24:55 ru Exp $ +.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.17 2006/11/05 20:12:32 danger Exp $ .\" -.Dd July 1, 2002 +.Dd November 5, 2006 .Dt DEVFS 8 .Os .Sh NAME @@ -237,7 +237,21 @@ .Sh FILES .Bl -tag -compact .It Pa /etc/defaults/devfs.rules +Default +.Nm +configuration file. .It Pa /etc/devfs.rules +Local +.Nm +configuration file. +.It Pa /etc/devfs.conf +Boot-time +.Nm +configuration file. +.It Pa /usr/share/examples/etc/devfs.conf +Example boot-time +.Nm +configuration file. .El .Sh EXAMPLES When the system boots, @@ -348,6 +362,8 @@ .Xr jail 2 , .Xr glob 3 , .Xr devfs 5 , +.Xr devfs.conf 5 , +.Xr devfs.rules 5 , .Xr chown 8 , .Xr jail 8 , .Xr mknod 8 ==== //depot/projects/dtrace/src/sbin/routed/main.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/routed/main.c,v 1.18 2005/05/31 20:28:48 stefanf Exp $ + * $FreeBSD: src/sbin/routed/main.c,v 1.19 2006/11/05 14:49:47 trhodes Exp $ */ #include "defs.h" @@ -45,10 +45,10 @@ __RCSID("$NetBSD$"); #include #elif defined(__FreeBSD__) -__RCSID("$FreeBSD: src/sbin/routed/main.c,v 1.18 2005/05/31 20:28:48 stefanf Exp $"); +__RCSID("$FreeBSD: src/sbin/routed/main.c,v 1.19 2006/11/05 14:49:47 trhodes Exp $"); #else -__RCSID("$Revision: 2.27 $"); -#ident "$Revision: 2.27 $" +__RCSID("$Revision: 2.31 $"); +#ident "$Revision: 2.31 $" #endif pid_t mypid; @@ -133,7 +133,7 @@ (void)gethostname(myname, sizeof(myname)-1); (void)gethost(myname, &myaddr); - while ((n = getopt(argc, argv, "sqdghmpAtvT:F:P:")) != -1) { + while ((n = getopt(argc, argv, "sqdghmAtvT:F:P:")) != -1) { switch (n) { case 's': supplier = 1; @@ -219,7 +219,7 @@ case 'v': /* display version */ verbose++; - msglog("version 2.25"); + msglog("version 2.31"); break; default: @@ -237,7 +237,7 @@ goto usage; if (argc != 0) { usage: - logbad(0, "usage: routed [-sqdghmpAtv] [-T tracefile]" + logbad(0, "usage: routed [-sqdghmAtv] [-T tracefile]" " [-F net[,metric]] [-P parms]"); } if (geteuid() != 0) { @@ -863,14 +863,15 @@ va_start(args, p); vsyslog(LOG_ERR, p, args); - + va_end(args); if (ftrace != 0) { if (ftrace == stdout) (void)fputs("routed: ", ftrace); + va_start(args, p); (void)vfprintf(ftrace, p, args); + va_end(args); (void)fputc('\n', ftrace); } - va_end(args); } @@ -889,8 +890,6 @@ struct msg_sub *ms1, *ms; const char *p1; - va_start(args, p); - /* look for the oldest slot in the table * or the slot for the bad router. */ @@ -925,15 +924,18 @@ trace_flush(); for (p1 = p; *p1 == ' '; p1++) continue; + va_start(args, p); vsyslog(LOG_ERR, p1, args); + va_end(args); } /* always display the message if tracing */ if (ftrace != 0) { + va_start(args, p); (void)vfprintf(ftrace, p, args); + va_end(args); (void)fputc('\n', ftrace); } - va_end(args); } @@ -946,12 +948,13 @@ va_start(args, p); vsyslog(LOG_ERR, p, args); - + va_end(args); (void)fputs("routed: ", stderr); + va_start(args, p); (void)vfprintf(stderr, p, args); + va_end(args); (void)fputs("; giving up\n",stderr); (void)fflush(stderr); - va_end(args); if (dump) abort(); ==== //depot/projects/dtrace/src/share/man/man4/ips.4#4 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ips.4,v 1.6 2006/06/18 09:53:00 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ips.4,v 1.7 2006/11/05 08:55:21 maxim Exp $ .\" -.Dd August 8, 2004 +.Dd November 4, 2006 .Dt IPS 4 .Os .Sh NAME >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 7 00:01:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EA8A16A407; Tue, 7 Nov 2006 00:01:53 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 36FE816A412 for ; Tue, 7 Nov 2006 00:01:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2576A43D78 for ; Tue, 7 Nov 2006 00:01:49 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA701nLS062935 for ; Tue, 7 Nov 2006 00:01:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA701kVR062875 for perforce@freebsd.org; Tue, 7 Nov 2006 00:01:46 GMT (envelope-from jb@freebsd.org) Date: Tue, 7 Nov 2006 00:01:46 GMT Message-Id: <200611070001.kA701kVR062875@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109406 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 00:01:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=109406 Change 109406 by jb@jb_freebsd8 on 2006/11/07 00:01:12 IFC Affected files ... .. //depot/projects/binutils/src/bin/sh/expand.c#2 integrate .. //depot/projects/binutils/src/bin/sh/parser.c#2 integrate .. //depot/projects/binutils/src/bin/sh/parser.h#2 integrate .. //depot/projects/binutils/src/etc/amd.map#2 integrate .. //depot/projects/binutils/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libiberty/config.h#3 integrate .. //depot/projects/binutils/src/gnu/usr.bin/cc/cc_tools/arm.md.diff#2 integrate .. //depot/projects/binutils/src/lib/libarchive/Makefile#2 integrate .. //depot/projects/binutils/src/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/binutils/src/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/binutils/src/lib/libc/amd64/net/Makefile.inc#2 delete .. //depot/projects/binutils/src/lib/libc/amd64/net/htonl.S#2 delete .. //depot/projects/binutils/src/lib/libc/amd64/net/htons.S#2 delete .. //depot/projects/binutils/src/lib/libc/amd64/net/ntohl.S#2 delete .. //depot/projects/binutils/src/lib/libc/amd64/net/ntohs.S#2 delete .. //depot/projects/binutils/src/lib/libc/arm/arith.h#2 integrate .. //depot/projects/binutils/src/lib/libc/arm/net/htonl.S#2 delete .. //depot/projects/binutils/src/lib/libc/arm/net/htons.S#2 delete .. //depot/projects/binutils/src/lib/libc/arm/net/ntohl.S#2 delete .. //depot/projects/binutils/src/lib/libc/arm/net/ntohs.S#2 delete .. //depot/projects/binutils/src/lib/libc/i386/net/Makefile.inc#2 delete .. //depot/projects/binutils/src/lib/libc/i386/net/htonl.S#2 delete .. //depot/projects/binutils/src/lib/libc/i386/net/htons.S#2 delete .. //depot/projects/binutils/src/lib/libc/i386/net/ntohl.S#2 delete .. //depot/projects/binutils/src/lib/libc/i386/net/ntohs.S#2 delete .. //depot/projects/binutils/src/lib/libc/ia64/net/Makefile.inc#2 delete .. //depot/projects/binutils/src/lib/libc/ia64/net/byte_swap_2.S#2 delete .. //depot/projects/binutils/src/lib/libc/ia64/net/byte_swap_4.S#2 delete .. //depot/projects/binutils/src/lib/libc/ia64/net/htonl.S#2 delete .. //depot/projects/binutils/src/lib/libc/ia64/net/htons.S#2 delete .. //depot/projects/binutils/src/lib/libc/ia64/net/ntohl.S#2 delete .. //depot/projects/binutils/src/lib/libc/ia64/net/ntohs.S#2 delete .. //depot/projects/binutils/src/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/binutils/src/lib/libc/net/ntoh.c#1 branch .. //depot/projects/binutils/src/lib/libc/powerpc/net/Makefile.inc#2 delete .. //depot/projects/binutils/src/lib/libc/powerpc/net/htonl.S#2 delete .. //depot/projects/binutils/src/lib/libc/powerpc/net/htons.S#2 delete .. //depot/projects/binutils/src/lib/libc/powerpc/net/ntohl.S#2 delete .. //depot/projects/binutils/src/lib/libc/powerpc/net/ntohs.S#2 delete .. //depot/projects/binutils/src/lib/libc/sparc64/net/Makefile.inc#2 delete .. //depot/projects/binutils/src/lib/libc/sparc64/net/htonl.S#2 delete .. //depot/projects/binutils/src/lib/libc/sparc64/net/htons.S#2 delete .. //depot/projects/binutils/src/lib/libc/sparc64/net/ntohl.S#2 delete .. //depot/projects/binutils/src/lib/libc/sparc64/net/ntohs.S#2 delete .. //depot/projects/binutils/src/lib/libc/sys/extattr_get_file.2#2 integrate .. //depot/projects/binutils/src/lib/libstand/Makefile#2 integrate .. //depot/projects/binutils/src/lib/libutil/login_ok.3#2 integrate .. //depot/projects/binutils/src/sbin/devfs/devfs.8#2 integrate .. //depot/projects/binutils/src/sbin/routed/main.c#2 integrate .. //depot/projects/binutils/src/share/man/man4/ips.4#2 integrate .. //depot/projects/binutils/src/share/man/man8/nanobsd.8#2 integrate .. //depot/projects/binutils/src/share/man/man9/Makefile#2 integrate .. //depot/projects/binutils/src/share/man/man9/priv.9#1 branch .. //depot/projects/binutils/src/share/man/man9/suser.9#2 integrate .. //depot/projects/binutils/src/share/misc/bsd-family-tree#2 integrate .. //depot/projects/binutils/src/share/mk/bsd.endian.mk#2 integrate .. //depot/projects/binutils/src/sys/amd64/amd64/io.c#2 integrate .. //depot/projects/binutils/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/binutils/src/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/binutils/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/binutils/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/binutils/src/sys/conf/files#2 integrate .. //depot/projects/binutils/src/sys/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/binutils/src/sys/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/binutils/src/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/binutils/src/sys/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/binutils/src/sys/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/binutils/src/sys/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/binutils/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/binutils/src/sys/ddb/db_main.c#2 integrate .. //depot/projects/binutils/src/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/binutils/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/binutils/src/sys/dev/arl/if_arl.c#2 integrate .. //depot/projects/binutils/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/binutils/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/binutils/src/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/binutils/src/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/binutils/src/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/binutils/src/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/binutils/src/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/binutils/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/binutils/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/binutils/src/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/binutils/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/binutils/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/binutils/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/binutils/src/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/binutils/src/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/binutils/src/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/binutils/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/binutils/src/sys/dev/null/null.c#2 integrate .. //depot/projects/binutils/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/binutils/src/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/binutils/src/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/binutils/src/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/binutils/src/sys/dev/si/si.c#2 integrate .. //depot/projects/binutils/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/binutils/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/binutils/src/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/binutils/src/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/binutils/src/sys/dev/zs/zs.c#2 integrate .. //depot/projects/binutils/src/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/binutils/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/binutils/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/binutils/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/binutils/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/binutils/src/sys/fs/procfs/procfs_ioctl.c#2 integrate .. //depot/projects/binutils/src/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/binutils/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/binutils/src/sys/fs/umapfs/umap_vfsops.c#2 integrate .. //depot/projects/binutils/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/binutils/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/binutils/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/binutils/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/binutils/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/binutils/src/sys/i386/i386/io.c#2 integrate .. //depot/projects/binutils/src/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/binutils/src/sys/i386/i386/vm86.c#2 integrate .. //depot/projects/binutils/src/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/binutils/src/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/binutils/src/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/binutils/src/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/binutils/src/sys/i4b/driver/i4b_ipr.c#2 integrate .. //depot/projects/binutils/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/binutils/src/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_environment.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_exec.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_jail.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_ntptime.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_priv.c#1 branch .. //depot/projects/binutils/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_time.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/binutils/src/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/binutils/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/binutils/src/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/binutils/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/binutils/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/binutils/src/sys/kern/sysv_ipc.c#2 integrate .. //depot/projects/binutils/src/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/binutils/src/sys/kern/tty.c#2 integrate .. //depot/projects/binutils/src/sys/kern/tty_cons.c#2 integrate .. //depot/projects/binutils/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/binutils/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/binutils/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/binutils/src/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/binutils/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/binutils/src/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/binutils/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/binutils/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/binutils/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/binutils/src/sys/net/bpf.c#2 integrate .. //depot/projects/binutils/src/sys/net/if.c#2 integrate .. //depot/projects/binutils/src/sys/net/if_bridge.c#3 integrate .. //depot/projects/binutils/src/sys/net/if_gre.c#2 integrate .. //depot/projects/binutils/src/sys/net/if_ppp.c#2 integrate .. //depot/projects/binutils/src/sys/net/if_sl.c#2 integrate .. //depot/projects/binutils/src/sys/net/if_tap.c#2 integrate .. //depot/projects/binutils/src/sys/net/if_tun.c#2 integrate .. //depot/projects/binutils/src/sys/net/ppp_tty.c#2 integrate .. //depot/projects/binutils/src/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/binutils/src/sys/net/rtsock.c#2 integrate .. //depot/projects/binutils/src/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/binutils/src/sys/netatalk/at_control.c#2 integrate .. //depot/projects/binutils/src/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/binutils/src/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/binutils/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/binutils/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/binutils/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/binutils/src/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/binutils/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/in.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/ip_output.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/binutils/src/sys/netinet6/in6.c#2 integrate .. //depot/projects/binutils/src/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/binutils/src/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/binutils/src/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/binutils/src/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/binutils/src/sys/netipsec/ipsec_osdep.h#2 integrate .. //depot/projects/binutils/src/sys/netipx/ipx_pcb.c#2 integrate .. //depot/projects/binutils/src/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/binutils/src/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/binutils/src/sys/netncp/ncp_mod.c#2 integrate .. //depot/projects/binutils/src/sys/netncp/ncp_subr.h#2 integrate .. //depot/projects/binutils/src/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/binutils/src/sys/netsmb/smb_subr.h#2 integrate .. //depot/projects/binutils/src/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/binutils/src/sys/pc98/cbus/fdc.c#2 integrate .. //depot/projects/binutils/src/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/binutils/src/sys/security/audit/audit.c#2 integrate .. //depot/projects/binutils/src/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/binutils/src/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/binutils/src/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/binutils/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/binutils/src/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/binutils/src/sys/security/mac/mac_priv.c#1 branch .. //depot/projects/binutils/src/sys/security/mac/mac_system.c#2 integrate .. //depot/projects/binutils/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/binutils/src/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/binutils/src/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/binutils/src/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/binutils/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/binutils/src/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/binutils/src/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/binutils/src/sys/sys/jail.h#2 integrate .. //depot/projects/binutils/src/sys/sys/mac_policy.h#2 integrate .. //depot/projects/binutils/src/sys/sys/priv.h#1 branch .. //depot/projects/binutils/src/sys/sys/systm.h#2 integrate .. //depot/projects/binutils/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/binutils/src/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/binutils/src/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/binutils/src/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/binutils/src/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/binutils/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/binutils/src/sys/vm/swap_pager.c#2 integrate .. //depot/projects/binutils/src/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/binutils/src/tools/regression/bin/sh/errors/bad-parm-exp1.0#1 branch .. //depot/projects/binutils/src/tools/regression/bin/sh/errors/bad-parm-exp2.2#1 branch .. //depot/projects/binutils/src/tools/regression/bin/sh/errors/bad-parm-exp2.2.stderr#1 branch .. //depot/projects/binutils/src/tools/regression/bin/sh/errors/bad-parm-exp3.2#1 branch .. //depot/projects/binutils/src/tools/regression/bin/sh/errors/bad-parm-exp3.2.stderr#1 branch .. //depot/projects/binutils/src/tools/regression/bin/sh/errors/bad-parm-exp4.2#1 branch .. //depot/projects/binutils/src/tools/regression/bin/sh/errors/bad-parm-exp4.2.stderr#1 branch .. //depot/projects/binutils/src/tools/regression/bin/sh/errors/bad-parm-exp5.2#1 branch .. //depot/projects/binutils/src/tools/regression/bin/sh/errors/bad-parm-exp5.2.stderr#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.ascii.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.block.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.dddh.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.ddhd.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.ddhd2.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.ddhh.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.ddhh2.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.dhdd.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.dhdh.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.dhhd.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.dhhd2.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.dhhh.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.dhhh2.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.ed.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.grep.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hddd.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hddd2.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hddh.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hddh2.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hdhd.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hdhd2.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hdhh.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hdhh2.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hhdd.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hhdd2.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hhdh.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hhdh2.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hhhd.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hhhd2.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hhhh.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.hhhh2.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.n21.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.out#2 delete .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.sh#2 integrate .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.stutter.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.tabs.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.x.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.xaa.out#1 branch .. //depot/projects/binutils/src/tools/regression/usr.bin/jot/regress.yes.out#1 branch .. //depot/projects/binutils/src/usr.bin/jot/jot.1#2 integrate .. //depot/projects/binutils/src/usr.bin/jot/jot.c#2 integrate .. //depot/projects/binutils/src/usr.bin/ktrace/ktrace.1#2 integrate Differences ... ==== //depot/projects/binutils/src/bin/sh/expand.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.49 2006/02/04 14:37:50 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.50 2006/11/05 18:36:05 stefanf Exp $"); #include #include @@ -763,6 +763,11 @@ goto record; break; + case VSERROR: + c = p - var - 1; + error("${%.*s%s}: Bad substitution", c, var, + (c > 0 && *p != CTLENDVAR) ? "..." : ""); + default: abort(); } ==== //depot/projects/binutils/src/bin/sh/parser.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.57 2006/07/31 11:32:12 yar Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.58 2006/11/05 18:36:05 stefanf Exp $"); #include #include @@ -1228,12 +1228,17 @@ c = pgetc(); } } else { - if (! is_special(c)) -badsub: synerror("Bad substitution"); - USTPUTC(c, out); - c = pgetc(); + if (! is_special(c)) { + subtype = VSERROR; + if (c == '}') + pungetc(); + else + USTPUTC(c, out); + } else { + USTPUTC(c, out); + c = pgetc(); + } } - STPUTC('=', out); flags = 0; if (subtype == 0) { switch (c) { @@ -1243,9 +1248,13 @@ /*FALLTHROUGH*/ default: p = strchr(types, c); - if (p == NULL) - goto badsub; - subtype = p - types + VSNORMAL; + if (p == NULL) { + if (flags == VSNUL) + STPUTC(':', out); + STPUTC(c, out); + subtype = VSERROR; + } else + subtype = p - types + VSNORMAL; break; case '%': case '#': @@ -1261,9 +1270,10 @@ break; } } - } else { + } else if (subtype != VSERROR) { pungetc(); } + STPUTC('=', out); if (subtype != VSLENGTH && (dblquote || arinest)) flags |= VSQUOTE; *(stackblock() + typeloc) = subtype | flags; ==== //depot/projects/binutils/src/bin/sh/parser.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)parser.h 8.3 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/parser.h,v 1.10 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/parser.h,v 1.11 2006/11/05 18:36:05 stefanf Exp $ */ /* control characters in argument strings */ @@ -60,6 +60,7 @@ #define VSTRIMRIGHT 0x8 /* ${var%pattern} */ #define VSTRIMRIGHTMAX 0x9 /* ${var%%pattern} */ #define VSLENGTH 0xa /* ${#var} */ +#define VSERROR 0xb /* Syntax error, issue when expanded */ /* ==== //depot/projects/binutils/src/etc/amd.map#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/amd.map,v 1.9 2002/05/15 22:24:29 obrien Exp $ +# $FreeBSD: src/etc/amd.map,v 1.10 2006/11/06 01:42:11 obrien Exp $ # /defaults type:=host;fs:=${autodir}/${rhost}/host;rhost:=${key} -* opts:=rw,grpid,resvport,vers=3,proto=udp,nosuid,nodev +* opts:=rw,grpid,resvport,vers=3,proto=tcp,nosuid,nodev ==== //depot/projects/binutils/src/etc/defaults/rc.conf#2 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.301 2006/10/28 20:08:12 phk Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.302 2006/11/06 15:11:24 rwatson Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -478,6 +478,7 @@ ############################################################## auditd_enable="NO" # Run the audit daemon. +auditd_program="/usr/sbin/auditd" # Path to the audit daemon. auditd_flags="" # Which options to pass to the audit daemon. cached_enable="NO" # Run the nsswitch caching daemon. cron_enable="YES" # Run the periodic job daemon. ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libiberty/config.h#3 (text+ko) ==== ==== //depot/projects/binutils/src/gnu/usr.bin/cc/cc_tools/arm.md.diff#2 (text+ko) ==== @@ -1,20 +1,13 @@ -$FreeBSD: src/gnu/usr.bin/cc/cc_tools/arm.md.diff,v 1.1 2006/09/18 17:08:32 imp Exp $ +$FreeBSD: src/gnu/usr.bin/cc/cc_tools/arm.md.diff,v 1.2 2006/11/06 02:49:19 obrien Exp $ Index: arm.md =================================================================== RCS file: /cognet/ncvs/src/contrib/gcc/config/arm/arm.md,v retrieving revision 1.1.1.7 diff -u -p -r1.1.1.7 arm.md --- arm.md 3 Jun 2005 03:28:42 -0000 1.1.1.7 -+++ arm.md 29 Aug 2005 12:39:39 -0000 -@@ -8836,12 +8836,12 @@ - ldm[2] = operands[4]; - } - if (GET_CODE (XEXP (operands[2], 0)) != REG) -- val1 = INTVAL (XEXP (XEXP (operands[2], 0), 1)); -+ val1 = INTVAL (XEXP (XEXP (operands[2], 0), 1)); - if (GET_CODE (XEXP (operands[3], 0)) != REG) -- val2 = INTVAL (XEXP (XEXP (operands[3], 0), 1)); -+ val2 = INTVAL (XEXP (XEXP (operands[3], 0), 1)); ++++ arm.md 6 Nov 2006 02:44:36 -0000 +@@ -8840,7 +8840,7 @@ + val2 = INTVAL (XEXP (XEXP (operands[3], 0), 1)); arith[0] = operands[0]; arith[3] = operands[1]; - if (val1 < val2) @@ -22,7 +15,7 @@ { arith[1] = ldm[1]; arith[2] = ldm[2]; -@@ -8871,7 +8871,7 @@ +@@ -8870,7 +8870,7 @@ else output_asm_insn (\"ldm%?ia\\t%0, {%1, %2}\", ldm); } @@ -31,7 +24,7 @@ { ldm[0] = XEXP (operands[2], 0); if (val1 < val2) -@@ -8879,6 +8879,14 @@ +@@ -8878,6 +8878,14 @@ else output_asm_insn (\"ldm%?da\\t%0, {%1, %2}\", ldm); } ==== //depot/projects/binutils/src/lib/libarchive/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.50 2006/09/05 05:59:45 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.52 2006/11/06 00:28:46 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -13,12 +13,9 @@ ARCHIVE_API_MAJOR!= echo ${VERSION} | sed -e 's/\..*//' ARCHIVE_API_MINOR!= echo ${VERSION} | sed -e 's/[0-9]*\.//' | sed -e 's/\..*//' -# The FreeBSD SHLIB_MAJOR is computed from the above values. -# To bump SHLIB_MAJOR, increase the MINOR number in "version" file. -SHLIB_MAJOR!= echo $$((${ARCHIVE_API_MAJOR} + ${ARCHIVE_API_MINOR})) -# The SHLIB_MAJOR computation above attempts to match the -# version number generated by libtool. (This may change -# when the FreeBSD port of libtool gets fixed.) +# FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. +# It has no real relation to the version number above. +SHLIB_MAJOR= 3 CFLAGS+= -DPACKAGE_NAME=\"lib${LIB}\" CFLAGS+= -DPACKAGE_VERSION=\"${VERSION}\" @@ -187,7 +184,6 @@ MLINKS+= archive_write.3 archive_write_open.3 MLINKS+= archive_write.3 archive_write_open_fd.3 MLINKS+= archive_write.3 archive_write_open_file.3 -MLINKS+= archive_write.3 archive_write_prepare.3 MLINKS+= archive_write.3 archive_write_set_bytes_per_block.3 MLINKS+= archive_write.3 archive_write_set_bytes_in_last_block.3 MLINKS+= archive_write.3 archive_write_set_callbacks.3 ==== //depot/projects/binutils/src/lib/libarchive/archive_write.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.13 2005/11/24 10:06:05 ru Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.14 2006/11/06 00:28:46 kientzle Exp $ .\" .Dd January 8, 2005 .Dt archive_write 3 @@ -42,7 +42,6 @@ .Nm archive_write_open , .Nm archive_write_open_fd , .Nm archive_write_open_file , -.Nm archive_write_prepare , .Nm archive_write_header , .Nm archive_write_data , .Nm archive_write_close , ==== //depot/projects/binutils/src/lib/libarchive/archive_write.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.18 2006/09/05 05:59:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.19 2006/11/06 00:16:40 kientzle Exp $"); /* * This file contains the "essential" portions of the write API, that @@ -47,8 +47,6 @@ #include "archive_entry.h" #include "archive_private.h" -extern char **environ; - /* * Allocate, initialize and return an archive object. */ ==== //depot/projects/binutils/src/lib/libc/arm/arith.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/arm/arith.h,v 1.1 2004/05/14 12:04:29 cognet Exp $ + * $FreeBSD: src/lib/libc/arm/arith.h,v 1.2 2006/11/06 20:49:23 cognet Exp $ */ /* @@ -11,6 +11,11 @@ * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ +#ifndef __ARMEB__ #define IEEE_8087 #define Arith_Kind_ASL 1 #define Sudden_Underflow +#else +#define IEEE_MC68k +#define Arith_Kind_ASL 2 +#endif ==== //depot/projects/binutils/src/lib/libc/net/Makefile.inc#2 (text+ko) ==== @@ -1,17 +1,17 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.61 2006/07/26 08:36:46 yar Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.62 2006/11/06 22:07:47 cognet Exp $ # machine-independent net sources -.PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net +.PATH: ${.CURDIR}/net -SRCS+= addr2ascii.c ascii2addr.c base64.c ether_addr.c eui64.c \ +SRCS+= addr2ascii.c ascii2addr.c base64.c ether_addr.c eui64.c \ gai_strerror.c getaddrinfo.c \ gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \ getifaddrs.c getifmaddrs.c getnameinfo.c \ getnetbydns.c getnetbyht.c getnetbynis.c getnetnamadr.c \ getproto.c getprotoent.c getprotoname.c getservent.c \ if_indextoname.c if_nameindex.c if_nametoindex.c \ - ip6opt.c linkaddr.c map_v4v6.c name6.c \ + ip6opt.c linkaddr.c map_v4v6.c name6.c ntoh.c \ nsdispatch.c nslexer.c nsparser.c nss_compat.c \ rcmd.c rcmdsh.c recv.c rthdr.c send.c sockatmark.c vars.c @@ -42,11 +42,6 @@ ${LEX} ${LFLAGS} -o/dev/stdout ${.IMPSRC} | \ 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" -.endif - MAN+= addr2ascii.3 byteorder.3 ethers.3 eui64.3 \ getaddrinfo.3 gai_strerror.3 gethostbyname.3 \ getifaddrs.3 getifmaddrs.3 getipnodebyname.3 \ ==== //depot/projects/binutils/src/lib/libc/sys/extattr_get_file.2#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/lib/libc/sys/extattr_get_file.2,v 1.17 2005/06/10 16:54:17 rodrigc Exp $ +.\" $FreeBSD: src/lib/libc/sys/extattr_get_file.2,v 1.18 2006/11/06 15:12:43 rwatson Exp $ .\" .Dd February 23, 2005 .Dt EXTATTR 2 @@ -48,7 +48,6 @@ .Sh SYNOPSIS .In sys/types.h .In sys/extattr.h -.In sys/uio.h .Ft ssize_t .Fn extattr_get_fd "int fd" "int attrnamespace" "const char *attrname" "void *data" "size_t nbytes" .Ft int ==== //depot/projects/binutils/src/lib/libstand/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libstand/Makefile,v 1.56 2006/08/22 08:03:01 ru Exp $ +# $FreeBSD: src/lib/libstand/Makefile,v 1.57 2006/11/06 22:07:45 cognet Exp $ # Originally from $NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $ # # Notes: @@ -37,13 +37,9 @@ # private (pruned) versions of libc string functions SRCS+= strcasecmp.c -# byte order functions from libc -.if ${MACHINE_ARCH} != "amd64" -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/net -.else -.PATH: ${.CURDIR}/../libc/i386/net -.endif -SRCS+= htons.S ntohs.S htonl.S ntohl.S +.PATH: ${.CURDIR}/../libc/net + +SRCS+= ntoh.c # string functions from libc .PATH: ${.CURDIR}/../libc/string ==== //depot/projects/binutils/src/lib/libutil/login_ok.3#2 (text+ko) ==== @@ -17,7 +17,7 @@ .\" 5. Modifications may be freely made to this file providing the above .\" conditions are met. .\" -.\" $FreeBSD: src/lib/libutil/login_ok.3,v 1.14 2004/07/02 23:52:19 ru Exp $ +.\" $FreeBSD: src/lib/libutil/login_ok.3,v 1.15 2006/11/05 19:00:08 trhodes Exp $ .\" .Dd January 2, 1997 .Os @@ -56,7 +56,7 @@ An empty .Em ttys.allow list (or if no such capability exists for -the give login class) logins via any tty device are allowed unless +the given login class) logins via any tty device are allowed unless the .Em ttys.deny list exists and is non-empty, and the device or its ==== //depot/projects/binutils/src/sbin/devfs/devfs.8#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.15 2005/06/14 11:24:55 ru Exp $ +.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.17 2006/11/05 20:12:32 danger Exp $ .\" -.Dd July 1, 2002 +.Dd November 5, 2006 .Dt DEVFS 8 .Os .Sh NAME @@ -237,7 +237,21 @@ .Sh FILES .Bl -tag -compact .It Pa /etc/defaults/devfs.rules +Default +.Nm +configuration file. .It Pa /etc/devfs.rules +Local +.Nm +configuration file. +.It Pa /etc/devfs.conf +Boot-time +.Nm +configuration file. +.It Pa /usr/share/examples/etc/devfs.conf +Example boot-time +.Nm +configuration file. .El .Sh EXAMPLES When the system boots, @@ -348,6 +362,8 @@ .Xr jail 2 , .Xr glob 3 , .Xr devfs 5 , +.Xr devfs.conf 5 , +.Xr devfs.rules 5 , .Xr chown 8 , .Xr jail 8 , .Xr mknod 8 ==== //depot/projects/binutils/src/sbin/routed/main.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/routed/main.c,v 1.18 2005/05/31 20:28:48 stefanf Exp $ + * $FreeBSD: src/sbin/routed/main.c,v 1.19 2006/11/05 14:49:47 trhodes Exp $ */ #include "defs.h" @@ -45,10 +45,10 @@ __RCSID("$NetBSD$"); #include #elif defined(__FreeBSD__) -__RCSID("$FreeBSD: src/sbin/routed/main.c,v 1.18 2005/05/31 20:28:48 stefanf Exp $"); +__RCSID("$FreeBSD: src/sbin/routed/main.c,v 1.19 2006/11/05 14:49:47 trhodes Exp $"); #else -__RCSID("$Revision: 2.27 $"); -#ident "$Revision: 2.27 $" +__RCSID("$Revision: 2.31 $"); +#ident "$Revision: 2.31 $" #endif pid_t mypid; @@ -133,7 +133,7 @@ (void)gethostname(myname, sizeof(myname)-1); (void)gethost(myname, &myaddr); - while ((n = getopt(argc, argv, "sqdghmpAtvT:F:P:")) != -1) { + while ((n = getopt(argc, argv, "sqdghmAtvT:F:P:")) != -1) { switch (n) { case 's': supplier = 1; @@ -219,7 +219,7 @@ case 'v': /* display version */ verbose++; - msglog("version 2.25"); + msglog("version 2.31"); break; default: @@ -237,7 +237,7 @@ goto usage; if (argc != 0) { usage: - logbad(0, "usage: routed [-sqdghmpAtv] [-T tracefile]" + logbad(0, "usage: routed [-sqdghmAtv] [-T tracefile]" " [-F net[,metric]] [-P parms]"); } if (geteuid() != 0) { @@ -863,14 +863,15 @@ va_start(args, p); vsyslog(LOG_ERR, p, args); - + va_end(args); if (ftrace != 0) { if (ftrace == stdout) (void)fputs("routed: ", ftrace); + va_start(args, p); (void)vfprintf(ftrace, p, args); + va_end(args); (void)fputc('\n', ftrace); } - va_end(args); } @@ -889,8 +890,6 @@ struct msg_sub *ms1, *ms; const char *p1; - va_start(args, p); - /* look for the oldest slot in the table * or the slot for the bad router. */ @@ -925,15 +924,18 @@ trace_flush(); for (p1 = p; *p1 == ' '; p1++) continue; + va_start(args, p); vsyslog(LOG_ERR, p1, args); + va_end(args); } /* always display the message if tracing */ if (ftrace != 0) { + va_start(args, p); (void)vfprintf(ftrace, p, args); + va_end(args); (void)fputc('\n', ftrace); } - va_end(args); } @@ -946,12 +948,13 @@ va_start(args, p); vsyslog(LOG_ERR, p, args); - + va_end(args); (void)fputs("routed: ", stderr); + va_start(args, p); (void)vfprintf(stderr, p, args); + va_end(args); (void)fputs("; giving up\n",stderr); (void)fflush(stderr); - va_end(args); if (dump) abort(); ==== //depot/projects/binutils/src/share/man/man4/ips.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ips.4,v 1.6 2006/06/18 09:53:00 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ips.4,v 1.7 2006/11/05 08:55:21 maxim Exp $ .\" -.Dd August 8, 2004 +.Dd November 4, 2006 .Dt IPS 4 .Os .Sh NAME @@ -89,6 +89,8 @@ ServeRAID Series 5 .It ServeRAID 6i/6M +.It +ServeRAID 7t/7k/7M .El .Sh DIAGNOSTICS Several error codes may be shown when the card initializes the ==== //depot/projects/binutils/src/share/man/man8/nanobsd.8#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man8/nanobsd.8,v 1.1 2006/08/29 09:12:48 danger Exp $ +.\" $FreeBSD: src/share/man/man8/nanobsd.8,v 1.2 2006/11/05 20:08:58 danger Exp $ .\" .Dd August 28, 2006 .Dt NANOBSD 8 @@ -265,7 +265,7 @@ .Sh FILES .Bl -tag -width ".Pa src/tools/tools/nanobsd" -compact .It Pa src/tools/tools/nanobsd -base directory of the +Base directory of the .Nm NanoBSD build script. .El ==== //depot/projects/binutils/src/share/man/man9/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.282 2006/10/05 12:40:44 ru Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.283 2006/11/06 13:37:18 rwatson Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -188,6 +188,7 @@ pmap_zero_page.9 \ printf.9 \ prison_check.9 \ + priv.9 \ pseudofs.9 \ psignal.9 \ random.9 \ ==== //depot/projects/binutils/src/share/man/man9/suser.9#2 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/suser.9,v 1.29 2006/05/16 22:58:43 keramida Exp $ +.\" $FreeBSD: src/share/man/man9/suser.9,v 1.31 2006/11/06 14:26:43 ru Exp $ .\" -.Dd April 2, 2002 +.Dd November 6, 2006 .Dt SUSER 9 .Os .Sh NAME @@ -54,6 +54,12 @@ .Fn suser_cred functions check if the credentials given include superuser powers. .Pp +These interfaces have now been obsoleted by +.Xr priv 9 , +and are provided only for compatibility with third party kernel modules that +have not yet been updated to the new interface. +They should not be used in any new kernel code. +.Pp The .Fn suser function is the most common, and should be used unless special @@ -123,7 +129,8 @@ in which a TRUE response indicates superuser powers. .Sh SEE ALSO .Xr chroot 2 , -.Xr jail 2 +.Xr jail 2 , +.Xr priv 9 .Sh BUGS The .Fn suser ==== //depot/projects/binutils/src/share/misc/bsd-family-tree#2 (text+ko) ==== @@ -198,14 +198,16 @@ | | | | | NetBSD 2.1 | | | | | | | | | | | | | NetBSD 3.0 | | - | | | | | | | DragonFly 1.4.0 - | | | | | | OpenBSD 3.9 | - | FreeBSD | | | | | | - | 6.1 | | | | | | - | | FreeBSD 5.5 | | | | | - | | | | NetBSD 3.0.1 | DragonFly 1.6.0 - | | | | | | - | V | | OpenBSD 4.0 | + | | | | | | | | DragonFly 1.4.0 + | | | | | | | OpenBSD 3.9 | + | FreeBSD | | | | | | | + | 6.1 | | | | | | | + | | FreeBSD 5.5 | | | | | | + | | | | | NetBSD 3.0.1 | DragonFly 1.6.0 + | | | | | | | | + | V | | | | OpenBSD 4.0 | + | | | | NetBSD 3.0.2 | | + | | | NetBSD 3.1 | | | | | | | FreeBSD 7 -current | NetBSD -current OpenBSD -current | | | | | | @@ -454,6 +456,8 @@ NetBSD 3.0.1 2006-07-24 [NBD] (security/critical release) DragonFly 1.6.0 2006-07-24 [DFB] OpenBSD 4.0 2006-11-01 [OBD] +NetBSD 3.0.2 2006-11-04 [NBD] (security/critical release) +NetBSD 3.1 2006-11-04 [NBD] Bibliography ------------------------ @@ -514,4 +518,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.108 2006/11/01 04:56:35 maxim Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.109 2006/11/05 15:56:45 maxim Exp $ ==== //depot/projects/binutils/src/share/mk/bsd.endian.mk#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/share/mk/bsd.endian.mk,v 1.3 2006/08/22 07:51:10 ru Exp $ +# $FreeBSD: src/share/mk/bsd.endian.mk,v 1.4 2006/11/05 15:33:26 cognet Exp $ .if ${MACHINE_ARCH} == "amd64" || \ ${MACHINE_ARCH} == "i386" || \ ${MACHINE_ARCH} == "ia64" || \ - (${MACHINE_ARCH} == "arm" && !defined(ARM_BIG_ENDIAN)) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 7 01:28:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4CBB16A415; Tue, 7 Nov 2006 01:28:40 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 AF6A816A40F for ; Tue, 7 Nov 2006 01:28:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40D8643D45 for ; Tue, 7 Nov 2006 01:28:40 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA71Setp088937 for ; Tue, 7 Nov 2006 01:28:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA71SdXm088934 for perforce@freebsd.org; Tue, 7 Nov 2006 01:28:39 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Nov 2006 01:28:39 GMT Message-Id: <200611070128.kA71SdXm088934@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109407 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 01:28:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=109407 Change 109407 by sam@sam_ebb on 2006/11/07 01:28:29 add missing bus_space_handle_t param to bus_space_unmap Affected files ... .. //depot/projects/arm/src/sys/arm/arm/nexus_io.c#3 edit .. //depot/projects/arm/src/sys/arm/include/bus.h#5 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#8 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_space.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/nexus_io.c#3 (text+ko) ==== @@ -152,7 +152,7 @@ void -nexus_bs_unmap(void *t, bus_size_t size) +nexus_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) { /* * Temporary implementation ==== //depot/projects/arm/src/sys/arm/include/bus.h#5 (text+ko) ==== @@ -93,7 +93,7 @@ /* mapping/unmapping */ int (*bs_map) (void *, bus_addr_t, bus_size_t, int, bus_space_handle_t *); - void (*bs_unmap) (void *, bus_size_t); + void (*bs_unmap) (void *, bus_space_handle_t, bus_size_t); int (*bs_subregion) (void *, bus_space_handle_t, bus_size_t, bus_size_t, bus_space_handle_t *); @@ -471,7 +471,8 @@ bus_size_t size, int cacheable, bus_space_handle_t *bshp); #define bs_unmap_proto(f) \ -void __bs_c(f,_bs_unmap) (void *t, bus_size_t size); +void __bs_c(f,_bs_unmap) (void *t, bus_space_handle_t bsh, \ + bus_size_t size); #define bs_subregion_proto(f) \ int __bs_c(f,_bs_subregion) (void *t, bus_space_handle_t bsh, \ ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#8 (text+ko) ==== @@ -231,7 +231,7 @@ } void -ixp425_pci_io_bs_unmap(void *t, bus_size_t size) +ixp425_pci_io_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) { /* Nothing to do. */ } @@ -424,7 +424,7 @@ } void -ixp425_pci_mem_bs_unmap(void *t, bus_size_t size) +ixp425_pci_mem_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) { vm_offset_t va, endva; ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_space.c#3 (text+ko) ==== @@ -166,7 +166,7 @@ } void -ixp425_bs_unmap(void *t, bus_size_t size) +ixp425_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) { vm_offset_t va, endva; From owner-p4-projects@FreeBSD.ORG Tue Nov 7 01:29:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8994F16A412; Tue, 7 Nov 2006 01:29:42 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4A0AC16A403 for ; Tue, 7 Nov 2006 01:29:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0811D43D55 for ; Tue, 7 Nov 2006 01:29:42 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA71Tf8p088998 for ; Tue, 7 Nov 2006 01:29:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA71TfHc088995 for perforce@freebsd.org; Tue, 7 Nov 2006 01:29:41 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Nov 2006 01:29:41 GMT Message-Id: <200611070129.kA71TfHc088995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109408 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 01:29:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=109408 Change 109408 by sam@sam_ebb on 2006/11/07 01:29:23 o add comments o be pedantic and cleanup resources in detach Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 (text+ko) ==== @@ -59,6 +59,20 @@ #include __FBSDID("$FreeBSD$"); +/* + * Intel XScale Queue Manager support. + * + * Each IXP4XXX device has a hardware block that implements a priority + * queue manager that is shared between the XScale cpu and the backend + * devices (such as the NPE). Queues are accessed by reading/writing + * special memory locations. The queue contents are mapped into a shared + * SRAM region with entries managed in a circular buffer. The XScale + * processor can receive interrupts based on queue contents (a condition + * code determines when interrupts should be delivered). + * + * The code here basically replaces the qmgr class in the Intel Access + * Library (IAL). + */ #include #include #include @@ -121,6 +135,7 @@ bus_space_handle_t sc_ioh; struct resource *sc_irq; /* IRQ resource */ void *sc_ih; /* interrupt handler */ + int sc_rid; /* resource id for irq */ struct qmgrInfo qinfo[IX_QMGR_MAX_NUM_QUEUES]; /* @@ -193,7 +208,7 @@ { struct ixpqmgr_softc *sc = device_get_softc(dev); struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); - int rid, i; + int i; ixpqmgr_sc = sc; @@ -204,7 +219,7 @@ panic("%s: Cannot map registers", device_get_name(dev)); /* NB: we only use the lower 32 q's */ - sc->sc_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, + sc->sc_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->sc_rid, IXP425_INT_QUE1_32, IXP425_INT_QUE33_64, 2, RF_ACTIVE); if (!sc->sc_irq) panic("Unable to allocate the qmgr irqs.\n"); @@ -288,8 +303,9 @@ struct ixpqmgr_softc *sc = device_get_softc(dev); aqm_reset(sc); /* disable interrupts */ - /* XXX unmap memory */ - /* XXX free irq */ + bus_teardown_intr(dev, sc->sc_irq, sc->sc_ih); + bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid, sc->sc_irq); + bus_space_unmap(sc->sc_iot, sc->sc_ioh, IXP425_QMGR_SIZE); } int From owner-p4-projects@FreeBSD.ORG Tue Nov 7 01:33:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E563316A47B; Tue, 7 Nov 2006 01:33:47 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B929416A416 for ; Tue, 7 Nov 2006 01:33:47 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C82743D45 for ; Tue, 7 Nov 2006 01:33:47 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA71Xl5P090339 for ; Tue, 7 Nov 2006 01:33:47 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA71XlK7090336 for perforce@freebsd.org; Tue, 7 Nov 2006 01:33:47 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Nov 2006 01:33:47 GMT Message-Id: <200611070133.kA71XlK7090336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109409 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 01:33:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=109409 Change 109409 by sam@sam_ebb on 2006/11/07 01:33:10 lots of cleanups: o single-thread access to the mailbox registers o eliminate spinning waiting for a message reply; instead enable interrupts and do sleep/wakeup to get the msg response from the NPE o remove ixpnpe_sendmsg and ipxnpe_recvmsg; they are now dangerous to use and are otherwise we really need clients to use the send+recv api o be pedantic and cleanup resources on detach Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#3 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#3 (text+ko) ==== @@ -69,6 +69,9 @@ * for loading microcode images and the associated NPE CPU * manipulations (start, stop, reset). * + * The code here basically replaces the npeDl and npeMh classes + * in the Intel Access Library (IAL). + * * NB: Microcode images are loaded with firmware(9). To * include microcode in a static kernel include the * ixpnpe_fw device. Otherwise the firmware will be @@ -103,8 +106,12 @@ device_t sc_dev; bus_space_tag_t sc_iot; bus_space_handle_t sc_ioh; + bus_size_t sc_size; /* size of mapped register window */ struct resource *sc_irq; /* IRQ resource */ void *sc_ih; /* interrupt handler */ + struct mtx sc_mtx; /* mailbox lock */ + uint32_t sc_msg[2]; /* reply msg collected in ixpnpe_intr */ + int sc_msgwaiting; /* sc_msg holds valid data */ int validImage; /* valid ucode image loaded */ int started; /* NPE is started */ @@ -221,9 +228,7 @@ static int npe_ctx_reg_write(struct ixpnpe_softc *, uint32_t ctxtNum, uint32_t ctxtReg, uint32_t ctxtRegVal, int verify); -#if 0 static void ixpnpe_intr(void *arg); -#endif static uint32_t npe_reg_read(struct ixpnpe_softc *sc, bus_size_t off) @@ -246,16 +251,17 @@ struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); struct ixpnpe_softc *sc; bus_addr_t base; - bus_size_t size; int rid, irq; /* XXX M_BUS */ sc = malloc(sizeof(struct ixpnpe_softc), M_TEMP, M_WAITOK | M_ZERO); sc->sc_dev = dev; sc->sc_iot = sa->sc_iot; + mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); + if (device_get_unit(dev) == 0) { base = IXP425_NPE_B_HWBASE; - size = IXP425_NPE_B_SIZE; + sc->sc_size = IXP425_NPE_B_SIZE; irq = IXP425_INT_NPE_B; /* size of instruction memory */ @@ -264,7 +270,7 @@ sc->dataMemSize = IX_NPEDL_DATA_MEMSIZE_WORDS_NPEB; } else { base = IXP425_NPE_C_HWBASE; - size = IXP425_NPE_C_SIZE; + sc->sc_size = IXP425_NPE_C_SIZE; irq = IXP425_INT_NPE_C; /* size of instruction memory */ @@ -272,7 +278,7 @@ /* size of data memory */ sc->dataMemSize = IX_NPEDL_DATA_MEMSIZE_WORDS_NPEC; } - if (bus_space_map(sc->sc_iot, base, size, 0, &sc->sc_ioh)) + if (bus_space_map(sc->sc_iot, base, sc->sc_size, 0, &sc->sc_ioh)) panic("%s: Cannot map registers", device_get_name(dev)); /* @@ -284,10 +290,11 @@ if (!sc->sc_irq) panic("%s: Unable to allocate irq %u", device_get_name(dev), irq); /* XXX could be a source of entropy */ -#if 0 bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET | INTR_MPSAFE, ixpnpe_intr, sc, &sc->sc_ih); -#endif + /* enable output fifo interrupts (NB: must also set OFIFO Write Enable) */ + npe_reg_write(sc, IX_NPECTL, + npe_reg_read(sc, IX_NPECTL) | (IX_NPECTL_OFE | IX_NPECTL_OFWE)); return sc; } @@ -295,8 +302,13 @@ void ixpnpe_detach(struct ixpnpe_softc *sc) { - /* XXX release irq */ - /* XXX unmap memory */ + /* disable output fifo interrupts */ + npe_reg_write(sc, IX_NPECTL, + npe_reg_read(sc, IX_NPECTL) &~ (IX_NPECTL_OFE | IX_NPECTL_OFWE)); + + bus_teardown_intr(sc->sc_dev, sc->sc_irq, sc->sc_ih); + bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_size); + mtx_destroy(&sc->sc_mtx); free(sc, M_TEMP); } @@ -305,11 +317,14 @@ { int error; - error = npe_cpu_stop(sc); /* stop NPE */ + mtx_lock(&sc->sc_mtx); + error = npe_cpu_stop(sc); /* stop NPE */ if (error == 0) error = npe_cpu_reset(sc); /* reset it */ if (error == 0) - sc->started = 0; /* mark stopped */ + sc->started = 0; /* mark stopped */ + mtx_unlock(&sc->sc_mtx); + DPRINTF(sc->sc_dev, "%s: error %d\n", __func__, error); return error; } @@ -319,12 +334,15 @@ { int error; + mtx_lock(&sc->sc_mtx); if (!sc->started) { error = npe_cpu_start(sc); if (error == 0) sc->started = 1; } else error = 0; + mtx_unlock(&sc->sc_mtx); + DPRINTF(sc->sc_dev, "%s: error %d\n", __func__, error); return error; } @@ -334,9 +352,12 @@ { int error; + mtx_lock(&sc->sc_mtx); error = npe_cpu_stop(sc); if (error == 0) sc->started = 0; + mtx_unlock(&sc->sc_mtx); + DPRINTF(sc->sc_dev, "%s: error %d\n", __func__, error); return error; } @@ -425,6 +446,7 @@ * currently loaded images. If a critical error occured * during download, record that the NPE has an invalid image */ + mtx_lock(&sc->sc_mtx); error = npe_load_image(sc, imageCodePtr, 1 /*VERIFY*/); if (error == 0) { sc->validImage = 1; @@ -433,6 +455,7 @@ sc->validImage = 0; } sc->functionalityId = IX_NPEDL_FUNCTIONID_FROM_IMAGEID_GET(imageId); + mtx_unlock(&sc->sc_mtx); done: firmware_put(fw, FIRMWARE_UNLOAD); DPRINTF(sc->sc_dev, "%s: error %d\n", __func__, error); @@ -808,7 +831,7 @@ #undef N } -int +static int npe_cpu_start(struct ixpnpe_softc *sc) { uint32_t ecsRegVal; @@ -1214,27 +1237,18 @@ } } -#if 0 -static void -ixpnpe_intr(void *arg) -{ - struct ixpnpe_softc *sc = arg; - uint32_t status; - - status = npe_reg_read(sc, IX_NPESTAT); - device_printf(sc->sc_dev, "%s: status 0x%x\n", __func__, status); -} -#endif - +/* + * NPE Mailbox support. + */ #define IX_NPEMH_MAXTRIES 100000 static int -ixpnpe_ififo_wait(struct ixpnpe_softc *sc) +ixpnpe_ofifo_wait(struct ixpnpe_softc *sc) { int i; for (i = 0; i < IX_NPEMH_MAXTRIES; i++) { - if (npe_reg_read(sc, IX_NPESTAT) & IX_NPESTAT_IFNF) + if (npe_reg_read(sc, IX_NPESTAT) & IX_NPESTAT_OFNE) return 1; DELAY(10); } @@ -1243,54 +1257,102 @@ return 0; } -int -ixpnpe_sendmsg(struct ixpnpe_softc *sc, const uint32_t msg[2]) +static void +ixpnpe_intr(void *arg) { + struct ixpnpe_softc *sc = arg; + uint32_t status; - if (!ixpnpe_ififo_wait(sc)) - return EIO; - npe_reg_write(sc, IX_NPEFIFO, msg[0]); - if (!ixpnpe_ififo_wait(sc)) - return EIO; - npe_reg_write(sc, IX_NPEFIFO, msg[1]); - return 0; + status = npe_reg_read(sc, IX_NPESTAT); + if ((status & IX_NPESTAT_OFINT) == 0) { + /* NB: should not happen */ + device_printf(sc->sc_dev, "%s: status 0x%x\n", __func__, status); + /* XXX must silence interrupt? */ + return; + } + /* + * A message is waiting in the output FIFO, copy it so + * the interrupt will be silenced; then signal anyone + * waiting to collect the result. + */ + sc->sc_msgwaiting = -1; /* NB: error indicator */ + if (ixpnpe_ofifo_wait(sc)) { + sc->sc_msg[0] = npe_reg_read(sc, IX_NPEFIFO); + if (ixpnpe_ofifo_wait(sc)) { + sc->sc_msg[1] = npe_reg_read(sc, IX_NPEFIFO); + sc->sc_msgwaiting = 1; /* successful fetch */ + } + } + wakeup_one(sc); } static int -ixpnpe_ofifo_wait(struct ixpnpe_softc *sc) +ixpnpe_ififo_wait(struct ixpnpe_softc *sc) { int i; for (i = 0; i < IX_NPEMH_MAXTRIES; i++) { - if (npe_reg_read(sc, IX_NPESTAT) & IX_NPESTAT_OFNE) + if (npe_reg_read(sc, IX_NPESTAT) & IX_NPESTAT_IFNF) return 1; DELAY(10); } - device_printf(sc->sc_dev, "%s: timeout, last status 0x%x\n", - __func__, npe_reg_read(sc, IX_NPESTAT)); return 0; } -int -ixpnpe_recvmsg(struct ixpnpe_softc *sc, uint32_t msg[2]) +static int +ixpnpe_sendmsg_locked(struct ixpnpe_softc *sc, const uint32_t msg[2]) +{ + int error = 0; + + mtx_assert(&sc->sc_mtx, MA_OWNED); + + sc->sc_msgwaiting = 0; + if (ixpnpe_ififo_wait(sc)) { + npe_reg_write(sc, IX_NPEFIFO, msg[0]); + if (ixpnpe_ififo_wait(sc)) + npe_reg_write(sc, IX_NPEFIFO, msg[1]); + else + error = EIO; + } else + error = EIO; + + if (error) + device_printf(sc->sc_dev, "input FIFO timeout, msg [0x%x,0x%x]\n", + msg[0], msg[1]); + return error; +} + +static int +ixpnpe_recvmsg_locked(struct ixpnpe_softc *sc, uint32_t msg[2]) { - if (!ixpnpe_ofifo_wait(sc)) - return EIO; - msg[0] = npe_reg_read(sc, IX_NPEFIFO); - if (!ixpnpe_ofifo_wait(sc)) - return EIO; - msg[1] = npe_reg_read(sc, IX_NPEFIFO); - return 0; + mtx_assert(&sc->sc_mtx, MA_OWNED); + + if (!sc->sc_msgwaiting) + msleep(sc, &sc->sc_mtx, 0, "npemh", 0); + bcopy(sc->sc_msg, msg, sizeof(sc->sc_msg)); + /* NB: sc_msgwaiting != 1 means the ack fetch failed */ + return sc->sc_msgwaiting != 1 ? EIO : 0; } +/* + * Send a msg to the NPE and wait for a reply. We use the + * private mutex and sleep until an interrupt is received + * signalling the availability of data in the output FIFO + * so the caller cannot be holding a mutex. May be better + * piggyback on the caller's mutex instead but that would + * make other locking confusing. + */ int ixpnpe_sendandrecvmsg(struct ixpnpe_softc *sc, const uint32_t send[2], uint32_t recv[2]) { - int status; + int error; + + mtx_lock(&sc->sc_mtx); + error = ixpnpe_sendmsg_locked(sc, send); + if (error == 0) + error = ixpnpe_recvmsg_locked(sc, recv); + mtx_unlock(&sc->sc_mtx); - status = ixpnpe_sendmsg(sc, send); - if (status == 0) - status = ixpnpe_recvmsg(sc, recv); - return status; + return error; } ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#3 (text+ko) ==== @@ -87,8 +87,6 @@ const char *imageName, uint32_t imageId); int ixpnpe_getfunctionality(struct ixpnpe_softc *sc); -int ixpnpe_sendmsg(struct ixpnpe_softc *, const uint32_t msg[2]); -int ixpnpe_recvmsg(struct ixpnpe_softc *, uint32_t msg[2]); int ixpnpe_sendandrecvmsg(struct ixpnpe_softc *, const uint32_t send[2], uint32_t recv[2]); #endif /* _IXP425_NPEVAR_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Nov 7 01:34:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0BF216A47E; Tue, 7 Nov 2006 01:34:49 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 BB18916A412 for ; Tue, 7 Nov 2006 01:34:49 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 827CF43D45 for ; Tue, 7 Nov 2006 01:34:49 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA71YnAl090380 for ; Tue, 7 Nov 2006 01:34:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA71Yn88090377 for perforce@freebsd.org; Tue, 7 Nov 2006 01:34:49 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Nov 2006 01:34:49 GMT Message-Id: <200611070134.kA71Yn88090377@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109410 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 01:34:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=109410 Change 109410 by sam@sam_ebb on 2006/11/07 01:34:29 Track npe msg handling changes: must now drop the softc lock around calls to collect status as otherwise we'd be holding the softc lock when ixpnpe_sendandrecvmsg sleeps. Note: we get input fifo polling timeouts when setting up rx qids for traffic classes 4-7; will investigate but things appear to otherwise work Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#6 (text+ko) ==== @@ -654,7 +654,11 @@ struct npestats *ns = sc->sc_stats; NPE_ASSERT_LOCKED(sc); + + NPE_UNLOCK(sc); /* XXX */ npe_updatestats(sc); /* update + clear stats */ + NPE_LOCK(sc); + bus_dmamap_sync(sc->sc_stats_tag, sc->sc_stats_map, BUS_DMASYNC_POSTREAD); @@ -688,9 +692,7 @@ + be32toh(ns->RxUnderflowEntryDiscards) ; - /* - * Schedule another timeout one second from now. - */ + /* schedule next poll */ callout_reset(&sc->tick_ch, hz, npe_tick, sc); #undef MIBADD } From owner-p4-projects@FreeBSD.ORG Tue Nov 7 04:12:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 138BA16A415; Tue, 7 Nov 2006 04:12:15 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 CB95916A412 for ; Tue, 7 Nov 2006 04:12:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A35D443D46 for ; Tue, 7 Nov 2006 04:12:14 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA74CElN020444 for ; Tue, 7 Nov 2006 04:12:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA74CENp020439 for perforce@freebsd.org; Tue, 7 Nov 2006 04:12:14 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Nov 2006 04:12:14 GMT Message-Id: <200611070412.kA74CENp020439@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109415 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 04:12:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=109415 Change 109415 by sam@sam_ebb on 2006/11/07 04:11:19 don't lump carrier sense errors into oerrors; not meaningful Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#7 (text+ko) ==== @@ -682,8 +682,7 @@ be32toh(ns->RxOverrunDiscards) + be32toh(ns->RxUnderflowEntryDiscards); - ifp->if_oerrors += be32toh(ns->dot3StatsCarrierSenseErrors) - + be32toh(ns->dot3StatsInternalMacTransmitErrors) + ifp->if_oerrors += be32toh(ns->dot3StatsInternalMacTransmitErrors) + be32toh(ns->TxVLANIdFilterDiscards) ; ifp->if_ierrors += be32toh(ns->dot3StatsFCSErrors) From owner-p4-projects@FreeBSD.ORG Tue Nov 7 05:24:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C161316A47C; Tue, 7 Nov 2006 05:24:58 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 6B2EA16A415 for ; Tue, 7 Nov 2006 05:24:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DF1043D75 for ; Tue, 7 Nov 2006 05:24:50 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA75OmtR040651 for ; Tue, 7 Nov 2006 05:24:48 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA75OmFw040648 for perforce@freebsd.org; Tue, 7 Nov 2006 05:24:48 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Nov 2006 05:24:48 GMT Message-Id: <200611070524.kA75OmFw040648@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109417 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 05:24:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=109417 Change 109417 by sam@sam_ebb on 2006/11/07 05:24:12 replace m_defrag with private code for a small speedup Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#8 (text+ko) ==== @@ -982,6 +982,29 @@ NPE_UNLOCK(sc); } +static struct mbuf * +npe_linearize(struct mbuf *m0, int how) +{ + struct mbuf *m, *n; + + if (m0->m_pkthdr.len > MHLEN) + n = m_getcl(how, MT_DATA, M_PKTHDR); + else + n = m_gethdr(how, MT_DATA); + if (n != NULL) { + n->m_len = 0; /* NB: not initialized on alloc */ + for (m = m0; m != NULL; m = m->m_next) { + bcopy(mtod(m, void *), mtod(n, char *) + n->m_len, + m->m_len); + n->m_len += m->m_len; + } + /* NB: this works because we never change m_final->m_data */ + m_move_pkthdr(n, m0); + } + m_freem(m0); + return n; +} + /* * dequeu packets and transmit */ @@ -990,7 +1013,7 @@ { struct npe_softc *sc = ifp->if_softc; struct npebuf *npe; - struct mbuf *m, *mdefrag; + struct mbuf *m; struct npedma *dma = &sc->txdma; bus_dma_segment_t segs[1]; int nseg, len; @@ -1007,16 +1030,14 @@ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; return; } - mdefrag = m_defrag(m, M_DONTWAIT); - if (mdefrag == NULL) { - /* XXX not a good idea */ - IFQ_DRV_PREPEND(&ifp->if_snd, m); - return; + npe = sc->tx_free; + if (m->m_next != NULL) { + m = npe_linearize(m, M_DONTWAIT); + if (m == NULL) + return; } - m = mdefrag; - npe = sc->tx_free; - if (bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map, m, - segs, &nseg, 0) != 0) { + if (bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map, + m, segs, &nseg, 0) != 0) { m_freem(m); continue; } From owner-p4-projects@FreeBSD.ORG Tue Nov 7 06:09:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4190116A416; Tue, 7 Nov 2006 06:09:47 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 19F4816A412 for ; Tue, 7 Nov 2006 06:09:47 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E31A543D45 for ; Tue, 7 Nov 2006 06:09:46 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA769kdN054989 for ; Tue, 7 Nov 2006 06:09:46 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA769kt6054986 for perforce@freebsd.org; Tue, 7 Nov 2006 06:09:46 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Nov 2006 06:09:46 GMT Message-Id: <200611070609.kA769kt6054986@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109419 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 06:09:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=109419 Change 109419 by sam@sam_ebb on 2006/11/07 06:09:07 correct tx q configs Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#9 (text+ko) ==== @@ -570,10 +570,10 @@ sc->tx_qid = npeconfig[unit].tx_qid; sc->tx_doneqid = npeconfig[unit].tx_doneqid; - ixpqmgr_qconfig(sc->tx_qid, NPE_MAX_RX_BUFFERS, 0, - NPE_MAX_RX_BUFFERS, 0, NULL, sc); + ixpqmgr_qconfig(sc->tx_qid, NPE_MAX_TX_BUFFERS, 0, + NPE_MAX_TX_BUFFERS, 0, NULL, sc); if (tx_doneqid == -1) { - ixpqmgr_qconfig(sc->tx_doneqid, NPE_MAX_RX_BUFFERS, 0, 2, + ixpqmgr_qconfig(sc->tx_doneqid, NPE_MAX_TX_BUFFERS, 0, 2, IX_QMGR_Q_SOURCE_ID_NOT_E, npe_txdone, sc); tx_doneqid = sc->tx_doneqid; } From owner-p4-projects@FreeBSD.ORG Tue Nov 7 09:16:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B27D16A416; Tue, 7 Nov 2006 09:16:47 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D287F16A412 for ; Tue, 7 Nov 2006 09:16:46 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8492443D5D for ; Tue, 7 Nov 2006 09:16:46 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA79GkXW096185 for ; Tue, 7 Nov 2006 09:16:46 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA79Gk4I096182 for perforce@freebsd.org; Tue, 7 Nov 2006 09:16:46 GMT (envelope-from imp@freebsd.org) Date: Tue, 7 Nov 2006 09:16:46 GMT Message-Id: <200611070916.kA79Gk4I096182@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109426 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 09:16:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=109426 Change 109426 by imp@imp_lighthouse on 2006/11/07 09:15:53 Ooops, wait for the bit to turn ON, not OFF. Should fix hangs on boot when this is enabled. Affected files ... .. //depot/projects/arm/src/sys/dev/flash/at45d.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/dev/flash/at45d.c#8 (text+ko) ==== @@ -188,7 +188,7 @@ static void at45d_wait_for_device_ready(device_t dev) { - while (at45d_get_status(dev) & 0x80) + while (!(at45d_get_status(dev) & 0x80)) continue; } From owner-p4-projects@FreeBSD.ORG Tue Nov 7 09:17:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF1EE16A415; Tue, 7 Nov 2006 09:17:48 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A36AD16A403 for ; Tue, 7 Nov 2006 09:17:48 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55CAA43D62 for ; Tue, 7 Nov 2006 09:17:48 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA79HmHO096238 for ; Tue, 7 Nov 2006 09:17:48 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA79HmVF096235 for perforce@freebsd.org; Tue, 7 Nov 2006 09:17:48 GMT (envelope-from imp@freebsd.org) Date: Tue, 7 Nov 2006 09:17:48 GMT Message-Id: <200611070917.kA79HmVF096235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 09:17:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=109427 Change 109427 by imp@imp_lighthouse on 2006/11/07 09:17:14 Allow armeb:arm. However, this makes MACHINE=arm ambiguous, since MACHINE_ARCH could be arm or armeb. Affected files ... .. //depot/projects/arm/src/Makefile.inc1#17 edit Differences ... ==== //depot/projects/arm/src/Makefile.inc1#17 (text+ko) ==== @@ -107,7 +107,7 @@ TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v +KNOWN_ARCHES?= amd64 arm armeb/arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else From owner-p4-projects@FreeBSD.ORG Tue Nov 7 09:36:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E3ED16A47B; Tue, 7 Nov 2006 09:36:13 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0BB2E16A407 for ; Tue, 7 Nov 2006 09:36:13 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8A6243D5F for ; Tue, 7 Nov 2006 09:36:12 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA79aCBL099649 for ; Tue, 7 Nov 2006 09:36:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA79aC3E099646 for perforce@freebsd.org; Tue, 7 Nov 2006 09:36:12 GMT (envelope-from imp@freebsd.org) Date: Tue, 7 Nov 2006 09:36:12 GMT Message-Id: <200611070936.kA79aC3E099646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109430 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 09:36:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=109430 Change 109430 by imp@imp_lighthouse on 2006/11/07 09:35:32 This loop can't be all we need... But I think it might be, apart from some additional init... Affected files ... .. //depot/projects/arm/src/sys/dev/flash/at45d.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/dev/flash/at45d.c#9 (text+ko) ==== @@ -305,8 +305,16 @@ { struct at45d_softc *sc = (struct at45d_softc*)arg; struct bio *bp; + uint8_t txBuf[8], rxBuf[8]; + struct spi_command cmd; + int sz; + daddr_t block, end; + device_t dev, pdev; + int err; for (;;) { + dev = sc->dev; + pdev = device_get_parent(dev); AT45D_LOCK(sc); do { bp = bioq_first(&sc->bio_queue); @@ -315,8 +323,29 @@ } while (bp == NULL); bioq_remove(&sc->bio_queue, bp); AT45D_UNLOCK(sc); - // XXX need to make the read/write request, maybe even - // XXX breaking things down into smaller blocks. + sz = sc->disk->d_sectorsize; + end = bp->bio_pblkno + (bp->bio_bcount / sz); + for (block = bp->bio_pblkno; block < end; ) { + char *vaddr = bp->bio_data + (block - bp->bio_pblkno) * sz; + if (bp->bio_cmd == BIO_READ) + txBuf[0] = CONTINUOUS_ARRAY_READ_HF; + else + txBuf[0] = PROGRAM_THROUGH_BUFFER; + // XXX only works on certain devices... Fixme + txBuf[1] = ((block >> 5) & 0xFF); + txBuf[2] = ((block << 3) & 0xF8); + txBuf[3] = 0; + cmd.tx_cmd = txBuf; + cmd.tx_cmd_sz = 5; + cmd.rx_cmd = rxBuf; + cmd.rx_cmd_sz = 5; + cmd.tx_data = vaddr; + cmd.tx_data_sz = sz; + cmd.rx_data = vaddr; + cmd.rx_data_sz = sz; + err = SPIBUS_TRANSFER(pdev, dev, &cmd); + // XXX err check? + } biodone(bp); } } From owner-p4-projects@FreeBSD.ORG Tue Nov 7 18:04:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC5F716A4C2; Tue, 7 Nov 2006 18:04:08 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9A6B416A49E for ; Tue, 7 Nov 2006 18:04:08 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F4B143D9B for ; Tue, 7 Nov 2006 18:04:08 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7I48mf013448 for ; Tue, 7 Nov 2006 18:04:08 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7I47lx013444 for perforce@freebsd.org; Tue, 7 Nov 2006 18:04:07 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 7 Nov 2006 18:04:07 GMT Message-Id: <200611071804.kA7I47lx013444@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 109456 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 18:04:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=109456 Change 109456 by mjacob@newisp on 2006/11/07 18:03:41 Move code that cleans up after dead or new devices into the outer layer where policy can be applied. Affected files ... .. //depot/projects/newisp/dev/isp/isp.c#27 edit .. //depot/projects/newisp/dev/isp/isp_freebsd.c#19 edit .. //depot/projects/newisp/dev/isp/ispvar.h#11 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp.c#27 (text+ko) ==== @@ -2757,11 +2757,10 @@ switch (lp->state) { case FC_PORTDB_STATE_PROBATIONAL: case FC_PORTDB_STATE_DEAD: + /* + * It's up to the outer layers to clear isp_ini_map. + */ isp_async(isp, ISPASYNC_DEV_GONE, lp); - if (lp->ini_map_idx) { - fcp->isp_ini_map[lp->ini_map_idx-1] = 0; - lp->ini_map_idx = 0; - } lp->state = FC_PORTDB_STATE_NIL; if (lp->autologin == 0) { if (IS_24XX(isp)) { @@ -2790,53 +2789,40 @@ */ lp->portid = lp->new_portid; lp->roles = lp->new_roles; + /* + * It's up to the outer layers to assign a virtual + * target id in isp_ini_map (if any). + */ + isp_async(isp, ISPASYNC_DEV_ARRIVED, lp); lp->state = FC_PORTDB_STATE_VALID; - if ((isp->isp_role & ISP_ROLE_INITIATOR) && - (lp->roles & (SVC3_TGT_ROLE >> SVC3_ROLE_SHIFT))) { - int i, t = dbidx; - for (i = 0; i < MAX_FC_TARG; i++) { - if (i < FL_ID || i > SNS_ID) { - if (fcp->isp_ini_map[t] == 0) { - break; - } - } - if (++t == MAX_FC_TARG) { - t = 0; - } - } - if (i < MAX_FC_TARG) { - fcp->isp_ini_map[t] = dbidx + 1; - lp->ini_map_idx = t + 1; - } else { - isp_prt(isp, ISP_LOGWARN, - "out of target ids"); - } - } - isp_async(isp, ISPASYNC_DEV_ARRIVED, lp); lp->new_roles = 0; lp->new_portid = 0; break; case FC_PORTDB_STATE_CHANGED: + /* + * For now, just have a policy of accepting 'changed' + * devices. + */ lp->portid = lp->new_portid; lp->roles = lp->new_roles; - lp->state = FC_PORTDB_STATE_VALID; if (lp->ini_map_idx) { int t = lp->ini_map_idx - 1; fcp->isp_ini_map[t] = dbidx + 1; } isp_async(isp, ISPASYNC_DEV_CHANGED, lp); + lp->state = FC_PORTDB_STATE_VALID; lp->new_roles = 0; lp->new_portid = 0; break; case FC_PORTDB_STATE_PENDING_VALID: lp->portid = lp->new_portid; lp->roles = lp->new_roles; - lp->state = FC_PORTDB_STATE_VALID; if (lp->ini_map_idx) { int t = lp->ini_map_idx - 1; fcp->isp_ini_map[t] = dbidx + 1; } isp_async(isp, ISPASYNC_DEV_STAYED, lp); + lp->state = FC_PORTDB_STATE_VALID; if (dbidx != FL_ID) { lp->new_roles = 0; lp->new_portid = 0; @@ -3950,7 +3936,7 @@ ispreq_t *reqp, *qep; void *cdbp; uint16_t *tptr; - int target, i; + int target, i, hdlidx = 0; XS_INITERR(xs); isp = XS_ISP(xs); @@ -4006,14 +3992,14 @@ return (CMD_COMPLETE); } - i = fcp->isp_ini_map[XS_TGT(xs)]; + hdlidx = fcp->isp_ini_map[XS_TGT(xs)] - 1; isp_prt(isp, ISP_LOGDEBUG1, "XS_TGT(xs)=%d- handle value %d", - XS_TGT(xs), i); - if (i < 1 || i >= MAX_FC_TARG) { + XS_TGT(xs), hdlidx); + if (hdlidx < 0 || hdlidx >= MAX_FC_TARG) { XS_SETERR(xs, HBA_SELTIMEOUT); return (CMD_COMPLETE); } - target = fcp->portdb[i - 1].handle; + target = fcp->portdb[hdlidx].handle; } /* @@ -4141,9 +4127,7 @@ } else if (IS_24XX(isp)) { fcportdb_t *lp; - i = FCPARAM(isp)->isp_ini_map[XS_TGT(xs)] - 1; - lp = &FCPARAM(isp)->portdb[i]; - + lp = &FCPARAM(isp)->portdb[hdlidx]; ((ispreqt7_t *)reqp)->req_nphdl = target; ((ispreqt7_t *)reqp)->req_tidlo = lp->portid; ((ispreqt7_t *)reqp)->req_tidhi = lp->portid >> 16; ==== //depot/projects/newisp/dev/isp/isp_freebsd.c#19 (text+ko) ==== @@ -49,6 +49,7 @@ int isp_fabric_hysteresis = 5; int isp_loop_down_limit = 300; /* default loop down limit */ int isp_quickboot_time = 5; /* don't wait more than N secs for loop up */ +int isp_lost_device_time = 30; /* grace time before reporting device lost */ static d_ioctl_t ispioctl; static void isp_intr_enable(void *); @@ -2918,7 +2919,26 @@ break; case ISPASYNC_DEV_ARRIVED: lp = arg; + if ((isp->isp_role & ISP_ROLE_INITIATOR) && + (lp->roles & (SVC3_TGT_ROLE >> SVC3_ROLE_SHIFT))) { + int dbidx = lp - FCPARAM(isp)->portdb; + int i; + for (i = 0; i < MAX_FC_TARG; i++) { + if (i >= FL_ID || i <= SNS_ID) { + continue; + } + if (FCPARAM(isp)->isp_ini_map[i] == 0) { + break; + } + } + if (i < MAX_FC_TARG) { + FCPARAM(isp)->isp_ini_map[i] = dbidx + 1; + lp->ini_map_idx = i + 1; + } else { + isp_prt(isp, ISP_LOGWARN, "out of target ids"); + } + } if (lp->ini_map_idx) { tgt = lp->ini_map_idx - 1; isp_prt(isp, ISP_LOGCONFIG, prom2, @@ -2995,7 +3015,12 @@ case ISPASYNC_DEV_GONE: lp = arg; if (lp->ini_map_idx) { +/* + * XXX: HERE IS WHERE WE'D START A TIMER + */ tgt = lp->ini_map_idx - 1; + FCPARAM(isp)->isp_ini_map[tgt] = 0; + lp->ini_map_idx = 0; isp_prt(isp, ISP_LOGCONFIG, prom2, lp->portid, lp->handle, roles[lp->roles & 0x3], "departed from", tgt, ==== //depot/projects/newisp/dev/isp/ispvar.h#11 (text+ko) ==== @@ -75,7 +75,7 @@ * Overall parameters */ #define MAX_TARGETS 16 -#define MAX_FC_TARG 256 +#define MAX_FC_TARG 512 #define ISP_MAX_TARGETS(isp) (IS_FC(isp)? MAX_FC_TARG : MAX_TARGETS) #define ISP_MAX_LUNS(isp) (isp)->isp_maxluns @@ -303,7 +303,26 @@ * value. */ typedef struct { + /* + * This is the handle that the firmware needs in order for us to + * send commands to the device. For pre-24XX cards, this would be + * the 'loopid'. + */ uint16_t handle; + /* + * The ini_map_idx, if nonzero, is the system virtual target ID (+1) + * as a cross-reference with the isp_ini_map. + * + * A device is 'autologin' if the firmware automatically logs into + * it (re-logins as needed). Basically, local private loop devices. + * + * The state is the current state of thsi entry. + * + * Role is Initiator, Target, Both + * + * Portid is obvious, as or node && port WWNs. The new_role and + * new_portid is for when we are pending a change. + */ uint16_t ini_map_idx : 12, autologin : 1, /* F/W does PLOGI/PLOGO */ state : 3; @@ -357,8 +376,21 @@ uint16_t isp_maxfrmlen; uint64_t isp_nodewwn; uint64_t isp_portwwn; + + /* + * Our Port Data Base + */ fcportdb_t portdb[MAX_FC_TARG]; + + /* + * This maps system virtual 'target' id to a portdb entry. + * + * The mapping function is to take any non-zero entry and + * subtract one to get the portdb index. This means that + * entries which are zero are unmapped (i.e., don't exist). + */ uint16_t isp_ini_map[MAX_FC_TARG]; + /* * Scratch DMA mapped in area to fetch Port Database stuff, etc. */ From owner-p4-projects@FreeBSD.ORG Tue Nov 7 18:04:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0757116A47B; Tue, 7 Nov 2006 18:04:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D949D16A565 for ; Tue, 7 Nov 2006 18:04:09 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B539643D9B for ; Tue, 7 Nov 2006 18:04:08 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7I48RR013454 for ; Tue, 7 Nov 2006 18:04:08 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7I4850013451 for perforce@freebsd.org; Tue, 7 Nov 2006 18:04:08 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 7 Nov 2006 18:04:08 GMT Message-Id: <200611071804.kA7I4850013451@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 109457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 18:04:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=109457 Change 109457 by mjacob@newisp on 2006/11/07 18:04:06 Fix cam_xpt.c. Affected files ... .. //depot/projects/newisp/cam/cam_xpt.c#10 edit Differences ... ==== //depot/projects/newisp/cam/cam_xpt.c#10 (text+ko) ==== @@ -6607,8 +6607,8 @@ && (inq_data->flags & SID_Sync) == 0 && cts->type == CTS_TYPE_CURRENT_SETTINGS) || ((cpi.hba_inquiry & PI_SDTR_ABLE) == 0) - || (cur_spi->sync_offset == 0) - || (cur_spi->sync_period == 0)) { + || (spi->sync_offset == 0) + || (spi->sync_period == 0)) { /* Force async */ spi->sync_period = 0; spi->sync_offset = 0; From owner-p4-projects@FreeBSD.ORG Tue Nov 7 18:11:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5567D16A4CA; Tue, 7 Nov 2006 18:11:26 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0D26F16A494 for ; Tue, 7 Nov 2006 18:11:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C29FA43D5A for ; Tue, 7 Nov 2006 18:11:18 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7IBIKk014481 for ; Tue, 7 Nov 2006 18:11:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7IBI0X014477 for perforce@freebsd.org; Tue, 7 Nov 2006 18:11:18 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Nov 2006 18:11:18 GMT Message-Id: <200611071811.kA7IBI0X014477@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 18:11:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=109459 Change 109459 by sam@sam_ebb on 2006/11/07 18:11:06 loopback bootp fix Affected files ... .. //depot/projects/arm/src/sys/nfsclient/bootp_subr.c#4 integrate Differences ... ==== //depot/projects/arm/src/sys/nfsclient/bootp_subr.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.66 2006/06/29 19:22:05 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.67 2006/11/07 18:02:45 sam Exp $"); #include "opt_bootp.h" @@ -1277,6 +1277,8 @@ args->flags |= NFSMNT_SOFT; if ((tmp = (char *)substr(p, "noconn"))) args->flags |= NFSMNT_NOCONN; + if ((tmp = (char *)substr(p, "nolockd"))) + args->flags |= NFSMNT_NOLOCKD; if ((tmp = (char *)substr(p, "tcp"))) args->sotype = SOCK_STREAM; } From owner-p4-projects@FreeBSD.ORG Tue Nov 7 18:24:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2362116A47B; Tue, 7 Nov 2006 18:24:46 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 F017916A403 for ; Tue, 7 Nov 2006 18:24:45 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF7CB43D7B for ; Tue, 7 Nov 2006 18:24:39 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7IOdKe016849 for ; Tue, 7 Nov 2006 18:24:39 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7IOZd1016820 for perforce@freebsd.org; Tue, 7 Nov 2006 18:24:35 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 7 Nov 2006 18:24:35 GMT Message-Id: <200611071824.kA7IOZd1016820@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 109460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 18:24:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=109460 Change 109460 by mjacob@newisp on 2006/11/07 18:23:51 IFC Affected files ... .. //depot/projects/newisp/amd64/amd64/io.c#2 integrate .. //depot/projects/newisp/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/newisp/arm/at91/if_ate.c#3 integrate .. //depot/projects/newisp/arm/include/atomic.h#2 integrate .. //depot/projects/newisp/boot/Makefile#3 integrate .. //depot/projects/newisp/boot/common/load_elf.c#3 integrate .. //depot/projects/newisp/boot/efi/include/efilib.h#3 integrate .. //depot/projects/newisp/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/newisp/boot/efi/libefi/bootinfo.c#2 delete .. //depot/projects/newisp/boot/efi/libefi/copy.c#2 delete .. //depot/projects/newisp/boot/efi/libefi/devicename.c#3 delete .. //depot/projects/newisp/boot/efi/libefi/efiboot.h#3 delete .. //depot/projects/newisp/boot/efi/libefi/efifpswa.c#2 delete .. //depot/projects/newisp/boot/efi/libefi/efifs.c#3 integrate .. //depot/projects/newisp/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/newisp/boot/efi/libefi/elf_freebsd.c#2 delete .. //depot/projects/newisp/boot/efi/libefi/errno.c#1 branch .. //depot/projects/newisp/boot/efi/libefi/handles.c#1 branch .. //depot/projects/newisp/boot/efi/libefi/libefi.c#2 integrate .. //depot/projects/newisp/boot/efi/libefi/module.c#2 delete .. //depot/projects/newisp/boot/efi/libefi/time.c#2 integrate .. //depot/projects/newisp/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/newisp/boot/i386/libi386/elf32_freebsd.c#3 integrate .. //depot/projects/newisp/boot/ia64/Makefile#2 integrate .. //depot/projects/newisp/boot/ia64/common/Makefile#1 branch .. //depot/projects/newisp/boot/ia64/common/autoload.c#1 branch .. //depot/projects/newisp/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/newisp/boot/ia64/common/copy.c#1 branch .. //depot/projects/newisp/boot/ia64/common/devicename.c#1 branch .. //depot/projects/newisp/boot/ia64/common/exec.c#1 branch .. //depot/projects/newisp/boot/ia64/common/libia64.h#1 branch .. //depot/projects/newisp/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/newisp/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/newisp/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/newisp/boot/ia64/efi/main.c#3 integrate .. //depot/projects/newisp/boot/ia64/efi/version#2 integrate .. //depot/projects/newisp/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/newisp/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/newisp/boot/ia64/ski/bootinfo.c#2 delete .. //depot/projects/newisp/boot/ia64/ski/copy.c#2 delete .. //depot/projects/newisp/boot/ia64/ski/devicename.c#3 delete .. //depot/projects/newisp/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/newisp/boot/ia64/ski/elf_freebsd.c#2 delete .. //depot/projects/newisp/boot/ia64/ski/libski.h#3 integrate .. //depot/projects/newisp/boot/ia64/ski/main.c#3 integrate .. //depot/projects/newisp/boot/ia64/ski/skifs.c#2 integrate .. //depot/projects/newisp/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/newisp/boot/ia64/ski/version#2 integrate .. //depot/projects/newisp/boot/pc98/boot2/boot.c#3 integrate .. //depot/projects/newisp/cam/cam_xpt.c#11 integrate .. //depot/projects/newisp/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/newisp/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_proto.h#11 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_syscall.h#11 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_syscalls.c#11 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_sysent.c#11 integrate .. //depot/projects/newisp/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/newisp/compat/linux/linux_misc.c#6 integrate .. //depot/projects/newisp/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/newisp/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/newisp/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/newisp/conf/NOTES#12 integrate .. //depot/projects/newisp/conf/files#11 integrate .. //depot/projects/newisp/conf/options#6 integrate .. //depot/projects/newisp/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/newisp/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/newisp/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/newisp/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/newisp/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/newisp/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/newisp/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/newisp/ddb/db_command.c#3 integrate .. //depot/projects/newisp/ddb/db_main.c#2 integrate .. //depot/projects/newisp/dev/aac/aac_pci.c#2 integrate .. //depot/projects/newisp/dev/acpi_support/acpi_aiboost.c#3 integrate .. //depot/projects/newisp/dev/an/if_an.c#2 integrate .. //depot/projects/newisp/dev/arl/if_arl.c#2 integrate .. //depot/projects/newisp/dev/asr/asr.c#4 integrate .. //depot/projects/newisp/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/newisp/dev/ce/if_ce.c#2 integrate .. //depot/projects/newisp/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/newisp/dev/cp/if_cp.c#2 integrate .. //depot/projects/newisp/dev/ctau/if_ct.c#2 integrate .. //depot/projects/newisp/dev/cx/if_cx.c#2 integrate .. //depot/projects/newisp/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/newisp/dev/drm/drmP.h#3 integrate .. //depot/projects/newisp/dev/fdc/fdc.c#4 integrate .. //depot/projects/newisp/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/newisp/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/newisp/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/newisp/dev/kbd/kbd.c#2 integrate .. //depot/projects/newisp/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/newisp/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/newisp/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/newisp/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/newisp/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/newisp/dev/null/null.c#2 integrate .. //depot/projects/newisp/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/newisp/dev/pci/pci.c#6 integrate .. //depot/projects/newisp/dev/random/randomdev.c#2 integrate .. //depot/projects/newisp/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/newisp/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/newisp/dev/si/si.c#2 integrate .. //depot/projects/newisp/dev/syscons/syscons.c#4 integrate .. //depot/projects/newisp/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/newisp/dev/wi/if_wi.c#2 integrate .. //depot/projects/newisp/dev/wl/if_wl.c#2 integrate .. //depot/projects/newisp/dev/zs/zs.c#2 integrate .. //depot/projects/newisp/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/newisp/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/newisp/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/newisp/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/newisp/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/newisp/fs/procfs/procfs_ioctl.c#3 integrate .. //depot/projects/newisp/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/newisp/fs/smbfs/smbfs_smb.c#2 integrate .. //depot/projects/newisp/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/newisp/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/newisp/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/newisp/geom/eli/g_eli.c#4 integrate .. //depot/projects/newisp/geom/journal/g_journal.c#2 integrate .. //depot/projects/newisp/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/newisp/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/newisp/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/newisp/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/newisp/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/newisp/i386/conf/DEFAULTS#3 integrate .. //depot/projects/newisp/i386/i386/io.c#2 integrate .. //depot/projects/newisp/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/newisp/i386/i386/vm86.c#2 integrate .. //depot/projects/newisp/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/newisp/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/newisp/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/newisp/i386/linux/linux_machdep.c#5 integrate .. //depot/projects/newisp/i4b/driver/i4b_ipr.c#2 integrate .. //depot/projects/newisp/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/newisp/ia64/ia64/machdep.c#3 integrate .. //depot/projects/newisp/ia64/ia64/ssc.c#2 integrate .. //depot/projects/newisp/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/newisp/kern/init_sysent.c#8 integrate .. //depot/projects/newisp/kern/kern_acct.c#4 integrate .. //depot/projects/newisp/kern/kern_descrip.c#3 integrate .. //depot/projects/newisp/kern/kern_environment.c#3 integrate .. //depot/projects/newisp/kern/kern_exec.c#5 integrate .. //depot/projects/newisp/kern/kern_fork.c#4 integrate .. //depot/projects/newisp/kern/kern_jail.c#4 integrate .. //depot/projects/newisp/kern/kern_ktrace.c#3 integrate .. //depot/projects/newisp/kern/kern_linker.c#3 integrate .. //depot/projects/newisp/kern/kern_ntptime.c#2 integrate .. //depot/projects/newisp/kern/kern_priv.c#1 branch .. //depot/projects/newisp/kern/kern_prot.c#4 integrate .. //depot/projects/newisp/kern/kern_resource.c#4 integrate .. //depot/projects/newisp/kern/kern_shutdown.c#3 integrate .. //depot/projects/newisp/kern/kern_sysctl.c#3 integrate .. //depot/projects/newisp/kern/kern_thr.c#4 integrate .. //depot/projects/newisp/kern/kern_time.c#4 integrate .. //depot/projects/newisp/kern/kern_umtx.c#10 integrate .. //depot/projects/newisp/kern/kern_xxx.c#2 integrate .. //depot/projects/newisp/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/newisp/kern/subr_firmware.c#2 integrate .. //depot/projects/newisp/kern/subr_prf.c#4 integrate .. //depot/projects/newisp/kern/subr_witness.c#3 integrate .. //depot/projects/newisp/kern/syscalls.c#8 integrate .. //depot/projects/newisp/kern/syscalls.master#8 integrate .. //depot/projects/newisp/kern/systrace_args.c#8 integrate .. //depot/projects/newisp/kern/sysv_ipc.c#2 integrate .. //depot/projects/newisp/kern/sysv_msg.c#4 integrate .. //depot/projects/newisp/kern/tty.c#7 integrate .. //depot/projects/newisp/kern/tty_cons.c#3 integrate .. //depot/projects/newisp/kern/tty_pts.c#4 integrate .. //depot/projects/newisp/kern/tty_pty.c#5 integrate .. //depot/projects/newisp/kern/uipc_mbuf.c#4 integrate .. //depot/projects/newisp/kern/uipc_mqueue.c#3 integrate .. //depot/projects/newisp/kern/uipc_sem.c#3 integrate .. //depot/projects/newisp/kern/uipc_socket.c#6 integrate .. //depot/projects/newisp/kern/uipc_syscalls.c#4 integrate .. //depot/projects/newisp/kern/vfs_mount.c#6 integrate .. //depot/projects/newisp/kern/vfs_subr.c#7 integrate .. //depot/projects/newisp/kern/vfs_syscalls.c#7 integrate .. //depot/projects/newisp/kern/vfs_vnops.c#3 integrate .. //depot/projects/newisp/modules/ath_rate_amrr/Makefile#3 integrate .. //depot/projects/newisp/modules/bge/Makefile#2 integrate .. //depot/projects/newisp/modules/nfe/Makefile#2 integrate .. //depot/projects/newisp/net/bpf.c#3 integrate .. //depot/projects/newisp/net/bridgestp.c#4 integrate .. //depot/projects/newisp/net/if.c#4 integrate .. //depot/projects/newisp/net/if_bridge.c#6 integrate .. //depot/projects/newisp/net/if_gre.c#2 integrate .. //depot/projects/newisp/net/if_ppp.c#4 integrate .. //depot/projects/newisp/net/if_sl.c#2 integrate .. //depot/projects/newisp/net/if_tap.c#3 integrate .. //depot/projects/newisp/net/if_tun.c#3 integrate .. //depot/projects/newisp/net/ppp_tty.c#2 integrate .. //depot/projects/newisp/net/raw_usrreq.c#2 integrate .. //depot/projects/newisp/net/rtsock.c#2 integrate .. //depot/projects/newisp/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/newisp/netatalk/at_control.c#2 integrate .. //depot/projects/newisp/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/newisp/netatm/atm_usrreq.c#2 integrate .. //depot/projects/newisp/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/newisp/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/newisp/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/newisp/netgraph/ng_device.c#2 integrate .. //depot/projects/newisp/netgraph/ng_socket.c#3 integrate .. //depot/projects/newisp/netgraph/ng_tty.c#2 integrate .. //depot/projects/newisp/netinet/in.c#3 integrate .. //depot/projects/newisp/netinet/in_pcb.c#4 integrate .. //depot/projects/newisp/netinet/in_proto.c#2 integrate .. //depot/projects/newisp/netinet/ip_carp.c#4 integrate .. //depot/projects/newisp/netinet/ip_divert.c#3 integrate .. //depot/projects/newisp/netinet/ip_fw2.c#6 integrate .. //depot/projects/newisp/netinet/ip_mroute.c#4 integrate .. //depot/projects/newisp/netinet/ip_output.c#7 integrate .. //depot/projects/newisp/netinet/raw_ip.c#4 integrate .. //depot/projects/newisp/netinet/sctp.h#1 branch .. //depot/projects/newisp/netinet/sctp_asconf.c#1 branch .. //depot/projects/newisp/netinet/sctp_asconf.h#1 branch .. //depot/projects/newisp/netinet/sctp_auth.c#1 branch .. //depot/projects/newisp/netinet/sctp_auth.h#1 branch .. //depot/projects/newisp/netinet/sctp_bsd_addr.c#1 branch .. //depot/projects/newisp/netinet/sctp_bsd_addr.h#1 branch .. //depot/projects/newisp/netinet/sctp_constants.h#1 branch .. //depot/projects/newisp/netinet/sctp_crc32.c#1 branch .. //depot/projects/newisp/netinet/sctp_crc32.h#1 branch .. //depot/projects/newisp/netinet/sctp_header.h#1 branch .. //depot/projects/newisp/netinet/sctp_indata.c#1 branch .. //depot/projects/newisp/netinet/sctp_indata.h#1 branch .. //depot/projects/newisp/netinet/sctp_input.c#1 branch .. //depot/projects/newisp/netinet/sctp_input.h#1 branch .. //depot/projects/newisp/netinet/sctp_lock_bsd.h#1 branch .. //depot/projects/newisp/netinet/sctp_os.h#1 branch .. //depot/projects/newisp/netinet/sctp_os_bsd.h#1 branch .. //depot/projects/newisp/netinet/sctp_output.c#1 branch .. //depot/projects/newisp/netinet/sctp_output.h#1 branch .. //depot/projects/newisp/netinet/sctp_pcb.c#1 branch .. //depot/projects/newisp/netinet/sctp_pcb.h#1 branch .. //depot/projects/newisp/netinet/sctp_peeloff.c#1 branch .. //depot/projects/newisp/netinet/sctp_peeloff.h#1 branch .. //depot/projects/newisp/netinet/sctp_structs.h#1 branch .. //depot/projects/newisp/netinet/sctp_timer.c#1 branch .. //depot/projects/newisp/netinet/sctp_timer.h#1 branch .. //depot/projects/newisp/netinet/sctp_uio.h#1 branch .. //depot/projects/newisp/netinet/sctp_usrreq.c#1 branch .. //depot/projects/newisp/netinet/sctp_var.h#1 branch .. //depot/projects/newisp/netinet/sctputil.c#1 branch .. //depot/projects/newisp/netinet/sctputil.h#1 branch .. //depot/projects/newisp/netinet/tcp_subr.c#8 integrate .. //depot/projects/newisp/netinet/udp_usrreq.c#5 integrate .. //depot/projects/newisp/netinet6/in6.c#3 integrate .. //depot/projects/newisp/netinet6/in6_pcb.c#2 integrate .. //depot/projects/newisp/netinet6/in6_proto.c#3 integrate .. //depot/projects/newisp/netinet6/in6_src.c#2 integrate .. //depot/projects/newisp/netinet6/ipsec.c#2 integrate .. //depot/projects/newisp/netinet6/sctp6_usrreq.c#1 branch .. //depot/projects/newisp/netinet6/sctp6_var.h#1 branch .. //depot/projects/newisp/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/newisp/netipsec/ipsec.c#2 integrate .. //depot/projects/newisp/netipsec/ipsec_osdep.h#2 integrate .. //depot/projects/newisp/netipx/ipx_pcb.c#2 integrate .. //depot/projects/newisp/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/newisp/netncp/ncp_conn.c#2 integrate .. //depot/projects/newisp/netncp/ncp_mod.c#2 integrate .. //depot/projects/newisp/netncp/ncp_subr.h#2 integrate .. //depot/projects/newisp/netsmb/smb_conn.c#2 integrate .. //depot/projects/newisp/netsmb/smb_subr.c#2 integrate .. //depot/projects/newisp/netsmb/smb_subr.h#2 integrate .. //depot/projects/newisp/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/newisp/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/newisp/pc98/cbus/fdc.c#3 integrate .. //depot/projects/newisp/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/newisp/posix4/p1003_1b.c#2 integrate .. //depot/projects/newisp/powerpc/conf/DEFAULTS#3 integrate .. //depot/projects/newisp/security/audit/audit.c#6 integrate .. //depot/projects/newisp/security/audit/audit_arg.c#3 integrate .. //depot/projects/newisp/security/audit/audit_pipe.c#2 integrate .. //depot/projects/newisp/security/audit/audit_private.h#4 integrate .. //depot/projects/newisp/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/newisp/security/mac/mac_framework.h#4 integrate .. //depot/projects/newisp/security/mac/mac_internal.h#4 integrate .. //depot/projects/newisp/security/mac/mac_net.c#4 integrate .. //depot/projects/newisp/security/mac/mac_priv.c#1 branch .. //depot/projects/newisp/security/mac/mac_system.c#3 integrate .. //depot/projects/newisp/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/newisp/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/newisp/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/newisp/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/newisp/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/newisp/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/newisp/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/newisp/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/newisp/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/newisp/sun4v/conf/DEFAULTS#3 integrate .. //depot/projects/newisp/sun4v/include/elf.h#2 integrate .. //depot/projects/newisp/sun4v/include/hypervisor_api.h#2 integrate .. //depot/projects/newisp/sun4v/include/trap.h#2 integrate .. //depot/projects/newisp/sun4v/include/utrap.h#2 integrate .. //depot/projects/newisp/sun4v/sun4v/exception.S#2 integrate .. //depot/projects/newisp/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/newisp/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/newisp/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/newisp/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/newisp/sun4v/sun4v/wbuf.S#2 integrate .. //depot/projects/newisp/sys/jail.h#2 integrate .. //depot/projects/newisp/sys/libkern.h#2 integrate .. //depot/projects/newisp/sys/mac_policy.h#6 integrate .. //depot/projects/newisp/sys/mbuf.h#6 integrate .. //depot/projects/newisp/sys/priv.h#1 branch .. //depot/projects/newisp/sys/socket.h#2 integrate .. //depot/projects/newisp/sys/syscall.h#8 integrate .. //depot/projects/newisp/sys/syscall.mk#8 integrate .. //depot/projects/newisp/sys/sysproto.h#8 integrate .. //depot/projects/newisp/sys/systm.h#5 integrate .. //depot/projects/newisp/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/newisp/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/newisp/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/newisp/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/newisp/ufs/ufs/ufs_quota.c#4 integrate .. //depot/projects/newisp/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/newisp/vm/swap_pager.c#4 integrate .. //depot/projects/newisp/vm/vm_mmap.c#3 integrate Differences ... ==== //depot/projects/newisp/amd64/amd64/io.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.1 2004/08/01 11:40:50 markm Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.2 2006/11/06 13:41:49 rwatson Exp $"); #include #include @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -54,7 +55,7 @@ { int error; - error = suser(td); + error = priv_check(td, PRIV_IO); if (error != 0) return (error); error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/newisp/amd64/conf/DEFAULTS#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.7 2006/10/26 22:05:24 jb Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.9 2006/11/04 23:50:11 jb Exp $ machine amd64 ==== //depot/projects/newisp/arm/at91/if_ate.c#3 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.11 2006/10/20 07:04:56 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.12 2006/11/03 07:39:37 imp Exp $"); #include #include @@ -195,7 +195,6 @@ ate_get_mac(sc, eaddr); ate_set_mac(sc, eaddr); - sc->ifp = ifp = if_alloc(IFT_ETHER); if (mii_phy_probe(dev, &sc->miibus, ate_ifmedia_upd, ate_ifmedia_sts)) { device_printf(dev, "Cannot find my PHY.\n"); @@ -271,10 +270,12 @@ * For the last buffer, set the wrap bit so the controller * restarts from the first descriptor. */ + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); if (i == ATE_MAX_RX_BUFFERS - 1) sc->rx_descs[i].addr = segs[0].ds_addr | ETH_WRAP_BIT; else sc->rx_descs[i].addr = segs[0].ds_addr; + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_POSTWRITE); sc->rx_descs[i].status = 0; /* Flush the memory in the mbuf */ bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREREAD); @@ -489,11 +490,30 @@ } static void +ate_stat_update(struct ate_softc *sc, int active) +{ + /* + * The speed and full/half-duplex state needs to be reflected + * in the ETH_CFG register. + */ + if (IFM_SUBTYPE(active) == IFM_10_T) + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_SPD); + else + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_SPD); + if (active & IFM_FDX) + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_FD); + else + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_FD); +} + +static void ate_tick(void *xsc) { struct ate_softc *sc = xsc; + struct ifnet *ifp = sc->ifp; struct mii_data *mii; int active; + uint32_t c; /* * The KB920x boot loader tests ETH_SR & ETH_SR_LINK and will ask @@ -506,25 +526,8 @@ active = mii->mii_media_active; mii_tick(mii); if (mii->mii_media_status & IFM_ACTIVE && - active != mii->mii_media_active) { - /* - * The speed and full/half-duplex state needs - * to be reflected in the ETH_CFG register, it - * seems. - */ - if (IFM_SUBTYPE(mii->mii_media_active) == IFM_10_T) - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & - ~ETH_CFG_SPD); - else - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | - ETH_CFG_SPD); - if (mii->mii_media_active & IFM_FDX) - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | - ETH_CFG_FD); - else - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & - ~ETH_CFG_FD); - } + active != mii->mii_media_active) + ate_stat_update(sc, mii->mii_media_active); } /* @@ -535,16 +538,25 @@ * the dot3Stats mib, so for those we just count them as general * errors. Stats for iframes, ibutes, oframes and obytes are * collected elsewhere. These registers zero on a read to prevent - * races. + * races. For all the collision stats, also update the collision + * stats for the interface. */ sc->mibdata.dot3StatsAlignmentErrors += RD4(sc, ETH_ALE); sc->mibdata.dot3StatsFCSErrors += RD4(sc, ETH_SEQE); - sc->mibdata.dot3StatsSingleCollisionFrames += RD4(sc, ETH_SCOL); - sc->mibdata.dot3StatsMultipleCollisionFrames += RD4(sc, ETH_MCOL); + c = RD4(sc, ETH_SCOL); + ifp->if_collisions += c; + sc->mibdata.dot3StatsSingleCollisionFrames += c; + c = RD4(sc, ETH_MCOL); + sc->mibdata.dot3StatsMultipleCollisionFrames += c; + ifp->if_collisions += c; sc->mibdata.dot3StatsSQETestErrors += RD4(sc, ETH_SQEE); sc->mibdata.dot3StatsDeferredTransmissions += RD4(sc, ETH_DTE); - sc->mibdata.dot3StatsLateCollisions += RD4(sc, ETH_LCOL); - sc->mibdata.dot3StatsExcessiveCollisions += RD4(sc, ETH_ECOL); + c = RD4(sc, ETH_LCOL); + sc->mibdata.dot3StatsLateCollisions += c; + ifp->if_collisions += c; + c = RD4(sc, ETH_ECOL); + sc->mibdata.dot3StatsExcessiveCollisions += c; + ifp->if_collisions += c; sc->mibdata.dot3StatsCarrierSenseErrors += RD4(sc, ETH_CSE); sc->mibdata.dot3StatsFrameTooLongs += RD4(sc, ETH_ELR); sc->mibdata.dot3StatsInternalMacReceiveErrors += RD4(sc, ETH_DRFC); @@ -552,7 +564,7 @@ * not sure where to lump these, so count them against the errors * for the interface. */ - sc->ifp->if_oerrors += RD4(sc, ETH_CSE) + RD4(sc, ETH_TUE); + sc->ifp->if_oerrors += RD4(sc, ETH_TUE); sc->ifp->if_ierrors += RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) + RD4(sc, ETH_USF); @@ -577,9 +589,9 @@ uint32_t low, high; /* - * The KB920x loaders will setup the MAC with an address, if one - * is set in the loader. The TSC loader will also set the MAC address - * in a similar way. Grab the MAC address from the SA1[HL] registers. + * The boot loader setup the MAC with an address, if one is set in + * the loader. The TSC loader will also set the MAC address in a + * similar way. Grab the MAC address from the SA1[HL] registers. */ low = RD4(sc, ETH_SA1L); high = RD4(sc, ETH_SA1H); @@ -595,6 +607,7 @@ ate_intr(void *xsc) { struct ate_softc *sc = xsc; + struct ifnet *ifp = sc->ifp; int status; int i; void *bp; @@ -614,15 +627,18 @@ rx_stat = sc->rx_descs[i].status; if ((rx_stat & ETH_LEN_MASK) == 0) { printf("ignoring bogus 0 len packet\n"); + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, + BUS_DMASYNC_PREWRITE); sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, - BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_POSTWRITE); continue; } /* Flush memory for mbuf so we don't get stale bytes */ bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_POSTREAD); - WR4(sc, ETH_RSR, RD4(sc, ETH_RSR)); // XXX WHY? XXX imp + WR4(sc, ETH_RSR, RD4(sc, ETH_RSR)); + /* * The length returned by the device includes the * ethernet CRC calculation for the packet, but @@ -630,25 +646,37 @@ */ mb = m_devget(sc->rx_buf[i], (rx_stat & ETH_LEN_MASK) - ETHER_CRC_LEN, - ETHER_ALIGN, sc->ifp, NULL); + ETHER_ALIGN, ifp, NULL); + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, + BUS_DMASYNC_PREWRITE); sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, - BUS_DMASYNC_PREWRITE); + BUS_DMASYNC_POSTWRITE); bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREREAD); - if (mb != NULL) - (*sc->ifp->if_input)(sc->ifp, mb); + if (mb != NULL) { + ifp->if_ipackets++; + (*ifp->if_input)(ifp, mb); + } + } } if (status & ETH_ISR_TCOM) { ATE_LOCK(sc); + /* XXX TSR register should be cleared */ if (sc->sent_mbuf[0]) { + bus_dmamap_sync(sc->rxtag, sc->tx_map[0], + BUS_DMASYNC_POSTWRITE); m_freem(sc->sent_mbuf[0]); + ifp->if_opackets++; sc->sent_mbuf[0] = NULL; } if (sc->sent_mbuf[1]) { if (RD4(sc, ETH_TSR) & ETH_TSR_IDLE) { + bus_dmamap_sync(sc->rxtag, sc->tx_map[1], + BUS_DMASYNC_POSTWRITE); m_freem(sc->sent_mbuf[1]); + ifp->if_opackets++; sc->txcur = 0; sc->sent_mbuf[0] = sc->sent_mbuf[1] = NULL; } else { @@ -684,6 +712,7 @@ { struct ate_softc *sc = xsc; struct ifnet *ifp = sc->ifp; + struct mii_data *mii; ATE_ASSERT_LOCKED(sc); @@ -731,6 +760,10 @@ */ ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + + mii = device_get_softc(sc->miibus); + mii_pollstat(mii); + ate_stat_update(sc, mii->mii_media_active); atestart_locked(ifp); callout_reset(&sc->tick_ch, hz, ate_tick, sc); @@ -745,7 +778,7 @@ struct ate_softc *sc = ifp->if_softc; struct mbuf *m, *mdefrag; bus_dma_segment_t segs[1]; - int nseg; + int nseg, e; ATE_ASSERT_LOCKED(sc); if (ifp->if_drv_flags & IFF_DRV_OACTIVE) @@ -767,14 +800,19 @@ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; return; } - mdefrag = m_defrag(m, M_DONTWAIT); - if (mdefrag == NULL) { - IFQ_DRV_PREPEND(&ifp->if_snd, m); - return; + e = bus_dmamap_load_mbuf_sg(sc->mtag, sc->tx_map[sc->txcur], m, + segs, &nseg, 0); + if (e == EFBIG) { + mdefrag = m_defrag(m, M_DONTWAIT); + if (mdefrag == NULL) { + IFQ_DRV_PREPEND(&ifp->if_snd, m); + return; + } + m = mdefrag; + e = bus_dmamap_load_mbuf_sg(sc->mtag, + sc->tx_map[sc->txcur], m, segs, &nseg, 0); } - m = mdefrag; - if (bus_dmamap_load_mbuf_sg(sc->mtag, sc->tx_map[sc->txcur], m, - segs, &nseg, 0) != 0) { + if (e != 0) { m_freem(m); continue; } ==== //depot/projects/newisp/arm/include/atomic.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.19 2006/05/15 13:08:12 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.20 2006/11/07 11:53:44 cognet Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -337,6 +337,7 @@ #define atomic_cmpset_acq_int atomic_cmpset_32 #define atomic_cmpset_acq_ptr atomic_cmpset_ptr #define atomic_cmpset_acq_long atomic_cmpset_long +#define atomic_cmpset_acq_32 atomic_cmpset_32 #define atomic_store_rel_ptr atomic_store_ptr #define atomic_store_rel_int atomic_store_32 #define atomic_cmpset_rel_32 atomic_cmpset_32 ==== //depot/projects/newisp/boot/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.31 2006/10/09 04:43:06 kmacy Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.32 2006/11/05 22:03:02 marcel Exp $ .include @@ -8,7 +8,7 @@ .endif # Build EFI library. -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "ia64" SUBDIR+= efi .endif ==== //depot/projects/newisp/boot/common/load_elf.c#3 (text+ko) ==== @@ -26,12 +26,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.35 2006/10/29 14:50:57 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.37 2006/11/02 17:52:43 ru Exp $"); #include #include #include #include +#include #include #include #include @@ -263,7 +264,7 @@ #if __ELF_WORD_SIZE == 64 off = - (off & 0xffffffffff000000ull);/* x86_64 relocates after locore */ #else - off = - (off & 0xc0000000u); /* i386 relocates after locore */ + off = - (off & 0xff000000u); /* i386 relocates after locore */ #endif #else off = 0; /* other archs use direct mapped kernels */ @@ -400,9 +401,9 @@ lastaddr += sizeof(size); #ifdef ELF_VERBOSE - printf("\n%s: 0x%lx@0x%lx -> 0x%lx-0x%lx", secname, - shdr[i].sh_size, shdr[i].sh_offset, - lastaddr, lastaddr + shdr[i].sh_size); + printf("\n%s: 0x%jx@0x%jx -> 0x%jx-0x%jx", secname, + (uintmax_t)shdr[i].sh_size, (uintmax_t)shdr[i].sh_offset, + (uintmax_t)lastaddr, (uintmax_t)(lastaddr + shdr[i].sh_size)); #else if (i == symstrindex) printf("+"); ==== //depot/projects/newisp/boot/efi/include/efilib.h#3 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2000 Doug Rabson + * Copyright (c) 2006 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,24 +24,31 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.5 2006/11/02 02:42:47 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.6 2006/11/05 22:03:02 marcel Exp $ */ -#include +#include extern EFI_HANDLE IH; extern EFI_SYSTEM_TABLE *ST; extern EFI_BOOT_SERVICES *BS; extern EFI_RUNTIME_SERVICES *RS; -/* DIG64 Headless Console & Debug Port Table. */ -#define HCDP_TABLE_GUID \ - {0xf951938d,0x620b,0x42ef,{0x82,0x79,0xa8,0x4b,0x79,0x61,0x78,0x98}} +extern struct devsw efifs_dev; +extern struct fs_ops efifs_fsops; + +extern struct devsw efinet_dev; +extern struct netif_driver efinetif; void *efi_get_table(EFI_GUID *tbl); void efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table); -EFI_PHYSICAL_ADDRESS efimd_va2pa(EFI_VIRTUAL_ADDRESS); +int efi_register_handles(struct devsw *, EFI_HANDLE *, int); +EFI_HANDLE efi_find_handle(struct devsw *, int); +int efi_handle_lookup(EFI_HANDLE, struct devsw **, int *); + +int efi_status_to_errno(EFI_STATUS); +time_t efi_time(EFI_TIME *); EFI_STATUS main(int argc, CHAR16 *argv[]); void exit(EFI_STATUS status); ==== //depot/projects/newisp/boot/efi/libefi/Makefile#2 (text+ko) ==== @@ -1,27 +1,16 @@ -# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.16 2004/11/28 00:30:22 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.17 2006/11/05 22:03:03 marcel Exp $ -.PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} - LIB= efi INTERNALLIB= -SRCS= bootinfo.c copy.c delay.c devicename.c efi_console.c efifs.c efinet.c \ - elf_freebsd.c libefi.c module.c time.c +SRCS= delay.c efi_console.c efifs.c efinet.c errno.c handles.c libefi.c \ + time.c -.if ${MACHINE_ARCH} == "ia64" -SRCS+= efifpswa.c pal.S -.endif - CFLAGS+= -I${.CURDIR}/../include -CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} +CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH:S/amd64/i386/} CFLAGS+= -I${.CURDIR}/../../../../lib/libstand # Pick up the bootstrap header for some interface items CFLAGS+= -I${.CURDIR}/../../common -# Make the disk code more talkative -.if defined(BOOT_DISK_DEBUG) -CFLAGS+= -DDISK_DEBUG -.endif - .include ==== //depot/projects/newisp/boot/efi/libefi/efifs.c#3 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2001 Doug Rabson + * Copyright (c) 2006 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,88 +23,100 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.9 2006/11/02 01:23:17 marcel Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.10 2006/11/05 22:03:03 marcel Exp $"); + #include #include #include -#include #include +#include + #include #include -#include "efiboot.h" +#include /* Perform I/O in blocks of size EFI_BLOCK_SIZE. */ #define EFI_BLOCK_SIZE (1024 * 1024) +union fileinfo { + EFI_FILE_INFO info; + char bytes[sizeof(EFI_FILE_INFO) + 508]; +}; + +static EFI_GUID sfs_guid = SIMPLE_FILE_SYSTEM_PROTOCOL; +static EFI_GUID fs_guid = EFI_FILE_SYSTEM_INFO_ID; +static EFI_GUID fi_guid = EFI_FILE_INFO_ID; + static int efifs_open(const char *upath, struct open_file *f) { - struct efi_devdesc *dev = f->f_devdata; - static EFI_GUID sfsid = SIMPLE_FILE_SYSTEM_PROTOCOL; - EFI_FILE_IO_INTERFACE *sfs; - EFI_FILE *root; - EFI_FILE *file; + struct devdesc *dev = f->f_devdata; + EFI_FILE_IO_INTERFACE *fsif; + EFI_FILE *file, *root; + EFI_HANDLE h; EFI_STATUS status; - CHAR16 *cp; - CHAR16 *path; + CHAR16 *cp, *path; + + if (f->f_dev != &efifs_dev || dev->d_unit < 0) + return (EINVAL); - /* - * We cannot blindly assume that f->f_devdata points to a - * efi_devdesc structure. Before we dereference 'dev', make - * sure that the underlying device is ours. - */ - if (f->f_dev != &efifs_dev || dev->d_handle == NULL) - return ENOENT; + h = efi_find_handle(f->f_dev, dev->d_unit); + if (h == NULL) + return (EINVAL); - status = BS->HandleProtocol(dev->d_handle, &sfsid, (VOID **)&sfs); + status = BS->HandleProtocol(h, &sfs_guid, (VOID **)&fsif); if (EFI_ERROR(status)) - return ENOENT; + return (efi_status_to_errno(status)); - /* - * Find the root directory. - */ - status = sfs->OpenVolume(sfs, &root); + /* Get the root directory. */ + status = fsif->OpenVolume(fsif, &root); + if (EFI_ERROR(status)) + return (efi_status_to_errno(status)); - /* - * Convert path to CHAR16, skipping leading separators. - */ while (*upath == '/') upath++; - if (!*upath) { - /* Opening the root directory, */ + + /* Special case: opening the root directory. */ + if (*upath == '\0') { f->f_fsdata = root; - return 0; + return (0); + } + + path = malloc((strlen(upath) + 1) * sizeof(CHAR16)); + if (path == NULL) { + root->Close(root); + return (ENOMEM); } - cp = path = malloc((strlen(upath) + 1) * sizeof(CHAR16)); - if (path == NULL) - return ENOMEM; - while (*upath) { - if (*upath == '/') + + cp = path; + while (*upath != '\0') { + if (*upath == '/') { *cp = '\\'; - else + while (upath[1] == '/') + upath++; + } else *cp = *upath; upath++; cp++; } - *cp++ = 0; + *cp = 0; - /* - * Try to open it. - */ - status = root->Open(root, &file, path, EFI_FILE_MODE_READ, 0); + /* Open the file. */ + status = root->Open(root, &file, path, + EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE, 0); + if (status == EFI_ACCESS_DENIED || status == EFI_WRITE_PROTECTED) + status = root->Open(root, &file, path, EFI_FILE_MODE_READ, 0); free(path); - if (EFI_ERROR(status)) { - root->Close(root); - return ENOENT; - } + root->Close(root); + if (EFI_ERROR(status)) + return (efi_status_to_errno(status)); - root->Close(root); f->f_fsdata = file; - return 0; + return (0); } static int @@ -111,8 +124,12 @@ { EFI_FILE *file = f->f_fsdata; + if (file == NULL) + return (EBADF); + file->Close(file); - return 0; + f->f_fsdata = NULL; + return (0); } static int @@ -123,15 +140,17 @@ UINTN sz = size; char *bufp; + if (file == NULL) + return (EBADF); + bufp = buf; while (size > 0) { sz = size; if (sz > EFI_BLOCK_SIZE) sz = EFI_BLOCK_SIZE; status = file->Read(file, &sz, bufp); - twiddle(); if (EFI_ERROR(status)) - return EIO; + return (efi_status_to_errno(status)); if (sz == 0) break; size -= sz; @@ -139,7 +158,7 @@ } if (resid) *resid = size; - return 0; + return (0); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 7 18:48:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A91AC16A47B; Tue, 7 Nov 2006 18:48:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 844F816A403 for ; Tue, 7 Nov 2006 18:48:19 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89A4443D7F for ; Tue, 7 Nov 2006 18:48:11 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7ImBRn020413 for ; Tue, 7 Nov 2006 18:48:11 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7ImBSV020410 for perforce@freebsd.org; Tue, 7 Nov 2006 18:48:11 GMT (envelope-from als@FreeBSD.org) Date: Tue, 7 Nov 2006 18:48:11 GMT Message-Id: <200611071848.kA7ImBSV020410@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 109462 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 18:48:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=109462 Change 109462 by als@als_head on 2006/11/07 18:47:58 disable linker debug. add to default in for jail only kernel_linker_file. other modules only init jail_0 and must be kldloaded when need init selected context. Affected files ... .. //depot/projects/jail2/sys/kern/kern_linker.c#7 edit Differences ... ==== //depot/projects/jail2/sys/kern/kern_linker.c#7 (text+ko) ==== @@ -31,8 +31,6 @@ #include "opt_hwpmc_hooks.h" #include "opt_mac.h" -#define KLD_DEBUG - #include #include #include @@ -67,7 +65,7 @@ #endif #ifdef KLD_DEBUG -int kld_debug = 1; +int kld_debug = 0; #endif #define KLD_LOCK() sx_xlock(&kld_sx) @@ -365,6 +363,26 @@ } static void +linker_file_register_jaildefault(linker_file_t lf) +{ + struct jailinit **start, **stop, **sipp; + + KLD_DPF(FILE, + ("linker_file_register_jaildefault: registering default for jail." + "file %s\n", lf->filename)); + + if (linker_file_lookup_set(lf, "jailinit_set", &start, &stop, NULL) != 0) + return; + + for (sipp = start; sipp < stop; sipp++) { + if ((*sipp)->subsystem == SI_SUB_DUMMY) + continue; /* skip dummy task(s) */ + + jailsysinit_add(*sipp); + } +} + +static void linker_file_jailuninit(linker_file_t lf, struct prison *pr) { struct jailinit **start, **stop, **sipp, **xipp, *save; @@ -394,8 +412,6 @@ if ((*sipp)->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s) */ - if (!pr_jailed(pr)) - jailsysinit_del(*sipp); /* Call function */ (*((*sipp)->fini)) (pr); } @@ -490,6 +506,7 @@ linker_file_register_modules(linker_kernel_file); #ifdef JAIL + linker_file_register_jaildefault(linker_kernel_file); linker_file_register_jailinit(linker_kernel_file, &jail_0); #endif } From owner-p4-projects@FreeBSD.ORG Tue Nov 7 19:15:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFEC916A412; Tue, 7 Nov 2006 19:15:49 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 97B1716A407 for ; Tue, 7 Nov 2006 19:15:49 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A2E643D45 for ; Tue, 7 Nov 2006 19:15:49 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7JFn7G026802 for ; Tue, 7 Nov 2006 19:15:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7JFn7V026799 for perforce@freebsd.org; Tue, 7 Nov 2006 19:15:49 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Nov 2006 19:15:49 GMT Message-Id: <200611071915.kA7JFn7V026799@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109467 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 19:15:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=109467 Change 109467 by sam@sam_ebb on 2006/11/07 19:15:21 count packets and collisions Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#10 (text+ko) ==== @@ -690,6 +690,9 @@ + be32toh(ns->RxOverrunDiscards) + be32toh(ns->RxUnderflowEntryDiscards) ; + ifp->if_collisions += be32toh(ns->dot3StatsSingleCollisionFrames) + + be32toh(ns->dot3StatsMultipleCollisionFrames) + ; /* schedule next poll */ callout_reset(&sc->tick_ch, hz, npe_tick, sc); @@ -746,6 +749,7 @@ npe->ix_m = NULL; npe->ix_next = sc->tx_free; sc->tx_free = npe; + ifp->if_opackets++; } /* * We're no longer busy, so clear the busy flag and call the @@ -836,6 +840,7 @@ mrx->m_pkthdr.rcvif = ifp; mrx->m_flags |= M_HASFCS; + ifp->if_ipackets++; ifp->if_input(ifp, mrx); if (npe_rxbuf_init(sc, npe, m) != 0) { From owner-p4-projects@FreeBSD.ORG Tue Nov 7 19:48:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59F9B16A512; Tue, 7 Nov 2006 19:48:56 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2CEE816A49E for ; Tue, 7 Nov 2006 19:48:56 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CF6243DC1 for ; Tue, 7 Nov 2006 19:47:56 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7JlhKZ031621 for ; Tue, 7 Nov 2006 19:47:43 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7JlSJ9031607 for perforce@freebsd.org; Tue, 7 Nov 2006 19:47:28 GMT (envelope-from piso@freebsd.org) Date: Tue, 7 Nov 2006 19:47:28 GMT Message-Id: <200611071947.kA7JlSJ9031607@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 109468 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 19:48:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=109468 Change 109468 by piso@piso_newluxor on 2006/11/07 19:46:43 IFC@109440 Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/genassym.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#9 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/io.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/pmap.c#8 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/support.S#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/trap.c#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/conf/GENERIC#8 integrate .. //depot/projects/soc2006/intr_filter/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/conf/NOTES#6 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/apicvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/asmacros.h#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/profile.h#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/isa/atpic.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux.h#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_dummy.c#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_proto.h#9 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_syscall.h#9 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_sysent.c#9 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/syscalls.master#9 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/cpufunc.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/elf_trampoline.c#7 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/fusu.S#3 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/genassym.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/nexus.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/nexus_io.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/trap.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/undefined.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_mci.c#1 branch .. //depot/projects/soc2006/intr_filter/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/soc2006/intr_filter/arm/at91/at91_spi.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_sscreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_twi.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/if_ate.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/kb920x_machdep.c#7 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/std.at91#3 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/std.kb920x#3 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/EP80219#3 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/IQ31244#3 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/KB920X#5 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/SIMICS#3 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/SKYEYE#3 integrate .. //depot/projects/soc2006/intr_filter/arm/include/atomic.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0_ost.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/boot/Makefile#5 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/boot0spi/main.c#3 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/arm/at91/bootiic/env_vars.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/bootiic/loader_prompt.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/bootspi/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/bootspi/arm_init.S#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/soc2006/intr_filter/boot/arm/at91/bootspi/env_vars.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/bootspi/loader_prompt.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/bootspi/main.c#3 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/at91rm9200.h#3 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/emac.h#3 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/lib.h#3 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/lib_AT91RM9200.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/mci_device.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/mci_device.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/p_string.c#3 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/printf.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/putchar.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/sd-card.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/common/Makefile.inc#2 integrate .. //depot/projects/soc2006/intr_filter/boot/common/bootstrap.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/common/devopen.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/common/help.common#3 integrate .. //depot/projects/soc2006/intr_filter/boot/common/load_elf.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/common/loader.8#3 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/efi.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/efi_nii.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/efiapi.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/eficon.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/efidebug.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/efidef.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/efidevp.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/efierr.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/efifs.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/efilib.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/efinet.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/efipart.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/efiprot.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/efipxebc.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/efiser.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/efistdarg.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/i386/efibind.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/i386/pe.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/ia64/efibind.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/include/ia64/pe.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/libefi/bootinfo.c#2 delete .. //depot/projects/soc2006/intr_filter/boot/efi/libefi/copy.c#2 delete .. //depot/projects/soc2006/intr_filter/boot/efi/libefi/devicename.c#2 delete .. //depot/projects/soc2006/intr_filter/boot/efi/libefi/efiboot.h#2 delete .. //depot/projects/soc2006/intr_filter/boot/efi/libefi/efifpswa.c#2 delete .. //depot/projects/soc2006/intr_filter/boot/efi/libefi/efifs.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/libefi/elf_freebsd.c#2 delete .. //depot/projects/soc2006/intr_filter/boot/efi/libefi/errno.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/efi/libefi/handles.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/efi/libefi/libefi.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/efi/libefi/module.c#2 delete .. //depot/projects/soc2006/intr_filter/boot/efi/libefi/time.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/forth/support.4th#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/libi386/bootinfo32.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/libi386/elf64_freebsd.c#3 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/loader/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/loader/main.c#3 integrate .. //depot/projects/soc2006/intr_filter/boot/ia64/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ia64/common/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/boot/ia64/common/autoload.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/ia64/common/copy.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/ia64/common/devicename.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/ia64/common/exec.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/ia64/common/libia64.h#1 branch .. //depot/projects/soc2006/intr_filter/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ia64/efi/main.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ia64/efi/version#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ia64/ski/bootinfo.c#2 delete .. //depot/projects/soc2006/intr_filter/boot/ia64/ski/copy.c#2 delete .. //depot/projects/soc2006/intr_filter/boot/ia64/ski/devicename.c#2 delete .. //depot/projects/soc2006/intr_filter/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ia64/ski/elf_freebsd.c#2 delete .. //depot/projects/soc2006/intr_filter/boot/ia64/ski/libski.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ia64/ski/main.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ia64/ski/skifs.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/ia64/ski/version#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ofw/common/main.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ofw/libofw/libofw.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/boot/pc98/loader/main.c#3 integrate .. //depot/projects/soc2006/intr_filter/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/soc2006/intr_filter/cam/cam_ccb.h#2 integrate .. //depot/projects/soc2006/intr_filter/cam/cam_xpt.c#4 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/soc2006/intr_filter/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_emul.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_emul.h#2 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_file.c#4 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_ipc.c#4 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_misc.c#6 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_misc.h#1 branch .. //depot/projects/soc2006/intr_filter/compat/linux/linux_signal.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_signal.h#2 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_stats.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/soc2006/intr_filter/conf/NOTES#9 integrate .. //depot/projects/soc2006/intr_filter/conf/files#8 integrate .. //depot/projects/soc2006/intr_filter/conf/files.amd64#6 integrate .. //depot/projects/soc2006/intr_filter/conf/files.i386#6 integrate .. //depot/projects/soc2006/intr_filter/conf/files.ia64#4 integrate .. //depot/projects/soc2006/intr_filter/conf/files.pc98#4 integrate .. //depot/projects/soc2006/intr_filter/conf/files.powerpc#4 integrate .. //depot/projects/soc2006/intr_filter/conf/files.sparc64#2 integrate .. //depot/projects/soc2006/intr_filter/conf/kern.post.mk#5 integrate .. //depot/projects/soc2006/intr_filter/conf/kern.pre.mk#5 integrate .. //depot/projects/soc2006/intr_filter/conf/kmod.mk#4 integrate .. //depot/projects/soc2006/intr_filter/conf/options#7 integrate .. //depot/projects/soc2006/intr_filter/conf/options.sparc64#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/soc2006/intr_filter/contrib/pf/net/pf.c#3 integrate .. //depot/projects/soc2006/intr_filter/crypto/sha2/sha2.c#3 integrate .. //depot/projects/soc2006/intr_filter/ddb/db_command.c#4 integrate .. //depot/projects/soc2006/intr_filter/ddb/db_main.c#2 integrate .. //depot/projects/soc2006/intr_filter/ddb/db_ps.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/aac/aac_cam.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/aac/aac_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpi_support/acpi_aiboost.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/advansys/advansys.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/advansys/advlib.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/advansys/adwcam.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/aha/aha.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ahb/ahb.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/aic/aic.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/aic7xxx/aic7xxx_osm.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/amd/amd.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/amr/amr.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/amr/amr_cam.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/amr/amr_disk.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/an/if_an.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/arl/if_arl.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/asr/asr.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-disk.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-raid.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/atkbdc/atkbd.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/awi/if_awi_pccard.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/bce/if_bce.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/bge/if_bge.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/buslogic/bt.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ce/if_ce.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ciss/ciss.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cp/if_cp.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ctau/if_ct.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/cx/if_cx.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/dc/if_dc.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/dpt/dpt_scsi.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/drm/drmP.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em.c#14 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em.h#6 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em_hw.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em_hw.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em_osdep.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/fdc/fdc.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/sbp.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/iir/iir.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_library.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_library.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_pci.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_sbus.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_stds.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/isp/isp_target.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_target.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/ispmbox.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/ispreg.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/ispvar.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ispfw/asm_2300.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwireg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/kbd/kbd.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/lmc/if_lmc.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/md/md.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi_debug.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfireg.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfivar.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mly/mly.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mmc/bridge.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/mmc/mmc.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/mmc/mmcbr_if.m#1 branch .. //depot/projects/soc2006/intr_filter/dev/mmc/mmcbrvar.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/mmc/mmcbus_if.m#1 branch .. //depot/projects/soc2006/intr_filter/dev/mmc/mmcreg.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/mmc/mmcsd.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/mmc/mmcvar.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_cam.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/null/null.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ofw/openfirm.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci_pci.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pcivar.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/random/randomdev.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ray/if_ray.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sbsh/if_sbsh.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/si/si.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/midi/sequencer.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/spibus/spibus.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/syscons/syscons.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/trm/trm.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_cam.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/uart/uart_kbd_sun.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/uart/uart_kbd_sun.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ehci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_axe.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_udav.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_ural.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ohci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ubsa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uhci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ukbd.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/umass.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usbdevs#7 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usbdi.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/wi/if_wi.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/wl/if_wl.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/zs/zs.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/devfs/devfs.h#3 integrate .. //depot/projects/soc2006/intr_filter/fs/devfs/devfs_devs.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/soc2006/intr_filter/fs/devfs/devfs_rule.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/soc2006/intr_filter/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/denode.h#3 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/nwfs/nwfs_subr.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/procfs/procfs_ioctl.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/smbfs/smbfs_smb.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/smbfs/smbfs_subr.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/soc2006/intr_filter/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/geom/concat/g_concat.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/eli/g_eli.c#5 integrate .. //depot/projects/soc2006/intr_filter/geom/geom.h#4 integrate .. //depot/projects/soc2006/intr_filter/geom/geom_disk.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/geom_disk.h#2 integrate .. //depot/projects/soc2006/intr_filter/geom/geom_gpt.c#4 integrate .. //depot/projects/soc2006/intr_filter/geom/geom_io.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/geom_slice.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/journal/g_journal.c#1 branch .. //depot/projects/soc2006/intr_filter/geom/journal/g_journal.h#1 branch .. //depot/projects/soc2006/intr_filter/geom/journal/g_journal_ufs.c#1 branch .. //depot/projects/soc2006/intr_filter/geom/mirror/g_mirror.c#6 integrate .. //depot/projects/soc2006/intr_filter/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/soc2006/intr_filter/geom/mirror/g_mirror_ctl.c#3 integrate .. //depot/projects/soc2006/intr_filter/geom/raid3/g_raid3.c#6 integrate .. //depot/projects/soc2006/intr_filter/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/soc2006/intr_filter/geom/raid3/g_raid3_ctl.c#5 integrate .. //depot/projects/soc2006/intr_filter/geom/shsec/g_shsec.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/acpica/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/i386/conf/DEFAULTS#3 integrate .. //depot/projects/soc2006/intr_filter/i386/conf/GENERIC#9 integrate .. //depot/projects/soc2006/intr_filter/i386/conf/NOTES#6 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/db_trace.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/genassym.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#14 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/io.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/io_apic.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/local_apic.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/pmap.c#7 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/support.s#4 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/trap.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/vm86.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_misc.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/include/apicvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/i386/include/asmacros.h#2 integrate .. //depot/projects/soc2006/intr_filter/i386/include/intr_machdep.h#4 integrate .. //depot/projects/soc2006/intr_filter/i386/include/profile.h#2 integrate .. //depot/projects/soc2006/intr_filter/i386/isa/atpic.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux.h#3 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_dummy.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_proto.h#9 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_syscall.h#9 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_sysent.c#9 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/syscalls.master#9 integrate .. //depot/projects/soc2006/intr_filter/i4b/driver/i4b_ipr.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/soc2006/intr_filter/ia64/conf/GENERIC#8 integrate .. //depot/projects/soc2006/intr_filter/ia64/conf/NOTES#3 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/clock.c#3 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/genassym.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/nexus.c#4 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/pmap.c#5 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/ssc.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/support.S#3 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/trap.c#5 integrate .. //depot/projects/soc2006/intr_filter/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/init_main.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/init_sysent.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_acct.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_acl.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_alq.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_clock.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_conf.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_descrip.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_environment.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_exec.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_exit.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_fork.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_idle.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#17 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_jail.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_kse.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_ktrace.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_linker.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mac.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_malloc.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mbuf.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_ntptime.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_poll.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_priv.c#1 branch .. //depot/projects/soc2006/intr_filter/kern/kern_proc.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_prot.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_resource.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_shutdown.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sig.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_subr.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_switch.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_synch.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sysctl.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_thr.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_thread.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_time.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_timeout.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_umtx.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_xxx.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/link_elf.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/link_elf_obj.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_4bsd.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_ule.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_acl_posix1e.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_disk.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_fattime.c#1 branch .. //depot/projects/soc2006/intr_filter/kern/subr_firmware.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_prf.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_trap.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_witness.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/sys_generic.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/sys_pipe.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/sys_process.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/sys_socket.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/syscalls.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/syscalls.master#7 integrate .. //depot/projects/soc2006/intr_filter/kern/systrace_args.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_ipc.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_msg.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_sem.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_shm.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/tty.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/tty_cons.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/tty_pts.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/tty_pty.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_mbuf.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_mqueue.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_sem.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_socket.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_syscalls.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_usrreq.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_aio.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_bio.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_cluster.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_lookup.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_mount.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_subr.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_syscalls.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/modules/acpi/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/acpi/acpi_aiboost/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/aio/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/ath_rate_amrr/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/modules/bge/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/geom/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/modules/geom/geom_journal/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/linux/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/modules/mem/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/mmc/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/mmcsd/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/nfe/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/powermac_nvram/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/uart/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/ufs/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/net/bpf.c#6 integrate .. //depot/projects/soc2006/intr_filter/net/bridgestp.c#5 integrate .. //depot/projects/soc2006/intr_filter/net/bridgestp.h#2 integrate .. //depot/projects/soc2006/intr_filter/net/bsd_comp.c#2 integrate .. //depot/projects/soc2006/intr_filter/net/if.c#7 integrate .. //depot/projects/soc2006/intr_filter/net/if_atmsubr.c#3 integrate .. //depot/projects/soc2006/intr_filter/net/if_bridge.c#8 integrate .. //depot/projects/soc2006/intr_filter/net/if_bridgevar.h#3 integrate .. //depot/projects/soc2006/intr_filter/net/if_ethersubr.c#4 integrate .. //depot/projects/soc2006/intr_filter/net/if_fddisubr.c#2 integrate .. //depot/projects/soc2006/intr_filter/net/if_fwsubr.c#2 integrate .. //depot/projects/soc2006/intr_filter/net/if_gif.c#5 integrate .. //depot/projects/soc2006/intr_filter/net/if_gre.c#4 integrate .. //depot/projects/soc2006/intr_filter/net/if_iso88025subr.c#2 integrate .. //depot/projects/soc2006/intr_filter/net/if_ppp.c#3 integrate .. //depot/projects/soc2006/intr_filter/net/if_sl.c#2 integrate .. //depot/projects/soc2006/intr_filter/net/if_stf.c#5 integrate .. //depot/projects/soc2006/intr_filter/net/if_tap.c#4 integrate .. //depot/projects/soc2006/intr_filter/net/if_tun.c#4 integrate .. //depot/projects/soc2006/intr_filter/net/if_vlan.c#8 integrate .. //depot/projects/soc2006/intr_filter/net/ppp_tty.c#2 integrate .. //depot/projects/soc2006/intr_filter/net/raw_usrreq.c#3 integrate .. //depot/projects/soc2006/intr_filter/net/rtsock.c#4 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/soc2006/intr_filter/netatalk/aarp.c#2 integrate .. //depot/projects/soc2006/intr_filter/netatalk/at_control.c#2 integrate .. //depot/projects/soc2006/intr_filter/netatalk/ddp_input.c#2 integrate .. //depot/projects/soc2006/intr_filter/netatalk/ddp_output.c#2 integrate .. //depot/projects/soc2006/intr_filter/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/soc2006/intr_filter/netatm/atm_usrreq.c#3 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/soc2006/intr_filter/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/netgraph.h#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_base.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_device.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_message.h#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_nat.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_socket.c#4 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_socket.h#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_tty.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/if_ether.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/igmp.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/in.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_pcb.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_proto.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_carp.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_divert.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_dummynet.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_fw2.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_icmp.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_input.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_mroute.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_options.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_output.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/libalias.3#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/raw_ip.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_asconf.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_asconf.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_auth.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_auth.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_bsd_addr.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_bsd_addr.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_constants.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_crc32.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_crc32.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_header.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_indata.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_indata.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_input.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_input.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_lock_bsd.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_os.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_os_bsd.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_output.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_output.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_pcb.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_pcb.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_peeloff.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_peeloff.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_structs.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_timer.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_timer.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_uio.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_usrreq.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctp_var.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctputil.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/sctputil.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/tcp_input.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_output.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_subr.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_syncache.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/udp_usrreq.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_pcb.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_proto.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_src.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ipsec.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/nd6.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/sctp6_usrreq.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet6/sctp6_var.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/soc2006/intr_filter/netipsec/ipsec.c#2 integrate .. //depot/projects/soc2006/intr_filter/netipsec/ipsec_osdep.h#3 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_pcb.c#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_usrreq.c#3 integrate .. //depot/projects/soc2006/intr_filter/netncp/ncp_conn.c#2 integrate .. //depot/projects/soc2006/intr_filter/netncp/ncp_mod.c#2 integrate .. //depot/projects/soc2006/intr_filter/netncp/ncp_subr.h#2 integrate .. //depot/projects/soc2006/intr_filter/netsmb/smb_conn.c#3 integrate .. //depot/projects/soc2006/intr_filter/netsmb/smb_subr.c#2 integrate .. //depot/projects/soc2006/intr_filter/netsmb/smb_subr.h#2 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs.h#2 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/soc2006/intr_filter/pc98/cbus/fdc.c#4 integrate .. //depot/projects/soc2006/intr_filter/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/soc2006/intr_filter/pc98/conf/GENERIC#8 integrate .. //depot/projects/soc2006/intr_filter/pc98/conf/NOTES#4 integrate .. //depot/projects/soc2006/intr_filter/pc98/pc98/machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/pci/agp.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/if_sis.c#4 integrate .. //depot/projects/soc2006/intr_filter/pci/ncr.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/nfsmb.c#4 integrate .. //depot/projects/soc2006/intr_filter/posix4/ksched.c#4 integrate .. //depot/projects/soc2006/intr_filter/posix4/p1003_1b.c#3 integrate .. //depot/projects/soc2006/intr_filter/powerpc/conf/DEFAULTS#3 integrate .. //depot/projects/soc2006/intr_filter/powerpc/conf/GENERIC#8 integrate .. //depot/projects/soc2006/intr_filter/powerpc/conf/NOTES#3 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/copyinout.c#3 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/trap.c#4 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_arg.c#4 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_pipe.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_private.h#3 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_framework.h#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_inet.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_internal.h#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_label.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_net.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_pipe.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_priv.c#1 branch .. //depot/projects/soc2006/intr_filter/security/mac/mac_process.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_socket.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_system.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_sysv_msg.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_sysv_sem.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_sysv_shm.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_vfs.c#4 integrate .. //depot/projects/soc2006/intr_filter/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/conf/GENERIC#9 integrate .. //depot/projects/soc2006/intr_filter/sparc64/conf/NOTES#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/endian.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/support.S#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/conf/DEFAULTS#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/conf/NOTES#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/elf.h#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/endian.h#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/hypervisor_api.h#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/hypervisorvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/trap.h#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/utrap.h#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/exception.S#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/fpemu.c#2 delete .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/genassym.c#2 delete .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/hcall.S#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/support.S#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/wbuf.S#2 integrate .. //depot/projects/soc2006/intr_filter/sys/bio.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/clock.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/conf.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/cons.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/elf32.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/elf64.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/jail.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/libkern.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/mac.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/mac_policy.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/mbuf.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/mount.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/param.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/pcpu.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/priv.h#1 branch .. //depot/projects/soc2006/intr_filter/sys/proc.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/queue.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/rtprio.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/rwlock.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/sched.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/sem.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/socket.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/soundcard.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/syscall.h#6 integrate .. //depot/projects/soc2006/intr_filter/sys/syscall.mk#6 integrate .. //depot/projects/soc2006/intr_filter/sys/sysproto.h#6 integrate .. //depot/projects/soc2006/intr_filter/sys/systm.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/umtx.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/vnode.h#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/fs.h#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/gjournal.h#1 branch .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_gjournal.c#1 branch .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_quota.c#3 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/soc2006/intr_filter/vm/device_pager.c#3 integrate .. //depot/projects/soc2006/intr_filter/vm/phys_pager.c#2 integrate .. //depot/projects/soc2006/intr_filter/vm/swap_pager.c#4 integrate .. //depot/projects/soc2006/intr_filter/vm/uma_core.c#3 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_contig.c#3 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_fault.c#5 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_glue.c#2 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_kern.c#2 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_map.c#5 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_mmap.c#3 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_object.c#4 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_page.c#6 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_page.h#4 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_pageout.c#3 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_zeroidle.c#3 integrate .. //depot/projects/soc2006/intr_filter/vm/vnode_pager.c#4 integrate Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.77 2006/06/01 04:49:29 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.78 2006/10/15 16:52:59 hrs Exp $"); #include #include @@ -520,7 +520,7 @@ __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); } else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { - printf("bus_dmamem_alloc failed to align memory properly."); + printf("bus_dmamem_alloc failed to align memory properly.\n"); } CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); ==== //depot/projects/soc2006/intr_filter/amd64/amd64/db_trace.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.75 2006/07/12 21:22:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.76 2006/10/20 09:44:20 bde Exp $"); #include #include @@ -91,6 +91,7 @@ { "r15", DB_OFFSET(tf_r15), db_frame }, { "rip", DB_OFFSET(tf_rip), db_frame }, { "rflags", DB_OFFSET(tf_rflags), db_frame }, +#define DB_N_SHOW_REGS 20 /* Don't show registers after here. */ { "dr0", NULL, db_dr0 }, { "dr1", NULL, db_dr1 }, { "dr2", NULL, db_dr2 }, @@ -100,7 +101,7 @@ { "dr6", NULL, db_dr6 }, { "dr7", NULL, db_dr7 }, }; -struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); +struct db_variable *db_eregs = db_regs + DB_N_SHOW_REGS; #define DB_DRX_FUNC(reg) \ static int \ ==== //depot/projects/soc2006/intr_filter/amd64/amd64/genassym.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.157 2005/09/27 21:10:10 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.158 2006/11/01 04:54:49 jb Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -185,6 +185,7 @@ ASSYM(PC_FPCURTHREAD, offsetof(struct pcpu, pc_fpcurthread)); ASSYM(PC_IDLETHREAD, offsetof(struct pcpu, pc_idlethread)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); +ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); ASSYM(PC_SCRATCH_RSP, offsetof(struct pcpu, pc_scratch_rsp)); ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#9 (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/amd64/amd64/intr_machdep.c,v 1.20 2006/07/12 21:22:42 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.25 2006/10/16 21:40:46 jhb Exp $ */ /* @@ -37,6 +37,7 @@ * that source. */ +#include "opt_atpic.h" #include "opt_ddb.h" #include @@ -56,6 +57,14 @@ #include #endif +#ifndef DEV_ATPIC +#include +#include +#include +#include +#include +#endif + #define MAX_STRAY_LOG 5 typedef void (*mask_fn)(void *); @@ -63,6 +72,7 @@ static int intrcnt_index; static struct intsrc *interrupt_sources[NUM_IO_INTS]; static struct mtx intr_table_lock; +static STAILQ_HEAD(, pic) pics; extern struct callout stray_callout_handle; @@ -73,10 +83,45 @@ #endif static void intr_init(void *__dummy); +static int intr_pic_registered(struct pic *pic); static void intrcnt_setname(const char *name, int index); static void intrcnt_updatename(struct intsrc *is); static void intrcnt_register(struct intsrc *is); +static int +intr_pic_registered(struct pic *pic) +{ + struct pic *p; + + STAILQ_FOREACH(p, &pics, pics) { + if (p == pic) + return (1); + } + return (0); +} + +/* + * Register a new interrupt controller (PIC). This is to support suspend + * and resume where we suspend/resume controllers rather than individual + * sources. This also allows controllers with no active sources (such as + * 8259As in a system using the APICs) to participate in suspend and resume. + */ +int +intr_register_pic(struct pic *pic) +{ + int error; + + mtx_lock_spin(&intr_table_lock); + if (intr_pic_registered(pic)) + error = EBUSY; + else { + STAILQ_INSERT_TAIL(&pics, pic, pics); + error = 0; + } + mtx_unlock_spin(&intr_table_lock); + return (error); +} + /* * Register a new interrupt source with the global interrupt system. * The global interrupts need to be disabled when this function is @@ -87,6 +132,7 @@ { int error, vector; + KASSERT(intr_pic_registered(isrc->is_pic), ("unregistered PIC")); vector = isrc->is_pic->pic_vector(isrc); if (interrupt_sources[vector] != NULL) return (EEXIST); @@ -274,26 +320,29 @@ void intr_resume(void) { - struct intsrc **isrc; - int i; + struct pic *pic; +#ifndef DEV_ATPIC + atpic_reset(); +#endif mtx_lock_spin(&intr_table_lock); - for (i = 0, isrc = interrupt_sources; i < NUM_IO_INTS; i++, isrc++) - if (*isrc != NULL && (*isrc)->is_pic->pic_resume != NULL) - (*isrc)->is_pic->pic_resume(*isrc); + STAILQ_FOREACH(pic, &pics, pics) { + if (pic->pic_resume != NULL) + pic->pic_resume(pic); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 7 21:33:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA0DA16A4A7; Tue, 7 Nov 2006 21:33:06 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7838B16A47C for ; Tue, 7 Nov 2006 21:33:06 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46C8343D53 for ; Tue, 7 Nov 2006 21:33:06 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7LX6CC059134 for ; Tue, 7 Nov 2006 21:33:06 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7LX5DT059131 for perforce@freebsd.org; Tue, 7 Nov 2006 21:33:05 GMT (envelope-from cognet@freebsd.org) Date: Tue, 7 Nov 2006 21:33:05 GMT Message-Id: <200611072133.kA7LX5DT059131@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 109479 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 21:33:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=109479 Change 109479 by cognet@cognet on 2006/11/07 21:32:51 Introduce ixpnpe_start_locked(), to be used from ixpnpe_init(), where we already hold the lock. Approved by: mux (mentor) Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#4 (text+ko) ==== @@ -329,25 +329,34 @@ return error; } -int -ixpnpe_start(struct ixpnpe_softc *sc) +static int +ixpnpe_start_locked(struct ixpnpe_softc *sc) { int error; - mtx_lock(&sc->sc_mtx); if (!sc->started) { error = npe_cpu_start(sc); if (error == 0) sc->started = 1; } else error = 0; - mtx_unlock(&sc->sc_mtx); DPRINTF(sc->sc_dev, "%s: error %d\n", __func__, error); return error; } int +ixpnpe_start(struct ixpnpe_softc *sc) +{ + int ret; + + mtx_lock(&sc->sc_mtx); + ret = ixpnpe_start_locked(sc); + mtx_unlock(&sc->sc_mtx); + return (ret); +} + +int ixpnpe_stop(struct ixpnpe_softc *sc) { int error; @@ -450,7 +459,7 @@ error = npe_load_image(sc, imageCodePtr, 1 /*VERIFY*/); if (error == 0) { sc->validImage = 1; - error = ixpnpe_start(sc); + error = ixpnpe_start_locked(sc); } else { sc->validImage = 0; } From owner-p4-projects@FreeBSD.ORG Tue Nov 7 21:48:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DBE516A415; Tue, 7 Nov 2006 21:48:29 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3A5CF16A407 for ; Tue, 7 Nov 2006 21:48:29 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB19C43D5C for ; Tue, 7 Nov 2006 21:48:28 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7LmS3i061528 for ; Tue, 7 Nov 2006 21:48:28 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7LmSRk061525 for perforce@freebsd.org; Tue, 7 Nov 2006 21:48:28 GMT (envelope-from cognet@freebsd.org) Date: Tue, 7 Nov 2006 21:48:28 GMT Message-Id: <200611072148.kA7LmSRk061525@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 109485 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 21:48:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=109485 Change 109485 by cognet@cognet on 2006/11/07 21:47:39 Introduce ixpnpe_sendandrecvmsg_locked(), to avoid having to drop then re-lock the softc mutex in the tick method. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#11 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#5 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#11 (text+ko) ==== @@ -655,9 +655,7 @@ NPE_ASSERT_LOCKED(sc); - NPE_UNLOCK(sc); /* XXX */ npe_updatestats(sc); /* update + clear stats */ - NPE_LOCK(sc); bus_dmamap_sync(sc->sc_stats_tag, sc->sc_stats_map, BUS_DMASYNC_POSTREAD); @@ -1238,7 +1236,7 @@ msg[0] = NPE_RESETSTATS << NPE_MAC_MSGID_SHL; msg[1] = sc->sc_stats_phys; /* physical address of stat block */ - return ixpnpe_sendandrecvmsg(sc->sc_npe, msg, msg); + return ixpnpe_sendandrecvmsg_locked(sc->sc_npe, msg, msg); } #if 0 ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#5 (text+ko) ==== @@ -1352,16 +1352,26 @@ * make other locking confusing. */ int -ixpnpe_sendandrecvmsg(struct ixpnpe_softc *sc, +ixpnpe_sendandrecvmsg_locked(struct ixpnpe_softc *sc, const uint32_t send[2], uint32_t recv[2]) { int error; - mtx_lock(&sc->sc_mtx); error = ixpnpe_sendmsg_locked(sc, send); if (error == 0) error = ixpnpe_recvmsg_locked(sc, recv); - mtx_unlock(&sc->sc_mtx); return error; } + +int +ixpnpe_sendandrecvmsg(struct ixpnpe_softc *sc, + const uint32_t send[2], uint32_t recv[2]) +{ + int error; + + mtx_lock(&sc->sc_mtx); + error = ixpnpe_sendandrecvmsg_locked(sc, send, recv); + mtx_unlock(&sc->sc_mtx); + return (error); +} ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#4 (text+ko) ==== @@ -89,4 +89,6 @@ int ixpnpe_sendandrecvmsg(struct ixpnpe_softc *, const uint32_t send[2], uint32_t recv[2]); +int ixpnpe_sendandrecvmsg_locked(struct ixpnpe_softc *, + const uint32_t send[2], uint32_t recv[2]); #endif /* _IXP425_NPEVAR_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Nov 7 22:07:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3819716A412; Tue, 7 Nov 2006 22:07:56 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 F249016A407 for ; Tue, 7 Nov 2006 22:07:55 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90CBF43D53 for ; Tue, 7 Nov 2006 22:07:55 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7M7tGb065953 for ; Tue, 7 Nov 2006 22:07:55 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7M7slo065950 for perforce@freebsd.org; Tue, 7 Nov 2006 22:07:54 GMT (envelope-from cognet@freebsd.org) Date: Tue, 7 Nov 2006 22:07:54 GMT Message-Id: <200611072207.kA7M7slo065950@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 109488 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 22:07:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=109488 Change 109488 by cognet@cognet on 2006/11/07 22:07:40 Backout previous submit, ixpnpe and npe have different mutexes so it won't work Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#12 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#6 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#12 (text+ko) ==== @@ -655,7 +655,9 @@ NPE_ASSERT_LOCKED(sc); + NPE_UNLOCK(sc); /* XXX */ npe_updatestats(sc); /* update + clear stats */ + NPE_LOCK(sc); bus_dmamap_sync(sc->sc_stats_tag, sc->sc_stats_map, BUS_DMASYNC_POSTREAD); @@ -1236,7 +1238,7 @@ msg[0] = NPE_RESETSTATS << NPE_MAC_MSGID_SHL; msg[1] = sc->sc_stats_phys; /* physical address of stat block */ - return ixpnpe_sendandrecvmsg_locked(sc->sc_npe, msg, msg); + return ixpnpe_sendandrecvmsg(sc->sc_npe, msg, msg); } #if 0 ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#6 (text+ko) ==== @@ -1352,26 +1352,16 @@ * make other locking confusing. */ int -ixpnpe_sendandrecvmsg_locked(struct ixpnpe_softc *sc, +ixpnpe_sendandrecvmsg(struct ixpnpe_softc *sc, const uint32_t send[2], uint32_t recv[2]) { int error; + mtx_lock(&sc->sc_mtx); error = ixpnpe_sendmsg_locked(sc, send); if (error == 0) error = ixpnpe_recvmsg_locked(sc, recv); + mtx_unlock(&sc->sc_mtx); return error; } - -int -ixpnpe_sendandrecvmsg(struct ixpnpe_softc *sc, - const uint32_t send[2], uint32_t recv[2]) -{ - int error; - - mtx_lock(&sc->sc_mtx); - error = ixpnpe_sendandrecvmsg_locked(sc, send, recv); - mtx_unlock(&sc->sc_mtx); - return (error); -} ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#5 (text+ko) ==== @@ -89,6 +89,4 @@ int ixpnpe_sendandrecvmsg(struct ixpnpe_softc *, const uint32_t send[2], uint32_t recv[2]); -int ixpnpe_sendandrecvmsg_locked(struct ixpnpe_softc *, - const uint32_t send[2], uint32_t recv[2]); #endif /* _IXP425_NPEVAR_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Nov 7 23:10:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17B0416A49E; Tue, 7 Nov 2006 23:10:27 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C97F316A40F for ; Tue, 7 Nov 2006 23:10:26 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0CC543D88 for ; Tue, 7 Nov 2006 23:10:16 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7NAGL3077085 for ; Tue, 7 Nov 2006 23:10:16 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7NAGeZ077079 for perforce@freebsd.org; Tue, 7 Nov 2006 23:10:16 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 7 Nov 2006 23:10:16 GMT Message-Id: <200611072310.kA7NAGeZ077079@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 109491 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 23:10:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=109491 Change 109491 by mjacob@newisp on 2006/11/07 23:10:01 move isp_dump_portdb to isp_library so the outer layers can use it directly. Affected files ... .. //depot/projects/newisp/dev/isp/isp.c#28 edit .. //depot/projects/newisp/dev/isp/isp_freebsd.c#20 edit .. //depot/projects/newisp/dev/isp/isp_library.c#15 edit .. //depot/projects/newisp/dev/isp/isp_library.h#11 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp.c#28 (text+ko) ==== @@ -109,7 +109,6 @@ static void isp_scsi_channel_init(ispsoftc_t *, int); static void isp_fibre_init(ispsoftc_t *); static void isp_fibre_init_2400(ispsoftc_t *); -static void isp_dump_portdb(ispsoftc_t *); static void isp_mark_portdb(ispsoftc_t *, int); static void isp_plogx_24xx(ispsoftc_t *, uint16_t, uint32_t, int *); static int isp_port_login(ispsoftc_t *, uint16_t, uint32_t); @@ -2047,53 +2046,6 @@ isp->isp_state = ISP_INITSTATE; } -/* - * Fibre Channel Support- get the port database for the id. - */ -static void -isp_dump_portdb(ispsoftc_t *isp) -{ - fcparam *fcp = (fcparam *) isp->isp_param; - int i; - - for (i = 0; i < MAX_FC_TARG; i++) { - char mb[4]; - const char *dbs[8] = { - "NIL ", - "PROB", - "DEAD", - "CHGD", - "NEW ", - "PVLD", - "????", - "VLD " - }; - const char *roles[4] = { - " UNK", " TGT", " INI", "TINI" - }; - fcportdb_t *lp = &fcp->portdb[i]; - - if (lp->state == FC_PORTDB_STATE_NIL) { - continue; - } - if (lp->ini_map_idx) { - SNPRINTF(mb, sizeof (mb), "%3d", - ((int) lp->ini_map_idx) - 1); - } else { - SNPRINTF(mb, sizeof (mb), "---"); - } - isp_prt(isp, ISP_LOGALL, "%d: %s al%d tgt %s %s 0x%06x =>%s" - " 0x%06x; WWNN 0x%08x%08x WWPN 0x%08x%08x", i, - dbs[lp->state], lp->autologin, mb, - roles[lp->roles], lp->portid, - roles[lp->new_roles], lp->new_portid, - (uint32_t) (lp->node_wwn >> 32), - (uint32_t) (lp->node_wwn), - (uint32_t) (lp->port_wwn >> 32), - (uint32_t) (lp->port_wwn)); - } -} - static void isp_mark_portdb(ispsoftc_t *isp, int onprobation) { ==== //depot/projects/newisp/dev/isp/isp_freebsd.c#20 (text+ko) ==== @@ -2937,6 +2937,7 @@ lp->ini_map_idx = i + 1; } else { isp_prt(isp, ISP_LOGWARN, "out of target ids"); + isp_dump_portdb(isp); } } if (lp->ini_map_idx) { ==== //depot/projects/newisp/dev/isp/isp_library.c#15 (text) ==== @@ -233,6 +233,53 @@ return (0); } +/* + * Fibre Channel Support- get the port database for the id. + */ +void +isp_dump_portdb(ispsoftc_t *isp) +{ + fcparam *fcp = (fcparam *) isp->isp_param; + int i; + + for (i = 0; i < MAX_FC_TARG; i++) { + char mb[4]; + const char *dbs[8] = { + "NIL ", + "PROB", + "DEAD", + "CHGD", + "NEW ", + "PVLD", + "????", + "VLD " + }; + const char *roles[4] = { + " UNK", " TGT", " INI", "TINI" + }; + fcportdb_t *lp = &fcp->portdb[i]; + + if (lp->state == FC_PORTDB_STATE_NIL) { + continue; + } + if (lp->ini_map_idx) { + SNPRINTF(mb, sizeof (mb), "%3d", + ((int) lp->ini_map_idx) - 1); + } else { + SNPRINTF(mb, sizeof (mb), "---"); + } + isp_prt(isp, ISP_LOGALL, "%d: %s al%d tgt %s %s 0x%06x =>%s" + " 0x%06x; WWNN 0x%08x%08x WWPN 0x%08x%08x", i, + dbs[lp->state], lp->autologin, mb, + roles[lp->roles], lp->portid, + roles[lp->new_roles], lp->new_portid, + (uint32_t) (lp->node_wwn >> 32), + (uint32_t) (lp->node_wwn), + (uint32_t) (lp->port_wwn >> 32), + (uint32_t) (lp->port_wwn)); + } +} + void isp_shutdown(ispsoftc_t *isp) { ==== //depot/projects/newisp/dev/isp/isp_library.h#11 (text) ==== @@ -39,6 +39,7 @@ extern void isp_print_qentry (ispsoftc_t *, char *, int, void *); extern void isp_print_bytes(ispsoftc_t *, char *, int, void *); extern int isp_fc_runstate(ispsoftc_t *, int); +extern void isp_dump_portdb(ispsoftc_t *); extern void isp_shutdown(ispsoftc_t *); extern void isp_put_hdr(ispsoftc_t *, isphdr_t *, isphdr_t *); extern void isp_get_hdr(ispsoftc_t *, isphdr_t *, isphdr_t *); From owner-p4-projects@FreeBSD.ORG Tue Nov 7 23:18:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EE3C16A415; Tue, 7 Nov 2006 23:18:33 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 1E82A16A47B for ; Tue, 7 Nov 2006 23:18:33 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2021943D86 for ; Tue, 7 Nov 2006 23:18:31 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7NIUu6078607 for ; Tue, 7 Nov 2006 23:18:30 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7NIUIn078604 for perforce@freebsd.org; Tue, 7 Nov 2006 23:18:30 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 7 Nov 2006 23:18:30 GMT Message-Id: <200611072318.kA7NIUIn078604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 109493 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 23:18:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=109493 Change 109493 by mjacob@newisp on 2006/11/07 23:17:40 IFC cam_xpt.c change. Affected files ... .. //depot/projects/newisp/cam/cam_xpt.c#12 integrate Differences ... ==== //depot/projects/newisp/cam/cam_xpt.c#12 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.167 2006/11/07 05:51:40 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.168 2006/11/07 23:06:00 mjacob Exp $"); #include #include @@ -1611,6 +1611,9 @@ cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cts.type = CTS_TYPE_CURRENT_SETTINGS; xpt_action((union ccb*)&cts); + if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + return; + } /* Ask the SIM for its base transfer speed */ xpt_setup_ccb(&cpi.ccb_h, path, /*priority*/1); @@ -5860,6 +5863,9 @@ cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cts.type = CTS_TYPE_USER_SETTINGS; xpt_action((union ccb *)&cts); + if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + return; + } cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; cts.type = CTS_TYPE_CURRENT_SETTINGS; xpt_action((union ccb *)&cts); @@ -6560,7 +6566,9 @@ cur_cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cur_cts.type = cts->type; xpt_action((union ccb *)&cur_cts); - + if ((cur_cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + return; + } cur_scsi = &cur_cts.proto_specific.scsi; if ((scsi->valid & CTS_SCSI_VALID_TQ) == 0) { scsi->flags &= ~CTS_SCSI_FLAGS_TAG_ENB; From owner-p4-projects@FreeBSD.ORG Tue Nov 7 23:36:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2064A16A492; Tue, 7 Nov 2006 23:36:57 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 F012116A40F for ; Tue, 7 Nov 2006 23:36:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8360843D55 for ; Tue, 7 Nov 2006 23:36:54 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7NasNQ081772 for ; Tue, 7 Nov 2006 23:36:54 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7Nas5m081769 for perforce@freebsd.org; Tue, 7 Nov 2006 23:36:54 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Nov 2006 23:36:54 GMT Message-Id: <200611072336.kA7Nas5m081769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109494 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 23:36:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=109494 Change 109494 by sam@sam_ebb on 2006/11/07 23:36:53 Add ixpnpe_sendmsg and ixpnpe_recvmsg to allow callers to split transaction w/o sleeping. This is unsafe and still problematic (caller could conceivably sleep on internal mtx) but is good enough for now. Also fix mtx type so witness doesn't bitch about duplication with the npe network driver. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#7 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#7 (text+ko) ==== @@ -257,7 +257,7 @@ sc = malloc(sizeof(struct ixpnpe_softc), M_TEMP, M_WAITOK | M_ZERO); sc->sc_dev = dev; sc->sc_iot = sa->sc_iot; - mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); + mtx_init(&sc->sc_mtx, device_get_nameunit(dev), "npe driver", MTX_DEF); if (device_get_unit(dev) == 0) { base = IXP425_NPE_B_HWBASE; @@ -1365,3 +1365,32 @@ return error; } + +/* XXX temporary, not reliable */ + +int +ixpnpe_sendmsg(struct ixpnpe_softc *sc, const uint32_t msg[2]) +{ + int error; + + mtx_lock(&sc->sc_mtx); + error = ixpnpe_sendmsg_locked(sc, msg); + mtx_unlock(&sc->sc_mtx); + + return error; +} + +int +ixpnpe_recvmsg(struct ixpnpe_softc *sc, uint32_t msg[2]) +{ + int error; + + mtx_lock(&sc->sc_mtx); + if (sc->sc_msgwaiting) + bcopy(sc->sc_msg, msg, sizeof(sc->sc_msg)); + /* NB: sc_msgwaiting != 1 means the ack fetch failed */ + error = sc->sc_msgwaiting != 1 ? EIO : 0; + mtx_unlock(&sc->sc_mtx); + + return error; +} ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#6 (text+ko) ==== @@ -87,6 +87,8 @@ const char *imageName, uint32_t imageId); int ixpnpe_getfunctionality(struct ixpnpe_softc *sc); +int ixpnpe_sendmsg(struct ixpnpe_softc *, const uint32_t msg[2]); +int ixpnpe_recvmsg(struct ixpnpe_softc *, uint32_t msg[2]); int ixpnpe_sendandrecvmsg(struct ixpnpe_softc *, const uint32_t send[2], uint32_t recv[2]); #endif /* _IXP425_NPEVAR_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Nov 7 23:45:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53A7D16A417; Tue, 7 Nov 2006 23:45:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2D7D916A40F for ; Tue, 7 Nov 2006 23:45:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33F9543D5D for ; Tue, 7 Nov 2006 23:45:05 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7Nj5EI083169 for ; Tue, 7 Nov 2006 23:45:05 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7Nj5Fa083166 for perforce@freebsd.org; Tue, 7 Nov 2006 23:45:05 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Nov 2006 23:45:05 GMT Message-Id: <200611072345.kA7Nj5Fa083166@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109495 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 23:45:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=109495 Change 109495 by sam@sam_ebb on 2006/11/07 23:44:33 Hack around locking issue with npe msg support: we cannot sleep in npe_tick waiting for the update stats msg reply so use the send+recv api's to send a request each tick and fetch the results on the next. This works because we are the only thread (at the moment) that will use the npe msg api once the interface is up and running. Long term we probably need to revise the msg support. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#13 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#13 (text+ko) ==== @@ -646,22 +646,12 @@ } static void -npe_tick(void *xsc) +npe_addstats(struct npe_softc *sc) { #define MIBADD(x) sc->mibdata.x += be32toh(ns->x) - struct npe_softc *sc = xsc; struct ifnet *ifp = sc->sc_ifp; struct npestats *ns = sc->sc_stats; - NPE_ASSERT_LOCKED(sc); - - NPE_UNLOCK(sc); /* XXX */ - npe_updatestats(sc); /* update + clear stats */ - NPE_LOCK(sc); - - bus_dmamap_sync(sc->sc_stats_tag, sc->sc_stats_map, - BUS_DMASYNC_POSTREAD); - MIBADD(dot3StatsAlignmentErrors); MIBADD(dot3StatsFCSErrors); MIBADD(dot3StatsSingleCollisionFrames); @@ -682,7 +672,8 @@ be32toh(ns->RxOverrunDiscards) + be32toh(ns->RxUnderflowEntryDiscards); - ifp->if_oerrors += be32toh(ns->dot3StatsInternalMacTransmitErrors) + ifp->if_oerrors += + be32toh(ns->dot3StatsInternalMacTransmitErrors) + be32toh(ns->TxVLANIdFilterDiscards) ; ifp->if_ierrors += be32toh(ns->dot3StatsFCSErrors) @@ -690,13 +681,31 @@ + be32toh(ns->RxOverrunDiscards) + be32toh(ns->RxUnderflowEntryDiscards) ; - ifp->if_collisions += be32toh(ns->dot3StatsSingleCollisionFrames) + ifp->if_collisions += + be32toh(ns->dot3StatsSingleCollisionFrames) + be32toh(ns->dot3StatsMultipleCollisionFrames) ; +#undef MIBADD +} +static void +npe_tick(void *xsc) +{ +#define ACK (NPE_RESETSTATS << NPE_MAC_MSGID_SHL) + struct npe_softc *sc = xsc; + uint32_t msg[2]; + + NPE_ASSERT_LOCKED(sc); + + if (ixpnpe_recvmsg(sc->sc_npe, msg) == 0 && msg[0] == ACK) { + bus_dmamap_sync(sc->sc_stats_tag, sc->sc_stats_map, + BUS_DMASYNC_POSTREAD); + npe_addstats(sc); + } + npe_updatestats(sc); /* schedule next poll */ callout_reset(&sc->tick_ch, hz, npe_tick, sc); -#undef MIBADD +#undef ACK } static void @@ -1238,7 +1247,7 @@ msg[0] = NPE_RESETSTATS << NPE_MAC_MSGID_SHL; msg[1] = sc->sc_stats_phys; /* physical address of stat block */ - return ixpnpe_sendandrecvmsg(sc->sc_npe, msg, msg); + return ixpnpe_sendmsg(sc->sc_npe, msg); /* NB: no recv */ } #if 0 From owner-p4-projects@FreeBSD.ORG Tue Nov 7 23:48:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D708916A47E; Tue, 7 Nov 2006 23:48:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9830B16A47B for ; Tue, 7 Nov 2006 23:48:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2269443D46 for ; Tue, 7 Nov 2006 23:48:10 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7NmAl9083339 for ; Tue, 7 Nov 2006 23:48:10 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7Nm9nA083336 for perforce@freebsd.org; Tue, 7 Nov 2006 23:48:09 GMT (envelope-from sam@freebsd.org) Date: Tue, 7 Nov 2006 23:48:09 GMT Message-Id: <200611072348.kA7Nm9nA083336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109496 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2006 23:48:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=109496 Change 109496 by sam@sam_ebb on 2006/11/07 23:47:21 add dev.npe.X.debug mib so we can toggle debugging after boot Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#14 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#14 (text+ko) ==== @@ -283,6 +283,10 @@ ifp->if_linkmiblen = sizeof(sc->mibdata); sc->mibdata.dot3Compliance = DOT3COMPLIANCE_STATS; + SYSCTL_ADD_INT(device_get_sysctl_ctx(sc->sc_dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(sc->sc_dev)), OID_AUTO, + "debug", CTLFLAG_RW, &sc->debug, 0, "control debugging printfs"); + ether_ifattach(ifp, eaddr); return 0; out: From owner-p4-projects@FreeBSD.ORG Wed Nov 8 00:25:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E66EA16A4C2; Wed, 8 Nov 2006 00:25:11 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C25BD16A49E for ; Wed, 8 Nov 2006 00:25:11 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65FBB43D5E for ; Wed, 8 Nov 2006 00:25:03 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA80P0m3091129 for ; Wed, 8 Nov 2006 00:25:00 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA80Oxpj091126 for perforce@freebsd.org; Wed, 8 Nov 2006 00:24:59 GMT (envelope-from imp@freebsd.org) Date: Wed, 8 Nov 2006 00:24:59 GMT Message-Id: <200611080024.kA80Oxpj091126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 00:25:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=109498 Change 109498 by imp@imp_lighthouse on 2006/11/08 00:24:17 We don't need the table in arm_init.S. This saves about 300 bytes in boot2. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#15 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#11 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/table.S#1 add Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#15 (text+ko) ==== @@ -2,7 +2,7 @@ P=bootspi FILES=${P} -SRCS=arm_init.S main.c loader_prompt.c env_vars.c ee.c +SRCS=arm_init.S main.c loader_prompt.c env_vars.c ee.c table.S NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#11 (text+ko) ==== @@ -99,31 +99,3 @@ infiniteLoop: b infiniteLoop - -/* the following section is used to store boot commands in */ -/* non-volatile memory. */ - - .global BootCommandSection -BootCommandSection: -#ifdef SUPPORT_LINUX - .string "Bootloader for KB9202 Evaluation Board." - .string "c 0x20210000 0x10100000 0x80000 " - .string "m 0 0 0 0 0 0 " - .string "t 0x20000100 console=ttyS0,115200 root=/dev/ram rw initrd=0x20210000,654933" - .string "e 0x10000000 " - .string " " -#else -#if 1 - .string "Bootloader for KB9202 Evaluation Board." - .string "m 42 53 44 0 0 1 " - .string "ip 206 168 13 194 " - .string "server_ip 206 168 13 207 " - .string "tftp 0x20000000 kernel.bin " - .string "e 0x20000000 " -#else - .string "m 42 53 44 0 0 1" - .string "k 0x20000000" - .string "e 0x20000000" -#endif - .word 0 -#endif From owner-p4-projects@FreeBSD.ORG Wed Nov 8 00:40:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25B8416A4C9; Wed, 8 Nov 2006 00:40:57 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 F084E16A47E for ; Wed, 8 Nov 2006 00:40:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB78B43D9A for ; Wed, 8 Nov 2006 00:40:20 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA80eJtJ092833 for ; Wed, 8 Nov 2006 00:40:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA80eJfa092830 for perforce@freebsd.org; Wed, 8 Nov 2006 00:40:19 GMT (envelope-from sam@freebsd.org) Date: Wed, 8 Nov 2006 00:40:19 GMT Message-Id: <200611080040.kA80eJfa092830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109499 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 00:40:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=109499 Change 109499 by sam@sam_ebb on 2006/11/08 00:39:22 Add multi-segment tx: o change ix_npe in npebuf to an NPE_MAXSEG array of descriptors (3 for now based on tracing traffic for NFS root mount and normal traffic patterns running diskless) o bring in defrag code from ath to handle the case where the mbuf chain doesn't fit Gets us >20% improvement for upstream TCP netperf on a WITNESS+INVARIANTS kernel. Note: rx buffers get NPE_MAXSEG-1 unused descriptors (~8Kbytes right now); this can easily be reclaimed. Note: can optimize npebuf setup a bit in tx path by unrolling loop and eliminating extraneous write to the uncached npebuf. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#15 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npereg.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#15 (text+ko) ==== @@ -380,7 +380,7 @@ static int npe_dma_setup(struct npe_softc *sc, struct npedma *dma, - const char *name, int nbuf) + const char *name, int nbuf, int maxseg) { int error, i; @@ -391,7 +391,7 @@ /* DMA tag for mapped mbufs */ error = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, 1, MCLBYTES, 0, + BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, maxseg, MCLBYTES, 0, busdma_lock_mutex, &sc->sc_mtx, &dma->mtag); if (error != 0) { device_printf(sc->sc_dev, "unable to create %s mbuf dma tag, " @@ -508,10 +508,11 @@ } } else sc->sc_miih = sc->sc_ioh; - error = npe_dma_setup(sc, &sc->txdma, "tx", NPE_MAX_TX_BUFFERS); + error = npe_dma_setup(sc, &sc->txdma, "tx", NPE_MAX_TX_BUFFERS, + NPE_MAXSEG); if (error != 0) return error; - error = npe_dma_setup(sc, &sc->rxdma, "rx", NPE_MAX_RX_BUFFERS); + error = npe_dma_setup(sc, &sc->rxdma, "rx", NPE_MAX_RX_BUFFERS, 1); if (error != 0) return error; @@ -753,6 +754,7 @@ uint32_t entry; NPE_LOCK(sc); + /* XXX max # at a time? */ while (ixpqmgr_qread(qid, &entry) == 0) { struct npebuf *npe = P2V(NPE_QM_Q_ADDR(entry)); @@ -786,7 +788,6 @@ m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); if (m == NULL) return ENOBUFS; - m->m_len = MCLBYTES; } KASSERT(m->m_ext.ext_size >= 1536 + ETHER_ALIGN, ("ext_size %d", m->m_ext.ext_size)); @@ -799,11 +800,11 @@ m_freem(m); return error; } - npe->ix_ne_data = htobe32(segs[0].ds_addr); + npe->ix_ne[0].data = htobe32(segs[0].ds_addr); /* NB: NPE requires length be a multiple of 64 */ /* NB: buffer length is shifted in word */ - npe->ix_ne_len = htobe32(segs[0].ds_len << 16); - npe->ix_ne_next = 0; + npe->ix_ne[0].len = htobe32(segs[0].ds_len << 16); + npe->ix_ne[0].next = 0; npe->ix_m = m; /* Flush the memory in the mbuf */ bus_dmamap_sync(dma->mtag, npe->ix_map, BUS_DMASYNC_PREREAD); @@ -830,7 +831,7 @@ struct mbuf *m; DPRINTF(sc, "%s: entry 0x%x neaddr 0x%x ne_len 0x%x\n", - __func__, entry, npe->ix_neaddr, npe->ix_ne_len);/*XXX*/ + __func__, entry, npe->ix_neaddr, npe->ix_ne[0].len); /* * Allocate a new mbuf to replenish the rx buffer. * If doing so fails we drop the rx'd frame so we @@ -848,7 +849,7 @@ BUS_DMASYNC_POSTREAD); /* set m_len etc. per rx frame size */ - mrx->m_len = be32toh(npe->ix_ne_len) & 0xffff; + mrx->m_len = be32toh(npe->ix_ne[0].len) & 0xffff; mrx->m_pkthdr.len = mrx->m_len; mrx->m_pkthdr.rcvif = ifp; mrx->m_flags |= M_HASFCS; @@ -862,8 +863,8 @@ } } else { m = npe->ix_m; - npe->ix_ne_len = htobe32(m->m_len << 16); - npe->ix_ne_next = 0; + npe->ix_ne[0].len = htobe32(m->m_len << 16); + npe->ix_ne[0].next = 0; /* XXX? sync? */ } bus_dmamap_sync(dma->buf_tag, dma->buf_map, @@ -1000,27 +1001,88 @@ NPE_UNLOCK(sc); } +/* + * Defragment an mbuf chain, returning at most maxfrags separate + * mbufs+clusters. If this is not possible NULL is returned and + * the original mbuf chain is left in it's present (potentially + * modified) state. We use two techniques: collapsing consecutive + * mbufs and replacing consecutive mbufs by a cluster. + */ static struct mbuf * -npe_linearize(struct mbuf *m0, int how) +npe_defrag(struct mbuf *m0, int how, int maxfrags) { - struct mbuf *m, *n; + struct mbuf *m, *n, *n2, **prev; + u_int curfrags; - if (m0->m_pkthdr.len > MHLEN) - n = m_getcl(how, MT_DATA, M_PKTHDR); - else - n = m_gethdr(how, MT_DATA); - if (n != NULL) { - n->m_len = 0; /* NB: not initialized on alloc */ - for (m = m0; m != NULL; m = m->m_next) { - bcopy(mtod(m, void *), mtod(n, char *) + n->m_len, - m->m_len); - n->m_len += m->m_len; + /* + * Calculate the current number of frags. + */ + curfrags = 0; + for (m = m0; m != NULL; m = m->m_next) + curfrags++; + /* + * First, try to collapse mbufs. Note that we always collapse + * towards the front so we don't need to deal with moving the + * pkthdr. This may be suboptimal if the first mbuf has much + * less data than the following. + */ + m = m0; +again: + for (;;) { + n = m->m_next; + if (n == NULL) + break; + if ((m->m_flags & M_RDONLY) == 0 && + n->m_len < M_TRAILINGSPACE(m)) { + bcopy(mtod(n, void *), mtod(m, char *) + m->m_len, + n->m_len); + m->m_len += n->m_len; + m->m_next = n->m_next; + m_free(n); + if (--curfrags <= maxfrags) + return m0; + } else + m = n; + } + KASSERT(maxfrags > 1, + ("maxfrags %u, but normal collapse failed", maxfrags)); + /* + * Collapse consecutive mbufs to a cluster. + */ + prev = &m0->m_next; /* NB: not the first mbuf */ + while ((n = *prev) != NULL) { + if ((n2 = n->m_next) != NULL && + n->m_len + n2->m_len < MCLBYTES) { + m = m_getcl(how, MT_DATA, 0); + if (m == NULL) + goto bad; + bcopy(mtod(n, void *), mtod(m, void *), n->m_len); + bcopy(mtod(n2, void *), mtod(m, char *) + n->m_len, + n2->m_len); + m->m_len = n->m_len + n2->m_len; + m->m_next = n2->m_next; + *prev = m; + m_free(n); + m_free(n2); + if (--curfrags <= maxfrags) /* +1 cl -2 mbufs */ + return m0; + /* + * Still not there, try the normal collapse + * again before we allocate another cluster. + */ + goto again; } - /* NB: this works because we never change m_final->m_data */ - m_move_pkthdr(n, m0); + prev = &n->m_next; } - m_freem(m0); - return n; + /* + * No place where we can collapse to a cluster; punt. + * This can occur if, for example, you request 2 frags + * but the packet requires that both be clusters (we + * never reallocate the first mbuf to avoid moving the + * packet header). + */ +bad: + return NULL; } /* @@ -1031,10 +1093,11 @@ { struct npe_softc *sc = ifp->if_softc; struct npebuf *npe; - struct mbuf *m; + struct mbuf *m, *n; struct npedma *dma = &sc->txdma; - bus_dma_segment_t segs[1]; - int nseg, len; + bus_dma_segment_t segs[NPE_MAXSEG]; + int nseg, len, error, i; + uint32_t next; NPE_ASSERT_LOCKED(sc); /* XXX can this happen? */ @@ -1049,19 +1112,27 @@ return; } npe = sc->tx_free; - if (m->m_next != NULL) { - m = npe_linearize(m, M_DONTWAIT); - if (m == NULL) - return; + error = bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map, + m, segs, &nseg, 0); + if (error == EFBIG) { + n = npe_defrag(m, M_DONTWAIT, NPE_MAXSEG); + if (n == NULL) { + if_printf(ifp, "%s: too many fragments %u\n", + __func__, nseg); + m_freem(m); + return; /* XXX? */ + } + m = n; + error = bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map, + m, segs, &nseg, 0); } - if (bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map, - m, segs, &nseg, 0) != 0) { + if (error != 0 || nseg == 0) { + if_printf(ifp, "%s: error %u nseg %u\n", + __func__, error, nseg); m_freem(m); - continue; + return; /* XXX? */ } sc->tx_free = npe->ix_next; - if (sc->tx_free == NULL) - ifp->if_drv_flags |= IFF_DRV_OACTIVE; bus_dmamap_sync(dma->mtag, npe->ix_map, BUS_DMASYNC_PREWRITE); @@ -1071,22 +1142,30 @@ BPF_MTAP(ifp, m); npe->ix_m = m; - npe->ix_ne_data = htobe32(segs[0].ds_addr); - len = segs[0].ds_len; - /* NB: this sets both frame and buffer lengths */ - npe->ix_ne_len = htobe32((len<<16) | len); - npe->ix_ne_next = 0; /* NB: no chaining (yet) */ + len = m->m_pkthdr.len; + next = npe->ix_neaddr + sizeof(npe->ix_ne[0]); + for (i = 0; i < nseg; i++) { + npe->ix_ne[i].data = htobe32(segs[i].ds_addr); + npe->ix_ne[i].len = htobe32((segs[i].ds_len<<16) | len); + npe->ix_ne[i].next = htobe32(next); + + len = 0; /* zero for segments > 1 */ + next += sizeof(npe->ix_ne[0]); + } + npe->ix_ne[i-1].next = 0; /* zero last in chain */ /* XXX flush descriptor instead of using uncached memory */ DPRINTF(sc, "%s: qwrite(%u, 0x%x) ne_data %x ne_len 0x%x\n", __func__, sc->tx_qid, npe->ix_neaddr, - npe->ix_ne_data, npe->ix_ne_len); + npe->ix_ne[0].data, npe->ix_ne[0].len); /* stick it on the tx q */ /* XXX add vlan priority */ ixpqmgr_qwrite(sc->tx_qid, npe->ix_neaddr); ifp->if_timer = 5; } + if (sc->tx_free == NULL) + ifp->if_drv_flags |= IFF_DRV_OACTIVE; } void ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npereg.h#3 (text+ko) ==== @@ -67,16 +67,20 @@ * of the Intel code all the s/w area is free for us to use as we * choose--only the npe area layout and alignment must be honored. */ +#define NPE_MAXSEG 3 /* empirically selected */ + struct npebuf { struct npebuf *ix_next; /* chain to next buffer */ void *ix_m; /* backpointer to mbuf */ uint32_t ix_neaddr; /* phys address of ix_ne */ bus_dmamap_t ix_map; /* bus dma map for associated data */ uint32_t ix_reserved[4]; - uint32_t ix_ne[8]; /* NPE shared area, cacheline aligned */ -#define ix_ne_next ix_ne[0] /* phys addr of next buffer */ -#define ix_ne_len ix_ne[1] /* buffer length (bytes) */ -#define ix_ne_data ix_ne[2] /* phys addr of data buffer */ + struct { /* NPE shared area, cacheline aligned */ + uint32_t next; /* phys addr of next segment */ + uint32_t len; /* buffer/segment length (bytes) */ + uint32_t data; /* phys addr of data segment */ + uint32_t pad[5]; /* pad to cacheline */ + } ix_ne[NPE_MAXSEG]; }; #define NPE_PORTS_MAX 3 From owner-p4-projects@FreeBSD.ORG Wed Nov 8 00:54:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AE7216A417; Wed, 8 Nov 2006 00:54:49 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3D96416A47E for ; Wed, 8 Nov 2006 00:54:49 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA2C643D68 for ; Wed, 8 Nov 2006 00:54:39 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA80scUj004090 for ; Wed, 8 Nov 2006 00:54:38 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA80scNJ004087 for perforce@freebsd.org; Wed, 8 Nov 2006 00:54:38 GMT (envelope-from imp@freebsd.org) Date: Wed, 8 Nov 2006 00:54:38 GMT Message-Id: <200611080054.kA80scNJ004087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109500 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 00:54:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=109500 Change 109500 by imp@imp_lighthouse on 2006/11/08 00:54:16 Add perliminary support for KB9202{,A} to boot2. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#24 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#8 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#11 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#8 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#36 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#15 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#24 (text+ko) ==== @@ -5,6 +5,9 @@ __at91_boot_Makefile.inc__: +# tsc, kb920x are the supported flavors +BOOT_FLAVOR=kb920x + CFLAGS=-Os -mcpu=arm9 -ffreestanding \ -I${.CURDIR}/../libat91 \ -I${.CURDIR}/../../../.. \ @@ -18,8 +21,7 @@ # -Wmissing-declarations # -Wstrict-prototypes -CFLAGS+=-DBOOT_TSC -#CFLAGS+=-DBOOT_KB9202 +CFLAGS+=-DBOOT_${BOOT_FLAVOR:U} LIBAT91=${.OBJDIR}/../libat91/libat91.a ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#8 (text+ko) ==== @@ -4,7 +4,7 @@ P=boot2 FILES=${P} -SRCS=arm_init.S boot2.c tsc_board.c ee.c +SRCS=arm_init.S boot2.c ${BOOT_FLAVOR}_board.c ee.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#11 (text) ==== @@ -100,7 +100,7 @@ while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY)) continue; -#ifdef BOOT_KB9202 +#ifdef BOOT_KB920X // setup flash access (allow ample margin) // 9 wait states, 1 setup, 1 hold, 1 float for 8-bit device ((AT91PS_SMC2)AT91C_BASE_SMC2)->SMC2_CSR[0] = ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#8 (text) ==== @@ -31,7 +31,7 @@ #define SDRAM_BASE 0x20000000 -#ifdef BOOT_KB9202 +#ifdef BOOT_KB920X /* The following divisor sets PLLA frequency: e.g. 10/5 * 90 = 180MHz */ #define OSC_MAIN_FREQ_DIV 5 /* for 10MHz osc */ #define SDRAM_WIDTH AT91C_SDRC_DBW_16_BITS ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#36 (text+ko) ==== @@ -384,7 +384,7 @@ unsigned sec; int i; #endif -#ifdef BOOT_KB9202 +#ifdef BOOT_KB920X stat2 = AT91F_MII_ReadPhy(pEmac, MII_STS2_REG); if (!(stat2 & MII_STS2_LINK)) return ; ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#15 (text+ko) ==== @@ -114,7 +114,7 @@ /* MII registers definition */ #define MII_STS_REG 0x01 #define MII_STS_LINK_STAT 0x04 -#ifdef BOOT_KB9202 +#ifdef BOOT_KB920X #define MII_STS2_REG 0x11 #define MII_STS2_LINK 0x400 #define MII_STS2_100TX 0x4000 ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#8 (text+ko) ==== @@ -94,7 +94,7 @@ AT91C_PA8_ETXEN | AT91C_PA16_EMDIO | AT91C_PA9_ETX0 | AT91C_PA10_ETX1 | AT91C_PA11_ECRS_ECRSDV | AT91C_PA15_EMDC | AT91C_PA7_ETXCK_EREFCK; -#ifdef BOOT_KB9202 /* Really !RMII */ +#ifdef BOOT_KB920X /* Really !RMII */ AT91C_BASE_PIOB->PIO_BSR = AT91C_PB12_ETX2 | AT91C_PB13_ETX3 | AT91C_PB14_ETXER | AT91C_PB15_ERX2 | AT91C_PB16_ERX3 | AT91C_PB17_ERXDV | From owner-p4-projects@FreeBSD.ORG Wed Nov 8 00:55:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D68B416A515; Wed, 8 Nov 2006 00:55:49 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9C61E16A4F8 for ; Wed, 8 Nov 2006 00:55:49 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF61F43D8C for ; Wed, 8 Nov 2006 00:55:40 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA80te1L004178 for ; Wed, 8 Nov 2006 00:55:40 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA80teWS004175 for perforce@freebsd.org; Wed, 8 Nov 2006 00:55:40 GMT (envelope-from imp@freebsd.org) Date: Wed, 8 Nov 2006 00:55:40 GMT Message-Id: <200611080055.kA80teWS004175@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109501 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 00:55:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=109501 Change 109501 by imp@imp_lighthouse on 2006/11/08 00:54:56 SN7 Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#2 (text+ko) ==== @@ -55,7 +55,7 @@ uint32_t sig; #if 0 uint8_t euid64[8] = { 0x00, 0x30, 0x96, 0x20, - 0x00, 0x00, 0x00, 0x04 }; + 0x00, 0x00, 0x00, 0x07 }; #endif #if 0 From owner-p4-projects@FreeBSD.ORG Wed Nov 8 01:28:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9FB716A417; Wed, 8 Nov 2006 01:28:31 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A2C9016A40F for ; Wed, 8 Nov 2006 01:28:31 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A91843D73 for ; Wed, 8 Nov 2006 01:28:23 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA81SNRn010251 for ; Wed, 8 Nov 2006 01:28:23 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA81SMMe010248 for perforce@freebsd.org; Wed, 8 Nov 2006 01:28:22 GMT (envelope-from imp@freebsd.org) Date: Wed, 8 Nov 2006 01:28:22 GMT Message-Id: <200611080128.kA81SMMe010248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109503 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 01:28:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=109503 Change 109503 by imp@imp_lighthouse on 2006/11/08 01:28:02 Remove if 0 Affected files ... .. //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc0#3 edit .. //depot/projects/arm/src/gnu/usr.bin/binutils/as/Makefile#5 edit .. //depot/projects/arm/src/gnu/usr.bin/cc/Makefile.inc#5 edit .. //depot/projects/arm/src/gnu/usr.bin/cc/Makefile.tgt#4 edit .. //depot/projects/arm/src/gnu/usr.bin/gdb/Makefile.inc#2 edit .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/Makefile#2 edit .. //depot/projects/arm/src/gnu/usr.bin/gdb/libgdb/Makefile#2 edit .. //depot/projects/arm/src/lib/libc/Makefile#3 edit .. //depot/projects/arm/src/lib/libpthread/Makefile#3 edit .. //depot/projects/arm/src/lib/libthr/Makefile#3 edit .. //depot/projects/arm/src/lib/msun/Makefile#2 edit .. //depot/projects/arm/src/share/mk/bsd.endian.mk#3 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#25 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#12 edit Differences ... ==== //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc0#3 (text+ko) ==== @@ -38,7 +38,7 @@ .PATH: ${.CURDIR}/${TARGET_ARCH} .endif -ARCHS= ${TARGET_ARCH} +ARCHS= ${TARGET_ARCH:S/armeb/arm/} .for _arch in ${CROSS_ARCH} .if (${ARCHS:R:M${_arch:R}} == "") @@ -47,7 +47,5 @@ .endfor .for _arch in ${ARCHS} -.if exists(${.CURDIR}/Makefile.${_arch}) .include "${.CURDIR}/Makefile.${_arch}" -.endif .endfor ==== //depot/projects/arm/src/gnu/usr.bin/binutils/as/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.18 2006/10/09 04:52:14 kmacy Exp $ +.include # BINDIR .include "${.CURDIR}/../../Makefile.inc" @@ -27,6 +28,8 @@ .elif ${TARGET_ARCH} == "sparc64" # change back to tc-sparc.c when new binutils is imported SRCS+= tc-sparc-fixed.c +.elif ${TARGET_ARCH} == "armeb" +SRCS+= tc-arm.c .else SRCS+= tc-${TARGET_ARCH}.c .endif ==== //depot/projects/arm/src/gnu/usr.bin/cc/Makefile.inc#5 (text+ko) ==== @@ -11,7 +11,7 @@ .include "Makefile.tgt" # Machine description. -.if ${TARGET_ARCH} == "arm" +.if ${GCC_CPU} == "arm" MD_FILE= ${.OBJDIR}/arm-diked.md .else MD_FILE= ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md @@ -50,11 +50,11 @@ LIBCC_INT= ${.CURDIR}/../cc_int/libcc_int.a .endif -.if ${TARGET_ARCH} == "arm" +.if ${GCC_CPU} == "arm" CLEANFILES+= arm-diked.md ${GCC_CPU}.md.orig fpa.md cirrus.md iwmmxt.md .endif -.if ${TARGET_ARCH} == "arm" +.if ${GCC_CPU} == "arm" ${.OBJDIR}/arm-diked.md: cp ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md . #XXX: Those are not patched but are included by arm.md ==== //depot/projects/arm/src/gnu/usr.bin/cc/Makefile.tgt#4 (text+ko) ==== @@ -10,6 +10,9 @@ .if defined(TARGET_BIG_ENDIAN) CFLAGS+= -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END .endif +.elif ${TARGET_ARCH} == "armeb" +GCC_CPU= arm +CFLAGS+= -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END .elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" GCC_CPU= i386 .elif ${TARGET_ARCH} == "ia64" ==== //depot/projects/arm/src/gnu/usr.bin/gdb/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,7 @@ # $FreeBSD: src/gnu/usr.bin/gdb/Makefile.inc,v 1.13 2004/12/21 08:47:00 ru Exp $ +.include + VERSION= "6.1.1 [FreeBSD]" VENDOR= marcel @@ -16,10 +18,11 @@ OBJ_BU= ${OBJ_ROOT}/binutils OBJ_GDB= ${OBJ_ROOT}/gdb -TARGET_ARCH?= ${MACHINE_ARCH} -TARGET_SUBDIR= ${BMAKE_GDB}/arch/${TARGET_ARCH} +# XXX not sure that blurring the endians is the thing to do here. +TARG_ARCH?= ${MACHINE_CPU_ARCH} +TARGET_SUBDIR= ${BMAKE_GDB}/arch/${TARG_ARCH} -.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARG_ARCH} != ${MACHINE_CPU_ARCH} GDB_CROSS_DEBUGGER= .endif @@ -31,7 +34,7 @@ CFLAGS+= -DHAVE_CONFIG_H -DRL_NO_COMPAT -DMI_OUT=1 -DTUI=1 CFLAGS+= -I. CFLAGS+= -I${TARGET_SUBDIR} -CFLAGS+= -I${BMAKE_BU}/libbfd -I${BMAKE_BU}/libbfd/${TARGET_ARCH} +CFLAGS+= -I${BMAKE_BU}/libbfd -I${BMAKE_BU}/libbfd/${TARG_ARCH} CFLAGS+= -I${CNTRB_GDB}/gdb CFLAGS+= -I${CNTRB_GDB}/gdb/config CFLAGS+= -I${CNTRB_GDB}/include @@ -42,7 +45,7 @@ .if defined(GDB_CROSS_DEBUGGER) CFLAGS+= -DCROSS_DEBUGGER -GDB_SUFFIX= -${TARGET_ARCH} +GDB_SUFFIX= -${TARG_ARCH} NO_MAN= .endif ==== //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/gnu/usr.bin/gdb/kgdb/Makefile,v 1.6 2005/02/20 23:06:03 kan Exp $ PROG= kgdb${GDB_SUFFIX} -SRCS= main.c kthr.c trgt.c trgt_${TARGET_ARCH}.c +SRCS= main.c kthr.c trgt.c trgt_${TARG_ARCH}.c WARNS?= 2 BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ==== //depot/projects/arm/src/gnu/usr.bin/gdb/libgdb/Makefile#2 (text+ko) ==== @@ -1,6 +1,8 @@ # $FreeBSD: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.11 2006/04/10 09:00:19 ru Exp $ -TARGET_ARCH?= ${MACHINE_ARCH} +.include + +TARG_ARCH?= ${MACHINE_CPU_ARCH} LIB= gdb INTERNALLIB= @@ -53,7 +55,7 @@ CFLAGS+= -D${stupid_gnu}=${stupid_gnu:S/^x//} .endfor -.if ${TARGET_ARCH} == ${MACHINE_ARCH} +.if ${TARG_ARCH} == ${MACHINE_CPU_ARCH} _fork_child= fork-child.c _infptrace= infptrace.c _inftarg= inftarg.c @@ -72,7 +74,7 @@ echo 'const char version[] = ${VERSION};' >> ${.TARGET} echo 'const char host_name[] = "${MACHINE_ARCH}-${VENDOR}-freebsd";' \ >> ${.TARGET} - echo 'const char target_name[] = "${TARGET_ARCH}-${VENDOR}-freebsd";' \ + echo 'const char target_name[] = "${TARG_ARCH}-${VENDOR}-freebsd";' \ >> ${.TARGET} .include ==== //depot/projects/arm/src/lib/libc/Makefile#3 (text+ko) ==== @@ -15,7 +15,7 @@ SHLIB_MAJOR= 7 WARNS?= 2 CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include -CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH} +CFLAGS+=-I${.CURDIR}/${MACHINE_CPU_ARCH} CLEANFILES+=tags INSTALL_PIC_ARCHIVE= PRECIOUSLIB= @@ -28,7 +28,7 @@ MIASM= NOASM= -.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc" +.include "${.CURDIR}/${MACHINE_CPU_ARCH}/Makefile.inc" .include "${.CURDIR}/db/Makefile.inc" .include "${.CURDIR}/compat-43/Makefile.inc" .include "${.CURDIR}/gdtoa/Makefile.inc" @@ -56,7 +56,7 @@ .include "${.CURDIR}/rpc/Makefile.inc" .include "${.CURDIR}/uuid/Makefile.inc" .include "${.CURDIR}/xdr/Makefile.inc" -.if ${MACHINE_ARCH} == "arm" +.if ${MACHINE_CPU_ARCH} == "arm" .include "${.CURDIR}/softfloat/Makefile.inc" .endif .if ${MK_NIS} != "no" @@ -100,14 +100,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.${MACHINE_CPU_ARCH} libkern.gen: ${KQSRCS} ${KSRCS} cp -p ${.CURDIR}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern -libkern.${MACHINE_ARCH}:: ${KMSRCS} +libkern.${MACHINE_CPU_ARCH}:: ${KMSRCS} .if defined(KMSRCS) && !empty(KMSRCS) - cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${MACHINE_ARCH} + cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${MACHINE_CPU_ARCH} .endif .include ==== //depot/projects/arm/src/lib/libpthread/Makefile#3 (text+ko) ==== @@ -7,6 +7,8 @@ # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. +.include + .if ${MACHINE_ARCH} == "sparc64" LIB=kse .else @@ -17,10 +19,10 @@ CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include -CFLAGS+=-I${.CURDIR}/arch/${MACHINE_ARCH}/include +CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPU_ARCH}/include CFLAGS+=-I${.CURDIR}/sys CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf -CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH} +CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_CPU_ARCH} CFLAGS+=-fno-builtin # Uncomment this if you want libpthread to contain debug information for @@ -46,7 +48,7 @@ PRECIOUSLIB= -.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" +.include "${.CURDIR}/arch/${MACHINE_CPU_ARCH}/Makefile.inc" .include "${.CURDIR}/support/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" ==== //depot/projects/arm/src/lib/libthr/Makefile#3 (text+ko) ==== @@ -19,10 +19,10 @@ CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include -CFLAGS+=-I${.CURDIR}/arch/${MACHINE_ARCH}/include +CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPU_ARCH}/include CFLAGS+=-I${.CURDIR}/sys CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf -CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH} +CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_CPU_ARCH} CFLAGS+=-I${.CURDIR}/../libthread_db CFLAGS+=-Winline @@ -38,7 +38,7 @@ PRECIOUSLIB= -.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" +.include "${.CURDIR}/arch/${MACHINE_CPU_ARCH}/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" ==== //depot/projects/arm/src/lib/msun/Makefile#2 (text+ko) ==== @@ -12,10 +12,16 @@ # # +.include + .if ${MACHINE_ARCH} == "i386" ARCH_SUBDIR= i387 +.elif exists(${MACHINE_ARCH}/Makefile.inc) +ARCH_SUBDIR= ${MACHINE_ARCH} +.elif exists(${MACHINE_CPU_ARCH}/Makefile.inc) +ARCH_SUBDIR=${MACHINE_CPU_ARCH} .else -ARCH_SUBDIR= ${MACHINE_ARCH} +.error "Can't find ${MACHINE_ARCH} or ${MACHINE_CPU_ARCH} makefile" .endif .include "${ARCH_SUBDIR}/Makefile.inc" ==== //depot/projects/arm/src/share/mk/bsd.endian.mk#3 (text+ko) ==== @@ -1,12 +1,19 @@ # $FreeBSD: src/share/mk/bsd.endian.mk,v 1.3 2006/08/22 07:51:10 ru Exp $ -.if ${MACHINE_ARCH} == "amd64" || \ +# Hack to transition people away from TARGET_BIG_ENDIAN to armeb. After +# transition, just add "arm" and "armeb" below and delete this hack. +.if (${MACHINE_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)) || \ + ${MACHINE_ARCH} == "armeb" +TARGET_ENDIANNESS=4321 +.elif ${MACHINE_ARCH} == "arm" +TARGET_ENDIANNESS=1234 +.elif ${MACHINE_ARCH} == "amd64" || \ ${MACHINE_ARCH} == "i386" || \ - ${MACHINE_ARCH} == "ia64" || \ - (${MACHINE_ARCH} == "arm" && !defined(ARM_BIG_ENDIAN)) + ${MACHINE_ARCH} == "ia64" TARGET_ENDIANNESS= 1234 .elif ${MACHINE_ARCH} == "powerpc" || \ - ${MACHINE_ARCH} == "sparc64" || \ - ${MACHINE_ARCH} == "arm" + ${MACHINE_ARCH} == "sparc64" TARGET_ENDIANNESS= 4321 +.else +.error "Don't know the endianness of this architecture" .endif ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#25 (text+ko) ==== @@ -30,6 +30,7 @@ #include "lib.h" #include "sd-card.h" #include "ee.h" +#include "board.h" #define RBX_ASKNAME 0x0 /* -a */ #define RBX_SINGLE 0x1 /* -s */ @@ -141,15 +142,13 @@ } } -// Each board has to provide one of these. -void board_init(void); - int main(void) { int autoboot, c = 0; ino_t ino; +printf("MAIN\n"); board_init(); EMAC_Init(); sdcard_init(); ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 (text+ko) ==== @@ -6,6 +6,7 @@ #include "emac.h" #include "lib.h" #include "ee.h" +#include "board.h" extern unsigned char mac[]; ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#12 (text) ==== @@ -53,7 +53,6 @@ register unsigned value; volatile sdram_size_t *p = (sdram_size_t *)SDRAM_BASE; -#if 0 #ifdef BOOT_TSC // For the TSC board, we turn ON the one LED we have while // early in boot. @@ -61,7 +60,6 @@ AT91C_BASE_PIOC->PIO_OER = AT91C_PIO_PC10; AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC10; #endif -#endif // configure clocks // assume: From owner-p4-projects@FreeBSD.ORG Wed Nov 8 01:40:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D7D516A415; Wed, 8 Nov 2006 01:40:45 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4F0BB16A40F for ; Wed, 8 Nov 2006 01:40:45 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EADAA43D78 for ; Wed, 8 Nov 2006 01:40:39 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA81edxR012113 for ; Wed, 8 Nov 2006 01:40:39 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA81eddu012110 for perforce@freebsd.org; Wed, 8 Nov 2006 01:40:39 GMT (envelope-from cognet@freebsd.org) Date: Wed, 8 Nov 2006 01:40:39 GMT Message-Id: <200611080140.kA81eddu012110@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 109505 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 01:40:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=109505 Change 109505 by cognet@cognet on 2006/11/08 01:39:58 IFC for interrupt counter. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/intr.c#9 integrate Differences ... ==== //depot/projects/arm/src/sys/arm/arm/intr.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.12 2005/12/22 22:16:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.13 2006/11/08 01:32:24 cognet Exp $"); #include #include #include @@ -106,6 +106,7 @@ struct thread *td = curthread; int i, thread; + PCPU_LAZY_INC(cnt.v_intr); td->td_intr_nesting_level++; while ((i = arm_get_next_irq()) != -1) { arm_mask_irq(i); From owner-p4-projects@FreeBSD.ORG Wed Nov 8 17:12:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E6BB16A407; Wed, 8 Nov 2006 17:12:29 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 1F69A16A4B3 for ; Wed, 8 Nov 2006 17:12:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5E1143D46 for ; Wed, 8 Nov 2006 17:12:28 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA8HCOp2025709 for ; Wed, 8 Nov 2006 17:12:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA8HCOeO025705 for perforce@freebsd.org; Wed, 8 Nov 2006 17:12:24 GMT (envelope-from sam@freebsd.org) Date: Wed, 8 Nov 2006 17:12:24 GMT Message-Id: <200611081712.kA8HCOeO025705@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109528 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 17:12:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=109528 Change 109528 by sam@sam_ebb on 2006/11/08 17:12:22 correct comment Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npereg.h#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npereg.h#4 (text+ko) ==== @@ -171,7 +171,7 @@ /* TX Control Register 1*/ #define NPE_TX_CNTRL1_TX_EN (1<<0) /* enable TX engine */ -#define NPE_TX_CNTRL1_DUPLEX (1<<1) /* select full duplex (!half) */ +#define NPE_TX_CNTRL1_DUPLEX (1<<1) /* select half duplex */ #define NPE_TX_CNTRL1_RETRY (1<<2) /* auto-retry on collision */ #define NPE_TX_CNTRL1_PAD_EN (1<<3) /* pad frames <64 bytes */ #define NPE_TX_CNTRL1_FCS_EN (1<<4) /* append FCS */ From owner-p4-projects@FreeBSD.ORG Wed Nov 8 17:17:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21DED16A49E; Wed, 8 Nov 2006 17:17:26 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E344E16A40F for ; Wed, 8 Nov 2006 17:17:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F14B343D72 for ; Wed, 8 Nov 2006 17:16:31 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA8HGVkL026341 for ; Wed, 8 Nov 2006 17:16:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA8HGVAY026338 for perforce@freebsd.org; Wed, 8 Nov 2006 17:16:31 GMT (envelope-from sam@freebsd.org) Date: Wed, 8 Nov 2006 17:16:31 GMT Message-Id: <200611081716.kA8HGVAY026338@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 17:17:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=109529 Change 109529 by sam@sam_ebb on 2006/11/08 17:15:37 Rx fixups: o correct rx mac setup: must enable pause frame processing when operating in full duplex o correctly handle failure to replenish a rx mbuf o eliminiate obfuscating defines used for default values in mac setup o move tick callout startup below mac enable Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#16 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#16 (text+ko) ==== @@ -91,8 +91,8 @@ device_t sc_mii; /* child miibus */ bus_space_handle_t sc_miih; /* MII register window */ struct ixpnpe_softc *sc_npe; /* NPE support */ - int sc_portid; - int debug; + int sc_portid; /* NPE port identification */ + int debug; /* DPRINTF* control */ struct callout tick_ch; /* Tick callout */ struct npedma txdma; struct npebuf *tx_free; /* list of free tx buffers */ @@ -856,21 +856,16 @@ ifp->if_ipackets++; ifp->if_input(ifp, mrx); - - if (npe_rxbuf_init(sc, npe, m) != 0) { - /* XXX recover? */ - continue; - } } else { + /* discard frame and re-use mbuf */ m = npe->ix_m; - npe->ix_ne[0].len = htobe32(m->m_len << 16); - npe->ix_ne[0].next = 0; - /* XXX? sync? */ + } + if (npe_rxbuf_init(sc, npe, m) == 0) { + /* return npe buf to rx free list */ + ixpqmgr_qwrite(sc->rx_freeqid, npe->ix_neaddr); + } else { + /* XXX should not happen */ } - bus_dmamap_sync(dma->buf_tag, dma->buf_map, - BUS_DMASYNC_PREWRITE); - /* return npe buf to rx free list */ - ixpqmgr_qwrite(sc->rx_freeqid, npe->ix_neaddr); } #undef P2V } @@ -938,36 +933,32 @@ WR4(sc, NPE_MAC_TX_CNTRL1, RD4(sc, NPE_MAC_TX_CNTRL1) &~ NPE_TX_CNTRL1_TX_EN); - /* set clock for ixp4xx */ - WR4(sc, NPE_MAC_INT_CLK_THRESH, NPE_MAC_INT_CLK_THRESH_DEFAULT); - /* * Set the MAC core registers. */ - WR4(sc, NPE_MAC_TX_CNTRL2, NPE_TX_CNTRL2_RETRIES_MASK); - WR4(sc, NPE_MAC_RANDOM_SEED, NPE_RANDOM_SEED_DEFAULT); - WR4(sc, NPE_MAC_THRESH_P_EMPTY, NPE_MAC_THRESH_P_EMPTY_DEFAULT); - WR4(sc, NPE_MAC_THRESH_P_FULL, NPE_MAC_THRESH_P_FULL_DEFAULT); - WR4(sc, NPE_MAC_TX_DEFER, NPE_MAC_TX_DEFER_DEFAULT); - WR4(sc, NPE_MAC_TX_TWO_DEFER_1, NPE_MAC_TX_TWO_DEFER_1_DEFAULT); - WR4(sc, NPE_MAC_TX_TWO_DEFER_2, NPE_MAC_TX_TWO_DEFER_2_DEFAULT); - WR4(sc, NPE_MAC_SLOT_TIME, NPE_MAC_SLOT_TIME_DEFAULT); - WR4(sc, NPE_MAC_INT_CLK_THRESH, NPE_MAC_INT_CLK_THRESH_DEFAULT); - WR4(sc, NPE_MAC_BUF_SIZE_TX, NPE_MAC_BUF_SIZE_TX_DEFAULT); - /* NB: enables padding and FCS append */ -#if 0 - WR4(sc, NPE_MAC_TX_CNTRL1, NPE_TX_CNTRL1_DEFAULT); - WR4(sc, NPE_MAC_RX_CNTRL1, NPE_RX_CNTRL1_DEFAULT); -#else - /* XXX full duplex */ + WR4(sc, NPE_MAC_INT_CLK_THRESH, 0x1); /* clock ratio: for ipx4xx */ + WR4(sc, NPE_MAC_TX_CNTRL2, 0xf); /* max retries */ + WR4(sc, NPE_MAC_RANDOM_SEED, 0x8); /* LFSR back-off seed */ + /* thresholds determined by NPE firmware FS */ + WR4(sc, NPE_MAC_THRESH_P_EMPTY, 0x12); + WR4(sc, NPE_MAC_THRESH_P_FULL, 0x30); + WR4(sc, NPE_MAC_BUF_SIZE_TX, 0x8); /* tx fifo threshold (bytes) */ + WR4(sc, NPE_MAC_TX_DEFER, 0x15); /* for single deferral */ + WR4(sc, NPE_MAC_RX_DEFER, 0x16); /* deferral on inter-frame gap*/ + WR4(sc, NPE_MAC_TX_TWO_DEFER_1, 0x8); /* for 2-part deferral */ + WR4(sc, NPE_MAC_TX_TWO_DEFER_2, 0x7); /* for 2-part deferral */ + WR4(sc, NPE_MAC_SLOT_TIME, 0x80); /* assumes MII mode */ + WR4(sc, NPE_MAC_TX_CNTRL1, - (NPE_TX_CNTRL1_DEFAULT &~ NPE_TX_CNTRL1_TX_EN) - | NPE_TX_CNTRL1_DUPLEX); + NPE_TX_CNTRL1_RETRY /* retry failed xmits */ + | NPE_TX_CNTRL1_FCS_EN /* append FCS */ + | NPE_TX_CNTRL1_2DEFER /* 2-part deferal */ + | NPE_TX_CNTRL1_PAD_EN); /* pad runt frames */ + /* XXX pad strip? */ WR4(sc, NPE_MAC_RX_CNTRL1, - (NPE_RX_CNTRL1_DEFAULT &~ NPE_RX_CNTRL1_RX_EN) - | NPE_RX_CNTRL1_PAUSE_EN); -#endif - /* XXX RC_CNTRL2? */ + NPE_RX_CNTRL1_CRC_EN /* include CRC/FCS */ + | NPE_RX_CNTRL1_PAUSE_EN); /* ena pause frame handling */ + WR4(sc, NPE_MAC_RX_CNTRL2, 0); npe_setmac(sc, IF_LLADDR(ifp)); npe_setmcast(sc); @@ -975,21 +966,17 @@ npe_startxmit(sc); npe_startrecv(sc); - /* - * Set 'running' flag, and clear output active flag - * and attempt to start the output - */ ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_timer = 0; /* just in case */ - callout_reset(&sc->tick_ch, hz, npe_tick, sc); - /* enable transmitter and reciver in the MAC */ WR4(sc, NPE_MAC_RX_CNTRL1, RD4(sc, NPE_MAC_RX_CNTRL1) | NPE_RX_CNTRL1_RX_EN); WR4(sc, NPE_MAC_TX_CNTRL1, RD4(sc, NPE_MAC_TX_CNTRL1) | NPE_TX_CNTRL1_TX_EN); + + callout_reset(&sc->tick_ch, hz, npe_tick, sc); } static void From owner-p4-projects@FreeBSD.ORG Wed Nov 8 18:44:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E75D216A5BB; Wed, 8 Nov 2006 18:44:30 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C201516A550 for ; Wed, 8 Nov 2006 18:44:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D55143D68 for ; Wed, 8 Nov 2006 18:44:26 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA8IiQPR042527 for ; Wed, 8 Nov 2006 18:44:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA8IiPqF042524 for perforce@freebsd.org; Wed, 8 Nov 2006 18:44:25 GMT (envelope-from sam@freebsd.org) Date: Wed, 8 Nov 2006 18:44:25 GMT Message-Id: <200611081844.kA8IiPqF042524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109539 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 18:44:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=109539 Change 109539 by sam@sam_ebb on 2006/11/08 18:44:03 Misc cleanups: o add mii statchng method so we can force full/half duplex mac state on mii change o call mii_tick from npe_tick to poll for mii state changes o add hw.npe mib tree o add hw.npe.tickinterval knob for controlling the frequency of npe_tick; change the default from 1 sec to 3 secs o move debug mib knobs from debug to hw.npe o parameterize the # tx/rx buffers; knobs are under hw.npe o add carrier sense errors back into oerrors now that we have full duplex done right o remove miscounting of carrier sense errors as mibdata.dot3StatsSQETestErrors Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#17 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#17 (text+ko) ==== @@ -68,9 +68,6 @@ #include "miibus_if.h" -#define NPE_MAX_TX_BUFFERS 64 -#define NPE_MAX_RX_BUFFERS 128 - struct npedma { const char* name; int nbuf; /* # npebuf's allocated */ @@ -92,7 +89,8 @@ bus_space_handle_t sc_miih; /* MII register window */ struct ixpnpe_softc *sc_npe; /* NPE support */ int sc_portid; /* NPE port identification */ - int debug; /* DPRINTF* control */ + int sc_debug; /* DPRINTF* control */ + int sc_tickinterval; struct callout tick_ch; /* Tick callout */ struct npedma txdma; struct npebuf *tx_free; /* list of free tx buffers */ @@ -204,17 +202,32 @@ static int tx_doneqid = -1; static int rx_qid = -1; +SYSCTL_NODE(_hw, OID_AUTO, npe, CTLFLAG_RD, 0, "IXP425 NPE driver parameters"); + static int npe_debug = 0; -SYSCTL_INT(_debug, OID_AUTO, npe, CTLFLAG_RW, &npe_debug, +SYSCTL_INT(_hw_npe, OID_AUTO, debug, CTLFLAG_RW, &npe_debug, 0, "IXP425 NPE network interface debug msgs"); -TUNABLE_INT("debug.npe", &npe_debug); +TUNABLE_INT("hw.npe.npe", &npe_debug); #define DPRINTF(sc, fmt, ...) do { \ - if (sc->debug) device_printf(sc->sc_dev, fmt, __VA_ARGS__); \ + if (sc->sc_debug) device_printf(sc->sc_dev, fmt, __VA_ARGS__); \ } while (0) #define DPRINTFn(n, sc, fmt, ...) do { \ - if (sc->debug >= n) device_printf(sc->sc_dev, fmt, __VA_ARGS__);\ + if (sc->sc_debug >= n) device_printf(sc->sc_dev, fmt, __VA_ARGS__);\ } while (0) +static int npe_tickinterval = 3; /* npe_tick frequency (secs) */ +SYSCTL_INT(_hw_npe, OID_AUTO, tickinterval, CTLFLAG_RD, &npe_tickinterval, + 0, "periodic work interval (secs)"); +TUNABLE_INT("hw.npe.tickinterval", &npe_tickinterval); +static int npe_rxbuf = 64; /* # rx buffers to allocate */ +SYSCTL_INT(_hw_npe, OID_AUTO, rxbuf, CTLFLAG_RD, &npe_rxbuf, + 0, "rx buffers allocated"); +TUNABLE_INT("hw.npe.rxbuf", &npe_rxbuf); +static int npe_txbuf = 128; /* # tx buffers to allocate */ +SYSCTL_INT(_hw_npe, OID_AUTO, txbuf, CTLFLAG_RD, &npe_txbuf, + 0, "tx buffers allocated"); +TUNABLE_INT("hw.npe.txbuf", &npe_txbuf); + static int npe_probe(device_t dev) { @@ -236,6 +249,8 @@ { struct npe_softc *sc = device_get_softc(dev); struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); + struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(dev); + struct sysctl_oid *tree = device_get_sysctl_tree(dev); struct ifnet *ifp = NULL; int error; u_char eaddr[6]; @@ -244,7 +259,8 @@ sc->sc_iot = sa->sc_iot; NPE_LOCK_INIT(sc); callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); - sc->debug = npe_debug; + sc->sc_debug = npe_debug; + sc->sc_tickinterval = npe_tickinterval; sc->sc_npe = ixpnpe_attach(dev); if (sc->sc_npe == NULL) { @@ -274,7 +290,6 @@ ifp->if_ioctl = npeioctl; ifp->if_watchdog = npewatchdog; ifp->if_init = npeinit; - ifp->if_baudrate = 100*1000*1000; /* XXX */ IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; IFQ_SET_READY(&ifp->if_snd); @@ -283,9 +298,10 @@ ifp->if_linkmiblen = sizeof(sc->mibdata); sc->mibdata.dot3Compliance = DOT3COMPLIANCE_STATS; - SYSCTL_ADD_INT(device_get_sysctl_ctx(sc->sc_dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(sc->sc_dev)), OID_AUTO, - "debug", CTLFLAG_RW, &sc->debug, 0, "control debugging printfs"); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "debug", + CTLFLAG_RW, &sc->sc_debug, 0, "control debugging printfs"); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tickinterval", + CTLFLAG_RW, &sc->sc_tickinterval, 0, "periodic work frequency"); ether_ifattach(ifp, eaddr); return 0; @@ -508,11 +524,10 @@ } } else sc->sc_miih = sc->sc_ioh; - error = npe_dma_setup(sc, &sc->txdma, "tx", NPE_MAX_TX_BUFFERS, - NPE_MAXSEG); + error = npe_dma_setup(sc, &sc->txdma, "tx", npe_txbuf, NPE_MAXSEG); if (error != 0) return error; - error = npe_dma_setup(sc, &sc->rxdma, "rx", NPE_MAX_RX_BUFFERS, 1); + error = npe_dma_setup(sc, &sc->rxdma, "rx", npe_rxbuf, 1); if (error != 0) return error; @@ -563,22 +578,20 @@ sc->rx_qid = npeconfig[unit].rx_qid; sc->rx_freeqid = npeconfig[unit].rx_freeqid; if (rx_qid == -1) { - ixpqmgr_qconfig(sc->rx_qid, NPE_MAX_RX_BUFFERS, 0, 1, + ixpqmgr_qconfig(sc->rx_qid, npe_rxbuf, 0, 1, IX_QMGR_Q_SOURCE_ID_NOT_E, npe_rxdone, sc); rx_qid = sc->rx_qid; } - ixpqmgr_qconfig(sc->rx_freeqid, NPE_MAX_RX_BUFFERS, 0, - NPE_MAX_RX_BUFFERS/2, 0, NULL, sc); + ixpqmgr_qconfig(sc->rx_freeqid, npe_rxbuf, 0, npe_rxbuf/2, 0, NULL, sc); /* tell the NPE to direct all traffic to rx_qid */ for (i = 0; i < 8; i++) npe_setrxqosentry(sc, i, 0, sc->rx_qid); sc->tx_qid = npeconfig[unit].tx_qid; sc->tx_doneqid = npeconfig[unit].tx_doneqid; - ixpqmgr_qconfig(sc->tx_qid, NPE_MAX_TX_BUFFERS, 0, - NPE_MAX_TX_BUFFERS, 0, NULL, sc); + ixpqmgr_qconfig(sc->tx_qid, npe_txbuf, 0, npe_txbuf, 0, NULL, sc); if (tx_doneqid == -1) { - ixpqmgr_qconfig(sc->tx_doneqid, NPE_MAX_TX_BUFFERS, 0, 2, + ixpqmgr_qconfig(sc->tx_doneqid, npe_txbuf, 0, 2, IX_QMGR_Q_SOURCE_ID_NOT_E, npe_txdone, sc); tx_doneqid = sc->tx_doneqid; } @@ -661,9 +674,6 @@ MIBADD(dot3StatsFCSErrors); MIBADD(dot3StatsSingleCollisionFrames); MIBADD(dot3StatsMultipleCollisionFrames); - /* XXX? */ - sc->mibdata.dot3StatsSQETestErrors += - be32toh(ns->dot3StatsCarrierSenseErrors); MIBADD(dot3StatsDeferredTransmissions); MIBADD(dot3StatsLateCollisions); MIBADD(dot3StatsExcessiveCollisions); @@ -679,6 +689,7 @@ ifp->if_oerrors += be32toh(ns->dot3StatsInternalMacTransmitErrors) + + be32toh(ns->dot3StatsCarrierSenseErrors) + be32toh(ns->TxVLANIdFilterDiscards) ; ifp->if_ierrors += be32toh(ns->dot3StatsFCSErrors) @@ -698,6 +709,7 @@ { #define ACK (NPE_RESETSTATS << NPE_MAC_MSGID_SHL) struct npe_softc *sc = xsc; + struct mii_data *mii = device_get_softc(sc->sc_mii); uint32_t msg[2]; NPE_ASSERT_LOCKED(sc); @@ -708,8 +720,10 @@ npe_addstats(sc); } npe_updatestats(sc); + mii_tick(mii); + /* schedule next poll */ - callout_reset(&sc->tick_ch, hz, npe_tick, sc); + callout_reset(&sc->tick_ch, sc->sc_tickinterval * hz, npe_tick, sc); #undef ACK } @@ -976,7 +990,7 @@ WR4(sc, NPE_MAC_TX_CNTRL1, RD4(sc, NPE_MAC_TX_CNTRL1) | NPE_TX_CNTRL1_TX_EN); - callout_reset(&sc->tick_ch, hz, npe_tick, sc); + callout_reset(&sc->tick_ch, sc->sc_tickinterval * hz, npe_tick, sc); } static void @@ -1456,6 +1470,27 @@ (void) npe_mii_mdio_wait(sc); } +static void +npe_miibus_statchg(device_t dev) +{ + struct npe_softc *sc = device_get_softc(dev); + struct mii_data *mii = device_get_softc(sc->sc_mii); + uint32_t tx1, rx1; + + /* sync MAC duplex state */ + tx1 = RD4(sc, NPE_MAC_TX_CNTRL1); + rx1 = RD4(sc, NPE_MAC_RX_CNTRL1); + if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX) { + tx1 &= ~NPE_TX_CNTRL1_DUPLEX; + rx1 |= NPE_RX_CNTRL1_PAUSE_EN; + } else { + tx1 |= NPE_TX_CNTRL1_DUPLEX; + rx1 &= ~NPE_RX_CNTRL1_PAUSE_EN; + } + WR4(sc, NPE_MAC_RX_CNTRL1, rx1); + WR4(sc, NPE_MAC_TX_CNTRL1, tx1); +} + static device_method_t npe_methods[] = { /* Device interface */ DEVMETHOD(device_probe, npe_probe), @@ -1468,6 +1503,7 @@ /* MII interface */ DEVMETHOD(miibus_readreg, npe_miibus_readreg), DEVMETHOD(miibus_writereg, npe_miibus_writereg), + DEVMETHOD(miibus_statchg, npe_miibus_statchg), { 0, 0 } }; From owner-p4-projects@FreeBSD.ORG Wed Nov 8 19:09:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D574016A4C9; Wed, 8 Nov 2006 19:09:44 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 ACA2516A4AB for ; Wed, 8 Nov 2006 19:09:44 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4097143D78 for ; Wed, 8 Nov 2006 19:09:06 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA8J8wTj047207 for ; Wed, 8 Nov 2006 19:08:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA8J8vfE047204 for perforce@freebsd.org; Wed, 8 Nov 2006 19:08:57 GMT (envelope-from sam@freebsd.org) Date: Wed, 8 Nov 2006 19:08:57 GMT Message-Id: <200611081908.kA8J8vfE047204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109541 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 19:09:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=109541 Change 109541 by sam@sam_ebb on 2006/11/08 19:08:34 whitespace changes; also nuke defines brought over from intel code that we'll never use Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#18 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npereg.h#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#18 (text+ko) ==== @@ -939,6 +939,7 @@ */ WR4(sc, NPE_MAC_CORE_CNTRL, NPE_CORE_RESET); DELAY(NPE_MAC_RESET_DELAY); + /* configure MAC to generate MDC clock */ WR4(sc, NPE_MAC_CORE_CNTRL, NPE_CORE_MDC_EN); /* disable transmitter and reciver in the MAC */ ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npereg.h#5 (text+ko) ==== @@ -62,10 +62,14 @@ /* * NPE/NPE tx/rx descriptor format. This data structure has an - * area used by the Intel NPE s/w support followed by an area - * shared with ucode running in the NPE. Since we don't use any - * of the Intel code all the s/w area is free for us to use as we - * choose--only the npe area layout and alignment must be honored. + * area used by the driver followed by an area shared with ucode + * running in the NPE. The latter must be cacheline-aligned; + * hence the unused space in the s/w area. We allocate NPE_MAXSEG + * "descriptors" per buffer; this allows us to do minimal s/g. + * The number of descriptors can be expanded but doing so uses + * memory so should be done with care. + * + * These buffers are setup in uncached memory. */ #define NPE_MAXSEG 3 /* empirically selected */ @@ -116,93 +120,94 @@ #define NPE_SETLOOPBACK 0x12 /* enable/disable loopback */ /* ... XXX more */ +#define NPE_MAC_MSGID_SHL 24 +#define NPE_MAC_PORTID_SHL 16 + /* - * MAC register definitions + * MAC register definitions; see section + * 15.2 of the Intel Developers Manual. */ -#define NPE_MAC_TX_CNTRL1 0x000 -#define NPE_MAC_TX_CNTRL2 0x004 -#define NPE_MAC_RX_CNTRL1 0x010 -#define NPE_MAC_RX_CNTRL2 0x014 -#define NPE_MAC_RANDOM_SEED 0x020 -#define NPE_MAC_THRESH_P_EMPTY 0x030 -#define NPE_MAC_THRESH_P_FULL 0x038 -#define NPE_MAC_BUF_SIZE_TX 0x040 -#define NPE_MAC_TX_DEFER 0x050 -#define NPE_MAC_RX_DEFER 0x054 -#define NPE_MAC_TX_TWO_DEFER_1 0x060 -#define NPE_MAC_TX_TWO_DEFER_2 0x064 -#define NPE_MAC_SLOT_TIME 0x070 -#define NPE_MAC_MDIO_CMD_1 0x080 -#define NPE_MAC_MDIO_CMD_2 0x084 -#define NPE_MAC_MDIO_CMD_3 0x088 -#define NPE_MAC_MDIO_CMD_4 0x08c -#define NPE_MAC_MDIO_STS_1 0x090 -#define NPE_MAC_MDIO_STS_2 0x094 -#define NPE_MAC_MDIO_STS_3 0x098 -#define NPE_MAC_MDIO_STS_4 0x09c -#define NPE_MAC_ADDR_MASK_1 0x0A0 -#define NPE_MAC_ADDR_MASK_2 0x0A4 -#define NPE_MAC_ADDR_MASK_3 0x0A8 -#define NPE_MAC_ADDR_MASK_4 0x0AC -#define NPE_MAC_ADDR_MASK_5 0x0B0 -#define NPE_MAC_ADDR_MASK_6 0x0B4 -#define NPE_MAC_ADDR_1 0x0C0 -#define NPE_MAC_ADDR_2 0x0C4 -#define NPE_MAC_ADDR_3 0x0C8 -#define NPE_MAC_ADDR_4 0x0CC -#define NPE_MAC_ADDR_5 0x0D0 -#define NPE_MAC_ADDR_6 0x0D4 -#define NPE_MAC_INT_CLK_THRESH 0x0E0 -#define NPE_MAC_UNI_ADDR_1 0x0F0 -#define NPE_MAC_UNI_ADDR_2 0x0F4 -#define NPE_MAC_UNI_ADDR_3 0x0F8 -#define NPE_MAC_UNI_ADDR_4 0x0FC -#define NPE_MAC_UNI_ADDR_5 0x100 -#define NPE_MAC_UNI_ADDR_6 0x104 -#define NPE_MAC_CORE_CNTRL 0x1FC +#define NPE_MAC_TX_CNTRL1 0x000 +#define NPE_MAC_TX_CNTRL2 0x004 +#define NPE_MAC_RX_CNTRL1 0x010 +#define NPE_MAC_RX_CNTRL2 0x014 +#define NPE_MAC_RANDOM_SEED 0x020 +#define NPE_MAC_THRESH_P_EMPTY 0x030 +#define NPE_MAC_THRESH_P_FULL 0x038 +#define NPE_MAC_BUF_SIZE_TX 0x040 +#define NPE_MAC_TX_DEFER 0x050 +#define NPE_MAC_RX_DEFER 0x054 +#define NPE_MAC_TX_TWO_DEFER_1 0x060 +#define NPE_MAC_TX_TWO_DEFER_2 0x064 +#define NPE_MAC_SLOT_TIME 0x070 +#define NPE_MAC_MDIO_CMD_1 0x080 +#define NPE_MAC_MDIO_CMD_2 0x084 +#define NPE_MAC_MDIO_CMD_3 0x088 +#define NPE_MAC_MDIO_CMD_4 0x08c +#define NPE_MAC_MDIO_STS_1 0x090 +#define NPE_MAC_MDIO_STS_2 0x094 +#define NPE_MAC_MDIO_STS_3 0x098 +#define NPE_MAC_MDIO_STS_4 0x09c +#define NPE_MAC_ADDR_MASK_1 0x0A0 +#define NPE_MAC_ADDR_MASK_2 0x0A4 +#define NPE_MAC_ADDR_MASK_3 0x0A8 +#define NPE_MAC_ADDR_MASK_4 0x0AC +#define NPE_MAC_ADDR_MASK_5 0x0B0 +#define NPE_MAC_ADDR_MASK_6 0x0B4 +#define NPE_MAC_ADDR_1 0x0C0 +#define NPE_MAC_ADDR_2 0x0C4 +#define NPE_MAC_ADDR_3 0x0C8 +#define NPE_MAC_ADDR_4 0x0CC +#define NPE_MAC_ADDR_5 0x0D0 +#define NPE_MAC_ADDR_6 0x0D4 +#define NPE_MAC_INT_CLK_THRESH 0x0E0 +#define NPE_MAC_UNI_ADDR_1 0x0F0 +#define NPE_MAC_UNI_ADDR_2 0x0F4 +#define NPE_MAC_UNI_ADDR_3 0x0F8 +#define NPE_MAC_UNI_ADDR_4 0x0FC +#define NPE_MAC_UNI_ADDR_5 0x100 +#define NPE_MAC_UNI_ADDR_6 0x104 +#define NPE_MAC_CORE_CNTRL 0x1FC -#define NPE_MAC_ADDR_MASK(i) (NPE_MAC_ADDR_MASK_1 + ((i)<<2)) -#define NPE_MAC_ADDR(i) (NPE_MAC_ADDR_1 + ((i)<<2)) -#define NPE_MAC_UNI_ADDR(i) (NPE_MAC_UNI_ADDR_1 + ((i)<<2)) +#define NPE_MAC_ADDR_MASK(i) (NPE_MAC_ADDR_MASK_1 + ((i)<<2)) +#define NPE_MAC_ADDR(i) (NPE_MAC_ADDR_1 + ((i)<<2)) +#define NPE_MAC_UNI_ADDR(i) (NPE_MAC_UNI_ADDR_1 + ((i)<<2)) /* * Bit definitions */ /* TX Control Register 1*/ -#define NPE_TX_CNTRL1_TX_EN (1<<0) /* enable TX engine */ -#define NPE_TX_CNTRL1_DUPLEX (1<<1) /* select half duplex */ -#define NPE_TX_CNTRL1_RETRY (1<<2) /* auto-retry on collision */ -#define NPE_TX_CNTRL1_PAD_EN (1<<3) /* pad frames <64 bytes */ -#define NPE_TX_CNTRL1_FCS_EN (1<<4) /* append FCS */ -#define NPE_TX_CNTRL1_2DEFER (1<<5) /* select 2-part deferral */ -#define NPE_TX_CNTRL1_RMII (1<<6) +#define NPE_TX_CNTRL1_TX_EN 0x01 /* enable TX engine */ +#define NPE_TX_CNTRL1_DUPLEX 0x02 /* select half duplex */ +#define NPE_TX_CNTRL1_RETRY 0x04 /* auto-retry on collision */ +#define NPE_TX_CNTRL1_PAD_EN 0x08 /* pad frames <64 bytes */ +#define NPE_TX_CNTRL1_FCS_EN 0x10 /* append FCS */ +#define NPE_TX_CNTRL1_2DEFER 0x20 /* select 2-part deferral */ +#define NPE_TX_CNTRL1_RMII 0x40 /* TX Control Register 2 */ -#define NPE_TX_CNTRL2_RETRIES_MASK 0xf /* max retry count */ +#define NPE_TX_CNTRL2_RETRIES_MASK 0xf /* max retry count */ /* RX Control Register 1 */ -#define NPE_RX_CNTRL1_RX_EN (1<<0) /* enable RX engine */ -#define NPE_RX_CNTRL1_PADSTRIP_EN (1<<1) /* strip frame padding */ -#define NPE_RX_CNTRL1_CRC_EN (1<<2) /* include CRC in RX frame */ -#define NPE_RX_CNTRL1_PAUSE_EN (1<<3) /* detect Pause frames */ -#define NPE_RX_CNTRL1_LOOP_EN (1<<4) /* loopback tx/rx */ -#define NPE_RX_CNTRL1_ADDR_FLTR_EN (1<<5) /* enable address filtering */ -#define NPE_RX_CNTRL1_RX_RUNT_EN (1<<6) /* enable RX of runt frames */ -#define NPE_RX_CNTRL1_BCAST_DIS (1<<7) /* discard broadcast frames */ +#define NPE_RX_CNTRL1_RX_EN 0x01 /* enable RX engine */ +#define NPE_RX_CNTRL1_PADSTRIP_EN 0x02 /* strip frame padding */ +#define NPE_RX_CNTRL1_CRC_EN 0x04 /* include CRC in RX frame */ +#define NPE_RX_CNTRL1_PAUSE_EN 0x08 /* detect Pause frames */ +#define NPE_RX_CNTRL1_LOOP_EN 0x10 /* loopback tx/rx */ +#define NPE_RX_CNTRL1_ADDR_FLTR_EN 0x20 /* enable address filtering */ +#define NPE_RX_CNTRL1_RX_RUNT_EN 0x40 /* enable RX of runt frames */ +#define NPE_RX_CNTRL1_BCAST_DIS 0x80 /* discard broadcast frames */ /* RX Control Register 2 */ -#define NPE_RX_CNTRL2_DEFER_EN (1<<0) +#define NPE_RX_CNTRL2_DEFER_EN 0x01 /* Core Control Register */ -#define NPE_CORE_RESET (1<<0) /* MAC reset state */ -#define NPE_CORE_RX_FIFO_FLUSH (1<<1) /* flush RX FIFO */ -#define NPE_CORE_TX_FIFO_FLUSH (1<<2) /* flush TX FIFO */ -#define NPE_CORE_SEND_JAM (1<<3) /* send JAM on packet RX */ -#define NPE_CORE_MDC_EN (1<<4) /* IXP42X drives MDC clock */ - -/* 1st bit of 1st MAC octet */ -#define NPE_ETH_MAC_BCAST_MCAST_BIT ( 1) +#define NPE_CORE_RESET 0x01 /* MAC reset state */ +#define NPE_CORE_RX_FIFO_FLUSH 0x02 /* flush RX FIFO */ +#define NPE_CORE_TX_FIFO_FLUSH 0x04 /* flush TX FIFO */ +#define NPE_CORE_SEND_JAM 0x08 /* send JAM on packet RX */ +#define NPE_CORE_MDC_EN 0x10 /* IXP42X drives MDC clock */ /* * Stat block returned by NPE with NPE_GETSTATS msg. @@ -235,74 +240,22 @@ /* * Default values */ -#define NPE_TX_CNTRL1_DEFAULT \ - (NPE_TX_CNTRL1_TX_EN | NPE_TX_CNTRL1_RETRY | NPE_TX_CNTRL1_FCS_EN | \ - NPE_TX_CNTRL1_2DEFER | NPE_TX_CNTRL1_PAD_EN) -#define NPE_TX_MAX_RETRIES_DEFAULT 0x0f -#define NPE_RX_CNTRL1_DEFAULT \ - (NPE_RX_CNTRL1_CRC_EN | NPE_RX_CNTRL1_RX_EN) -#define NPE_RX_CNTRL2_DEFAULT 0x0 +#define NPE_MAC_INT_CLK_THRESH_DEFAULT 0x1 -/* Thresholds determined by NPE firmware FS */ -#define NPE_MAC_THRESH_P_EMPTY_DEFAULT 0x12 -#define NPE_MAC_THRESH_P_FULL_DEFAULT 0x30 +#define NPE_MAC_RESET_DELAY 1 -/* Number of bytes that must be in the tx fifo before - transmission commences*/ -#define NPE_MAC_BUF_SIZE_TX_DEFAULT 0x8 - -/* One-part deferral values */ -#define NPE_MAC_TX_DEFER_DEFAULT 0x15 -#define NPE_MAC_RX_DEFER_DEFAULT 0x16 - -/* Two-part deferral values... */ -#define NPE_MAC_TX_TWO_DEFER_1_DEFAULT 0x08 -#define NPE_MAC_TX_TWO_DEFER_2_DEFAULT 0x07 - -/* This value applies to MII */ -#define NPE_MAC_SLOT_TIME_DEFAULT 0x80 - /* This value applies to RMII */ #define NPE_MAC_SLOT_TIME_RMII_DEFAULT 0xFF -#define NPE_MAC_ADDR_MASK_DEFAULT 0xFF - -#define NPE_MAC_INT_CLK_THRESH_DEFAULT 0x1 -/*The following is a value chosen at random*/ -#define NPE_RANDOM_SEED_DEFAULT 0x8 - -/*By default we must configure the MAC to generate the - MDC clock*/ -#define NPE_CORE_DEFAULT NPE_CORE_MDC_EN - -#define IXP400_ETH_ACC_MAX_PHY 2 -#define IXP400_ETH_ACC_MAX_AN_ENTRIES 20 -#define NPE_MAC_RESET_DELAY 1 - -#define NPE_MAC_ALL_BITS_SET 0xFF - -#define NPE_MAC_MSGID_SHL 24 -#define NPE_MAC_PORTID_SHL 16 - -#define NPE_PORT_DISABLE_DELAY_MSECS 20 -#define NPE_PORT_DISABLE_DELAY_COUNT 200 /* 4 seconds timeout */ -#define NPE_PORT_DISABLE_RETRY_COUNT 3 -#define NPE_MIB_STATS_DELAY_MSECS 2000 /* 2 seconds delay for ethernet stats */ - /* * MII definitions - these have been verified against the LXT971 and LXT972 PHYs */ +#define NPE_MII_REG_SHL 16 +#define NPE_MII_ADDR_SHL 21 -#define IXP400_ETH_ACC_MII_MAX_REG 32 /* max register per phy */ - -#define NPE_MII_REG_SHL 16 -#define NPE_MII_ADDR_SHL 21 - -/* Definitions for MII access routines*/ - /* NB: shorthands for mii bus mdio routines */ -#define NPE_MAC_MDIO_CMD NPE_MAC_MDIO_CMD_1 -#define NPE_MAC_MDIO_STS NPE_MAC_MDIO_STS_1 +#define NPE_MAC_MDIO_CMD NPE_MAC_MDIO_CMD_1 +#define NPE_MAC_MDIO_STS NPE_MAC_MDIO_STS_1 #define NPE_MII_GO (1<<31) #define NPE_MII_WRITE (1<<26) @@ -315,12 +268,7 @@ #define NPE_MII_PHY_NULL 0xff /* PHY is not present */ #define NPE_MII_PHY_DEF_ADDR 0x0 /* default PHY's logical address */ -#ifndef NPE_MII_MONITOR_DELAY -# define NPE_MII_MONITOR_DELAY 0x5 /* in seconds */ -#endif - /* Register definition */ - #define NPE_MII_CTRL_REG 0x0 /* Control Register */ #define NPE_MII_STAT_REG 0x1 /* Status Register */ #define NPE_MII_PHY_ID1_REG 0x2 /* PHY identifier 1 Register */ From owner-p4-projects@FreeBSD.ORG Wed Nov 8 19:18:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4B6B16A4E7; Wed, 8 Nov 2006 19:18:17 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9080A16A4CA for ; Wed, 8 Nov 2006 19:18:17 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D67F43F6D for ; Wed, 8 Nov 2006 19:14:33 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA8JEGfP048536 for ; Wed, 8 Nov 2006 19:14:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA8JE6vk048492 for perforce@freebsd.org; Wed, 8 Nov 2006 19:14:06 GMT (envelope-from jhb@freebsd.org) Date: Wed, 8 Nov 2006 19:14:06 GMT Message-Id: <200611081914.kA8JE6vk048492@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 Cc: Subject: PERFORCE change 109543 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 19:18:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=109543 Change 109543 by jhb@jhb_mutex on 2006/11/08 19:13:38 IFC @109540. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/io.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#59 integrate .. //depot/projects/smpng/sys/amd64/conf/DEFAULTS#7 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#6 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#12 integrate .. //depot/projects/smpng/sys/arm/arm/identcpu.c#9 integrate .. //depot/projects/smpng/sys/arm/arm/intr.c#13 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#35 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#24 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#9 integrate .. //depot/projects/smpng/sys/arm/include/armreg.h#5 integrate .. //depot/projects/smpng/sys/arm/include/atomic.h#26 integrate .. //depot/projects/smpng/sys/arm/include/cpuconf.h#7 integrate .. //depot/projects/smpng/sys/arm/include/cpufunc.h#10 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#19 integrate .. //depot/projects/smpng/sys/boot/Makefile#24 integrate .. //depot/projects/smpng/sys/boot/common/Makefile.inc#10 integrate .. //depot/projects/smpng/sys/boot/common/bootstrap.h#10 integrate .. //depot/projects/smpng/sys/boot/common/devopen.c#3 integrate .. //depot/projects/smpng/sys/boot/common/load_elf.c#16 integrate .. //depot/projects/smpng/sys/boot/efi/include/efi.h#4 integrate .. //depot/projects/smpng/sys/boot/efi/include/efi_nii.h#3 integrate .. //depot/projects/smpng/sys/boot/efi/include/efiapi.h#7 integrate .. //depot/projects/smpng/sys/boot/efi/include/eficon.h#3 integrate .. //depot/projects/smpng/sys/boot/efi/include/efidebug.h#3 integrate .. //depot/projects/smpng/sys/boot/efi/include/efidef.h#3 integrate .. //depot/projects/smpng/sys/boot/efi/include/efidevp.h#3 integrate .. //depot/projects/smpng/sys/boot/efi/include/efierr.h#2 integrate .. //depot/projects/smpng/sys/boot/efi/include/efifs.h#3 integrate .. //depot/projects/smpng/sys/boot/efi/include/efilib.h#4 integrate .. //depot/projects/smpng/sys/boot/efi/include/efinet.h#3 integrate .. //depot/projects/smpng/sys/boot/efi/include/efipart.h#3 integrate .. //depot/projects/smpng/sys/boot/efi/include/efiprot.h#4 integrate .. //depot/projects/smpng/sys/boot/efi/include/efipxebc.h#3 integrate .. //depot/projects/smpng/sys/boot/efi/include/efiser.h#3 integrate .. //depot/projects/smpng/sys/boot/efi/include/efistdarg.h#2 integrate .. //depot/projects/smpng/sys/boot/efi/include/i386/efibind.h#4 integrate .. //depot/projects/smpng/sys/boot/efi/include/i386/pe.h#2 integrate .. //depot/projects/smpng/sys/boot/efi/include/ia64/efibind.h#5 integrate .. //depot/projects/smpng/sys/boot/efi/include/ia64/pe.h#2 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/Makefile#12 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/bootinfo.c#12 delete .. //depot/projects/smpng/sys/boot/efi/libefi/copy.c#6 delete .. //depot/projects/smpng/sys/boot/efi/libefi/devicename.c#4 delete .. //depot/projects/smpng/sys/boot/efi/libefi/efiboot.h#8 delete .. //depot/projects/smpng/sys/boot/efi/libefi/efifpswa.c#3 delete .. //depot/projects/smpng/sys/boot/efi/libefi/efifs.c#9 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/efinet.c#5 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/elf_freebsd.c#14 delete .. //depot/projects/smpng/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/smpng/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/smpng/sys/boot/efi/libefi/libefi.c#5 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/module.c#3 delete .. //depot/projects/smpng/sys/boot/efi/libefi/time.c#5 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#31 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/bioscd.c#8 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#14 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/bootinfo32.c#3 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/devicename.c#5 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/elf32_freebsd.c#5 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/libi386.h#14 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#22 integrate .. //depot/projects/smpng/sys/boot/i386/loader/main.c#14 integrate .. //depot/projects/smpng/sys/boot/ia64/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/smpng/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/smpng/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/smpng/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/smpng/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/smpng/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/smpng/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/smpng/sys/boot/ia64/efi/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/conf.c#3 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/efimd.c#3 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/main.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/version#2 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/acpi_stub.c#3 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/bootinfo.c#5 delete .. //depot/projects/smpng/sys/boot/ia64/ski/copy.c#2 delete .. //depot/projects/smpng/sys/boot/ia64/ski/devicename.c#2 delete .. //depot/projects/smpng/sys/boot/ia64/ski/efi_stub.c#3 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/elf_freebsd.c#3 delete .. //depot/projects/smpng/sys/boot/ia64/ski/libski.h#2 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/main.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/skifs.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/smpng/sys/boot/ia64/ski/version#2 integrate .. //depot/projects/smpng/sys/boot/ofw/common/main.c#8 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/libofw.h#10 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/boot.c#9 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/biosdisk.c#12 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#18 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/main.c#12 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#21 integrate .. //depot/projects/smpng/sys/cam/cam_ccb.h#9 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#38 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#11 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#71 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low.c#15 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#35 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#35 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#35 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#35 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#40 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#73 integrate .. //depot/projects/smpng/sys/compat/linux/linux_uid16.c#22 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#23 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#59 integrate .. //depot/projects/smpng/sys/conf/NOTES#129 integrate .. //depot/projects/smpng/sys/conf/files#189 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#58 integrate .. //depot/projects/smpng/sys/conf/options#128 integrate .. //depot/projects/smpng/sys/conf/options.sparc64#14 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq_cbq.c#3 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq_rio.c#3 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#23 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#36 integrate .. //depot/projects/smpng/sys/ddb/db_main.c#4 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#20 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#43 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/smpng/sys/dev/advansys/advansys.c#13 integrate .. //depot/projects/smpng/sys/dev/advansys/advlib.c#8 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#14 integrate .. //depot/projects/smpng/sys/dev/aha/aha.c#18 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#15 integrate .. //depot/projects/smpng/sys/dev/aic/aic.c#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#23 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#17 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#20 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#19 integrate .. //depot/projects/smpng/sys/dev/amd/amd.c#17 integrate .. //depot/projects/smpng/sys/dev/amr/amr_cam.c#18 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#53 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#8 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl.c#12 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#34 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#29 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#64 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt.c#15 integrate .. //depot/projects/smpng/sys/dev/ce/if_ce.c#4 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#48 integrate .. //depot/projects/smpng/sys/dev/cnw/if_cnw.c#23 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#17 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#19 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#26 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#11 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#9 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_scsi.c#17 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#16 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#75 integrate .. //depot/projects/smpng/sys/dev/esp/ncr53c9x.c#8 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#26 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#39 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#76 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#19 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#41 integrate .. //depot/projects/smpng/sys/dev/iir/iir.c#17 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#45 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#47 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#33 integrate .. //depot/projects/smpng/sys/dev/isp/isp_library.c#5 integrate .. //depot/projects/smpng/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#41 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#17 integrate .. //depot/projects/smpng/sys/dev/isp/isp_stds.h#1 branch .. //depot/projects/smpng/sys/dev/isp/isp_target.c#21 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.h#14 integrate .. //depot/projects/smpng/sys/dev/isp/isp_tpublic.h#11 integrate .. //depot/projects/smpng/sys/dev/isp/ispmbox.h#22 integrate .. //depot/projects/smpng/sys/dev/isp/ispreg.h#9 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#32 integrate .. //depot/projects/smpng/sys/dev/ispfw/asm_2300.h#10 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#21 integrate .. //depot/projects/smpng/sys/dev/kbd/kbd.c#18 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#14 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.h#5 integrate .. //depot/projects/smpng/sys/dev/md/md.c#79 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#28 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#15 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_raid.c#9 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#30 integrate .. //depot/projects/smpng/sys/dev/null/null.c#20 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#25 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#75 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#17 integrate .. //depot/projects/smpng/sys/dev/pci/pcib_if.m#4 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.c#30 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#21 integrate .. //depot/projects/smpng/sys/dev/sbsh/if_sbsh.c#14 integrate .. //depot/projects/smpng/sys/dev/si/si.c#22 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#26 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#57 integrate .. //depot/projects/smpng/sys/dev/syscons/sysmouse.c#14 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#24 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_cam.c#8 integrate .. //depot/projects/smpng/sys/dev/uart/uart_kbd_sun.c#9 integrate .. //depot/projects/smpng/sys/dev/uart/uart_kbd_sun.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#59 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#82 integrate .. //depot/projects/smpng/sys/dev/wl/if_wl.c#29 integrate .. //depot/projects/smpng/sys/dev/zs/zs.c#24 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_rule.c#17 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#60 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#32 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#49 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#36 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#14 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#24 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_smb.c#15 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#36 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#31 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#25 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#17 integrate .. //depot/projects/smpng/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#36 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.h#14 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror_ctl.c#13 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#37 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.h#14 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3_ctl.c#16 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#17 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vfsops.c#8 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vnops.c#5 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_fs.h#3 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#6 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/smpng/sys/i386/conf/DEFAULTS#8 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#49 integrate .. //depot/projects/smpng/sys/i386/i386/io.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#118 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#48 integrate .. //depot/projects/smpng/sys/i386/i386/vm86.c#21 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#31 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#13 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#11 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#38 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#25 integrate .. //depot/projects/smpng/sys/ia64/conf/DEFAULTS#7 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#106 integrate .. //depot/projects/smpng/sys/ia64/ia64/ssc.c#19 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#43 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#78 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#98 integrate .. //depot/projects/smpng/sys/kern/kern_environment.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#101 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#103 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#55 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#83 integrate .. //depot/projects/smpng/sys/kern/kern_ntptime.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_priv.c#1 branch .. //depot/projects/smpng/sys/kern/kern_prot.c#100 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_xxx.c#18 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#70 integrate .. //depot/projects/smpng/sys/kern/subr_acl_posix1e.c#4 integrate .. //depot/projects/smpng/sys/kern/subr_firmware.c#14 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#49 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#155 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#78 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#85 integrate .. //depot/projects/smpng/sys/kern/systrace_args.c#5 integrate .. //depot/projects/smpng/sys/kern/sysv_ipc.c#15 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#32 integrate .. //depot/projects/smpng/sys/kern/tty.c#67 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#36 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#5 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#48 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#50 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#9 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#21 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#95 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#95 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#66 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#135 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#118 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#76 integrate .. //depot/projects/smpng/sys/modules/ath_rate_amrr/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/bge/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/nfe/Makefile#2 integrate .. //depot/projects/smpng/sys/net/bpf.c#65 integrate .. //depot/projects/smpng/sys/net/bridgestp.c#14 integrate .. //depot/projects/smpng/sys/net/if.c#88 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#39 integrate .. //depot/projects/smpng/sys/net/if_gre.c#33 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#43 integrate .. //depot/projects/smpng/sys/net/if_sl.c#32 integrate .. //depot/projects/smpng/sys/net/if_tap.c#43 integrate .. //depot/projects/smpng/sys/net/if_tun.c#49 integrate .. //depot/projects/smpng/sys/net/ppp_tty.c#22 integrate .. //depot/projects/smpng/sys/net/raw_usrreq.c#23 integrate .. //depot/projects/smpng/sys/net/rtsock.c#56 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#30 integrate .. //depot/projects/smpng/sys/netatalk/at_control.c#14 integrate .. //depot/projects/smpng/sys/netatalk/ddp_pcb.c#9 integrate .. //depot/projects/smpng/sys/netatm/atm_usrreq.c#18 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#12 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#20 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#17 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#18 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#42 integrate .. //depot/projects/smpng/sys/netgraph/ng_tty.c#19 integrate .. //depot/projects/smpng/sys/netinet/in.c#34 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#69 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#24 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#21 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#51 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#79 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#49 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#88 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_smedia.c#4 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#62 integrate .. //depot/projects/smpng/sys/netinet/sctp.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_asconf.c#1 branch .. //depot/projects/smpng/sys/netinet/sctp_asconf.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_auth.c#1 branch .. //depot/projects/smpng/sys/netinet/sctp_auth.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.c#1 branch .. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_constants.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_crc32.c#1 branch .. //depot/projects/smpng/sys/netinet/sctp_crc32.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_header.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_indata.c#1 branch .. //depot/projects/smpng/sys/netinet/sctp_indata.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_input.c#1 branch .. //depot/projects/smpng/sys/netinet/sctp_input.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_lock_bsd.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_os.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_output.c#1 branch .. //depot/projects/smpng/sys/netinet/sctp_output.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#1 branch .. //depot/projects/smpng/sys/netinet/sctp_pcb.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_peeloff.c#1 branch .. //depot/projects/smpng/sys/netinet/sctp_peeloff.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_structs.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_timer.c#1 branch .. //depot/projects/smpng/sys/netinet/sctp_timer.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_uio.h#1 branch .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#1 branch .. //depot/projects/smpng/sys/netinet/sctp_var.h#1 branch .. //depot/projects/smpng/sys/netinet/sctputil.c#1 branch .. //depot/projects/smpng/sys/netinet/sctputil.h#1 branch .. //depot/projects/smpng/sys/netinet/tcp_subr.c#85 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#72 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#36 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#46 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#17 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#27 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#26 integrate .. //depot/projects/smpng/sys/netinet6/sctp6_usrreq.c#1 branch .. //depot/projects/smpng/sys/netinet6/sctp6_var.h#1 branch .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#41 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#16 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_osdep.h#4 integrate .. //depot/projects/smpng/sys/netipx/ipx_pcb.c#19 integrate .. //depot/projects/smpng/sys/netipx/ipx_usrreq.c#25 integrate .. //depot/projects/smpng/sys/netncp/ncp_conn.c#14 integrate .. //depot/projects/smpng/sys/netncp/ncp_mod.c#9 integrate .. //depot/projects/smpng/sys/netncp/ncp_subr.h#7 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.c#17 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.c#17 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.h#15 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#32 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#30 integrate .. //depot/projects/smpng/sys/pc98/cbus/fdc.c#7 integrate .. //depot/projects/smpng/sys/pc98/conf/DEFAULTS#8 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#41 integrate .. //depot/projects/smpng/sys/pci/if_pcnreg.h#8 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#62 integrate .. //depot/projects/smpng/sys/pci/ncr.c#23 integrate .. //depot/projects/smpng/sys/posix4/p1003_1b.c#15 integrate .. //depot/projects/smpng/sys/powerpc/conf/DEFAULTS#6 integrate .. //depot/projects/smpng/sys/security/audit/audit.c#6 integrate .. //depot/projects/smpng/sys/security/audit/audit_arg.c#6 integrate .. //depot/projects/smpng/sys/security/audit/audit_pipe.c#6 integrate .. //depot/projects/smpng/sys/security/audit/audit_private.h#6 integrate .. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#7 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#10 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#16 integrate .. //depot/projects/smpng/sys/security/mac/mac_priv.c#1 branch .. //depot/projects/smpng/sys/security/mac/mac_system.c#7 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#20 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#32 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#9 integrate .. //depot/projects/smpng/sys/security/mac_portacl/mac_portacl.c#9 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#8 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#17 integrate .. //depot/projects/smpng/sys/sparc64/conf/DEFAULTS#6 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#24 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#39 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#82 integrate .. //depot/projects/smpng/sys/sun4v/conf/DEFAULTS#3 integrate .. //depot/projects/smpng/sys/sun4v/include/elf.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/hypervisor_api.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/hypervisorvar.h#3 integrate .. //depot/projects/smpng/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/utrap.h#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/exception.S#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/wbuf.S#2 integrate .. //depot/projects/smpng/sys/sys/jail.h#16 integrate .. //depot/projects/smpng/sys/sys/libkern.h#23 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#40 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#65 integrate .. //depot/projects/smpng/sys/sys/priv.h#1 branch .. //depot/projects/smpng/sys/sys/sem.h#9 integrate .. //depot/projects/smpng/sys/sys/socket.h#30 integrate .. //depot/projects/smpng/sys/sys/syscall.h#77 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#77 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#81 integrate .. //depot/projects/smpng/sys/sys/systm.h#75 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#42 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#90 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#47 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#39 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#35 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#59 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#66 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#40 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#61 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#85 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/io.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.1 2004/08/01 11:40:50 markm Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.2 2006/11/06 13:41:49 rwatson Exp $"); #include #include @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -54,7 +55,7 @@ { int error; - error = suser(td); + error = priv_check(td, PRIV_IO); if (error != 0) return (error); error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#59 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.657 2006/10/26 21:42:16 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.660 2006/11/07 21:57:18 ru Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -196,7 +196,7 @@ #ifdef PERFMON perfmon_init(); #endif - printf("usable memory = %ju (%ju MB)\n", ptoa((uintmax_t)physmem), + printf("usable memory = %ju (%ju MB)\n", ptoa((uintmax_t)physmem), ptoa((uintmax_t)physmem) / 1048576); realmem = Maxmem; /* @@ -220,7 +220,7 @@ vm_ksubmap_init(&kmi); - printf("avail memory = %ju (%ju MB)\n", + printf("avail memory = %ju (%ju MB)\n", ptoa((uintmax_t)cnt.v_free_count), ptoa((uintmax_t)cnt.v_free_count) / 1048576); @@ -747,8 +747,6 @@ ip->gd_hioffset = ((uintptr_t)func)>>16 ; } -#define IDTVEC(name) __CONCAT(X,name) - extern inthand_t IDTVEC(div), IDTVEC(dbg), IDTVEC(nmi), IDTVEC(bpt), IDTVEC(ofl), IDTVEC(bnd), IDTVEC(ill), IDTVEC(dna), IDTVEC(fpusegm), @@ -877,7 +875,7 @@ if (smap->base < physmap[i + 1]) { if (boothowto & RB_VERBOSE) printf( - "Overlapping or non-montonic memory region, ignoring second region\n"); + "Overlapping or non-monotonic memory region, ignoring second region\n"); continue; } } ==== //depot/projects/smpng/sys/amd64/conf/DEFAULTS#7 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.7 2006/10/26 22:05:24 jb Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.9 2006/11/04 23:50:11 jb Exp $ machine amd64 ==== //depot/projects/smpng/sys/amd64/linux32/linux.h#6 (text+ko) ==== @@ -27,14 +27,12 @@ * (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/linux32/linux.h,v 1.8 2006/10/29 14:02:38 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.9 2006/11/07 18:53:49 jhb Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ #define _AMD64_LINUX_LINUX_H_ -#include /* for sigval union */ - #include /* @@ -379,6 +377,11 @@ #define LINUX_SI_MAX_SIZE 128 #define LINUX_SI_PAD_SIZE ((LINUX_SI_MAX_SIZE/sizeof(l_int)) - 3) +union l_sigval { + l_int sival_int; + l_uintptr_t sival_ptr; +}; + typedef struct l_siginfo { l_int lsi_signo; l_int lsi_errno; @@ -399,7 +402,7 @@ struct { l_pid_t _pid; /* sender's pid */ l_uid16_t _uid; /* sender's uid */ - union sigval _sigval; + union l_sigval _sigval; } __packed _rt; struct { ==== //depot/projects/smpng/sys/arm/arm/cpufunc.c#12 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.12 2006/10/21 04:25:00 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.13 2006/11/07 22:36:56 cognet Exp $"); #include #include @@ -73,13 +73,17 @@ #include #endif +#if defined(CPU_XSCALE_81342) +#include +#endif + #ifdef CPU_XSCALE_IXP425 #include #include #endif #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) #include #endif @@ -570,6 +574,62 @@ /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 CPU_XSCALE_80219 */ +#ifdef CPU_XSCALE_81342 +struct cpu_functions xscalec3_cpufuncs = { + /* CPU functions */ + + cpufunc_id, /* id */ + xscale_cpwait, /* cpwait */ + + /* MMU functions */ + + xscale_control, /* control */ + cpufunc_domains, /* domain */ + xscalec3_setttb, /* setttb */ + cpufunc_faultstatus, /* faultstatus */ + cpufunc_faultaddress, /* faultaddress */ + + /* TLB functions */ + + armv4_tlb_flushID, /* tlb_flushID */ + xscale_tlb_flushID_SE, /* tlb_flushID_SE */ + armv4_tlb_flushI, /* tlb_flushI */ + (void *)armv4_tlb_flushI, /* tlb_flushI_SE */ + armv4_tlb_flushD, /* tlb_flushD */ + armv4_tlb_flushD_SE, /* tlb_flushD_SE */ + + /* Cache operations */ + + xscalec3_cache_syncI, /* icache_sync_all */ + xscale_cache_syncI_rng, /* icache_sync_range */ + + xscalec3_cache_purgeD, /* dcache_wbinv_all */ + xscalec3_cache_purgeD_rng, /* dcache_wbinv_range */ + xscale_cache_flushD_rng, /* dcache_inv_range */ + xscalec3_cache_cleanD_rng, /* dcache_wb_range */ + + xscalec3_cache_purgeID, /* idcache_wbinv_all */ + xscalec3_cache_purgeID_rng, /* idcache_wbinv_range */ + + /* Other functions */ + + cpufunc_nullop, /* flush_prefetchbuf */ + armv4_drain_writebuf, /* drain_writebuf */ + cpufunc_nullop, /* flush_brnchtgt_C */ + (void *)cpufunc_nullop, /* flush_brnchtgt_E */ + + xscale_cpu_sleep, /* sleep */ + + /* Soft functions */ + + cpufunc_null_fixup, /* dataabt_fixup */ + cpufunc_null_fixup, /* prefetchabt_fixup */ + + xscalec3_context_switch, /* context_switch */ + + xscale_setup /* cpu setup */ +}; +#endif /* CPU_XSCALE_81342 */ /* * Global constants also used by locore.s */ @@ -582,7 +642,7 @@ defined (CPU_ARM10) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) static void get_cachetype_cp15(void); @@ -895,7 +955,6 @@ if (cputype == CPU_ID_80321_400 || cputype == CPU_ID_80321_600 || cputype == CPU_ID_80321_400_B0 || cputype == CPU_ID_80321_600_B0 || cputype == CPU_ID_80219_400 || cputype == CPU_ID_80219_600) { - /* * Reset the Performance Monitoring Unit to a * pristine state: @@ -920,6 +979,19 @@ } #endif /* CPU_XSCALE_80321 */ +#if defined(CPU_XSCALE_81342) + if (cputype == CPU_ID_81342) { + cpufuncs = xscalec3_cpufuncs; +#if defined(PERFCTRS) + xscale_pmu_init(); +#endif + + cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ + get_cachetype_cp15(); + pmap_pte_init_xscale(); + return 0; + } +#endif /* CPU_XSCALE_81342 */ #ifdef CPU_XSCALE_PXA2X0 /* ignore core revision to test PXA2xx CPUs */ if ((cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA250 || @@ -1326,7 +1398,7 @@ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) #define IGN 0 #define OR 1 @@ -1794,7 +1866,7 @@ #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) struct cpu_option xscale_options[] = { #ifdef COMPAT_12 { "branchpredict", BIC, OR, CPU_CONTROL_BPRD_ENABLE }, ==== //depot/projects/smpng/sys/arm/arm/identcpu.c#9 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.8 2006/08/24 23:51:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.9 2006/11/07 22:36:57 cognet Exp $"); #include #include #include @@ -126,6 +126,13 @@ "rev 12", "rev 13", "rev 14", "rev 15", }; +static const char * const i81342_steppings[16] = { + "step A-0", "rev 1", "rev 2", "rev 3", + "rev 4", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + static const char * const pxa2x0_steppings[16] = { "step A-0", "step A-1", "step B-0", "step B-1", "step B-2", "step C-0", "rev 6", "rev 7", @@ -229,6 +236,9 @@ { CPU_ID_80321_600_B0, CPU_CLASS_XSCALE, "i80321 600MHz", i80321_steppings }, + { CPU_ID_81342, CPU_CLASS_XSCALE, "i81342", + i81342_steppings }, + { CPU_ID_80219_400, CPU_CLASS_XSCALE, "i80219 400MHz", xscale_steppings }, ==== //depot/projects/smpng/sys/arm/arm/intr.c#13 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.12 2005/12/22 22:16:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.13 2006/11/08 01:32:24 cognet Exp $"); #include #include #include @@ -106,6 +106,7 @@ struct thread *td = curthread; int i, thread; + PCPU_LAZY_INC(cnt.v_intr); td->td_intr_nesting_level++; while ((i = arm_get_next_irq()) != -1) { arm_mask_irq(i); ==== //depot/projects/smpng/sys/arm/arm/pmap.c#35 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.69 2006/08/28 21:43:34 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.71 2006/11/08 06:31:28 alc Exp $"); #include #include #include @@ -278,6 +278,8 @@ extern void bcopy_page(vm_offset_t, vm_offset_t); extern void bzero_page(vm_offset_t); +extern vm_offset_t alloc_firstaddr; + char *_tmppt; /* @@ -1960,7 +1962,7 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + vm_page_array_size; + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; pv_entry_high_water = 9 * (pv_entry_max / 10); l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); @@ -2784,6 +2786,11 @@ KASSERT(l2b != NULL, ("No L2 bucket in pmap_remove_pages")); pt = &l2b->l2b_kva[l2pte_index(pv->pv_va)]; m = PHYS_TO_VM_PAGE(*pt & L2_ADDR_MASK); +#ifdef ARM_USE_SMALL_ALLOC + KASSERT((vm_offset_t)m >= alloc_firstaddr, ("Trying to access non-existent page va %x pte %x", pv->pv_va, *pt)); +#else + KASSERT((vm_offset_t)m >= KERNBASE, ("Trying to access non-existent page va %x pte %x", pv->pv_va, *pt)); +#endif *pt = 0; PTE_SYNC(pt); npv = TAILQ_NEXT(pv, pv_plist); @@ -4563,7 +4570,7 @@ /* * pmap_link_l2pt: * - * Link the L2 page table specified by "pa" into the L1 + * Link the L2 page table specified by l2pv.pv_pa into the L1 * page table at the slot for "va". */ void @@ -4574,7 +4581,12 @@ proto = L1_S_DOM(PMAP_DOMAIN_KERNEL) | L1_C_PROTO; +#ifdef VERBOSE_INIT_ARM + printf("pmap_link_l2pt: pa=0x%x va=0x%x\n", l2pv->pv_pa, l2pv->pv_va); +#endif + pde[slot + 0] = proto | (l2pv->pv_pa + 0x000); + PTE_SYNC(&pde[slot]); SLIST_INSERT_HEAD(&kernel_pt_list, l2pv, pv_list); ==== //depot/projects/smpng/sys/arm/arm/vm_machdep.c#24 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.28 2006/10/24 23:27:52 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.29 2006/11/07 22:35:30 cognet Exp $"); #include #include @@ -456,7 +456,7 @@ MALLOC_DEFINE(M_VMSMALLALLOC, "vm_small_alloc", "VM Small alloc data"); -static vm_offset_t alloc_firstaddr; +vm_offset_t alloc_firstaddr; vm_offset_t arm_ptovirt(vm_paddr_t pa) ==== //depot/projects/smpng/sys/arm/at91/if_ate.c#9 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.11 2006/10/20 07:04:56 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.12 2006/11/03 07:39:37 imp Exp $"); #include #include @@ -195,7 +195,6 @@ ate_get_mac(sc, eaddr); ate_set_mac(sc, eaddr); - sc->ifp = ifp = if_alloc(IFT_ETHER); if (mii_phy_probe(dev, &sc->miibus, ate_ifmedia_upd, ate_ifmedia_sts)) { device_printf(dev, "Cannot find my PHY.\n"); @@ -271,10 +270,12 @@ * For the last buffer, set the wrap bit so the controller * restarts from the first descriptor. */ + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); if (i == ATE_MAX_RX_BUFFERS - 1) sc->rx_descs[i].addr = segs[0].ds_addr | ETH_WRAP_BIT; else sc->rx_descs[i].addr = segs[0].ds_addr; + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_POSTWRITE); sc->rx_descs[i].status = 0; /* Flush the memory in the mbuf */ bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREREAD); @@ -489,11 +490,30 @@ } static void +ate_stat_update(struct ate_softc *sc, int active) +{ + /* + * The speed and full/half-duplex state needs to be reflected + * in the ETH_CFG register. + */ + if (IFM_SUBTYPE(active) == IFM_10_T) + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_SPD); + else + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_SPD); + if (active & IFM_FDX) + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_FD); + else + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_FD); +} + +static void ate_tick(void *xsc) { struct ate_softc *sc = xsc; + struct ifnet *ifp = sc->ifp; struct mii_data *mii; int active; + uint32_t c; /* * The KB920x boot loader tests ETH_SR & ETH_SR_LINK and will ask @@ -506,25 +526,8 @@ active = mii->mii_media_active; mii_tick(mii); if (mii->mii_media_status & IFM_ACTIVE && - active != mii->mii_media_active) { - /* - * The speed and full/half-duplex state needs - * to be reflected in the ETH_CFG register, it - * seems. - */ - if (IFM_SUBTYPE(mii->mii_media_active) == IFM_10_T) - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & - ~ETH_CFG_SPD); - else - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | - ETH_CFG_SPD); - if (mii->mii_media_active & IFM_FDX) - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | - ETH_CFG_FD); - else - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & - ~ETH_CFG_FD); - } + active != mii->mii_media_active) + ate_stat_update(sc, mii->mii_media_active); } /* @@ -535,16 +538,25 @@ * the dot3Stats mib, so for those we just count them as general * errors. Stats for iframes, ibutes, oframes and obytes are * collected elsewhere. These registers zero on a read to prevent - * races. + * races. For all the collision stats, also update the collision + * stats for the interface. */ sc->mibdata.dot3StatsAlignmentErrors += RD4(sc, ETH_ALE); sc->mibdata.dot3StatsFCSErrors += RD4(sc, ETH_SEQE); - sc->mibdata.dot3StatsSingleCollisionFrames += RD4(sc, ETH_SCOL); - sc->mibdata.dot3StatsMultipleCollisionFrames += RD4(sc, ETH_MCOL); + c = RD4(sc, ETH_SCOL); + ifp->if_collisions += c; + sc->mibdata.dot3StatsSingleCollisionFrames += c; + c = RD4(sc, ETH_MCOL); + sc->mibdata.dot3StatsMultipleCollisionFrames += c; + ifp->if_collisions += c; sc->mibdata.dot3StatsSQETestErrors += RD4(sc, ETH_SQEE); sc->mibdata.dot3StatsDeferredTransmissions += RD4(sc, ETH_DTE); - sc->mibdata.dot3StatsLateCollisions += RD4(sc, ETH_LCOL); - sc->mibdata.dot3StatsExcessiveCollisions += RD4(sc, ETH_ECOL); + c = RD4(sc, ETH_LCOL); + sc->mibdata.dot3StatsLateCollisions += c; + ifp->if_collisions += c; + c = RD4(sc, ETH_ECOL); + sc->mibdata.dot3StatsExcessiveCollisions += c; + ifp->if_collisions += c; sc->mibdata.dot3StatsCarrierSenseErrors += RD4(sc, ETH_CSE); sc->mibdata.dot3StatsFrameTooLongs += RD4(sc, ETH_ELR); sc->mibdata.dot3StatsInternalMacReceiveErrors += RD4(sc, ETH_DRFC); @@ -552,7 +564,7 @@ * not sure where to lump these, so count them against the errors * for the interface. */ - sc->ifp->if_oerrors += RD4(sc, ETH_CSE) + RD4(sc, ETH_TUE); + sc->ifp->if_oerrors += RD4(sc, ETH_TUE); sc->ifp->if_ierrors += RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) + RD4(sc, ETH_USF); @@ -577,9 +589,9 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 8 19:18:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 051C816A674; Wed, 8 Nov 2006 19:18:27 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 BD12516A665 for ; Wed, 8 Nov 2006 19:18:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8D0D43EB2 for ; Wed, 8 Nov 2006 19:16:27 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA8JGJrr048899 for ; Wed, 8 Nov 2006 19:16:19 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA8JGJuq048896 for perforce@freebsd.org; Wed, 8 Nov 2006 19:16:19 GMT (envelope-from jhb@freebsd.org) Date: Wed, 8 Nov 2006 19:16:19 GMT Message-Id: <200611081916.kA8JGJuq048896@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 Cc: Subject: PERFORCE change 109544 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 19:18:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=109544 Change 109544 by jhb@jhb_mutex on 2006/11/08 19:15:50 IFC @109542. Affected files ... .. //depot/projects/smpng/sys/vm/vm_page.c#86 integrate Differences ... ==== //depot/projects/smpng/sys/vm/vm_page.c#86 (text+ko) ==== @@ -97,7 +97,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.331 2006/11/08 18:43:47 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.332 2006/11/08 19:11:54 alc Exp $"); #include #include @@ -320,6 +320,12 @@ phys_avail[biggestone + 1] = new_end; /* + * Clear all of the page structures + */ + bzero((caddr_t) vm_page_array, page_range * sizeof(struct vm_page)); + vm_page_array_size = page_range; + + /* * This assertion tests the hypothesis that npages and total are * redundant. XXX */ @@ -330,12 +336,6 @@ ("vm_page_startup: inconsistent page counts")); /* - * Clear all of the page structures - */ - bzero((caddr_t) vm_page_array, page_range * sizeof(struct vm_page)); - vm_page_array_size = page_range; - - /* * Construct the free queue(s) in descending order (by physical * address) so that the first 16MB of physical memory is allocated * last rather than first. On large-memory machines, this avoids From owner-p4-projects@FreeBSD.ORG Wed Nov 8 19:51:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC5A616A417; Wed, 8 Nov 2006 19:51:07 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A715616A40F for ; Wed, 8 Nov 2006 19:51:07 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 367E243D6A for ; Wed, 8 Nov 2006 19:51:04 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA8Jp4HB054246 for ; Wed, 8 Nov 2006 19:51:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA8Jp3KE054238 for perforce@freebsd.org; Wed, 8 Nov 2006 19:51:03 GMT (envelope-from sam@freebsd.org) Date: Wed, 8 Nov 2006 19:51:03 GMT Message-Id: <200611081951.kA8Jp3KE054238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109547 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 19:51:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=109547 Change 109547 by sam@sam_ebb on 2006/11/08 19:50:09 o fix teardown_intr to handle multiple irqs o change setup_intr to work like teardown--compute the mask of irqs and touch intr_enabled only once Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#16 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#16 (text+ko) ==== @@ -301,6 +301,7 @@ struct resource *ires, int flags, driver_intr_t *intr, void *arg, void **cookiep) { + uint32_t mask; int i; if (flags & INTR_TYPE_TTY) { @@ -313,8 +314,11 @@ } BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, cookiep); + + mask = 0; for (i = rman_get_start(ires); i <= rman_get_end(ires); i++) - intr_enabled |= 1 << i; + mask |= 1 << i; + intr_enabled |= mask; ixp425_set_intrmask(); return (0); @@ -324,9 +328,15 @@ ixp425_teardown_intr(device_t dev, device_t child, struct resource *res, void *cookie) { + uint32_t mask; + int i; - intr_enabled &= ~ 1 << rman_get_start(res); + mask = 0; + for (i = rman_get_start(res); i <= rman_get_end(res); i++) + mask |= 1 << i; + intr_enabled &= ~mask; ixp425_set_intrmask(); + return (BUS_TEARDOWN_INTR(device_get_parent(dev), child, res, cookie)); } From owner-p4-projects@FreeBSD.ORG Wed Nov 8 22:34:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4D7B16A4AB; Wed, 8 Nov 2006 22:34:22 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 90DE016A40F for ; Wed, 8 Nov 2006 22:34:22 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CAF7A43D93 for ; Wed, 8 Nov 2006 22:34:00 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA8MXxOQ093317 for ; Wed, 8 Nov 2006 22:33:59 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA8MXxEt093314 for perforce@freebsd.org; Wed, 8 Nov 2006 22:33:59 GMT (envelope-from imp@freebsd.org) Date: Wed, 8 Nov 2006 22:33:59 GMT Message-Id: <200611082233.kA8MXxEt093314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109565 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 22:34:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=109565 Change 109565 by imp@imp_lighthouse on 2006/11/08 22:33:02 BOOT_TSC OBE HERE Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#3 (text+ko) ==== @@ -115,8 +115,6 @@ SPI_InitFlash(); fpga_load(); #endif -#ifdef BOOT_TSC EEInit(); MacFromEE(); -#endif } From owner-p4-projects@FreeBSD.ORG Wed Nov 8 22:40:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95E7D16A415; Wed, 8 Nov 2006 22:40:08 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 71D7316A403 for ; Wed, 8 Nov 2006 22:40:08 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABB7843D69 for ; Wed, 8 Nov 2006 22:40:07 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA8Me7nu093523 for ; Wed, 8 Nov 2006 22:40:07 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA8Me7Pe093519 for perforce@freebsd.org; Wed, 8 Nov 2006 22:40:07 GMT (envelope-from imp@freebsd.org) Date: Wed, 8 Nov 2006 22:40:07 GMT Message-Id: <200611082240.kA8Me7Pe093519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109566 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 22:40:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=109566 Change 109566 by imp@imp_lighthouse on 2006/11/08 22:39:47 Copy Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/arm_init.S#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Nov 8 23:02:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64DB716A4EE; Wed, 8 Nov 2006 23:02:39 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A00F516A4D1 for ; Wed, 8 Nov 2006 23:02:38 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 546F243D97 for ; Wed, 8 Nov 2006 23:01:46 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA8N1beY097308 for ; Wed, 8 Nov 2006 23:01:37 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA8N1bNG097305 for perforce@freebsd.org; Wed, 8 Nov 2006 23:01:37 GMT (envelope-from cognet@freebsd.org) Date: Wed, 8 Nov 2006 23:01:37 GMT Message-Id: <200611082301.kA8N1bNG097305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 109570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2006 23:02:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=109570 Change 109570 by cognet@cognet on 2006/11/08 23:01:25 Spell reg "reg", not "val", or funny things happen and the GPIO gets really upset :-) Pointy hat to: kevlo Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 (text+ko) ==== @@ -149,11 +149,11 @@ reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPOER); if (val) - val |= GPIO_I2C_SDA_BIT; + reg |= GPIO_I2C_SDA_BIT; else - val &= ~GPIO_I2C_SDA_BIT; + reg &= ~GPIO_I2C_SDA_BIT; - GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOER, val); + GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOER, reg); DELAY(I2C_DELAY); } @@ -170,11 +170,11 @@ reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPOER); if (val) - val |= GPIO_I2C_SCL_BIT; + reg |= GPIO_I2C_SCL_BIT; else - val &= ~GPIO_I2C_SCL_BIT; + reg &= ~GPIO_I2C_SCL_BIT; - GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOER, val); + GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOER, reg); DELAY(I2C_DELAY); } From owner-p4-projects@FreeBSD.ORG Thu Nov 9 00:30:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E0DE16A412; Thu, 9 Nov 2006 00:30:39 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7799D16A407 for ; Thu, 9 Nov 2006 00:30:39 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA20143D73 for ; Thu, 9 Nov 2006 00:30:32 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA90UWjg013850 for ; Thu, 9 Nov 2006 00:30:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA90UWid013847 for perforce@freebsd.org; Thu, 9 Nov 2006 00:30:32 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Nov 2006 00:30:32 GMT Message-Id: <200611090030.kA90UWid013847@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 00:30:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=109573 Change 109573 by imp@imp_lighthouse on 2006/11/09 00:30:13 More anal about the warnings/errors Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#25 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#25 (text+ko) ==== @@ -16,9 +16,9 @@ -Wall -Waggregate-return \ -Wnested-externs \ -Wpointer-arith -Wshadow -Wwrite-strings \ - -Werror -# -Wmissing-prototypes -# -Wmissing-declarations + -Werror \ + -Wmissing-prototypes \ + -Wmissing-declarations # -Wstrict-prototypes CFLAGS+=-DBOOT_${BOOT_FLAVOR:U} From owner-p4-projects@FreeBSD.ORG Thu Nov 9 00:40:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B93A16A415; Thu, 9 Nov 2006 00:40:47 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 356F216A40F for ; Thu, 9 Nov 2006 00:40:47 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F226D43D53 for ; Thu, 9 Nov 2006 00:40:46 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA90eke9015453 for ; Thu, 9 Nov 2006 00:40:46 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA90ek9s015450 for perforce@freebsd.org; Thu, 9 Nov 2006 00:40:46 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Nov 2006 00:40:46 GMT Message-Id: <200611090040.kA90ek9s015450@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109576 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 00:40:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=109576 Change 109576 by imp@imp_lighthouse on 2006/11/09 00:39:48 Merge mci_device.c into sd-card.c. There wasn't much benefit from having them separate. Remove a few layers of indirection, simplify interfaces, etc. This saves about 650 bytes to boot! Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#20 delete .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.h#11 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#13 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.h#11 (text+ko) ==== @@ -83,43 +83,19 @@ // MMC & SDCard Structures /////////////////////////////////////////////////////////////////////////////// -/*-----------------------------------------------*/ -/* SDCard Device Descriptor Structure Definition */ -/*-----------------------------------------------*/ -typedef struct _AT91S_MciDeviceDesc -{ - volatile unsigned char state; - unsigned char SDCard_bus_width; - -} AT91S_MciDeviceDesc, *AT91PS_MciDeviceDesc; - /*---------------------------------------------*/ -/* MMC & SDCard Structure Device Features */ -/*---------------------------------------------*/ -typedef struct _AT91S_MciDeviceFeatures -{ - unsigned char Card_Inserted; // (0=AT91C_CARD_REMOVED) (1=AT91C_MMC_CARD_INSERTED) (2=AT91C_SD_CARD_INSERTED) - unsigned int Relative_Card_Address; // RCA - unsigned int READ_BL_LEN; - unsigned int WRITE_BL_LEN; - unsigned char Read_Partial; // READ_BL_PARTIAL - unsigned char Write_Partial; // WRITE_BL_PARTIAL - unsigned char Erase_Block_Enable; // ERASE_BLK_EN - unsigned char Read_Block_Misalignment; // READ_BLK_MISALIGN - unsigned char Write_Block_Misalignment; // WRITE_BLK_MISALIGN - unsigned char Sector_Size; // SECTOR_SIZE - unsigned int Memory_Capacity; // Size in bits of the device - -} AT91S_MciDeviceFeatures, *AT91PS_MciDeviceFeatures ; - -/*---------------------------------------------*/ /* MCI Device Structure Definition */ /*---------------------------------------------*/ typedef struct _AT91S_MciDevice { - AT91PS_MciDeviceDesc pMCI_DeviceDesc; // MCI device descriptor - AT91PS_MciDeviceFeatures pMCI_DeviceFeatures;// Pointer on a MCI device features array -} AT91S_MciDevice, *AT91PS_MciDevice; + volatile unsigned char state; + unsigned char SDCard_bus_width; + unsigned int RCA; // RCA + unsigned int READ_BL_LEN; +#ifdef REPORT_SIZE + unsigned int Memory_Capacity; +#endif +} AT91S_MciDevice; #include @@ -450,15 +426,4 @@ #define CSD_0_STRUCT_M 0x03 /////////////////////////////////////////////////////////////////////////////// - -void AT91F_MCI_Device_Handler(AT91PS_MciDevice,unsigned int); -AT91S_MCIDeviceStatus AT91F_MCI_SDCard_Init (AT91PS_MciDevice); -AT91S_MCIDeviceStatus AT91F_MCI_SetBlocklength(unsigned int); -AT91S_MCIDeviceStatus AT91F_MCI_ReadBlock(AT91PS_MciDevice,int,unsigned int *,int); -AT91S_MCIDeviceStatus AT91F_MCI_WriteBlock(AT91PS_MciDevice,int,unsigned int *,int); -#if 0 -AT91S_MCIDeviceStatus AT91F_MCI_MMC_Init (AT91PS_MciDevice pMCI_Device); -AT91S_MCIDeviceStatus AT91F_MCI_MMC_SelectCard(AT91PS_MciDevice pMCI_Device, unsigned int relative_card_address); -#endif - #endif ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#13 (text+ko) ==== @@ -51,13 +51,7 @@ #define BUFFER_SIZE_MCI_DEVICE 512 #define MASTER_CLOCK 60000000 -//Private functions -//static void initInts(void); -static void AT91F_MCI_Handler(void); - //* Global Variables -AT91S_MciDeviceFeatures MCI_Device_Features; -AT91S_MciDeviceDesc MCI_Device_Desc; AT91S_MciDevice MCI_Device; char Buffer[BUFFER_SIZE_MCI_DEVICE]; @@ -83,56 +77,126 @@ } while( !(status & AT91C_MCI_NOTBUSY) && (timeout>0) ); - AT91F_MCI_Handler(); + status = AT91C_BASE_MCI->MCI_SR; + + // If End of Tx Buffer Empty interrupt occurred + if (MCI_Device.state == AT91C_MCI_TX_SINGLE_BLOCK && status & AT91C_MCI_TXBUFE) { + AT91C_BASE_MCI->MCI_IDR = AT91C_MCI_TXBUFE; + AT91C_BASE_PDC_MCI->PDC_PTCR = AT91C_PDC_TXTDIS; + MCI_Device.state = AT91C_MCI_IDLE; + } // End of if AT91C_MCI_TXBUFF + + // If End of Rx Buffer Full interrupt occurred + if (MCI_Device.state == AT91C_MCI_RX_SINGLE_BLOCK && status & AT91C_MCI_RXBUFF) { + AT91C_BASE_MCI->MCI_IDR = AT91C_MCI_RXBUFF; + AT91C_BASE_PDC_MCI->PDC_PTCR = AT91C_PDC_RXTDIS; + MCI_Device.state = AT91C_MCI_IDLE; + } // End of if AT91C_MCI_RXBUFF +} + +inline static unsigned int +swap(unsigned int a) +{ + return (((a & 0xff) << 24) | ((a & 0xff00) << 8) | ((a & 0xff0000) >> 8) + | ((a & 0xff000000) >> 24)); } -#if 0 -int -MCI_write (unsigned dest, char* source, unsigned length) +inline static void +wait_ready() { - unsigned sectorLength = 1 << MCI_Device.pMCI_DeviceFeatures->WRITE_BL_LEN; - unsigned offset = dest % sectorLength; - AT91S_MCIDeviceStatus status; - int sizeToWrite; + int status; - //As long as there is data to write - while (length) + // wait for CMDRDY Status flag to read the response + do { - //See if we've got at least a sector to write - if (length > sectorLength) - sizeToWrite = sectorLength; - //Else just write the remainder - else - sizeToWrite = length; + status = AT91C_BASE_MCI->MCI_SR; + } while( !(status & AT91C_MCI_CMDRDY) ); +} + +//*---------------------------------------------------------------------------- +//* \fn AT91F_MCI_SendCommand +//* \brief Generic function to send a command to the MMC or SDCard +//*---------------------------------------------------------------------------- +static int +AT91F_MCI_SendCommand( + unsigned int Cmd, + unsigned int Arg) +{ + unsigned int error; - AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); - //Do the writing - status = AT91F_MCI_WriteBlock(&MCI_Device, dest, (unsigned int*)source, sizeToWrite); - //TODO:Status checking + AT91C_BASE_MCI->MCI_ARGR = Arg; + AT91C_BASE_MCI->MCI_CMDR = Cmd; - //Update counters & pointers - length -= sizeToWrite; - dest += sizeToWrite; - source += sizeToWrite; +// printf("CMDR %x ARG %x\n", Cmd, Arg); + wait_ready(); + // Test error ==> if crc error and response R3 ==> don't check error + error = (AT91C_BASE_MCI->MCI_SR) & AT91C_MCI_SR_ERROR; + if (error != 0) { + if (error != AT91C_MCI_RCRCE) + return (1); } + return 0; +} - return 0; +//*---------------------------------------------------------------------------- +//* \fn AT91F_MCI_GetStatus +//* \brief Addressed card sends its status register +//*---------------------------------------------------------------------------- +static unsigned int +AT91F_MCI_GetStatus() +{ + if (AT91F_MCI_SendCommand(SEND_STATUS_CMD, MCI_Device.RCA << 16)) + return AT91C_CMD_SEND_ERROR; + return (AT91C_BASE_MCI->MCI_RSPR[0]); } -#endif -inline static unsigned int -swap(unsigned int a) +//*---------------------------------------------------------------------------- +//* \fn AT91F_MCI_ReadBlock +//* \brief Read an ENTIRE block or PARTIAL block +//*---------------------------------------------------------------------------- +static int +AT91F_MCI_ReadBlock(int src, unsigned int *dataBuffer, int sizeToRead) { - return (((a & 0xff) << 24) | ((a & 0xff00) << 8) | ((a & 0xff0000) >> 8) - | ((a & 0xff000000) >> 24)); + unsigned log2sl = MCI_Device.READ_BL_LEN; + unsigned sectorLength = 1 << log2sl; + + /////////////////////////////////////////////////////////////////////// + if (MCI_Device.state != AT91C_MCI_IDLE) + return 1; + + if ((AT91F_MCI_GetStatus() & AT91C_SR_READY_FOR_DATA) == 0) + return 1; + + /////////////////////////////////////////////////////////////////////// + + // Init Mode Register + AT91C_BASE_MCI->MCI_MR |= ((sectorLength << 16) | AT91C_MCI_PDCMODE); + + sizeToRead = sizeToRead / 4; + + AT91C_BASE_PDC_MCI->PDC_PTCR = (AT91C_PDC_TXTDIS | AT91C_PDC_RXTDIS); + AT91C_BASE_PDC_MCI->PDC_RPR = (unsigned int)dataBuffer; + AT91C_BASE_PDC_MCI->PDC_RCR = sizeToRead; + + // Send the Read single block command + if (AT91F_MCI_SendCommand(READ_SINGLE_BLOCK_CMD, src)) + return AT91C_READ_ERROR; + MCI_Device.state = AT91C_MCI_RX_SINGLE_BLOCK; + + // Enable AT91C_MCI_RXBUFF Interrupt + AT91C_BASE_MCI->MCI_IER = AT91C_MCI_RXBUFF; + + // (PDC) Receiver Transfer Enable + AT91C_BASE_PDC_MCI->PDC_PTCR = AT91C_PDC_RXTEN; + + return 0; } int MCI_read(char* dest, unsigned source, unsigned length) { - unsigned log2sl = MCI_Device.pMCI_DeviceFeatures->READ_BL_LEN; + unsigned log2sl = MCI_Device.READ_BL_LEN; unsigned sectorLength = 1 << log2sl; - AT91S_MCIDeviceStatus status; int sizeToRead; unsigned int *walker; @@ -146,11 +210,8 @@ AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); //Do the reading - status = AT91F_MCI_ReadBlock(&MCI_Device, source, - (unsigned int*)dest, sizeToRead); - - //TODO:Status checking - if (status != AT91C_READ_OK) + if (AT91F_MCI_ReadBlock(source, + (unsigned int*)dest, sizeToRead)) return -1; //* Wait MCI Device Ready @@ -179,29 +240,122 @@ { // Init Device Structure - MCI_Device_Features.Relative_Card_Address = 0; - MCI_Device_Features.Card_Inserted = AT91C_SD_CARD_INSERTED; - MCI_Device_Features.READ_BL_LEN = 0; - MCI_Device_Features.WRITE_BL_LEN = 0; - MCI_Device_Features.Read_Partial = 0; - MCI_Device_Features.Write_Partial = 0; - MCI_Device_Features.Erase_Block_Enable = 0; - MCI_Device_Features.Sector_Size = 0; - MCI_Device_Features.Memory_Capacity = 0; - MCI_Device_Desc.state = AT91C_MCI_IDLE; - MCI_Device_Desc.SDCard_bus_width = AT91C_MCI_SCDBUS; - MCI_Device.pMCI_DeviceDesc = &MCI_Device_Desc; - MCI_Device.pMCI_DeviceFeatures = &MCI_Device_Features; + MCI_Device.RCA = 0; + MCI_Device.READ_BL_LEN = 0; +#ifdef REPORT_SIZE + MCI_Device.Memory_Capacity = 0; +#endif + MCI_Device.state = AT91C_MCI_IDLE; + MCI_Device.SDCard_bus_width = AT91C_MCI_SCDBUS; +} + +//*---------------------------------------------------------------------------- +//* \fn AT91F_MCI_SDCard_SendAppCommand +//* \brief Specific function to send a specific command to the SDCard +//*---------------------------------------------------------------------------- +static int +AT91F_MCI_SDCard_SendAppCommand( + unsigned int Cmd_App, + unsigned int Arg) +{ + // Send the CMD55 for application specific command + AT91C_BASE_MCI->MCI_ARGR = (MCI_Device.RCA << 16 ); + AT91C_BASE_MCI->MCI_CMDR = APP_CMD; + + wait_ready(); + // if an error occurs + if (AT91C_BASE_MCI->MCI_SR & AT91C_MCI_SR_ERROR) + return (1); + return (AT91F_MCI_SendCommand(Cmd_App,Arg)); +} + +//*---------------------------------------------------------------------------- +//* \fn AT91F_MCI_GetCSD +//* \brief Asks to the specified card to send its CSD +//*---------------------------------------------------------------------------- +static int +AT91F_MCI_GetCSD(unsigned int rca, unsigned int *response) +{ + + if (AT91F_MCI_SendCommand(SEND_CSD_CMD, (rca << 16))) + return 1; + + response[0] = AT91C_BASE_MCI->MCI_RSPR[0]; + response[1] = AT91C_BASE_MCI->MCI_RSPR[1]; + response[2] = AT91C_BASE_MCI->MCI_RSPR[2]; + response[3] = AT91C_BASE_MCI->MCI_RSPR[3]; + + return 0; +} + +//*---------------------------------------------------------------------------- +//* \fn AT91F_MCI_SDCard_GetOCR +//* \brief Asks to all cards to send their operations conditions +//*---------------------------------------------------------------------------- +static int +AT91F_MCI_SDCard_GetOCR() +{ + unsigned int response=0x0; + + // The RCA to be used for CMD55 in Idle state shall be the card's default RCA=0x0000. + MCI_Device.RCA = 0x0; + + while( (response & AT91C_CARD_POWER_UP_BUSY) != AT91C_CARD_POWER_UP_BUSY ) { + if (AT91F_MCI_SDCard_SendAppCommand(SDCARD_APP_OP_COND_CMD, + AT91C_MMC_HOST_VOLTAGE_RANGE)) + return 1; + response = AT91C_BASE_MCI->MCI_RSPR[0]; + } + return (0); +} + +//*---------------------------------------------------------------------------- +//* \fn AT91F_MCI_SDCard_GetCID +//* \brief Asks to the SDCard on the chosen slot to send its CID +//*---------------------------------------------------------------------------- +static int +AT91F_MCI_SDCard_GetCID(unsigned int *response) +{ + if (AT91F_MCI_SendCommand(ALL_SEND_CID_CMD, AT91C_NO_ARGUMENT)) + return 1; + + response[0] = AT91C_BASE_MCI->MCI_RSPR[0]; + response[1] = AT91C_BASE_MCI->MCI_RSPR[1]; + response[2] = AT91C_BASE_MCI->MCI_RSPR[2]; + response[3] = AT91C_BASE_MCI->MCI_RSPR[3]; + + return 0; } -static void AT91F_MCI_Handler(void) +//*---------------------------------------------------------------------------- +//* \fn AT91F_MCI_SDCard_SetBusWidth +//* \brief Set bus width for SDCard +//*---------------------------------------------------------------------------- +static int +AT91F_MCI_SDCard_SetBusWidth() { - int status; + volatile int ret_value; + char bus_width; + + do { + ret_value=AT91F_MCI_GetStatus(); + } + while((ret_value > 0) && ((ret_value & AT91C_SR_READY_FOR_DATA) == 0)); + + // Select Card + AT91F_MCI_SendCommand(SEL_DESEL_CARD_CMD, (MCI_Device.RCA)<<16); + + // Set bus width for Sdcard + if (MCI_Device.SDCard_bus_width == AT91C_MCI_SCDBUS) + bus_width = AT91C_BUS_WIDTH_4BITS; + else + bus_width = AT91C_BUS_WIDTH_1BIT; -// status = ( AT91C_BASE_MCI->MCI_SR & AT91C_BASE_MCI->MCI_IMR ); - status = AT91C_BASE_MCI->MCI_SR; + if (AT91F_MCI_SDCard_SendAppCommand( + SDCARD_SET_BUS_WIDTH_CMD,bus_width) != AT91C_CMD_SEND_OK) + return 1; - AT91F_MCI_Device_Handler(&MCI_Device, status); + return 0; } //*---------------------------------------------------------------------------- @@ -211,12 +365,12 @@ int sdcard_init(void) { -/////////////////////////////////////////////////////////////////////////////// -// MCI Init : common to MMC and SDCard -/////////////////////////////////////////////////////////////////////////////// + unsigned int tab_response[4]; +#ifdef REPORT_SIZE + unsigned int mult,blocknr; +#endif + int i; - //initInts(); - // Init MCI for MMC and SDCard interface AT91F_MCI_CfgPIO(); AT91F_MCI_CfgPMC(); @@ -229,8 +383,43 @@ AT91C_MCI_DTOR_1MEGA_CYCLES, AT91C_MCI_PDCMODE, AT91C_MCI_SDCARD_4BITS_SLOTA); - - if (AT91F_MCI_SDCard_Init(&MCI_Device) != AT91C_INIT_OK) + AT91F_MCI_SendCommand(GO_IDLE_STATE_CMD, AT91C_NO_ARGUMENT); + + for (i = 0; i < 100; i++) { + if (!AT91F_MCI_SDCard_GetOCR(&MCI_Device)) + break; + printf("."); + } + if (i >= 100) + return 0; + if (AT91F_MCI_SDCard_GetCID(tab_response)) + return 0; + if (AT91F_MCI_SendCommand(SET_RELATIVE_ADDR_CMD, 0)) + return 0; + + MCI_Device.RCA = (AT91C_BASE_MCI->MCI_RSPR[0] >> 16); + if (AT91F_MCI_GetCSD(MCI_Device.RCA,tab_response)) + return 0; + MCI_Device.READ_BL_LEN = (tab_response[1] >> CSD_1_RD_B_LEN_S) & + CSD_1_RD_B_LEN_M; +#ifdef REPORT_SIZE + // compute MULT + mult = 1 << ( ((tab_response[2] >> CSD_2_C_SIZE_M_S) & + CSD_2_C_SIZE_M_M) + 2 ); + // compute MSB of C_SIZE + blocknr = ((tab_response[1] >> CSD_1_CSIZE_H_S) & + CSD_1_CSIZE_H_M) << 2; + // compute MULT * (LSB of C-SIZE + MSB already computed + 1) = BLOCKNR + blocknr = mult * ((blocknr + ((tab_response[2] >> CSD_2_CSIZE_L_S) & + CSD_2_CSIZE_L_M)) + 1); + MCI_Device.Memory_Capacity = (1 << MCI_Device.READ_BL_LEN) * blocknr; +#endif + if (AT91F_MCI_SDCard_SetBusWidth()) + return 0; + if (AT91F_MCI_SendCommand(SET_BLOCKLEN_CMD, 1 << MCI_Device.READ_BL_LEN)) return 0; +#ifdef REPORT_SIZE + printf("Found SD card %u bytes\n", MCI_Device.Memory_Capacity); +#endif return 1; } From owner-p4-projects@FreeBSD.ORG Thu Nov 9 00:40:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFA0916A52F; Thu, 9 Nov 2006 00:40:47 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 841EF16A403 for ; Thu, 9 Nov 2006 00:40:47 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 513ED43D53 for ; Thu, 9 Nov 2006 00:40:47 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA90elLV015460 for ; Thu, 9 Nov 2006 00:40:47 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA90ells015456 for perforce@freebsd.org; Thu, 9 Nov 2006 00:40:47 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Nov 2006 00:40:47 GMT Message-Id: <200611090040.kA90ells015456@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109577 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 00:40:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=109577 Change 109577 by imp@imp_lighthouse on 2006/11/09 00:40:26 You can't delete a file and still keep it in the makefile. Doh! Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#24 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#24 (text+ko) ==== @@ -6,7 +6,7 @@ INTERNALLIB= SRCS=at91rm9200_lowlevel.c delay.c eeprom.c emac.c emac_init.c fpga.c getc.c \ putchar.c printf.c reset.c spi_flash.c xmodem.c \ - sd-card.c mci_device.c strcvt.c strlen.c strcmp.c memcpy.c strcpy.c \ + sd-card.c strcvt.c strlen.c strcmp.c memcpy.c strcpy.c \ memset.c memcmp.c SRCS+=ashldi3.c divsi3.S NO_MAN= From owner-p4-projects@FreeBSD.ORG Thu Nov 9 00:41:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D84216A40F; Thu, 9 Nov 2006 00:41:49 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5C45916A403 for ; Thu, 9 Nov 2006 00:41:49 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C50143D62 for ; Thu, 9 Nov 2006 00:41:49 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA90fnCR016147 for ; Thu, 9 Nov 2006 00:41:49 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA90fmon016144 for perforce@freebsd.org; Thu, 9 Nov 2006 00:41:48 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Nov 2006 00:41:48 GMT Message-Id: <200611090041.kA90fmon016144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109578 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 00:41:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=109578 Change 109578 by imp@imp_lighthouse on 2006/11/09 00:41:03 Blinkin-lights for the KB920x Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#13 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#13 (text) ==== @@ -61,6 +61,16 @@ AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC10; #endif +#ifdef BOOT_KB920X + AT91C_BASE_PIOC->PIO_PER = AT91C_PIO_PC18 | AT91C_PIO_PC19 | + AT91C_PIO_PC20; + AT91C_BASE_PIOC->PIO_OER = AT91C_PIO_PC18 | AT91C_PIO_PC19 | + AT91C_PIO_PC20; + AT91C_BASE_PIOC->PIO_SODR = AT91C_PIO_PC18 | AT91C_PIO_PC19 | + AT91C_PIO_PC20; + AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC18; +#endif + // configure clocks // assume: // main osc = 10Mhz From owner-p4-projects@FreeBSD.ORG Thu Nov 9 00:41:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A6FF16A576; Thu, 9 Nov 2006 00:41:50 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 688AA16A412 for ; Thu, 9 Nov 2006 00:41:50 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C379B43D62 for ; Thu, 9 Nov 2006 00:41:49 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA90fnwS016160 for ; Thu, 9 Nov 2006 00:41:49 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA90fn6Z016157 for perforce@freebsd.org; Thu, 9 Nov 2006 00:41:49 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Nov 2006 00:41:49 GMT Message-Id: <200611090041.kA90fn6Z016157@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109580 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 00:41:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=109580 Change 109580 by imp@imp_lighthouse on 2006/11/09 00:41:31 Complete merge Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/arm_init.S#7 delete .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#12 delete .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/arm_init.S#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/arm_init.S#2 (text+ko) ==== @@ -23,6 +23,7 @@ * $FreeBSD: src/sys/boot/arm/at91/bootspi/arm_init.S,v 1.3 2006/10/21 22:44:26 imp Exp $ ******************************************************************************/ + .equ TWI_EEPROM_SIZE, 0x2000 .equ ARM_MODE_USER, 0x10 .equ ARM_MODE_FIQ, 0x11 .equ ARM_MODE_IRQ, 0x12 @@ -60,7 +61,7 @@ B dabtvec @; Data Abort rsvdvec: #ifdef BOOT_IIC - .long 12 << 10 @; 12k from iic part + .long (TWI_EEPROM_SIZE >> 9) #else .long ((1056 << 17) | (13 << 13) | (12 * 2)) #endif @@ -99,3 +100,30 @@ infiniteLoop: b infiniteLoop + +/* the following section is used to store boot commands in */ +/* non-volatile memory. */ + + .global BootCommandSection +BootCommandSection: +#ifdef SUPPORT_LINUX + .string "Bootloader for KB9202 Evaluation Board." + .string "c 0x20210000 0x10100000 0x80000 " + .string "m 0 0 0 0 0 0 " + .string "t 0x20000100 console=ttyS0,115200 root=/dev/ram rw initrd=0x20210000,654933" + .string "e 0x10000000 " + .string " " +#else +#if 1 + .string "m 42 53 44 0 0 1" + .string "ip 206 168 13 194" + .string "server_ip 206 168 13 207" + .string "tftp 0x20000000 kernel.bin" + .string "e 0x20000000" +#else + .string "m 42 53 44 0 0 1" + .string "k 0x20000000" + .string "e 0x20000000" +#endif + .word 0 +#endif From owner-p4-projects@FreeBSD.ORG Thu Nov 9 00:42:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D68816A415; Thu, 9 Nov 2006 00:42:52 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2096D16A407 for ; Thu, 9 Nov 2006 00:42:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E265B43D45 for ; Thu, 9 Nov 2006 00:42:51 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA90gpFH016511 for ; Thu, 9 Nov 2006 00:42:51 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA90gpr1016507 for perforce@freebsd.org; Thu, 9 Nov 2006 00:42:51 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Nov 2006 00:42:51 GMT Message-Id: <200611090042.kA90gpr1016507@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109581 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 00:42:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=109581 Change 109581 by imp@imp_lighthouse on 2006/11/09 00:42:30 Ooops, finish cleanup for arm_init.S merge Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#16 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/table.S#2 delete Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#16 (text+ko) ==== @@ -1,8 +1,10 @@ # $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.4 2006/10/21 22:51:21 imp Exp $ +.PATH: ${.CURDIR}/../libat91 + P=bootspi FILES=${P} -SRCS=arm_init.S main.c loader_prompt.c env_vars.c ee.c table.S +SRCS=arm_init.S main.c loader_prompt.c env_vars.c ee.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} From owner-p4-projects@FreeBSD.ORG Thu Nov 9 00:43:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53EE316A415; Thu, 9 Nov 2006 00:43:54 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 19EE916A40F for ; Thu, 9 Nov 2006 00:43:54 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C348343D49 for ; Thu, 9 Nov 2006 00:43:53 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA90hrED016839 for ; Thu, 9 Nov 2006 00:43:53 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA90hrk4016836 for perforce@freebsd.org; Thu, 9 Nov 2006 00:43:53 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Nov 2006 00:43:53 GMT Message-Id: <200611090043.kA90hrk4016836@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109582 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 00:43:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=109582 Change 109582 by imp@imp_lighthouse on 2006/11/09 00:43:09 Makefile goo for arm_init.S cleanup Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#18 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#18 (text+ko) ==== @@ -1,5 +1,7 @@ # $FreeBSD: src/sys/boot/arm/at91/bootiic/Makefile,v 1.3 2006/08/10 19:55:52 imp Exp $ +.PATH: ${.CURDIR}/../libat91 + P=bootiic FILES=${P} SRCS=arm_init.S main.c loader_prompt.c env_vars.c @@ -8,3 +10,5 @@ OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .include + +CFLAGS += -DBOOT_IIC From owner-p4-projects@FreeBSD.ORG Thu Nov 9 00:44:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3ADD16A4ED; Thu, 9 Nov 2006 00:44:56 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9F90916A407 for ; Thu, 9 Nov 2006 00:44:56 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D46343D53 for ; Thu, 9 Nov 2006 00:44:56 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA90iufh016881 for ; Thu, 9 Nov 2006 00:44:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA90iuF9016878 for perforce@freebsd.org; Thu, 9 Nov 2006 00:44:56 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Nov 2006 00:44:56 GMT Message-Id: <200611090044.kA90iuF9016878@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109584 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 00:44:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=109584 Change 109584 by imp@imp_lighthouse on 2006/11/09 00:44:21 Touch the right eeprom for the KB920x boards Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/kb920x_board.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/kb920x_board.c#3 (text+ko) ==== @@ -5,7 +5,6 @@ #include "emac.h" #include "lib.h" -#include "ee.h" #include "board.h" extern unsigned char mac[]; @@ -15,10 +14,10 @@ { uint32_t sig; sig = 0; - EERead(12 * 1024, (uint8_t *)&sig, sizeof(sig)); + ReadEEPROM(12 * 1024, (uint8_t *)&sig, sizeof(sig)); if (sig != 0xaa55aa55) return; - EERead(12 * 1024 + 4, mac, 6); + ReadEEPROM(12 * 1024 + 4, mac, 6); printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); } @@ -31,6 +30,6 @@ void board_init(void) { - EEInit(); + InitEEPROM(); MacFromEE(); } From owner-p4-projects@FreeBSD.ORG Thu Nov 9 00:45:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3289616A415; Thu, 9 Nov 2006 00:45:59 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9A2C316A40F for ; Thu, 9 Nov 2006 00:45:58 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B04F43D58 for ; Thu, 9 Nov 2006 00:45:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA90jwp7017018 for ; Thu, 9 Nov 2006 00:45:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA90jvVV017015 for perforce@freebsd.org; Thu, 9 Nov 2006 00:45:57 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Nov 2006 00:45:57 GMT Message-Id: <200611090045.kA90jvVV017015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 00:45:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=109585 Change 109585 by imp@imp_lighthouse on 2006/11/09 00:45:36 Finish making this work for either TSC's board or the kb920x. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#9 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#26 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#9 (text+ko) ==== @@ -1,16 +1,22 @@ # $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.1 2006/04/19 17:16:48 imp Exp $ -.PATH: ${.CURDIR}/../bootspi +.PATH: ${.CURDIR}/../libat91 P=boot2 FILES=${P} -SRCS=arm_init.S boot2.c ${BOOT_FLAVOR}_board.c ee.c +SRCS=arm_init.S boot2.c ${BOOT_FLAVOR}_board.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .include +.if ${BOOT_FLAVOR} == "tsc" +SRCS+=ee.c +.endif +.if ${BOOT_FLAVOR} == "kb920x" +CFLAGS+=-DBOOT_IIC +.endif CFLAGS+= \ -I${.CURDIR}/../bootspi \ -I${.CURDIR}/../../../common \ ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#26 (text+ko) ==== @@ -148,7 +148,6 @@ int autoboot, c = 0; ino_t ino; -printf("MAIN\n"); board_init(); EMAC_Init(); sdcard_init(); From owner-p4-projects@FreeBSD.ORG Thu Nov 9 01:02:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6FF516A416; Thu, 9 Nov 2006 01:02:21 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 981E116A415 for ; Thu, 9 Nov 2006 01:02:21 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEB3543D5D for ; Thu, 9 Nov 2006 01:02:20 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA912KY2027282 for ; Thu, 9 Nov 2006 01:02:20 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA912Kr2027279 for perforce@freebsd.org; Thu, 9 Nov 2006 01:02:20 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Nov 2006 01:02:20 GMT Message-Id: <200611090102.kA912Kr2027279@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 01:02:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=109586 Change 109586 by imp@imp_lighthouse on 2006/11/09 01:01:32 Style: no need for all that AT91F_ prefix junk. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#14 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#14 (text+ko) ==== @@ -62,11 +62,11 @@ #define MCI_UNSUPP_OFFSET_ERROR 6 //*---------------------------------------------------------------------------- -//* \fn AT91F_MCIDeviceWaitReady +//* \fn MCIDeviceWaitReady //* \brief Wait for MCI Device ready //*---------------------------------------------------------------------------- static void -AT91F_MCIDeviceWaitReady(unsigned int timeout) +MCIDeviceWaitReady(unsigned int timeout) { volatile int status; @@ -114,11 +114,11 @@ } //*---------------------------------------------------------------------------- -//* \fn AT91F_MCI_SendCommand +//* \fn MCI_SendCommand //* \brief Generic function to send a command to the MMC or SDCard //*---------------------------------------------------------------------------- static int -AT91F_MCI_SendCommand( +MCI_SendCommand( unsigned int Cmd, unsigned int Arg) { @@ -139,23 +139,23 @@ } //*---------------------------------------------------------------------------- -//* \fn AT91F_MCI_GetStatus +//* \fn MCI_GetStatus //* \brief Addressed card sends its status register //*---------------------------------------------------------------------------- static unsigned int -AT91F_MCI_GetStatus() +MCI_GetStatus() { - if (AT91F_MCI_SendCommand(SEND_STATUS_CMD, MCI_Device.RCA << 16)) + if (MCI_SendCommand(SEND_STATUS_CMD, MCI_Device.RCA << 16)) return AT91C_CMD_SEND_ERROR; return (AT91C_BASE_MCI->MCI_RSPR[0]); } //*---------------------------------------------------------------------------- -//* \fn AT91F_MCI_ReadBlock +//* \fn MCI_ReadBlock //* \brief Read an ENTIRE block or PARTIAL block //*---------------------------------------------------------------------------- static int -AT91F_MCI_ReadBlock(int src, unsigned int *dataBuffer, int sizeToRead) +MCI_ReadBlock(int src, unsigned int *dataBuffer, int sizeToRead) { unsigned log2sl = MCI_Device.READ_BL_LEN; unsigned sectorLength = 1 << log2sl; @@ -164,7 +164,7 @@ if (MCI_Device.state != AT91C_MCI_IDLE) return 1; - if ((AT91F_MCI_GetStatus() & AT91C_SR_READY_FOR_DATA) == 0) + if ((MCI_GetStatus() & AT91C_SR_READY_FOR_DATA) == 0) return 1; /////////////////////////////////////////////////////////////////////// @@ -179,7 +179,7 @@ AT91C_BASE_PDC_MCI->PDC_RCR = sizeToRead; // Send the Read single block command - if (AT91F_MCI_SendCommand(READ_SINGLE_BLOCK_CMD, src)) + if (MCI_SendCommand(READ_SINGLE_BLOCK_CMD, src)) return AT91C_READ_ERROR; MCI_Device.state = AT91C_MCI_RX_SINGLE_BLOCK; @@ -208,14 +208,14 @@ else sizeToRead = length; - AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); + MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); //Do the reading - if (AT91F_MCI_ReadBlock(source, + if (MCI_ReadBlock(source, (unsigned int*)dest, sizeToRead)) return -1; //* Wait MCI Device Ready - AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); + MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); // Fix erratum in MCI part for (walker = (unsigned int *)dest; @@ -231,30 +231,12 @@ return 0; } - //*---------------------------------------------------------------------------- -//* \fn AT91F_CfgDevice -//* \brief This function is used to initialise MMC or SDCard Features -//*---------------------------------------------------------------------------- -static void AT91F_CfgDevice(void) -{ - // Init Device Structure - - MCI_Device.RCA = 0; - MCI_Device.READ_BL_LEN = 0; -#ifdef REPORT_SIZE - MCI_Device.Memory_Capacity = 0; -#endif - MCI_Device.state = AT91C_MCI_IDLE; - MCI_Device.SDCard_bus_width = AT91C_MCI_SCDBUS; -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_MCI_SDCard_SendAppCommand +//* \fn MCI_SDCard_SendAppCommand //* \brief Specific function to send a specific command to the SDCard //*---------------------------------------------------------------------------- static int -AT91F_MCI_SDCard_SendAppCommand( +MCI_SDCard_SendAppCommand( unsigned int Cmd_App, unsigned int Arg) { @@ -266,18 +248,18 @@ // if an error occurs if (AT91C_BASE_MCI->MCI_SR & AT91C_MCI_SR_ERROR) return (1); - return (AT91F_MCI_SendCommand(Cmd_App,Arg)); + return (MCI_SendCommand(Cmd_App,Arg)); } //*---------------------------------------------------------------------------- -//* \fn AT91F_MCI_GetCSD +//* \fn MCI_GetCSD //* \brief Asks to the specified card to send its CSD //*---------------------------------------------------------------------------- static int -AT91F_MCI_GetCSD(unsigned int rca, unsigned int *response) +MCI_GetCSD(unsigned int rca, unsigned int *response) { - if (AT91F_MCI_SendCommand(SEND_CSD_CMD, (rca << 16))) + if (MCI_SendCommand(SEND_CSD_CMD, (rca << 16))) return 1; response[0] = AT91C_BASE_MCI->MCI_RSPR[0]; @@ -289,11 +271,11 @@ } //*---------------------------------------------------------------------------- -//* \fn AT91F_MCI_SDCard_GetOCR +//* \fn MCI_SDCard_GetOCR //* \brief Asks to all cards to send their operations conditions //*---------------------------------------------------------------------------- static int -AT91F_MCI_SDCard_GetOCR() +MCI_SDCard_GetOCR() { unsigned int response=0x0; @@ -301,7 +283,7 @@ MCI_Device.RCA = 0x0; while( (response & AT91C_CARD_POWER_UP_BUSY) != AT91C_CARD_POWER_UP_BUSY ) { - if (AT91F_MCI_SDCard_SendAppCommand(SDCARD_APP_OP_COND_CMD, + if (MCI_SDCard_SendAppCommand(SDCARD_APP_OP_COND_CMD, AT91C_MMC_HOST_VOLTAGE_RANGE)) return 1; response = AT91C_BASE_MCI->MCI_RSPR[0]; @@ -310,13 +292,13 @@ } //*---------------------------------------------------------------------------- -//* \fn AT91F_MCI_SDCard_GetCID +//* \fn MCI_SDCard_GetCID //* \brief Asks to the SDCard on the chosen slot to send its CID //*---------------------------------------------------------------------------- static int -AT91F_MCI_SDCard_GetCID(unsigned int *response) +MCI_SDCard_GetCID(unsigned int *response) { - if (AT91F_MCI_SendCommand(ALL_SEND_CID_CMD, AT91C_NO_ARGUMENT)) + if (MCI_SendCommand(ALL_SEND_CID_CMD, AT91C_NO_ARGUMENT)) return 1; response[0] = AT91C_BASE_MCI->MCI_RSPR[0]; @@ -328,22 +310,22 @@ } //*---------------------------------------------------------------------------- -//* \fn AT91F_MCI_SDCard_SetBusWidth +//* \fn MCI_SDCard_SetBusWidth //* \brief Set bus width for SDCard //*---------------------------------------------------------------------------- static int -AT91F_MCI_SDCard_SetBusWidth() +MCI_SDCard_SetBusWidth() { volatile int ret_value; char bus_width; do { - ret_value=AT91F_MCI_GetStatus(); + ret_value=MCI_GetStatus(); } while((ret_value > 0) && ((ret_value & AT91C_SR_READY_FOR_DATA) == 0)); // Select Card - AT91F_MCI_SendCommand(SEL_DESEL_CARD_CMD, (MCI_Device.RCA)<<16); + MCI_SendCommand(SEL_DESEL_CARD_CMD, (MCI_Device.RCA)<<16); // Set bus width for Sdcard if (MCI_Device.SDCard_bus_width == AT91C_MCI_SCDBUS) @@ -351,7 +333,7 @@ else bus_width = AT91C_BUS_WIDTH_1BIT; - if (AT91F_MCI_SDCard_SendAppCommand( + if (MCI_SDCard_SendAppCommand( SDCARD_SET_BUS_WIDTH_CMD,bus_width) != AT91C_CMD_SEND_OK) return 1; @@ -376,29 +358,30 @@ AT91F_MCI_CfgPMC(); AT91F_PDC_Open(AT91C_BASE_PDC_MCI); - // Init MCI Device Structures - AT91F_CfgDevice(); + // Init Device Structure + MCI_Device.state = AT91C_MCI_IDLE; + MCI_Device.SDCard_bus_width = AT91C_MCI_SCDBUS; AT91F_MCI_Configure(AT91C_BASE_MCI, AT91C_MCI_DTOR_1MEGA_CYCLES, AT91C_MCI_PDCMODE, AT91C_MCI_SDCARD_4BITS_SLOTA); - AT91F_MCI_SendCommand(GO_IDLE_STATE_CMD, AT91C_NO_ARGUMENT); + MCI_SendCommand(GO_IDLE_STATE_CMD, AT91C_NO_ARGUMENT); for (i = 0; i < 100; i++) { - if (!AT91F_MCI_SDCard_GetOCR(&MCI_Device)) + if (!MCI_SDCard_GetOCR(&MCI_Device)) break; printf("."); } if (i >= 100) return 0; - if (AT91F_MCI_SDCard_GetCID(tab_response)) + if (MCI_SDCard_GetCID(tab_response)) return 0; - if (AT91F_MCI_SendCommand(SET_RELATIVE_ADDR_CMD, 0)) + if (MCI_SendCommand(SET_RELATIVE_ADDR_CMD, 0)) return 0; MCI_Device.RCA = (AT91C_BASE_MCI->MCI_RSPR[0] >> 16); - if (AT91F_MCI_GetCSD(MCI_Device.RCA,tab_response)) + if (MCI_GetCSD(MCI_Device.RCA,tab_response)) return 0; MCI_Device.READ_BL_LEN = (tab_response[1] >> CSD_1_RD_B_LEN_S) & CSD_1_RD_B_LEN_M; @@ -414,9 +397,9 @@ CSD_2_CSIZE_L_M)) + 1); MCI_Device.Memory_Capacity = (1 << MCI_Device.READ_BL_LEN) * blocknr; #endif - if (AT91F_MCI_SDCard_SetBusWidth()) + if (MCI_SDCard_SetBusWidth()) return 0; - if (AT91F_MCI_SendCommand(SET_BLOCKLEN_CMD, 1 << MCI_Device.READ_BL_LEN)) + if (MCI_SendCommand(SET_BLOCKLEN_CMD, 1 << MCI_Device.READ_BL_LEN)) return 0; #ifdef REPORT_SIZE printf("Found SD card %u bytes\n", MCI_Device.Memory_Capacity); From owner-p4-projects@FreeBSD.ORG Thu Nov 9 01:05:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B35FC16A47C; Thu, 9 Nov 2006 01:05:25 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 776DF16A403 for ; Thu, 9 Nov 2006 01:05:25 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B71343D5A for ; Thu, 9 Nov 2006 01:05:25 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA915P9s029007 for ; Thu, 9 Nov 2006 01:05:25 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA915ON6029004 for perforce@freebsd.org; Thu, 9 Nov 2006 01:05:24 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Nov 2006 01:05:24 GMT Message-Id: <200611090105.kA915ON6029004@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109587 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 01:05:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=109587 Change 109587 by imp@imp_lighthouse on 2006/11/09 01:04:57 Inline a little. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#15 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#15 (text+ko) ==== @@ -362,10 +362,12 @@ MCI_Device.state = AT91C_MCI_IDLE; MCI_Device.SDCard_bus_width = AT91C_MCI_SCDBUS; - AT91F_MCI_Configure(AT91C_BASE_MCI, - AT91C_MCI_DTOR_1MEGA_CYCLES, - AT91C_MCI_PDCMODE, - AT91C_MCI_SDCARD_4BITS_SLOTA); + //* Reset the MCI + AT91C_BASE_MCI->MCI_CR = AT91C_MCI_MCIEN | AT91C_MCI_PWSEN; + AT91C_BASE_MCI->MCI_IDR = 0xFFFFFFFF; + AT91C_BASE_MCI->MCI_DTOR = AT91C_MCI_DTOR_1MEGA_CYCLES; + AT91C_BASE_MCI->MCI_MR = AT91C_MCI_PDCMODE; + AT91C_BASE_MCI->MCI_SDCR = AT91C_MCI_SDCARD_4BITS_SLOTA; MCI_SendCommand(GO_IDLE_STATE_CMD, AT91C_NO_ARGUMENT); for (i = 0; i < 100; i++) { From owner-p4-projects@FreeBSD.ORG Thu Nov 9 05:14:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D44EE16A415; Thu, 9 Nov 2006 05:14:44 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9701C16A40F for ; Thu, 9 Nov 2006 05:14:44 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FA4B43D70 for ; Thu, 9 Nov 2006 05:14:44 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA95EilY084754 for ; Thu, 9 Nov 2006 05:14:44 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA95Eha3084751 for perforce@freebsd.org; Thu, 9 Nov 2006 05:14:43 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 9 Nov 2006 05:14:43 GMT Message-Id: <200611090514.kA95Eha3084751@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 109591 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 05:14:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=109591 Change 109591 by mjacob@newisp on 2006/11/09 05:14:05 Add a loop down timer that will then cause devices to get marked lost if it expires. This is a tunable value that can be set. Affected files ... .. //depot/projects/newisp/dev/isp/isp_freebsd.c#21 edit .. //depot/projects/newisp/dev/isp/isp_freebsd.h#13 edit .. //depot/projects/newisp/dev/isp/isp_pci.c#17 edit .. //depot/projects/newisp/dev/isp/ispvar.h#12 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_freebsd.c#21 (text+ko) ==== @@ -50,12 +50,16 @@ int isp_loop_down_limit = 300; /* default loop down limit */ int isp_quickboot_time = 5; /* don't wait more than N secs for loop up */ int isp_lost_device_time = 30; /* grace time before reporting device lost */ +static const char *roles[4] = { + "(none)", "Target", "Initiator", "Target/Initiator" +}; static d_ioctl_t ispioctl; static void isp_intr_enable(void *); static void isp_cam_async(void *, uint32_t, struct cam_path *, void *); static void isp_poll(struct cam_sim *); static timeout_t isp_watchdog; +static timeout_t isp_ldt; static void isp_kthread(void *); static void isp_action(struct cam_sim *, union ccb *); @@ -633,12 +637,9 @@ struct sysctl_oid *tree = device_get_sysctl_tree(isp->isp_osinfo.dev); if (IS_SCSI(isp)) { - isp->isp_osinfo.sysctl_info.spi.iid = DEFAULT_IID(isp); - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "iid", - CTLFLAG_RD, &isp->isp_osinfo.sysctl_info.spi.iid, 0, - "Initiator ID"); return; } + snprintf(isp->isp_osinfo.sysctl_info.fc.wwnn, sizeof (isp->isp_osinfo.sysctl_info.fc.wwnn), "0x%08x%08x", (uint32_t) (ISP_NODEWWN(isp) >> 32), (uint32_t) ISP_NODEWWN(isp)); @@ -650,9 +651,21 @@ SYSCTL_ADD_STRING(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "wwnn", CTLFLAG_RD, isp->isp_osinfo.sysctl_info.fc.wwnn, 0, "World Wide Node Name"); + SYSCTL_ADD_STRING(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "wwpn", CTLFLAG_RD, isp->isp_osinfo.sysctl_info.fc.wwpn, 0, "World Wide Port Name"); + + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "loop_down_time", + CTLFLAG_RD, &isp->isp_osinfo.loop_down_time, 0, + "How long Loop has been down"); + + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "loop_down_limit", + CTLFLAG_RW, &isp->isp_osinfo.loop_down_limit, 0, + "How long to wait for loop to come back up"); + + printf("loop_down %d loop_down_limit %d\n", + isp->isp_osinfo.loop_down_time, isp->isp_osinfo.loop_down_limit); } #endif @@ -2090,12 +2103,78 @@ } static void +isp_ldt(void *arg) +{ + ispsoftc_t *isp = arg; + fcportdb_t *lp; + static const char prom3[] = + "PortID 0x%06x handle 0x%x role %s %s tgt %u because of %s\n" + " WWNN 0x%08x%08x WWPN 0x%08x%08x"; + struct cam_path *tmppath; + int dbidx, tgt; + + isp_prt(isp, ISP_LOGALL, "LDT EXPIRED"); + ISP_LOCK(isp); + + /* + * Notify to the OS all targets who we now consider have departed. + */ + for (dbidx = 0; dbidx < MAX_FC_TARG; dbidx++) { + lp = &FCPARAM(isp)->portdb[dbidx]; + + if (lp->state != FC_PORTDB_STATE_PROBATIONAL) { + continue; + } + if (lp->ini_map_idx == 0) { + continue; + } + + /* + * XXX: CLEAN UP AND COMPLETE ANY PENDING COMMANDS FIRST! + */ + + /* + * Mark that we've announced that this device is gone.... + */ + lp->reserved = 1; + + /* + * but *don't* change the state of the entry. Just clear + * any target id stuff and announce to CAM that the + * device is gone. This way any necessary PLOGO stuff + * will happen when loop comes back up. + */ + + tgt = lp->ini_map_idx - 1; + FCPARAM(isp)->isp_ini_map[tgt] = 0; + lp->ini_map_idx = 0; + isp_prt(isp, ISP_LOGCONFIG, prom3, + lp->portid, lp->handle, + roles[lp->roles & 0x3], "departed from", tgt, + "LOOP Down Timeout", + (uint32_t) (lp->node_wwn >> 32), + (uint32_t) lp->node_wwn, + (uint32_t) (lp->port_wwn >> 32), + (uint32_t) lp->port_wwn); +#if __FreeBSD_version >= 500000 + ISPLOCK_2_CAMLOCK(isp); + if (xpt_create_path(&tmppath, NULL, cam_sim_path(isp->isp_sim), + tgt, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { + CAMLOCK_2_ISPLOCK(isp); + continue; + } + xpt_async(AC_LOST_DEVICE, tmppath, NULL); + xpt_free_path(tmppath); + CAMLOCK_2_ISPLOCK(isp); +#endif + } +} + +static void isp_kthread(void *arg) { ispsoftc_t *isp = arg; int slp; - - #if __FreeBSD_version < 500000 int s; @@ -2796,15 +2875,13 @@ isp_async(ispsoftc_t *isp, ispasync_t cmd, void *arg) { int bus, rv = 0; - static const char *roles[4] = { - "(none)", "Target", "Initiator", "Target/Initiator" - }; static const char prom[] = "PortID 0x%06x handle 0x%x role %s %s\n" - " WWNN 0x%08x%08x WWPN 0x%08x%08x"; + " WWNN 0x%08x%08x WWPN 0x%08x%08x"; static const char prom2[] = "PortID 0x%06x handle 0x%x role %s %s tgt %u\n" - " WWNN 0x%08x%08x WWPN 0x%08x%08x"; + " WWNN 0x%08x%08x WWPN 0x%08x%08x"; + char *msg = NULL; target_id_t tgt; fcportdb_t *lp; struct cam_path *tmppath; @@ -2891,22 +2968,29 @@ } break; case ISPASYNC_LIP: - if (isp->isp_path) { - isp_freeze_loopdown(isp, "ISPASYNC_LIP"); + if (msg == NULL) { + msg = "LIP Received"; } - isp_prt(isp, ISP_LOGINFO, "LIP Received"); - break; + /* FALLTHROUGH */ case ISPASYNC_LOOP_RESET: - if (isp->isp_path) { - isp_freeze_loopdown(isp, "ISPASYNC_LOOP_RESET"); + if (msg == NULL) { + msg = "LOOP Reset"; } - isp_prt(isp, ISP_LOGINFO, "Loop Reset Received"); - break; + /* FALLTHROUGH */ case ISPASYNC_LOOP_DOWN: + if (msg == NULL) { + msg = "LOOP Down"; + } if (isp->isp_path) { - isp_freeze_loopdown(isp, "ISPASYNC_LOOP_DOWN"); + isp_freeze_loopdown(isp, msg); + } + if (isp->isp_osinfo.ldt_running == 0) { + isp->isp_osinfo.ldt = timeout(isp_ldt, isp, + isp->isp_osinfo.loop_down_limit * hz); + isp->isp_osinfo.ldt_running = 1; +isp_prt(isp, ISP_LOGALL, "LDT: starting loop down timer for %d seconds", isp->isp_osinfo.loop_down_limit); } - isp_prt(isp, ISP_LOGINFO, "Loop DOWN"); + isp_prt(isp, ISP_LOGINFO, msg); break; case ISPASYNC_LOOP_UP: /* @@ -2919,13 +3003,14 @@ break; case ISPASYNC_DEV_ARRIVED: lp = arg; + lp->reserved = 0; if ((isp->isp_role & ISP_ROLE_INITIATOR) && (lp->roles & (SVC3_TGT_ROLE >> SVC3_ROLE_SHIFT))) { int dbidx = lp - FCPARAM(isp)->portdb; int i; for (i = 0; i < MAX_FC_TARG; i++) { - if (i >= FL_ID || i <= SNS_ID) { + if (i >= FL_ID && i <= SNS_ID) { continue; } if (FCPARAM(isp)->isp_ini_map[i] == 0) { @@ -3016,9 +3101,7 @@ case ISPASYNC_DEV_GONE: lp = arg; if (lp->ini_map_idx) { -/* - * XXX: HERE IS WHERE WE'D START A TIMER - */ + lp->reserved = 1; tgt = lp->ini_map_idx - 1; FCPARAM(isp)->isp_ini_map[tgt] = 0; lp->ini_map_idx = 0; @@ -3041,7 +3124,7 @@ xpt_free_path(tmppath); CAMLOCK_2_ISPLOCK(isp); #endif - } else { + } else if (lp->reserved == 0) { isp_prt(isp, ISP_LOGCONFIG, prom, lp->portid, lp->handle, roles[lp->roles & 0x3], "departed", @@ -3049,6 +3132,7 @@ (uint32_t) lp->node_wwn, (uint32_t) (lp->port_wwn >> 32), (uint32_t) lp->port_wwn); + lp->reserved = 1; } break; case ISPASYNC_CHANGE_NOTIFY: @@ -3061,6 +3145,11 @@ } else { msg = "Other Change Notify"; } + if (isp->isp_osinfo.ldt_running) { + isp->isp_osinfo.ldt_running = 0; + untimeout(isp_ldt, isp, isp->isp_osinfo.ldt); + callout_handle_init(&isp->isp_osinfo.ldt); + } isp_prt(isp, ISP_LOGINFO, msg); isp_freeze_loopdown(isp, msg); #if __FreeBSD_version < 500000 ==== //depot/projects/newisp/dev/isp/isp_freebsd.h#13 (text+ko) ==== @@ -149,16 +149,18 @@ struct cam_sim *sim2; struct cam_path *path2; struct intr_config_hook ehook; - uint16_t loop_down_time; - uint16_t loop_down_limit; + uint32_t loop_down_time; + uint32_t loop_down_limit; uint32_t : 5, simqfrozen : 3, hysteresis : 8, - : 4, + : 3, + ldt_running : 1, disabled : 1, fcbsy : 1, mboxcmd_done : 1, mboxbsy : 1; + struct callout_handle ldt; /* loop down timer */ #if __FreeBSD_version >= 500000 struct firmware * fw; struct mtx lock; @@ -168,9 +170,6 @@ char wwnn[17]; char wwpn[17]; } fc; - struct { - int iid; - } spi; } sysctl_info; #endif struct proc *kproc; @@ -204,10 +203,17 @@ #define CAMLOCK_2_ISPLOCK(isp) \ mtx_unlock(&Giant); mtx_lock(&(isp)->isp_lock) #else +#if __FreeBSD_version < 500000 #define ISP_LOCK(x) do { } while (0) #define ISP_UNLOCK(x) do { } while (0) #define ISPLOCK_2_CAMLOCK(isp) do { } while (0) #define CAMLOCK_2_ISPLOCK(isp) do { } while (0) +#else +#define ISP_LOCK(x) GIANT_REQUIRED +#define ISP_UNLOCK(x) do { } while (0) +#define ISPLOCK_2_CAMLOCK(isp) do { } while (0) +#define CAMLOCK_2_ISPLOCK(isp) GIANT_REQUIRED +#endif #endif /* @@ -404,8 +410,7 @@ #include #endif -void isp_prt(ispsoftc_t *, int level, const char *, ...) - __printflike(3, 4); +void isp_prt(ispsoftc_t *, int level, const char *, ...) __printflike(3, 4); /* * isp_osinfo definiitions && shorthand */ ==== //depot/projects/newisp/dev/isp/isp_pci.c#17 (text+ko) ==== @@ -432,6 +432,8 @@ uint64_t wwn; int bitmap, unit; + callout_handle_init(&isp->isp_osinfo.ldt); + unit = device_get_unit(dev); if (getenv_int("isp_disable", &bitmap)) { if (bitmap & (1 << unit)) { @@ -578,6 +580,9 @@ { int tval; const char *sptr; + + callout_handle_init(&isp->isp_osinfo.ldt); + /* * Figure out if we're supposed to skip this one. */ @@ -733,7 +738,7 @@ isp->isp_osinfo.hysteresis = isp_fabric_hysteresis; } - tval = 0; + tval = -1; (void) resource_int_value(device_get_name(dev), device_get_unit(dev), "loop_down_limit", &tval); if (tval >= 0 && tval < 0xffff) { @@ -795,7 +800,7 @@ isp = &pcs->pci_isp; /* - * Get Generic Options + * Set and Get Generic Options */ isp_get_options(dev, isp); @@ -814,7 +819,6 @@ */ isp_get_pci_options(dev, &m1, &m2); - linesz = PCI_DFLT_LNSZ; irq = regs = NULL; rgd = rtp = iqd = 0; ==== //depot/projects/newisp/dev/isp/ispvar.h#12 (text+ko) ==== @@ -326,10 +326,10 @@ uint16_t ini_map_idx : 12, autologin : 1, /* F/W does PLOGI/PLOGO */ state : 3; - uint32_t : 6, + uint32_t reserved : 6, roles : 2, portid : 24; - uint32_t : 6, + uint32_t new_reserved : 6, new_roles : 2, new_portid : 24; uint64_t node_wwn; From owner-p4-projects@FreeBSD.ORG Thu Nov 9 05:20:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 395F116A494; Thu, 9 Nov 2006 05:20:55 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D333D16A415 for ; Thu, 9 Nov 2006 05:20:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F5CE43D55 for ; Thu, 9 Nov 2006 05:20:54 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA95Ksf5085076 for ; Thu, 9 Nov 2006 05:20:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA95KqK4085068 for perforce@freebsd.org; Thu, 9 Nov 2006 05:20:52 GMT (envelope-from jb@freebsd.org) Date: Thu, 9 Nov 2006 05:20:52 GMT Message-Id: <200611090520.kA95KqK4085068@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109592 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 05:20:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=109592 Change 109592 by jb@jb_freebsd8 on 2006/11/09 05:20:10 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#34 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#22 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#15 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#3 integrate .. //depot/projects/dtrace/doc/share/mk/doc.subdir.mk#3 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/farrokhi.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/laszlof.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/miwi.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#16 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#16 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/philip.key#3 integrate .. //depot/projects/dtrace/ports/MOVED#31 integrate .. //depot/projects/dtrace/ports/Mk/bsd.apache.mk#3 integrate .. //depot/projects/dtrace/ports/UPDATING#24 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#16 integrate .. //depot/projects/dtrace/src/bin/sh/expand.c#5 integrate .. //depot/projects/dtrace/src/sbin/quotacheck/quotacheck.8#4 integrate .. //depot/projects/dtrace/src/sbin/quotacheck/quotacheck.c#4 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux.h#7 integrate .. //depot/projects/dtrace/src/sys/arm/arm/cpufunc.c#7 integrate .. //depot/projects/dtrace/src/sys/arm/arm/identcpu.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/arm/intr.c#4 integrate .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#14 integrate .. //depot/projects/dtrace/src/sys/arm/arm/vm_machdep.c#9 integrate .. //depot/projects/dtrace/src/sys/arm/include/armreg.h#5 integrate .. //depot/projects/dtrace/src/sys/arm/include/atomic.h#6 integrate .. //depot/projects/dtrace/src/sys/arm/include/cpuconf.h#6 integrate .. //depot/projects/dtrace/src/sys/arm/include/cpufunc.h#5 integrate .. //depot/projects/dtrace/src/sys/arm/include/pmap.h#8 integrate .. //depot/projects/dtrace/src/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/dtrace/src/sys/conf/files.arm#5 integrate .. //depot/projects/dtrace/src/sys/conf/files.sun4v#7 integrate .. //depot/projects/dtrace/src/sys/dev/aha/ahareg.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci_private.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pcib_if.m#4 integrate .. //depot/projects/dtrace/src/sys/i386/i386/identcpu.c#9 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#15 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#18 integrate .. //depot/projects/dtrace/src/sys/netinet/libalias/alias_smedia.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/dtrace/src/sys/nfsclient/bootp_subr.c#4 integrate .. //depot/projects/dtrace/src/sys/pci/if_pcn.c#5 integrate .. //depot/projects/dtrace/src/sys/pci/if_pcnreg.h#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hcall.S#8 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/interrupt.S#9 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/intr_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/support.S#6 integrate .. //depot/projects/dtrace/src/sys/sys/sem.h#5 integrate .. //depot/projects/dtrace/src/sys/vm/vm_contig.c#8 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.c#17 integrate .. //depot/projects/dtrace/src/tools/regression/fifo/fifo_io/fifo_io.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#8 integrate .. //depot/projects/dtrace/src/usr.bin/top/machine.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/portsnap/phttpget/phttpget.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/install.c#7 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/installUpgrade.c#5 integrate .. //depot/projects/dtrace/www/en/about.sgml#7 integrate .. //depot/projects/dtrace/www/en/developers.sgml#12 integrate .. //depot/projects/dtrace/www/en/releases/6.1R/errata.html#9 integrate .. //depot/projects/dtrace/www/share/sgml/advisories.xml#9 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#10 integrate .. //depot/projects/dtrace/www/tools/portsgrowth/ports.log#6 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#34 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -280,10 +280,10 @@ PResizer, and &partitionmagic; can resize FAT16 and FAT32 - partitions — used in &ms-dos; through &windows; ME. - &partitionmagic; is the only one of - the above applications that can resize NTFS - partitions. + partitions — used in &ms-dos; through &windows; ME. Both + &partitionmagic; and + GParted are known to work on + NTFS. Incorrect use of these tools can delete the data on your disk. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -776,7 +776,7 @@ is one of the functions of the core team, as is the recruitment of new core team members as others move on. The current core team was elected from a pool of committer - candidates in July 2004. Elections are held every 2 years. + candidates in July 2006. Elections are held every 2 years. Some core team members also have specific areas of ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#15 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.400 2006/10/08 13:18:57 syrinx Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.402 2006/11/07 14:00:36 farrokhi Exp $ --> aaron@FreeBSD.org"> @@ -298,6 +298,8 @@ fanf@FreeBSD.org"> +farrokhi@FreeBSD.org"> + fenner@FreeBSD.org"> fjoe@FreeBSD.org"> @@ -538,6 +540,8 @@ lars@FreeBSD.org"> +laszlof@FreeBSD.org"> + lawrance@FreeBSD.org"> lbr@FreeBSD.org"> ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#3 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.14 2006/03/20 20:39:05 blackend Exp $ - Original revision: 1.64 + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.15 2006/11/08 20:26:57 blackend Exp $ + Original revision: 1.66 --> @@ -260,67 +260,73 @@ &prompt.user; mozilla -mail + + Firefox + + Firefox + + + Firefox est la + génération suivante de navigateurs basés + sur le code de Mozilla. + Mozilla est une suite + complète d'applications, comme un navigateur, un client + de messagerie, un client de discussion et bien plus. + Firefox est juste un navigateur, ce + qui le rend plus petit et plus rapide. + + Installez la version pré-compilée du + logiciel en tapant: + + &prompt.root; pkg_add -r firefox + + Vous pouvez également utiliser le catalogue des + logiciels portés si vous désirez effectuer la + compilation à partir des sources: + + &prompt.root; cd /usr/ports/www/firefox +&prompt.root; make install clean + + - - - - Tom - Rhodes - Contribution de - - - + Firefox, Mozilla et le greffon &java; - Mozilla et le greffon &java; + + Dans cette section et la suivante, nous supposerons que + vous avez déjà installé + Firefox ou + Mozilla. + - Installer Mozilla est simple, mais - malheureusement installer Mozilla - avec le support de modules additionnels comme &java; et - ¯omedia; &flash; consomme beaucoup de - temps et d'espace disque. + La fondation &os; a acquis auprès de Sun + Microsystems une licence de distribution des binaires &os; + pour le Java Runtime Environment (&jre;) et le Java + Development Kit (&jdk;). Les paquetages binaires pour &os; + sont disponibles sur le site de la fondation + &os;. - La première chose à faire est de - télécharger les fichiers qui seront utilisé - avec Mozilla. Pointez votre navigateur - Web vers - et - créez un compte sur leur site. Pensez à sauver - quelque part le nom d'utilisateur et le mot de passe car ils seront - nécessaires prochainement. Téléchargez - les fichiers jdk-1_5_0-bin-scsl.zip - (binaires SCSL JDK 5.0) et - jdk-1_5_0-src-scsl.zip (sources SCSL JDK - 5.0) et placez-les dans - le répertoire /usr/ports/distfiles/ comme - le port ne le téléchagera pas automatiquement. - Cela en raison de restriction de licence. Tant que nous y - sommes, téléchargeons “l'environnement - java” à partir de - . - Le nom du fichier est - j2sdk-1_4_2_08-linux-i586.bin. - Comme - précédemment, ce fichier doit être - placé dans /usr/ports/distfiles/. - Téléchargez une copie du “java patchkit” - à partir de l'adresse - et - placez-le dans - /usr/ports/distfiles/. Puis enfin, - installez le port java/jdk13 - avec la commande classique make install - clean. + Pour ajouter le support &java; à + Firefox ou + Mozilla, vous devez installer tout + d'abord le logiciel porté java/javavmwrapper. Ensuite, + téléchargez le paquetage Diablo + &jre; à l'adresse , + et installez-le à l'aide de &man.pkg.add.1;. - Lancez Mozilla et - accédez à l'option About - Plug-ins du menu Help. Le + Lancez votre navigateur et tapez + about:plugins dans la barre d'adresse et + appuyez sur Entrée. Une page + concernant les greffons installés s'affichera, le greffon &java; devrait - désormais apparaître dans la liste. + désormais apparaître dans la liste. - Mozilla et le greffon ¯omedia; &flash; + Firefox, Mozilla et le greffon ¯omedia; &flash; Le greffon ¯omedia; &flash; n'est pas disponible pour &os;. Cependant il existe une couche logicielle @@ -339,20 +345,40 @@ configurations sont installés dans le répertoire /usr/local/share/examples/linuxpluginwrapper/. - Installez le port - www/mozilla, si - Mozilla n'est pas déjà - installé. + L'étape suivante est l'installation du logiciel porté www/linux-flashplugin7. Une fois le + greffon installé, lancez votre navigateur, tapez + about:plugins dans la barre d'adresse et + appuyez sur Entrée. Une des greffons + actuellement disponibles devrait apparaître. + + Si le greffon &flash; n'est pas listé, c'est, la + plupart du temps, dû à un lien symbolique + manquant. En tant que root, lancez les + commandes suivantes: + + &prompt.root; ln -s /usr/local/lib/npapi/linux-flashplugin/libflashplayer.so \ + /usr/X11R6/lib/browser_plugins/ +&prompt.root; ln -s /usr/local/lib/npapi/linux-flashplugin/flashplayer.xpt \ + /usr/X11R6/lib/browser_plugins/ - Maintenant lancez juste Mozilla - avec: + Si vous relancez votre navigateur, le greffon devrait + désormais apparaître dans la liste + mentionnée précédemment. Votre + navigateur peut également planter lors de la lecture de + certaines animations &flash;, dans ce cas un correctif peut + vous aider: - &prompt.user; mozilla & + &prompt.root; cd /usr/src +&prompt.root; fetch http://people.FreeBSD.org/~nork/rtld_dlsym_hack.diff +&prompt.root; patch < rtld_dlsym_hack.diff +&prompt.root; cd libexec/rtld-elf/ +&prompt.root; make clean +&prompt.root; make obj +&prompt.root; make depend +&prompt.root; make && make install - Et cliquez sur l'option - About Plug-ins du menu - Help. Une liste devrait apparaître - avec tous les greffons disponibles. + Puis redémarrez votre machine. Le programme @@ -394,41 +420,13 @@ linux-opera à la place d'opera dans les exemples précédents. La version Linux est utile dans les - situations demandants l'utilisation de greffons qui sont + situations demandant l'utilisation de greffons qui sont uniquement disponibles pour Linux, comme &acrobat.reader;. Dans tous les autres aspects, les versions FreeBSD et Linux sont identiques. - Firefox - - Firefox - - - Firefox est la - génération suivante de navigateurs basés - sur le code de Mozilla. - Mozilla est une suite - complète d'applications, comme un navigateur, un client - de messagerie, un client de discussion et bien plus. - Firefox est juste un navigateur, ce - qui le rend plus petit et plus rapide. - - Installez la version pré-compilée du - logiciel en tapant: - - &prompt.root; pkg_add -r firefox - - Vous pouvez également utiliser le catalogue des - logiciels portés si vous désirez effectuer la - compilation à partir des sources: - - &prompt.root; cd /usr/ports/www/firefox -&prompt.root; make install clean - - - Konqueror Konqueror ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#3 (text+ko) ==== @@ -2,9 +2,8 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml,v 1.3 2002/09/21 18:05:40 blackend Exp $ - $Id: preface.sgml,v 1.10 2002/09/21 17:49:36 marc Exp $ - Original revision: 1.16 + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml,v 1.4 2006/11/08 14:05:14 blackend Exp $ + Original revision: 1.35 --> @@ -16,7 +15,7 @@ Le nouveau venu à FreeBSD constatera que la première section de ce livre guide l'utilisateur à travers le processus d'installation de FreeBSD, et présente progressivement les concepts - et les conventions qui sont les fondements d'Unix. Travailler avec cette + et les conventions qui sont les fondements d'&unix;. Travailler avec cette section demande un peu plus que le simple désire d'explorer, et la capacité d'assimiler de nouveaux concepts quand ils sont présentés. @@ -31,10 +30,119 @@ Pour une liste de sources d'informations complémentaires, veuillez consulter . + Modifications + depuis la Seconde Edition + + Cette seconde édition est le point culminant de plus de + deux ans de travail pour les membres du Groupe de Documentation de + FreeBSD. Ce qui suit présente les changements principaux + de cette nouvelle édition: + + + + , le chapitre + Configuration et optimisation, a + été augmenté avec des informations + nouvelles sur la gestion ACPI des ressources et de + l'énergie, sur l'utilitaire système + cron, et sur d'autres d'options + supplémentaires d'optimisation du noyau. + + + + , le chapitre + Sécurité, a été + augmenté avec de nouvelles informations sur les + réseaux privés virtuels (VPNs), les listes de + contrôle d'accès au système de fichiers + (ACLs), et sur les avis de sécurité. + + + + , Le contrôle + d'accès mandataire (MAC) est un nouveau + chapitre ajouté avec cette édition. Il explique + ce qu'est le MAC et comment ce mécanisme peut + être utilisé pour sécuriser un + système &os;. + + + + , le chapitre Stockage des + données, a bénéficié de + l'ajout de nouvelles sections concernant les + périphériques de stockage USB, les + instantanés de systèmes de fichiers, les quotas + d'utilisation des disques, les systèmes de fichiers + réseaux et sauvegardés sur fichier, et le + chiffrage de partitions. + + + + , Vinum, + est un nouveau chapitre apparaissant avec cette + édition. Il décrit l'utilisation de Vinum, un + gestionnaire de volume qui permet la création de + disques logiques indépendants du + périphérique, et l'utilisation de + systèmes RAID-0, RAID-1 et RAID-5 logiciels. + + + + Une section dépannage a été + ajoutée au chapitre , PPP + et SLIP. + + + + , le chapitre Courrier + électronique, bénéficie de + nouvelles sections sur l'utilisation d'agents de transfert de + courrier alternatifs, sur l'authentification SMTP, l'UUCP, + fetchmail, + procmail, et d'autres sujets + avancés. + + + + , le chapitre + Serveurs réseau, apparaît avec + cette édition. Ce chapitre traite de la configuration + du serveur HTTP Apache, de + ftpd, et celle d'un serveur pour + clients µsoft; &windows; à l'aide de + Samba. Certaines sections du + chapitre , + Administration réseau avancée ont + été déplacées vers ce nouveau + chapitre. + + + + , le chapitre + Administration réseau avancée a + été complété avec des informations + sur l'utilisation des périphériques &bluetooth; + sous &os;, la configuration de réseaux sans fil, et sur + le mode de transfert réseau asynchrone (ATM). + + + + Un glossaire a été ajouté pour + centraliser les définitions des termes techniques + employés tout au long de cet ouvrage. + + + + La présentation des tableaux et des figures a + été améliorée. + + + Modifications depuis la Première Edition - Cette seconde édition est le point culminant de deux ans de + La seconde édition est le point culminant de deux ans de travail pour les membres du Groupe de Documentation de FreeBSD. Ce qui suit présente les changements principaux de cette nouvelle édition: @@ -68,9 +176,9 @@ pour les nouveaux utilisateurs. - Le (“Quelques bases d'Unix”) a + Le (“Quelques bases d'&unix;”) a été augmenté pour contenir des informations - additionelles sur les processus, deamons et signaux. + additionnelles sur les processus, daemons et signaux. Le (“Installer des applications”) a @@ -83,7 +191,7 @@ complètement été réécrit en insistant sur l'utilisation de technologies modernes d'environnement de travail comme KDE et - GNOME sous XFree86 4.X. + GNOME sous &xfree86; 4.X. Le (“Le processus de démarrage de @@ -118,10 +226,10 @@ configuration de sendmail. - Le (“Compatibilité Linux”) a + Le (“Compatibilité &linux;”) a été augmenté pour inclure des informations sur - l'installation d'Oracle et - SAP/R3. + l'installation d'&oracle; et + &sap.r3;. Les nouveaux sujets suivants sont abordés dans cette @@ -140,20 +248,29 @@ Organisation de cet ouvrage - Ce livre est divisé en trois parties logiquement distinctes. Le + Ce livre est divisé en cinq parties logiquement distinctes. Le première section, Pour commencer, couvre l'installation et les bases de l'utilisation de FreeBSD. On s'attend à ce que le lecteur suive ces chapitres dans l'ordre, sautant éventuellement les chapitres traitant de sujets familiers. - La seconde section L'Administration Système, - couvre une large collection de sujets qui intéresseront les - utilisateurs plus avancés de FreeBSD. Chaque section débute + La seconde section Tâches courantes, + couvre les fonctionnalités de &os; fréquemment + utilisées. Cette section, ainsi que toutes les sections + suivantes, peuvent être lues dans n'importe quel ordre. + Chaque chapitre débute avec un synopsis succinct qui décrit ce dont parle le chapitre et ce qu'on s'attend à ce que le lecteur sache déjà. Cela en vue de permettre au lecteur occasionnel de se rendre directement aux - chapitres qui l'intéresse. La troisième section contient des + chapitres qui l'intéresse. La troisième section, + Administration système, traite des + sujets concernant l'administration. La quatrième section, + Réseaux, couvre le domaine des + réseaux et des serveurs. La cinquième section + contient des annexes d'information de référence. + + , Introduction @@ -173,11 +290,11 @@ - , Quelques bases d'Unix + , Quelques bases d'&unix; Couvre les commandes et fonctionnalités de base du système d'exploitation FreeBSD. Si vous êtes familier - avec Linux ou un autre type d'Unix alors vous pouvez probablement + avec &linux; ou un autre type d'&unix; alors vous pouvez probablement passer ce chapitre. @@ -193,13 +310,69 @@ , Le système X Window Décrit le système X Window en général - et l'utilisation d'XFree86 sur FreeBSD en particulier. Décrit + et l'utilisation d'X11 sur FreeBSD en particulier. Décrit également les environnements de travail comme KDE et GNOME. + + + + + , Bureautique + + Liste les applications de bureautique courantes, comme + les navigateurs Web et les suites de bureautique, et + décrit comment les installer sous &os;. + + + , + Multimédia + + Montre comment installer le support du son et de la + vidéo pour votre système. Décrit + également quelques applications audio et + vidéo. + + + + , Configurer le noyau de + &os; + + Explique pour quelles raisons vous devriez configurer un + nouveau noyau et fournit des instructions + détaillées pour la configuration, la + compilation et l'installation d'un noyau sur mesures. + + + , + Impression + + Décrit la gestion des imprimantes sous &os;, y + compris les informations sur les pages d'en-tête, la + comptabilisation de l'usage et la configuration de + base. + + + + , Compatibilité + binaire avec &linux; + + Décrit les caractéristiques de la + compatibilité &linux; sous &os;. Fournit + également les instructions détaillées + de l'installation de plusieurs applications &linux; populaires + comme &oracle;, + &sap.r3; et + &mathematica;. + + + + + + , Configuration et optimisation @@ -230,29 +403,21 @@ - , Configurer le noyau de - FreeBSD - - Explique pour quelles raisons vous devriez configurer un - nouveau noyau et fournit des instructions détaillées - pour la configuration, la compilation et l'installation d'un noyau - sur mesures. - - - , Sécurité Décrit différents outils disponibles pour vous aider à sécuriser votre système FreeBSD, dont - Kerberos, IPsec, OpenSSH et les coupe-feux. + Kerberos, IPsec et OpenSSH. - , Impression + , Contrôle + d'accès mandataire - Décrit la gestion des imprimantes sous FreeBSD, y compris - les informations sur les pages d'en-tête, la comptabilisation - de l'usage et la configuration de base. + Explique ce qu'est le contrôle d'accès + mandataire (MAC) et comment ce mécanisme peut + être utilisé pour sécuriser un + système &os;. @@ -266,6 +431,14 @@ + , GEOM + + Décrit ce qu'est le système GEOM sous &os; + et comment configurer les différents niveaux de RAID + supportés. + + + , Vinum Décrit comment utiliser Vinum, un gestionnaire de @@ -283,23 +456,20 @@ - , Bureautique + , Questions + avancées - Liste les applications de bureautique courantes, comme - les navigateurs Web et les suites de bureautique, et décrit - comment les installer sous FreeBSD. + Explique les différences entre &os;-STABLE, + &os;-CURRENT et les versions de publication;. + Décrit quel type d'utilisateurs pourrait tirer profit + de suivre un système de développement et + présente le processus. + + + - , - Multimédia - - Montre comment installer le support du son et de la - vidéo pour votre système. Décrit - également quelques applications audio et vidéo. - - - , Communications série Explique comment connecter terminaux et modems à votre @@ -316,17 +486,6 @@ - , Administration réseau - avancée - - Décrit de nombreux sujets sur l'utilisation réseau, - dont le partage d'une connexion Internet avec d'autres ordinateurs - sur votre réseau local, l'utilisation des systèmes de - fichiers réseau, le partage des comptes via NIS, la - configuration d'un serveur de noms, et bien plus. - - - , Courrier électronique Explique les différents composants d'un serveur de @@ -336,26 +495,39 @@ - , Questions avancées + , Serveurs + réseau + + Fournit des instructions détaillées et des + exemples de fichiers de configuration pour configurer votre + machine &os; comme serveur de fichiers, serveur de noms de + domaine, serveur d'information réseau, ou comme serveur + de synchronisation d'horloge. + + + + , Coupe-feux - Explique les différences entre FreeBSD-STABLE, - FreeBSD-CURRENT et les releases FreeBSD. Décrit quel type - d'utilisateurs pourrait tirer profit de suivre un système de - développement et présente le processus. + Explique la philosophie des coupe-feux logiciels et + fournit des informations détaillées sur la + configuration des différents coupe-feux disponibles + pour &os;. - , Compatibilité Linux + , + Administration réseau avancée - Décrit les caractéristiques de la - compatibilité Linux sous FreeBSD. Fournit également - les instructions détaillées de l'installation de - plusieurs applications Linux populaires comme - Oracle, - SAP/R3 et - Mathematica. + Décrit de nombreux sujets sur l'utilisation + réseau, dont le partage d'une connexion Internet avec + d'autres ordinateurs sur votre réseau local, routage, + réseaux sans-fils, &bluetooth;, ATM, IPv6, et bien + plus. + + + , Se procurer FreeBSD @@ -410,10 +582,10 @@ - Police de caractères à chasse fixe + Police de caractères à chasse fixe Une police de caractères à - chasse fixe + chasse fixe est utilisée pour les messages d'erreurs, les commandes, les variables d'environnement, les noms des logiciels portés, les noms d'hôtes, les noms d'utilisateurs, les noms de @@ -449,6 +621,10 @@ + Indiquant que l'utilisateur devra appuyer simultanément + sur les touches Ctrl, Alt, et + Del. + Les touches qui sont sensées être tapées en séquence seront séparées par une virgule, par exemple: @@ -474,9 +650,9 @@ renderas=sect2>Exemples Les exemples commençant par E:\> - indiquent une commande MS-DOS. Sauf indication contraire, on peut + indiquent une commande &ms-dos;. Sauf indication contraire, on peut exécuter ces commandes depuis une fenêtre “d'invite de - commande” dans un environnement Windows moderne. + commande” dans un environnement µsoft.windows; moderne. E:\> tools\fdimage floppies\kern.flp A: @@ -519,7 +695,11 @@ un certain nombre d'améliorations à l'infrastructure de publication et à l'ajout de chapitres. Ce travail a abouti à la publication de la deuxième édition imprimée - en Novembre 2001 (ISBN 1-57176-303-1). + en Novembre 2001 (ISBN 1-57176-303-1). En 2003-2004, FreeBSD Mall, Inc, a + payé plusieurs auteurs pour travailler sur + l'amélioration de ce manuel en vue de la publication de la + troisième édition papier. ==== //depot/projects/dtrace/doc/share/mk/doc.subdir.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ # Taken from: # Id: bsd.subdir.mk,v 1.27 1999/03/21 06:43:40 bde # >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 9 05:26:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D472916A416; Thu, 9 Nov 2006 05:26:02 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7B74A16A412 for ; Thu, 9 Nov 2006 05:26:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 058B843D5E for ; Thu, 9 Nov 2006 05:26:02 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA95Q1Ep086463 for ; Thu, 9 Nov 2006 05:26:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA95Q04Z086460 for perforce@freebsd.org; Thu, 9 Nov 2006 05:26:00 GMT (envelope-from jb@freebsd.org) Date: Thu, 9 Nov 2006 05:26:00 GMT Message-Id: <200611090526.kA95Q04Z086460@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 109593 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 05:26:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=109593 Change 109593 by jb@jb_freebsd8 on 2006/11/09 05:25:08 IFC Affected files ... .. //depot/projects/binutils/src/ObsoleteFiles.inc#3 integrate .. //depot/projects/binutils/src/bin/sh/expand.c#3 integrate .. //depot/projects/binutils/src/sbin/quotacheck/quotacheck.8#2 integrate .. //depot/projects/binutils/src/sbin/quotacheck/quotacheck.c#2 integrate .. //depot/projects/binutils/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/binutils/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/binutils/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/binutils/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/binutils/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/binutils/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/binutils/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/binutils/src/sys/arm/include/armreg.h#2 integrate .. //depot/projects/binutils/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/binutils/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/binutils/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/binutils/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/binutils/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/binutils/src/sys/conf/files.arm#2 integrate .. //depot/projects/binutils/src/sys/conf/files.sun4v#2 integrate .. //depot/projects/binutils/src/sys/dev/aha/ahareg.h#2 integrate .. //depot/projects/binutils/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/binutils/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/binutils/src/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/binutils/src/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/binutils/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/binutils/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/binutils/src/sys/kern/sched_ule.c#2 integrate .. //depot/projects/binutils/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/binutils/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/binutils/src/sys/netinet/libalias/alias_smedia.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/binutils/src/sys/netinet/sctputil.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/binutils/src/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/binutils/src/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/binutils/src/sys/pci/if_pcn.c#2 integrate .. //depot/projects/binutils/src/sys/pci/if_pcnreg.h#2 integrate .. //depot/projects/binutils/src/sys/sun4v/sun4v/hcall.S#2 integrate .. //depot/projects/binutils/src/sys/sun4v/sun4v/interrupt.S#2 integrate .. //depot/projects/binutils/src/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/binutils/src/sys/sun4v/sun4v/support.S#2 integrate .. //depot/projects/binutils/src/sys/sys/sem.h#2 integrate .. //depot/projects/binutils/src/sys/vm/vm_contig.c#2 integrate .. //depot/projects/binutils/src/sys/vm/vm_page.c#2 integrate .. //depot/projects/binutils/src/tools/regression/fifo/fifo_io/fifo_io.c#2 integrate .. //depot/projects/binutils/src/usr.bin/calendar/calendars/calendar.freebsd#2 integrate .. //depot/projects/binutils/src/usr.bin/top/machine.c#2 integrate .. //depot/projects/binutils/src/usr.sbin/portsnap/phttpget/phttpget.c#2 integrate .. //depot/projects/binutils/src/usr.sbin/sysinstall/install.c#2 integrate .. //depot/projects/binutils/src/usr.sbin/sysinstall/installUpgrade.c#2 integrate Differences ... ==== //depot/projects/binutils/src/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.58 2006/11/05 00:39:56 trhodes Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.59 2006/11/08 03:23:49 marcel Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +.if ${TARGET_ARCH} == "ia64" +# 20061104: skiload.help removed +OLD_FILES+=boot/skiload.help +.endif # 20061018: pccardc removed OLD_FILES+=usr/sbin/pccardc usr/share/man/man8/pccardc.8.gz # 20060930: demangle.h from contrib/libstdc++/include/ext/ ==== //depot/projects/binutils/src/bin/sh/expand.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.50 2006/11/05 18:36:05 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.51 2006/11/07 22:46:13 stefanf Exp $"); #include #include @@ -98,7 +98,7 @@ STATIC int subevalvar(char *, char *, int, int, int, int); STATIC char *evalvar(char *, int); STATIC int varisset(char *, int); -STATIC void varvalue(char *, int, int); +STATIC void varvalue(char *, int, int, int); STATIC void recordregion(int, int, int); STATIC void removerecordregions(int); STATIC void ifsbreakup(char *, struct arglist *); @@ -633,7 +633,7 @@ int easy; int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); - varflags = *p++; + varflags = (unsigned char)*p++; subtype = varflags & VSTYPE; var = p; special = 0; @@ -669,7 +669,7 @@ if (set && subtype != VSPLUS) { /* insert the value of the variable */ if (special) { - varvalue(var, varflags & VSQUOTE, flag & EXP_FULL); + varvalue(var, varflags & VSQUOTE, subtype, flag); if (subtype == VSLENGTH) { varlen = expdest - stackblock() - startloc; STADJUST(-varlen, expdest); @@ -841,7 +841,7 @@ */ STATIC void -varvalue(char *name, int quoted, int allow_split) +varvalue(char *name, int quoted, int subtype, int flag) { int num; char *p; @@ -853,7 +853,7 @@ #define STRTODEST(p) \ do {\ - if (allow_split) { \ + if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH) { \ syntax = quoted? DQSYNTAX : BASESYNTAX; \ while (*p) { \ if (syntax[(int)*p] == CCTL) \ @@ -888,7 +888,7 @@ } break; case '@': - if (allow_split && quoted) { + if (flag & EXP_FULL && quoted) { for (ap = shellparam.p ; (p = *ap++) != NULL ; ) { STRTODEST(p); if (*ap) ==== //depot/projects/binutils/src/sbin/quotacheck/quotacheck.8#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)quotacheck.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/quotacheck/quotacheck.8,v 1.16 2005/02/10 09:19:32 ru Exp $ +.\" $FreeBSD: src/sbin/quotacheck/quotacheck.8,v 1.17 2006/11/07 19:07:52 ceri Exp $ .\" -.Dd June 5, 1993 +.Dd November 7, 2006 .Dt QUOTACHECK 8 .Os .Sh NAME @@ -40,6 +40,7 @@ .Sh SYNOPSIS .Nm .Op Fl guv +.Op Fl l Ar maxrun .Fl a .Nm .Op Fl guv @@ -72,6 +73,13 @@ Only group quotas listed in .Pa /etc/fstab are to be checked. +.It Fl l Ar maxrun +Specifies the maximum number of concurrent file systems +to check in parallel. +If this option is omitted, or if +.Ar maxrun +is zero, parallel passes are run as per +.Xr fsck 8 . .It Fl u Only user quotas listed in .Pa /etc/fstab ==== //depot/projects/binutils/src/sbin/quotacheck/quotacheck.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/quotacheck/quotacheck.c,v 1.25 2005/02/10 09:19:33 ru Exp $"); +__FBSDID("$FreeBSD: src/sbin/quotacheck/quotacheck.c,v 1.26 2006/11/07 19:07:52 ceri Exp $"); /* * Fix up / report on disk quotas & usage @@ -192,6 +192,12 @@ (void) addid((u_long)pw->pw_uid, USRQUOTA, pw->pw_name); endpwent(); } + /* + * Setting maxrun (-l) makes no sense without the -a flag. + * Historically this was never an error, so we just warn. + */ + if (maxrun > 0 && !aflag) + warnx("ignoring -l without -a"); if (aflag) exit(checkfstab(1, maxrun, needchk, chkquota)); if (setfsent() == 0) @@ -217,7 +223,7 @@ usage() { (void)fprintf(stderr, "%s\n%s\n", - "usage: quotacheck [-guv] -a", + "usage: quotacheck [-guv] [-l maxrun] -a", " quotacheck [-guv] filesystem ..."); exit(1); } ==== //depot/projects/binutils/src/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.657 2006/10/26 21:42:16 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.660 2006/11/07 21:57:18 ru Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -196,7 +196,7 @@ #ifdef PERFMON perfmon_init(); #endif - printf("usable memory = %ju (%ju MB)\n", ptoa((uintmax_t)physmem), + printf("usable memory = %ju (%ju MB)\n", ptoa((uintmax_t)physmem), ptoa((uintmax_t)physmem) / 1048576); realmem = Maxmem; /* @@ -220,7 +220,7 @@ vm_ksubmap_init(&kmi); - printf("avail memory = %ju (%ju MB)\n", + printf("avail memory = %ju (%ju MB)\n", ptoa((uintmax_t)cnt.v_free_count), ptoa((uintmax_t)cnt.v_free_count) / 1048576); @@ -747,8 +747,6 @@ ip->gd_hioffset = ((uintptr_t)func)>>16 ; } -#define IDTVEC(name) __CONCAT(X,name) - extern inthand_t IDTVEC(div), IDTVEC(dbg), IDTVEC(nmi), IDTVEC(bpt), IDTVEC(ofl), IDTVEC(bnd), IDTVEC(ill), IDTVEC(dna), IDTVEC(fpusegm), @@ -877,7 +875,7 @@ if (smap->base < physmap[i + 1]) { if (boothowto & RB_VERBOSE) printf( - "Overlapping or non-montonic memory region, ignoring second region\n"); + "Overlapping or non-monotonic memory region, ignoring second region\n"); continue; } } ==== //depot/projects/binutils/src/sys/amd64/linux32/linux.h#2 (text+ko) ==== @@ -27,14 +27,12 @@ * (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/linux32/linux.h,v 1.8 2006/10/29 14:02:38 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.9 2006/11/07 18:53:49 jhb Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ #define _AMD64_LINUX_LINUX_H_ -#include /* for sigval union */ - #include /* @@ -379,6 +377,11 @@ #define LINUX_SI_MAX_SIZE 128 #define LINUX_SI_PAD_SIZE ((LINUX_SI_MAX_SIZE/sizeof(l_int)) - 3) +union l_sigval { + l_int sival_int; + l_uintptr_t sival_ptr; +}; + typedef struct l_siginfo { l_int lsi_signo; l_int lsi_errno; @@ -399,7 +402,7 @@ struct { l_pid_t _pid; /* sender's pid */ l_uid16_t _uid; /* sender's uid */ - union sigval _sigval; + union l_sigval _sigval; } __packed _rt; struct { ==== //depot/projects/binutils/src/sys/arm/arm/cpufunc.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.12 2006/10/21 04:25:00 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.13 2006/11/07 22:36:56 cognet Exp $"); #include #include @@ -73,13 +73,17 @@ #include #endif +#if defined(CPU_XSCALE_81342) +#include +#endif + #ifdef CPU_XSCALE_IXP425 #include #include #endif #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) #include #endif @@ -570,6 +574,62 @@ /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 CPU_XSCALE_80219 */ +#ifdef CPU_XSCALE_81342 +struct cpu_functions xscalec3_cpufuncs = { + /* CPU functions */ + + cpufunc_id, /* id */ + xscale_cpwait, /* cpwait */ + + /* MMU functions */ + + xscale_control, /* control */ + cpufunc_domains, /* domain */ + xscalec3_setttb, /* setttb */ + cpufunc_faultstatus, /* faultstatus */ + cpufunc_faultaddress, /* faultaddress */ + + /* TLB functions */ + + armv4_tlb_flushID, /* tlb_flushID */ + xscale_tlb_flushID_SE, /* tlb_flushID_SE */ + armv4_tlb_flushI, /* tlb_flushI */ + (void *)armv4_tlb_flushI, /* tlb_flushI_SE */ + armv4_tlb_flushD, /* tlb_flushD */ + armv4_tlb_flushD_SE, /* tlb_flushD_SE */ + + /* Cache operations */ + + xscalec3_cache_syncI, /* icache_sync_all */ + xscale_cache_syncI_rng, /* icache_sync_range */ + + xscalec3_cache_purgeD, /* dcache_wbinv_all */ + xscalec3_cache_purgeD_rng, /* dcache_wbinv_range */ + xscale_cache_flushD_rng, /* dcache_inv_range */ + xscalec3_cache_cleanD_rng, /* dcache_wb_range */ + + xscalec3_cache_purgeID, /* idcache_wbinv_all */ + xscalec3_cache_purgeID_rng, /* idcache_wbinv_range */ + + /* Other functions */ + + cpufunc_nullop, /* flush_prefetchbuf */ + armv4_drain_writebuf, /* drain_writebuf */ + cpufunc_nullop, /* flush_brnchtgt_C */ + (void *)cpufunc_nullop, /* flush_brnchtgt_E */ + + xscale_cpu_sleep, /* sleep */ + + /* Soft functions */ + + cpufunc_null_fixup, /* dataabt_fixup */ + cpufunc_null_fixup, /* prefetchabt_fixup */ + + xscalec3_context_switch, /* context_switch */ + + xscale_setup /* cpu setup */ +}; +#endif /* CPU_XSCALE_81342 */ /* * Global constants also used by locore.s */ @@ -582,7 +642,7 @@ defined (CPU_ARM10) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) static void get_cachetype_cp15(void); @@ -895,7 +955,6 @@ if (cputype == CPU_ID_80321_400 || cputype == CPU_ID_80321_600 || cputype == CPU_ID_80321_400_B0 || cputype == CPU_ID_80321_600_B0 || cputype == CPU_ID_80219_400 || cputype == CPU_ID_80219_600) { - /* * Reset the Performance Monitoring Unit to a * pristine state: @@ -920,6 +979,19 @@ } #endif /* CPU_XSCALE_80321 */ +#if defined(CPU_XSCALE_81342) + if (cputype == CPU_ID_81342) { + cpufuncs = xscalec3_cpufuncs; +#if defined(PERFCTRS) + xscale_pmu_init(); +#endif + + cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ + get_cachetype_cp15(); + pmap_pte_init_xscale(); + return 0; + } +#endif /* CPU_XSCALE_81342 */ #ifdef CPU_XSCALE_PXA2X0 /* ignore core revision to test PXA2xx CPUs */ if ((cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA250 || @@ -1326,7 +1398,7 @@ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) #define IGN 0 #define OR 1 @@ -1794,7 +1866,7 @@ #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) struct cpu_option xscale_options[] = { #ifdef COMPAT_12 { "branchpredict", BIC, OR, CPU_CONTROL_BPRD_ENABLE }, ==== //depot/projects/binutils/src/sys/arm/arm/identcpu.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.8 2006/08/24 23:51:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.9 2006/11/07 22:36:57 cognet Exp $"); #include #include #include @@ -126,6 +126,13 @@ "rev 12", "rev 13", "rev 14", "rev 15", }; +static const char * const i81342_steppings[16] = { + "step A-0", "rev 1", "rev 2", "rev 3", + "rev 4", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + static const char * const pxa2x0_steppings[16] = { "step A-0", "step A-1", "step B-0", "step B-1", "step B-2", "step C-0", "rev 6", "rev 7", @@ -229,6 +236,9 @@ { CPU_ID_80321_600_B0, CPU_CLASS_XSCALE, "i80321 600MHz", i80321_steppings }, + { CPU_ID_81342, CPU_CLASS_XSCALE, "i81342", + i81342_steppings }, + { CPU_ID_80219_400, CPU_CLASS_XSCALE, "i80219 400MHz", xscale_steppings }, ==== //depot/projects/binutils/src/sys/arm/arm/intr.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.12 2005/12/22 22:16:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.13 2006/11/08 01:32:24 cognet Exp $"); #include #include #include @@ -106,6 +106,7 @@ struct thread *td = curthread; int i, thread; + PCPU_LAZY_INC(cnt.v_intr); td->td_intr_nesting_level++; while ((i = arm_get_next_irq()) != -1) { arm_mask_irq(i); ==== //depot/projects/binutils/src/sys/arm/arm/pmap.c#2 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.69 2006/08/28 21:43:34 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.71 2006/11/08 06:31:28 alc Exp $"); #include #include #include @@ -278,6 +278,8 @@ extern void bcopy_page(vm_offset_t, vm_offset_t); extern void bzero_page(vm_offset_t); +extern vm_offset_t alloc_firstaddr; + char *_tmppt; /* @@ -1960,7 +1962,7 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + vm_page_array_size; + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; pv_entry_high_water = 9 * (pv_entry_max / 10); l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); @@ -2784,6 +2786,11 @@ KASSERT(l2b != NULL, ("No L2 bucket in pmap_remove_pages")); pt = &l2b->l2b_kva[l2pte_index(pv->pv_va)]; m = PHYS_TO_VM_PAGE(*pt & L2_ADDR_MASK); +#ifdef ARM_USE_SMALL_ALLOC + KASSERT((vm_offset_t)m >= alloc_firstaddr, ("Trying to access non-existent page va %x pte %x", pv->pv_va, *pt)); +#else + KASSERT((vm_offset_t)m >= KERNBASE, ("Trying to access non-existent page va %x pte %x", pv->pv_va, *pt)); +#endif *pt = 0; PTE_SYNC(pt); npv = TAILQ_NEXT(pv, pv_plist); @@ -4563,7 +4570,7 @@ /* * pmap_link_l2pt: * - * Link the L2 page table specified by "pa" into the L1 + * Link the L2 page table specified by l2pv.pv_pa into the L1 * page table at the slot for "va". */ void @@ -4574,7 +4581,12 @@ proto = L1_S_DOM(PMAP_DOMAIN_KERNEL) | L1_C_PROTO; +#ifdef VERBOSE_INIT_ARM + printf("pmap_link_l2pt: pa=0x%x va=0x%x\n", l2pv->pv_pa, l2pv->pv_va); +#endif + pde[slot + 0] = proto | (l2pv->pv_pa + 0x000); + PTE_SYNC(&pde[slot]); SLIST_INSERT_HEAD(&kernel_pt_list, l2pv, pv_list); ==== //depot/projects/binutils/src/sys/arm/arm/vm_machdep.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.28 2006/10/24 23:27:52 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.29 2006/11/07 22:35:30 cognet Exp $"); #include #include @@ -456,7 +456,7 @@ MALLOC_DEFINE(M_VMSMALLALLOC, "vm_small_alloc", "VM Small alloc data"); -static vm_offset_t alloc_firstaddr; +vm_offset_t alloc_firstaddr; vm_offset_t arm_ptovirt(vm_paddr_t pa) ==== //depot/projects/binutils/src/sys/arm/include/armreg.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/armreg.h,v 1.4 2006/08/24 23:51:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/armreg.h,v 1.5 2006/11/07 22:36:56 cognet Exp $ */ #ifndef MACHINE_ARMREG_H @@ -157,6 +157,7 @@ #define CPU_ID_80321_600_B0 0x69052c30 #define CPU_ID_80219_400 0x69052e20 /* A0 stepping/revision. */ #define CPU_ID_80219_600 0x69052e30 /* A0 stepping/revision. */ +#define CPU_ID_81342 0x69056810 #define CPU_ID_IXP425_533 0x690541c0 #define CPU_ID_IXP425_400 0x690541d0 #define CPU_ID_IXP425_266 0x690541f0 ==== //depot/projects/binutils/src/sys/arm/include/atomic.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.19 2006/05/15 13:08:12 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.20 2006/11/07 11:53:44 cognet Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -337,6 +337,7 @@ #define atomic_cmpset_acq_int atomic_cmpset_32 #define atomic_cmpset_acq_ptr atomic_cmpset_ptr #define atomic_cmpset_acq_long atomic_cmpset_long +#define atomic_cmpset_acq_32 atomic_cmpset_32 #define atomic_store_rel_ptr atomic_store_ptr #define atomic_store_rel_int atomic_store_32 #define atomic_cmpset_rel_32 atomic_cmpset_32 ==== //depot/projects/binutils/src/sys/arm/include/cpuconf.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.8 2006/08/24 23:51:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.9 2006/11/07 22:36:56 cognet Exp $ * */ @@ -64,7 +64,8 @@ #define ARM_ARCH_4 0 #endif -#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || defined(CPU_XSCALE_80219) || \ +#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ defined(CPU_XSCALE_PXA2X0)) || defined(CPU_ARM10) #define ARM_ARCH_5 1 #else @@ -113,7 +114,7 @@ #if(defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219)) + defined(CPU_XSCALE_80219)) || defined(CPU_XSCALE_81342) #define ARM_MMU_XSCALE 1 #else #define ARM_MMU_XSCALE 0 @@ -132,7 +133,7 @@ */ #if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_80219)) + defined(CPU_XSCALE_80219)) || defined(CPU_XSCALE_81342) #define ARM_XSCALE_PMU 1 #else #define ARM_XSCALE_PMU 0 ==== //depot/projects/binutils/src/sys/arm/include/cpufunc.h#2 (text+ko) ==== @@ -38,7 +38,7 @@ * * Prototypes for cpu, mmu and tlb related functions. * - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.9 2006/08/24 23:51:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.10 2006/11/07 22:36:56 cognet Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -374,7 +374,7 @@ defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) void armv4_tlb_flushID (void); void armv4_tlb_flushI (void); @@ -392,7 +392,7 @@ #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) void xscale_cpwait (void); void xscale_cpu_sleep (int mode); @@ -433,6 +433,28 @@ #endif /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 CPU_XSCALE_80219 */ +#ifdef CPU_XSCALE_81342 + +void xscalec3_cache_cleanID (void); +void xscalec3_cache_cleanD (void); + +void xscalec3_cache_purgeID (void); +void xscalec3_cache_purgeID_E (u_int entry); +void xscalec3_cache_purgeD (void); +void xscalec3_cache_purgeD_E (u_int entry); + +void xscalec3_cache_syncI (void); +void xscalec3_cache_cleanID_rng (vm_offset_t start, vm_size_t end); +void xscalec3_cache_cleanD_rng (vm_offset_t start, vm_size_t end); +void xscalec3_cache_purgeID_rng (vm_offset_t start, vm_size_t end); +void xscalec3_cache_purgeD_rng (vm_offset_t start, vm_size_t end); + + +void xscalec3_setttb (u_int ttb); +void xscalec3_context_switch (void); + +#endif /* CPU_XSCALE_81342 */ + #define tlb_flush cpu_tlb_flushID #define setttb cpu_setttb #define drain_writebuf cpu_drain_writebuf ==== //depot/projects/binutils/src/sys/arm/include/pmap.h#2 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.20 2006/08/08 20:59:38 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.21 2006/11/07 22:36:56 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -426,7 +426,7 @@ extern void (*pmap_copy_page_func)(vm_paddr_t, vm_paddr_t); extern void (*pmap_zero_page_func)(vm_paddr_t, int, int); -#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 +#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 || defined(CPU_XSCALE_81342) void pmap_copy_page_generic(vm_paddr_t, vm_paddr_t); void pmap_zero_page_generic(vm_paddr_t, int, int); ==== //depot/projects/binutils/src/sys/cam/cam_xpt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.166 2006/11/02 00:54:33 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.168 2006/11/07 23:06:00 mjacob Exp $"); #include #include @@ -1607,6 +1607,9 @@ cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cts.type = CTS_TYPE_CURRENT_SETTINGS; xpt_action((union ccb*)&cts); + if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + return; + } /* Ask the SIM for its base transfer speed */ xpt_setup_ccb(&cpi.ccb_h, path, /*priority*/1); @@ -5835,6 +5838,9 @@ cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cts.type = CTS_TYPE_USER_SETTINGS; xpt_action((union ccb *)&cts); + if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + return; + } cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; cts.type = CTS_TYPE_CURRENT_SETTINGS; xpt_action((union ccb *)&cts); @@ -6356,7 +6362,9 @@ cur_cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; cur_cts.type = cts->type; xpt_action((union ccb *)&cur_cts); - + if ((cur_cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + return; + } cur_scsi = &cur_cts.proto_specific.scsi; if ((scsi->valid & CTS_SCSI_VALID_TQ) == 0) { scsi->flags &= ~CTS_SCSI_FLAGS_TAG_ENB; @@ -6403,8 +6411,8 @@ && (inq_data->flags & SID_Sync) == 0 && cts->type == CTS_TYPE_CURRENT_SETTINGS) || ((cpi.hba_inquiry & PI_SDTR_ABLE) == 0) - || (cur_spi->sync_offset == 0) - || (cur_spi->sync_period == 0)) { + || (spi->sync_offset == 0) + || (spi->sync_period == 0)) { /* Force async */ spi->sync_period = 0; spi->sync_offset = 0; ==== //depot/projects/binutils/src/sys/conf/files.arm#2 (text+ko) ==== @@ -1,4 +1,7 @@ -# $FreeBSD: src/sys/conf/files.arm,v 1.11 2006/07/14 00:50:51 cognet Exp $ +# $FreeBSD: src/sys/conf/files.arm,v 1.12 2006/11/08 20:51:01 sam Exp $ +crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp +crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \ + netsmb arm/arm/autoconf.c standard arm/arm/bcopy_page.S standard arm/arm/bcopyinout.S standard ==== //depot/projects/binutils/src/sys/conf/files.sun4v#2 (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.sun4v,v 1.2 2006/10/09 04:45:17 kmacy Exp $ +# $FreeBSD: src/sys/conf/files.sun4v,v 1.3 2006/11/08 21:45:45 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -20,7 +20,7 @@ # crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \ - netsmbcrypto + netsmb dev/ofw/ofw_bus_if.m standard dev/ofw/ofw_bus_subr.c standard dev/ofw/ofw_console.c optional ofw_console ==== //depot/projects/binutils/src/sys/dev/aha/ahareg.h#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/dev/aha/ahareg.h,v 1.19 2005/01/19 06:54:10 imp Exp $ + * $FreeBSD: src/sys/dev/aha/ahareg.h,v 1.20 2006/11/09 02:19:30 kevlo Exp $ */ #ifndef _AHAREG_H_ @@ -184,10 +184,6 @@ } config_data_t; typedef struct { - uint8_t enable; -} target_mode_params_t; - -typedef struct { uint8_t offset : 4, period : 3, sync : 1; @@ -212,28 +208,8 @@ uint8_t bios_mbox_addr[3]; } setup_data_t; -struct aha_isa_port { - uint16_t addr; - uint8_t bio; /* board IO offset */ -}; - #define AHA_NUM_ISAPORTS 6 -typedef enum { - BIO_330 = 0, - BIO_334 = 1, - BIO_230 = 2, - BIO_234 = 3, - BIO_130 = 4, - BIO_134 = 5, - BIO_DISABLED = 6, - BIO_DISABLED2 = 7 -} isa_compat_io_t; - -typedef struct { - uint8_t sync_rate[16]; /* Sync in 10ns units */ -} target_sync_info_data_t; - typedef struct { uint8_t len[3]; uint8_t addr[3]; @@ -409,7 +385,6 @@ void aha_free(struct aha_softc *); int aha_init(struct aha_softc *); void aha_intr(void *); -int aha_iop_from_bio(isa_compat_io_t); int aha_probe(struct aha_softc *); #define DEFAULT_CMD_TIMEOUT 10000 /* 1 sec */ ==== //depot/projects/binutils/src/sys/dev/iwi/if_iwi.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.41 2006/10/23 00:34:07 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.42 2006/11/07 19:03:42 jhb Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -488,13 +488,12 @@ struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = ic->ic_ifp; - iwi_stop(sc); - iwi_put_firmware(sc); - if (ifp != NULL) { + iwi_stop(sc); bpfdetach(ifp); ieee80211_ifdetach(ic); } + iwi_put_firmware(sc); iwi_free_cmd_ring(sc, &sc->cmdq); iwi_free_tx_ring(sc, &sc->txq[0]); ==== //depot/projects/binutils/src/sys/dev/pci/pci.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.319 2006/11/04 06:56:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.320 2006/11/07 18:55:51 jhb Exp $"); #include "opt_bus.h" @@ -83,11 +83,11 @@ static int pci_probe(device_t dev); static int pci_attach(device_t dev); static void pci_load_vendor_data(void); -static int pci_describe_parse_line(char **ptr, int *vendor, +static int pci_describe_parse_line(char **ptr, int *vendor, int *device, char **desc); static char *pci_describe_device(device_t dev); static int pci_modevent(module_t mod, int what, void *arg); -static void pci_hdrtypedata(device_t pcib, int b, int s, int f, +static void pci_hdrtypedata(device_t pcib, int b, int s, int f, pcicfgregs *cfg); static void pci_read_extcap(device_t pcib, pcicfgregs *cfg); static uint32_t pci_read_vpd_reg(device_t pcib, pcicfgregs *cfg, @@ -371,7 +371,7 @@ return (NULL); cfg = &devlist_entry->cfg; - + cfg->bus = b; cfg->slot = s; cfg->func = f; @@ -1124,14 +1124,14 @@ if (bootverbose) { pcicfgregs *cfg = &dinfo->cfg; - printf("found->\tvendor=0x%04x, dev=0x%04x, revid=0x%02x\n", + printf("found->\tvendor=0x%04x, dev=0x%04x, revid=0x%02x\n", cfg->vendor, cfg->device, cfg->revid); printf("\tbus=%d, slot=%d, func=%d\n", cfg->bus, cfg->slot, cfg->func); printf("\tclass=%02x-%02x-%02x, hdrtype=0x%02x, mfdev=%d\n", cfg->baseclass, cfg->subclass, cfg->progif, cfg->hdrtype, cfg->mfdev); - printf("\tcmdreg=0x%04x, statreg=0x%04x, cachelnsz=%d (dwords)\n", + printf("\tcmdreg=0x%04x, statreg=0x%04x, cachelnsz=%d (dwords)\n", cfg->cmdreg, cfg->statreg, cfg->cachelnsz); printf("\tlattimer=0x%02x (%d ns), mingnt=0x%02x (%d ns), maxlat=0x%02x (%d ns)\n", cfg->lattimer, cfg->lattimer * 30, cfg->mingnt, @@ -1161,7 +1161,7 @@ *(uint16_t *)&vrop->value[2])); else if (strncmp("RV", vrop->keyword, 2) == 0) printf("\tRV: %#hhx\n", vrop->value[0]); - else + else printf("\t%.2s: %s\n", vrop->keyword, vrop->value); } @@ -1281,6 +1281,7 @@ "pci%d:%d:%d bar %#x too many address bits", b, s, f, reg); return (barlen); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 9 14:14:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A01D816A4C9; Thu, 9 Nov 2006 14:14:47 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 76E6316A49E for ; Thu, 9 Nov 2006 14:14:47 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4019E43D77 for ; Thu, 9 Nov 2006 14:14:47 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA9EElYe017239 for ; Thu, 9 Nov 2006 14:14:47 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA9EEkCZ017236 for perforce@freebsd.org; Thu, 9 Nov 2006 14:14:46 GMT (envelope-from bushman@freebsd.org) Date: Thu, 9 Nov 2006 14:14:46 GMT Message-Id: <200611091414.kA9EEkCZ017236@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 109617 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 14:14:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=109617 Change 109617 by bushman@bushman_nss_ldap_cached on 2006/11/09 14:14:23 + bug in nss_ldap.c fixed - buffer and mdata pointers should be updated during several getent calls with small buffers (i.e. when we return NSS_LDAP_BUFFER_ERROR) + user names caching in ldap_group.c - optimizes getent() calls when groups with huge amount of members should be returned (and uniqueMember field is used) + small changes in _ATM _OCM _AT and _OC behavior to respect the map argument + some fixes in paged results parsing code. Several potential errors (hopefully errors) fixed (hopefully). + some minor fixes in style - some more debugging printf's added - they will be eliminated soon Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.c#15 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#15 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.c#11 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapschema.c#13 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapschema.h#11 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.c#17 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.h#15 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.c#16 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.h#16 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#17 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.h#13 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.c#15 (text+ko) ==== @@ -45,29 +45,63 @@ #include "ldapconf.h" #include "nss_ldap.h" +#define NSS_LDAP_MAP_USER_HASH_ENTRY_INITIAL_SIZE (8) +#define NSS_LDAP_MAP_USER_HASH_SIZE (127) + #define NSS_LDAP_MAP_GROUP_HASH_ENTRY_INITIAL_SIZE (8) #define NSS_LDAP_MAP_GROUP_HASH_SIZE (127) + #define NSS_LDAP_MAP_GROUP_DN_PROCESS_NESTED_FLAG (1) #define NSS_LDAP_MAP_GROUP_DN_USE_CACHE_FLAG (1 << 1) #define NSS_LDAP_MAP_GROUP_DN_USE_RDN_FLAG (1 << 2) -struct mapped_group { +/* + * Hashtable-and-friends definitions for caching mapped user names + */ +struct mapped_user { + char *dn; + char *mapped_name; +}; + +struct __mu_he { + HASHTABLE_ENTRY_HEAD(__mu_he_item, struct mapped_user) data; +}; + +HASHTABLE_HEAD(__mu_ht, __mu_he); + +struct group_mdata_ext { + struct __mu_ht *users; + struct __pg_ht *groups; +}; + +/* + * Hashtable-and-friends definitions for nested groups processing + */ +struct processed_group { char *dn; }; -struct __mg_he { - HASHTABLE_ENTRY_HEAD(__mg_he_item, struct mapped_group) data; +struct __pg_he { + HASHTABLE_ENTRY_HEAD(__pg_he_item, struct processed_group) data; }; +HASHTABLE_HEAD(__pg_ht, __pg_he); + struct map_group_dn_request { StringList *next_requests; - HASHTABLE_HEAD(__mg_ht, __mg_he) groups; + struct __mu_ht *users; + struct __pg_ht *groups; int flags; }; -static int __mg_ht_item_cmp_func(const void *, const void *); -static hashtable_index_t __mg_ht_item_hash_func(const void *, size_t); -HASHTABLE_PROTOTYPE(__mg_ht, __mg_he, struct mapped_group); +static int __mu_ht_item_cmp_func(const void *, const void *); +static hashtable_index_t __mu_ht_item_hash_func(const void *, size_t); +HASHTABLE_PROTOTYPE(__mu_ht, __mu_he, struct mapped_user); + +static int __pg_ht_item_cmp_func(const void *, const void *); +static hashtable_index_t __pg_ht_item_hash_func(const void *, size_t); +HASHTABLE_PROTOTYPE(__pg_ht, __pg_he, struct processed_group); + static int nss_ldap_map_group_dn(struct nss_ldap_search_context *, char const *, char **, size_t *, char *, size_t, void *); static int nss_ldap_parse_nested_group(struct nss_ldap_search_context *, @@ -75,10 +109,9 @@ size_t *, char *, size_t); static int nss_ldap_parse_group(struct nss_ldap_parse_context *); +static void nss_ldap_destroy_group_ctx(struct nss_ldap_parse_context *); -//static int ldap_getgrnam_r(const char *, struct group *, char *, size_t, -// struct group **); -int ldap_getgrnam_r(const char *, struct group *, char *, size_t, +static int ldap_getgrnam_r(const char *, struct group *, char *, size_t, struct group **); static int ldap_getgrgid_r(gid_t, struct group *, char *, size_t, struct group **); @@ -86,51 +119,85 @@ static void ldap_setgrent(); static int -__mg_ht_item_cmp_func(const void *p1, const void *p2) +__mu_ht_item_cmp_func(const void *p1, const void *p2) +{ + + return (strcmp( + ((struct mapped_user *)p1)->dn, + ((struct mapped_user *)p2)->dn)); + +} + +static hashtable_index_t +__mu_ht_item_hash_func(const void *p, size_t cache_entries_size) +{ + struct mapped_user const *mu; + size_t i, len; + hashtable_index_t retval; + + mu = p; + assert(mu->dn != NULL); + + len = strlen(mu->dn); + retval = 0; + for (i = 0; i < len; ++i) + retval = (127 * retval + (unsigned char)mu->dn[i]) % + cache_entries_size; + + return (retval); +} + +static int +__pg_ht_item_cmp_func(const void *p1, const void *p2) { return (strcmp( - ((struct mapped_group *)p1)->dn, - ((struct mapped_group *)p2)->dn)); + ((struct processed_group *)p1)->dn, + ((struct processed_group *)p2)->dn)); } static hashtable_index_t -__mg_ht_item_hash_func(const void *p, size_t cache_entries_size) +__pg_ht_item_hash_func(const void *p, size_t cache_entries_size) { - struct mapped_group const *mg; + struct processed_group const *pg; size_t i, len; hashtable_index_t retval; - mg = p; - assert(mg->dn != NULL); + pg = p; + assert(pg->dn != NULL); - len = strlen(mg->dn); + len = strlen(pg->dn); retval = 0; for (i = 0; i < len; ++i) - retval = (127 * retval + (unsigned char)mg->dn[i]) % + retval = (127 * retval + (unsigned char)pg->dn[i]) % cache_entries_size; - return retval; + return (retval); } -HASHTABLE_GENERATE(__mg_ht, __mg_he, struct mapped_group, data, - __mg_ht_item_hash_func, __mg_ht_item_cmp_func); +HASHTABLE_GENERATE(__mu_ht, __mu_he, struct mapped_user, data, + __mu_ht_item_hash_func, __mu_ht_item_cmp_func); +HASHTABLE_GENERATE(__pg_ht, __pg_he, struct processed_group, data, + __pg_ht_item_hash_func, __pg_ht_item_cmp_func); static int nss_ldap_map_group_dn(struct nss_ldap_search_context *ctx, char const *dn, char **res, size_t *res_size, char *buf, size_t bufsize, void *mdata) { struct nss_ldap_search_request sreq; - struct mapped_group new_mg; + struct processed_group new_pg; + struct mapped_user new_mu; struct nss_ldap_search_context *newctx; struct map_group_dn_request *req; char **cp; char const *uid_attr, *gid_attr; - struct mapped_group *hash_entry_data; - struct __mg_he *hash_entry; - hashtable_index_t hash; - int rv; + struct processed_group *group_hash_entry_data; + struct __pg_he *group_hash_entry; + struct mapped_user *user_hash_entry_data; + struct __mu_he *user_hash_entry; + hashtable_index_t group_hash, user_hash; + int rv, rv2; assert(ctx != NULL); assert(dn != NULL); @@ -139,34 +206,64 @@ assert(buf != NULL); assert(mdata != NULL); - //printf("__ %s %d %s\n", __FILE__, __LINE__, dn); - req = mdata; newctx = NULL; + + if (req->users == NULL) { + req->users = malloc(sizeof(struct __mu_ht)); + if (req->users == NULL) { + rv = NSS_LDAP_MEMORY_ERROR; + goto fin; + } + HASHTABLE_INIT(req->users, struct mapped_user, data, + NSS_LDAP_MAP_USER_HASH_SIZE, + NSS_LDAP_MAP_USER_HASH_ENTRY_INITIAL_SIZE); + if (!HASHTABLE_OK(req->users)) { + rv = NSS_LDAP_MEMORY_ERROR; + goto fin; + } + } - memset(&new_mg, 0, sizeof(new_mg)); - new_mg.dn = (char *)dn; + memset(&sreq, 0, sizeof(sreq)); + memset(&new_pg, 0, sizeof(new_pg)); + memset(&new_mu, 0, sizeof(new_mu)); + new_pg.dn = new_mu.dn = (char *)dn; + + group_hash = HASHTABLE_CALCULATE_HASH(__pg_ht, req->groups, &new_pg); + assert(group_hash > 0); + assert(group_hash < HASHTABLE_ENTRIES_COUNT(req->groups)); - hash = HASHTABLE_CALCULATE_HASH(__mg_ht, &req->groups, &new_mg); - assert(hash > 0); - assert(hash < HASHTABLE_ENTRIES_COUNT(&req->groups)); - - hash_entry = HASHTABLE_GET_ENTRY(&req->groups, hash); - hash_entry_data = HASHTABLE_ENTRY_FIND(__mg_ht, hash_entry, - &new_mg); - if (hash_entry_data != NULL) { + group_hash_entry = HASHTABLE_GET_ENTRY(req->groups, group_hash); + group_hash_entry_data = HASHTABLE_ENTRY_FIND(__pg_ht, group_hash_entry, + &new_pg); +// printf("__ %s %d\n", __FILE__, __LINE__); + if (group_hash_entry_data != NULL) { rv = NSS_LDAP_SUCCESS; *res_size = 0; - //printf("__ %s %d\n", __FILE__, __LINE__); +// printf("__ %s %d\n", __FILE__, __LINE__); + goto fin; + } + + user_hash = HASHTABLE_CALCULATE_HASH(__mu_ht, req->users, &new_mu); + assert(user_hash > 0); + assert(user_hash < HASHTABLE_ENTRIES_COUNT(req->users)); + + user_hash_entry = HASHTABLE_GET_ENTRY(req->users, user_hash); + user_hash_entry_data = HASHTABLE_ENTRY_FIND(__mu_ht, user_hash_entry, + &new_mu); + if (user_hash_entry_data != NULL) { + rv = __nss_ldap_assign_str(user_hash_entry_data->mapped_name, + res, res_size, buf, bufsize); goto fin; } - memset(&sreq, 0, sizeof(sreq)); sreq.scope = LDAP_SCOPE_BASE; sreq.filter = "(objectClass=*)"; sreq.search_base = (char *)dn; + sreq.map = NSS_LDAP_MAP_GROUP; +// printf("__ %s %d\n", __FILE__, __LINE__); uid_attr = _ATM(&ctx->conf->schema, PASSWD, uid); gid_attr = _ATM(&ctx->conf->schema, GROUP, gidNumber); sreq.attributes = sl_init(); @@ -176,12 +273,14 @@ goto fin; } +// printf("__ %s %d\n", __FILE__, __LINE__); rv = sl_add(sreq.attributes, (char *)gid_attr); if (rv == -1) { rv = NSS_LDAP_MEMORY_ERROR; goto fin; } +// printf("__ %s %d\n", __FILE__, __LINE__); rv = sl_add(sreq.attributes, "objectClass"); if (rv == -1) { rv = NSS_LDAP_MEMORY_ERROR; @@ -207,6 +306,7 @@ goto fin2; } +// printf("__ %s %d\n", __FILE__, __LINE__); rv = __nss_ldap_search_next(&__nss_ldap_conf->search_method, newctx); if (rv != NSS_LDAP_SUCCESS) { @@ -215,18 +315,19 @@ goto fin2; } - new_mg.dn = strdup(dn); - if (new_mg.dn == NULL) { + new_pg.dn = strdup(dn); + if (new_pg.dn == NULL) { rv = NSS_LDAP_MEMORY_ERROR; goto fin2; } +// printf("__ %s %d\n", __FILE__, __LINE__); if (__nss_ldap_check_oc(newctx, _OC(&ctx->conf->schema, posixGroup)) == NSS_LDAP_SUCCESS) { - rv = sl_add(req->next_requests, new_mg.dn); + rv = sl_add(req->next_requests, new_pg.dn); if (rv == -1) { - free(new_mg.dn); + free(new_pg.dn); rv = NSS_LDAP_MEMORY_ERROR; goto fin2; } @@ -237,12 +338,35 @@ rv = __nss_ldap_assign_attr_str(newctx, uid_attr, res, res_size, buf, bufsize); - rv = HASHTABLE_ENTRY_STORE(__mg_ht, hash_entry, &new_mg); - if (rv == -1) { - free(new_mg.dn); - rv = NSS_LDAP_MEMORY_ERROR; - } else - rv = NSS_LDAP_SUCCESS; + rv2 = HASHTABLE_ENTRY_STORE(__pg_ht, group_hash_entry, &new_pg); + if (rv2 == -1) { + free(new_pg.dn); + if (rv == NSS_LDAP_SUCCESS) + rv = NSS_LDAP_MEMORY_ERROR; + goto fin2; + } + + if (rv == NSS_LDAP_SUCCESS) { + new_mu.dn = strdup(dn); + if (new_mu.dn == NULL) { + rv = NSS_LDAP_MEMORY_ERROR; + goto fin2; + } + new_mu.mapped_name = strdup(*res); + if (new_mu.mapped_name == NULL) { + free(new_mu.dn); + rv = NSS_LDAP_MEMORY_ERROR; + goto fin2; + } + rv2 = HASHTABLE_ENTRY_STORE(__mu_ht, user_hash_entry, + &new_mu); + if (rv2 == -1) { + free(new_mu.dn); + free(new_mu.mapped_name); + rv = NSS_LDAP_MEMORY_ERROR; + goto fin2; + } + } } fin: @@ -250,9 +374,11 @@ sl_free(sreq.attributes, 0); fin2: +// printf("__ %s %d\n", __FILE__, __LINE__); if (newctx != NULL) __nss_ldap_end_search(&__nss_ldap_conf->search_method, newctx); +// printf("__ %s %d\n", __FILE__, __LINE__); return (rv); } @@ -270,6 +396,7 @@ sreq.scope = LDAP_SCOPE_BASE; sreq.filter = "(objectClass=*)"; sreq.search_base = (char *)dn; + sreq.map = NSS_LDAP_MAP_GROUP; //printf("__ %s %d\n", __FILE__, __LINE__); newctx = __nss_ldap_start_search(&__nss_ldap_conf->search_method, @@ -285,7 +412,6 @@ goto fin; } - printf("__ %s %d\n", __FILE__, __LINE__); rv = __nss_ldap_assign_attr_multi_str_paged_ext(newctx, _ATM(&ctx->conf->schema, GROUP, uniqueMember), res, res_size, len, buf, bufsize, @@ -295,7 +421,6 @@ nss_ldap_map_group_dn, (void *)dnreq); fin: - printf("__ %s %d %d\n", __FILE__, __LINE__, rv); if (newctx != NULL) __nss_ldap_end_search(&__nss_ldap_conf->search_method, newctx); @@ -307,23 +432,25 @@ static int nss_ldap_parse_group(struct nss_ldap_parse_context *pctx) { + struct group_mdata_ext *gmdata; struct map_group_dn_request dnreq; struct nss_ldap_schema *schema; struct nss_ldap_search_context *sctx; struct group *grp; char *buf, *rbuf; char **res, **new_res; - struct __mg_he *hash_entry; - struct mapped_group *hash_data; + struct __pg_he *group_hash_entry; + struct processed_group *group_hash_data; size_t len, memlen, res_memlen, nr_offset; int rv; assert(pctx != NULL); sctx = pctx->sctx; - grp = (struct group *)pctx->mdata; + grp = pctx->mdata; buf = pctx->buffer; - rbuf = buf + pctx->bufsize; + rbuf = buf + pctx->bufsize; + gmdata = pctx->mdata_ext; schema = &sctx->conf->schema; // printf("__ %s %d\n", __FILE__, __LINE__); @@ -340,7 +467,7 @@ &grp->gr_name, &len, buf, rbuf - buf); if (rv != NSS_LDAP_SUCCESS) goto errfin; - //printf("__ %s %d\n", __FILE__, __LINE__); +// printf("__ %s %d %s\n", __FILE__, __LINE__, grp->gr_name); buf += len; rv = __nss_ldap_assign_attr_password(sctx, @@ -359,37 +486,54 @@ &res, &memlen, &len, buf, rbuf - buf, NSS_LDAP_ATTR_MULTI_STR_END_WITH_PTRS_FLAG | NSS_LDAP_ATTR_MULTI_STR_DONT_PACK_PTRS_FLAG, NULL, NULL); - //printf("__ %s %d %d\n", __FILE__, __LINE__, rv); if (rv == NSS_LDAP_SUCCESS) { -// char **cp; -// for (cp = res; *cp; ++cp) { -// printf("__ %s %d %p\n", __FILE__, __LINE__, (void *)*cp); -// printf("__ %s %d %s\n", __FILE__, __LINE__, *cp); -// } - rbuf = (char *)res; buf += len; grp->gr_mem = res; } + if (gmdata == NULL) { + gmdata = malloc(sizeof(struct group_mdata_ext)); + if (gmdata == NULL) { + rv = NSS_LDAP_MEMORY_ERROR; + goto errfin; + } + memset(gmdata, 0, sizeof(struct group_mdata_ext)); + pctx->mdata_ext = gmdata; + + gmdata->groups = malloc(sizeof(struct __pg_ht)); + if (gmdata->groups == NULL) { + rv = NSS_LDAP_MEMORY_ERROR; + goto errfin; + } + + HASHTABLE_INIT(gmdata->groups, struct processed_group, data, + NSS_LDAP_MAP_GROUP_HASH_SIZE, + NSS_LDAP_MAP_GROUP_HASH_ENTRY_INITIAL_SIZE); + if (!HASHTABLE_OK(gmdata->groups)) { + rv = NSS_LDAP_MEMORY_ERROR; + goto errfin; + } + } else + HASHTABLE_FOREACH(gmdata->groups, group_hash_entry) { + HASHTABLE_ENTRY_FOREACH(group_hash_entry, data, + group_hash_data) + free(group_hash_data->dn); + + HASHTABLE_ENTRY_CLEAR(group_hash_entry, data); + } + nr_offset = 0; memset(&dnreq, 0, sizeof(struct nss_ldap_dn2attr_request)); dnreq.flags = NSS_LDAP_MAP_GROUP_DN_PROCESS_NESTED_FLAG; + dnreq.groups = gmdata->groups; + dnreq.users = gmdata->users; dnreq.next_requests = sl_init(); if (dnreq.next_requests == NULL) { rv = NSS_LDAP_MEMORY_ERROR; goto errfin; } - HASHTABLE_INIT(&dnreq.groups, struct mapped_group, data, - NSS_LDAP_MAP_GROUP_HASH_SIZE, - NSS_LDAP_MAP_GROUP_HASH_ENTRY_INITIAL_SIZE); - if (!HASHTABLE_OK(&dnreq.groups)) { - rv = NSS_LDAP_MEMORY_ERROR; - sl_free(dnreq.next_requests, 0); - goto errfin; - } -// printf("__ %s %d %d %p %s\n", __FILE__, __LINE__, rv, (void *)grp->gr_mem, grp->gr_name); if (rv != NSS_LDAP_BUFFER_ERROR) { res_memlen = memlen; @@ -401,25 +545,18 @@ (grp->gr_mem == NULL ? 0 : NSS_LDAP_ATTR_MULTI_STR_NO_END_NULL_FLAG), nss_ldap_map_group_dn, (void *)&dnreq); - //printf("__ %s %d %d\n", __FILE__, __LINE__, rv); + if (rv == NSS_LDAP_SUCCESS) { res_memlen += memlen; grp->gr_mem = res; rbuf = (char *)res; buf += len; -// char **cp; -// for (cp = res; *cp; ++cp) { -// printf("__ %s %d %p\n", __FILE__, __LINE__, (void *)*cp); -// printf("==__ %s %d %s\n", __FILE__, __LINE__, *cp); -// } //printf("__ %s %d %d %d %d\n", __FILE__, __LINE__, // nr_offset, // dnreq.next_requests->sl_cur, // dnreq.next_requests->sl_max); while (nr_offset < dnreq.next_requests->sl_cur) { - - //printf("__ %s %d\n", __FILE__, __LINE__); rv = nss_ldap_parse_nested_group(sctx, dnreq.next_requests->sl_str[nr_offset], &dnreq, &res, &memlen, &len, buf, @@ -456,6 +593,12 @@ // printf("__ %s %d %s\n", __FILE__, __LINE__, *cp); } +// char **cp; +// for (cp = grp->gr_mem; *cp; ++cp) { +// printf("__ %s %d %p %p %p\n", __FILE__, __LINE__, (void *)cp, (void *)*cp, (void *)buf); +// printf("__ %s %d %s\n", __FILE__, __LINE__, *cp); +// } + if ((grp->gr_mem != NULL) && (rv != NSS_LDAP_BUFFER_ERROR)) { new_res = (char **)ALIGN(rbuf); if (new_res != grp->gr_mem) { @@ -465,25 +608,71 @@ } rv = NSS_LDAP_SUCCESS; } + + /* + * Users hash table could be allocated by + * nss_ldap_map_group_dn + */ + gmdata->users = dnreq.users; } - HASHTABLE_FOREACH(&dnreq.groups, hash_entry) { - HASHTABLE_ENTRY_FOREACH(hash_entry, data, hash_data) - free(hash_data->dn); + sl_free(dnreq.next_requests, 0); +errfin: +// printf("__ %s %d %d\n", __FILE__, __LINE__, rv); + return (rv); +} - HASHTABLE_ENTRY_CLEAR(hash_entry, data); - } +static void +nss_ldap_destroy_group_ctx(struct nss_ldap_parse_context *pctx) +{ + struct group_mdata_ext *gmdata; + + struct __mu_he *user_hash_entry; + struct mapped_user *user_hash_data; + + struct __pg_he *group_hash_entry; + struct processed_group *group_hash_data; + assert(pctx != NULL); + printf("%s %d\n", __FILE__, __LINE__); + if (pctx->mdata_ext != NULL) { + gmdata = pctx->mdata_ext; - sl_free(dnreq.next_requests, 0); - HASHTABLE_DESTROY(&dnreq.groups, data); -errfin: -// printf("__ %s %d %d %p %s\n", __FILE__, __LINE__, rv, (void *)grp->gr_mem, grp->gr_name); - return (rv); + printf("%s %d\n", __FILE__, __LINE__); + if (gmdata->users != NULL) { + HASHTABLE_FOREACH(gmdata->users, user_hash_entry) { + HASHTABLE_ENTRY_FOREACH(user_hash_entry, data, + user_hash_data) { + free(user_hash_data->dn); + free(user_hash_data->mapped_name); + } + + HASHTABLE_ENTRY_CLEAR(user_hash_entry, data); + } + HASHTABLE_DESTROY(gmdata->users, data); + free(gmdata->users); + printf("%s %d\n", __FILE__, __LINE__); + } + + printf("%s %d\n", __FILE__, __LINE__); + if (gmdata->groups != NULL) { + HASHTABLE_FOREACH(gmdata->groups, group_hash_entry) { + HASHTABLE_ENTRY_FOREACH(group_hash_entry, data, + group_hash_data) + free(group_hash_data->dn); + + HASHTABLE_ENTRY_CLEAR(group_hash_entry, data); + } + HASHTABLE_DESTROY(gmdata->groups, data); + free(gmdata->groups); + printf("%s %d\n", __FILE__, __LINE__); + } + + free(gmdata); + } } -//static int -int +static int ldap_getgrnam_r(const char *name, struct group *grp, char *buffer, size_t bufsize, struct group **result) { @@ -500,7 +689,8 @@ sizeof(filter), name); rv = __nss_ldap_getby(NSS_LDAP_MAP_GROUP, filter, (void *)grp, - buffer, bufsize, nss_ldap_parse_group); + buffer, bufsize, nss_ldap_parse_group, + nss_ldap_destroy_group_ctx); if (rv == NS_SUCCESS) *result = grp; @@ -525,7 +715,8 @@ sizeof(filter), gid); rv = __nss_ldap_getby(NSS_LDAP_MAP_GROUP, filter, (void *)grp, - buffer, bufsize, nss_ldap_parse_group); + buffer, bufsize, nss_ldap_parse_group, + nss_ldap_destroy_group_ctx); if (rv == NS_SUCCESS) *result = grp; @@ -546,7 +737,8 @@ return (NS_UNAVAIL); rv = __nss_ldap_getent(NSS_LDAP_MAP_GROUP, filter, (void *)grp, - buffer, bufsize, nss_ldap_parse_group, NULL); + buffer, bufsize, nss_ldap_parse_group, + nss_ldap_destroy_group_ctx); if (rv == NS_SUCCESS) *result = grp; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#15 (text+ko) ==== @@ -200,7 +200,7 @@ sizeof(filter), name); rv = __nss_ldap_getby(NSS_LDAP_MAP_PASSWD, filter, (void *)pwd, - buffer, bufsize, nss_ldap_parse_passwd); + buffer, bufsize, nss_ldap_parse_passwd, NULL); if (rv == NS_SUCCESS) *result = pwd; @@ -225,7 +225,7 @@ sizeof(filter), uid); rv = __nss_ldap_getby(NSS_LDAP_MAP_PASSWD, filter, (void *)pwd, - buffer, bufsize, nss_ldap_parse_passwd); + buffer, bufsize, nss_ldap_parse_passwd, NULL); if (rv == NS_SUCCESS) *result = pwd; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.c#11 (text+ko) ==== @@ -59,7 +59,7 @@ }; static int nss_ldap_parse_servent(struct nss_ldap_parse_context *); -static void nss_ldap_destroy_servent(struct nss_ldap_parse_context *); +static void nss_ldap_destroy_servent_ctx(struct nss_ldap_parse_context *); static int ldap_getservbyname_r(const char *, const char *, struct servent *, char *, size_t, struct servent **); @@ -147,9 +147,9 @@ if (++serv_mdata_ext->offset >= serv_mdata_ext->count) { serv_mdata_ext->offset = -1; serv_mdata_ext->count = 0; - pctx->need_no_more = 0; + pctx->need_no_more = NSS_LDAP_NEED_NO_MORE_OFF; } else - pctx->need_no_more = 1; + pctx->need_no_more = NSS_LDAP_NEED_NO_MORE_ON; buflen -= len; buf += len; @@ -190,7 +190,7 @@ } static void -nss_ldap_destroy_servent(struct nss_ldap_parse_context *pctx) +nss_ldap_destroy_servent_ctx(struct nss_ldap_parse_context *pctx) { assert(pctx != NULL); @@ -225,7 +225,7 @@ rv = __nss_ldap_getby(NSS_LDAP_MAP_SERVICES, filter, (void *)&mdata, buffer, bufsize, - nss_ldap_parse_servent); + nss_ldap_parse_servent, NULL); if (rv == NS_SUCCESS) *result = serv; @@ -261,7 +261,7 @@ rv = __nss_ldap_getby(NSS_LDAP_MAP_SERVICES, filter, (void *)&mdata, buffer, bufsize, - nss_ldap_parse_servent); + nss_ldap_parse_servent, NULL); printf("== %d\n", rv); if (rv == NS_SUCCESS) @@ -289,7 +289,7 @@ rv = __nss_ldap_getent(NSS_LDAP_MAP_SERVICES, filter, (void *)&mdata, buffer, bufsize, nss_ldap_parse_servent, - nss_ldap_destroy_servent); + nss_ldap_destroy_servent_ctx); if (rv == NS_SUCCESS) *result = serv; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapschema.c#13 (text+ko) ==== @@ -353,18 +353,28 @@ struct nss_ldap_schema_rule * __nss_ldap_find_rule(struct nss_ldap_rules_collection *rules, - char const *left_arg) + char const *left_arg, int map) { + struct nss_ldap_schema_rule *first_chance; size_t i; assert(rules != NULL); assert(left_arg != NULL); + /* + * Concrete rules mappings (with .map != NSS_LDAP_MAP_NONE) take + * precedence of global mappings (with .map == NSS_LDAP_MAP_NONE). + */ + first_chance = NULL; for (i = 0; i < rules->rules_size; ++i) - if (strcmp(rules->rules[i].left_arg, left_arg) == 0) - return (&rules->rules[i]); + if (strcmp(rules->rules[i].left_arg, left_arg) == 0) { + if (rules->rules[i].map == map) + return (&rules->rules[i]); + else if (rules->rules[i].map == NSS_LDAP_MAP_NONE) + first_chance = &rules->rules[i]; + } - return (NULL); + return (first_chance); } void @@ -394,7 +404,7 @@ result = __nss_ldap_find_rule( __nss_ldap_get_schema_rules(schema, NSS_LDAP_SCHEMA_MAP_ATTRIBUTE_RULES), - key); + key, map); return (result == NULL ? key : result->right_arg); } @@ -413,7 +423,7 @@ result = __nss_ldap_find_rule( __nss_ldap_get_schema_rules(schema, NSS_LDAP_SCHEMA_MAP_OBJECTCLASS_RULES), - key); + key, NSS_LDAP_MAP_NONE); return (result == NULL ? key : result->right_arg); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapschema.h#11 (text+ko) ==== @@ -67,6 +67,7 @@ { char *left_arg; char *right_arg; + int map; }; struct nss_ldap_rules_collection @@ -116,7 +117,7 @@ size_t ); struct nss_ldap_schema_rule *__nss_ldap_find_rule( struct nss_ldap_rules_collection *, - char const *); + char const *, int); extern void __nss_ldap_destroy_rules_collection( struct nss_ldap_rules_collection *); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.c#17 (text+ko) ==== @@ -77,6 +77,7 @@ return (NSS_LDAP_MEMORY_ERROR); dest->scope = src->scope; + dest->map = src->map; dest->filter = strdup(src->filter); if (dest->filter == NULL) @@ -91,9 +92,13 @@ s = strdup(*cp); if (s == NULL) return (NSS_LDAP_MEMORY_ERROR); - if (sl_add(dest->attributes,s) != 0) + if (sl_add(dest->attributes, s) != 0) { + free(s); return (NSS_LDAP_MEMORY_ERROR); + } } + if (sl_add(dest->attributes, NULL) != 0) + return (NSS_LDAP_MEMORY_ERROR); } else dest->attributes = NULL; @@ -154,7 +159,10 @@ } if (!(flags & NSS_LDAP_ATTR_MULTI_STR_NO_END_NULL_FLAG)) *(siter + 1) = NULL; + + //printf("%s %d\n", __FILE__, __LINE__); rbuf = (char *)siter; + *str_array = siter + 1; } else { siter = (char **)ALIGN(buf); if ((char *)siter + size >= rbuf) { @@ -167,12 +175,16 @@ } buf = (char *)siter + size; + *str_array = siter; } - *str_array = siter; - + //printf("%s %d\n", __FILE__, __LINE__); + if (values != NULL) { + //printf("%s %d\n", __FILE__, __LINE__); for (viter = values; *viter; ++viter) { + //printf("%s %d %p %p\n", __FILE__, __LINE__, (void *)*siter, (void *)**str_array); + //printf("%s %d %p %p\n", __FILE__, __LINE__, (void *)siter, (void *)*str_array); if (sp_fn == NULL) rv = __nss_ldap_assign_str(*viter, siter, &size, buf, rbuf - buf); @@ -181,17 +193,16 @@ rbuf - buf, mdata); if (rv != NSS_LDAP_SUCCESS) { - //printf("__ %s %d %d\n", __FILE__, __LINE__, rv); ldap_value_free(values); goto fin; } if (size > 0) { - //printf("__%s %d %s\n", __FILE__, __LINE__, *siter); ++*str_array_size; buf += size; if (flags & - NSS_LDAP_ATTR_MULTI_STR_END_WITH_PTRS_FLAG) { + NSS_LDAP_ATTR_MULTI_STR_END_WITH_PTRS_FLAG) { + --*str_array; --siter; if ((char *)siter <= buf) { rv = NSS_LDAP_BUFFER_ERROR; @@ -206,13 +217,21 @@ ldap_value_free(values); } - + if (!(flags & (NSS_LDAP_ATTR_MULTI_STR_NO_END_NULL_FLAG | NSS_LDAP_ATTR_MULTI_STR_END_WITH_PTRS_FLAG))) *siter = NULL; +// if (rv == NSS_LDAP_SUCCESS) { +// char **cp; +// for (cp = *str_array; *cp; ++cp) { +// printf("_____ %s %d %p %d\n", __FILE__, __LINE__, (void *)*cp, flags & NSS_LDAP_ATTR_MULTI_STR_NO_END_NULL_FLAG); +// printf("_____ %s %d %s\n", __FILE__, __LINE__, *cp); +// } +// } + if (flags & NSS_LDAP_ATTR_MULTI_STR_END_WITH_PTRS_FLAG) { - *str_array = siter + 1; +// *str_array = siter + 1; if (!(flags & NSS_LDAP_ATTR_MULTI_STR_DONT_PACK_PTRS_FLAG)) { new_res_arr = (char **)ALIGN(buf); @@ -220,18 +239,15 @@ memmove(new_res_arr, *str_array, sizeof(char *) * (*str_array_size)); *str_array = new_res_arr; - } - + } } } *len = buf - sbuf; //printf("%s %d %d %d %p %p %d %d\n", __FILE__, __LINE__, *len, *str_array_size, (void *)(sbuf + bufsize), (void *)*str_array, (size_t)(sbuf + bufsize - (char *)(*str_array)), (size_t)(sbuf + bufsize - (char *)(*str_array))/ sizeof( char *)); rv = NSS_LDAP_SUCCESS; - //printf("__ %s %d %d\n", __FILE__, __LINE__, *str_array_size); fin: - //printf("__ %s %d %d\n", __FILE__, __LINE__, rv); return (rv); } @@ -250,12 +266,10 @@ size_t res_arr_size, res_buf_size, res_buf_offset, res_arr_offset; int range_start, range_end, rv, sf; - //printf("__ %s %d %s %s\n", __FILE__, __LINE__, attr, attr_model); rv = __nss_ldap_parse_range(attr, &range_start, &range_end); if (rv != NSS_LDAP_SUCCESS) return (rv); - //printf("__ %s %d\n", __FILE__, __LINE__); sbuf = buf; rbuf = buf + bufsize; res_arr_size = 0; @@ -267,11 +281,11 @@ rv = do_assign_attr_multi_str(ctx, attr, &res_arr, &res_arr_offset, &res_buf_offset, buf, rbuf - buf, - (flags & NSS_LDAP_ATTR_MULTI_STR_NO_END_NULL_FLAG) | + (flags & ~NSS_LDAP_ATTR_MULTI_STR_NO_END_NULL_FLAG) | (sf == 0 ? NSS_LDAP_ATTR_MULTI_STR_END_WITH_PTRS_FLAG : NSS_LDAP_ATTR_MULTI_STR_END_WITH_PTRS_FLAG | NSS_LDAP_ATTR_MULTI_STR_NO_END_NULL_FLAG) | - NSS_LDAP_ATTR_MULTI_STR_DONT_PACK_PTRS_FLAG, + NSS_LDAP_ATTR_MULTI_STR_DONT_PACK_PTRS_FLAG, sp_fn, mdata); if (rv != NSS_LDAP_SUCCESS) break; @@ -285,6 +299,7 @@ sreq.scope = LDAP_SCOPE_BASE; sreq.filter = "(objectClass=*)"; + sreq.map = ctx->search_request.map; sreq.search_base = ldap_get_dn(ctx->conn->ld, ctx->msg); if (sreq.search_base == NULL) { rv = NSS_LDAP_CONNECTION_ERROR; @@ -354,7 +369,6 @@ if (attr == NULL) break; -// printf("__ %s %d\n", __FILE__, __LINE__); rv = __nss_ldap_parse_range(attr, &range_start, &range_end); if (rv != NSS_LDAP_SUCCESS) break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 9 14:29:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 985BB16A47E; Thu, 9 Nov 2006 14:29:27 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7504E16A403 for ; Thu, 9 Nov 2006 14:29:27 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E13043D49 for ; Thu, 9 Nov 2006 14:29:26 +0000 (GMT) (envelope-from andre@freebsd.org) Received: (qmail 39855 invoked from network); 9 Nov 2006 14:23:02 -0000 Received: from c00l3r.networx.ch (HELO [127.0.0.1]) ([62.48.2.2]) (envelope-sender ) by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP for ; 9 Nov 2006 14:23:02 -0000 Message-ID: <45533B43.1090706@freebsd.org> Date: Thu, 09 Nov 2006 15:29:23 +0100 From: Andre Oppermann User-Agent: Thunderbird 1.5.0.7 (Windows/20060909) MIME-Version: 1.0 To: Warner Losh References: <200611080128.kA81SMMe010248@repoman.freebsd.org> In-Reply-To: <200611080128.kA81SMMe010248@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 109503 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 14:29:27 -0000 Warner Losh wrote: > http://perforce.freebsd.org/chv.cgi?CH=109503 > > Change 109503 by imp@imp_lighthouse on 2006/11/08 01:28:02 > > Remove if 0 > > Affected files ... > > .. //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc0#3 edit > .. //depot/projects/arm/src/gnu/usr.bin/binutils/as/Makefile#5 edit > .. //depot/projects/arm/src/gnu/usr.bin/cc/Makefile.inc#5 edit > .. //depot/projects/arm/src/gnu/usr.bin/cc/Makefile.tgt#4 edit > .. //depot/projects/arm/src/gnu/usr.bin/gdb/Makefile.inc#2 edit > .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/Makefile#2 edit > .. //depot/projects/arm/src/gnu/usr.bin/gdb/libgdb/Makefile#2 edit > .. //depot/projects/arm/src/lib/libc/Makefile#3 edit > .. //depot/projects/arm/src/lib/libpthread/Makefile#3 edit > .. //depot/projects/arm/src/lib/libthr/Makefile#3 edit > .. //depot/projects/arm/src/lib/msun/Makefile#2 edit > .. //depot/projects/arm/src/share/mk/bsd.endian.mk#3 edit > .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#25 edit > .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 edit > .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#12 edit > > Differences ... > > ==== //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc0#3 (text+ko) ==== > > @@ -38,7 +38,7 @@ > .PATH: ${.CURDIR}/${TARGET_ARCH} > .endif > > -ARCHS= ${TARGET_ARCH} > +ARCHS= ${TARGET_ARCH:S/armeb/arm/} > > .for _arch in ${CROSS_ARCH} > .if (${ARCHS:R:M${_arch:R}} == "") > @@ -47,7 +47,5 @@ > .endfor > > .for _arch in ${ARCHS} > -.if exists(${.CURDIR}/Makefile.${_arch}) > .include "${.CURDIR}/Makefile.${_arch}" > -.endif > .endfor This breaks compiling binutils libiberty as no Makefile.arm exists there. -- Andre From owner-p4-projects@FreeBSD.ORG Thu Nov 9 15:18:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82D5516A4A0; Thu, 9 Nov 2006 15:18:56 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5D4C816A492 for ; Thu, 9 Nov 2006 15:18:56 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47FC043D80 for ; Thu, 9 Nov 2006 15:18:46 +0000 (GMT) (envelope-from andre@freebsd.org) Received: (qmail 40455 invoked from network); 9 Nov 2006 15:12:22 -0000 Received: from c00l3r.networx.ch (HELO [127.0.0.1]) ([62.48.2.2]) (envelope-sender ) by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP for ; 9 Nov 2006 15:12:22 -0000 Message-ID: <455346D4.8070606@freebsd.org> Date: Thu, 09 Nov 2006 16:18:44 +0100 From: Andre Oppermann User-Agent: Thunderbird 1.5.0.7 (Windows/20060909) MIME-Version: 1.0 To: Warner Losh References: <200611080128.kA81SMMe010248@repoman.freebsd.org> In-Reply-To: <200611080128.kA81SMMe010248@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 109503 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 15:18:56 -0000 Warner Losh wrote: > http://perforce.freebsd.org/chv.cgi?CH=109503 > > Change 109503 by imp@imp_lighthouse on 2006/11/08 01:28:02 > > Remove if 0 > > Affected files ... > > .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#25 edit > .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 edit > ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#25 (text+ko) ==== > > @@ -30,6 +30,7 @@ > #include "lib.h" > #include "sd-card.h" > #include "ee.h" > +#include "board.h" > > #define RBX_ASKNAME 0x0 /* -a */ > #define RBX_SINGLE 0x1 /* -s */ > @@ -141,15 +142,13 @@ > } > } > > -// Each board has to provide one of these. > -void board_init(void); > - > int > main(void) > { > int autoboot, c = 0; > ino_t ino; > > +printf("MAIN\n"); > board_init(); > EMAC_Init(); > sdcard_init(); > > ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 (text+ko) ==== > > @@ -6,6 +6,7 @@ > #include "emac.h" > #include "lib.h" > #include "ee.h" > +#include "board.h" > > extern unsigned char mac[]; board.h doesn't exist and it seems to compile just fine without it. -- Andre From owner-p4-projects@FreeBSD.ORG Thu Nov 9 18:25:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36D2616A492; Thu, 9 Nov 2006 18:25:06 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 11CD116A417 for ; Thu, 9 Nov 2006 18:25:05 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0374643D77 for ; Thu, 9 Nov 2006 18:25:04 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA9IP457060916 for ; Thu, 9 Nov 2006 18:25:04 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA9IP4Dk060913 for perforce@freebsd.org; Thu, 9 Nov 2006 18:25:04 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Nov 2006 18:25:04 GMT Message-Id: <200611091825.kA9IP4Dk060913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109629 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 18:25:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=109629 Change 109629 by imp@imp_lighthouse on 2006/11/09 18:24:11 Oops Affected files ... .. //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc0#4 edit Differences ... ==== //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc0#4 (text+ko) ==== @@ -47,5 +47,7 @@ .endfor .for _arch in ${ARCHS} +.if exists(${.CURDIR}/Makefile.${_arch}) .include "${.CURDIR}/Makefile.${_arch}" +.endif .endfor From owner-p4-projects@FreeBSD.ORG Thu Nov 9 18:27:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6167816A415; Thu, 9 Nov 2006 18:27:11 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 39FC316A403 for ; Thu, 9 Nov 2006 18:27:11 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17FA543D7D for ; Thu, 9 Nov 2006 18:27:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA9IR7o3061042 for ; Thu, 9 Nov 2006 18:27:07 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA9IR7rC061039 for perforce@freebsd.org; Thu, 9 Nov 2006 18:27:07 GMT (envelope-from imp@freebsd.org) Date: Thu, 9 Nov 2006 18:27:07 GMT Message-Id: <200611091827.kA9IR7rC061039@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109630 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 18:27:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=109630 Change 109630 by imp@imp_lighthouse on 2006/11/09 18:26:35 Forgot to add this. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/board.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Nov 9 18:40:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 522B616A412; Thu, 9 Nov 2006 18:40:26 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 EFA0016A40F for ; Thu, 9 Nov 2006 18:40:25 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8EA2C43D6E for ; Thu, 9 Nov 2006 18:40:25 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA9IePYa062982 for ; Thu, 9 Nov 2006 18:40:25 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA9IeP8g062975 for perforce@freebsd.org; Thu, 9 Nov 2006 18:40:25 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 9 Nov 2006 18:40:25 GMT Message-Id: <200611091840.kA9IeP8g062975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 109632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 18:40:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=109632 Change 109632 by mjacob@newisp on 2006/11/09 18:40:10 Eliminate so-called 'inline' functions. They aren't really functions that can be inlined and the minor amount of kernel symbol table pollution is a small price to pay to put them where they belong. Add back in the ability to sleep for some mailbox commands. Affected files ... .. //depot/projects/newisp/dev/isp/isp_freebsd.c#22 edit .. //depot/projects/newisp/dev/isp/isp_freebsd.h#14 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_freebsd.c#22 (text+ko) ==== @@ -48,8 +48,9 @@ int isp_announced = 0; int isp_fabric_hysteresis = 5; int isp_loop_down_limit = 300; /* default loop down limit */ +int isp_change_is_bad = 0; /* "changed" devices are bad */ int isp_quickboot_time = 5; /* don't wait more than N secs for loop up */ -int isp_lost_device_time = 30; /* grace time before reporting device lost */ +int isp_lost_device_time = 60; /* grace time before reporting device lost */ static const char *roles[4] = { "(none)", "Target", "Initiator", "Target/Initiator" }; @@ -2113,7 +2114,7 @@ struct cam_path *tmppath; int dbidx, tgt; - isp_prt(isp, ISP_LOGALL, "LDT EXPIRED"); + isp_prt(isp, ISP_LOGDEBUG0, "LDT timer expired"); ISP_LOCK(isp); /* @@ -2194,7 +2195,9 @@ int wasfrozen, lb; isp_prt(isp, ISP_LOGDEBUG0, "kthread: checking FC state"); + isp->isp_osinfo.mbox_sleep_ok = 1; lb = isp_fc_runstate(isp, 250000); + isp->isp_osinfo.mbox_sleep_ok = 0; if (lb) { unsigned int inc = 1; @@ -2988,7 +2991,7 @@ isp->isp_osinfo.ldt = timeout(isp_ldt, isp, isp->isp_osinfo.loop_down_limit * hz); isp->isp_osinfo.ldt_running = 1; -isp_prt(isp, ISP_LOGALL, "LDT: starting loop down timer for %d seconds", isp->isp_osinfo.loop_down_limit); + isp_prt(isp, ISP_LOGDEBUG0, "starting LDT timer"); } isp_prt(isp, ISP_LOGINFO, msg); break; @@ -3145,6 +3148,9 @@ } else { msg = "Other Change Notify"; } + /* + * If the loop down timer is running, cancel it. + */ if (isp->isp_osinfo.ldt_running) { isp->isp_osinfo.ldt_running = 0; untimeout(isp_ldt, isp, isp->isp_osinfo.ldt); @@ -3269,3 +3275,94 @@ va_end(ap); printf("\n"); } + +uint64_t +isp_nanotime_sub(struct timespec *b, struct timespec *a) +{ + uint64_t elapsed; + struct timespec x = *b; + timespecsub(&x, a); + elapsed = GET_NANOSEC(&x); + if (elapsed == 0) + elapsed++; + return (elapsed); +} + +int +isp_mbox_acquire(ispsoftc_t *isp) +{ + if (isp->isp_osinfo.mboxbsy) { + return (1); + } else { + isp->isp_osinfo.mboxcmd_done = 0; + isp->isp_osinfo.mboxbsy = 1; + return (0); + } +} + +void +isp_mbox_wait_complete(ispsoftc_t *isp, mbreg_t *mbp) +{ + int usecs = mbp->timeout; + int j; + + if (usecs == 0) { + usecs = MBCMD_DEFAULT_TIMEOUT; + } + if (isp->isp_mbxwrk0) { + usecs *= isp->isp_mbxwrk0; + } + if (isp->isp_osinfo.mbox_sleep_ok) { + struct timeval t; + t.tv_sec = usecs / 1000000; + t.tv_usec = usecs % 1000000; + isp->isp_osinfo.mbox_sleep_ok = 0; + isp->isp_osinfo.mbox_sleeping = 1; +#if __FreeBSD_version < 500000 || !defined(ISP_SMPLOCK) + tsleep(&isp->isp_mbxworkp, PRIBIO, "ispmbx_sleep", tvtohz(&t)); +#else + msleep(&isp->isp_mbxworkp, &isp->isp_mtx, PRIBIO, + "ispmbx_sleep", tvtohz(&t)); +#endif + isp->isp_osinfo.mbox_sleep_ok = 1; + isp->isp_osinfo.mbox_sleeping = 0; + } else { + for (j = 0; j < usecs; j += 100) { + uint32_t isr; + uint16_t sema, mbox; + if (isp->isp_osinfo.mboxcmd_done) { + break; + } + if (ISP_READ_ISR(isp, &isr, &sema, &mbox)) { + isp_intr(isp, isr, sema, mbox); + if (isp->isp_osinfo.mboxcmd_done) { + break; + } + } + USEC_DELAY(100); + } + } + if (isp->isp_osinfo.mboxcmd_done == 0) { + isp_prt(isp, ISP_LOGWARN, + "%s Mailbox Command (0x%x) Timeout", + isp->isp_osinfo.mbox_sleep_ok? "Interrupting" : "Polled", + isp->isp_lastmbxcmd); + mbp->param[0] = MBOX_TIMEOUT; + isp->isp_osinfo.mboxcmd_done = 1; + } +} + +void +isp_mbox_notify_done(ispsoftc_t *isp) +{ + if (isp->isp_osinfo.mbox_sleeping) { + wakeup(&isp->isp_mbxworkp); + } + isp->isp_osinfo.mboxcmd_done = 1; +} + +void +isp_mbox_release(ispsoftc_t *isp) +{ + isp->isp_osinfo.mboxbsy = 0; +} ==== //depot/projects/newisp/dev/isp/isp_freebsd.h#14 (text+ko) ==== @@ -154,10 +154,12 @@ uint32_t : 5, simqfrozen : 3, hysteresis : 8, - : 3, + : 1, ldt_running : 1, disabled : 1, fcbsy : 1, + mbox_sleeping : 1, + mbox_sleep_ok : 1, mboxcmd_done : 1, mboxbsy : 1; struct callout_handle ldt; /* loop down timer */ @@ -231,7 +233,7 @@ #define NANOTIME_T struct timespec #define GET_NANOTIME nanotime #define GET_NANOSEC(x) ((x)->tv_sec * 1000000000 + (x)->tv_nsec) -#define NANOTIME_SUB nanotime_sub +#define NANOTIME_SUB isp_nanotime_sub #define MAXISPREQUEST(isp) ((IS_FC(isp) || IS_ULTRA2(isp))? 1024 : 256) @@ -253,7 +255,7 @@ #define MBOX_ACQUIRE isp_mbox_acquire #define MBOX_WAIT_COMPLETE isp_mbox_wait_complete -#define MBOX_NOTIFY_COMPLETE(isp) isp->isp_osinfo.mboxcmd_done = 1 +#define MBOX_NOTIFY_COMPLETE isp_mbox_notify_done #define MBOX_RELEASE isp_mbox_release #define FC_SCRATCH_ACQUIRE(isp) \ @@ -410,7 +412,6 @@ #include #endif -void isp_prt(ispsoftc_t *, int level, const char *, ...) __printflike(3, 4); /* * isp_osinfo definiitions && shorthand */ @@ -461,100 +462,21 @@ #define XS_CMD_S_CLEAR(sccb) (sccb)->ccb_h.spriv_field0 = 0 /* + * Platform Library Functions + */ +void isp_prt(ispsoftc_t *, int level, const char *, ...) __printflike(3, 4); +uint64_t isp_nanotime_sub(struct timespec *, struct timespec *); +int isp_mbox_acquire(ispsoftc_t *); +void isp_mbox_wait_complete(ispsoftc_t *, mbreg_t *); +void isp_mbox_notify_done(ispsoftc_t *); +void isp_mbox_release(ispsoftc_t *); + +/* * Platform specific inline functions */ -static __inline int isp_mbox_acquire(ispsoftc_t *); -static __inline void isp_mbox_wait_complete(ispsoftc_t *, mbreg_t *); -static __inline void isp_mbox_release(ispsoftc_t *); - -static __inline int -isp_mbox_acquire(ispsoftc_t *isp) -{ - if (isp->isp_osinfo.mboxbsy) { - return (1); - } else { - isp->isp_osinfo.mboxcmd_done = 0; - isp->isp_osinfo.mboxbsy = 1; - return (0); - } -} - -static __inline void -isp_mbox_wait_complete(ispsoftc_t *isp, mbreg_t *mbp) -{ - int lim = mbp->timeout; - int j; - - if (lim == 0) { - lim = MBCMD_DEFAULT_TIMEOUT; - } - if (isp->isp_mbxwrk0) { - lim *= isp->isp_mbxwrk0; - } - for (j = 0; j < lim; j += 100) { - uint32_t isr; - uint16_t sema, mbox; - if (isp->isp_osinfo.mboxcmd_done) { - break; - } - if (ISP_READ_ISR(isp, &isr, &sema, &mbox)) { - isp_intr(isp, isr, sema, mbox); - if (isp->isp_osinfo.mboxcmd_done) { - break; - } - } - USEC_DELAY(100); - } - if (isp->isp_osinfo.mboxcmd_done == 0) { - isp_prt(isp, ISP_LOGWARN, - "Polled Mailbox Command (0x%x) Timeout", - isp->isp_lastmbxcmd); - mbp->param[0] = MBOX_TIMEOUT; - isp->isp_osinfo.mboxcmd_done = 1; - } -} - -static __inline void -isp_mbox_release(ispsoftc_t *isp) -{ - isp->isp_osinfo.mboxbsy = 0; -} - -static __inline uint64_t nanotime_sub(struct timespec *, struct timespec *); -static __inline uint64_t -nanotime_sub(struct timespec *b, struct timespec *a) -{ - uint64_t elapsed; - struct timespec x = *b; - timespecsub(&x, a); - elapsed = GET_NANOSEC(&x); - if (elapsed == 0) - elapsed++; - return (elapsed); -} - -static __inline char *strncat(char *, const char *, size_t); -static __inline char * -strncat(char *d, const char *s, size_t c) -{ - char *t = d; - - if (c) { - while (*d) - d++; - while ((*d++ = *s++)) { - if (--c == 0) { - *d = '\0'; - break; - } - } - } - return (t); -} - /* - * ISP Library functions + * ISP General Library functions */ #include From owner-p4-projects@FreeBSD.ORG Thu Nov 9 20:07:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA70016A47E; Thu, 9 Nov 2006 20:07:21 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 B7C9416A416 for ; Thu, 9 Nov 2006 20:07:21 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCD8A43D55 for ; Thu, 9 Nov 2006 20:07:20 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA9K7KCN080568 for ; Thu, 9 Nov 2006 20:07:20 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA9K7GMw080558 for perforce@freebsd.org; Thu, 9 Nov 2006 20:07:16 GMT (envelope-from als@FreeBSD.org) Date: Thu, 9 Nov 2006 20:07:16 GMT Message-Id: <200611092007.kA9K7GMw080558@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 109637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 20:07:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=109637 Change 109637 by als@als_head on 2006/11/09 20:06:49 merge last priv(9) changes. it`s only have compile test. more testing planing at weekend. Affected files ... .. //depot/projects/jail2/sys/amd64/amd64/io.c#2 integrate .. //depot/projects/jail2/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/jail2/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/jail2/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/jail2/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/jail2/sys/arm/arm/intr.c#2 integrate .. //depot/projects/jail2/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/jail2/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/jail2/sys/arm/include/armreg.h#3 integrate .. //depot/projects/jail2/sys/arm/include/atomic.h#2 integrate .. //depot/projects/jail2/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/jail2/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/jail2/sys/arm/include/pmap.h#3 integrate .. //depot/projects/jail2/sys/boot/Makefile#5 integrate .. //depot/projects/jail2/sys/boot/efi/include/efilib.h#3 integrate .. //depot/projects/jail2/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/jail2/sys/boot/efi/libefi/bootinfo.c#2 delete .. //depot/projects/jail2/sys/boot/efi/libefi/copy.c#2 delete .. //depot/projects/jail2/sys/boot/efi/libefi/devicename.c#3 delete .. //depot/projects/jail2/sys/boot/efi/libefi/efiboot.h#3 delete .. //depot/projects/jail2/sys/boot/efi/libefi/efifpswa.c#2 delete .. //depot/projects/jail2/sys/boot/efi/libefi/efifs.c#3 integrate .. //depot/projects/jail2/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/jail2/sys/boot/efi/libefi/elf_freebsd.c#2 delete .. //depot/projects/jail2/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/module.c#2 delete .. //depot/projects/jail2/sys/boot/efi/libefi/time.c#2 integrate .. //depot/projects/jail2/sys/boot/ia64/Makefile#2 integrate .. //depot/projects/jail2/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/jail2/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/jail2/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/jail2/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/jail2/sys/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/jail2/sys/boot/ia64/efi/main.c#3 integrate .. //depot/projects/jail2/sys/boot/ia64/efi/version#2 integrate .. //depot/projects/jail2/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/jail2/sys/boot/ia64/ski/bootinfo.c#2 delete .. //depot/projects/jail2/sys/boot/ia64/ski/copy.c#2 delete .. //depot/projects/jail2/sys/boot/ia64/ski/devicename.c#3 delete .. //depot/projects/jail2/sys/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/jail2/sys/boot/ia64/ski/elf_freebsd.c#2 delete .. //depot/projects/jail2/sys/boot/ia64/ski/libski.h#3 integrate .. //depot/projects/jail2/sys/boot/ia64/ski/main.c#3 integrate .. //depot/projects/jail2/sys/boot/ia64/ski/skifs.c#2 integrate .. //depot/projects/jail2/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/version#2 integrate .. //depot/projects/jail2/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/jail2/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/jail2/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/jail2/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/jail2/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/jail2/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/jail2/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/jail2/sys/conf/files#8 integrate .. //depot/projects/jail2/sys/conf/files.arm#3 integrate .. //depot/projects/jail2/sys/conf/files.sun4v#3 integrate .. //depot/projects/jail2/sys/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/jail2/sys/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/jail2/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/jail2/sys/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/jail2/sys/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/jail2/sys/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/jail2/sys/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/jail2/sys/ddb/db_main.c#2 integrate .. //depot/projects/jail2/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/jail2/sys/dev/aha/ahareg.h#2 integrate .. //depot/projects/jail2/sys/dev/an/if_an.c#2 integrate .. //depot/projects/jail2/sys/dev/arl/if_arl.c#2 integrate .. //depot/projects/jail2/sys/dev/asr/asr.c#3 integrate .. //depot/projects/jail2/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/jail2/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/jail2/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/jail2/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/jail2/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/jail2/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/jail2/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/jail2/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/jail2/sys/dev/em/if_em.c#8 integrate .. //depot/projects/jail2/sys/dev/em/if_em.h#5 integrate .. //depot/projects/jail2/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/jail2/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/jail2/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/jail2/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/jail2/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/jail2/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/jail2/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/jail2/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/jail2/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/jail2/sys/dev/null/null.c#2 integrate .. //depot/projects/jail2/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/jail2/sys/dev/pci/pci.c#5 integrate .. //depot/projects/jail2/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/jail2/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/jail2/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/jail2/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/jail2/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/jail2/sys/dev/si/si.c#2 integrate .. //depot/projects/jail2/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/jail2/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/jail2/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/jail2/sys/dev/wl/if_wl.c#3 integrate .. //depot/projects/jail2/sys/dev/zs/zs.c#2 integrate .. //depot/projects/jail2/sys/fs/devfs/devfs_rule.c#3 integrate .. //depot/projects/jail2/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/jail2/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/jail2/sys/fs/procfs/procfs_ioctl.c#3 integrate .. //depot/projects/jail2/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/jail2/sys/fs/smbfs/smbfs_smb.c#2 integrate .. //depot/projects/jail2/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/jail2/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/jail2/sys/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/jail2/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/jail2/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/jail2/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/jail2/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/jail2/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/jail2/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/jail2/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/jail2/sys/i386/i386/io.c#2 integrate .. //depot/projects/jail2/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/jail2/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/jail2/sys/i386/i386/vm86.c#2 integrate .. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_misc.c#4 integrate .. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_socksys.c#3 integrate .. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/jail2/sys/i386/linux/linux_machdep.c#6 integrate .. //depot/projects/jail2/sys/i4b/driver/i4b_ipr.c#2 integrate .. //depot/projects/jail2/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/jail2/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/jail2/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_acct.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/jail2/sys/kern/kern_environment.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_exec.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_fork.c#5 integrate .. //depot/projects/jail2/sys/kern/kern_jail.c#10 edit .. //depot/projects/jail2/sys/kern/kern_ktrace.c#5 integrate .. //depot/projects/jail2/sys/kern/kern_linker.c#8 integrate .. //depot/projects/jail2/sys/kern/kern_ntptime.c#2 integrate .. //depot/projects/jail2/sys/kern/kern_priv.c#1 branch .. //depot/projects/jail2/sys/kern/kern_prot.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_resource.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_thr.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_time.c#5 integrate .. //depot/projects/jail2/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/jail2/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/jail2/sys/kern/sched_ule.c#4 integrate .. //depot/projects/jail2/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/jail2/sys/kern/subr_firmware.c#3 integrate .. //depot/projects/jail2/sys/kern/subr_prf.c#5 integrate .. //depot/projects/jail2/sys/kern/subr_witness.c#4 integrate .. //depot/projects/jail2/sys/kern/sysv_ipc.c#3 integrate .. //depot/projects/jail2/sys/kern/sysv_msg.c#5 integrate .. //depot/projects/jail2/sys/kern/tty.c#7 integrate .. //depot/projects/jail2/sys/kern/tty_cons.c#3 integrate .. //depot/projects/jail2/sys/kern/tty_pts.c#4 integrate .. //depot/projects/jail2/sys/kern/tty_pty.c#4 integrate .. //depot/projects/jail2/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/jail2/sys/kern/uipc_sem.c#5 integrate .. //depot/projects/jail2/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/jail2/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/jail2/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/jail2/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/jail2/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/jail2/sys/net/bpf.c#4 integrate .. //depot/projects/jail2/sys/net/if.c#7 integrate .. //depot/projects/jail2/sys/net/if_bridge.c#8 integrate .. //depot/projects/jail2/sys/net/if_bridgevar.h#4 integrate .. //depot/projects/jail2/sys/net/if_gre.c#3 integrate .. //depot/projects/jail2/sys/net/if_ppp.c#4 integrate .. //depot/projects/jail2/sys/net/if_sl.c#2 integrate .. //depot/projects/jail2/sys/net/if_tap.c#5 integrate .. //depot/projects/jail2/sys/net/if_tun.c#4 integrate .. //depot/projects/jail2/sys/net/ppp_tty.c#3 integrate .. //depot/projects/jail2/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/jail2/sys/net/rtsock.c#5 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/jail2/sys/netatalk/at_control.c#2 integrate .. //depot/projects/jail2/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/jail2/sys/netatm/atm_usrreq.c#3 integrate .. //depot/projects/jail2/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/jail2/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate .. //depot/projects/jail2/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/jail2/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/jail2/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/jail2/sys/netinet/in.c#3 integrate .. //depot/projects/jail2/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/jail2/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/jail2/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/jail2/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/jail2/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/jail2/sys/netinet/ip_output.c#6 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_smedia.c#3 integrate .. //depot/projects/jail2/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/jail2/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_crc32.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctputil.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctputil.h#2 integrate .. //depot/projects/jail2/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/jail2/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/jail2/sys/netinet6/in6.c#5 integrate .. //depot/projects/jail2/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/jail2/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/jail2/sys/netinet6/ipsec.c#3 integrate .. //depot/projects/jail2/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/jail2/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/jail2/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/jail2/sys/netipsec/ipsec_osdep.h#3 integrate .. //depot/projects/jail2/sys/netipx/ipx_pcb.c#2 integrate .. //depot/projects/jail2/sys/netipx/ipx_usrreq.c#3 integrate .. //depot/projects/jail2/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/jail2/sys/netncp/ncp_mod.c#2 integrate .. //depot/projects/jail2/sys/netncp/ncp_subr.h#2 integrate .. //depot/projects/jail2/sys/netsmb/smb_conn.c#3 integrate .. //depot/projects/jail2/sys/netsmb/smb_subr.c#2 integrate .. //depot/projects/jail2/sys/netsmb/smb_subr.h#2 integrate .. //depot/projects/jail2/sys/nfsclient/bootp_subr.c#4 integrate .. //depot/projects/jail2/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/jail2/sys/pc98/cbus/fdc.c#3 integrate .. //depot/projects/jail2/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/jail2/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/jail2/sys/pci/if_pcn.c#2 integrate .. //depot/projects/jail2/sys/pci/if_pcnreg.h#2 integrate .. //depot/projects/jail2/sys/posix4/p1003_1b.c#3 integrate .. //depot/projects/jail2/sys/powerpc/conf/DEFAULTS#3 integrate .. //depot/projects/jail2/sys/security/audit/audit.c#4 integrate .. //depot/projects/jail2/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/jail2/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/jail2/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/jail2/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/jail2/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/jail2/sys/security/mac/mac_internal.h#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_net.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_priv.c#1 branch .. //depot/projects/jail2/sys/security/mac/mac_system.c#3 integrate .. //depot/projects/jail2/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/jail2/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/jail2/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/jail2/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/jail2/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/jail2/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/jail2/sys/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/jail2/sys/sun4v/conf/DEFAULTS#3 integrate .. //depot/projects/jail2/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/hcall.S#3 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/interrupt.S#2 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/support.S#3 integrate .. //depot/projects/jail2/sys/sys/jail.h#7 integrate .. //depot/projects/jail2/sys/sys/mac_policy.h#5 integrate .. //depot/projects/jail2/sys/sys/priv.h#1 branch .. //depot/projects/jail2/sys/sys/sem.h#3 integrate .. //depot/projects/jail2/sys/sys/systm.h#7 integrate .. //depot/projects/jail2/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/jail2/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/jail2/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/jail2/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/jail2/sys/ufs/ufs/ufs_quota.c#4 integrate .. //depot/projects/jail2/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/jail2/sys/vm/swap_pager.c#4 integrate .. //depot/projects/jail2/sys/vm/vm_contig.c#5 integrate .. //depot/projects/jail2/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/jail2/sys/vm/vm_page.c#7 integrate Differences ... ==== //depot/projects/jail2/sys/amd64/amd64/io.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.1 2004/08/01 11:40:50 markm Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.2 2006/11/06 13:41:49 rwatson Exp $"); #include #include @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -54,7 +55,7 @@ { int error; - error = suser(td); + error = priv_check(td, PRIV_IO); if (error != 0) return (error); error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/jail2/sys/amd64/amd64/machdep.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.657 2006/10/26 21:42:16 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.660 2006/11/07 21:57:18 ru Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -196,7 +196,7 @@ #ifdef PERFMON perfmon_init(); #endif - printf("usable memory = %ju (%ju MB)\n", ptoa((uintmax_t)physmem), + printf("usable memory = %ju (%ju MB)\n", ptoa((uintmax_t)physmem), ptoa((uintmax_t)physmem) / 1048576); realmem = Maxmem; /* @@ -220,7 +220,7 @@ vm_ksubmap_init(&kmi); - printf("avail memory = %ju (%ju MB)\n", + printf("avail memory = %ju (%ju MB)\n", ptoa((uintmax_t)cnt.v_free_count), ptoa((uintmax_t)cnt.v_free_count) / 1048576); @@ -747,8 +747,6 @@ ip->gd_hioffset = ((uintptr_t)func)>>16 ; } -#define IDTVEC(name) __CONCAT(X,name) - extern inthand_t IDTVEC(div), IDTVEC(dbg), IDTVEC(nmi), IDTVEC(bpt), IDTVEC(ofl), IDTVEC(bnd), IDTVEC(ill), IDTVEC(dna), IDTVEC(fpusegm), @@ -877,7 +875,7 @@ if (smap->base < physmap[i + 1]) { if (boothowto & RB_VERBOSE) printf( - "Overlapping or non-montonic memory region, ignoring second region\n"); + "Overlapping or non-monotonic memory region, ignoring second region\n"); continue; } } ==== //depot/projects/jail2/sys/amd64/conf/DEFAULTS#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.8 2006/11/04 04:58:09 jb Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.9 2006/11/04 23:50:11 jb Exp $ machine amd64 @@ -17,6 +17,3 @@ # KSE support went from being default to a kernel option options KSE - -# Kernel support for loading DTrace modules -options KDTRACE ==== //depot/projects/jail2/sys/amd64/linux32/linux.h#4 (text+ko) ==== @@ -27,14 +27,12 @@ * (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/linux32/linux.h,v 1.8 2006/10/29 14:02:38 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.9 2006/11/07 18:53:49 jhb Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ #define _AMD64_LINUX_LINUX_H_ -#include /* for sigval union */ - #include /* @@ -379,6 +377,11 @@ #define LINUX_SI_MAX_SIZE 128 #define LINUX_SI_PAD_SIZE ((LINUX_SI_MAX_SIZE/sizeof(l_int)) - 3) +union l_sigval { + l_int sival_int; + l_uintptr_t sival_ptr; +}; + typedef struct l_siginfo { l_int lsi_signo; l_int lsi_errno; @@ -399,7 +402,7 @@ struct { l_pid_t _pid; /* sender's pid */ l_uid16_t _uid; /* sender's uid */ - union sigval _sigval; + union l_sigval _sigval; } __packed _rt; struct { ==== //depot/projects/jail2/sys/arm/arm/cpufunc.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.12 2006/10/21 04:25:00 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.13 2006/11/07 22:36:56 cognet Exp $"); #include #include @@ -73,13 +73,17 @@ #include #endif +#if defined(CPU_XSCALE_81342) +#include +#endif + #ifdef CPU_XSCALE_IXP425 #include #include #endif #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) #include #endif @@ -570,6 +574,62 @@ /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 CPU_XSCALE_80219 */ +#ifdef CPU_XSCALE_81342 +struct cpu_functions xscalec3_cpufuncs = { + /* CPU functions */ + + cpufunc_id, /* id */ + xscale_cpwait, /* cpwait */ + + /* MMU functions */ + + xscale_control, /* control */ + cpufunc_domains, /* domain */ + xscalec3_setttb, /* setttb */ + cpufunc_faultstatus, /* faultstatus */ + cpufunc_faultaddress, /* faultaddress */ + + /* TLB functions */ + + armv4_tlb_flushID, /* tlb_flushID */ + xscale_tlb_flushID_SE, /* tlb_flushID_SE */ + armv4_tlb_flushI, /* tlb_flushI */ + (void *)armv4_tlb_flushI, /* tlb_flushI_SE */ + armv4_tlb_flushD, /* tlb_flushD */ + armv4_tlb_flushD_SE, /* tlb_flushD_SE */ + + /* Cache operations */ + + xscalec3_cache_syncI, /* icache_sync_all */ + xscale_cache_syncI_rng, /* icache_sync_range */ + + xscalec3_cache_purgeD, /* dcache_wbinv_all */ + xscalec3_cache_purgeD_rng, /* dcache_wbinv_range */ + xscale_cache_flushD_rng, /* dcache_inv_range */ + xscalec3_cache_cleanD_rng, /* dcache_wb_range */ + + xscalec3_cache_purgeID, /* idcache_wbinv_all */ + xscalec3_cache_purgeID_rng, /* idcache_wbinv_range */ + + /* Other functions */ + + cpufunc_nullop, /* flush_prefetchbuf */ + armv4_drain_writebuf, /* drain_writebuf */ + cpufunc_nullop, /* flush_brnchtgt_C */ + (void *)cpufunc_nullop, /* flush_brnchtgt_E */ + + xscale_cpu_sleep, /* sleep */ + + /* Soft functions */ + + cpufunc_null_fixup, /* dataabt_fixup */ + cpufunc_null_fixup, /* prefetchabt_fixup */ + + xscalec3_context_switch, /* context_switch */ + + xscale_setup /* cpu setup */ +}; +#endif /* CPU_XSCALE_81342 */ /* * Global constants also used by locore.s */ @@ -582,7 +642,7 @@ defined (CPU_ARM10) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) static void get_cachetype_cp15(void); @@ -895,7 +955,6 @@ if (cputype == CPU_ID_80321_400 || cputype == CPU_ID_80321_600 || cputype == CPU_ID_80321_400_B0 || cputype == CPU_ID_80321_600_B0 || cputype == CPU_ID_80219_400 || cputype == CPU_ID_80219_600) { - /* * Reset the Performance Monitoring Unit to a * pristine state: @@ -920,6 +979,19 @@ } #endif /* CPU_XSCALE_80321 */ +#if defined(CPU_XSCALE_81342) + if (cputype == CPU_ID_81342) { + cpufuncs = xscalec3_cpufuncs; +#if defined(PERFCTRS) + xscale_pmu_init(); +#endif + + cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ + get_cachetype_cp15(); + pmap_pte_init_xscale(); + return 0; + } +#endif /* CPU_XSCALE_81342 */ #ifdef CPU_XSCALE_PXA2X0 /* ignore core revision to test PXA2xx CPUs */ if ((cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA250 || @@ -1326,7 +1398,7 @@ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) #define IGN 0 #define OR 1 @@ -1794,7 +1866,7 @@ #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) struct cpu_option xscale_options[] = { #ifdef COMPAT_12 { "branchpredict", BIC, OR, CPU_CONTROL_BPRD_ENABLE }, ==== //depot/projects/jail2/sys/arm/arm/identcpu.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.8 2006/08/24 23:51:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.9 2006/11/07 22:36:57 cognet Exp $"); #include #include #include @@ -126,6 +126,13 @@ "rev 12", "rev 13", "rev 14", "rev 15", }; +static const char * const i81342_steppings[16] = { + "step A-0", "rev 1", "rev 2", "rev 3", + "rev 4", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + static const char * const pxa2x0_steppings[16] = { "step A-0", "step A-1", "step B-0", "step B-1", "step B-2", "step C-0", "rev 6", "rev 7", @@ -229,6 +236,9 @@ { CPU_ID_80321_600_B0, CPU_CLASS_XSCALE, "i80321 600MHz", i80321_steppings }, + { CPU_ID_81342, CPU_CLASS_XSCALE, "i81342", + i81342_steppings }, + { CPU_ID_80219_400, CPU_CLASS_XSCALE, "i80219 400MHz", xscale_steppings }, ==== //depot/projects/jail2/sys/arm/arm/intr.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.12 2005/12/22 22:16:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.13 2006/11/08 01:32:24 cognet Exp $"); #include #include #include @@ -106,6 +106,7 @@ struct thread *td = curthread; int i, thread; + PCPU_LAZY_INC(cnt.v_intr); td->td_intr_nesting_level++; while ((i = arm_get_next_irq()) != -1) { arm_mask_irq(i); ==== //depot/projects/jail2/sys/arm/arm/pmap.c#4 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.69 2006/08/28 21:43:34 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.71 2006/11/08 06:31:28 alc Exp $"); #include #include #include @@ -278,6 +278,8 @@ extern void bcopy_page(vm_offset_t, vm_offset_t); extern void bzero_page(vm_offset_t); +extern vm_offset_t alloc_firstaddr; + char *_tmppt; /* @@ -1960,7 +1962,7 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + vm_page_array_size; + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; pv_entry_high_water = 9 * (pv_entry_max / 10); l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); @@ -2784,6 +2786,11 @@ KASSERT(l2b != NULL, ("No L2 bucket in pmap_remove_pages")); pt = &l2b->l2b_kva[l2pte_index(pv->pv_va)]; m = PHYS_TO_VM_PAGE(*pt & L2_ADDR_MASK); +#ifdef ARM_USE_SMALL_ALLOC + KASSERT((vm_offset_t)m >= alloc_firstaddr, ("Trying to access non-existent page va %x pte %x", pv->pv_va, *pt)); +#else + KASSERT((vm_offset_t)m >= KERNBASE, ("Trying to access non-existent page va %x pte %x", pv->pv_va, *pt)); +#endif *pt = 0; PTE_SYNC(pt); npv = TAILQ_NEXT(pv, pv_plist); @@ -4563,7 +4570,7 @@ /* * pmap_link_l2pt: * - * Link the L2 page table specified by "pa" into the L1 + * Link the L2 page table specified by l2pv.pv_pa into the L1 * page table at the slot for "va". */ void @@ -4574,7 +4581,12 @@ proto = L1_S_DOM(PMAP_DOMAIN_KERNEL) | L1_C_PROTO; +#ifdef VERBOSE_INIT_ARM + printf("pmap_link_l2pt: pa=0x%x va=0x%x\n", l2pv->pv_pa, l2pv->pv_va); +#endif + pde[slot + 0] = proto | (l2pv->pv_pa + 0x000); + PTE_SYNC(&pde[slot]); SLIST_INSERT_HEAD(&kernel_pt_list, l2pv, pv_list); ==== //depot/projects/jail2/sys/arm/arm/vm_machdep.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.28 2006/10/24 23:27:52 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.29 2006/11/07 22:35:30 cognet Exp $"); #include #include @@ -456,7 +456,7 @@ MALLOC_DEFINE(M_VMSMALLALLOC, "vm_small_alloc", "VM Small alloc data"); -static vm_offset_t alloc_firstaddr; +vm_offset_t alloc_firstaddr; vm_offset_t arm_ptovirt(vm_paddr_t pa) ==== //depot/projects/jail2/sys/arm/include/armreg.h#3 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/armreg.h,v 1.4 2006/08/24 23:51:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/armreg.h,v 1.5 2006/11/07 22:36:56 cognet Exp $ */ #ifndef MACHINE_ARMREG_H @@ -157,6 +157,7 @@ #define CPU_ID_80321_600_B0 0x69052c30 #define CPU_ID_80219_400 0x69052e20 /* A0 stepping/revision. */ #define CPU_ID_80219_600 0x69052e30 /* A0 stepping/revision. */ +#define CPU_ID_81342 0x69056810 #define CPU_ID_IXP425_533 0x690541c0 #define CPU_ID_IXP425_400 0x690541d0 #define CPU_ID_IXP425_266 0x690541f0 ==== //depot/projects/jail2/sys/arm/include/atomic.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.19 2006/05/15 13:08:12 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.20 2006/11/07 11:53:44 cognet Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -337,6 +337,7 @@ #define atomic_cmpset_acq_int atomic_cmpset_32 #define atomic_cmpset_acq_ptr atomic_cmpset_ptr #define atomic_cmpset_acq_long atomic_cmpset_long +#define atomic_cmpset_acq_32 atomic_cmpset_32 #define atomic_store_rel_ptr atomic_store_ptr #define atomic_store_rel_int atomic_store_32 #define atomic_cmpset_rel_32 atomic_cmpset_32 ==== //depot/projects/jail2/sys/arm/include/cpuconf.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.8 2006/08/24 23:51:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.9 2006/11/07 22:36:56 cognet Exp $ * */ @@ -64,7 +64,8 @@ #define ARM_ARCH_4 0 #endif -#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || defined(CPU_XSCALE_80219) || \ +#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ defined(CPU_XSCALE_PXA2X0)) || defined(CPU_ARM10) #define ARM_ARCH_5 1 #else @@ -113,7 +114,7 @@ #if(defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219)) + defined(CPU_XSCALE_80219)) || defined(CPU_XSCALE_81342) #define ARM_MMU_XSCALE 1 #else #define ARM_MMU_XSCALE 0 @@ -132,7 +133,7 @@ */ #if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_80219)) + defined(CPU_XSCALE_80219)) || defined(CPU_XSCALE_81342) #define ARM_XSCALE_PMU 1 #else #define ARM_XSCALE_PMU 0 ==== //depot/projects/jail2/sys/arm/include/cpufunc.h#3 (text+ko) ==== @@ -38,7 +38,7 @@ * * Prototypes for cpu, mmu and tlb related functions. * - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.9 2006/08/24 23:51:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.10 2006/11/07 22:36:56 cognet Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -374,7 +374,7 @@ defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) void armv4_tlb_flushID (void); void armv4_tlb_flushI (void); @@ -392,7 +392,7 @@ #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) void xscale_cpwait (void); void xscale_cpu_sleep (int mode); @@ -433,6 +433,28 @@ #endif /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 CPU_XSCALE_80219 */ +#ifdef CPU_XSCALE_81342 + +void xscalec3_cache_cleanID (void); +void xscalec3_cache_cleanD (void); + +void xscalec3_cache_purgeID (void); +void xscalec3_cache_purgeID_E (u_int entry); +void xscalec3_cache_purgeD (void); +void xscalec3_cache_purgeD_E (u_int entry); + +void xscalec3_cache_syncI (void); +void xscalec3_cache_cleanID_rng (vm_offset_t start, vm_size_t end); +void xscalec3_cache_cleanD_rng (vm_offset_t start, vm_size_t end); +void xscalec3_cache_purgeID_rng (vm_offset_t start, vm_size_t end); +void xscalec3_cache_purgeD_rng (vm_offset_t start, vm_size_t end); + + +void xscalec3_setttb (u_int ttb); +void xscalec3_context_switch (void); + +#endif /* CPU_XSCALE_81342 */ + #define tlb_flush cpu_tlb_flushID #define setttb cpu_setttb #define drain_writebuf cpu_drain_writebuf ==== //depot/projects/jail2/sys/arm/include/pmap.h#3 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.20 2006/08/08 20:59:38 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.21 2006/11/07 22:36:56 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -426,7 +426,7 @@ extern void (*pmap_copy_page_func)(vm_paddr_t, vm_paddr_t); extern void (*pmap_zero_page_func)(vm_paddr_t, int, int); -#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 +#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 || defined(CPU_XSCALE_81342) void pmap_copy_page_generic(vm_paddr_t, vm_paddr_t); void pmap_zero_page_generic(vm_paddr_t, int, int); ==== //depot/projects/jail2/sys/boot/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.31 2006/10/09 04:43:06 kmacy Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.32 2006/11/05 22:03:02 marcel Exp $ .include @@ -8,7 +8,7 @@ .endif # Build EFI library. -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "ia64" SUBDIR+= efi .endif ==== //depot/projects/jail2/sys/boot/efi/include/efilib.h#3 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2000 Doug Rabson + * Copyright (c) 2006 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,24 +24,31 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.5 2006/11/02 02:42:47 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.6 2006/11/05 22:03:02 marcel Exp $ */ -#include +#include extern EFI_HANDLE IH; extern EFI_SYSTEM_TABLE *ST; extern EFI_BOOT_SERVICES *BS; extern EFI_RUNTIME_SERVICES *RS; -/* DIG64 Headless Console & Debug Port Table. */ -#define HCDP_TABLE_GUID \ - {0xf951938d,0x620b,0x42ef,{0x82,0x79,0xa8,0x4b,0x79,0x61,0x78,0x98}} +extern struct devsw efifs_dev; +extern struct fs_ops efifs_fsops; + +extern struct devsw efinet_dev; +extern struct netif_driver efinetif; void *efi_get_table(EFI_GUID *tbl); void efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table); -EFI_PHYSICAL_ADDRESS efimd_va2pa(EFI_VIRTUAL_ADDRESS); +int efi_register_handles(struct devsw *, EFI_HANDLE *, int); +EFI_HANDLE efi_find_handle(struct devsw *, int); +int efi_handle_lookup(EFI_HANDLE, struct devsw **, int *); + +int efi_status_to_errno(EFI_STATUS); +time_t efi_time(EFI_TIME *); EFI_STATUS main(int argc, CHAR16 *argv[]); void exit(EFI_STATUS status); ==== //depot/projects/jail2/sys/boot/efi/libefi/Makefile#2 (text+ko) ==== @@ -1,27 +1,16 @@ -# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.16 2004/11/28 00:30:22 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.17 2006/11/05 22:03:03 marcel Exp $ -.PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} - LIB= efi INTERNALLIB= -SRCS= bootinfo.c copy.c delay.c devicename.c efi_console.c efifs.c efinet.c \ - elf_freebsd.c libefi.c module.c time.c +SRCS= delay.c efi_console.c efifs.c efinet.c errno.c handles.c libefi.c \ + time.c -.if ${MACHINE_ARCH} == "ia64" -SRCS+= efifpswa.c pal.S -.endif - CFLAGS+= -I${.CURDIR}/../include -CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} +CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH:S/amd64/i386/} CFLAGS+= -I${.CURDIR}/../../../../lib/libstand # Pick up the bootstrap header for some interface items CFLAGS+= -I${.CURDIR}/../../common -# Make the disk code more talkative -.if defined(BOOT_DISK_DEBUG) -CFLAGS+= -DDISK_DEBUG -.endif - .include ==== //depot/projects/jail2/sys/boot/efi/libefi/efifs.c#3 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2001 Doug Rabson + * Copyright (c) 2006 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,88 +23,100 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.9 2006/11/02 01:23:17 marcel Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.10 2006/11/05 22:03:03 marcel Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 9 23:24:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3ACA16A51C; Thu, 9 Nov 2006 23:24:47 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 89F2C16A501 for ; Thu, 9 Nov 2006 23:24:47 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66A4A43D6D for ; Thu, 9 Nov 2006 23:24:44 +0000 (GMT) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA9NOiAC028597 for ; Thu, 9 Nov 2006 23:24:44 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA9NOhrF028594 for perforce@freebsd.org; Thu, 9 Nov 2006 23:24:43 GMT (envelope-from jkim@freebsd.org) Date: Thu, 9 Nov 2006 23:24:43 GMT Message-Id: <200611092324.kA9NOhrF028594@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 109652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 23:24:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=109652 Change 109652 by jkim@jkim_hammer on 2006/11/09 23:24:13 Fixes for 'blocking in fifoor state' problem of LTP tests. linux_*stat*() functions were opening files with O_RDONLY to get major/minor pair for char/block special files. Unfortunately, when these functions are used against fifo, it is blocked forever because there is no writer. Instead, we only open char/block special files for major/minor conversion. We have to get rid of kern_open() entirely from translate_path_major_minor() but today is not the day. While I am here, add checks for errors before calling translate_path_major_minor(). Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#5 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#5 (text+ko) ==== @@ -100,23 +100,16 @@ translate_fd_major_minor(struct thread *td, int fd, struct stat *buf) { struct file *fp; - int error; int major, minor; - if ((error = fget(td, fd, &fp)) != 0) + if ((!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode)) || + fget(td, fd, &fp) != 0) return; - if (fp->f_vnode) { - if (fp->f_vnode->v_type == VCHR - || fp->f_vnode->v_type == VBLK) { - if (fp->f_vnode->v_un.vu_cdev) { - if (linux_driver_get_major_minor( - fp->f_vnode->v_un.vu_cdev->si_name, - &major, &minor) == 0) { - buf->st_rdev = (major << 8 | minor); - } - } - } - } + if (fp->f_vnode != NULL && + fp->f_vnode->v_un.vu_cdev != NULL && + linux_driver_get_major_minor(fp->f_vnode->v_un.vu_cdev->si_name, + &major, &minor) == 0) + buf->st_rdev = (major << 8 | minor); fdrop(fp, td); } @@ -129,6 +122,8 @@ int fd; int temp; + if (!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode)) + return; temp = td->td_retval[0]; if (kern_open(td, path, UIO_SYSSPACE, O_RDONLY, 0) != 0) return; @@ -179,18 +174,19 @@ #endif error = kern_stat(td, path, UIO_SYSSPACE, &buf); - if (!error && strlen(path) > strlen("/dev/pts/") && - !strncmp(path, "/dev/pts/", strlen("/dev/pts/")) - && path[9] >= '0' && path[9] <= '9') { - /* - * Linux checks major and minors of the slave device to make - * sure it's a pty device, so let's make him believe it is. - */ - buf.st_rdev = (136 << 8); - } - - translate_path_major_minor(td, path, &buf); - + if (!error) { + if (strlen(path) > strlen("/dev/pts/") && + !strncmp(path, "/dev/pts/", strlen("/dev/pts/")) && + path[9] >= '0' && path[9] <= '9') { + /* + * Linux checks major and minors of the slave device + * to make sure it's a pty device, so let's make him + * believe it is. + */ + buf.st_rdev = (136 << 8); + } else + translate_path_major_minor(td, path, &buf); + } LFREEPATH(path); if (error) return (error); @@ -212,7 +208,8 @@ #endif error = kern_lstat(td, path, UIO_SYSSPACE, &sb); - translate_path_major_minor(td, path, &sb); + if (!error) + translate_path_major_minor(td, path, &sb); LFREEPATH(path); if (error) return (error); @@ -539,18 +536,19 @@ #endif error = kern_stat(td, filename, UIO_SYSSPACE, &buf); - if (!error && strlen(filename) > strlen("/dev/pts/") && - !strncmp(filename, "/dev/pts/", strlen("/dev/pts/")) - && filename[9] >= '0' && filename[9] <= '9') { - /* - * Linux checks major and minors of the slave device to make - * sure it's a pty deivce, so let's make him believe it is. - */ - buf.st_rdev = (136 << 8); + if (!error) { + if (strlen(filename) > strlen("/dev/pts/") && + !strncmp(filename, "/dev/pts/", strlen("/dev/pts/")) && + filename[9] >= '0' && filename[9] <= '9') { + /* + * Linux checks major and minors of the slave device + * to make sure it's a pty deivce, so let's make him + * believe it is. + */ + buf.st_rdev = (136 << 8); + } else + translate_path_major_minor(td, filename, &buf); } - - translate_path_major_minor(td, filename, &buf); - LFREEPATH(filename); if (error) return (error); @@ -572,7 +570,8 @@ #endif error = kern_lstat(td, filename, UIO_SYSSPACE, &sb); - translate_path_major_minor(td, filename, &sb); + if (!error) + translate_path_major_minor(td, filename, &sb); LFREEPATH(filename); if (error) return (error); From owner-p4-projects@FreeBSD.ORG Thu Nov 9 23:31:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DAC116A47B; Thu, 9 Nov 2006 23:31:54 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3068916A407 for ; Thu, 9 Nov 2006 23:31:54 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5626743D58 for ; Thu, 9 Nov 2006 23:31:53 +0000 (GMT) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA9NVriY033267 for ; Thu, 9 Nov 2006 23:31:53 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA9NVrkK033258 for perforce@freebsd.org; Thu, 9 Nov 2006 23:31:53 GMT (envelope-from jkim@freebsd.org) Date: Thu, 9 Nov 2006 23:31:53 GMT Message-Id: <200611092331.kA9NVrkK033258@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 109653 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 23:31:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=109653 Change 109653 by jkim@jkim_hammer on 2006/11/09 23:31:05 Linux mknod(2) can open any files, not just char/block or fifo files. This fixes LTP test case mknod01, mknod07 and mknod09. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#30 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#30 (text+ko) ==== @@ -891,11 +891,34 @@ printf(ARGS(mknod, "%s, %d, %d"), path, args->mode, args->dev); #endif - if (S_ISFIFO(args->mode)) + switch (args->mode & S_IFMT) { + case S_IFIFO: + case S_IFSOCK: error = kern_mkfifo(td, path, UIO_SYSSPACE, args->mode); - else + break; + + case S_IFCHR: + case S_IFBLK: error = kern_mknod(td, path, UIO_SYSSPACE, args->mode, args->dev); + break; + + case S_IFDIR: + error = EPERM; + break; + + case 0: + args->mode |= S_IFREG; + /* fall through */ + case S_IFREG: + error = kern_open(td, path, UIO_SYSSPACE, + O_WRONLY | O_CREAT | O_TRUNC, args->mode); + break; + + default: + error = EINVAL; + break; + } LFREEPATH(path); return (error); } From owner-p4-projects@FreeBSD.ORG Thu Nov 9 23:44:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7959F16A416; Thu, 9 Nov 2006 23:44:09 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5309616A403 for ; Thu, 9 Nov 2006 23:44:09 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9F5F43D55 for ; Thu, 9 Nov 2006 23:44:08 +0000 (GMT) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA9Ni8p8039938 for ; Thu, 9 Nov 2006 23:44:08 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA9Ni8tL039928 for perforce@freebsd.org; Thu, 9 Nov 2006 23:44:08 GMT (envelope-from jkim@freebsd.org) Date: Thu, 9 Nov 2006 23:44:08 GMT Message-Id: <200611092344.kA9Ni8tL039928@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 109654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 23:44:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=109654 Change 109654 by jkim@jkim_hammer on 2006/11/09 23:43:53 Add two linprocfs entries for Linux IPC: /proc/sys/kernel/msgmni -> kern.ipc.msgmni /proc/sys/kernel/sem -> kern.ipc.semmsl kern.ipc.semmns kern.ipc.semopm kern.ipc.semmni This fixes LTP test case msgget03 and semget05 for now. msgctl08 and msgctl09 also use /proc/sys/kernel/msgmni but the tests fail because Linux's ipcs(1) fails with an unknown reason: %/usr/compat/linux/usr/bin/ipcs -q kernel not configured for message queues Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#6 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#6 (text+ko) ==== @@ -925,6 +925,24 @@ } /* + * Filler function for proc/sys/kernel/msgmni + */ +static int +linprocfs_domsgmni(PFS_FILL_ARGS) +{ + int msgmni; + size_t size; + + size = sizeof(msgmni); + if (kernel_sysctlbyname(td, "kern.ipc.msgmni", &msgmni, &size, + 0, 0, 0, 0) != 0) + msgmni = 0; + sbuf_printf(sb, "%i\n", msgmni); + + return (0); +} + +/* * Filler function for proc/sys/kernel/pid_max */ static int @@ -937,6 +955,44 @@ } /* + * Filler function for proc/sys/kernel/sem + */ +static int +linprocfs_dosem(PFS_FILL_ARGS) +{ + int semmsl, semmns, semopm, semmni; + size_t size; + + /* Field 1: SEMMSL */ + size = sizeof(semmsl); + if (kernel_sysctlbyname(td, "kern.ipc.semmsl", &semmsl, &size, + 0, 0, 0, 0) != 0) + semmsl = 0; + + /* Field 2: SEMMNS */ + size = sizeof(semmns); + if (kernel_sysctlbyname(td, "kern.ipc.semmns", &semmns, &size, + 0, 0, 0, 0) != 0) + semmns = 0; + + /* Field 3: SEMOPM */ + size = sizeof(semopm); + if (kernel_sysctlbyname(td, "kern.ipc.semopm", &semopm, &size, + 0, 0, 0, 0) != 0) + semopm = 0; + + /* Field 4: SEMMNI */ + size = sizeof(semmni); + if (kernel_sysctlbyname(td, "kern.ipc.semmni", &semmni, &size, + 0, 0, 0, 0) != 0) + semmni = 0; + + sbuf_printf(sb, "%i %i %i %i\n", semmsl, semmns, semopm, semmni); + + return (0); +} + +/* * Filler function for proc/scsi/device_info */ static int @@ -1080,8 +1136,12 @@ dir = pfs_create_dir(root, "sys", NULL, NULL, 0); /* /proc/sys/kernel/... */ dir = pfs_create_dir(dir, "kernel", NULL, NULL, 0); + pfs_create_file(dir, "msgmni", &linprocfs_domsgmni, + NULL, NULL, PFS_RD); pfs_create_file(dir, "pid_max", &linprocfs_dopid_max, NULL, NULL, PFS_RD); + pfs_create_file(dir, "sem", &linprocfs_dosem, + NULL, NULL, PFS_RD); return (0); } From owner-p4-projects@FreeBSD.ORG Fri Nov 10 00:00:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4707F16A412; Fri, 10 Nov 2006 00:00:31 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 1864416A403 for ; Fri, 10 Nov 2006 00:00:30 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8133E43D55 for ; Fri, 10 Nov 2006 00:00:30 +0000 (GMT) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAA00Upn048578 for ; Fri, 10 Nov 2006 00:00:30 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAA00Ueu048575 for perforce@freebsd.org; Fri, 10 Nov 2006 00:00:30 GMT (envelope-from jkim@freebsd.org) Date: Fri, 10 Nov 2006 00:00:30 GMT Message-Id: <200611100000.kAA00Ueu048575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 109655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 00:00:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=109655 Change 109655 by jkim@jkim_hammer on 2006/11/09 23:59:35 - Move linux_nanosleep() from amd64/linux32 to linux_time.c. - Validate timespec before use as Linux kernel does. - Fix l_timespec structure. - Clean up styles. This fixes LTP test case nanosleep04 (at least on amd64). Note the test was not really blocked. Negative -> unsigned long casting made huge number and it was normally(!) sleeping very long time. ;-) Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#8 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#14 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_time.c#2 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#7 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#10 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#10 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#10 edit .. //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#9 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#8 (text+ko) ==== @@ -173,8 +173,8 @@ * stat family of syscalls */ struct l_timespec { - l_ulong tv_sec; - l_ulong tv_nsec; + l_time_t tv_sec; + l_long tv_nsec; } __packed; struct l_newstat { ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#14 (text+ko) ==== @@ -1100,27 +1100,6 @@ } int -linux_nanosleep(struct thread *td, struct linux_nanosleep_args *uap) -{ - struct timespec rqt, rmt; - struct l_timespec ats32; - int error; - - error = copyin(uap->rqtp, &ats32, sizeof(ats32)); - if (error != 0) - return (error); - rqt.tv_sec = ats32.tv_sec; - rqt.tv_nsec = ats32.tv_nsec; - error = kern_nanosleep(td, &rqt, &rmt); - if (uap->rmtp != NULL) { - ats32.tv_sec = rmt.tv_sec; - ats32.tv_nsec = rmt.tv_nsec; - error = copyout(&ats32, uap->rmtp, sizeof(ats32)); - } - return (error); -} - -int linux_getrusage(struct thread *td, struct linux_getrusage_args *uap) { struct l_rusage s32; ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_time.c#2 (text+ko) ==== @@ -65,7 +65,7 @@ static void native_to_linux_timespec(struct l_timespec *, struct timespec *); -static void linux_to_native_timespec(struct timespec *, +static int linux_to_native_timespec(struct timespec *, struct l_timespec *); static int linux_to_native_clockid(clockid_t *, clockid_t); @@ -76,11 +76,15 @@ ltp->tv_nsec = ntp->tv_nsec; } -static void +static int linux_to_native_timespec(struct timespec *ntp, struct l_timespec *ltp) { + if (ltp->tv_sec < 0 || ltp->tv_nsec > (l_long)999999999L) + return (EINVAL); ntp->tv_sec = ltp->tv_sec; ntp->tv_nsec = ltp->tv_nsec; + + return (0); } static int @@ -97,10 +101,12 @@ case LINUX_CLOCK_THREAD_CPUTIME_ID: case LINUX_CLOCK_REALTIME_HR: case LINUX_CLOCK_MONOTONIC_HR: - return EINVAL; + default: + return (EINVAL); + break; } - return 0; + return (0); } int @@ -113,15 +119,13 @@ error = linux_to_native_clockid(&nwhich, args->which); if (error != 0) - return error; - + return (error); error = kern_clock_gettime(td, nwhich, &tp); if (error != 0) - return error; - + return (error); native_to_linux_timespec(<s, &tp); - return copyout(<s, args->tp, sizeof lts); + return (copyout(<s, args->tp, sizeof lts)); } int @@ -134,15 +138,15 @@ error = linux_to_native_clockid(&nwhich, args->which); if (error != 0) - return error; - + return (error); error = copyin(args->tp, <s, sizeof lts); if (error != 0) - return error; + return (error); + error = linux_to_native_timespec(&ts, <s); + if (error != 0) + return (error); - linux_to_native_timespec(&ts, <s); - - return kern_clock_settime(td, nwhich, &ts); + return (kern_clock_settime(td, nwhich, &ts)); } int @@ -154,19 +158,51 @@ clockid_t nwhich = 0; /* XXX: GCC */ if (args->tp == NULL) - return (0); + return (0); error = linux_to_native_clockid(&nwhich, args->which); if (error != 0) - return error; + return (error); + error = kern_clock_getres(td, nwhich, &ts); + if (error != 0) + return (error); + native_to_linux_timespec(<s, &ts); + + return (copyout(<s, args->tp, sizeof lts)); +} + +int +linux_nanosleep(struct thread *td, struct linux_nanosleep_args *args) +{ + struct timespec *rmtp; + struct l_timespec lrqts, lrmts; + struct timespec rqts, rmts; + int error; + + error = copyin(args->rqtp, &lrqts, sizeof lrqts); + if (error != 0) + return (error); + + if (args->rmtp != NULL) + rmtp = &rmts; + else + rmtp = NULL; - error = kern_clock_getres(td, nwhich, &ts); + error = linux_to_native_timespec(&rqts, &lrqts); + if (error != 0) + return (error); + error = kern_nanosleep(td, &rqts, rmtp); if (error != 0) - return error; + return (error); + + if (args->rmtp != NULL) { + native_to_linux_timespec(&lrmts, rmtp); + error = copyout(&lrmts, args->rmtp, sizeof(lrmts)); + if (error != 0) + return (error); + } - native_to_linux_timespec(<s, &ts); - - return copyout(<s, args->tp, sizeof lts); + return (0); } int @@ -178,31 +214,33 @@ int error; if (args->flags != 0) - return EINVAL; /* XXX deal with TIMER_ABSTIME */ + return (EINVAL); /* XXX deal with TIMER_ABSTIME */ if (args->which != LINUX_CLOCK_REALTIME) - return EINVAL; + return (EINVAL); error = copyin(args->rqtp, &lrqts, sizeof lrqts); if (error != 0) - return error; + return (error); if (args->rmtp != NULL) rmtp = &rmts; else rmtp = NULL; - linux_to_native_timespec(&rqts, &lrqts); - + error = linux_to_native_timespec(&rqts, &lrqts); + if (error != 0) + return (error); error = kern_nanosleep(td, &rqts, rmtp); if (error != 0) - return error; + return (error); + if (args->rmtp != NULL) { native_to_linux_timespec(&lrmts, rmtp); error = copyout(&lrmts, args->rmtp, sizeof lrmts ); if (error != 0) - return error; + return (error); } - return 0; + return (0); } ==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#7 (text+ko) ==== @@ -146,8 +146,8 @@ * stat family of syscalls */ struct l_timespec { - l_ulong tv_sec; - l_ulong tv_nsec; + l_time_t tv_sec; + l_long tv_nsec; }; struct l_newstat { ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#10 (text+ko) ==== @@ -475,6 +475,10 @@ struct linux_sched_get_priority_min_args { char policy_l_[PADL_(l_int)]; l_int policy; char policy_r_[PADR_(l_int)]; }; +struct linux_nanosleep_args { + char rqtp_l_[PADL_(const struct l_timespec *)]; const struct l_timespec * rqtp; char rqtp_r_[PADR_(const struct l_timespec *)]; + char rmtp_l_[PADL_(struct l_timespec *)]; struct l_timespec * rmtp; char rmtp_r_[PADR_(struct l_timespec *)]; +}; struct linux_mremap_args { char addr_l_[PADL_(l_ulong)]; l_ulong addr; char addr_r_[PADR_(l_ulong)]; char old_len_l_[PADL_(l_ulong)]; l_ulong old_len; char old_len_r_[PADR_(l_ulong)]; @@ -1068,6 +1072,7 @@ int linux_sched_getscheduler(struct thread *, struct linux_sched_getscheduler_args *); int linux_sched_get_priority_max(struct thread *, struct linux_sched_get_priority_max_args *); int linux_sched_get_priority_min(struct thread *, struct linux_sched_get_priority_min_args *); +int linux_nanosleep(struct thread *, struct linux_nanosleep_args *); int linux_mremap(struct thread *, struct linux_mremap_args *); int linux_setresuid16(struct thread *, struct linux_setresuid16_args *); int linux_getresuid16(struct thread *, struct linux_getresuid16_args *); @@ -1319,6 +1324,7 @@ #define LINUX_SYS_AUE_linux_sched_getscheduler AUE_SCHED_GETSCHEDULER #define LINUX_SYS_AUE_linux_sched_get_priority_max AUE_SCHED_GET_PRIORITY_MAX #define LINUX_SYS_AUE_linux_sched_get_priority_min AUE_SCHED_GET_PRIORITY_MIN +#define LINUX_SYS_AUE_linux_nanosleep AUE_NULL #define LINUX_SYS_AUE_linux_mremap AUE_NULL #define LINUX_SYS_AUE_linux_setresuid16 AUE_SETRESUID #define LINUX_SYS_AUE_linux_getresuid16 AUE_GETRESUID ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#10 (text+ko) ==== @@ -156,7 +156,7 @@ #define LINUX_SYS_linux_sched_get_priority_max 159 #define LINUX_SYS_linux_sched_get_priority_min 160 #define LINUX_SYS_sched_rr_get_interval 161 -#define LINUX_SYS_nanosleep 162 +#define LINUX_SYS_linux_nanosleep 162 #define LINUX_SYS_linux_mremap 163 #define LINUX_SYS_linux_setresuid16 164 #define LINUX_SYS_linux_getresuid16 165 ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#10 (text+ko) ==== @@ -181,7 +181,7 @@ { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX, NULL, 0, 0 }, /* 159 = linux_sched_get_priority_max */ { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN, NULL, 0, 0 }, /* 160 = linux_sched_get_priority_min */ { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL, NULL, 0, 0 }, /* 161 = sched_rr_get_interval */ - { AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL, NULL, 0, 0 }, /* 162 = nanosleep */ + { AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 162 = linux_nanosleep */ { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL, NULL, 0, 0 }, /* 163 = linux_mremap */ { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID, NULL, 0, 0 }, /* 164 = linux_setresuid16 */ { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID, NULL, 0, 0 }, /* 165 = linux_getresuid16 */ ==== //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#9 (text+ko) ==== @@ -282,9 +282,9 @@ l_int policy); } 161 AUE_SCHED_RR_GET_INTERVAL NOPROTO { int sched_rr_get_interval(l_pid_t pid, \ struct l_timespec *interval); } -162 AUE_NULL NOPROTO { int nanosleep( \ - const struct timespec *rqtp, \ - struct timespec *rmtp); } +162 AUE_NULL STD { int linux_nanosleep( \ + const struct l_timespec *rqtp, \ + struct l_timespec *rmtp); } 163 AUE_NULL STD { int linux_mremap(l_ulong addr, \ l_ulong old_len, l_ulong new_len, \ l_ulong flags, l_ulong new_addr); } From owner-p4-projects@FreeBSD.ORG Fri Nov 10 00:17:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E5C616A40F; Fri, 10 Nov 2006 00:17:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 572E916A407 for ; Fri, 10 Nov 2006 00:17:55 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from anuket.mj.niksun.com (gwnew.niksun.com [65.115.46.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF3C943D49 for ; Fri, 10 Nov 2006 00:17:52 +0000 (GMT) (envelope-from jkim@FreeBSD.org) Received: from niksun.com (anuket [10.70.0.5]) by anuket.mj.niksun.com (8.13.1/8.13.1) with ESMTP id kAA0HoK0000950 for ; Thu, 9 Nov 2006 19:17:50 -0500 (EST) (envelope-from jkim@FreeBSD.org) From: Jung-uk Kim To: Perforce Change Reviews Date: Thu, 9 Nov 2006 19:17:34 -0500 User-Agent: KMail/1.6.2 References: <200611100000.kAA00Ueu048575@repoman.freebsd.org> In-Reply-To: <200611100000.kAA00Ueu048575@repoman.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200611091917.37816.jkim@FreeBSD.org> X-Virus-Scanned: ClamAV 0.88.6/2181/Thu Nov 9 15:12:52 2006 on anuket.mj.niksun.com X-Virus-Status: Clean Cc: Subject: Re: PERFORCE change 109655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 00:17:55 -0000 On Thursday 09 November 2006 07:00 pm, Jung-uk Kim wrote: > http://perforce.freebsd.org/chv.cgi?CH=109655 > > Change 109655 by jkim@jkim_hammer on 2006/11/09 23:59:35 > > - Move linux_nanosleep() from amd64/linux32 to linux_time.c. > - Validate timespec before use as Linux kernel does. > - Fix l_timespec structure. > - Clean up styles. > > This fixes LTP test case nanosleep04 (at least on amd64). > Note the test was not really blocked. Negative -> unsigned long > casting made huge number and it was normally(!) sleeping very long > time. ;-) After this change, there only five test cases to fix to run LTP without user intervention. They are all blocked in msgwait state and I don't know how to fix them. In fact, I think Linux msgsnd/msgrcv don't work at all (at least on amd64). :-( Jung-uk Kim From owner-p4-projects@FreeBSD.ORG Fri Nov 10 02:43:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5464716A415; Fri, 10 Nov 2006 02:43:03 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2CA9516A407 for ; Fri, 10 Nov 2006 02:43:03 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0EAF43D4C for ; Fri, 10 Nov 2006 02:43:02 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAA2h2RE093859 for ; Fri, 10 Nov 2006 02:43:02 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAA2h27r093856 for perforce@freebsd.org; Fri, 10 Nov 2006 02:43:02 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 10 Nov 2006 02:43:02 GMT Message-Id: <200611100243.kAA2h27r093856@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 109661 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 02:43:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=109661 Change 109661 by mjacob@newisp on 2006/11/10 02:42:32 Add a ISP_LOGSANCFG log level. Affected files ... .. //depot/projects/newisp/dev/isp/ispvar.h#13 edit Differences ... ==== //depot/projects/newisp/dev/isp/ispvar.h#13 (text+ko) ==== @@ -881,7 +881,7 @@ #define ISP_LOGDEBUG1 0x20 /* log intermediate debug messages */ #define ISP_LOGDEBUG2 0x40 /* log most debug messages */ #define ISP_LOGDEBUG3 0x80 /* log high frequency debug messages */ -#define ISP_LOGDEBUG4 0x100 /* log high frequency debug messages */ +#define ISP_LOGSANCFG 0x100 /* log SAN configuration */ #define ISP_LOGTDEBUG0 0x200 /* log simple debug messages (target mode) */ #define ISP_LOGTDEBUG1 0x400 /* log intermediate debug messages (target) */ #define ISP_LOGTDEBUG2 0x800 /* log all debug messages (target) */ From owner-p4-projects@FreeBSD.ORG Fri Nov 10 02:44:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C343116A494; Fri, 10 Nov 2006 02:44:04 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A1F2016A47E for ; Fri, 10 Nov 2006 02:44:04 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 72CCA43D45 for ; Fri, 10 Nov 2006 02:44:04 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAA2i4a5094090 for ; Fri, 10 Nov 2006 02:44:04 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAA2i4Vi094087 for perforce@freebsd.org; Fri, 10 Nov 2006 02:44:04 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 10 Nov 2006 02:44:04 GMT Message-Id: <200611100244.kAA2i4Vi094087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 109662 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 02:44:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=109662 Change 109662 by mjacob@newisp on 2006/11/10 02:43:10 Initialize Gone Device Timer handle and parameter. Affected files ... .. //depot/projects/newisp/dev/isp/isp_pci.c#18 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_pci.c#18 (text+ko) ==== @@ -433,6 +433,7 @@ int bitmap, unit; callout_handle_init(&isp->isp_osinfo.ldt); + callout_handle_init(&isp->isp_osinfo.gdt); unit = device_get_unit(dev); if (getenv_int("isp_disable", &bitmap)) { @@ -522,6 +523,14 @@ isp->isp_osinfo.loop_down_limit = isp_loop_down_limit; } + bitmap = 0; + (void) getenv_int("isp_gone_device_time", &bitmap); + if (bitmap >= 0 && bitmap < 0xffff) { + isp->isp_osinfo.gone_device_time = bitmap; + } else { + isp->isp_osinfo.gone_device_time = isp_gone_device_time; + } + #ifdef ISP_FW_CRASH_DUMP bitmap = 0; @@ -582,6 +591,7 @@ const char *sptr; callout_handle_init(&isp->isp_osinfo.ldt); + callout_handle_init(&isp->isp_osinfo.gdt); /* * Figure out if we're supposed to skip this one. @@ -747,6 +757,14 @@ isp->isp_osinfo.loop_down_limit = isp_loop_down_limit; } + tval = -1; + (void) resource_int_value(device_get_name(dev), device_get_unit(dev), + "gone_device_time", &tval); + if (tval >= 0 && tval < 0xffff) { + isp->isp_osinfo.gone_device_time = tval; + } else { + isp->isp_osinfo.gone_device_time = isp_gone_device_time; + } } static void From owner-p4-projects@FreeBSD.ORG Fri Nov 10 02:44:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A0FD16A40F; Fri, 10 Nov 2006 02:44:05 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0F29A16A55F for ; Fri, 10 Nov 2006 02:44:05 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7E7443D45 for ; Fri, 10 Nov 2006 02:44:04 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAA2i451094097 for ; Fri, 10 Nov 2006 02:44:04 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAA2i4IN094093 for perforce@freebsd.org; Fri, 10 Nov 2006 02:44:04 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 10 Nov 2006 02:44:04 GMT Message-Id: <200611100244.kAA2i4IN094093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 109663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 02:44:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=109663 Change 109663 by mjacob@newisp on 2006/11/10 02:43:40 Change log levels in isp_fc_runstate to ISP_LOGSANCFG. Affected files ... .. //depot/projects/newisp/dev/isp/isp_library.c#16 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_library.c#16 (text) ==== @@ -197,13 +197,13 @@ if (fcp->isp_fwstate < FW_READY || fcp->isp_loopstate < LOOP_PDB_RCVD) { if (isp_control(isp, ISPCTL_FCLINK_TEST, tptr) != 0) { - isp_prt(isp, ISP_LOGINFO, + isp_prt(isp, ISP_LOGSANCFG, "isp_fc_runstate: linktest failed"); return (-1); } if (fcp->isp_fwstate != FW_READY || fcp->isp_loopstate < LOOP_PDB_RCVD) { - isp_prt(isp, ISP_LOGINFO, + isp_prt(isp, ISP_LOGSANCFG, "isp_fc_runstate: f/w not ready"); return (-1); } @@ -212,21 +212,21 @@ return (0); } if (isp_control(isp, ISPCTL_SCAN_LOOP, NULL) != 0) { - isp_prt(isp, ISP_LOGINFO, + isp_prt(isp, ISP_LOGSANCFG, "isp_fc_runstate: scan loop fails"); return (LOOP_PDB_RCVD); } if (isp_control(isp, ISPCTL_SCAN_FABRIC, NULL) != 0) { - isp_prt(isp, ISP_LOGINFO, + isp_prt(isp, ISP_LOGSANCFG, "isp_fc_runstate: scan fabric fails"); return (LOOP_LSCAN_DONE); } if (isp_control(isp, ISPCTL_PDB_SYNC, NULL) != 0) { - isp_prt(isp, ISP_LOGINFO, "isp_fc_runstate: pdb_sync fails"); + isp_prt(isp, ISP_LOGSANCFG, "isp_fc_runstate: pdb_sync fails"); return (LOOP_FSCAN_DONE); } if (fcp->isp_fwstate != FW_READY || fcp->isp_loopstate != LOOP_READY) { - isp_prt(isp, ISP_LOGINFO, + isp_prt(isp, ISP_LOGSANCFG, "isp_fc_runstate: f/w not ready again"); return (-1); } From owner-p4-projects@FreeBSD.ORG Fri Nov 10 02:45:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA4ED16A47B; Fri, 10 Nov 2006 02:45:07 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5349A16A403 for ; Fri, 10 Nov 2006 02:45:07 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4E8C43D49 for ; Fri, 10 Nov 2006 02:45:06 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAA2j6ZC094146 for ; Fri, 10 Nov 2006 02:45:06 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAA2j6J5094143 for perforce@freebsd.org; Fri, 10 Nov 2006 02:45:06 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 10 Nov 2006 02:45:06 GMT Message-Id: <200611100245.kAA2j6J5094143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 109664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 02:45:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=109664 Change 109664 by mjacob@newisp on 2006/11/10 02:44:21 Add the 'gone' device timer and timer running flag and a definition for the base 'gone' device timeout. Affected files ... .. //depot/projects/newisp/dev/isp/isp_freebsd.h#15 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_freebsd.h#15 (text+ko) ==== @@ -151,10 +151,11 @@ struct intr_config_hook ehook; uint32_t loop_down_time; uint32_t loop_down_limit; + uint32_t gone_device_time; uint32_t : 5, simqfrozen : 3, hysteresis : 8, - : 1, + gdt_running : 1, ldt_running : 1, disabled : 1, fcbsy : 1, @@ -163,6 +164,7 @@ mboxcmd_done : 1, mboxbsy : 1; struct callout_handle ldt; /* loop down timer */ + struct callout_handle gdt; /* gone device timer */ #if __FreeBSD_version >= 500000 struct firmware * fw; struct mtx lock; @@ -437,6 +439,7 @@ extern int isp_announced; extern int isp_fabric_hysteresis; extern int isp_loop_down_limit; +extern int isp_gone_device_time; extern int isp_quickboot_time; /* From owner-p4-projects@FreeBSD.ORG Fri Nov 10 05:34:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FECA16A40F; Fri, 10 Nov 2006 05:34:45 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B6D6816A403 for ; Fri, 10 Nov 2006 05:34:44 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87EDC43D45 for ; Fri, 10 Nov 2006 05:34:44 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAA5Yi2L033237 for ; Fri, 10 Nov 2006 05:34:44 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAA5YiPZ033234 for perforce@freebsd.org; Fri, 10 Nov 2006 05:34:44 GMT (envelope-from sam@freebsd.org) Date: Fri, 10 Nov 2006 05:34:44 GMT Message-Id: <200611100534.kAA5YiPZ033234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 05:34:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=109670 Change 109670 by sam@sam_ebb on 2006/11/10 05:34:02 add defs for expansion bus data areas; define mapping for cs1 where the avila cf-ide is located Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#5 (text+ko) ==== @@ -277,7 +277,7 @@ #define GPIO_TYPE_REG(b) (((b)&8)?IXP425_GPIO_GPIT2R:IXP425_GPIO_GPIT1R) /* - * Expansion Bus + * Expansion Bus Configuration Space. */ #define IXP425_EXP_HWBASE 0xc4000000UL #define IXP425_EXP_VBASE (IXP425_IO_VBASE + IXP425_IO_SIZE) @@ -547,4 +547,26 @@ #define IXP425_MAC_B_VBASE (IXP425_IO_VBASE + IXP425_MAC_B_OFFSET) #define IXP425_MAC_B_SIZE 0x1000 /* Actually only 256 bytes */ +/* + * Expansion Bus Data Space. + */ +#define IXP425_EXP_BUS_HWBASE 0x50000000UL +#define IXP425_EXP_BUS_SIZE 0x01000000 /* max, typically smaller */ + +#define IXP425_EXP_BUS_CSx_HWBASE(i) \ + (IXP425_EXP_BUS_HWBASE + (i)*IXP425_EXP_BUS_SIZE) + +#define IXP425_EXP_BUS_CS1_HWBASE IXP425_EXP_BUS_CSx_HWBASE(1) +#define IXP425_EXP_BUS_CS1_VBASE (IXP425_MAC_B_VBASE + IXP425_MAC_B_SIZE) +#define IXP425_EXP_BUS_CS1_SIZE 0x1000 + +/* NB: not mapped (yet) */ +#define IXP425_EXP_BUS_CS0_HWBASE IXP425_EXP_BUS_CSx_HWBASE(0) +#define IXP425_EXP_BUS_CS2_HWBASE IXP425_EXP_BUS_CSx_HWBASE(2) +#define IXP425_EXP_BUS_CS3_HWBASE IXP425_EXP_BUS_CSx_HWBASE(3) +#define IXP425_EXP_BUS_CS4_HWBASE IXP425_EXP_BUS_CSx_HWBASE(4) +#define IXP425_EXP_BUS_CS5_HWBASE IXP425_EXP_BUS_CSx_HWBASE(5) +#define IXP425_EXP_BUS_CS6_HWBASE IXP425_EXP_BUS_CSx_HWBASE(6) +#define IXP425_EXP_BUS_CS7_HWBASE IXP425_EXP_BUS_CSx_HWBASE(7) + #endif /* _IXP425REG_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Nov 10 05:35:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EC9516A47C; Fri, 10 Nov 2006 05:35:46 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 52B7316A417 for ; Fri, 10 Nov 2006 05:35:46 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22BB843D46 for ; Fri, 10 Nov 2006 05:35:46 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAA5ZkTO033310 for ; Fri, 10 Nov 2006 05:35:46 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAA5Zjwg033307 for perforce@freebsd.org; Fri, 10 Nov 2006 05:35:45 GMT (envelope-from sam@freebsd.org) Date: Fri, 10 Nov 2006 05:35:45 GMT Message-Id: <200611100535.kAA5Zjwg033307@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109671 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 05:35:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=109671 Change 109671 by sam@sam_ebb on 2006/11/10 05:34:47 o define mapping for expansion bus cs1 o correct comments for npe assignments o enumerate avila_ata driver Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#17 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#17 (text+ko) ==== @@ -83,6 +83,9 @@ { IXP425_NPE_C_HWBASE, IXP425_NPE_C_SIZE, IXP425_NPE_C_VBASE }, { IXP425_MAC_A_HWBASE, IXP425_MAC_A_SIZE, IXP425_MAC_A_VBASE }, { IXP425_MAC_B_HWBASE, IXP425_MAC_B_SIZE, IXP425_MAC_B_VBASE }, + /* Gateworks Avila IDE/CF is mapped here */ + { IXP425_EXP_BUS_CS1_HWBASE, IXP425_EXP_BUS_SIZE, + IXP425_EXP_BUS_CS1_VBASE }, }; static int @@ -226,8 +229,9 @@ device_add_child(dev, "uart", 0); /* XXX these are optional, what if they are not configured? */ device_add_child(dev, "ixpqmgr", 0); - device_add_child(dev, "npe", 0); /* NPE-A */ - device_add_child(dev, "npe", 1); /* NPE-B */ + device_add_child(dev, "npe", 0); /* NPE-B */ + device_add_child(dev, "npe", 1); /* NPE-C */ + device_add_child(dev, "ata_avila", 0); /* XXX */ if (bus_space_map(sc->sc_iot, IXP425_GPIO_HWBASE, IXP425_GPIO_SIZE, 0, &sc->sc_gpio_ioh)) From owner-p4-projects@FreeBSD.ORG Fri Nov 10 05:36:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D5F616A417; Fri, 10 Nov 2006 05:36:48 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 372A916A403 for ; Fri, 10 Nov 2006 05:36:48 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E2C8243D46 for ; Fri, 10 Nov 2006 05:36:47 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAA5alSe033383 for ; Fri, 10 Nov 2006 05:36:47 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAA5alip033380 for perforce@freebsd.org; Fri, 10 Nov 2006 05:36:47 GMT (envelope-from sam@freebsd.org) Date: Fri, 10 Nov 2006 05:36:47 GMT Message-Id: <200611100536.kAA5alip033380@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 05:36:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=109672 Change 109672 by sam@sam_ebb on 2006/11/10 05:35:59 checkpoint driver for gateworks avila cf-ide slot Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.avila#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/files.avila#3 (text+ko) ==== @@ -1,3 +1,4 @@ #$FreeBSD$ arm/xscale/ixp425/avila_machdep.c standard -arm/xscale/ixp425/ixdp425_pci.c optional pci +arm/xscale/ixp425/avila_ata.c optional ata_avila +arm/xscale/ixp425/ixdp425_pci.c optional pci From owner-p4-projects@FreeBSD.ORG Fri Nov 10 05:40:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A63E216A407; Fri, 10 Nov 2006 05:40:53 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9F20F16A403 for ; Fri, 10 Nov 2006 05:40:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A47743D49 for ; Fri, 10 Nov 2006 05:40:53 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAA5erkk033583 for ; Fri, 10 Nov 2006 05:40:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAA5errn033578 for perforce@freebsd.org; Fri, 10 Nov 2006 05:40:53 GMT (envelope-from sam@freebsd.org) Date: Fri, 10 Nov 2006 05:40:53 GMT Message-Id: <200611100540.kAA5errn033578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 05:40:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=109673 Change 109673 by sam@sam_ebb on 2006/11/10 05:40:06 o add KSE to maintain status quo o add INVARIANTS+WITNESS for now (~50% perf drop) o add bpf+if_bridge o add crypto stuff commented out (tested and works) o add ata_avila for cf-ide support Affected files ... .. //depot/projects/arm/src/sys/arm/conf/AVILA#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/AVILA#4 (text+ko) ==== @@ -34,7 +34,12 @@ options HZ=100 #options DEVICE_POLLING +options INVARIANTS #Enable calls of extra sanity checking +options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +options WITNESS #Enable checks to detect deadlocks and cycles + options SCHED_4BSD #4BSD scheduler +options KSE options INET #InterNETworking options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem @@ -82,19 +87,23 @@ device ata device atadisk # ATA disk drives options ATA_STATIC_ID # Static device numbering +device ata_avila # Gateworks CF/IDE support device npe # Network Processing Engine device npe_fw # NPE firmware device firmware # firmware support for npe_fw -device qmgr # Q Manager +device qmgr # Q Manager (required by npe) device miibus # NB: required by npe device ether +device bpf device pty device loop +device if_bridge # Debugging for use in -current options KDB +#options GDB options DDB #Enable the kernel debugger #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS @@ -121,3 +130,7 @@ device ath_hal # Atheros HAL (Hardware Access Layer) device ath_rate_sample # SampleRate tx rate control for ath options ATH_DEBUG + +#device crypto +#device cryptodev +#device hifn # NB: Soekris minipci card known to work From owner-p4-projects@FreeBSD.ORG Fri Nov 10 13:40:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7502116A417; Fri, 10 Nov 2006 13:40:17 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4CC6916A40F for ; Fri, 10 Nov 2006 13:40:17 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E836F43D45 for ; Fri, 10 Nov 2006 13:40:16 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAADeGNc021775 for ; Fri, 10 Nov 2006 13:40:16 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAADeGVN021772 for perforce@freebsd.org; Fri, 10 Nov 2006 13:40:16 GMT (envelope-from bushman@freebsd.org) Date: Fri, 10 Nov 2006 13:40:16 GMT Message-Id: <200611101340.kAADeGVN021772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 109682 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 13:40:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=109682 Change 109682 by bushman@bushman_nss_ldap_cached on 2006/11/10 13:40:14 + more diagnostic log messages added - should be useful when setting up an LDAP environment Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.c#16 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#17 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.c#13 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#17 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#18 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.h#14 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.c#16 (text+ko) ==== @@ -101,22 +101,20 @@ static int __pg_ht_item_cmp_func(const void *, const void *); static hashtable_index_t __pg_ht_item_hash_func(const void *, size_t); HASHTABLE_PROTOTYPE(__pg_ht, __pg_he, struct processed_group); - + +static int ldap_getgrnam_r(const char *, struct group *, char *, size_t, + struct group **); +static int ldap_getgrgid_r(gid_t, struct group *, char *, size_t, + struct group **); +static int ldap_getgrent_r(struct group *, char *, size_t, struct group **); +static void ldap_setgrent(); static int nss_ldap_map_group_dn(struct nss_ldap_search_context *, char const *, char **, size_t *, char *, size_t, void *); +static int nss_ldap_parse_group(struct nss_ldap_parse_context *); static int nss_ldap_parse_nested_group(struct nss_ldap_search_context *, char const *, struct map_group_dn_request *, char ***, size_t *, size_t *, char *, size_t); - -static int nss_ldap_parse_group(struct nss_ldap_parse_context *); static void nss_ldap_destroy_group_ctx(struct nss_ldap_parse_context *); - -static int ldap_getgrnam_r(const char *, struct group *, char *, size_t, - struct group **); -static int ldap_getgrgid_r(gid_t, struct group *, char *, size_t, - struct group **); -static int ldap_getgrent_r(struct group *, char *, size_t, struct group **); -static void ldap_setgrent(); static int __mu_ht_item_cmp_func(const void *p1, const void *p2) @@ -458,23 +456,36 @@ rv = __nss_ldap_assign_attr_gid(sctx, _ATM(schema, GROUP, gidNumber), &grp->gr_gid); - if (rv != NSS_LDAP_SUCCESS) + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_group: " + "can't assign %s, error %d (%s)", + _ATM(schema, GROUP, gidNumber), rv, __nss_ldap_err2str(rv)); goto errfin; + } //printf("__ %s %d\n", __FILE__, __LINE__); rv = __nss_ldap_assign_rdn_str(sctx, _ATM(schema, GROUP, cn), &grp->gr_name, &len, buf, rbuf - buf); - if (rv != NSS_LDAP_SUCCESS) + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_group: " + "can't assign %s, error %d (%s)", + _ATM(schema, GROUP, cn), rv, __nss_ldap_err2str(rv)); goto errfin; + } // printf("__ %s %d %s\n", __FILE__, __LINE__, grp->gr_name); buf += len; rv = __nss_ldap_assign_attr_password(sctx, _ATM(schema, GROUP, userPassword), &grp->gr_passwd, &len, buf, rbuf - buf); - if (rv != NSS_LDAP_SUCCESS) + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_group: " + "can't assign %s, error %d (%s)", + _ATM(schema, GROUP, userPassword), rv, + __nss_ldap_err2str(rv)); goto errfin; + } buf += len; grp->gr_mem = NULL; @@ -491,6 +502,11 @@ buf += len; grp->gr_mem = res; + + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_group: " + "can't assign %s, error %d (%s)", + _ATM(schema, GROUP, memberUid), rv, + __nss_ldap_err2str(rv)); } if (gmdata == NULL) { @@ -591,7 +607,12 @@ // printf("__ %s %d %d %d %d\n", __FILE__, __LINE__, memlen, len, buflen); // for (cp = res; *cp; ++cp) // printf("__ %s %d %s\n", __FILE__, __LINE__, *cp); - } + } else + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, + "nss_ldap_parse_group: can't assign %s, error %d (%s)", + _ATM(schema, GROUP, uniqueMember), rv, + __nss_ldap_err2str(rv)); + // char **cp; // for (cp = grp->gr_mem; *cp; ++cp) { @@ -617,6 +638,13 @@ } sl_free(dnreq.next_requests, 0); + + if (rv != NSS_LDAP_SUCCESS) + __nss_ldap_log(NSS_LDAP_LL_WARN, + "nss_ldap_parse_group: can't assign %s and %s, error %d (%s)", + _ATM(schema, GROUP, memberUid), + _ATM(schema, GROUP, uniqueMember), rv, + __nss_ldap_err2str(rv)); errfin: // printf("__ %s %d %d\n", __FILE__, __LINE__, rv); return (rv); @@ -634,11 +662,9 @@ struct processed_group *group_hash_data; assert(pctx != NULL); - printf("%s %d\n", __FILE__, __LINE__); if (pctx->mdata_ext != NULL) { gmdata = pctx->mdata_ext; - printf("%s %d\n", __FILE__, __LINE__); if (gmdata->users != NULL) { HASHTABLE_FOREACH(gmdata->users, user_hash_entry) { HASHTABLE_ENTRY_FOREACH(user_hash_entry, data, @@ -651,10 +677,8 @@ } HASHTABLE_DESTROY(gmdata->users, data); free(gmdata->users); - printf("%s %d\n", __FILE__, __LINE__); } - printf("%s %d\n", __FILE__, __LINE__); if (gmdata->groups != NULL) { HASHTABLE_FOREACH(gmdata->groups, group_hash_entry) { HASHTABLE_ENTRY_FOREACH(group_hash_entry, data, @@ -665,7 +689,6 @@ } HASHTABLE_DESTROY(gmdata->groups, data); free(gmdata->groups); - printf("%s %d\n", __FILE__, __LINE__); } free(gmdata); @@ -688,6 +711,8 @@ __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_STR, filter, sizeof(filter), name); + __nss_ldap_log(NSS_LDAP_LL_DEBUG, "ldap_getgrnam_r: doing ldap query " + "with filter: %s", filter); rv = __nss_ldap_getby(NSS_LDAP_MAP_GROUP, filter, (void *)grp, buffer, bufsize, nss_ldap_parse_group, nss_ldap_destroy_group_ctx); @@ -714,6 +739,8 @@ __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_GID, filter, sizeof(filter), gid); + __nss_ldap_log(NSS_LDAP_LL_DEBUG, "ldap_getgrgid_r: doing ldap query " + "with filter: %s", filter); rv = __nss_ldap_getby(NSS_LDAP_MAP_GROUP, filter, (void *)grp, buffer, bufsize, nss_ldap_parse_group, nss_ldap_destroy_group_ctx); @@ -736,6 +763,8 @@ if (filter == NULL) return (NS_UNAVAIL); + __nss_ldap_log(NSS_LDAP_LL_DEBUG, "ldap_getgrent_r: doing ldap query " + "with filter: %s", filter); rv = __nss_ldap_getent(NSS_LDAP_MAP_GROUP, filter, (void *)grp, buffer, bufsize, nss_ldap_parse_group, nss_ldap_destroy_group_ctx); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#17 (text+ko) ==== @@ -43,15 +43,98 @@ #include "ldapconf.h" #include "nss_ldap.h" -static int nss_ldap_parse_passwd(struct nss_ldap_parse_context *); - static int ldap_getpwnam_r(const char *, struct passwd *, char *, size_t, struct passwd **); static int ldap_getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **); static int ldap_getpwent_r(struct passwd *, char *, size_t, struct passwd **); static void ldap_setpwent(); +static int nss_ldap_parse_passwd(struct nss_ldap_parse_context *); +static int +ldap_getpwnam_r(const char *name, struct passwd *pwd, + char *buffer, size_t bufsize, struct passwd **result) +{ + char filter[NSS_LDAP_FILTER_MAX_SIZE]; + char const *fmt; + int rv; + + fmt = __nss_ldap_get_schema_filter(&__nss_ldap_conf->schema, + NSS_LDAP_FILTER_GETPWNAM); + if (fmt == NULL) + return (NS_UNAVAIL); + + __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_STR, filter, + sizeof(filter), name); + + __nss_ldap_log(NSS_LDAP_LL_DEBUG, "ldap_getpwnam_r: doing ldap query " + "with filter: %s", filter); + rv = __nss_ldap_getby(NSS_LDAP_MAP_PASSWD, filter, (void *)pwd, + buffer, bufsize, nss_ldap_parse_passwd, NULL); + + if (rv == NS_SUCCESS) + *result = pwd; + + return (rv); +} + +static int +ldap_getpwuid_r(uid_t uid, struct passwd *pwd, + char *buffer, size_t bufsize, struct passwd **result) +{ + char filter[NSS_LDAP_FILTER_MAX_SIZE]; + char const *fmt; + int rv; + + fmt = __nss_ldap_get_schema_filter(&__nss_ldap_conf->schema, + NSS_LDAP_FILTER_GETPWUID); + if (fmt == NULL) + return (NS_UNAVAIL); + + __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_UID, filter, + sizeof(filter), uid); + + __nss_ldap_log(NSS_LDAP_LL_DEBUG, "ldap_getpwuid_r: doing ldap query " + "with filter: %s", filter); + rv = __nss_ldap_getby(NSS_LDAP_MAP_PASSWD, filter, (void *)pwd, + buffer, bufsize, nss_ldap_parse_passwd, NULL); + + if (rv == NS_SUCCESS) + *result = pwd; + + return (rv); +} + +static int +ldap_getpwent_r(struct passwd *pwd, char *buffer, size_t bufsize, + struct passwd **result) +{ + char const *filter; + int rv; + + filter = __nss_ldap_get_schema_filter(&__nss_ldap_conf->schema, + NSS_LDAP_FILTER_GETPWENT); + if (filter == NULL) + return (NS_UNAVAIL); + + __nss_ldap_log(NSS_LDAP_LL_DEBUG, "ldap_getpwent_r: doing ldap query " + "with filter: %s", filter); + rv = __nss_ldap_getent(NSS_LDAP_MAP_PASSWD, filter, (void *)pwd, + buffer, bufsize, nss_ldap_parse_passwd, NULL); + + if (rv == NS_SUCCESS) + *result = pwd; + + return (rv); +} + +static void +ldap_setpwent() +{ + + __nss_ldap_setent(NSS_LDAP_MAP_PASSWD); +} + static int nss_ldap_parse_passwd(struct nss_ldap_parse_context *pctx) { @@ -74,24 +157,40 @@ schema = &sctx->conf->schema; if ((__nss_ldap_check_oc(sctx, "shadowAccount") == NSS_LDAP_SUCCESS) - || (geteuid() != 0)) - rv = __nss_ldap_assign_str("*", &pwd->pw_dir, &len, buf, + || (geteuid() != 0)) { + rv = __nss_ldap_assign_str("*", &pwd->pw_passwd, &len, buf, buflen); - else + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " + "can't assign '*' as the password, error %d (%s)", + rv, __nss_ldap_err2str(rv)); + goto errfin; + } + } else { rv = __nss_ldap_assign_attr_password(sctx, _ATM(schema, PASSWD, userPassword), &pwd->pw_passwd, &len, buf, buflen); + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " + "can't assign %s, error %d (%s)", + _ATM(schema, PASSWD, userPassword), rv, + __nss_ldap_err2str(rv)); + goto errfin; + } + } - if (rv != NSS_LDAP_SUCCESS) - goto errfin; buflen -= len; buf += len; rv = __nss_ldap_assign_attr_str(sctx, _ATM(schema, PASSWD, uid), &pwd->pw_name, &len, buf, buflen); - if (rv != NSS_LDAP_SUCCESS) + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + "can't assign %s, error %d (%s)", + _ATM(schema, PASSWD, uid), rv, __nss_ldap_err2str(rv)); goto errfin; + } buflen -= len; buf += len; @@ -99,169 +198,154 @@ _ATM(schema, PASSWD, gecos), &pwd->pw_gecos, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: ", + "can't assign %s, error %d (%s), falling back to %s", + _ATM(schema, PASSWD, gecos), rv, + __nss_ldap_err2str(rv), _ATM(schema, PASSWD, cn)); pwd->pw_gecos = NULL; rv = __nss_ldap_assign_attr_str(sctx, _ATM(schema, PASSWD, cn), &pwd->pw_gecos, &len, buf, buflen); + + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + "can't assign %s, error %d (%s)", + _ATM(schema, PASSWD, cn), rv, __nss_ldap_err2str(rv)); + goto errfin; + } } - if (rv != NSS_LDAP_SUCCESS) - goto errfin; buflen -= len; buf += len; rv = __nss_ldap_assign_attr_str(sctx, _ATM(schema, PASSWD, homeDirectory), &pwd->pw_dir, &len, buf, buflen); - if (rv != NSS_LDAP_SUCCESS) + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: ", + "can't assign %s, error %d (%s), falling back to empty " + "value", _ATM(schema, PASSWD, homeDirectory), rv, + __nss_ldap_err2str(rv)); rv = __nss_ldap_assign_str("", &pwd->pw_dir, &len, buf, buflen); - if (rv != NSS_LDAP_SUCCESS) - goto errfin; + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + "can't assign empty value as home directory, " + "error %d (%s)", rv, __nss_ldap_err2str(rv)); + goto errfin; + } + } buflen -= len; buf += len; rv = __nss_ldap_assign_attr_str(sctx, _ATM(schema, PASSWD, loginShell), &pwd->pw_shell, &len, buf, buflen); - if (rv != NSS_LDAP_SUCCESS) + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: ", + "can't assign %s, error %d (%s), falling back to empty " + "value", _ATM(schema, PASSWD, loginShell), rv, + __nss_ldap_err2str(rv)); + rv = __nss_ldap_assign_str("", &pwd->pw_shell, &len, buf, buflen); - if (rv != NSS_LDAP_SUCCESS) - goto errfin; + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + "can't assign empty value as user shell, " + "error %d (%s)", rv, __nss_ldap_err2str(rv)); + goto errfin; + } + } buflen -= len; buf += len; rv = __nss_ldap_assign_attr_str(sctx, _ATM(schema, PASSWD, loginClass), &pwd->pw_class, &len, buf, buflen); - if (rv != NSS_LDAP_SUCCESS) + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: ", + "can't assign %s, error %d (%s), falling back to empty " + "value", _ATM(schema, PASSWD, loginClass), rv, + __nss_ldap_err2str(rv)); + rv = __nss_ldap_assign_str("", &pwd->pw_class, &len, buf, buflen); - if (rv != NSS_LDAP_SUCCESS) - goto errfin; + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + "can't assign empty value as login class, " + "error %d (%s)", rv, __nss_ldap_err2str(rv)); + goto errfin; + } + } buflen -= len; buf += len; rv = __nss_ldap_assign_attr_uid(sctx, _ATM(schema, PASSWD, uidNumber), &pwd->pw_uid); - if (rv != NSS_LDAP_SUCCESS) + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + "can't assign %s, error %d (%s)", + _ATM(schema, PASSWD, uidNumber), rv, __nss_ldap_err2str(rv)); goto errfin; + } rv = __nss_ldap_assign_attr_gid(sctx, _ATM(schema, PASSWD, gidNumber), &pwd->pw_gid); - if (rv != NSS_LDAP_SUCCESS) + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + "can't assign %s, error %d (%s)", + _ATM(schema, PASSWD, gidNumber), rv, + __nss_ldap_err2str(rv)); goto errfin; + } rv = __nss_ldap_assign_attr_time(sctx, _ATM(schema, PASSWD, shadowMax), &pwd->pw_change); if (rv == NSS_LDAP_SUCCESS) pwd->pw_change *= 24*60*60; - else + else { + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: ", + "can't assign %s, error %d (%s)", + _ATM(schema, PASSWD, shadowMax), rv, + __nss_ldap_err2str(rv)); pwd->pw_change = 0; + } if (pwd->pw_change > 0) { rv = __nss_ldap_assign_attr_time(sctx, _ATM(schema, PASSWD, shadowLastChange), &temp_time); if (rv == NSS_LDAP_SUCCESS) pwd->pw_change += temp_time; - else + else { pwd->pw_change = 0; + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, + "nss_ldap_parse_passwd: ", + "can't assign %s, error %d (%s)", + _ATM(schema, PASSWD, shadowLastChange), rv, + __nss_ldap_err2str(rv)); + } } rv = __nss_ldap_assign_attr_time(sctx, _ATM(schema, PASSWD, shadowExpire), &pwd->pw_expire); if (rv == NSS_LDAP_SUCCESS) pwd->pw_expire *= 24*60*60; - else + else { pwd->pw_expire = 0; + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, + "nss_ldap_parse_passwd: ", + "can't assign %s, error %d (%s)", + _ATM(schema, PASSWD, shadowExpire), rv, + __nss_ldap_err2str(rv)); + } rv = NSS_LDAP_SUCCESS; errfin: return (rv); } -static int -ldap_getpwnam_r(const char *name, struct passwd *pwd, - char *buffer, size_t bufsize, struct passwd **result) -{ - char filter[NSS_LDAP_FILTER_MAX_SIZE]; - char const *fmt; - int rv; - - fmt = __nss_ldap_get_schema_filter(&__nss_ldap_conf->schema, - NSS_LDAP_FILTER_GETPWNAM); - if (fmt == NULL) - return (NS_UNAVAIL); - - __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_STR, filter, - sizeof(filter), name); - - rv = __nss_ldap_getby(NSS_LDAP_MAP_PASSWD, filter, (void *)pwd, - buffer, bufsize, nss_ldap_parse_passwd, NULL); - - if (rv == NS_SUCCESS) - *result = pwd; - - return (rv); -} - -static int -ldap_getpwuid_r(uid_t uid, struct passwd *pwd, - char *buffer, size_t bufsize, struct passwd **result) -{ - char filter[NSS_LDAP_FILTER_MAX_SIZE]; - char const *fmt; - int rv; - - fmt = __nss_ldap_get_schema_filter(&__nss_ldap_conf->schema, - NSS_LDAP_FILTER_GETPWUID); - if (fmt == NULL) - return (NS_UNAVAIL); - - __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_UID, filter, - sizeof(filter), uid); - - rv = __nss_ldap_getby(NSS_LDAP_MAP_PASSWD, filter, (void *)pwd, - buffer, bufsize, nss_ldap_parse_passwd, NULL); - - if (rv == NS_SUCCESS) - *result = pwd; - - return (rv); -} - -static int -ldap_getpwent_r(struct passwd *pwd, char *buffer, size_t bufsize, - struct passwd **result) -{ - char const *filter; - int rv; - - filter = __nss_ldap_get_schema_filter(&__nss_ldap_conf->schema, - NSS_LDAP_FILTER_GETPWENT); - if (filter == NULL) - return (NS_UNAVAIL); - - rv = __nss_ldap_getent(NSS_LDAP_MAP_PASSWD, filter, (void *)pwd, - buffer, bufsize, nss_ldap_parse_passwd, NULL); - - if (rv == NS_SUCCESS) - *result = pwd; - - return (rv); -} - -static void -ldap_setpwent() -{ - - __nss_ldap_setent(NSS_LDAP_MAP_PASSWD); -} - - int __ldap_setpwent(void *retval, void *mdata, va_list ap) { ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.c#13 (text+ko) ==== @@ -57,9 +57,6 @@ ssize_t offset; size_t count; }; - -static int nss_ldap_parse_servent(struct nss_ldap_parse_context *); -static void nss_ldap_destroy_servent_ctx(struct nss_ldap_parse_context *); static int ldap_getservbyname_r(const char *, const char *, struct servent *, char *, size_t, struct servent **); @@ -68,8 +65,126 @@ static int ldap_getservent_r(struct servent *, char *, size_t, struct servent **); static void ldap_setservent(); +static int nss_ldap_parse_servent(struct nss_ldap_parse_context *); +static void nss_ldap_destroy_servent_ctx(struct nss_ldap_parse_context *); + +static int +ldap_getservbyname_r(const char *name, const char *proto, struct servent *serv, + char *buffer, size_t bufsize, struct servent **result) +{ + char filter[NSS_LDAP_FILTER_MAX_SIZE]; + struct services_mdata mdata; + char const *fmt; + int rv; + + fmt = __nss_ldap_get_schema_filter(&__nss_ldap_conf->schema, + NSS_LDAP_FILTER_GETSERVBYNAME); + if (fmt == NULL) + return (NS_UNAVAIL); + + if (proto != NULL) + __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_STR_STR, filter, + sizeof(filter), name, proto); + else + __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_STR_ANY, filter, + sizeof(filter), name); + + __nss_ldap_log(NSS_LDAP_LL_DEBUG, + "ldap_getservbyport_r: doing ldap query with filter: %s", filter); + + memset(&mdata, 0, sizeof(struct services_mdata)); + mdata.serv = serv; + mdata.proto = proto; + mdata.type = NSS_LDAP_SERVICES_BY_KEY; + + rv = __nss_ldap_getby(NSS_LDAP_MAP_SERVICES, filter, + (void *)&mdata, buffer, bufsize, + nss_ldap_parse_servent, NULL); + + if (rv == NS_SUCCESS) + *result = serv; + + return (rv); +} + +static int +ldap_getservbyport_r(int port, const char *proto, struct servent *serv, + char *buffer, size_t bufsize, struct servent **result) +{ + char filter[NSS_LDAP_FILTER_MAX_SIZE]; + struct services_mdata mdata; + char const *fmt; + int rv; + + fmt = __nss_ldap_get_schema_filter(&__nss_ldap_conf->schema, + NSS_LDAP_FILTER_GETSERVBYPORT); + if (fmt == NULL) + return (NS_UNAVAIL); + + if (proto != NULL) + __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_INT_STR, filter, + sizeof(filter), htons(port), proto); + else + __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_INT_ANY, filter, + sizeof(filter), htons(port)); + + __nss_ldap_log(NSS_LDAP_LL_DEBUG, + "ldap_getservbyport_r: doing ldap query with filter: %s", filter); + + memset(&mdata, 0, sizeof(struct services_mdata)); + mdata.serv = serv; + mdata.proto = proto; + mdata.type = NSS_LDAP_SERVICES_BY_KEY; + + rv = __nss_ldap_getby(NSS_LDAP_MAP_SERVICES, filter, + (void *)&mdata, buffer, bufsize, + nss_ldap_parse_servent, NULL); + + printf("== %d\n", rv); + if (rv == NS_SUCCESS) + *result = serv; + + return (rv); +} static int +ldap_getservent_r(struct servent *serv, char *buffer, size_t bufsize, + struct servent **result) +{ + struct services_mdata mdata; + char const *filter; + int rv; + + filter = __nss_ldap_get_schema_filter(&__nss_ldap_conf->schema, + NSS_LDAP_FILTER_GETSERVENT); + if (filter == NULL) + return (NS_UNAVAIL); + + __nss_ldap_log(NSS_LDAP_LL_DEBUG, "ldap_getservent_r: doing ldap query " + "with filter: %s", filter); + + memset(&mdata, 0, sizeof(struct services_mdata)); + mdata.serv = serv; + mdata.type = NSS_LDAP_SERVICES_ALL; + + rv = __nss_ldap_getent(NSS_LDAP_MAP_SERVICES, filter, (void *)&mdata, + buffer, bufsize, nss_ldap_parse_servent, + nss_ldap_destroy_servent_ctx); + + if (rv == NS_SUCCESS) + *result = serv; + + return (rv); +} + +static void +ldap_setservent() +{ + + __nss_ldap_setent(NSS_LDAP_MAP_SERVICES); +} + +static int nss_ldap_parse_servent(struct nss_ldap_parse_context *pctx) { struct nss_ldap_schema *schema; @@ -99,16 +214,29 @@ if (serv_mdata->proto != NULL) { rv = __nss_ldap_assign_str(serv_mdata->proto, &serv->s_proto, &len, buf, buflen); - if (rv != NSS_LDAP_SUCCESS) - goto errfin; + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, + "nss_ldap_parse_servent: can't assign " + "'%s', as the protocol, error %d (%s)", + serv_mdata->proto, rv, + __nss_ldap_err2str(rv)); + + goto errfin; + } buflen -= len; buf += len; } else { rv = __nss_ldap_assign_attr_str(sctx, _ATM(schema, SERVICES, ipServiceProtocol), &serv->s_proto, &len, buf, buflen); - if (rv != NSS_LDAP_SUCCESS) + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, + "nss_ldap_parse_servent: can't assign %s, " + "error %d (%s)", + _ATM(schema, SERVICES, ipServiceProtocol), + rv, __nss_ldap_err2str(rv)); goto errfin; + } buflen -= len; buf += len; } @@ -132,8 +260,14 @@ _ATM(schema, SERVICES, ipServiceProtocol), serv_mdata_ext->offset, &serv_mdata_ext->count, &serv->s_proto, &len, buf, buflen); - if (rv != NSS_LDAP_SUCCESS) + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, + "nss_ldap_parse_servent: can't assign %s" + " values number, error %d (%s)", + _ATM(schema, SERVICES, ipServiceProtocol), + rv, __nss_ldap_err2str(rv)); goto errfin; + } serv_mdata_ext->offset = 0; } @@ -143,6 +277,15 @@ _ATM(schema, SERVICES, ipServiceProtocol), serv_mdata_ext->offset, NULL, &serv->s_proto, &len, buf, buflen); + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, + "nss_ldap_parse_servent: can't assign %s" + " value number #%d of %d, error %d (%s)", + _ATM(schema, SERVICES, ipServiceProtocol), + serv_mdata_ext->offset, + serv_mdata_ext->count, + rv, __nss_ldap_err2str(rv)); + } if (++serv_mdata_ext->offset >= serv_mdata_ext->count) { serv_mdata_ext->offset = -1; @@ -165,8 +308,14 @@ rv = __nss_ldap_assign_rdn_str(sctx, _ATM(schema, SERVICES, cn), &serv->s_name, &len, buf, buflen); - if (rv != NSS_LDAP_SUCCESS) + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, + "nss_ldap_parse_servent: can't assign %s part of the rdn, " + "error %d (%s)", + _ATM(schema, SERVICES, cn), + rv, __nss_ldap_err2str(rv)); goto errfin; + } buflen -= len; buf += len; @@ -174,8 +323,14 @@ rv = __nss_ldap_assign_attr_multi_str(sctx, _ATM(schema, SERVICES, cn), &serv->s_aliases, &memlen, &len, buf, buflen); - if (rv != NSS_LDAP_SUCCESS) + if (rv != NSS_LDAP_SUCCESS) { + __nss_ldap_log(NSS_LDAP_LL_WARN, + "nss_ldap_parse_servent: can't assign %s, " + "error %d (%s)", + _ATM(schema, SERVICES, cn), + rv, __nss_ldap_err2str(rv)); goto errfin; + } buflen -= len; buf += len; @@ -184,9 +339,15 @@ &serv->s_port); if (rv == NSS_LDAP_SUCCESS) serv->s_port = ntohs(serv->s_port); - + else + __nss_ldap_log(NSS_LDAP_LL_WARN, + "nss_ldap_parse_servent: can't assign %s, " + "error %d (%s)", + _ATM(schema, SERVICES, ipServicePort), + rv, __nss_ldap_err2str(rv)); + errfin: - return (rv); + return (rv); } static void @@ -197,116 +358,10 @@ free(pctx->mdata_ext); } -static int -ldap_getservbyname_r(const char *name, const char *proto, struct servent *serv, - char *buffer, size_t bufsize, struct servent **result) -{ - char filter[NSS_LDAP_FILTER_MAX_SIZE]; - struct services_mdata mdata; - char const *fmt; - int rv; - - fmt = __nss_ldap_get_schema_filter(&__nss_ldap_conf->schema, - NSS_LDAP_FILTER_GETSERVBYNAME); - if (fmt == NULL) - return (NS_UNAVAIL); - - if (proto != NULL) - __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_STR_STR, filter, - sizeof(filter), name, proto); - else - __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_STR_ANY, filter, - sizeof(filter), name); - - memset(&mdata, 0, sizeof(struct services_mdata)); - mdata.serv = serv; - mdata.proto = proto; - mdata.type = NSS_LDAP_SERVICES_BY_KEY; - - rv = __nss_ldap_getby(NSS_LDAP_MAP_SERVICES, filter, - (void *)&mdata, buffer, bufsize, - nss_ldap_parse_servent, NULL); - - if (rv == NS_SUCCESS) - *result = serv; - - return (rv); -} - -static int -ldap_getservbyport_r(int port, const char *proto, struct servent *serv, - char *buffer, size_t bufsize, struct servent **result) -{ - char filter[NSS_LDAP_FILTER_MAX_SIZE]; - struct services_mdata mdata; - char const *fmt; - int rv; - - fmt = __nss_ldap_get_schema_filter(&__nss_ldap_conf->schema, - NSS_LDAP_FILTER_GETSERVBYPORT); - if (fmt == NULL) - return (NS_UNAVAIL); - - if (proto != NULL) - __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_INT_STR, filter, - sizeof(filter), htons(port), proto); - else - __nss_ldap_format_filter(fmt, NSS_LDAP_FILTER_ARGS_INT_ANY, filter, - sizeof(filter), htons(port)); - - memset(&mdata, 0, sizeof(struct services_mdata)); - mdata.serv = serv; - mdata.proto = proto; - mdata.type = NSS_LDAP_SERVICES_BY_KEY; - - rv = __nss_ldap_getby(NSS_LDAP_MAP_SERVICES, filter, - (void *)&mdata, buffer, bufsize, - nss_ldap_parse_servent, NULL); - - printf("== %d\n", rv); - if (rv == NS_SUCCESS) - *result = serv; - - return (rv); -} - -static int -ldap_getservent_r(struct servent *serv, char *buffer, size_t bufsize, - struct servent **result) -{ - struct services_mdata mdata; - char const *filter; - int rv; - - filter = __nss_ldap_get_schema_filter(&__nss_ldap_conf->schema, - NSS_LDAP_FILTER_GETSERVENT); - if (filter == NULL) - return (NS_UNAVAIL); - - memset(&mdata, 0, sizeof(struct services_mdata)); - mdata.serv = serv; - mdata.type = NSS_LDAP_SERVICES_ALL; - - rv = __nss_ldap_getent(NSS_LDAP_MAP_SERVICES, filter, (void *)&mdata, - buffer, bufsize, nss_ldap_parse_servent, - nss_ldap_destroy_servent_ctx); - - if (rv == NS_SUCCESS) - *result = serv; - - return (rv); -} - -static void -ldap_setservent() -{ - - __nss_ldap_setent(NSS_LDAP_MAP_SERVICES); -} - int __ldap_setservent(void *retval, void *mdata, va_list ap) { + if (__nss_ldap_configure() != NSS_LDAP_SUCCESS) return (NS_UNAVAIL); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#17 (text+ko) ==== @@ -322,6 +322,11 @@ char *str; int i, rv, value; + /* + * We ensure compatibility with PADL, but define, where appropriate, + * aliases for configuration keywords - in hope that with these + * aliases configuration file will look more consistent. + */ switch (fields[0][0]) { case 'b': case 'B': @@ -400,20 +405,14 @@ /* NOTE: we'd probably better use * NSS_LDAP_PROTO_VERSION_2 and * NSS_LDAP_PROTO_VERSION_3 constants here */ - if (strcasecmp(fields[0], "ldap-version") == 0) { + if ((strcasecmp(fields[0], "ldap-version") == 0) || + (strcasecmp(fields[0], "ldap_version") == 0)) { if ((field_count == 2) && (get_number(fields[1], 2, 3, &value) == NSS_LDAP_SUCCESS)) { conf->proto_version = value; return (NSS_LDAP_SUCCESS); } - } else if (strcasecmp(fields[0], "logdir") == 0) { - if (field_count == 2) { - free(conf->logdir); - conf->logdir = strdup(fields[1]); - if (conf->logdir != NULL) - return (NSS_LDAP_SUCCESS); - } } break; case 'n': @@ -445,7 +444,8 @@ return (NSS_LDAP_SUCCESS);; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 10 17:07:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B61916A4A0; Fri, 10 Nov 2006 17:07:35 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8B3C616A494 for ; Fri, 10 Nov 2006 17:07:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9487C43D72 for ; Fri, 10 Nov 2006 17:07:34 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAAH7Yat072180 for ; Fri, 10 Nov 2006 17:07:34 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAAH7Y44072177 for perforce@freebsd.org; Fri, 10 Nov 2006 17:07:34 GMT (envelope-from sam@freebsd.org) Date: Fri, 10 Nov 2006 17:07:34 GMT Message-Id: <200611101707.kAAH7Y44072177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109684 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 17:07:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=109684 Change 109684 by sam@sam_ebb on 2006/11/10 17:07:02 add missing arg setting up ata intr; now we get continuous interrupts Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#2 (text+ko) ==== @@ -98,7 +98,6 @@ struct ata_avila_softc *sc = device_get_softc(dev); struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); -bootverbose=1; sc->sc_dev = dev; /* NB: borrow from parent */ sc->sc_iot = sa->sc_iot; @@ -155,8 +154,9 @@ panic("Unable to allocate irq %u.\n", AVILA_IDE_IRQ); bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_BIO | INTR_MPSAFE | INTR_ENTROPY, - ata_avila_intr, NULL, &sc->sc_ih); + ata_avila_intr, sc, &sc->sc_ih); +bootverbose=1; /* attach channel on this controller */ device_add_child(dev, "ata", devclass_find_free_unit(ata_devclass, 0)); bus_generic_attach(dev); @@ -191,6 +191,7 @@ { struct ata_avila_softc *sc = xsc; +printf("%s: cb %p arg %p\n", __func__, sc->sc_intr[0].cb, sc->sc_intr[0].arg);/*XXX*/ if (sc->sc_intr[0].cb != NULL) sc->sc_intr[0].cb(sc->sc_intr[0].arg); } From owner-p4-projects@FreeBSD.ORG Fri Nov 10 17:48:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3092F16A4A0; Fri, 10 Nov 2006 17:48:28 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E638D16A494 for ; Fri, 10 Nov 2006 17:48:27 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 94D9D43D46 for ; Fri, 10 Nov 2006 17:48:27 +0000 (GMT) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAAHmReB078845 for ; Fri, 10 Nov 2006 17:48:27 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAAHmRAu078842 for perforce@freebsd.org; Fri, 10 Nov 2006 17:48:27 GMT (envelope-from andre@freebsd.org) Date: Fri, 10 Nov 2006 17:48:27 GMT Message-Id: <200611101748.kAAHmRAu078842@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 109689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 17:48:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=109689 Change 109689 by andre@andre_flirtbox on 2006/11/10 17:48:20 BOOT_FLAVOR's must be in upper case. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#26 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#26 (text+ko) ==== @@ -5,8 +5,8 @@ __at91_boot_Makefile.inc__: -# tsc, kb920x are the supported flavors -BOOT_FLAVOR=kb920x +# TSC, KB920X are the supported flavors +BOOT_FLAVOR=KB920X CFLAGS=-Os -mcpu=arm9 -ffreestanding \ -I${.CURDIR}/../libat91 \ From owner-p4-projects@FreeBSD.ORG Fri Nov 10 18:21:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0307416A416; Fri, 10 Nov 2006 18:21:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8F66216A407 for ; Fri, 10 Nov 2006 18:21:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32CEE43D45 for ; Fri, 10 Nov 2006 18:21:09 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAAIL93f085119 for ; Fri, 10 Nov 2006 18:21:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAAIL8sU085116 for perforce@freebsd.org; Fri, 10 Nov 2006 18:21:08 GMT (envelope-from sam@freebsd.org) Date: Fri, 10 Nov 2006 18:21:08 GMT Message-Id: <200611101821.kAAIL8sU085116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109691 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 18:21:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=109691 Change 109691 by sam@sam_ebb on 2006/11/10 18:20:40 Change expansion bus CSx register defs from bit shifts to masks so I stop making stupid mistakes. While here add the rest of the bits in the register and do space->tab conversion. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#6 (text+ko) ==== @@ -311,31 +311,41 @@ #define IXP425_EXP_ADDR_T(x) (((x) & 3) << IXP425_EXP_ADDR_SHIFT) /* EXP_CSn bits */ -#define EXP_BYTE_EN (1 << 0) -#define EXP_WR_EN (1 << 1) -#define EXP_SPLT_EN (1 << 3) -#define EXP_MUX_EN (1 << 4) -#define EXP_HRDY_POL (1 << 5) -#define EXP_BYTE_RD16 (1 << 6) -#define EXP_SZ_512 (0 << 10) -#define EXP_SZ_1K (1 << 10) -#define EXP_SZ_2K (2 << 10) -#define EXP_SZ_4K (3 << 10) -#define EXP_SZ_8K (4 << 10) -#define EXP_SZ_16K (5 << 10) -#define EXP_SZ_32K (6 << 10) -#define EXP_SZ_64K (7 << 10) -#define EXP_SZ_128K (8 << 10) -#define EXP_SZ_256K (9 << 10) -#define EXP_SZ_512K (10 << 10) -#define EXP_SZ_1M (11 << 10) -#define EXP_SZ_2M (12 << 10) -#define EXP_SZ_4M (13 << 10) -#define EXP_SZ_8M (14 << 10) -#define EXP_SZ_16M (15 << 10) -#define EXP_CYC_INTEL (0 << 14) -#define EXP_CYC_MOTO (1 << 14) -#define EXP_CYC_HPI (2 << 14) +#define EXP_BYTE_EN 0x00000001 /* bus uses only 8-bit data */ +#define EXP_WR_EN 0x00000002 /* ena writes to CS region */ +/* bit 2 is reserved */ +#define EXP_SPLT_EN 0x00000008 /* ena AHB split transfers */ +#define EXP_MUX_EN 0x00000010 /* multiplexed address/data */ +#define EXP_HRDY_POL 0x00000020 /* HPI|HRDY polarity */ +#define EXP_BYTE_RD16 0x00000040 /* byte rd access to word dev */ +#define EXP_CNFG 0x00003c00 /* device config size */ +#define EXP_SZ_512 (0 << 10) +#define EXP_SZ_1K (1 << 10) +#define EXP_SZ_2K (2 << 10) +#define EXP_SZ_4K (3 << 10) +#define EXP_SZ_8K (4 << 10) +#define EXP_SZ_16K (5 << 10) +#define EXP_SZ_32K (6 << 10) +#define EXP_SZ_64K (7 << 10) +#define EXP_SZ_128K (8 << 10) +#define EXP_SZ_256K (9 << 10) +#define EXP_SZ_512K (10 << 10) +#define EXP_SZ_1M (11 << 10) +#define EXP_SZ_2M (12 << 10) +#define EXP_SZ_4M (13 << 10) +#define EXP_SZ_8M (14 << 10) +#define EXP_SZ_16M (15 << 10) +#define EXP_CYC_TYPE 0x0000c000 /* bus cycle "type" */ +#define EXP_CYC_INTEL (0 << 14) +#define EXP_CYC_MOTO (1 << 14) +#define EXP_CYC_HPI (2 << 14) +#define EXP_T5 0x000f0000 /* recovery timing */ +#define EXP_T4 0x00300000 /* hold timing */ +#define EXP_T3 0x03c00000 /* strobe timing */ +#define EXP_T2 0x0c000000 /* setup/chip select timing */ +#define EXP_T1 0x30000000 /* address timing */ +/* bit 30 is reserved */ +#define EXP_CS_EN 0x80000000 /* chip select enabled */ /* EXP_CNFG0 bits */ #define EXP_CNFG0_8BIT (1 << 0) From owner-p4-projects@FreeBSD.ORG Fri Nov 10 18:23:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1722516A415; Fri, 10 Nov 2006 18:23:13 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 BC40116A40F for ; Fri, 10 Nov 2006 18:23:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69FE743D46 for ; Fri, 10 Nov 2006 18:23:12 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAAINCGV086092 for ; Fri, 10 Nov 2006 18:23:12 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAAINCUj086089 for perforce@freebsd.org; Fri, 10 Nov 2006 18:23:12 GMT (envelope-from sam@freebsd.org) Date: Fri, 10 Nov 2006 18:23:12 GMT Message-Id: <200611101823.kAAINCUj086089@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109692 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 18:23:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=109692 Change 109692 by sam@sam_ebb on 2006/11/10 18:22:20 o correct CS1 configuration o disable interrupts until we sort out ata device reset; otherwise ata storms ('cuz reset has done something to generate an interrupt but then no devices are presumed to exist so the interrupt is not processed) Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#3 (text+ko) ==== @@ -81,7 +81,9 @@ } sc_intr[1]; /* NB: 1/channel */ }; +#if 0 static void ata_avila_intr(void *); +#endif bs_protos(ata); static int @@ -142,20 +144,21 @@ /* clear ISR */ GPIO_CONF_WRITE_4(sa, IXP425_GPIO_GPISR, (1<sc_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->sc_rid, AVILA_IDE_IRQ, AVILA_IDE_IRQ, 1, RF_ACTIVE); if (!sc->sc_irq) panic("Unable to allocate irq %u.\n", AVILA_IDE_IRQ); +#if 0 bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_BIO | INTR_MPSAFE | INTR_ENTROPY, ata_avila_intr, sc, &sc->sc_ih); - +#endif bootverbose=1; /* attach channel on this controller */ device_add_child(dev, "ata", devclass_find_free_unit(ata_devclass, 0)); @@ -186,15 +189,19 @@ return 0; } +#if 0 static void ata_avila_intr(void *xsc) { struct ata_avila_softc *sc = xsc; +#if 0 printf("%s: cb %p arg %p\n", __func__, sc->sc_intr[0].cb, sc->sc_intr[0].arg);/*XXX*/ +#endif if (sc->sc_intr[0].cb != NULL) sc->sc_intr[0].cb(sc->sc_intr[0].arg); } +#endif static struct resource * ata_avila_alloc_resource(device_t dev, device_t child, int type, int *rid, @@ -412,7 +419,9 @@ } ch->r_io[ATA_CONTROL].res = &sc->sc_ata; ch->r_io[ATA_CONTROL].offset = AVILA_IDE_CTRL; + /* NB: by convention this points at the base of registers */ ch->r_io[ATA_IDX_ADDR].res = &sc->sc_ata; + ch->r_io[ATA_IDX_ADDR].offset = 0; ata_default_registers(dev); ata_generic_hw(dev); From owner-p4-projects@FreeBSD.ORG Fri Nov 10 18:42:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F57B16A415; Fri, 10 Nov 2006 18:42:37 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D3C0316A40F for ; Fri, 10 Nov 2006 18:42:36 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98ACC43D53 for ; Fri, 10 Nov 2006 18:42:36 +0000 (GMT) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAAIga5P089401 for ; Fri, 10 Nov 2006 18:42:36 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAAIgaAj089396 for perforce@freebsd.org; Fri, 10 Nov 2006 18:42:36 GMT (envelope-from andre@freebsd.org) Date: Fri, 10 Nov 2006 18:42:36 GMT Message-Id: <200611101842.kAAIgaAj089396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 109693 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 18:42:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=109693 Change 109693 by andre@andre_flirtbox on 2006/11/10 18:41:43 Handle upper case BOOT_FLAVOR. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#10 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#10 (text+ko) ==== @@ -4,17 +4,19 @@ P=boot2 FILES=${P} -SRCS=arm_init.S boot2.c ${BOOT_FLAVOR}_board.c +SRCS=arm_init.S boot2.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .include -.if ${BOOT_FLAVOR} == "tsc" +.if ${BOOT_FLAVOR} == "TSC" +SRCS+=tsc_board.c SRCS+=ee.c .endif -.if ${BOOT_FLAVOR} == "kb920x" +.if ${BOOT_FLAVOR} == "KB920X" +SRCS+=kb920x_board.c CFLAGS+=-DBOOT_IIC .endif CFLAGS+= \ From owner-p4-projects@FreeBSD.ORG Fri Nov 10 18:46:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 422C316A415; Fri, 10 Nov 2006 18:46:43 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 068C516A40F for ; Fri, 10 Nov 2006 18:46:43 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C7D643D5F for ; Fri, 10 Nov 2006 18:46:42 +0000 (GMT) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAAIkgeM089945 for ; Fri, 10 Nov 2006 18:46:42 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAAIkgVx089942 for perforce@freebsd.org; Fri, 10 Nov 2006 18:46:42 GMT (envelope-from andre@freebsd.org) Date: Fri, 10 Nov 2006 18:46:42 GMT Message-Id: <200611101846.kAAIkgVx089942@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 109694 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 18:46:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=109694 Change 109694 by andre@andre_flirtbox on 2006/11/10 18:45:42 Add printf to announce when boot0iic is ready to accept the download. Some xmodem implementations get confused when the 'C' for the download appear right away. Put /r/n to all printf's. Some terminal applications have trouble switching back from xmodem transfers and the first char of the printf gets lost. This is the case with CRT 5.2. Make the EEPROM write size a #define. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#8 (text) ==== @@ -28,16 +28,21 @@ #include "lib.h" #include "at91rm9200_lowlevel.h" +#define EEPROMSIZE 8192 /* Bytes to be written to EEPROM */ + int main(void) { char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ + printf("\r\nSend data to be written into EEPROM at addr 0 " + "(EEPROMSIZE bytes)\r\n"); + while (xmodem_rx(addr) == -1) continue; InitEEPROM(); - printf("Writing EEPROM from 0x%x to addr 0\n", addr); - WriteEEPROM(0, addr, 8192); - printf("Write complete. Press reset\n"); + printf("\r\nWriting EEPROM from 0x%x to addr 0, EEPROMSIZE bytes\r\n", addr); + WriteEEPROM(0, addr, EEPROMSIZE); + printf("\r\nWrite complete. Press reset\r\n"); return (1); } From owner-p4-projects@FreeBSD.ORG Fri Nov 10 18:50:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AC2A16A415; Fri, 10 Nov 2006 18:50:48 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 51C3716A407 for ; Fri, 10 Nov 2006 18:50:48 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1268243D46 for ; Fri, 10 Nov 2006 18:50:48 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAAIol4D090173 for ; Fri, 10 Nov 2006 18:50:47 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAAIol3a090170 for perforce@freebsd.org; Fri, 10 Nov 2006 18:50:47 GMT (envelope-from sam@freebsd.org) Date: Fri, 10 Nov 2006 18:50:47 GMT Message-Id: <200611101850.kAAIol3a090170@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109695 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 18:50:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=109695 Change 109695 by sam@sam_ebb on 2006/11/10 18:50:41 o setup all direct-mapped registers (was only doing up to command but everything up to status is there) o don't call ata_default_registers; it clobbers register mappings; not sure if we'll need to manually fixup IREASON and ALTSTAT Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#4 (text+ko) ==== @@ -281,8 +281,13 @@ { struct ata_avila_softc *sc = t; -printf("%s(%lx, %ld)\n", __func__, h, o); +#if 0 return bus_space_read_1(sc->sc_iot, h, o); +#else +uint8_t v = bus_space_read_1(sc->sc_iot, h, o); +printf("%s(%lx, %ld) => 0x%x\n", __func__, h, o, v); +return v; +#endif } void @@ -413,16 +418,17 @@ struct ata_channel *ch = device_get_softc(dev); int i; - for (i = ATA_DATA; i <= ATA_COMMAND; i++) { + /* registers up to ATA_STATUS map directly */ + for (i = ATA_DATA; i <= ATA_STATUS; i++) { ch->r_io[i].res = &sc->sc_ata; ch->r_io[i].offset = i; } + /* the control register is special */ ch->r_io[ATA_CONTROL].res = &sc->sc_ata; ch->r_io[ATA_CONTROL].offset = AVILA_IDE_CTRL; /* NB: by convention this points at the base of registers */ ch->r_io[ATA_IDX_ADDR].res = &sc->sc_ata; ch->r_io[ATA_IDX_ADDR].offset = 0; - ata_default_registers(dev); ata_generic_hw(dev); return ata_attach(dev); From owner-p4-projects@FreeBSD.ORG Fri Nov 10 19:05:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E5FA16A416; Fri, 10 Nov 2006 19:05:09 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 CE1F216A415 for ; Fri, 10 Nov 2006 19:05:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D993A43D5C for ; Fri, 10 Nov 2006 19:05:07 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAAJ57el094472 for ; Fri, 10 Nov 2006 19:05:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAAJ579Z094469 for perforce@freebsd.org; Fri, 10 Nov 2006 19:05:07 GMT (envelope-from sam@freebsd.org) Date: Fri, 10 Nov 2006 19:05:07 GMT Message-Id: <200611101905.kAAJ579Z094469@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109696 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 19:05:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=109696 Change 109696 by sam@sam_ebb on 2006/11/10 19:04:09 re-enable interrupts; they don't fire as before now that we're poking the right registers Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#5 (text+ko) ==== @@ -81,9 +81,7 @@ } sc_intr[1]; /* NB: 1/channel */ }; -#if 0 static void ata_avila_intr(void *); -#endif bs_protos(ata); static int @@ -154,11 +152,10 @@ AVILA_IDE_IRQ, AVILA_IDE_IRQ, 1, RF_ACTIVE); if (!sc->sc_irq) panic("Unable to allocate irq %u.\n", AVILA_IDE_IRQ); -#if 0 bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_BIO | INTR_MPSAFE | INTR_ENTROPY, ata_avila_intr, sc, &sc->sc_ih); -#endif + bootverbose=1; /* attach channel on this controller */ device_add_child(dev, "ata", devclass_find_free_unit(ata_devclass, 0)); @@ -189,7 +186,6 @@ return 0; } -#if 0 static void ata_avila_intr(void *xsc) { @@ -201,7 +197,6 @@ if (sc->sc_intr[0].cb != NULL) sc->sc_intr[0].cb(sc->sc_intr[0].arg); } -#endif static struct resource * ata_avila_alloc_resource(device_t dev, device_t child, int type, int *rid, @@ -410,7 +405,6 @@ return ata_probe(dev); } -#include static int avila_channel_attach(device_t dev) { From owner-p4-projects@FreeBSD.ORG Fri Nov 10 19:10:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B37F16A40F; Fri, 10 Nov 2006 19:10:15 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3D86816A403 for ; Fri, 10 Nov 2006 19:10:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DEFF343D46 for ; Fri, 10 Nov 2006 19:10:14 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAAJAEx9094905 for ; Fri, 10 Nov 2006 19:10:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAAJAEIe094902 for perforce@freebsd.org; Fri, 10 Nov 2006 19:10:14 GMT (envelope-from sam@freebsd.org) Date: Fri, 10 Nov 2006 19:10:14 GMT Message-Id: <200611101910.kAAJAEIe094902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109697 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 19:10:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=109697 Change 109697 by sam@sam_ebb on 2006/11/10 19:10:11 Temporarily disable rx q setup for traffic classes 4-7; these are failing with timeout that slows the boot process. Since all our traffic is classified as class 0 trying to set these up is wasted effort. Leave a printf to nag me to fix this. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#19 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#19 (text+ko) ==== @@ -584,7 +584,12 @@ } ixpqmgr_qconfig(sc->rx_freeqid, npe_rxbuf, 0, npe_rxbuf/2, 0, NULL, sc); /* tell the NPE to direct all traffic to rx_qid */ +#if 0 for (i = 0; i < 8; i++) +#else +device_printf(sc->sc_dev, "remember to fix rx q setup\n"); + for (i = 0; i < 4; i++) +#endif npe_setrxqosentry(sc, i, 0, sc->rx_qid); sc->tx_qid = npeconfig[unit].tx_qid; From owner-p4-projects@FreeBSD.ORG Fri Nov 10 19:33:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0676416A49E; Fri, 10 Nov 2006 19:33:48 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D603C16A47C for ; Fri, 10 Nov 2006 19:33:47 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 918A243D5C for ; Fri, 10 Nov 2006 19:33:47 +0000 (GMT) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAAJXjrR099542 for ; Fri, 10 Nov 2006 19:33:45 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAAJXjI9099537 for perforce@freebsd.org; Fri, 10 Nov 2006 19:33:45 GMT (envelope-from andre@freebsd.org) Date: Fri, 10 Nov 2006 19:33:45 GMT Message-Id: <200611101933.kAAJXjI9099537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 109698 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 19:33:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=109698 Change 109698 by andre@andre_flirtbox on 2006/11/10 19:33:17 Use ${BOOT_FLAVOR:L} magic to lowercase the board flavor. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#11 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#11 (text+ko) ==== @@ -4,7 +4,7 @@ P=boot2 FILES=${P} -SRCS=arm_init.S boot2.c +SRCS=arm_init.S boot2.c ${BOOT_FLAVOR:L}_board.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} @@ -12,11 +12,9 @@ .include .if ${BOOT_FLAVOR} == "TSC" -SRCS+=tsc_board.c SRCS+=ee.c .endif .if ${BOOT_FLAVOR} == "KB920X" -SRCS+=kb920x_board.c CFLAGS+=-DBOOT_IIC .endif CFLAGS+= \ From owner-p4-projects@FreeBSD.ORG Fri Nov 10 19:35:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1134716A417; Fri, 10 Nov 2006 19:35:49 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 DE5FA16A415 for ; Fri, 10 Nov 2006 19:35:48 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65E4143D66 for ; Fri, 10 Nov 2006 19:35:48 +0000 (GMT) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAAJZm4j099734 for ; Fri, 10 Nov 2006 19:35:48 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAAJZmWW099731 for perforce@freebsd.org; Fri, 10 Nov 2006 19:35:48 GMT (envelope-from andre@freebsd.org) Date: Fri, 10 Nov 2006 19:35:48 GMT Message-Id: <200611101935.kAAJZmWW099731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 109699 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 19:35:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=109699 Change 109699 by andre@andre_flirtbox on 2006/11/10 19:35:44 Increase EEPROMSIZE to 16384 as the boot2 loader is slighly larger than 8192 bytes. Get the printing of EEPROMSIZE right. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#9 (text) ==== @@ -28,7 +28,7 @@ #include "lib.h" #include "at91rm9200_lowlevel.h" -#define EEPROMSIZE 8192 /* Bytes to be written to EEPROM */ +#define EEPROMSIZE 16384 /* Bytes to be written to EEPROM */ int main(void) @@ -36,12 +36,12 @@ char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ printf("\r\nSend data to be written into EEPROM at addr 0 " - "(EEPROMSIZE bytes)\r\n"); + "(0x%x bytes)\r\n", EEPROMSIZE); while (xmodem_rx(addr) == -1) continue; InitEEPROM(); - printf("\r\nWriting EEPROM from 0x%x to addr 0, EEPROMSIZE bytes\r\n", addr); + printf("\r\nWriting EEPROM from 0x%x to addr 0, 0x%x bytes\r\n", addr, EEPROMSIZE); WriteEEPROM(0, addr, EEPROMSIZE); printf("\r\nWrite complete. Press reset\r\n"); return (1); From owner-p4-projects@FreeBSD.ORG Fri Nov 10 23:01:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA43216A4A7; Fri, 10 Nov 2006 23:01:44 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9F05B16A47E for ; Fri, 10 Nov 2006 23:01:44 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F8AA43E33 for ; Fri, 10 Nov 2006 23:00:12 +0000 (GMT) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAAN0Cmv045681 for ; Fri, 10 Nov 2006 23:00:12 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAAN0Cn1045678 for perforce@freebsd.org; Fri, 10 Nov 2006 23:00:12 GMT (envelope-from jkim@freebsd.org) Date: Fri, 10 Nov 2006 23:00:12 GMT Message-Id: <200611102300.kAAN0Cn1045678@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 109706 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2006 23:01:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=109706 Change 109706 by jkim@jkim_hammer on 2006/11/10 22:59:53 Add (ugly) 32-bit msgsnd/msgrcv support for amd64. msgp points to msghdr and msghdr contains msg_type, which is long. When we copyin/copyout, we copy the correct msg_type and advance msgp by msg_type size. This fixes LTP test cases msgget01, msgrcv01, msgrcv02, msgrcv04, and msgsnd03. Note: There is only one test case blocked in msgwait state after this change, which seems to be arch-independent issue. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.c#3 edit .. //depot/projects/linuxolator/src/sys/kern/sysv_msg.c#5 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.c#3 (text+ko) ==== @@ -83,6 +83,10 @@ l_ulong swap_successes; }; +/* XXX This should not be here. */ +int do_msgsnd(struct thread *, struct msgsnd_args *, size_t); +int do_msgrcv(struct thread *, struct msgrcv_args *, size_t); + static void bsd_to_linux_shminfo( struct shminfo *bpp, struct l_shminfo *lpp) { @@ -586,7 +590,8 @@ bsd_args.msgp = PTRIN(args->msgp); bsd_args.msgsz = args->msgsz; bsd_args.msgflg = args->msgflg; - return msgsnd(td, &bsd_args); + + return (do_msgsnd(td, &bsd_args, sizeof(l_long))); } int @@ -605,7 +610,8 @@ bsd_args.msgsz = args->msgsz; bsd_args.msgtyp = args->msgtyp; bsd_args.msgflg = args->msgflg; - return msgrcv(td, &bsd_args); + + return (do_msgrcv(td, &bsd_args, sizeof(l_long))); } int ==== //depot/projects/linuxolator/src/sys/kern/sysv_msg.c#5 (text+ko) ==== @@ -662,6 +662,11 @@ return (error); } +union msgtyp { + long mtype; + int32_t mtype32; +}; + #ifndef _SYS_SYSPROTO_H_ struct msgsnd_args { int msqid; @@ -671,14 +676,16 @@ }; #endif -/* - * MPSAFE - */ +/* XXX This should not be here. */ +int do_msgsnd(struct thread *, struct msgsnd_args *, size_t); + int -msgsnd(td, uap) +do_msgsnd(td, uap, mtsz) struct thread *td; register struct msgsnd_args *uap; + size_t mtsz; { + union msgtyp msgt; int msqid = uap->msqid; const void *user_msgp = uap->msgp; size_t msgsz = uap->msgsz; @@ -693,6 +700,9 @@ if (!jail_sysvipc_allowed && jailed(td->td_ucred)) return (ENOSYS); + if (mtsz != sizeof(msgt.mtype) && mtsz != sizeof(msgt.mtype32)) + return (EINVAL); + mtx_lock(&msq_mtx); msqid = IPCID_TO_IX(msqid); @@ -875,8 +885,7 @@ */ mtx_unlock(&msq_mtx); - if ((error = copyin(user_msgp, &msghdr->msg_type, - sizeof(msghdr->msg_type))) != 0) { + if ((error = copyin(user_msgp, &msgt, mtsz)) != 0) { mtx_lock(&msq_mtx); DPRINTF(("error %d copying the message type\n", error)); msg_freehdr(msghdr); @@ -884,8 +893,9 @@ wakeup(msqkptr); goto done2; } + msghdr->msg_type = (mtsz == sizeof(long)) ? msgt.mtype : msgt.mtype32; mtx_lock(&msq_mtx); - user_msgp = (const char *)user_msgp + sizeof(msghdr->msg_type); + user_msgp = (const char *)user_msgp + mtsz; /* * Validate the message type @@ -995,6 +1005,17 @@ return (error); } +/* + * MPSAFE + */ +int +msgsnd(td, uap) + struct thread *td; + register struct msgsnd_args *uap; +{ + return (do_msgsnd(td, uap, sizeof(long))); +} + #ifndef _SYS_SYSPROTO_H_ struct msgrcv_args { int msqid; @@ -1005,14 +1026,16 @@ }; #endif -/* - * MPSAFE - */ +/* XXX This should not be here. */ +int do_msgrcv(struct thread *, struct msgrcv_args *, size_t); + int -msgrcv(td, uap) +do_msgrcv(td, uap, mtsz) struct thread *td; register struct msgrcv_args *uap; + size_t mtsz; { + union msgtyp msgt; int msqid = uap->msqid; void *user_msgp = uap->msgp; size_t msgsz = uap->msgsz; @@ -1030,6 +1053,9 @@ if (!jail_sysvipc_allowed && jailed(td->td_ucred)) return (ENOSYS); + if (mtsz != sizeof(msgt.mtype) && mtsz != sizeof(msgt.mtype32)) + return (EINVAL); + msqid = IPCID_TO_IX(msqid); if (msqid < 0 || msqid >= msginfo.msgmni) { @@ -1226,8 +1252,11 @@ */ mtx_unlock(&msq_mtx); - error = copyout(&(msghdr->msg_type), user_msgp, - sizeof(msghdr->msg_type)); + if (mtsz == sizeof(long)) + msgt.mtype = msghdr->msg_type; + else + msgt.mtype32 = msghdr->msg_type; + error = copyout(&msgt, user_msgp, mtsz); mtx_lock(&msq_mtx); if (error != 0) { DPRINTF(("error (%d) copying out message type\n", error)); @@ -1235,7 +1264,7 @@ wakeup(msqkptr); goto done2; } - user_msgp = (char *)user_msgp + sizeof(msghdr->msg_type); + user_msgp = (char *)user_msgp + mtsz; /* * Return the segments to the user @@ -1280,6 +1309,17 @@ return (error); } +/* + * MPSAFE + */ +int +msgrcv(td, uap) + struct thread *td; + register struct msgrcv_args *uap; +{ + return (do_msgrcv(td, uap, sizeof(long))); +} + static int sysctl_msqids(SYSCTL_HANDLER_ARGS) { From owner-p4-projects@FreeBSD.ORG Sat Nov 11 00:37:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75EFC16A412; Sat, 11 Nov 2006 00:37:18 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 24EE916A417 for ; Sat, 11 Nov 2006 00:37:18 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE73343D5D for ; Sat, 11 Nov 2006 00:37:17 +0000 (GMT) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAB0bHhd064328 for ; Sat, 11 Nov 2006 00:37:17 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAB0bHT1064325 for perforce@freebsd.org; Sat, 11 Nov 2006 00:37:17 GMT (envelope-from jkim@freebsd.org) Date: Sat, 11 Nov 2006 00:37:17 GMT Message-Id: <200611110037.kAB0bHT1064325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 109712 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Nov 2006 00:37:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=109712 Change 109712 by jkim@jkim_hammer on 2006/11/11 00:37:12 Fix 32-bit msgsnd/msgrcv emulation for amd64 while I am here. Tested with 32-bit binary of src/tools/regression/sysvmsg/msgtest. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_misc.c#4 edit .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#8 edit .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#8 edit .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#8 edit .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#8 edit .. //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.master#8 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_misc.c#4 (text+ko) ==== @@ -91,6 +91,10 @@ #include #include +/* XXX This should not be here. */ +int do_msgsnd(struct thread *, struct msgsnd_args *, size_t); +int do_msgrcv(struct thread *, struct msgrcv_args *, size_t); + CTASSERT(sizeof(struct timeval32) == 8); CTASSERT(sizeof(struct timespec32) == 8); CTASSERT(sizeof(struct statfs32) == 256); @@ -1335,10 +1339,57 @@ int freebsd32_msgsys(struct thread *td, struct freebsd32_msgsys_args *uap) { - /* - * Vector through to msgsys if it is loaded. - */ - return sysent[SYS_msgsys].sy_call(td, uap); + switch (uap->which) { + case 2: + return (freebsd32_msgsnd(td, + (struct freebsd32_msgsnd_args *)&uap->a2)); + break; + case 3: + return (freebsd32_msgrcv(td, + (struct freebsd32_msgrcv_args *)&uap->a2)); + break; + default: + /* + * Vector through to msgsys if it is loaded. + */ + return (sysent[SYS_msgsys].sy_call(td, uap)); + break; + } +} + +int +freebsd32_msgsnd(struct thread *td, struct freebsd32_msgsnd_args *uap) +{ + struct msgsnd_args ap; + + if (sysent[SYS_msgsnd].sy_call == (sy_call_t *)lkmnosys || + sysent[SYS_msgsnd].sy_call == (sy_call_t *)lkmressys) + return (nosys(td, (struct nosys_args *)uap)); + + ap.msqid = uap->msqid; + ap.msgp = PTRIN(uap->msgp); + ap.msgsz = uap->msgsz; + ap.msgflg = uap->msgflg; + + return (do_msgsnd(td, &ap, sizeof(int32_t))); +} + +int +freebsd32_msgrcv(struct thread *td, struct freebsd32_msgrcv_args *uap) +{ + struct msgrcv_args ap; + + if (sysent[SYS_msgrcv].sy_call == (sy_call_t *)lkmnosys || + sysent[SYS_msgrcv].sy_call == (sy_call_t *)lkmressys) + return (nosys(td, (struct nosys_args *)uap)); + + ap.msqid = uap->msqid; + ap.msgp = PTRIN(uap->msgp); + ap.msgsz = uap->msgsz; + ap.msgtyp = uap->msgtyp; + ap.msgflg = uap->msgflg; + + return (do_msgrcv(td, &ap, sizeof(int32_t))); } int ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#8 (text+ko) ==== @@ -203,6 +203,19 @@ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char tptr_l_[PADL_(struct timeval32 *)]; struct timeval32 * tptr; char tptr_r_[PADR_(struct timeval32 *)]; }; +struct freebsd32_msgsnd_args { + char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)]; + char msgp_l_[PADL_(void *)]; void * msgp; char msgp_r_[PADR_(void *)]; + char msgsz_l_[PADL_(size_t)]; size_t msgsz; char msgsz_r_[PADR_(size_t)]; + char msgflg_l_[PADL_(int)]; int msgflg; char msgflg_r_[PADR_(int)]; +}; +struct freebsd32_msgrcv_args { + char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)]; + char msgp_l_[PADL_(void *)]; void * msgp; char msgp_r_[PADR_(void *)]; + char msgsz_l_[PADL_(size_t)]; size_t msgsz; char msgsz_r_[PADR_(size_t)]; + char msgtyp_l_[PADL_(long)]; long msgtyp; char msgtyp_r_[PADR_(long)]; + char msgflg_l_[PADL_(int)]; int msgflg; char msgflg_r_[PADR_(int)]; +}; struct freebsd32_shmctl_args { char shmid_l_[PADL_(int)]; int shmid; char shmid_r_[PADR_(int)]; char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; @@ -339,6 +352,8 @@ int freebsd32_ftruncate(struct thread *, struct freebsd32_ftruncate_args *); int freebsd32_sysctl(struct thread *, struct freebsd32_sysctl_args *); int freebsd32_futimes(struct thread *, struct freebsd32_futimes_args *); +int freebsd32_msgsnd(struct thread *, struct freebsd32_msgsnd_args *); +int freebsd32_msgrcv(struct thread *, struct freebsd32_msgrcv_args *); int freebsd32_shmctl(struct thread *, struct freebsd32_shmctl_args *); int freebsd32_clock_gettime(struct thread *, struct freebsd32_clock_gettime_args *); int freebsd32_clock_settime(struct thread *, struct freebsd32_clock_settime_args *); @@ -481,6 +496,8 @@ #define FREEBSD32_SYS_AUE_freebsd32_ftruncate AUE_FTRUNCATE #define FREEBSD32_SYS_AUE_freebsd32_sysctl AUE_SYSCTL #define FREEBSD32_SYS_AUE_freebsd32_futimes AUE_FUTIMES +#define FREEBSD32_SYS_AUE_freebsd32_msgsnd AUE_MSGSND +#define FREEBSD32_SYS_AUE_freebsd32_msgrcv AUE_MSGRCV #define FREEBSD32_SYS_AUE_freebsd32_shmctl AUE_SHMCTL #define FREEBSD32_SYS_AUE_freebsd32_clock_gettime AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_clock_settime AUE_CLOCK_SETTIME ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#8 (text+ko) ==== @@ -195,8 +195,8 @@ #define FREEBSD32_SYS_semop 222 #define FREEBSD32_SYS_msgctl 224 #define FREEBSD32_SYS_msgget 225 -#define FREEBSD32_SYS_msgsnd 226 -#define FREEBSD32_SYS_msgrcv 227 +#define FREEBSD32_SYS_freebsd32_msgsnd 226 +#define FREEBSD32_SYS_freebsd32_msgrcv 227 #define FREEBSD32_SYS_shmat 228 #define FREEBSD32_SYS_freebsd32_shmctl 229 #define FREEBSD32_SYS_shmdt 230 ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#8 (text+ko) ==== @@ -233,8 +233,8 @@ "#223", /* 223 = semconfig */ "msgctl", /* 224 = msgctl */ "msgget", /* 225 = msgget */ - "msgsnd", /* 226 = msgsnd */ - "msgrcv", /* 227 = msgrcv */ + "freebsd32_msgsnd", /* 226 = freebsd32_msgsnd */ + "freebsd32_msgrcv", /* 227 = freebsd32_msgrcv */ "shmat", /* 228 = shmat */ "freebsd32_shmctl", /* 229 = freebsd32_shmctl */ "shmdt", /* 230 = shmdt */ ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#8 (text+ko) ==== @@ -258,8 +258,8 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = semconfig */ { AS(msgctl_args), (sy_call_t *)msgctl, AUE_MSGCTL, NULL, 0, 0 }, /* 224 = msgctl */ { AS(msgget_args), (sy_call_t *)msgget, AUE_MSGGET, NULL, 0, 0 }, /* 225 = msgget */ - { AS(msgsnd_args), (sy_call_t *)msgsnd, AUE_MSGSND, NULL, 0, 0 }, /* 226 = msgsnd */ - { AS(msgrcv_args), (sy_call_t *)msgrcv, AUE_MSGRCV, NULL, 0, 0 }, /* 227 = msgrcv */ + { AS(freebsd32_msgsnd_args), (sy_call_t *)freebsd32_msgsnd, AUE_MSGSND, NULL, 0, 0 }, /* 226 = freebsd32_msgsnd */ + { AS(freebsd32_msgrcv_args), (sy_call_t *)freebsd32_msgrcv, AUE_MSGRCV, NULL, 0, 0 }, /* 227 = freebsd32_msgrcv */ { AS(shmat_args), (sy_call_t *)shmat, AUE_SHMAT, NULL, 0, 0 }, /* 228 = shmat */ { AS(freebsd32_shmctl_args), (sy_call_t *)freebsd32_shmctl, AUE_SHMCTL, NULL, 0, 0 }, /* 229 = freebsd32_shmctl */ { AS(shmdt_args), (sy_call_t *)shmdt, AUE_SHMDT, NULL, 0, 0 }, /* 230 = shmdt */ ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.master#8 (text+ko) ==== @@ -406,9 +406,9 @@ 224 AUE_MSGCTL NOPROTO { int msgctl(int msqid, int cmd, \ struct msqid_ds *buf); } 225 AUE_MSGGET NOPROTO { int msgget(key_t key, int msgflg); } -226 AUE_MSGSND NOPROTO { int msgsnd(int msqid, void *msgp, \ +226 AUE_MSGSND STD { int freebsd32_msgsnd(int msqid, void *msgp, \ size_t msgsz, int msgflg); } -227 AUE_MSGRCV NOPROTO { int msgrcv(int msqid, void *msgp, \ +227 AUE_MSGRCV STD { int freebsd32_msgrcv(int msqid, void *msgp, \ size_t msgsz, long msgtyp, int msgflg); } 228 AUE_SHMAT NOPROTO { int shmat(int shmid, void *shmaddr, \ int shmflg); } From owner-p4-projects@FreeBSD.ORG Sat Nov 11 01:14:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B2B716A416; Sat, 11 Nov 2006 01:14:05 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 BBAF516A412 for ; Sat, 11 Nov 2006 01:14:04 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91F2843D45 for ; Sat, 11 Nov 2006 01:14:04 +0000 (GMT) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAB1E4EO083651 for ; Sat, 11 Nov 2006 01:14:04 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAB1E4fY083648 for perforce@freebsd.org; Sat, 11 Nov 2006 01:14:04 GMT (envelope-from jkim@freebsd.org) Date: Sat, 11 Nov 2006 01:14:04 GMT Message-Id: <200611110114.kAB1E4fY083648@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 109714 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Nov 2006 01:14:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=109714 Change 109714 by jkim@jkim_hammer on 2006/11/11 01:13:58 Add SYSCALL_MODULE_PRESENT macro. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_misc.c#5 edit .. //depot/projects/linuxolator/src/sys/sys/sysent.h#2 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_misc.c#5 (text+ko) ==== @@ -1362,8 +1362,7 @@ { struct msgsnd_args ap; - if (sysent[SYS_msgsnd].sy_call == (sy_call_t *)lkmnosys || - sysent[SYS_msgsnd].sy_call == (sy_call_t *)lkmressys) + if (!SYSCALL_MODULE_PRESENT(msgsnd)) return (nosys(td, (struct nosys_args *)uap)); ap.msqid = uap->msqid; @@ -1379,8 +1378,7 @@ { struct msgrcv_args ap; - if (sysent[SYS_msgrcv].sy_call == (sy_call_t *)lkmnosys || - sysent[SYS_msgrcv].sy_call == (sy_call_t *)lkmressys) + if (!SYSCALL_MODULE_PRESENT(msgrcv)) return (nosys(td, (struct nosys_args *)uap)); ap.msqid = uap->msqid; ==== //depot/projects/linuxolator/src/sys/sys/sysent.h#2 (text+ko) ==== @@ -143,6 +143,12 @@ & syscallname##_syscall, & syscallname##_sysent, \ NULL, NULL); +#define SYSCALL_MODULE_PRESENT(syscallname) \ + (sysent[SYS_##syscallname].sy_call != \ + (sy_call_t *)lkmnosys && \ + sysent[SYS_##syscallname].sy_call != \ + (sy_call_t *)lkmressys) + int syscall_register(int *offset, struct sysent *new_sysent, struct sysent *old_sysent); int syscall_deregister(int *offset, struct sysent *old_sysent); From owner-p4-projects@FreeBSD.ORG Sat Nov 11 01:27:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCE4916A412; Sat, 11 Nov 2006 01:27:22 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 816E716A407 for ; Sat, 11 Nov 2006 01:27:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D19143D4C for ; Sat, 11 Nov 2006 01:27:22 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAB1RMph092729 for ; Sat, 11 Nov 2006 01:27:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAB1RMnj092726 for perforce@freebsd.org; Sat, 11 Nov 2006 01:27:22 GMT (envelope-from sam@freebsd.org) Date: Sat, 11 Nov 2006 01:27:22 GMT Message-Id: <200611110127.kAB1RMnj092726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109716 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Nov 2006 01:27:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=109716 Change 109716 by sam@sam_ebb on 2006/11/11 01:26:26 remove ata stuff until it's really working; seems to be interrupting again and then crashing Affected files ... .. //depot/projects/arm/src/sys/arm/conf/AVILA#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/AVILA#5 (text+ko) ==== @@ -87,7 +87,7 @@ device ata device atadisk # ATA disk drives options ATA_STATIC_ID # Static device numbering -device ata_avila # Gateworks CF/IDE support +#device ata_avila # Gateworks CF/IDE support device npe # Network Processing Engine device npe_fw # NPE firmware From owner-p4-projects@FreeBSD.ORG Sat Nov 11 04:52:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18DDD16A415; Sat, 11 Nov 2006 04:52:54 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E350416A407 for ; Sat, 11 Nov 2006 04:52:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0355343D73 for ; Sat, 11 Nov 2006 04:52:49 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAB4qnQl038644 for ; Sat, 11 Nov 2006 04:52:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAB4qnOG038640 for perforce@freebsd.org; Sat, 11 Nov 2006 04:52:49 GMT (envelope-from sam@freebsd.org) Date: Sat, 11 Nov 2006 04:52:49 GMT Message-Id: <200611110452.kAB4qnOG038640@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 109720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Nov 2006 04:52:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=109720 Change 109720 by sam@sam_ebb on 2006/11/11 04:51:49 o must setup ALTSTAT for ata_generic_status o setup IREASON just in case; looks to only be required for ATAPI which'll never exist on this board o change some useless code into assertions Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#6 (text+ko) ==== @@ -191,9 +191,6 @@ { struct ata_avila_softc *sc = xsc; -#if 0 -printf("%s: cb %p arg %p\n", __func__, sc->sc_intr[0].cb, sc->sc_intr[0].arg);/*XXX*/ -#endif if (sc->sc_intr[0].cb != NULL) sc->sc_intr[0].cb(sc->sc_intr[0].arg); } @@ -204,20 +201,21 @@ { struct ata_avila_softc *sc = device_get_softc(dev); - if (type == SYS_RES_IRQ && *rid == ATA_IRQ_RID) { - /* doesn't matter what we return so reuse the real thing */ - return sc->sc_irq; - } - return NULL; + KASSERT(type == SYS_RES_IRQ && *rid == ATA_IRQ_RID, + ("type %u rid %u start %lu end %lu count %lu flags %u", + type, *rid, start, end, count, flags)); + + /* doesn't matter what we return so reuse the real thing */ + return sc->sc_irq; } static int ata_avila_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { - if (type == SYS_RES_IRQ) - return rid != ATA_IRQ_RID ? ENOENT : 0; - return EINVAL; + KASSERT(type == SYS_RES_IRQ && rid == ATA_IRQ_RID, + ("type %u rid %u", type, rid)); + return 0; } static int @@ -424,6 +422,11 @@ ch->r_io[ATA_IDX_ADDR].res = &sc->sc_ata; ch->r_io[ATA_IDX_ADDR].offset = 0; + /* NB: should be used only for ATAPI devices */ + ch->r_io[ATA_IREASON] = ch->r_io[ATA_COUNT]; + /* alias this; required by ata_generic_status */ + ch->r_io[ATA_ALTSTAT] = ch->r_io[ATA_CONTROL]; + ata_generic_hw(dev); return ata_attach(dev); } From owner-p4-projects@FreeBSD.ORG Sat Nov 11 08:36:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70D8116A518; Sat, 11 Nov 2006 08:36:57 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 18BAF16A501; Sat, 11 Nov 2006 08:36:57 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.176.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6701A43D55; Sat, 11 Nov 2006 08:36:56 +0000 (GMT) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (localhost [127.0.0.1]) by eva.fit.vutbr.cz (envelope-from xdivac02@eva.fit.vutbr.cz) (8.13.8/8.13.7) with ESMTP id kAB8as4K050140 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 11 Nov 2006 09:36:54 +0100 (CET) Received: (from xdivac02@localhost) by eva.fit.vutbr.cz (8.13.8/8.13.3/Submit) id kAB8ar0D050139; Sat, 11 Nov 2006 09:36:53 +0100 (CET) Date: Sat, 11 Nov 2006 09:36:53 +0100 From: Divacky Roman To: Jung-uk Kim Message-ID: <20061111083653.GA49494@stud.fit.vutbr.cz> References: <200611110037.kAB0bHT1064325@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200611110037.kAB0bHT1064325@repoman.freebsd.org> User-Agent: Mutt/1.4.2.2i X-Scanned-By: MIMEDefang 2.57 on 147.229.176.14 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 109712 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Nov 2006 08:36:57 -0000 On Sat, Nov 11, 2006 at 12:37:17AM +0000, Jung-uk Kim wrote: > http://perforce.freebsd.org/chv.cgi?CH=109712 > > Change 109712 by jkim@jkim_hammer on 2006/11/11 00:37:12 > > Fix 32-bit msgsnd/msgrcv emulation for amd64 while I am here. > Tested with 32-bit binary of src/tools/regression/sysvmsg/msgtest. is linuxolator branch really the best place to commit such things? From owner-p4-projects@FreeBSD.ORG Sat Nov 11 09:07:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A683316A415; Sat, 11 Nov 2006 09:07:16 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 8081516A403 for ; Sat, 11 Nov 2006 09:07:16 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 204FE43D77 for ; Sat, 11 Nov 2006 09:07:16 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAB97Fm6093057 for ; Sat, 11 Nov 2006 09:07:15 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAB97FPQ093054 for perforce@freebsd.org; Sat, 11 Nov 2006 09:07:15 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 11 Nov 2006 09:07:15 GMT Message-Id: <200611110907.kAB97FPQ093054@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 109727 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Nov 2006 09:07:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=109727 Change 109727 by rdivacky@rdivacky_witten on 2006/11/11 09:06:19 Add comment about the status of FUTEX_FD Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#6 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#6 (text+ko) ==== @@ -259,6 +259,7 @@ break; case LINUX_FUTEX_FD: + /* XXX: linux plans to remove this operation */ printf("linux_sys_futex: unimplemented op %d\n", args->op); break; From owner-p4-projects@FreeBSD.ORG Sat Nov 11 13:13:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CB1B16A4B3; Sat, 11 Nov 2006 13:13:27 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0A06616A412; Sat, 11 Nov 2006 13:13:27 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from redbull.bpaserver.net (redbullneu.bpaserver.net [213.198.78.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id 09AA843DA0; Sat, 11 Nov 2006 13:13:05 +0000 (GMT) (envelope-from alexander@leidinger.net) Received: from outgoing.leidinger.net (p54A5D8C9.dip.t-dialin.net [84.165.216.201]) by redbull.bpaserver.net (Postfix) with ESMTP id A91592E1BA; Sat, 11 Nov 2006 14:12:53 +0100 (CET) Received: from webmail.leidinger.net (webmail.Leidinger.net [192.168.1.102]) by outgoing.leidinger.net (Postfix) with ESMTP id C94255B4C35; Sat, 11 Nov 2006 14:12:51 +0100 (CET) Received: (from www@localhost) by webmail.leidinger.net (8.13.8/8.13.8/Submit) id kABDCp71082104; Sat, 11 Nov 2006 14:12:51 +0100 (CET) (envelope-from Alexander@Leidinger.net) Received: from proxy.Leidinger.net (proxy.Leidinger.net [192.168.1.103]) by webmail.leidinger.net (Horde MIME library) with HTTP; Sat, 11 Nov 2006 14:12:51 +0100 Message-ID: <20061111141251.qht0nfvb7oc0gc4o@webmail.leidinger.net> X-Priority: 3 (Normal) Date: Sat, 11 Nov 2006 14:12:51 +0100 From: Alexander Leidinger To: Divacky Roman References: <200611110037.kAB0bHT1064325@repoman.freebsd.org> <20061111083653.GA49494@stud.fit.vutbr.cz> In-Reply-To: <20061111083653.GA49494@stud.fit.vutbr.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable User-Agent: Internet Messaging Program (IMP) H3 (4.1.3) / FreeBSD-7.0 X-BPAnet-MailScanner-Information: Please contact the ISP for more information X-BPAnet-MailScanner: Found to be clean X-BPAnet-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-2.463, required 6, autolearn=not spam, BAYES_00 -2.60, DK_POLICY_SIGNSOME 0.00, FORGED_RCVD_HELO 0.14) X-BPAnet-MailScanner-From: alexander@leidinger.net X-Spam-Status: No Cc: Perforce Change Reviews , Jung-uk Kim Subject: Re: PERFORCE change 109712 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Nov 2006 13:13:27 -0000 Quoting Divacky Roman (from Sat, 11 Nov =20 2006 09:36:53 +0100): > On Sat, Nov 11, 2006 at 12:37:17AM +0000, Jung-uk Kim wrote: >> http://perforce.freebsd.org/chv.cgi?CH=3D109712 >> >> Change 109712 by jkim@jkim_hammer on 2006/11/11 00:37:12 >> >> =09Fix 32-bit msgsnd/msgrcv emulation for amd64 while I am here. >> =09Tested with 32-bit binary of src/tools/regression/sysvmsg/msgtest. > > is linuxolator branch really the best place to commit such things? AFAIK there's no generic bug-fix-integration-before-commit-to-CVS =20 branch in p4. So aside from creating a branch just for this one fix: =20 what's your proposal where to commit this to? I assume committing all this stuff is just in preparation to commit =20 this to CVS. Bye, Alexander. --=20 He who makes a beast of himself gets rid of the pain of being a man. =09=09-- Dr. Johnson http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID =3D B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID =3D 72077137 From owner-p4-projects@FreeBSD.ORG Sat Nov 11 18:52:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0313416A415; Sat, 11 Nov 2006 18:52:13 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 CF96516A40F for ; Sat, 11 Nov 2006 18:52:12 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C03443D45 for ; Sat, 11 Nov 2006 18:52:12 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kABIqCZ7023897 for ; Sat, 11 Nov 2006 18:52:12 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kABIppGb023876 for perforce@freebsd.org; Sat, 11 Nov 2006 18:51:51 GMT (envelope-from marcel@freebsd.org) Date: Sat, 11 Nov 2006 18:51:51 GMT Message-Id: <200611111851.kABIppGb023876@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 Cc: Subject: PERFORCE change 109750 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Nov 2006 18:52:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=109750 Change 109750 by marcel@marcel_cluster on 2006/11/11 18:51:35 IFC @109749 Affected files ... .. //depot/projects/ia64/ObsoleteFiles.inc#12 integrate .. //depot/projects/ia64/bin/sh/expand.c#17 integrate .. //depot/projects/ia64/bin/sh/parser.c#17 integrate .. //depot/projects/ia64/bin/sh/parser.h#4 integrate .. //depot/projects/ia64/crypto/openssh/ChangeLog#13 integrate .. //depot/projects/ia64/crypto/openssh/Makefile.in#12 integrate .. //depot/projects/ia64/crypto/openssh/README#12 integrate .. //depot/projects/ia64/crypto/openssh/audit-bsm.c#3 integrate .. //depot/projects/ia64/crypto/openssh/auth-rsa.c#10 integrate .. //depot/projects/ia64/crypto/openssh/auth.c#13 integrate .. //depot/projects/ia64/crypto/openssh/bufaux.h#8 delete .. //depot/projects/ia64/crypto/openssh/bufbn.c#2 integrate .. //depot/projects/ia64/crypto/openssh/buildpkg.sh.in#5 integrate .. //depot/projects/ia64/crypto/openssh/clientloop.c#14 integrate .. //depot/projects/ia64/crypto/openssh/configure.ac#13 integrate .. //depot/projects/ia64/crypto/openssh/dh.c#10 integrate .. //depot/projects/ia64/crypto/openssh/entropy.c#7 integrate .. //depot/projects/ia64/crypto/openssh/kexdhc.c#5 integrate .. //depot/projects/ia64/crypto/openssh/kexdhs.c#5 integrate .. //depot/projects/ia64/crypto/openssh/kexgexc.c#5 integrate .. //depot/projects/ia64/crypto/openssh/kexgexs.c#4 integrate .. //depot/projects/ia64/crypto/openssh/key.c#14 integrate .. //depot/projects/ia64/crypto/openssh/moduli.c#7 integrate .. //depot/projects/ia64/crypto/openssh/monitor.c#15 integrate .. //depot/projects/ia64/crypto/openssh/monitor_fdpass.c#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-solaris.c#2 integrate .. //depot/projects/ia64/crypto/openssh/rsa.c#5 integrate .. //depot/projects/ia64/crypto/openssh/scard.c#7 integrate .. //depot/projects/ia64/crypto/openssh/scard/Makefile.in#2 integrate .. //depot/projects/ia64/crypto/openssh/serverloop.c#14 integrate .. //depot/projects/ia64/crypto/openssh/session.c#26 integrate .. //depot/projects/ia64/crypto/openssh/sftp-client.c#15 integrate .. //depot/projects/ia64/crypto/openssh/sftp.c#15 integrate .. //depot/projects/ia64/crypto/openssh/ssh-agent.c#17 integrate .. //depot/projects/ia64/crypto/openssh/ssh-dss.c#8 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keygen.c#14 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keyscan.1#8 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keyscan.c#15 integrate .. //depot/projects/ia64/crypto/openssh/ssh.1#15 integrate .. //depot/projects/ia64/crypto/openssh/ssh.c#16 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config#21 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config.5#17 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect.c#15 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect1.c#11 integrate .. //depot/projects/ia64/crypto/openssh/sshd.c#19 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config#23 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config.5#19 integrate .. //depot/projects/ia64/crypto/openssh/version.h#22 integrate .. //depot/projects/ia64/etc/amd.map#4 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#74 integrate .. //depot/projects/ia64/etc/mtree/BSD.local.dist#30 integrate .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#42 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/libiberty/config.h#6 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/arm.md.diff#2 integrate .. //depot/projects/ia64/lib/libarchive/Makefile#22 integrate .. //depot/projects/ia64/lib/libarchive/archive_check_magic.c#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.c#13 integrate .. //depot/projects/ia64/lib/libarchive/archive_platform.h#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_data_into_buffer.c#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_data_into_fd.c#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_extract.c#18 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_fd.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_file.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_bzip2.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_compress.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_gzip.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_none.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_cpio.c#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_iso9660.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#16 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_zip.c#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_string.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_string.h#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_util.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_write.3#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_write.c#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_open_fd.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_open_file.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_bzip2.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_gzip.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_none.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format.c#3 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_by_name.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_cpio.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#14 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_shar.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_ustar.c#7 integrate .. //depot/projects/ia64/lib/libc/amd64/net/Makefile.inc#2 delete .. //depot/projects/ia64/lib/libc/amd64/net/htonl.S#2 delete .. //depot/projects/ia64/lib/libc/amd64/net/htons.S#2 delete .. //depot/projects/ia64/lib/libc/amd64/net/ntohl.S#2 delete .. //depot/projects/ia64/lib/libc/amd64/net/ntohs.S#2 delete .. //depot/projects/ia64/lib/libc/arm/arith.h#2 integrate .. //depot/projects/ia64/lib/libc/arm/net/Makefile.inc#2 delete .. //depot/projects/ia64/lib/libc/arm/net/htonl.S#3 delete .. //depot/projects/ia64/lib/libc/arm/net/htons.S#3 delete .. //depot/projects/ia64/lib/libc/arm/net/ntohl.S#3 delete .. //depot/projects/ia64/lib/libc/arm/net/ntohs.S#3 delete .. //depot/projects/ia64/lib/libc/arm/sys/cerror.S#3 integrate .. //depot/projects/ia64/lib/libc/arm/sys/ptrace.S#3 integrate .. //depot/projects/ia64/lib/libc/i386/net/Makefile.inc#2 delete .. //depot/projects/ia64/lib/libc/i386/net/htonl.S#6 delete .. //depot/projects/ia64/lib/libc/i386/net/htons.S#4 delete .. //depot/projects/ia64/lib/libc/i386/net/ntohl.S#6 delete .. //depot/projects/ia64/lib/libc/i386/net/ntohs.S#4 delete .. //depot/projects/ia64/lib/libc/ia64/net/Makefile.inc#2 delete .. //depot/projects/ia64/lib/libc/ia64/net/byte_swap_2.S#4 delete .. //depot/projects/ia64/lib/libc/ia64/net/byte_swap_4.S#4 delete .. //depot/projects/ia64/lib/libc/ia64/net/htonl.S#4 delete .. //depot/projects/ia64/lib/libc/ia64/net/htons.S#4 delete .. //depot/projects/ia64/lib/libc/ia64/net/ntohl.S#4 delete .. //depot/projects/ia64/lib/libc/ia64/net/ntohs.S#4 delete .. //depot/projects/ia64/lib/libc/net/Makefile.inc#16 integrate .. //depot/projects/ia64/lib/libc/net/ntoh.c#1 branch .. //depot/projects/ia64/lib/libc/powerpc/net/Makefile.inc#2 delete .. //depot/projects/ia64/lib/libc/powerpc/net/htonl.S#2 delete .. //depot/projects/ia64/lib/libc/powerpc/net/htons.S#2 delete .. //depot/projects/ia64/lib/libc/powerpc/net/ntohl.S#2 delete .. //depot/projects/ia64/lib/libc/powerpc/net/ntohs.S#2 delete .. //depot/projects/ia64/lib/libc/sparc64/net/Makefile.inc#3 delete .. //depot/projects/ia64/lib/libc/sparc64/net/htonl.S#5 delete .. //depot/projects/ia64/lib/libc/sparc64/net/htons.S#4 delete .. //depot/projects/ia64/lib/libc/sparc64/net/ntohl.S#5 delete .. //depot/projects/ia64/lib/libc/sparc64/net/ntohs.S#4 delete .. //depot/projects/ia64/lib/libc/sys/extattr_get_file.2#13 integrate .. //depot/projects/ia64/lib/libc/sys/ptrace.2#12 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_exec/pam_exec.c#5 integrate .. //depot/projects/ia64/lib/libstand/Makefile#24 integrate .. //depot/projects/ia64/lib/libutil/login_ok.3#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#165 integrate .. //depot/projects/ia64/sbin/devfs/devfs.8#13 integrate .. //depot/projects/ia64/sbin/ifconfig/ifbridge.c#5 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#42 integrate .. //depot/projects/ia64/sbin/quotacheck/quotacheck.8#8 integrate .. //depot/projects/ia64/sbin/quotacheck/quotacheck.c#15 integrate .. //depot/projects/ia64/sbin/routed/main.c#6 integrate .. //depot/projects/ia64/share/colldef/Makefile#26 integrate .. //depot/projects/ia64/share/man/man4/ips.4#4 integrate .. //depot/projects/ia64/share/man/man4/le.4#3 integrate .. //depot/projects/ia64/share/man/man8/nanobsd.8#2 integrate .. //depot/projects/ia64/share/man/man9/Makefile#62 integrate .. //depot/projects/ia64/share/man/man9/priv.9#1 branch .. //depot/projects/ia64/share/man/man9/suser.9#11 integrate .. //depot/projects/ia64/share/misc/bsd-family-tree#34 integrate .. //depot/projects/ia64/share/mk/bsd.endian.mk#3 integrate .. //depot/projects/ia64/share/mklocale/Makefile#23 integrate .. //depot/projects/ia64/share/monetdef/Makefile#22 integrate .. //depot/projects/ia64/share/msgdef/Makefile#23 integrate .. //depot/projects/ia64/share/numericdef/Makefile#22 integrate .. //depot/projects/ia64/share/timedef/Makefile#22 integrate .. //depot/projects/ia64/share/timedef/nn_NO.ISO8859-1.src#1 branch .. //depot/projects/ia64/share/timedef/nn_NO.UTF-8.src#1 branch .. //depot/projects/ia64/sys/Makefile#14 integrate .. //depot/projects/ia64/sys/amd64/amd64/io.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#42 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux.h#6 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc.c#12 integrate .. //depot/projects/ia64/sys/arm/arm/identcpu.c#9 integrate .. //depot/projects/ia64/sys/arm/arm/intr.c#11 integrate .. //depot/projects/ia64/sys/arm/arm/pmap.c#21 integrate .. //depot/projects/ia64/sys/arm/arm/vm_machdep.c#16 integrate .. //depot/projects/ia64/sys/arm/include/armreg.h#5 integrate .. //depot/projects/ia64/sys/arm/include/atomic.h#13 integrate .. //depot/projects/ia64/sys/arm/include/cpuconf.h#7 integrate .. //depot/projects/ia64/sys/arm/include/cpufunc.h#8 integrate .. //depot/projects/ia64/sys/arm/include/pmap.h#16 integrate .. //depot/projects/ia64/sys/boot/arm/at91/Makefile#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/Makefile.inc#4 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot0iic/main.c#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot2/Makefile#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootiic/Makefile#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/Makefile#4 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/Makefile#4 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/emac.c#4 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/emac.h#4 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/emac_init.c#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/mci_device.h#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/memcmp.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/memcpy.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/memset.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/sd-card.c#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/strcmp.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/strcpy.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/strcvt.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/libat91/strlen.c#2 integrate .. //depot/projects/ia64/sys/boot/pc98/btx/btx/btx.S#6 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/ia64/sys/cam/cam_xpt.c#34 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#49 integrate .. //depot/projects/ia64/sys/compat/linux/linux_uid16.c#13 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_fcntl.c#16 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#39 integrate .. //depot/projects/ia64/sys/conf/NOTES#110 integrate .. //depot/projects/ia64/sys/conf/files#150 integrate .. //depot/projects/ia64/sys/conf/files.arm#8 integrate .. //depot/projects/ia64/sys/conf/files.sun4v#3 integrate .. //depot/projects/ia64/sys/conf/options#101 integrate .. //depot/projects/ia64/sys/contrib/altq/altq/altq_cbq.c#3 integrate .. //depot/projects/ia64/sys/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/ia64/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/ia64/sys/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/ia64/sys/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/ia64/sys/contrib/altq/altq/altq_rio.c#3 integrate .. //depot/projects/ia64/sys/contrib/pf/net/if_pfsync.c#15 integrate .. //depot/projects/ia64/sys/ddb/db_main.c#3 integrate .. //depot/projects/ia64/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#29 integrate .. //depot/projects/ia64/sys/dev/aha/ahareg.h#5 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#39 integrate .. //depot/projects/ia64/sys/dev/arl/if_arl.c#8 integrate .. //depot/projects/ia64/sys/dev/asr/asr.c#34 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#52 integrate .. //depot/projects/ia64/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/ia64/sys/dev/cnw/if_cnw.c#18 integrate .. //depot/projects/ia64/sys/dev/cp/if_cp.c#11 integrate .. //depot/projects/ia64/sys/dev/ctau/if_ct.c#15 integrate .. //depot/projects/ia64/sys/dev/cx/if_cx.c#16 integrate .. //depot/projects/ia64/sys/dev/dcons/dcons_os.c#7 integrate .. //depot/projects/ia64/sys/dev/drm/drmP.h#15 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#56 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#36 integrate .. //depot/projects/ia64/sys/dev/fdc/fdc.c#18 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#68 integrate .. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_mod.c#7 integrate .. //depot/projects/ia64/sys/dev/if_ndis/if_ndis.c#22 integrate .. //depot/projects/ia64/sys/dev/iwi/if_iwi.c#12 integrate .. //depot/projects/ia64/sys/dev/kbd/kbd.c#17 integrate .. //depot/projects/ia64/sys/dev/lmc/if_lmc.c#15 integrate .. //depot/projects/ia64/sys/dev/lmc/if_lmc.h#5 integrate .. //depot/projects/ia64/sys/dev/nmdm/nmdm.c#23 integrate .. //depot/projects/ia64/sys/dev/null/null.c#20 integrate .. //depot/projects/ia64/sys/dev/ofw/ofw_console.c#20 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#61 integrate .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#32 integrate .. //depot/projects/ia64/sys/dev/pci/pci_private.h#15 integrate .. //depot/projects/ia64/sys/dev/pci/pcib_if.m#4 integrate .. //depot/projects/ia64/sys/dev/random/randomdev.c#19 integrate .. //depot/projects/ia64/sys/dev/sbni/if_sbni.c#20 integrate .. //depot/projects/ia64/sys/dev/sbsh/if_sbsh.c#12 integrate .. //depot/projects/ia64/sys/dev/si/si.c#17 integrate .. //depot/projects/ia64/sys/dev/syscons/syscons.c#43 integrate .. //depot/projects/ia64/sys/dev/syscons/sysmouse.c#11 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#66 integrate .. //depot/projects/ia64/sys/dev/wl/if_wl.c#20 integrate .. //depot/projects/ia64/sys/dev/zs/zs.c#23 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_rule.c#17 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#50 integrate .. //depot/projects/ia64/sys/fs/hpfs/hpfs_vnops.c#33 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#42 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#36 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_ioctl.c#12 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#33 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vfsops.c#28 integrate .. //depot/projects/ia64/sys/fs/umapfs/umap_vfsops.c#21 integrate .. //depot/projects/ia64/sys/gnu/fs/ext2fs/ext2_vfsops.c#6 integrate .. //depot/projects/ia64/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/ia64/sys/gnu/fs/reiserfs/reiserfs_fs.h#3 integrate .. //depot/projects/ia64/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#5 integrate .. //depot/projects/ia64/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#45 integrate .. //depot/projects/ia64/sys/i386/i386/io.c#2 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#74 integrate .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#37 integrate .. //depot/projects/ia64/sys/i386/i386/vm86.c#15 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_misc.c#25 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_proto.h#12 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_socksys.c#9 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_sysi86.c#8 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_xenix.h#9 integrate .. //depot/projects/ia64/sys/i386/linux/linux_machdep.c#24 integrate .. //depot/projects/ia64/sys/i386/linux/linux_proto.h#22 integrate .. //depot/projects/ia64/sys/i386/pci/pci_pir.c#10 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_ipr.c#19 integrate .. //depot/projects/ia64/sys/ia64/ia64/ssc.c#16 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vfsops.c#36 integrate .. //depot/projects/ia64/sys/kern/Make.tags.inc#5 integrate .. //depot/projects/ia64/sys/kern/kern_acct.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#87 integrate .. //depot/projects/ia64/sys/kern/kern_environment.c#18 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#85 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#68 integrate .. //depot/projects/ia64/sys/kern/kern_jail.c#30 integrate .. //depot/projects/ia64/sys/kern/kern_ktrace.c#36 integrate .. //depot/projects/ia64/sys/kern/kern_linker.c#42 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#33 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#46 integrate .. //depot/projects/ia64/sys/kern/kern_ntptime.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_priv.c#1 branch .. //depot/projects/ia64/sys/kern/kern_prot.c#47 integrate .. //depot/projects/ia64/sys/kern/kern_resource.c#41 integrate .. //depot/projects/ia64/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/ia64/sys/kern/kern_shutdown.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#96 integrate .. //depot/projects/ia64/sys/kern/kern_sx.c#13 integrate .. //depot/projects/ia64/sys/kern/kern_sysctl.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_thr.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_time.c#35 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#24 integrate .. //depot/projects/ia64/sys/kern/kern_xxx.c#11 integrate .. //depot/projects/ia64/sys/kern/ksched.c#1 branch .. //depot/projects/ia64/sys/kern/makesyscalls.sh#12 integrate .. //depot/projects/ia64/sys/kern/p1003_1b.c#1 branch .. //depot/projects/ia64/sys/kern/posix4_mib.c#1 branch .. //depot/projects/ia64/sys/kern/sched_4bsd.c#37 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#51 integrate .. //depot/projects/ia64/sys/kern/subr_acl_posix1e.c#3 integrate .. //depot/projects/ia64/sys/kern/subr_firmware.c#4 integrate .. //depot/projects/ia64/sys/kern/subr_lock.c#2 integrate .. //depot/projects/ia64/sys/kern/subr_prf.c#40 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#60 integrate .. //depot/projects/ia64/sys/kern/sysv_ipc.c#10 integrate .. //depot/projects/ia64/sys/kern/sysv_msg.c#23 integrate .. //depot/projects/ia64/sys/kern/tty.c#50 integrate .. //depot/projects/ia64/sys/kern/tty_cons.c#29 integrate .. //depot/projects/ia64/sys/kern/tty_pts.c#6 integrate .. //depot/projects/ia64/sys/kern/tty_pty.c#32 integrate .. //depot/projects/ia64/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/ia64/sys/kern/uipc_sem.c#21 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#66 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#58 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#53 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#94 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#77 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#57 integrate .. //depot/projects/ia64/sys/modules/Makefile#99 integrate .. //depot/projects/ia64/sys/modules/acpi/Makefile#28 integrate .. //depot/projects/ia64/sys/modules/if_ppp/Makefile#9 integrate .. //depot/projects/ia64/sys/net/bpf.c#47 integrate .. //depot/projects/ia64/sys/net/bridgestp.c#10 integrate .. //depot/projects/ia64/sys/net/bridgestp.h#3 integrate .. //depot/projects/ia64/sys/net/if.c#54 integrate .. //depot/projects/ia64/sys/net/if_bridge.c#13 integrate .. //depot/projects/ia64/sys/net/if_bridgevar.h#8 integrate .. //depot/projects/ia64/sys/net/if_gre.c#25 integrate .. //depot/projects/ia64/sys/net/if_ppp.c#29 integrate .. //depot/projects/ia64/sys/net/if_pppvar.h#9 integrate .. //depot/projects/ia64/sys/net/if_sl.c#20 integrate .. //depot/projects/ia64/sys/net/if_tap.c#38 integrate .. //depot/projects/ia64/sys/net/if_tun.c#37 integrate .. //depot/projects/ia64/sys/net/ppp_tty.c#17 integrate .. //depot/projects/ia64/sys/net/raw_usrreq.c#21 integrate .. //depot/projects/ia64/sys/net/rtsock.c#38 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.c#21 integrate .. //depot/projects/ia64/sys/netatalk/at_control.c#11 integrate .. //depot/projects/ia64/sys/netatalk/ddp_pcb.c#8 integrate .. //depot/projects/ia64/sys/netatm/atm_usrreq.c#15 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#13 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#22 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#18 integrate .. //depot/projects/ia64/sys/netgraph/ng_socket.c#32 integrate .. //depot/projects/ia64/sys/netgraph/ng_tty.c#15 integrate .. //depot/projects/ia64/sys/netinet/in.c#24 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#49 integrate .. //depot/projects/ia64/sys/netinet/ip_carp.c#11 integrate .. //depot/projects/ia64/sys/netinet/ip_divert.c#37 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#61 integrate .. //depot/projects/ia64/sys/netinet/ip_mroute.c#40 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#58 integrate .. //depot/projects/ia64/sys/netinet/libalias/alias_smedia.c#4 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#50 integrate .. //depot/projects/ia64/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctputil.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctputil.h#2 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#60 integrate .. //depot/projects/ia64/sys/netinet/udp_usrreq.c#49 integrate .. //depot/projects/ia64/sys/netinet6/in6.c#27 integrate .. //depot/projects/ia64/sys/netinet6/in6_pcb.c#33 integrate .. //depot/projects/ia64/sys/netinet6/in6_src.c#20 integrate .. //depot/projects/ia64/sys/netinet6/ipsec.c#25 integrate .. //depot/projects/ia64/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/ia64/sys/netinet6/udp6_usrreq.c#30 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.c#16 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_osdep.h#4 integrate .. //depot/projects/ia64/sys/netipx/ipx_pcb.c#14 integrate .. //depot/projects/ia64/sys/netipx/ipx_usrreq.c#21 integrate .. //depot/projects/ia64/sys/netncp/ncp_conn.c#13 integrate .. //depot/projects/ia64/sys/netncp/ncp_mod.c#12 integrate .. //depot/projects/ia64/sys/netncp/ncp_subr.h#6 integrate .. //depot/projects/ia64/sys/netsmb/smb_conn.c#17 integrate .. //depot/projects/ia64/sys/netsmb/smb_subr.h#12 integrate .. //depot/projects/ia64/sys/nfsclient/bootp_subr.c#26 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#28 integrate .. //depot/projects/ia64/sys/pc98/cbus/fdc.c#8 integrate .. //depot/projects/ia64/sys/pc98/pc98/machdep.c#12 integrate .. //depot/projects/ia64/sys/pci/if_pcn.c#34 integrate .. //depot/projects/ia64/sys/pci/if_pcnreg.h#7 integrate .. //depot/projects/ia64/sys/posix4/_semaphore.h#5 delete .. //depot/projects/ia64/sys/posix4/ksched.c#16 delete .. //depot/projects/ia64/sys/posix4/ksem.h#2 delete .. //depot/projects/ia64/sys/posix4/p1003_1b.c#12 delete .. //depot/projects/ia64/sys/posix4/posix4.h#9 delete .. //depot/projects/ia64/sys/posix4/posix4_mib.c#7 delete .. //depot/projects/ia64/sys/posix4/sched.h#4 delete .. //depot/projects/ia64/sys/posix4/semaphore.h#6 delete .. //depot/projects/ia64/sys/security/audit/audit.c#4 integrate .. //depot/projects/ia64/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/ia64/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/ia64/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/ia64/sys/security/mac/mac_internal.h#5 integrate .. //depot/projects/ia64/sys/security/mac/mac_net.c#11 integrate .. //depot/projects/ia64/sys/security/mac/mac_posix_sem.c#4 integrate .. //depot/projects/ia64/sys/security/mac/mac_priv.c#1 branch .. //depot/projects/ia64/sys/security/mac/mac_system.c#6 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#36 integrate .. //depot/projects/ia64/sys/security/mac_bsdextended/mac_bsdextended.c#21 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#27 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#34 integrate .. //depot/projects/ia64/sys/security/mac_partition/mac_partition.c#10 integrate .. //depot/projects/ia64/sys/security/mac_portacl/mac_portacl.c#10 integrate .. //depot/projects/ia64/sys/security/mac_seeotheruids/mac_seeotheruids.c#9 integrate .. //depot/projects/ia64/sys/security/mac_stub/mac_stub.c#14 integrate .. //depot/projects/ia64/sys/security/mac_test/mac_test.c#30 integrate .. //depot/projects/ia64/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/ia64/sys/sun4v/include/cpufunc.h#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/hcall.S#3 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/hvcons.c#4 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/interrupt.S#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/support.S#3 integrate .. //depot/projects/ia64/sys/sys/_lock.h#6 integrate .. //depot/projects/ia64/sys/sys/_mutex.h#9 integrate .. //depot/projects/ia64/sys/sys/_semaphore.h#1 branch .. //depot/projects/ia64/sys/sys/jail.h#13 integrate .. //depot/projects/ia64/sys/sys/ksem.h#1 branch .. //depot/projects/ia64/sys/sys/lock.h#15 integrate .. //depot/projects/ia64/sys/sys/lock_profile.h#1 branch .. //depot/projects/ia64/sys/sys/lockmgr.h#18 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#35 integrate .. //depot/projects/ia64/sys/sys/mutex.h#30 integrate .. //depot/projects/ia64/sys/sys/param.h#78 integrate .. //depot/projects/ia64/sys/sys/posix4.h#1 branch .. //depot/projects/ia64/sys/sys/priv.h#1 branch .. //depot/projects/ia64/sys/sys/sched.h#15 integrate .. //depot/projects/ia64/sys/sys/sem.h#7 integrate .. //depot/projects/ia64/sys/sys/semaphore.h#1 branch .. //depot/projects/ia64/sys/sys/sysproto.h#60 integrate .. //depot/projects/ia64/sys/sys/systm.h#51 integrate .. //depot/projects/ia64/sys/sys/thr.h#9 integrate .. //depot/projects/ia64/sys/sys/umtx.h#13 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_alloc.c#38 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#66 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#51 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#29 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_quota.c#27 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#58 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#63 integrate .. //depot/projects/ia64/sys/vm/vm_contig.c#34 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#48 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#80 integrate .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp1.0#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp2.2#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp2.2.stderr#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp3.2#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp3.2.stderr#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp4.2#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp4.2.stderr#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp5.2#1 branch .. //depot/projects/ia64/tools/regression/bin/sh/errors/bad-parm-exp5.2.stderr#1 branch .. //depot/projects/ia64/tools/regression/fifo/fifo_io/fifo_io.c#2 integrate .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.ascii.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.block.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.dddh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.ddhd.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.ddhd2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.ddhh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.ddhh2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.dhdd.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.dhdh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.dhhd.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.dhhd2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.dhhh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.dhhh2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.ed.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.grep.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hddd.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hddd2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hddh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hddh2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hdhd.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hdhd2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hdhh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hdhh2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhdd.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhdd2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhdh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhdh2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhhd.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhhd2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhhh.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.hhhh2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.n21.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.out#2 delete .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.sh#5 integrate .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.stutter.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.tabs.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.x.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.xaa.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/jot/regress.yes.out#1 branch .. //depot/projects/ia64/tools/tools/pirtool/pirtable.h#3 integrate .. //depot/projects/ia64/tools/tools/pirtool/pirtool.c#3 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#63 integrate .. //depot/projects/ia64/usr.bin/fetch/fetch.c#24 integrate .. //depot/projects/ia64/usr.bin/jot/jot.1#7 integrate .. //depot/projects/ia64/usr.bin/jot/jot.c#8 integrate .. //depot/projects/ia64/usr.bin/ktrace/ktrace.1#5 integrate .. //depot/projects/ia64/usr.bin/netstat/if.c#13 integrate .. //depot/projects/ia64/usr.bin/top/machine.c#13 integrate .. //depot/projects/ia64/usr.sbin/bsnmpd/bsnmpd/Makefile#12 integrate .. //depot/projects/ia64/usr.sbin/portsnap/phttpget/phttpget.c#7 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/install.c#38 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/installUpgrade.c#12 integrate Differences ... ==== //depot/projects/ia64/ObsoleteFiles.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.58 2006/11/05 00:39:56 trhodes Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.59 2006/11/08 03:23:49 marcel Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +.if ${TARGET_ARCH} == "ia64" +# 20061104: skiload.help removed +OLD_FILES+=boot/skiload.help +.endif # 20061018: pccardc removed OLD_FILES+=usr/sbin/pccardc usr/share/man/man8/pccardc.8.gz # 20060930: demangle.h from contrib/libstdc++/include/ext/ ==== //depot/projects/ia64/bin/sh/expand.c#17 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.49 2006/02/04 14:37:50 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.51 2006/11/07 22:46:13 stefanf Exp $"); #include #include @@ -98,7 +98,7 @@ STATIC int subevalvar(char *, char *, int, int, int, int); STATIC char *evalvar(char *, int); STATIC int varisset(char *, int); -STATIC void varvalue(char *, int, int); +STATIC void varvalue(char *, int, int, int); STATIC void recordregion(int, int, int); STATIC void removerecordregions(int); STATIC void ifsbreakup(char *, struct arglist *); @@ -633,7 +633,7 @@ int easy; int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); - varflags = *p++; + varflags = (unsigned char)*p++; subtype = varflags & VSTYPE; var = p; special = 0; @@ -669,7 +669,7 @@ if (set && subtype != VSPLUS) { /* insert the value of the variable */ if (special) { - varvalue(var, varflags & VSQUOTE, flag & EXP_FULL); + varvalue(var, varflags & VSQUOTE, subtype, flag); if (subtype == VSLENGTH) { varlen = expdest - stackblock() - startloc; STADJUST(-varlen, expdest); @@ -763,6 +763,11 @@ goto record; break; + case VSERROR: + c = p - var - 1; + error("${%.*s%s}: Bad substitution", c, var, + (c > 0 && *p != CTLENDVAR) ? "..." : ""); + default: abort(); } @@ -836,7 +841,7 @@ */ STATIC void -varvalue(char *name, int quoted, int allow_split) +varvalue(char *name, int quoted, int subtype, int flag) { int num; char *p; @@ -848,7 +853,7 @@ #define STRTODEST(p) \ do {\ - if (allow_split) { \ + if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH) { \ syntax = quoted? DQSYNTAX : BASESYNTAX; \ while (*p) { \ if (syntax[(int)*p] == CCTL) \ @@ -883,7 +888,7 @@ } break; case '@': - if (allow_split && quoted) { + if (flag & EXP_FULL && quoted) { for (ap = shellparam.p ; (p = *ap++) != NULL ; ) { STRTODEST(p); if (*ap) ==== //depot/projects/ia64/bin/sh/parser.c#17 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.57 2006/07/31 11:32:12 yar Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.58 2006/11/05 18:36:05 stefanf Exp $"); #include #include @@ -1228,12 +1228,17 @@ c = pgetc(); } } else { - if (! is_special(c)) -badsub: synerror("Bad substitution"); - USTPUTC(c, out); - c = pgetc(); + if (! is_special(c)) { + subtype = VSERROR; + if (c == '}') + pungetc(); + else + USTPUTC(c, out); + } else { + USTPUTC(c, out); + c = pgetc(); + } } - STPUTC('=', out); flags = 0; if (subtype == 0) { switch (c) { @@ -1243,9 +1248,13 @@ /*FALLTHROUGH*/ default: p = strchr(types, c); - if (p == NULL) - goto badsub; - subtype = p - types + VSNORMAL; + if (p == NULL) { + if (flags == VSNUL) + STPUTC(':', out); + STPUTC(c, out); + subtype = VSERROR; + } else + subtype = p - types + VSNORMAL; break; case '%': case '#': @@ -1261,9 +1270,10 @@ break; } } - } else { + } else if (subtype != VSERROR) { pungetc(); } + STPUTC('=', out); if (subtype != VSLENGTH && (dblquote || arinest)) flags |= VSQUOTE; *(stackblock() + typeloc) = subtype | flags; ==== //depot/projects/ia64/bin/sh/parser.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)parser.h 8.3 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/parser.h,v 1.10 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/parser.h,v 1.11 2006/11/05 18:36:05 stefanf Exp $ */ /* control characters in argument strings */ @@ -60,6 +60,7 @@ #define VSTRIMRIGHT 0x8 /* ${var%pattern} */ #define VSTRIMRIGHTMAX 0x9 /* ${var%%pattern} */ #define VSLENGTH 0xa /* ${#var} */ +#define VSERROR 0xb /* Syntax error, issue when expanded */ /* ==== //depot/projects/ia64/crypto/openssh/ChangeLog#13 (text+ko) ==== @@ -1,7 +1,117 @@ +20061107 + - (dtucker) [sshd.c] Use privsep_pw if we have it, but only require it + if we absolutely need it. Pointed out by Corinna, ok djm@ + - (dtucker) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2006/11/06 21:25:28 + [auth-rsa.c kexgexc.c kexdhs.c key.c ssh-dss.c sshd.c kexgexs.c + ssh-keygen.c bufbn.c moduli.c scard.c kexdhc.c sshconnect1.c dh.c rsa.c] + add missing checks for openssl return codes; with & ok djm@ + - markus@cvs.openbsd.org 2006/11/07 10:31:31 + [monitor.c version.h] + correctly check for bad signatures in the monitor, otherwise the monitor + and the unpriv process can get out of sync. with dtucker@, ok djm@, + dtucker@ + - (dtucker) [README contrib/{caldera,redhat,contrib}/openssh.spec] Bump + versions. + - (dtucker) [dh.c] Type fix for BN_hex2bn; ok markus@ + - (dtucker) Release 4.5p1. + +20061105 + - (djm) OpenBSD CVS Sync + - otto@cvs.openbsd.org 2006/10/28 18:08:10 + [ssh.1] + correct/expand example of usage of -w; ok jmc@ stevesk@ + - markus@cvs.openbsd.org 2006/10/31 16:33:12 + [kexdhc.c kexdhs.c kexgexc.c kexgexs.c] + check DH_compute_key() for -1 even if it should not happen because of + earlier calls to dh_pub_is_valid(); report krahmer at suse.de; ok djm + +20061101 + - (dtucker) [openbsd-compat/port-solaris.c] Bug #1255: Make only hwerr + events fatal in Solaris process contract support and tell it to signal + only processes in the same process group when something happens. + Based on information from andrew.benham at thus.net and similar to + a patch from Chad Mynhier. ok djm@ + +20061027 +- (djm) [auth.c] gc some dead code + +20061023 + - (djm) OpenBSD CVS Sync + - ray@cvs.openbsd.org 2006/09/30 17:48:22 + [sftp.c] + Clear errno before calling the strtol functions. + From Paul Stoeber . + OK deraadt@. + - djm@cvs.openbsd.org 2006/10/06 02:29:19 + [ssh-agent.c ssh-keyscan.c ssh.c] + sys/resource.h needs sys/time.h; prompted by brad@ + (NB. Id sync only for portable) + - djm@cvs.openbsd.org 2006/10/09 23:36:11 + [session.c] + xmalloc -> xcalloc that was missed previously, from portable + (NB. Id sync only for portable, obviously) + - markus@cvs.openbsd.org 2006/10/10 10:12:45 + [sshconnect.c] + sleep before retrying (not after) since sleep changes errno; fixes + pr 5250; rad@twig.com; ok dtucker djm + - markus@cvs.openbsd.org 2006/10/11 12:38:03 + [clientloop.c serverloop.c] + exit instead of doing a blocking tcp send if we detect a client/server + timeout, since the tcp sendqueue might be already full (of alive + requests); ok dtucker, report mpf + - djm@cvs.openbsd.org 2006/10/22 02:25:50 + [sftp-client.c] + cancel progress meter when upload write fails; ok deraadt@ + - (tim) [Makefile.in scard/Makefile.in] Add datarootdir= lines to keep + autoconf 2.60 from complaining. + +20061018 + - (dtucker) OpenBSD CVS Sync + - ray@cvs.openbsd.org 2006/09/25 04:55:38 + [ssh-keyscan.1 ssh.1] + Change "a SSH" to "an SSH". Hurray, I'm not the only one who + pronounces "SSH" as "ess-ess-aich". + OK jmc@ and stevesk@. + - (dtucker) [sshd.c] Reshuffle storing of pw struct; prevents warnings + on older versions of OS X. ok djm@ + +20061016 + - (dtucker) [monitor_fdpass.c] Include sys/in.h, required for cmsg macros + on older (2.0) Linuxes. Based on patch from thmo-13 at gmx de. + +20061006 + - (tim) [buildpkg.sh.in] Use uname -r instead of -v in OS_VER for Solaris. + Differentiate between OpenServer 5 and OpenServer 6 + - (dtucker) [configure.ac] Set put -lselinux into $LIBS while testing for + SELinux functions so they're detected correctly. Patch from pebenito at + gentoo.org. + - (tim) [buildpkg.sh.in] Some systems have really limited nawk (OpenServer). + Allow setting alternate awk in openssh-config.local. + +20061003 + - (tim) [configure.ac] Move CHECK_HEADERS test before platform specific + section so additional platform specific CHECK_HEADER tests will work + correctly. Fixes " on FreeBSD" problem report by des AT des.no + Feedback and "seems like a good idea" dtucker@ + +20061001 + - (dtucker) [audit-bsm.c] Include errno.h. Pointed out by des at des.no. + +20060929 + - (dtucker) [configure.ac] Bug #1239: Fix configure test for OpenSSH engine + support. Patch from andrew.benham at thus net. + +20060928 + - (dtucker) [entropy.c] Bug #1238: include signal.h to fix compilation error + on Solaris 8 w/out /dev/random or prngd. Patch from rl at + math.technion.ac.il. + 20060926 - (dtucker) [bufaux.h] nuke bufaux.h; it's already gone from OpenBSD and not referenced any more. ok djm@ - (dtucker) [sftp-server.8] Resync; spotted by djm@ + - (dtucker) Release 4.4p1. 20060924 - (tim) [configure.ac] Remove CFLAGS hack for UnixWare 1.x/2.x (added @@ -2496,2995 +2606,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -20050901 - - (djm) Update RPM spec file versions - -20050831 - - (djm) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2005/08/30 22:08:05 - [gss-serv.c sshconnect2.c] - destroy credentials if krb5_kuserok() call fails. Stops credentials being - delegated to users who are not authorised for GSSAPIAuthentication when - GSSAPIDeletegateCredentials=yes and another authentication mechanism - succeeds; bz#1073 reported by paul.moore AT centrify.com, fix by - simon AT sxw.org.uk, tested todd@ biorn@ jakob@; ok deraadt@ - - markus@cvs.openbsd.org 2005/08/31 09:28:42 - [version.h] - 4.2 - - (dtucker) [README] Update release note URL to 4.2 - - (tim) [configure.ac auth.c defines.h session.c openbsd-compat/port-uw.c - openbsd-compat/port-uw.h openbsd-compat/xcrypt.c] libiaf cleanup. Disable - libiaf bits for OpenServer6. Free memory allocated by ia_get_logpwd(). - Feedback and OK dtucker@ - -20050830 - - (tim) [configure.ac] Back out last change. It needs to be done differently. - -20050829 - - (tim) [configure.ac] ia_openinfo() seems broken on OSR6. Limit UW long - password support to 7.x for now. - -20050826 - - (tim) [CREDITS LICENCE auth.c configure.ac defines.h includes.h session.c - openbsd-compat/Makefile.in openbsd-compat/openbsd-compat.h - openbsd-compat/xcrypt.c] New files [openssh/openbsd-compat/port-uw.c - openssh/openbsd-compat/port-uw.h] Support long passwords (> 8-char) - on UnixWare 7 from Dhiraj Gulati and Ahsan Rashid. Cleanup and testing - by tim@. Feedback and OK dtucker@ - -20050823 - - (dtucker) [regress/test-exec.sh] Do not prepend an extra "/" to a fully- - qualified sshd pathname since some systems (eg Cygwin) may consider "/foo" - and "//foo" to be different. Spotted by vinschen at redhat.com. - - (tim) [configure.ac] Not all gcc's support -Wsign-compare. Enhancements - and OK dtucker@ - - (tim) [defines.h] PATH_MAX bits for OpenServer OK dtucker@ - -20050821 - - (dtucker) [configure.ac defines.h includes.h sftp.c] Add support for - LynxOS, patch from Olli Savia (ops at iki.fi). ok djm@ - -20050816 - - (djm) [ttymodes.c] bugzilla #1025: Fix encoding of _POSIX_VDISABLE, - from Jacob Nevins; ok dtucker@ - -20050815 - - (tim) [sftp.c] wrap el_end() in #ifdef USE_LIBEDIT - - (tim) [configure.ac] corrections to libedit tests. Report and patches - by skeleten AT shillest.net - -20050812 - - (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2005/07/28 17:36:22 - [packet.c] - missing packet_init_compression(); from solar - - djm@cvs.openbsd.org 2005/07/30 01:26:16 - [ssh.c] - fix -D listen_host initialisation, so it picks up gateway_ports setting - correctly - - djm@cvs.openbsd.org 2005/07/30 02:03:47 - [readconf.c] - listen_hosts initialisation here too; spotted greg AT y2005.nest.cx - - dtucker@cvs.openbsd.org 2005/08/06 10:03:12 - [servconf.c] - Unbreak sshd ListenAddress for bare IPv6 addresses. - Report from Janusz Mucka; ok djm@ - - jaredy@cvs.openbsd.org 2005/08/08 13:22:48 - [sftp.c] - sftp prompt enhancements: - - in non-interactive mode, do not print an empty prompt at the end - before finishing - - print newline after EOF in editline mode - - call el_end() in editline mode - ok dtucker djm - -20050810 - - (dtucker) [configure.ac] Test libedit library and headers for compatibility. - Report from skeleten AT shillest.net, ok djm@ - - (dtucker) [LICENCE configure.ac defines.h openbsd-compat/realpath.c] - Sync current (thread-safe) version of realpath.c from OpenBSD (which is - in turn based on FreeBSD's). ok djm@ - -20050809 - - (tim) [configure.ac] Allow --with-audit=no. OK dtucker@ - Report by skeleten AT shillest.net - -20050803 - - (dtucker) [openbsd-compat/fake-rfc2553.h] Check for EAI_* defines - individually and use a value less likely to collide with real values from - netdb.h. Fixes compile warnings on FreeBSD 5.3. ok djm@ - - (dtucker) [openbsd-compat/fake-rfc2553.h] MAX_INT -> INT_MAX since the - latter is specified in the standard. - -20050802 - - (dtucker) OpenBSD CVS Sync - - dtucker@cvs.openbsd.org 2005/07/27 10:39:03 - [scp.c hostfile.c sftp-client.c] - Silence bogus -Wuninitialized warnings; ok djm@ - - (dtucker) [configure.ac] Enable -Wuninitialized by default when compiling - with gcc. ok djm@ - - (dtucker) [configure.ac] Add a --with-Werror option to configure for - adding -Werror to CFLAGS when all of the configure tests are done. ok djm@ - -20050726 - - (dtucker) [configure.ac] Update zlib warning message too, pointed out by - tim@. - - (djm) OpenBSD CVS Sync - - otto@cvs.openbsd.org 2005/07/19 15:32:26 - [auth-passwd.c] - auth_usercheck(3) can return NULL, so check for that. Report from - mpech@. ok markus@ - - markus@cvs.openbsd.org 2005/07/25 11:59:40 - [kex.c kex.h myproposal.h packet.c packet.h servconf.c session.c] - [sshconnect2.c sshd.c sshd_config sshd_config.5] - add a new compression method that delays compression until the user - has been authenticated successfully and set compression to 'delayed' - for sshd. - this breaks older openssh clients (< 3.5) if they insist on - compression, so you have to re-enable compression in sshd_config. - ok djm@ - -20050725 - - (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096. - -20050717 -- OpenBSD CVS Sync - - djm@cvs.openbsd.org 2005/07/16 01:35:24 - [auth1.c channels.c cipher.c clientloop.c kex.c session.c ssh.c] - [sshconnect.c] - spacing - - (djm) [acss.c auth-pam.c auth-shadow.c auth-skey.c auth1.c canohost.c] - [cipher-acss.c loginrec.c ssh-rand-helper.c sshd.c] Fix whitespace at EOL - in portable too ("perl -p -i -e 's/\s+$/\n/' *.[ch]") - - (djm) [auth-pam.c sftp.c] spaces vs. tabs at start of line - - djm@cvs.openbsd.org 2005/07/17 06:49:04 - [channels.c channels.h session.c session.h] - Fix a number of X11 forwarding channel leaks: - 1. Refuse multiple X11 forwarding requests on the same session - 2. Clean up all listeners after a single_connection X11 forward, not just - the one that made the single connection - 3. Destroy X11 listeners when the session owning them goes away - testing and ok dtucker@ - - djm@cvs.openbsd.org 2005/07/17 07:17:55 - [auth-rh-rsa.c auth-rhosts.c auth2-chall.c auth2-gss.c channels.c] - [cipher-ctr.c gss-genr.c gss-serv.c kex.c moduli.c readconf.c] - [serverloop.c session.c sftp-client.c sftp.c ssh-add.c ssh-keygen.c] - [sshconnect.c sshconnect2.c] - knf says that a 2nd level indent is four (not three or five) spaces - -(djm) [audit.c auth1.c auth2.c entropy.c loginrec.c serverloop.c] - [ssh-rand-helper.c] fix portable 2nd level indents at 4 spaces too - - (djm) [monitor.c monitor_wrap.c] -Wsign-compare for PAM monitor calls - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Nov 11 23:21:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D165516A416; Sat, 11 Nov 2006 23:21:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 9250A16A412 for ; Sat, 11 Nov 2006 23:21:01 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 426E143D46 for ; Sat, 11 Nov 2006 23:21:01 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kABNL1qJ086712 for ; Sat, 11 Nov 2006 23:21:01 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kABNKtHd086699 for perforce@freebsd.org; Sat, 11 Nov 2006 23:20:55 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 11 Nov 2006 23:20:55 GMT Message-Id: <200611112320.kABNKtHd086699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 109760 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Nov 2006 23:21:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=109760 Change 109760 by rdivacky@rdivacky_witten on 2006/11/11 23:20:00 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#9 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#11 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#11 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#10 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/include/armreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot0iic/main.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac.h#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac_init.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/mci_device.h#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/memcmp.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/memcpy.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/memset.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/sd-card.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/strcmp.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/strcpy.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/strcvt.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/strlen.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/linuxolator/src/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#31 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#10 integrate .. //depot/projects/linuxolator/src/sys/conf/files#10 integrate .. //depot/projects/linuxolator/src/sys/conf/files.arm#2 integrate .. //depot/projects/linuxolator/src/sys/conf/files.sun4v#3 integrate .. //depot/projects/linuxolator/src/sys/conf/options#7 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aha/ahareg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#11 integrate .. //depot/projects/linuxolator/src/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/Make.tags.inc#2 integrate .. //depot/projects/linuxolator/src/sys/kern/init_sysent.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sig.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_thr.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_time.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/ksched.c#1 branch .. //depot/projects/linuxolator/src/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/linuxolator/src/sys/kern/p1003_1b.c#1 branch .. //depot/projects/linuxolator/src/sys/kern/posix4_mib.c#1 branch .. //depot/projects/linuxolator/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_ule.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_lock.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/syscalls.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/systrace_args.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/tty.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_sem.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_aio.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/linuxolator/src/sys/modules/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/acpi/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/modules/if_ppp/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/net/bridgestp.c#5 integrate .. //depot/projects/linuxolator/src/sys/net/bridgestp.h#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridge.c#7 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_ppp.c#4 integrate .. //depot/projects/linuxolator/src/sys/net/if_pppvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias_smedia.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/linuxolator/src/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/pci/if_pcn.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_pcnreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/posix4/_semaphore.h#2 delete .. //depot/projects/linuxolator/src/sys/posix4/ksched.c#3 delete .. //depot/projects/linuxolator/src/sys/posix4/ksem.h#2 delete .. //depot/projects/linuxolator/src/sys/posix4/p1003_1b.c#3 delete .. //depot/projects/linuxolator/src/sys/posix4/posix4.h#2 delete .. //depot/projects/linuxolator/src/sys/posix4/posix4_mib.c#2 delete .. //depot/projects/linuxolator/src/sys/posix4/sched.h#2 delete .. //depot/projects/linuxolator/src/sys/posix4/semaphore.h#2 delete .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_posix_sem.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/cpufunc.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hcall.S#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/interrupt.S#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/support.S#3 integrate .. //depot/projects/linuxolator/src/sys/sys/_lock.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/_mutex.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/_semaphore.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/ksem.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/lock.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/lock_profile.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/lockmgr.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/mutex.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#6 integrate .. //depot/projects/linuxolator/src/sys/sys/posix4.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/sched.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/sem.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/semaphore.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/syscall.h#7 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.mk#7 integrate .. //depot/projects/linuxolator/src/sys/sys/sysproto.h#7 integrate .. //depot/projects/linuxolator/src/sys/sys/thr.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/umtx.h#4 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_contig.c#4 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_page.c#5 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.38 2006/08/10 06:29:43 imp Exp $ +# $FreeBSD: src/sys/Makefile,v 1.39 2006/11/11 16:26:55 trhodes Exp $ .include @@ -11,7 +11,7 @@ CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ isofs kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ - netsmb nfs nfsclient nfs4client rpc pccard pci posix4 sys \ + netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.657 2006/10/26 21:42:16 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.660 2006/11/07 21:57:18 ru Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -196,7 +196,7 @@ #ifdef PERFMON perfmon_init(); #endif - printf("usable memory = %ju (%ju MB)\n", ptoa((uintmax_t)physmem), + printf("usable memory = %ju (%ju MB)\n", ptoa((uintmax_t)physmem), ptoa((uintmax_t)physmem) / 1048576); realmem = Maxmem; /* @@ -220,7 +220,7 @@ vm_ksubmap_init(&kmi); - printf("avail memory = %ju (%ju MB)\n", + printf("avail memory = %ju (%ju MB)\n", ptoa((uintmax_t)cnt.v_free_count), ptoa((uintmax_t)cnt.v_free_count) / 1048576); @@ -747,8 +747,6 @@ ip->gd_hioffset = ((uintptr_t)func)>>16 ; } -#define IDTVEC(name) __CONCAT(X,name) - extern inthand_t IDTVEC(div), IDTVEC(dbg), IDTVEC(nmi), IDTVEC(bpt), IDTVEC(ofl), IDTVEC(bnd), IDTVEC(ill), IDTVEC(dna), IDTVEC(fpusegm), @@ -877,7 +875,7 @@ if (smap->base < physmap[i + 1]) { if (boothowto & RB_VERBOSE) printf( - "Overlapping or non-montonic memory region, ignoring second region\n"); + "Overlapping or non-monotonic memory region, ignoring second region\n"); continue; } } ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#9 (text+ko) ==== @@ -27,14 +27,12 @@ * (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/linux32/linux.h,v 1.7 2006/10/15 14:22:12 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.9 2006/11/07 18:53:49 jhb Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ #define _AMD64_LINUX_LINUX_H_ -#include /* for sigval union */ - #include /* @@ -379,6 +377,11 @@ #define LINUX_SI_MAX_SIZE 128 #define LINUX_SI_PAD_SIZE ((LINUX_SI_MAX_SIZE/sizeof(l_int)) - 3) +union l_sigval { + l_int sival_int; + l_uintptr_t sival_ptr; +}; + typedef struct l_siginfo { l_int lsi_signo; l_int lsi_errno; @@ -399,7 +402,7 @@ struct { l_pid_t _pid; /* sender's pid */ l_uid16_t _uid; /* sender's uid */ - union sigval _sigval; + union l_sigval _sigval; } __packed _rt; struct { ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.22 2006/10/28 10:59:59 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.26 2006/11/11 21:49:07 ru Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.22 2006/10/28 10:59:59 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.26 2006/11/11 21:49:07 ru Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.22 2006/10/28 10:59:59 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.26 2006/11/11 21:49:07 ru Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp */ #include ==== //depot/projects/linuxolator/src/sys/arm/arm/cpufunc.c#3 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.12 2006/10/21 04:25:00 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.13 2006/11/07 22:36:56 cognet Exp $"); #include #include @@ -73,13 +73,17 @@ #include #endif +#if defined(CPU_XSCALE_81342) +#include +#endif + #ifdef CPU_XSCALE_IXP425 #include #include #endif #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) #include #endif @@ -570,6 +574,62 @@ /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 CPU_XSCALE_80219 */ +#ifdef CPU_XSCALE_81342 +struct cpu_functions xscalec3_cpufuncs = { + /* CPU functions */ + + cpufunc_id, /* id */ + xscale_cpwait, /* cpwait */ + + /* MMU functions */ + + xscale_control, /* control */ + cpufunc_domains, /* domain */ + xscalec3_setttb, /* setttb */ + cpufunc_faultstatus, /* faultstatus */ + cpufunc_faultaddress, /* faultaddress */ + + /* TLB functions */ + + armv4_tlb_flushID, /* tlb_flushID */ + xscale_tlb_flushID_SE, /* tlb_flushID_SE */ + armv4_tlb_flushI, /* tlb_flushI */ + (void *)armv4_tlb_flushI, /* tlb_flushI_SE */ + armv4_tlb_flushD, /* tlb_flushD */ + armv4_tlb_flushD_SE, /* tlb_flushD_SE */ + + /* Cache operations */ + + xscalec3_cache_syncI, /* icache_sync_all */ + xscale_cache_syncI_rng, /* icache_sync_range */ + + xscalec3_cache_purgeD, /* dcache_wbinv_all */ + xscalec3_cache_purgeD_rng, /* dcache_wbinv_range */ + xscale_cache_flushD_rng, /* dcache_inv_range */ + xscalec3_cache_cleanD_rng, /* dcache_wb_range */ + + xscalec3_cache_purgeID, /* idcache_wbinv_all */ + xscalec3_cache_purgeID_rng, /* idcache_wbinv_range */ + + /* Other functions */ + + cpufunc_nullop, /* flush_prefetchbuf */ + armv4_drain_writebuf, /* drain_writebuf */ + cpufunc_nullop, /* flush_brnchtgt_C */ + (void *)cpufunc_nullop, /* flush_brnchtgt_E */ + + xscale_cpu_sleep, /* sleep */ + + /* Soft functions */ + + cpufunc_null_fixup, /* dataabt_fixup */ + cpufunc_null_fixup, /* prefetchabt_fixup */ + + xscalec3_context_switch, /* context_switch */ + + xscale_setup /* cpu setup */ +}; +#endif /* CPU_XSCALE_81342 */ /* * Global constants also used by locore.s */ @@ -582,7 +642,7 @@ defined (CPU_ARM10) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) static void get_cachetype_cp15(void); @@ -895,7 +955,6 @@ if (cputype == CPU_ID_80321_400 || cputype == CPU_ID_80321_600 || cputype == CPU_ID_80321_400_B0 || cputype == CPU_ID_80321_600_B0 || cputype == CPU_ID_80219_400 || cputype == CPU_ID_80219_600) { - /* * Reset the Performance Monitoring Unit to a * pristine state: @@ -920,6 +979,19 @@ } #endif /* CPU_XSCALE_80321 */ +#if defined(CPU_XSCALE_81342) + if (cputype == CPU_ID_81342) { + cpufuncs = xscalec3_cpufuncs; +#if defined(PERFCTRS) + xscale_pmu_init(); +#endif + + cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ + get_cachetype_cp15(); + pmap_pte_init_xscale(); + return 0; + } +#endif /* CPU_XSCALE_81342 */ #ifdef CPU_XSCALE_PXA2X0 /* ignore core revision to test PXA2xx CPUs */ if ((cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA250 || @@ -1326,7 +1398,7 @@ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) #define IGN 0 #define OR 1 @@ -1794,7 +1866,7 @@ #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) struct cpu_option xscale_options[] = { #ifdef COMPAT_12 { "branchpredict", BIC, OR, CPU_CONTROL_BPRD_ENABLE }, ==== //depot/projects/linuxolator/src/sys/arm/arm/identcpu.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.8 2006/08/24 23:51:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.9 2006/11/07 22:36:57 cognet Exp $"); #include #include #include @@ -126,6 +126,13 @@ "rev 12", "rev 13", "rev 14", "rev 15", }; +static const char * const i81342_steppings[16] = { + "step A-0", "rev 1", "rev 2", "rev 3", + "rev 4", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + static const char * const pxa2x0_steppings[16] = { "step A-0", "step A-1", "step B-0", "step B-1", "step B-2", "step C-0", "rev 6", "rev 7", @@ -229,6 +236,9 @@ { CPU_ID_80321_600_B0, CPU_CLASS_XSCALE, "i80321 600MHz", i80321_steppings }, + { CPU_ID_81342, CPU_CLASS_XSCALE, "i81342", + i81342_steppings }, + { CPU_ID_80219_400, CPU_CLASS_XSCALE, "i80219 400MHz", xscale_steppings }, ==== //depot/projects/linuxolator/src/sys/arm/arm/intr.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.12 2005/12/22 22:16:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.13 2006/11/08 01:32:24 cognet Exp $"); #include #include #include @@ -106,6 +106,7 @@ struct thread *td = curthread; int i, thread; + PCPU_LAZY_INC(cnt.v_intr); td->td_intr_nesting_level++; while ((i = arm_get_next_irq()) != -1) { arm_mask_irq(i); ==== //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#2 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.69 2006/08/28 21:43:34 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.72 2006/11/11 20:57:51 alc Exp $"); #include #include #include @@ -218,7 +218,6 @@ static MALLOC_DEFINE(M_VMPMAP, "pmap", "PMAP L1"); -vm_offset_t avail_end; /* PA of last available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ vm_offset_t pmap_curmaxkvaddr; @@ -278,6 +277,8 @@ extern void bcopy_page(vm_offset_t, vm_offset_t); extern void bzero_page(vm_offset_t); +extern vm_offset_t alloc_firstaddr; + char *_tmppt; /* @@ -1960,7 +1961,7 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + vm_page_array_size; + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; pv_entry_high_water = 9 * (pv_entry_max / 10); l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); @@ -2784,6 +2785,11 @@ KASSERT(l2b != NULL, ("No L2 bucket in pmap_remove_pages")); pt = &l2b->l2b_kva[l2pte_index(pv->pv_va)]; m = PHYS_TO_VM_PAGE(*pt & L2_ADDR_MASK); +#ifdef ARM_USE_SMALL_ALLOC + KASSERT((vm_offset_t)m >= alloc_firstaddr, ("Trying to access non-existent page va %x pte %x", pv->pv_va, *pt)); +#else + KASSERT((vm_offset_t)m >= KERNBASE, ("Trying to access non-existent page va %x pte %x", pv->pv_va, *pt)); +#endif *pt = 0; PTE_SYNC(pt); npv = TAILQ_NEXT(pv, pv_plist); @@ -4563,7 +4569,7 @@ /* * pmap_link_l2pt: * - * Link the L2 page table specified by "pa" into the L1 + * Link the L2 page table specified by l2pv.pv_pa into the L1 * page table at the slot for "va". */ void @@ -4574,7 +4580,12 @@ proto = L1_S_DOM(PMAP_DOMAIN_KERNEL) | L1_C_PROTO; +#ifdef VERBOSE_INIT_ARM + printf("pmap_link_l2pt: pa=0x%x va=0x%x\n", l2pv->pv_pa, l2pv->pv_va); +#endif + pde[slot + 0] = proto | (l2pv->pv_pa + 0x000); + PTE_SYNC(&pde[slot]); SLIST_INSERT_HEAD(&kernel_pt_list, l2pv, pv_list); ==== //depot/projects/linuxolator/src/sys/arm/arm/vm_machdep.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.28 2006/10/24 23:27:52 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.29 2006/11/07 22:35:30 cognet Exp $"); #include #include @@ -456,7 +456,7 @@ MALLOC_DEFINE(M_VMSMALLALLOC, "vm_small_alloc", "VM Small alloc data"); -static vm_offset_t alloc_firstaddr; +vm_offset_t alloc_firstaddr; vm_offset_t arm_ptovirt(vm_paddr_t pa) ==== //depot/projects/linuxolator/src/sys/arm/at91/kb920x_machdep.c#4 (text) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.18 2006/10/26 21:42:17 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.19 2006/11/11 20:57:52 alc Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -129,7 +129,6 @@ vm_paddr_t phys_avail[10]; vm_paddr_t dump_avail[4]; vm_offset_t physical_pages; -vm_offset_t clean_sva, clean_eva; struct pv_addr systempage; struct pv_addr msgbufpv; @@ -496,7 +495,6 @@ /* Do basic tuning, hz etc */ init_param1(); init_param2(physmem); - avail_end = KERNPHYSADDR + memsize - 1; kdb_init(); return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); ==== //depot/projects/linuxolator/src/sys/arm/include/armreg.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/armreg.h,v 1.4 2006/08/24 23:51:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/armreg.h,v 1.5 2006/11/07 22:36:56 cognet Exp $ */ #ifndef MACHINE_ARMREG_H @@ -157,6 +157,7 @@ #define CPU_ID_80321_600_B0 0x69052c30 #define CPU_ID_80219_400 0x69052e20 /* A0 stepping/revision. */ #define CPU_ID_80219_600 0x69052e30 /* A0 stepping/revision. */ +#define CPU_ID_81342 0x69056810 #define CPU_ID_IXP425_533 0x690541c0 #define CPU_ID_IXP425_400 0x690541d0 #define CPU_ID_IXP425_266 0x690541f0 ==== //depot/projects/linuxolator/src/sys/arm/include/atomic.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.19 2006/05/15 13:08:12 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.20 2006/11/07 11:53:44 cognet Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -337,6 +337,7 @@ #define atomic_cmpset_acq_int atomic_cmpset_32 #define atomic_cmpset_acq_ptr atomic_cmpset_ptr #define atomic_cmpset_acq_long atomic_cmpset_long +#define atomic_cmpset_acq_32 atomic_cmpset_32 #define atomic_store_rel_ptr atomic_store_ptr #define atomic_store_rel_int atomic_store_32 #define atomic_cmpset_rel_32 atomic_cmpset_32 ==== //depot/projects/linuxolator/src/sys/arm/include/cpuconf.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.8 2006/08/24 23:51:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.9 2006/11/07 22:36:56 cognet Exp $ * */ @@ -64,7 +64,8 @@ #define ARM_ARCH_4 0 #endif -#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || defined(CPU_XSCALE_80219) || \ +#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ defined(CPU_XSCALE_PXA2X0)) || defined(CPU_ARM10) #define ARM_ARCH_5 1 #else @@ -113,7 +114,7 @@ #if(defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219)) + defined(CPU_XSCALE_80219)) || defined(CPU_XSCALE_81342) #define ARM_MMU_XSCALE 1 #else #define ARM_MMU_XSCALE 0 @@ -132,7 +133,7 @@ */ #if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_80219)) + defined(CPU_XSCALE_80219)) || defined(CPU_XSCALE_81342) #define ARM_XSCALE_PMU 1 #else #define ARM_XSCALE_PMU 0 ==== //depot/projects/linuxolator/src/sys/arm/include/cpufunc.h#2 (text+ko) ==== @@ -38,7 +38,7 @@ * * Prototypes for cpu, mmu and tlb related functions. * - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.9 2006/08/24 23:51:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.10 2006/11/07 22:36:56 cognet Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -374,7 +374,7 @@ defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) void armv4_tlb_flushID (void); void armv4_tlb_flushI (void); @@ -392,7 +392,7 @@ #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) void xscale_cpwait (void); void xscale_cpu_sleep (int mode); @@ -433,6 +433,28 @@ #endif /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 CPU_XSCALE_80219 */ +#ifdef CPU_XSCALE_81342 + +void xscalec3_cache_cleanID (void); +void xscalec3_cache_cleanD (void); + +void xscalec3_cache_purgeID (void); +void xscalec3_cache_purgeID_E (u_int entry); +void xscalec3_cache_purgeD (void); +void xscalec3_cache_purgeD_E (u_int entry); + +void xscalec3_cache_syncI (void); +void xscalec3_cache_cleanID_rng (vm_offset_t start, vm_size_t end); +void xscalec3_cache_cleanD_rng (vm_offset_t start, vm_size_t end); +void xscalec3_cache_purgeID_rng (vm_offset_t start, vm_size_t end); +void xscalec3_cache_purgeD_rng (vm_offset_t start, vm_size_t end); + + +void xscalec3_setttb (u_int ttb); +void xscalec3_context_switch (void); + +#endif /* CPU_XSCALE_81342 */ + #define tlb_flush cpu_tlb_flushID #define setttb cpu_setttb #define drain_writebuf cpu_drain_writebuf ==== //depot/projects/linuxolator/src/sys/arm/include/pmap.h#2 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.20 2006/08/08 20:59:38 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.22 2006/11/11 20:57:52 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -213,9 +213,6 @@ return (ptep); } -extern vm_offset_t avail_end; -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; @@ -426,7 +423,7 @@ extern void (*pmap_copy_page_func)(vm_paddr_t, vm_paddr_t); extern void (*pmap_zero_page_func)(vm_paddr_t, int, int); -#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 +#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 || defined(CPU_XSCALE_81342) void pmap_copy_page_generic(vm_paddr_t, vm_paddr_t); void pmap_zero_page_generic(vm_paddr_t, int, int); ==== //depot/projects/linuxolator/src/sys/arm/sa11x0/assabet_machdep.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.19 2006/10/26 21:42:17 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.20 2006/11/11 20:57:52 alc Exp $"); #include "opt_md.h" @@ -146,7 +146,6 @@ vm_paddr_t physical_end; vm_paddr_t physical_freestart; vm_offset_t physical_pages; -vm_offset_t clean_sva, clean_eva; struct pv_addr systempage; struct pv_addr irqstack; @@ -455,7 +454,6 @@ init_param1(); init_param2(physmem); kdb_init(); - avail_end = 0xc0000000 + memsize - 1; return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/Makefile#2 (text) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/sys/boot/arm/at91/Makefile,v 1.2 2006/04/21 06:43:32 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/Makefile,v 1.3 2006/11/09 20:45:21 imp Exp $ -SUBDIR= libat91 boot0 boot0iic boot0spi bootiic bootspi +SUBDIR= libat91 boot0 boot0iic boot0spi boot2 bootiic bootspi .include ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/Makefile.inc#3 (text) ==== @@ -1,11 +1,14 @@ -# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.4 2006/10/21 22:51:20 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.5 2006/11/09 19:58:14 imp Exp $ .if !target(__at91_boot_Makefile.inc__) .PATH: ${.CURDIR}/../../../../libkern ${.CURDIR}/../../../../libkern/arm __at91_boot_Makefile.inc__: -CFLAGS=-O2 -mcpu=arm9 -ffreestanding \ +# tsc, kb920x are the supported flavors +BOOT_FLAVOR=kb920x + +CFLAGS=-Os -mcpu=arm9 -ffreestanding \ -I${.CURDIR}/../libat91 \ -I${.CURDIR}/../../../.. \ -I${.CURDIR}/../../../../arm \ @@ -13,13 +16,12 @@ -Wall -Waggregate-return \ -Wnested-externs \ -Wpointer-arith -Wshadow -Wwrite-strings \ - -Werror -# -Wmissing-prototypes -# -Wmissing-declarations + -Werror \ + -Wmissing-prototypes \ + -Wmissing-declarations # -Wstrict-prototypes -#CFLAGS+=-DBOOT_TSC -CFLAGS+=-DBOOT_KB9202 +CFLAGS+=-DBOOT_${BOOT_FLAVOR:U} LIBAT91=${.OBJDIR}/../libat91/libat91.a ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/boot0iic/main.c#2 (text) ==== @@ -21,7 +21,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/boot/arm/at91/boot0iic/main.c,v 1.2 2006/08/16 23:14:52 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/boot0iic/main.c,v 1.3 2006/11/09 19:55:25 imp Exp $ */ #include "at91rm9200.h" @@ -36,8 +36,8 @@ while (xmodem_rx(addr) == -1) continue; InitEEPROM(); - printf("Writing EEPROM from 0x%x to addr 0\r\n", addr); + printf("Writing EEPROM from 0x%x to addr 0\n", addr); WriteEEPROM(0, addr, 8192); - printf("Write complete. Press reset\r\n"); + printf("Write complete. Press reset\n"); return (1); } ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/Makefile#2 (text+ko) ==== @@ -1,16 +1,22 @@ -# $FreeBSD: src/sys/boot/arm/at91/boot2/Makefile,v 1.1 2006/10/20 09:12:05 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/boot2/Makefile,v 1.2 2006/11/09 20:07:26 imp Exp $ -.PATH: ${.CURDIR}/../bootspi +.PATH: ${.CURDIR}/../libat91 P=boot2 FILES=${P} -SRCS=arm_init.S boot2.c kb920x_board.c ee.c +SRCS=arm_init.S boot2.c ${BOOT_FLAVOR}_board.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .include +.if ${BOOT_FLAVOR} == "tsc" +SRCS+=ee.c +.endif +.if ${BOOT_FLAVOR} == "kb920x" +CFLAGS+=-DBOOT_IIC +.endif CFLAGS+= \ -I${.CURDIR}/../bootspi \ -I${.CURDIR}/../../../common \ ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/boot2.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.1 2006/10/20 09:12:05 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.2 2006/11/09 20:07:26 imp Exp $"); #include #include @@ -30,6 +30,7 @@ #include "lib.h" #include "sd-card.h" #include "ee.h" +#include "board.h" #define RBX_ASKNAME 0x0 /* -a */ #define RBX_SINGLE 0x1 /* -s */ @@ -66,7 +67,7 @@ #define PATH_CONFIG "/boot.config" //#define PATH_KERNEL "/boot/kernel/kernel" -#define PATH_KERNEL "/kernel.gz.tramp" +#define PATH_KERNEL "/boot/kernel/kernel.gz.tramp" #define NOPT 5 @@ -141,9 +142,6 @@ } } -// Each board has to provide one of these. -void board_init(void); - int main(void) { ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<