PERFORCE change 109543 for review
John Baldwin
jhb at FreeBSD.org
Wed Nov 8 19:18:18 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=109543
Change 109543 by jhb at 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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/conf.h>
@@ -33,6 +33,7 @@
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
+#include <sys/priv.h>
#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/systm.h>
@@ -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 <sys/cdefs.h>
-__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 <sys/signal.h> /* for sigval union */
-
#include <amd64/linux32/linux32_syscall.h>
/*
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/systm.h>
@@ -73,13 +73,17 @@
#include <arm/xscale/i80321/i80321var.h>
#endif
+#if defined(CPU_XSCALE_81342)
+#include <arm/xscale/i8134x/i81342reg.h>
+#endif
+
#ifdef CPU_XSCALE_IXP425
#include <arm/xscale/ixp425/ixp425reg.h>
#include <arm/xscale/ixp425/ixp425var.h>
#endif
#if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
- defined(CPU_XSCALE_80219)
+ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342)
#include <arm/xscale/xscalereg.h>
#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 <sys/cdefs.h>
-__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 <sys/systm.h>
#include <sys/param.h>
#include <sys/malloc.h>
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/systm.h>
#include <sys/syslog.h>
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/systm.h>
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/systm.h>
@@ -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) <<<
More information about the p4-projects
mailing list