PERFORCE change 128809 for review

Zhouyi ZHOU zhouzhouyi at FreeBSD.org
Thu Nov 8 00:00:30 PST 2007


http://perforce.freebsd.org/chv.cgi?CH=128809

Change 128809 by zhouzhouyi at zhouzhouyi_mactest on 2007/11/08 08:00:04

	Integrate from CVS because of rwatson's change to MAC framework

Affected files ...

.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/amd64/local_apic.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/amd64/machdep.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/amd64/msi.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/amd64/nexus.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/conf/DEFAULTS#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/conf/GENERIC#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/conf/NOTES#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/include/clock.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/include/pc/bios.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/isa/clock.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/pmap.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/at91/at91rm92reg.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/at91/if_ate.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/at91/kb920x_machdep.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/at91/ohci_atmelarm.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/at91/std.at91#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/at91/std.kb920x#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/include/cpuconf.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/sa11x0/assabet_machdep.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/if_npe.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot2/boot2.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/eeprom.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/emac.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/emac_init.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/lib.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/common/ufsread.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/i386/Makefile#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/i386/boot2/boot2.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/biosdisk.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/biosmem.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/biossmap.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/devicename.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/biosdisk.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/pc98/loader/main.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/bsm/audit.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/compat/linux/linux_file.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/compat/linux/linux_getcwd.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/compat/linux/linux_misc.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/kcondvar.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/mutex.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/rwlock.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/compat/pecoff/imgact_pecoff.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/compat/svr4/imgact_svr4.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/compat/svr4/svr4_fcntl.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/compat/svr4/svr4_misc.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/NOTES#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files#7 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files.amd64#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files.arm#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files.i386#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files.ia64#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files.pc98#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files.powerpc#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files.sun4v#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/options.arm#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/contrib/ipfilter/netinet/fil.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/contrib/ipfilter/netinet/ip_nat.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/contrib/opensolaris/uts/common/sys/vfs.h#3 delete
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/contrib/pf/net/pf.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/contrib/pf/net/pf_if.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/contrib/pf/net/pf_mtag.h#1 branch
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/contrib/pf/net/pf_table.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/ddb/db_examine.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/aac/aac.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/aac/aac_cam.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/acpi_support/acpi_ibm.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/acpica/acpi_cpu.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/acpica/acpi_ec.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/acpica/acpi_pci.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/acpica/acpi_pci_link.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-chipset.c#6 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-pci.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-cd.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/atapi-cd.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ciss/ciss.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/coretemp/coretemp.c#1 branch
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/isp/isp_sbus.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/mii/e1000phy.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/mii/e1000phyreg.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/mii/gentbi.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/mii/miidevs#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/mii/rgephy.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/mii/rgephyreg.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/mpt/mpt.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/nfe/if_nfe.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/pci/pci_user.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ral/rt2560.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ral/rt2661.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/safe/safe.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pci/atiixp.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pci/atiixp.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pcm/ac97.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pcm/ac97_patch.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/if_rum.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/if_ural.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/ukbd.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/devfs/devfs_devs.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/devfs/devfs_vnops.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/msdosfs/denode.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/msdosfs/msdosfs_fat.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/unionfs/union_subr.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/geom/geom_io.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/geom/part/g_part.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/geom/part/g_part.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/geom/part/g_part_gpt.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/conf/DEFAULTS#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/conf/GENERIC#6 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/conf/NOTES#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/conf/PAE#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/i386/msi.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/i386/pmap.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/ibcs2/ibcs2_misc.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/ibcs2/imgact_coff.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/include/clock.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/include/pc/bios.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/isa/clock.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/linux/imgact_linux.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/ia64/ia64/machdep.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/ia64/ia64/pmap.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/imgact_aout.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/imgact_elf.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/imgact_gzip.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/init_main.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_acct.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_alq.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_cpu.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_environment.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_exec.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_exit.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_fork.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_idle.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_intr.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_jail.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_kse.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_kthread.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_ktrace.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_linker.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_mbuf.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_proc.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_prot.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_shutdown.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_sig.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_sysctl.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_thr.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_thread.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/link_elf.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/link_elf_obj.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/sched_4bsd.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/sys_pipe.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/sys_socket.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/sysv_msg.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/sysv_sem.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/sysv_shm.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/uipc_mbuf2.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/uipc_sem.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/uipc_socket.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/uipc_syscalls.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/uipc_usrreq.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/vfs_acl.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/vfs_extattr.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/vfs_lookup.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/vfs_subr.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/vfs_syscalls.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/vfs_vnops.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/modules/Makefile#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/modules/coretemp/Makefile#1 branch
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/modules/geom/Makefile#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/bpf.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/bsd_comp.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_atmsubr.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_bridge.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_bridgevar.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_disc.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_ethersubr.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_fddisubr.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_fwsubr.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_gif.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_iso88025subr.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_loop.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_ppp.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_stf.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_tun.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_freebsd.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_freebsd.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_ht.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_ht.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_input.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_ioctl.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_ioctl.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_node.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_node.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_output.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_proto.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_proto.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_scan.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_scan_ap.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_scan_sta.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net80211/ieee80211_var.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netatalk/aarp.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netatalk/ddp_input.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netatalk/ddp_output.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netgraph/ng_base.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/if_ether.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/igmp.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/in_pcb.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_divert.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_fw2.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_icmp.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_input.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_options.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_output.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/raw_ip.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_cc_functions.c#1 branch
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_cc_functions.h#1 branch
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_constants.h#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_output.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_pcb.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_pcb.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_usrreq.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctputil.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctputil.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_input.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_output.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_subr.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_syncache.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_syncache.h#1 branch
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_timewait.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/udp_usrreq.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet6/nd6.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet6/udp6_usrreq.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/nfsclient/nfs_vfsops.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/nfsserver/nfs.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/nfsserver/nfs_srvsock.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/nfsserver/nfs_srvsubs.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pc98/conf/GENERIC#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pci/agp.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pci/agp_ali.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pci/agp_amd.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pci/agp_amd64.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pci/agp_ati.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pci/agp_i810.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pci/agp_intel.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pci/agp_nvidia.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pci/agp_sis.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pci/agp_via.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pci/agppriv.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/powerpc/powerpc/machdep.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/audit/audit.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/audit/audit.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/audit/audit_bsm.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/audit/audit_bsm_klib.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/audit/audit_pipe.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/audit/audit_syscalls.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_audit.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_framework.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_inet.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_inet6.c#1 branch
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_internal.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_net.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_pipe.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_policy.h#7 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_posix_sem.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_process.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_socket.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_syscalls.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_system.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_sysv_msg.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_sysv_sem.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_sysv_shm.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_vfs.c#7 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_biba/mac_biba.c#6 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_ifoff/mac_ifoff.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_lomac/mac_lomac.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_mls/mac_mls.c#6 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_none/mac_none.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_partition/mac_partition.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_portacl/mac_portacl.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_stub/mac_stub.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#9 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_if.c#3 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_log.c#5 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_private.h#5 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sparc64/isa/isa.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sparc64/sparc64/machdep.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sparc64/sparc64/pmap.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sun4v/sun4v/machdep.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sun4v/sun4v/pmap.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/gpt.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/kthread.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/param.h#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/pciio.h#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/proc.h#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/signalvar.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/ufs/ffs/ffs_vfsops.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/ufs/ufs/ufs_vnops.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/phys_pager.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/pmap.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/swap_pager.c#4 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_extern.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_glue.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_map.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_mmap.c#5 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_page.c#5 integrate

Differences ...

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/amd64/local_apic.c#4 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.42 2007/09/11 22:54:08 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.43 2007/10/27 13:34:53 jhb Exp $");
 
 #include "opt_hwpmc_hooks.h"
 
@@ -1007,10 +1007,6 @@
 	struct apic_enumerator *enumerator;
 	int retval, best;
 
-	/* We only support built in local APICs. */
-	if (!(cpu_feature & CPUID_APIC))
-		return;
-
 	/* Don't probe if APIC mode is disabled. */
 	if (resource_disabled("apic", 0))
 		return;

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/amd64/machdep.c#3 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.675 2007/06/06 07:35:07 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.677 2007/11/05 11:36:09 kib Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
@@ -881,7 +881,7 @@
 			printf("SMAP type=%02x base=%016lx len=%016lx\n",
 			    smap->type, smap->base, smap->length);
 
-		if (smap->type != 0x01)
+		if (smap->type != SMAP_TYPE_MEMORY)
 			continue;
 
 		if (smap->length == 0)
@@ -1137,7 +1137,7 @@
  	 * This may be done better later if it gets more high level
  	 * components in it. If so just link td->td_proc here.
 	 */
-	proc_linkup(&proc0, &thread0);
+	proc_linkup0(&proc0, &thread0);
 
 	preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE);
 	preload_bootstrap_relocate(KERNBASE);

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/amd64/msi.c#3 (text+ko) ====

@@ -1,6 +1,7 @@
 /*-
- * Copyright (c) 2006 John Baldwin <jhb at FreeBSD.org>
+ * Copyright (c) 2006 Yahoo!, Inc.
  * All rights reserved.
+ * Written by: John Baldwin <jhb at FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -34,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.6 2007/05/08 21:29:13 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.7 2007/10/24 21:16:22 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/amd64/nexus.c#3 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.77 2007/05/08 21:29:13 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.78 2007/10/28 21:23:48 jhb Exp $");
 
 /*
  * This code implements a `root nexus' for Intel Architecture
@@ -587,7 +587,7 @@
 
 	rid = 0;
 	for (smap = smapbase; smap < smapend; smap++) {
-		if (smap->type != 0x01 || smap->length == 0)
+		if (smap->type != SMAP_TYPE_MEMORY || smap->length == 0)
 			continue;
 		error = bus_set_resource(dev, SYS_RES_MEMORY, rid, smap->base,
 		    smap->length);

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/amd64/pmap.c#4 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.590 2007/08/21 04:59:33 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.593 2007/11/05 18:13:33 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -743,6 +743,22 @@
 #ifdef SMP
 /*
  * For SMP, these functions have to use the IPI mechanism for coherence.
+ *
+ * N.B.: Before calling any of the following TLB invalidation functions,
+ * the calling processor must ensure that all stores updating a non-
+ * kernel page table are globally performed.  Otherwise, another
+ * processor could cache an old, pre-update entry without being
+ * invalidated.  This can happen one of two ways: (1) The pmap becomes
+ * active on another processor after its pm_active field is checked by
+ * one of the following functions but before a store updating the page
+ * table is globally performed. (2) The pmap becomes active on another
+ * processor before its pm_active field is checked but due to
+ * speculative loads one of the following functions stills reads the
+ * pmap as inactive on the other processor.
+ * 
+ * The kernel page table is exempt because its pm_active field is
+ * immutable.  The kernel page table is always active on every
+ * processor.
  */
 void
 pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
@@ -1139,6 +1155,13 @@
 	}
 
 	/*
+	 * This is a release store so that the ordinary store unmapping
+	 * the page table page is globally performed before TLB shoot-
+	 * down is begun.
+	 */
+	atomic_subtract_rel_int(&cnt.v_wire_count, 1);
+
+	/*
 	 * Do an invltlb to make the invalidated mapping
 	 * take effect immediately.
 	 */
@@ -1151,7 +1174,6 @@
 	m->right = *free;
 	*free = m;
 	
-	atomic_subtract_int(&cnt.v_wire_count, 1);
 	return 1;
 }
 
@@ -1186,7 +1208,7 @@
  * Initialize a preallocated and zeroed pmap structure,
  * such as one in a vmspace structure.
  */
-void
+int
 pmap_pinit(pmap_t pmap)
 {
 	vm_page_t pml4pg;
@@ -1216,6 +1238,8 @@
 	pmap->pm_active = 0;
 	TAILQ_INIT(&pmap->pm_pvchunk);
 	bzero(&pmap->pm_stats, sizeof pmap->pm_stats);
+
+	return (1);
 }
 
 /*
@@ -1732,7 +1756,10 @@
 	PV_STAT(pv_entry_allocs++);
 	pv_entry_count++;
 	if (pv_entry_count > pv_entry_high_water)
-		pagedaemon_wakeup();
+		if (ratecheck(&lastprint, &printinterval))
+			printf("Approaching the limit on PV entries, consider "
+			    "increasing either the vm.pmap.shpgperproc or the "
+			    "vm.pmap.pv_entry_max sysctl.\n");
 	pc = TAILQ_FIRST(&pmap->pm_pvchunk);
 	if (pc != NULL) {
 		for (field = 0; field < _NPCM; field++) {
@@ -1767,10 +1794,6 @@
 		 * pages.  After that, if a pv chunk entry is still needed,
 		 * destroy mappings to active pages.
 		 */
-		if (ratecheck(&lastprint, &printinterval))
-			printf("Approaching the limit on PV entries, consider "
-			    "increasing sysctl vm.pmap.shpgperproc or "
-			    "vm.pmap.pv_entry_max\n");
 		PV_STAT(pmap_collect_inactive++);
 		pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]);
 		m = vm_page_alloc(NULL, colour,

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/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.10 2007/06/11 00:38:05 marcel Exp $
+# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.12 2007/10/29 22:19:08 peter Exp $
 
 machine		amd64
 

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/conf/GENERIC#5 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.485 2007/10/19 12:30:33 kensmith Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.487 2007/10/26 02:35:42 imp Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -279,8 +279,19 @@
 device		umass		# Disks/Mass storage - Requires scbus and da
 device		ums		# Mouse
 device		ural		# Ralink Technology RT2500USB wireless NICs
+device		rum		# Ralink Technology RT2501USB wireless NICs
 device		urio		# Diamond Rio 500 MP3 player
 device		uscanner	# Scanners
+# USB Serial devices
+device		ucom		# Generic com ttys
+device		uark		# Technologies ARK3116 based serial adapters
+device		ubsa		# Belkin F5U103 and compatible serial adapters
+device		ubser		# BWCT console serial adapters
+device		uftdi		# For FTDI usb serial adapters
+device		uipaq		# Some WinCE based devices
+device		uplcom		# Prolific PL-2303 serial adapters
+device		uvisor		# Visor and Palm devices
+device		uvscom		# USB serial support for DDI pocket's PHS
 # USB Ethernet, requires miibus
 device		aue		# ADMtek USB Ethernet
 device		axe		# ASIX Electronics USB Ethernet
@@ -288,6 +299,7 @@
 device		cue		# CATC USB Ethernet
 device		kue		# Kawasaki LSI USB Ethernet
 device		rue		# RealTek RTL8150 USB Ethernet
+device		udav		# Davicom DM9601E USB
 
 # FireWire support
 device		firewire	# FireWire bus code

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/conf/NOTES#4 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.69 2007/08/15 19:26:02 des Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.70 2007/10/29 22:19:08 peter Exp $
 #
 
 #
@@ -97,6 +97,9 @@
 # clock to actually be used.
 options 	CLK_USE_I8254_CALIBRATION
 
+# Provide read/write access to the memory in the clock chip.
+device		nvram		# Access to rtc cmos via /dev/nvram
+
 
 #####################################################################
 # MISCELLANEOUS DEVICES AND OPTIONS

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/include/clock.h#3 (text+ko) ====

@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.54 2007/01/23 08:01:19 bde Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.55 2007/10/26 03:23:53 peter Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
@@ -31,7 +31,8 @@
 
 int	acquire_timer2(int mode);
 int	release_timer2(void);
-int	rtcin(int val);
+int	rtcin(int reg);
+void	writertc(int reg, unsigned char val);
 int	sysbeep(int pitch, int period);
 void	init_TSC(void);
 void	init_TSC_tc(void);

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/include/pc/bios.h#3 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/pc/bios.h,v 1.19 2005/07/21 09:48:36 phk Exp $
+ * $FreeBSD: src/sys/amd64/include/pc/bios.h,v 1.20 2007/10/28 21:23:49 jhb Exp $
  */
 
 #ifndef _MACHINE_PC_BIOS_H_
@@ -38,10 +38,16 @@
 
 /*
  * Int 15:E820 'SMAP' structure
- *
- * XXX add constants for type
  */
+
 #define SMAP_SIG	0x534D4150			/* 'SMAP' */
+
+#define	SMAP_TYPE_MEMORY	1
+#define	SMAP_TYPE_RESERVED	2
+#define	SMAP_TYPE_ACPI_RECLAIM	3
+#define	SMAP_TYPE_ACPI_NVS	4
+#define	SMAP_TYPE_ACPI_ERROR	5
+
 struct bios_smap {
     u_int64_t	base;
     u_int64_t	length;

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/isa/clock.c#4 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.234 2007/09/14 01:12:39 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.235 2007/10/26 03:23:53 peter Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -433,7 +433,7 @@
 	return (val);
 }
 
-static void
+void
 writertc(int reg, u_char val)
 {
 
@@ -934,99 +934,4 @@
 DRIVER_MODULE(attimer, isa, attimer_driver, attimer_devclass, 0, 0);
 DRIVER_MODULE(attimer, acpi, attimer_driver, attimer_devclass, 0, 0);
 
-/*
- * Linux-style /dev/nvram driver
- *
- * cmos ram starts at bytes 14 through 128, for a total of 114 bytes.
- * bytes 16 through 31 are checksummed at byte 32.
- * Unlike Linux, you have to take care of the checksums yourself.
- * The driver exposes byte 14 as file offset 0.
- */
-
-#define NVRAM_FIRST	RTC_DIAG	/* 14 */
-#define NVRAM_LAST	128
-
-static d_open_t		nvram_open;
-static d_read_t		nvram_read;
-static d_write_t	nvram_write;
-
-static struct cdev *nvram_dev;
-
-static struct cdevsw nvram_cdevsw = {
-	.d_version =	D_VERSION,
-	.d_flags =	D_NEEDGIANT,
-	.d_open =	nvram_open,
-	.d_read =	nvram_read,
-	.d_write =	nvram_write,
-	.d_name =	"nvram",
-};
-
-static int
-nvram_open(struct cdev *dev __unused, int flags, int fmt __unused,
-    struct thread *td)
-{
-	int error = 0;
-
-	if (flags & FWRITE)
-		error = securelevel_gt(td->td_ucred, 0);
-
-	return (error);
-}
-
-static int
-nvram_read(struct cdev *dev, struct uio *uio, int flags)
-{
-	int nv_off;
-	u_char v;
-	int error = 0;
-
-	while (uio->uio_resid > 0 && error == 0) {
-		nv_off = uio->uio_offset + NVRAM_FIRST;
-		if (nv_off < NVRAM_FIRST || nv_off >= NVRAM_LAST)
-			return (0);	/* Signal EOF */
-		/* Single byte at a time */
-		v = rtcin(nv_off);
-		error = uiomove(&v, 1, uio);
-	}
-	return (error);
-
-}
-
-static int
-nvram_write(struct cdev *dev, struct uio *uio, int flags)
-{
-	int nv_off;
-	u_char v;
-	int error = 0;
-
-	while (uio->uio_resid > 0 && error == 0) {
-		nv_off = uio->uio_offset + NVRAM_FIRST;
-		if (nv_off < NVRAM_FIRST || nv_off >= NVRAM_LAST)
-			return (0);	/* Signal EOF */
-		/* Single byte at a time */
-		error = uiomove(&v, 1, uio);
-		writertc(nv_off, v);
-	}
-	return (error);
-}
-
-static int
-nvram_modevent(module_t mod __unused, int type, void *data __unused)
-{
-	switch (type) {
-	case MOD_LOAD:
-		nvram_dev = make_dev(&nvram_cdevsw, 0,
-		    UID_ROOT, GID_KMEM, 0640, "nvram");
-		break;
-	case MOD_UNLOAD:
-	case MOD_SHUTDOWN:
-		destroy_dev(nvram_dev);
-		break;
-	default:
-		return (EOPNOTSUPP);
-	}
-	return (0);
-}
-DEV_MODULE(nvram, nvram_modevent, NULL);
-
 #endif /* DEV_ISA */

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc.c#5 (text+ko) ====

@@ -45,7 +45,7 @@
  * Created      : 30/01/97
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.19 2007/10/18 05:33:05 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.20 2007/10/31 07:27:31 kevlo Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -734,7 +734,7 @@
 u_int cpu_reset_needs_v4_MMU_disable;	/* flag used in locore.s */
 
 #if defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined(CPU_ARM9) || \
-  defined (CPU_ARM10) ||					       \
+  defined (CPU_ARM9E) || 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_81342)

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/pmap.c#5 (text+ko) ====

@@ -147,7 +147,7 @@
 #include "opt_vm.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.87 2007/10/16 20:40:04 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.88 2007/11/05 11:36:10 kib Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -3813,7 +3813,7 @@
  * such as one in a vmspace structure.
  */
 
-void
+int
 pmap_pinit(pmap_t pmap)
 {
 	PDEBUG(1, printf("pmap_pinit: pmap = %08x\n", (uint32_t) pmap));
@@ -3832,6 +3832,7 @@
 		pmap_enter(pmap, vector_page, PHYS_TO_VM_PAGE(systempage.pv_pa),
 		    VM_PROT_READ, 1);
 	} 
+	return (1);
 }
 
 

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/at91/at91rm92reg.h#4 (text) ====

@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.5 2007/07/31 17:43:18 imp Exp $ */
+/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.6 2007/10/25 23:02:42 cognet Exp $ */
 
 #ifndef AT91RM92REG_H_
 #define AT91RM92REG_H_
@@ -340,7 +340,9 @@
 #define AT91RM92_OHCI_PA_BASE	0x00300000
 #define AT91RM92_OHCI_SIZE	0x00100000
 
+#ifndef AT91C_MASTER_CLOCK
 #define AT91C_MASTER_CLOCK	60000000
+#endif
 
 /* SDRAMC */
 

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/at91/if_ate.c#3 (text) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.20 2007/06/11 19:36:37 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.21 2007/10/24 23:12:19 cognet Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -597,12 +597,12 @@
 	high =  RD4(sc, ETH_SA1H);
 	if ((low | (high & 0xffff)) == 0)
 		return (ENXIO);
-	eaddr[0] = (high >> 8) & 0xff;
-	eaddr[1] = high & 0xff;
-	eaddr[2] = (low >> 24) & 0xff;
-	eaddr[3] = (low >> 16) & 0xff;
-	eaddr[4] = (low >> 8) & 0xff;
-	eaddr[5] = low & 0xff;
+	eaddr[0] = low & 0xff;
+	eaddr[1] = (low >> 8) & 0xff;
+	eaddr[2] = (low >> 16) & 0xff;
+	eaddr[3] = (low >> 24) & 0xff;
+	eaddr[4] = high & 0xff;
+	eaddr[5] = (high >> 8) & 0xff;
 	return (0);
 }
 

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/at91/kb920x_machdep.c#4 (text) ====

@@ -48,7 +48,7 @@
 #include "opt_at91.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.23 2007/07/31 17:43:18 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.27 2007/11/05 11:36:10 kib Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
@@ -283,10 +283,10 @@
 	i += 2;
 	fake_preload[i++] = MODINFO_ADDR;
 	fake_preload[i++] = sizeof(vm_offset_t);
-	fake_preload[i++] = KERNBASE;
+	fake_preload[i++] = KERNVIRTADDR;
 	fake_preload[i++] = MODINFO_SIZE;
 	fake_preload[i++] = sizeof(uint32_t);
-	fake_preload[i++] = (uint32_t)&end - KERNBASE;
+	fake_preload[i++] = (uint32_t)&end - KERNVIRTADDR;
 #ifdef DDB
 	if (*(uint32_t *)KERNVIRTADDR == MAGIC_TRAMP_NUMBER) {
 		fake_preload[i++] = MODINFO_METADATA|MODINFOMD_SSYM;
@@ -367,7 +367,7 @@
 	for (i = 0; i < KERNEL_PT_KERN_NUM; i++)
 		pmap_link_l2pt(l1pagetable, KERNBASE + i * 0x100000,
 		    &kernel_pt_table[KERNEL_PT_KERN + i]);
-	pmap_map_chunk(l1pagetable, KERNBASE, KERNPHYSADDR,
+	pmap_map_chunk(l1pagetable, KERNBASE, PHYSADDR,
 	   (((uint32_t)(lastaddr) - KERNBASE) + PAGE_SIZE) & ~(PAGE_SIZE - 1),
 	    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
 	afterkern = round_page((lastaddr + L1_S_SIZE) & ~(L1_S_SIZE 
@@ -449,7 +449,7 @@
 	undefined_handler_address = (u_int)undefinedinstruction_bounce;
 	undefined_init();
 				
-	proc_linkup(&proc0, &thread0);
+	proc_linkup0(&proc0, &thread0);
 	thread0.td_kstack = kernelstack.pv_va;
 	thread0.td_pcb = (struct pcb *)
 		(thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
@@ -464,8 +464,8 @@
 	 * ARM_USE_SMALL_ALLOC uses dump_avail, so it must be filled before
 	 * calling pmap_bootstrap.
 	 */
-	dump_avail[0] = KERNPHYSADDR;
-	dump_avail[1] = KERNPHYSADDR + memsize;
+	dump_avail[0] = PHYSADDR;
+	dump_avail[1] = PHYSADDR + memsize;
 	dump_avail[2] = 0;
 	dump_avail[3] = 0;
 					
@@ -478,10 +478,14 @@
 	
 	i = 0;
 	
-	phys_avail[0] = virtual_avail - KERNVIRTADDR + KERNPHYSADDR;
-	phys_avail[1] = KERNPHYSADDR + memsize;
-	phys_avail[2] = 0;
-	phys_avail[3] = 0;
+#if PHYSADDR != KERNPHYSADDR
+	phys_avail[i++] = PHYSADDR;
+	phys_avail[i++] = KERNPHYSADDR;
+#endif
+	phys_avail[i++] = virtual_avail - KERNVIRTADDR + KERNPHYSADDR;
+	phys_avail[i++] = PHYSADDR + memsize;
+	phys_avail[i++] = 0;
+	phys_avail[i++] = 0;
 	/* Do basic tuning, hz etc */
 	init_param1();
 	init_param2(physmem);

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/at91/ohci_atmelarm.c#4 (text) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/ohci_atmelarm.c,v 1.3 2007/07/31 17:43:18 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/ohci_atmelarm.c,v 1.4 2007/10/29 21:01:50 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -136,7 +136,6 @@
 	/*
 	 * turn on the clocks from the AT91's point of view.  Keep the unit in reset.
 	 */
-//	bus_space_write_4(sc->sc_ohci.iot, sc->sc_ohci.ioh, OHCI_CONTROL, 0);
 	at91_pmc_clock_enable(sc->iclk);
 	at91_pmc_clock_enable(sc->fclk);
 	bus_space_write_4(sc->sc_ohci.iot, sc->sc_ohci.ioh, OHCI_CONTROL, 0);

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/at91/std.at91#3 (text) ====

@@ -1,10 +1,6 @@
-# $FreeBSD: src/sys/arm/at91/std.at91,v 1.3 2006/10/25 08:00:11 imp Exp $
+# $FreeBSD: src/sys/arm/at91/std.at91,v 1.4 2007/10/25 22:57:19 cognet Exp $
 
 files	"../at91/files.at91"
 cpu	CPU_ARM9
 makeoptions	CONF_CFLAGS=-mcpu=arm9
-makeoptions	KERNPHYSADDR=0x20000000
-makeoptions	KERNVIRTADDR=0xc0000000
-options		KERNPHYSADDR=0x20000000	
-options		KERNVIRTADDR=0xc0000000	
 options		PHYSADDR=0x20000000

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/at91/std.kb920x#3 (text) ====

@@ -1,5 +1,9 @@
-#$FreeBSD: src/sys/arm/at91/std.kb920x,v 1.4 2006/10/25 08:00:11 imp Exp $
+#$FreeBSD: src/sys/arm/at91/std.kb920x,v 1.5 2007/10/25 22:57:19 cognet Exp $
 include "../at91/std.at91"
 files	"../at91/files.kb920x"
 
 options		STARTUP_PAGETABLE_ADDR=0x20800000

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list