From owner-p4-projects@FreeBSD.ORG Tue Jun 9 08:03:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFC5F1065670; Tue, 9 Jun 2009 08:03:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E777106566C for ; Tue, 9 Jun 2009 08:03:33 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7B7DD8FC13 for ; Tue, 9 Jun 2009 08:03:33 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5983XZe028757 for ; Tue, 9 Jun 2009 08:03:33 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5983WlO028755 for perforce@freebsd.org; Tue, 9 Jun 2009 08:03:32 GMT (envelope-from zec@fer.hr) Date: Tue, 9 Jun 2009 08:03:32 GMT Message-Id: <200906090803.n5983WlO028755@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163865 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2009 08:03:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=163865 Change 163865 by zec@zec_amdx4 on 2009/06/09 08:03:15 IFC @ 163863 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/local_apic.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/NOTES#9 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/param.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biosdisk.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#28 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#41 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#14 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#31 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/platform/acfreebsd.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/Osd/OsdSynch.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.h#15 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-nvidia.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ce/if_ce.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cp/if_cp.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis_usb.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/kbdmux/kbdmux.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mwl/if_mwl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sec/sec.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sec/sec.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/clone.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/isa/sndbuf_dma.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/macio/aoa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/macio/davbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/macio/i2s.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/macio/snapper.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/macio/tumbler.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/midi/midi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/midi/mpu401.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/midi/sequencer.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/csa.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/emu10kx-midi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/neomagic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/spicds.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/channel.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/channel_if.m#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/fake.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/feeder.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/feeder_chain.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/feeder_eq.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/feeder_fmt.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/feeder_format.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/feeder_matrix.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/feeder_mixer.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/g711.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/intpcm.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/matrix.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/matrix_map.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/mixer.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/mixer.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/pcm.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/sndstat.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/unit.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio_pcm.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/version.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/avr32dci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ugensa.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umct.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/ustorage_fs.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_controller.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_core.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_debug.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_debug.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_generic.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_handle_request.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_lookup.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zydreg.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/netfront/netfront.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clstate.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/osta.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_subr.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#16 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/local_apic.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/machdep.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/pmap.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/apicvar.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/i386/isa/clock.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/pmap.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exec.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#54 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_domain.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_bio.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_syscalls.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vnode_if.src#9 integrate .. //depot/projects/vimage-commit2/src/sys/modules/bridgestp/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cxgb/iw_cxgb/Makefile#5 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cxgb/tom/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/firewire/fwip/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ibcs2/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/if_ef/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/if_gif/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/if_ppp/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/if_stf/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/if_tun/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/if_vlan/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ip6_mroute_mod/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ip_mroute_mod/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ipfw/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/modules/linprocfs/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/modules/linux/Makefile#7 integrate .. //depot/projects/vimage-commit2/src/sys/modules/mac_lomac/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/netgraph/atm/atm/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/netgraph/ether/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/netgraph/gif/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/nfsclient/Makefile#6 integrate .. //depot/projects/vimage-commit2/src/sys/modules/nfsserver/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/modules/pf/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/modules/pseudofs/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/sem/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/sound/sound/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/svr4/Makefile#6 integrate .. //depot/projects/vimage-commit2/src/sys/modules/sysvipc/sysvmsg/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/sysvipc/sysvsem/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/sysvipc/sysvshm/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ufs/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan/Makefile#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/net/flowtable.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#75 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ef.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#37 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#30 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#43 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#22 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_crypto.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_crypto.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_crypto_ccmp.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_crypto_tkip.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_dfs.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_hostap.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ht.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_input.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_output.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_proto.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_radiotap.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan_sta.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_sta.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_var.h#16 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#32 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_message.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#37 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#42 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#33 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#30 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_fw2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#32 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#25 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#54 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#38 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#42 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_var.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_gif.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_mcast.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#34 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#35 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_var.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6protosw.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#37 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#34 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#32 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/MPC85XX#6 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/pio.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/ocpbus.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/ocpbus.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/bus_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/svc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/svc_auth.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/cdefs.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/sys/domain.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mount.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#43 integrate .. //depot/projects/vimage-commit2/src/sys/sys/priv.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/sys/protosw.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/sys/soundcard.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#71 integrate .. //depot/projects/vimage-commit2/src/sys/tools/feeder_eq_mkfilter.awk#1 branch .. //depot/projects/vimage-commit2/src/sys/tools/feeder_rate_mkfilter.awk#1 branch .. //depot/projects/vimage-commit2/src/sys/tools/snd_fxdiv_gen.awk#1 branch .. //depot/projects/vimage-commit2/src/sys/vm/vm_fault.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_glue.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_map.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_pager.h#2 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/local_apic.c#9 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.55 2009/05/05 01:13:20 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.56 2009/06/09 04:17:36 ariff Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -329,29 +329,6 @@ /* XXX: Error and thermal LVTs */ - if (cpu_vendor_id == CPU_VENDOR_AMD) { - /* - * Detect the presence of C1E capability mostly on latest - * dual-cores (or future) k8 family. This feature renders - * the local APIC timer dead, so we disable it by reading - * the Interrupt Pending Message register and clearing both - * C1eOnCmpHalt (bit 28) and SmiOnCmpHalt (bit 27). - * - * Reference: - * "BIOS and Kernel Developer's Guide for AMD NPT - * Family 0Fh Processors" - * #32559 revision 3.00 - */ - if ((cpu_id & 0x00000f00) == 0x00000f00 && - (cpu_id & 0x0fff0000) >= 0x00040000) { - uint64_t msr; - - msr = rdmsr(0xc0010055); - if (msr & 0x18000000) - wrmsr(0xc0010055, msr & ~0x18000000ULL); - } - } - intr_restore(eflags); } ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#11 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.701 2009/05/18 18:37:18 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.702 2009/06/09 04:17:36 ariff Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -600,7 +600,70 @@ __asm __volatile("sti; hlt"); } +static int cpu_ident_amdc1e = 0; + +static int +cpu_probe_amdc1e(void) +{ + int i; + + /* + * Forget it, if we're not using local APIC timer. + */ + if (resource_disabled("apic", 0) || + (resource_int_value("apic", 0, "clock", &i) == 0 && i == 0)) + return (0); + + /* + * Detect the presence of C1E capability mostly on latest + * dual-cores (or future) k8 family. + */ + if (cpu_vendor_id == CPU_VENDOR_AMD && + (cpu_id & 0x00000f00) == 0x00000f00 && + (cpu_id & 0x0fff0000) >= 0x00040000) { + cpu_ident_amdc1e = 1; + return (1); + } + + return (0); +} + +/* + * C1E renders the local APIC timer dead, so we disable it by + * reading the Interrupt Pending Message register and clearing + * both C1eOnCmpHalt (bit 28) and SmiOnCmpHalt (bit 27). + * + * Reference: + * "BIOS and Kernel Developer's Guide for AMD NPT Family 0Fh Processors" + * #32559 revision 3.00+ + */ +#define MSR_AMDK8_IPM 0xc0010055 +#define AMDK8_SMIONCMPHALT (1ULL << 27) +#define AMDK8_C1EONCMPHALT (1ULL << 28) +#define AMDK8_CMPHALT (AMDK8_SMIONCMPHALT | AMDK8_C1EONCMPHALT) + static void +cpu_idle_amdc1e(int busy) +{ + + disable_intr(); + if (sched_runnable()) + enable_intr(); + else { + uint64_t msr; + + msr = rdmsr(MSR_AMDK8_IPM); + if (msr & AMDK8_CMPHALT) + wrmsr(MSR_AMDK8_IPM, msr & ~AMDK8_CMPHALT); + + if (cpu_idle_hook) + cpu_idle_hook(); + else + __asm __volatile("sti; hlt"); + } +} + +static void cpu_idle_spin(int busy) { return; @@ -697,6 +760,7 @@ { cpu_idle_spin, "spin" }, { cpu_idle_mwait, "mwait" }, { cpu_idle_mwait_hlt, "mwait_hlt" }, + { cpu_idle_amdc1e, "amdc1e" }, { cpu_idle_hlt, "hlt" }, { cpu_idle_acpi, "acpi" }, { NULL, NULL } @@ -715,6 +779,9 @@ if (strstr(idle_tbl[i].id_name, "mwait") && (cpu_feature2 & CPUID2_MON) == 0) continue; + if (strcmp(idle_tbl[i].id_name, "amdc1e") == 0 && + cpu_ident_amdc1e == 0) + continue; p += sprintf(p, "%s, ", idle_tbl[i].id_name); } error = sysctl_handle_string(oidp, avail, 0, req); @@ -745,6 +812,9 @@ if (strstr(idle_tbl[i].id_name, "mwait") && (cpu_feature2 & CPUID2_MON) == 0) continue; + if (strcmp(idle_tbl[i].id_name, "amdc1e") == 0 && + cpu_ident_amdc1e == 0) + continue; if (strcmp(idle_tbl[i].id_name, buf)) continue; cpu_idle_fn = idle_tbl[i].id_fn; @@ -1593,6 +1663,9 @@ } #endif + if (cpu_probe_amdc1e()) + cpu_idle_fn = cpu_idle_amdc1e; + /* Location of kernel stack for locore */ return ((u_int64_t)thread0.td_pcb); } ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#15 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.658 2009/05/13 07:42:53 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.660 2009/06/08 18:23:43 ed Exp $"); /* * Manages physical address maps. ==== //depot/projects/vimage-commit2/src/sys/amd64/conf/NOTES#9 (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.90 2009/05/10 00:00:25 kuriyama Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.91 2009/06/08 20:07:16 jkim Exp $ # # @@ -237,12 +237,9 @@ # kernel environment variables to select initial debugging levels for the # Intel ACPICA code. (Note that the Intel code must also have USE_DEBUGGER # defined when it is built). -# -# ACPI_NO_SEMAPHORES makes the AcpiOs*Semaphore routines a no-op. device acpi options ACPI_DEBUG -#!options ACPI_NO_SEMAPHORES # The cpufreq(4) driver provides support for non-ACPI CPU frequency control device cpufreq ==== //depot/projects/vimage-commit2/src/sys/amd64/include/param.h#7 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.28 2009/05/18 19:33:59 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.29 2009/06/08 16:43:40 alc Exp $ */ /* @@ -137,15 +137,6 @@ #endif /* - * Ceiling on size of buffer cache (really only effects write queueing, - * the VM page cache is not effected), can be changed via - * the kern.maxbcache /boot/loader.conf variable. - */ -#ifndef VM_BCACHE_SIZE_MAX -#define VM_BCACHE_SIZE_MAX (1024 * 1024 * 1024) -#endif - -/* * Mach derived conversion macros */ #define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK)) ==== //depot/projects/vimage-commit2/src/sys/amd64/isa/clock.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.246 2009/05/03 17:47:21 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.247 2009/06/09 07:26:52 ariff Exp $"); /* * Routines to handle clock hardware. @@ -93,6 +93,9 @@ static int using_atrtc_timer; static int using_lapic_timer; +static u_int stat_ticks = 0; +static u_int prof_ticks = 0; + /* Values for timerX_state: */ #define RELEASED 0 #define RELEASE_PENDING 1 @@ -122,8 +125,6 @@ hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); else hardclock_cpu(TRAPF_USERMODE(frame)); - if (!using_atrtc_timer) - statclockintr(frame); return (FILTER_HANDLED); } @@ -131,8 +132,6 @@ statclockintr(struct trapframe *frame) { - if (profprocs != 0) - profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); statclock(TRAPF_USERMODE(frame)); return (FILTER_HANDLED); } @@ -166,6 +165,30 @@ ipi_all_but_self(IPI_HARDCLOCK); #endif hardclockintr(frame); + + if (!using_atrtc_timer) { + prof_ticks += profhz; + if (prof_ticks >= hz) { + prof_ticks -= hz; + if (profprocs != 0) { +#ifdef SMP + if (smp_started) + ipi_all_but_self(IPI_PROFCLOCK); +#endif + profclockintr(frame); + } + } + stat_ticks += stathz; + if (stat_ticks >= hz) { + stat_ticks -= hz; +#ifdef SMP + if (smp_started) + ipi_all_but_self(IPI_STATCLOCK); +#endif + statclockintr(frame); + } + } + return (FILTER_HANDLED); } @@ -500,7 +523,8 @@ INTR_TYPE_CLK, NULL); atrtc_enable_intr(); } else { - profhz = stathz = hz; + profhz = min(RTC_PROFRATE, hz); + stathz = min(RTC_NOPROFRATE, hz); } } @@ -511,7 +535,7 @@ cpu_startprofclock(void) { - if (using_lapic_timer) + if (using_lapic_timer || !using_atrtc_clock) return; atrtc_rate(RTCSA_PROF); psdiv = pscnt = psratio; @@ -521,7 +545,7 @@ cpu_stopprofclock(void) { - if (using_lapic_timer) + if (using_lapic_timer || !using_atrtc_clock) return; atrtc_rate(RTCSA_NOPROF); psdiv = pscnt = 1; ==== //depot/projects/vimage-commit2/src/sys/arm/arm/pmap.c#7 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.108 2009/05/07 05:42:13 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.109 2009/06/08 12:15:39 raj Exp $"); #include #include #include @@ -3124,7 +3124,19 @@ if (flush == FALSE && (pv->pv_pmap == curpm || pv->pv_pmap == pmap_kernel())) flush = TRUE; + PMAP_LOCK(pv->pv_pmap); + /* + * Cached contents were written-back in pmap_remove_write(), + * but we still have to invalidate the cache entry to make + * sure stale data are not retrieved when another page will be + * mapped under this virtual address. + */ + if (pmap_is_current(pv->pv_pmap)) { + cpu_dcache_inv_range(pv->pv_va, PAGE_SIZE); + cpu_l2cache_inv_range(pv->pv_va, PAGE_SIZE); + } + l2b = pmap_get_l2_bucket(pv->pv_pmap, pv->pv_va); KASSERT(l2b != NULL, ("No l2 bucket")); ptep = &l2b->l2b_kva[l2pte_index(pv->pv_va)]; ==== //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biosdisk.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.60 2009/06/01 14:20:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.61 2009/06/08 15:07:35 jhb Exp $"); /* * BIOS disk device handling. @@ -990,7 +990,8 @@ out: if (error) { - free(od->od_partitions); + if (od->od_nparts > 0) + free(od->od_partitions); od->od_flags &= ~BD_GPTOK; } return (error); @@ -1044,7 +1045,7 @@ delay(3000000); #endif #ifdef LOADER_GPT_SUPPORT - if (od->od_flags & BD_GPTOK) + if (od->od_flags & BD_GPTOK && od->od_nparts > 0) free(od->od_partitions); #endif free(od); ==== //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biospnp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.10 2005/12/19 09:00:11 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.11 2009/06/08 15:09:22 jhb Exp $"); /* * PnP BIOS enumerator. @@ -49,38 +49,38 @@ struct pnp_ICstructure { - u_int8_t pnp_signature[4] __packed; - u_int8_t pnp_version __packed; - u_int8_t pnp_length __packed; - u_int16_t pnp_BIOScontrol __packed; - u_int8_t pnp_checksum __packed; - u_int32_t pnp_eventflag __packed; - u_int16_t pnp_rmip __packed; - u_int16_t pnp_rmcs __packed; - u_int16_t pnp_pmip __packed; - u_int32_t pnp_pmcs __packed; - u_int8_t pnp_OEMdev[4] __packed; - u_int16_t pnp_rmds __packed; - u_int32_t pnp_pmds __packed; -}; + u_int8_t pnp_signature[4]; + u_int8_t pnp_version; + u_int8_t pnp_length; + u_int16_t pnp_BIOScontrol; + u_int8_t pnp_checksum; + u_int32_t pnp_eventflag; + u_int16_t pnp_rmip; + u_int16_t pnp_rmcs; + u_int16_t pnp_pmip; + u_int32_t pnp_pmcs; + u_int8_t pnp_OEMdev[4]; + u_int16_t pnp_rmds; + u_int32_t pnp_pmds; +} __packed; struct pnp_devNode { - u_int16_t dn_size __packed; - u_int8_t dn_handle __packed; - u_int8_t dn_id[4] __packed; - u_int8_t dn_type[3] __packed; - u_int16_t dn_attrib __packed; - u_int8_t dn_data[1] __packed; -}; + u_int16_t dn_size; + u_int8_t dn_handle; + u_int8_t dn_id[4]; + u_int8_t dn_type[3]; + u_int16_t dn_attrib; + u_int8_t dn_data[1]; +} __packed; struct pnp_isaConfiguration { - u_int8_t ic_revision __packed; - u_int8_t ic_nCSN __packed; - u_int16_t ic_rdport __packed; - u_int16_t ic_reserved __packed; -}; + u_int8_t ic_revision; + u_int8_t ic_nCSN; + u_int16_t ic_rdport; + u_int16_t ic_reserved; +} __packed; static struct pnp_ICstructure *pnp_Icheck = NULL; static u_int16_t pnp_NumNodes; ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#21 (text+ko) ==== @@ -39,11 +39,10 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 */ -#include "opt_route.h" #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.137 2009/03/26 17:14:22 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.138 2009/06/08 19:57:35 bz Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#18 (text+ko) ==== @@ -26,11 +26,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_route.h" #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.149 2009/05/27 15:23:12 avg Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.150 2009/06/08 19:57:35 bz Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.14 2009/05/29 18:46:57 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.15 2009/06/07 19:41:11 thompsa Exp $"); #include #include @@ -520,7 +520,7 @@ int i, j; struct ndis_softc *sc = device_get_softc(dev); struct usb_device *udev = sc->ndisusb_dev; - struct usb_pipe *p = NULL; + struct usb_endpoint *ep = NULL; struct usbd_interface_information *intf; struct usbd_pipe_information *pipe; struct usbd_urb_select_configuration *selconf; @@ -549,14 +549,14 @@ return usbd_usb2urb(ret); } - for (j = 0; (p = usb2_pipe_foreach(udev, p)); j++) { + for (j = 0; (ep = usb2_endpoint_foreach(udev, ep)); j++) { if (j >= intf->uii_numeps) { device_printf(dev, "endpoint %d and above are ignored", intf->uii_numeps); break; } - edesc = p->edesc; + edesc = ep->edesc; pipe = &intf->uii_pipes[j]; pipe->upi_handle = edesc; pipe->upi_epaddr = edesc->bEndpointAddress; ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#12 (text+ko) ==== @@ -27,9 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.23 2009/02/27 14:12:05 bz Exp $"); - -#include "opt_route.h" +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.24 2009/06/08 19:57:35 bz Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/conf/NOTES#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1543 2009/06/01 10:30:00 pjd Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1544 2009/06/08 04:39:48 svn Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2110,6 +2110,42 @@ hint.gusc.0.flags="0x13" # +# Following options are intended for debugging/testing purposes: +# +# SND_DEBUG Enable extra debugging code that includes +# sanity checking and possible increase of +# verbosity. +# +# SND_DIAGNOSTIC Simmilar in a spirit of INVARIANTS/DIAGNOSTIC, +# zero tolerance against inconsistencies. +# +# SND_FEEDER_MULTIFORMAT By default, only 16/32 bit feeders are compiled +# in. This options enable most feeder converters +# except for 8bit. WARNING: May bloat the kernel. +# +# SND_FEEDER_FULL_MULTIFORMAT Ditto, but includes 8bit feeders as well. +# +# SND_FEEDER_RATE_HP (feeder_rate) High precision 64bit arithmetic +# as much as possible (the default trying to +# avoid it). Possible slowdown. +# +# SND_PCM_64 (Only applicable for i386/32bit arch) +# Process 32bit samples through 64bit +# integer/arithmetic. Slight increase of dynamic +# range at a cost of possible slowdown. +# +# SND_OLDSTEREO Only 2 channels are allowed, effectively +# disabling multichannel processing. +# +options SND_DEBUG +options SND_DIAGNOSTIC +options SND_FEEDER_MULTIFORMAT +options SND_FEEDER_FULL_MULTIFORMAT +options SND_FEEDER_RATE_HP +options SND_PCM_64 +options SND_OLDSTEREO + +# # IEEE-488 hardware: # pcii: PCIIA cards (uPD7210 based isa cards) # tnt4882: National Instruments PCI-GPIB card. ==== //depot/projects/vimage-commit2/src/sys/conf/files#41 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1414 2009/06/05 19:22:47 luigi Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1415 2009/06/07 19:12:08 ariff Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -65,6 +65,21 @@ compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h p17v-alsa%diked.h" \ no-obj no-implicit-rule before-depend \ clean "p17v-alsa%diked.h" +feeder_eq_gen.h optional sound \ + dependency "$S/tools/feeder_eq_mkfilter.awk" \ + compile-with "${AWK} -f $S/tools/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > feeder_eq_gen.h" \ + no-obj no-implicit-rule before-depend \ + clean "feeder_eq_gen.h" +feeder_rate_gen.h optional sound \ + dependency "$S/tools/feeder_rate_mkfilter.awk" \ + compile-with "${AWK} -f $S/tools/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > feeder_rate_gen.h" \ + no-obj no-implicit-rule before-depend \ + clean "feeder_rate_gen.h" +snd_fxdiv_gen.h optional sound \ + dependency "$S/tools/snd_fxdiv_gen.awk" \ + compile-with "${AWK} -f $S/tools/snd_fxdiv_gen.awk -- > snd_fxdiv_gen.h" \ + no-obj no-implicit-rule before-depend \ + clean "snd_fxdiv_gen.h" miidevs.h optional miibus | mii \ dependency "$S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ @@ -1433,16 +1448,28 @@ dev/sound/pcm/ac97.c optional sound dev/sound/pcm/ac97_if.m optional sound dev/sound/pcm/ac97_patch.c optional sound -dev/sound/pcm/buffer.c optional sound +dev/sound/pcm/buffer.c optional sound \ + dependency "snd_fxdiv_gen.h" dev/sound/pcm/channel.c optional sound dev/sound/pcm/channel_if.m optional sound dev/sound/pcm/dsp.c optional sound -dev/sound/pcm/fake.c optional sound dev/sound/pcm/feeder.c optional sound -dev/sound/pcm/feeder_fmt.c optional sound +dev/sound/pcm/feeder_chain.c optional sound +dev/sound/pcm/feeder_eq.c optional sound \ + dependency "feeder_eq_gen.h" \ + dependency "snd_fxdiv_gen.h" dev/sound/pcm/feeder_if.m optional sound -dev/sound/pcm/feeder_rate.c optional sound -dev/sound/pcm/feeder_volume.c optional sound +dev/sound/pcm/feeder_format.c optional sound \ + dependency "snd_fxdiv_gen.h" +dev/sound/pcm/feeder_matrix.c optional sound \ + dependency "snd_fxdiv_gen.h" +dev/sound/pcm/feeder_mixer.c optional sound \ + dependency "snd_fxdiv_gen.h" +dev/sound/pcm/feeder_rate.c optional sound \ + dependency "feeder_rate_gen.h" \ + dependency "snd_fxdiv_gen.h" +dev/sound/pcm/feeder_volume.c optional sound \ + dependency "snd_fxdiv_gen.h" dev/sound/pcm/mixer.c optional sound dev/sound/pcm/mixer_if.m optional sound dev/sound/pcm/sndstat.c optional sound ==== //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#14 (text+ko) ==== @@ -1,7 +1,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<