From owner-p4-projects@FreeBSD.ORG Mon Jun 15 07:33:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B56B1065673; Mon, 15 Jun 2009 07:33:40 +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 DEC601065672 for ; Mon, 15 Jun 2009 07:33:39 +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 CAD668FC14 for ; Mon, 15 Jun 2009 07:33:39 +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 n5F7XdHX004448 for ; Mon, 15 Jun 2009 07:33:39 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5F7Xcp7004446 for perforce@freebsd.org; Mon, 15 Jun 2009 07:33:38 GMT (envelope-from zec@fer.hr) Date: Mon, 15 Jun 2009 07:33:38 GMT Message-Id: <200906150733.n5F7Xcp7004446@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 164403 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jun 2009 07:33:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=164403 Change 164403 by zec@zec_amdx4 on 2009/06/15 07:32:50 IFC @ 164395 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#17 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/common.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/db78xxx.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/discovery.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/db88f6xxx.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/kirkwood.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/mvreg.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/mvwin.h#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/db88f5xxx.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/orion.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/avila_ata.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cam/cam.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_futex.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stat.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#30 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#43 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#33 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-usb.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah_desc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_rate/sample/sample.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis_usb.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/miidevs#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_bus_subr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_bus_subr.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_if.m#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_iicbus.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_standard.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofwvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/openfirm.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/openfirmio.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sec/sec.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/feeder_rate.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/version.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/daemon/daemon_saver.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scterm-teken.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tsec/if_tsec.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tsec/if_tsec.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_cpu_mv.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci_atmelarm.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci_atmelarm.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/avr32dci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_ixp4xx.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_mbus.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_pci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg_atmelarm.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci_atmelarm.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci_pci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci_pci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/usb_controller.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci_atmelarm.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/uhid.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ukbd.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ums.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/udbp.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/ufm.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_aue.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_auereg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_axe.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_axereg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdce.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cue.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_kue.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_rue.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_ruereg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_udav.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_udavreg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/usb_ethernet.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/usb_ethernet.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/quirk/usb_quirk.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/quirk/usb_quirk.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/u3g.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uark.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubsa.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubser.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uchcom.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ucycom.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ufoma.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uftdi.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ugensa.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uipaq.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ulpt.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umct.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umodem.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umoscom.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uplcom.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/usb_serial.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/usb_serial.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uslcom.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvisor.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvscom.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/umass.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/urio.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/ustorage_fs.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_cdce.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_msc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_mtp.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_bus.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_busdma.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_busdma.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_controller.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_core.h#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_debug.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_debug.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_defs.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dynamic.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dynamic.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_endian.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_error.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_error.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_generic.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_generic.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_handle_request.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_handle_request.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_if.m#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_ioctl.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_lookup.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_lookup.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mbuf.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mbuf.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mfunc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_msctest.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_msctest.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_parse.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_parse.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_pci.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_process.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_process.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_revision.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_util.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_util.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#26 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbhid.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rum.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uath.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_upgt.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_ural.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_urtw.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/blkfront/blkfront.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/netfront/netfront.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_lookup.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clstate.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clvfsops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/geom/label/g_label.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/label/g_label.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/label/g_label_gpt.c#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/conf/GENERIC#17 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/cpufunc.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/in_cksum.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/pmap.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_shutdown.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_syscalls.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/kgssapi/krb5/krb5_mech.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/conf/ADM5120#5 integrate .. //depot/projects/vimage-commit2/src/sys/mips/idt/files.idt#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/malta/gt_pci.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/mainbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/if_ppp/Makefile#3 delete .. //depot/projects/vimage-commit2/src/sys/modules/if_sl/Makefile#2 delete .. //depot/projects/vimage-commit2/src/sys/modules/sound/sound/Makefile#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/flowtable.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/netisr.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/netisr.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/pfkeyv2.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#43 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#43 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_var.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#30 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#30 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_input.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_output.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#33 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/keydb.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvkrpc.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/nlm/nlm_advlock.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/pmap.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/jail.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/sys/kobj.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mbuf.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#44 integrate .. //depot/projects/vimage-commit2/src/sys/tools/sound/feeder_rate_mkfilter.awk#2 integrate .. //depot/projects/vimage-commit2/src/sys/vm/phys_pager.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_contig.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_object.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_object.h#3 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#16 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.660 2009/06/08 18:23:43 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.661 2009/06/14 19:51:43 alc Exp $"); /* * Manages physical address maps. @@ -3322,78 +3322,74 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object, vm_pindex_t pindex, vm_size_t size) { - vm_offset_t va; + pd_entry_t *pde; + vm_paddr_t pa, ptepa; vm_page_t p, pdpg; VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); KASSERT(object->type == OBJT_DEVICE, ("pmap_object_init_pt: non-device object")); - if (((addr & (NBPDR - 1)) == 0) && ((size & (NBPDR - 1)) == 0)) { - vm_page_t m[1]; - pd_entry_t ptepa, *pde; - - PMAP_LOCK(pmap); - pde = pmap_pde(pmap, addr); - if (pde != 0 && (*pde & PG_V) != 0) - goto out; - PMAP_UNLOCK(pmap); -retry: + if ((addr & (NBPDR - 1)) == 0 && (size & (NBPDR - 1)) == 0) { + if (!vm_object_populate(object, pindex, pindex + atop(size))) + return; p = vm_page_lookup(object, pindex); - if (p != NULL) { - if (vm_page_sleep_if_busy(p, FALSE, "init4p")) - goto retry; - } else { - p = vm_page_alloc(object, pindex, VM_ALLOC_NORMAL); - if (p == NULL) - return; - m[0] = p; + KASSERT(p->valid == VM_PAGE_BITS_ALL, + ("pmap_object_init_pt: invalid page %p", p)); - if (vm_pager_get_pages(object, m, 1, 0) != VM_PAGER_OK) { - vm_page_lock_queues(); - vm_page_free(p); - vm_page_unlock_queues(); - return; - } - - p = vm_page_lookup(object, pindex); - vm_page_wakeup(p); - } - + /* + * Abort the mapping if the first page is not physically + * aligned to a 2MB page boundary. + */ ptepa = VM_PAGE_TO_PHYS(p); if (ptepa & (NBPDR - 1)) return; - p->valid = VM_PAGE_BITS_ALL; + /* + * Skip the first page. Abort the mapping if the rest of + * the pages are not physically contiguous. + */ + p = TAILQ_NEXT(p, listq); + for (pa = ptepa + PAGE_SIZE; pa < ptepa + size; + pa += PAGE_SIZE) { + KASSERT(p->valid == VM_PAGE_BITS_ALL, + ("pmap_object_init_pt: invalid page %p", p)); + if (pa != VM_PAGE_TO_PHYS(p)) + return; + p = TAILQ_NEXT(p, listq); + } + /* Map using 2MB pages. */ PMAP_LOCK(pmap); - for (va = addr; va < addr + size; va += NBPDR) { - while ((pdpg = - pmap_allocpde(pmap, va, M_NOWAIT)) == NULL) { - PMAP_UNLOCK(pmap); - vm_page_busy(p); - VM_OBJECT_UNLOCK(object); - VM_WAIT; - VM_OBJECT_LOCK(object); - vm_page_wakeup(p); - PMAP_LOCK(pmap); + for (pa = ptepa; pa < ptepa + size; pa += NBPDR) { + pdpg = pmap_allocpde(pmap, addr, M_NOWAIT); + if (pdpg == NULL) { + /* + * The creation of mappings below is only an + * optimization. If a page directory page + * cannot be allocated without blocking, + * continue on to the next mapping rather than + * blocking. + */ + addr += NBPDR; + continue; } pde = (pd_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(pdpg)); - pde = &pde[pmap_pde_index(va)]; + pde = &pde[pmap_pde_index(addr)]; if ((*pde & PG_V) == 0) { - pde_store(pde, ptepa | PG_PS | PG_M | PG_A | + pde_store(pde, pa | PG_PS | PG_M | PG_A | PG_U | PG_RW | PG_V); - pmap->pm_stats.resident_count += - NBPDR / PAGE_SIZE; + pmap->pm_stats.resident_count += NBPDR / + PAGE_SIZE; + pmap_pde_mappings++; } else { + /* Continue on if the PDE is already valid. */ pdpg->wire_count--; KASSERT(pdpg->wire_count > 0, ("pmap_object_init_pt: missing reference " - "to page directory page, va: 0x%lx", va)); + "to page directory page, va: 0x%lx", addr)); } - ptepa += NBPDR; + addr += NBPDR; } - pmap_invalidate_all(pmap); -out: PMAP_UNLOCK(pmap); } } ==== //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#17 (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.528 2009/06/10 02:07:58 yongari Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.529 2009/06/14 18:01:35 ed Exp $ cpu HAMMER ident GENERIC @@ -66,6 +66,7 @@ options SYSVMSG # SYSV-style message queues options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions +options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) ==== //depot/projects/vimage-commit2/src/sys/arm/mv/common.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.6 2009/04/16 11:20:18 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.7 2009/06/12 20:00:38 marcel Exp $"); #include #include @@ -39,6 +39,7 @@ #include #include +#include static int win_eth_can_remap(int i); ==== //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/db78xxx.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/db78xxx.c,v 1.3 2009/01/08 18:31:43 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/db78xxx.c,v 1.4 2009/06/12 20:00:38 marcel Exp $"); #include #include @@ -47,6 +47,7 @@ #include #include +#include /* * Virtual address space layout: ==== //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/discovery.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/discovery.c,v 1.4 2009/01/08 18:31:43 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/discovery.c,v 1.5 2009/06/12 20:00:38 marcel Exp $"); #include #include @@ -40,6 +40,7 @@ #include #include +#include #define _MV_PCIE_MAX_PORT 8 ==== //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/db88f6xxx.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/kirkwood/db88f6xxx.c,v 1.3 2009/01/08 18:31:43 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/kirkwood/db88f6xxx.c,v 1.4 2009/06/12 20:00:38 marcel Exp $"); #include #include @@ -47,6 +47,7 @@ #include #include +#include /* * Virtual address space layout: ==== //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/kirkwood.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/kirkwood/kirkwood.c,v 1.4 2009/01/08 18:31:43 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/kirkwood/kirkwood.c,v 1.5 2009/06/12 20:00:38 marcel Exp $"); #include #include @@ -40,6 +40,7 @@ #include #include +#include struct obio_device obio_devices[] = { { "ic", MV_IC_BASE, MV_IC_SIZE, ==== //depot/projects/vimage-commit2/src/sys/arm/mv/mvreg.h#5 (text+ko) ==== @@ -28,126 +28,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.5 2009/04/16 11:20:18 raj Exp $ + * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.6 2009/06/12 20:00:38 marcel Exp $ */ #ifndef _MVREG_H_ #define _MVREG_H_ -#include - -/* - * Physical addresses of integrated SoC peripherals - */ -#define MV_PHYS_BASE 0xF1000000 -#define MV_SIZE 0x100000 - -/* - * Decode windows addresses (physical) - */ -#define MV_PCIE_IO_PHYS_BASE (MV_PHYS_BASE + MV_SIZE) -#define MV_PCIE_IO_BASE MV_PCIE_IO_PHYS_BASE -#define MV_PCIE_IO_SIZE (1024 * 1024) -#define MV_PCI_IO_PHYS_BASE (MV_PCIE_IO_PHYS_BASE + MV_PCIE_IO_SIZE) -#define MV_PCI_IO_BASE MV_PCI_IO_PHYS_BASE -#define MV_PCI_IO_SIZE (1024 * 1024) - -#define MV_PCIE_MEM_PHYS_BASE (MV_PCI_IO_PHYS_BASE + MV_PCI_IO_SIZE) -#define MV_PCIE_MEM_BASE MV_PCIE_MEM_PHYS_BASE -#define MV_PCIE_MEM_SIZE (64 * 1024 * 1024) -#define MV_PCI_MEM_PHYS_BASE (MV_PCIE_MEM_PHYS_BASE + MV_PCIE_MEM_SIZE) -#define MV_PCI_MEM_BASE MV_PCI_MEM_PHYS_BASE -#define MV_PCI_MEM_SIZE (64 * 1024 * 1024) - -/* XXX DEV_BOOT, CSx are board specific, should be defined per platform */ - -/* 512KB NOR FLASH */ -#define MV_DEV_BOOT_PHYS_BASE (MV_PCI_MEM_PHYS_BASE + MV_PCI_MEM_SIZE) -#define MV_DEV_BOOT_SIZE (512 * 1024) -/* CS0: 7-seg LED */ -#define MV_DEV_CS0_PHYS_BASE 0xFA000000 -#define MV_DEV_CS0_SIZE (1024 * 1024) /* XXX u-boot has 2MB */ -/* CS1: 32MB NOR FLASH */ -#define MV_DEV_CS1_PHYS_BASE (MV_DEV_CS0_PHYS_BASE + MV_DEV_CS0_SIZE) -#define MV_DEV_CS1_SIZE (32 * 1024 * 1024) -/* CS2: 32MB NAND FLASH */ -#define MV_DEV_CS2_PHYS_BASE (MV_DEV_CS1_PHYS_BASE + MV_DEV_CS1_SIZE) -#define MV_DEV_CS2_SIZE 1024 /* XXX u-boot has 1MB */ - -#define MV_CESA_SRAM_PHYS_BASE 0xFD000000 -#define MV_CESA_SRAM_BASE MV_CESA_SRAM_PHYS_BASE /* VA == PA mapping */ -#define MV_CESA_SRAM_SIZE (1024 * 1024) - -/* XXX this is probably not robust against wraparounds... */ -#if ((MV_CESA_SRAM_PHYS_BASE + MV_CESA_SRAM_SIZE) > 0xFFFEFFFF) -#error Devices memory layout overlaps reset vectors range! -#endif - -/* - * Integrated SoC peripherals addresses - */ -#define MV_BASE MV_PHYS_BASE /* VA == PA mapping */ -#define MV_DDR_CADR_BASE (MV_BASE + 0x1500) -#define MV_MPP_BASE (MV_BASE + 0x10000) -#define MV_GPIO_BASE (MV_BASE + 0x10100) -#define MV_GPIO_SIZE 0x20 -#define MV_RTC_BASE (MV_BASE + 0x10300) -#define MV_RTC_SIZE 0x08 -#define MV_TWSI_BASE (MV_BASE + 0x11000) -#define MV_TWSI_SIZE 0x20 -#define MV_UART0_BASE (MV_BASE + 0x12000) -#define MV_UART1_BASE (MV_BASE + 0x12100) -#define MV_UART_SIZE 0x20 -#define MV_MBUS_BRIDGE_BASE (MV_BASE + 0x20000) -#define MV_INTREGS_BASE (MV_MBUS_BRIDGE_BASE + 0x80) -#define MV_CPU_CONTROL_BASE (MV_MBUS_BRIDGE_BASE + 0x100) -#define MV_IC_BASE (MV_MBUS_BRIDGE_BASE + 0x200) -#define MV_IC_SIZE 0x3C -#define MV_TIMERS_BASE (MV_MBUS_BRIDGE_BASE + 0x300) -#define MV_TIMERS_SIZE 0x30 -#define MV_PCI_BASE (MV_BASE + 0x30000) -#define MV_PCI_SIZE 0x2000 -#if defined (SOC_MV_KIRKWOOD) -#define MV_CESA_BASE (MV_BASE + 0x30000) /* CESA,PCI don't coexist */ -#elif defined (SOC_MV_ORION) || defined(SOC_MV_DISCOVERY) -#define MV_CESA_BASE (MV_BASE + 0x90000) -#endif -#define MV_CESA_SIZE 0x10000 -#define MV_PCIE_BASE (MV_BASE + 0x40000) -#define MV_PCIE_SIZE 0x2000 - -#define MV_PCIE00_BASE (MV_PCIE_BASE + 0x00000) -#define MV_PCIE01_BASE (MV_PCIE_BASE + 0x04000) -#define MV_PCIE02_BASE (MV_PCIE_BASE + 0x08000) -#define MV_PCIE03_BASE (MV_PCIE_BASE + 0x0C000) -#define MV_PCIE10_BASE (MV_PCIE_BASE + 0x40000) -#define MV_PCIE11_BASE (MV_PCIE_BASE + 0x44000) -#define MV_PCIE12_BASE (MV_PCIE_BASE + 0x48000) -#define MV_PCIE13_BASE (MV_PCIE_BASE + 0x4C000) - -#define MV_USB0_BASE (MV_BASE + 0x50000) -#define MV_USB1_BASE (MV_USB0_BASE + 0x1000) -#define MV_USB2_BASE (MV_USB0_BASE + 0x2000) -#define MV_USB_SIZE 0x1000 -#define MV_USB_HOST_OFST 0x0100 /* EHCI HC regs start at this offset within USB range */ -#define MV_USB_AWR_BASE (MV_USB0_BASE + 0x320) -#define MV_IDMA_BASE (MV_BASE + 0x60000) -#define MV_IDMA_SIZE 0x1000 -#define MV_XOR_BASE (MV_BASE + 0x60000) -#define MV_XOR_SIZE 0x1000 -#define MV_ETH0_BASE (MV_BASE + 0x72000) -#define MV_ETH1_BASE (MV_BASE + 0x76000) -#define MV_ETH_SIZE 0x2000 -#if defined(SOC_MV_ORION) || defined(SOC_MV_KIRKWOOD) -#define MV_SATAHC_BASE (MV_BASE + 0x80000) -#define MV_SATAHC_SIZE 0x6000 -#elif defined(SOC_MV_DISCOVERY) -#define MV_SATAHC_BASE (MV_BASE + 0xA0000) -#define MV_SATAHC_SIZE 0x6000 -#endif - -#define MV_DEV_CS0_BASE MV_DEV_CS0_PHYS_BASE - /* * Interrupt sources */ @@ -478,135 +364,4 @@ #define MV_DEV_MV78100_Z0 0x6381 #define MV_DEV_MV78100 0x7810 -/* - * Decode windows definitions and macros - */ -#define MV_WIN_CPU_CTRL(n) (0x10 * (n) + (((n) < 8) ? 0x000 : 0x880)) -#define MV_WIN_CPU_BASE(n) (0x10 * (n) + (((n) < 8) ? 0x004 : 0x884)) -#define MV_WIN_CPU_REMAP_LO(n) (0x10 * (n) + (((n) < 8) ? 0x008 : 0x888)) -#define MV_WIN_CPU_REMAP_HI(n) (0x10 * (n) + (((n) < 8) ? 0x00C : 0x88C)) -#if defined(SOC_MV_DISCOVERY) -#define MV_WIN_CPU_MAX 14 -#else -#define MV_WIN_CPU_MAX 8 -#endif - -#define MV_WIN_DDR_BASE(n) (0x8 * (n) + 0x0) -#define MV_WIN_DDR_SIZE(n) (0x8 * (n) + 0x4) -#define MV_WIN_DDR_MAX 4 - -#define MV_WIN_CESA_CTRL(n) (0x8 * (n) + 0xa04) -#define MV_WIN_CESA_BASE(n) (0x8 * (n) + 0xa00) -#define MV_WIN_CESA_MAX 4 - -#define MV_WIN_USB_CTRL(n, m) (0x10 * (n) + (m) * 0x1000 + 0x0) -#define MV_WIN_USB_BASE(n, m) (0x10 * (n) + (m) * 0x1000 + 0x4) -#define MV_WIN_USB_MAX 4 - -#define MV_WIN_ETH_BASE(n) (0x8 * (n) + 0x200) -#define MV_WIN_ETH_SIZE(n) (0x8 * (n) + 0x204) -#define MV_WIN_ETH_REMAP(n) (0x4 * (n) + 0x280) -#define MV_WIN_ETH_MAX 6 - -#define MV_WIN_IDMA_BASE(n) (0x8 * (n) + 0xa00) -#define MV_WIN_IDMA_SIZE(n) (0x8 * (n) + 0xa04) -#define MV_WIN_IDMA_REMAP(n) (0x4 * (n) + 0xa60) -#define MV_WIN_IDMA_CAP(n) (0x4 * (n) + 0xa70) -#define MV_WIN_IDMA_MAX 8 -#define MV_IDMA_CHAN_MAX 4 - -#define MV_WIN_XOR_BASE(n, m) (0x4 * (n) + 0xa50 + (m) * 0x100) -#define MV_WIN_XOR_SIZE(n, m) (0x4 * (n) + 0xa70 + (m) * 0x100) -#define MV_WIN_XOR_REMAP(n, m) (0x4 * (n) + 0xa90 + (m) * 0x100) -#define MV_WIN_XOR_CTRL(n, m) (0x4 * (n) + 0xa40 + (m) * 0x100) -#define MV_WIN_XOR_OVERR(n, m) (0x4 * (n) + 0xaa0 + (m) * 0x100) -#define MV_WIN_XOR_MAX 8 -#define MV_XOR_CHAN_MAX 2 -#define MV_XOR_NON_REMAP 4 - -#define MV_WIN_PCIE_CTRL(n) (0x10 * (((n) < 5) ? (n) : \ - (n) + 1) + 0x1820) -#define MV_WIN_PCIE_BASE(n) (0x10 * (((n) < 5) ? (n) : \ - (n) + 1) + 0x1824) -#define MV_WIN_PCIE_REMAP(n) (0x10 * (((n) < 5) ? (n) : \ - (n) + 1) + 0x182C) -#define MV_WIN_PCIE_MAX 6 - -#define MV_PCIE_BAR(n) (0x04 * (n) + 0x1804) -#define MV_PCIE_BAR_MAX 3 - -#define MV_WIN_SATA_CTRL(n) (0x10 * (n) + 0x30) -#define MV_WIN_SATA_BASE(n) (0x10 * (n) + 0x34) -#define MV_WIN_SATA_MAX 4 - -#define WIN_REG_IDX_RD(pre,reg,off,base) \ - static __inline uint32_t \ - pre ## _ ## reg ## _read(int i) \ - { \ - return (bus_space_read_4(obio_tag, base, off(i))); \ - } - -#define WIN_REG_IDX_RD2(pre,reg,off,base) \ - static __inline uint32_t \ - pre ## _ ## reg ## _read(int i, int j) \ - { \ - return (bus_space_read_4(obio_tag, base, off(i, j))); \ - } \ - -#define WIN_REG_BASE_IDX_RD(pre,reg,off) \ - static __inline uint32_t \ - pre ## _ ## reg ## _read(uint32_t base, int i) \ - { \ - return (bus_space_read_4(obio_tag, base, off(i))); \ - } - -#define WIN_REG_IDX_WR(pre,reg,off,base) \ - static __inline void \ - pre ## _ ## reg ## _write(int i, uint32_t val) \ - { \ - bus_space_write_4(obio_tag, base, off(i), val); \ - } - -#define WIN_REG_IDX_WR2(pre,reg,off,base) \ - static __inline void \ - pre ## _ ## reg ## _write(int i, int j, uint32_t val) \ - { \ - bus_space_write_4(obio_tag, base, off(i, j), val); \ - } - -#define WIN_REG_BASE_IDX_WR(pre,reg,off) \ - static __inline void \ - pre ## _ ## reg ## _write(uint32_t base, int i, uint32_t val) \ - { \ - bus_space_write_4(obio_tag, base, off(i), val); \ - } - -#define WIN_REG_RD(pre,reg,off,base) \ - static __inline uint32_t \ - pre ## _ ## reg ## _read(void) \ - { \ - return (bus_space_read_4(obio_tag, base, off)); \ - } - -#define WIN_REG_BASE_RD(pre,reg,off) \ - static __inline uint32_t \ - pre ## _ ## reg ## _read(uint32_t base) \ - { \ - return (bus_space_read_4(obio_tag, base, off)); \ - } - -#define WIN_REG_WR(pre,reg,off,base) \ - static __inline void \ - pre ## _ ## reg ## _write(uint32_t val) \ - { \ - bus_space_write_4(obio_tag, base, off, val); \ - } - -#define WIN_REG_BASE_WR(pre,reg,off) \ - static __inline void \ - pre ## _ ## reg ## _write(uint32_t base, uint32_t val) \ - { \ - bus_space_write_4(obio_tag, base, off, val); \ - } - #endif /* _MVREG_H_ */ ==== //depot/projects/vimage-commit2/src/sys/arm/mv/orion/db88f5xxx.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/orion/db88f5xxx.c,v 1.4 2009/01/09 10:20:51 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/orion/db88f5xxx.c,v 1.5 2009/06/12 20:00:38 marcel Exp $"); #include #include @@ -41,12 +41,14 @@ #include #include +#include #include #include #include #include #include +#include /* * Virtual address space layout: ==== //depot/projects/vimage-commit2/src/sys/arm/mv/orion/orion.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/orion/orion.c,v 1.5 2009/01/09 10:20:51 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/orion/orion.c,v 1.6 2009/06/12 20:00:38 marcel Exp $"); #include #include @@ -40,6 +40,7 @@ #include #include +#include extern const struct obio_pci_irq_map pci_irq_map[]; ==== //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/avila_ata.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.6 2008/12/20 03:26:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.7 2009/06/12 00:07:09 imp Exp $"); /* * Compact Flash Support for the Avila Gateworks XScale boards. @@ -248,7 +248,7 @@ NULL, ata_avila_intr, sc, &sc->sc_ih); /* attach channel on this controller */ - device_add_child(dev, "ata", devclass_find_free_unit(ata_devclass, 0)); + device_add_child(dev, "ata", -1); bus_generic_attach(dev); return 0; ==== //depot/projects/vimage-commit2/src/sys/cam/cam.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.11 2007/05/23 13:27:37 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.12 2009/06/14 12:46:34 ed Exp $"); #include #ifdef _KERNEL @@ -37,6 +37,7 @@ #else /* _KERNEL */ #include #include +#include #endif /* _KERNEL */ #include ==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#5 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris.c,v 1.3 2009/05/29 21:27:12 jamie Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris.c,v 1.4 2009/06/13 15:39:12 jamie Exp $ * */ @@ -83,7 +83,7 @@ switch (type) { case MOD_LOAD: - utsname.nodename = prison0.pr_host; + utsname.nodename = prison0.pr_hostname; break; case MOD_UNLOAD: ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 (text+ko) ==== @@ -158,6 +158,7 @@ */ static int arc_min_prefetch_lifespan; +extern int zfs_prefetch_enable; static int arc_dead; /* @@ -3421,6 +3422,8 @@ void arc_init(void) { + int prefetch_tunable_set = 0; + mutex_init(&arc_reclaim_thr_lock, NULL, MUTEX_DEFAULT, NULL); cv_init(&arc_reclaim_thr_cv, NULL, CV_DEFAULT, NULL); mutex_init(&arc_lowmem_lock, NULL, MUTEX_DEFAULT, NULL); @@ -3549,6 +3552,23 @@ mutex_init(&zfs_write_limit_lock, NULL, MUTEX_DEFAULT, NULL); #ifdef _KERNEL + if (TUNABLE_INT_FETCH("vfs.zfs.prefetch_enable", &zfs_prefetch_enable)) + prefetch_tunable_set = 1; + +#ifdef __i386__ + if (prefetch_tunable_set == 0) { + printf("ZFS NOTICE: prefetch is disabled by default on i386" + " - add enable to tunable to change.\n" ); + zfs_prefetch_enable=0; + } +#else + if ((((uint64_t)physmem * PAGESIZE) < (1ULL << 32)) && + prefetch_tunable_set == 0) { + printf("ZFS NOTICE: system has less than 4GB and prefetch enable is not set" + "... disabling.\n"); + zfs_prefetch_enable=0; + } +#endif /* Warn about ZFS memory and address space requirements. */ if (((uint64_t)physmem * PAGESIZE) < (256 + 128 + 64) * (1 << 20)) { printf("ZFS WARNING: Recommended minimum RAM size is 512MB; " ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ * until we can get this working the way we want it to. */ -int zfs_prefetch_disable = 0; +int zfs_prefetch_enable = 1; /* max # of streams per zfetch */ uint32_t zfetch_max_streams = 8; @@ -49,9 +49,8 @@ uint64_t zfetch_array_rd_sz = 1024 * 1024; SYSCTL_DECL(_vfs_zfs); -TUNABLE_INT("vfs.zfs.prefetch_disable", &zfs_prefetch_disable); -SYSCTL_INT(_vfs_zfs, OID_AUTO, prefetch_disable, CTLFLAG_RDTUN, - &zfs_prefetch_disable, 0, "Disable prefetch"); +SYSCTL_INT(_vfs_zfs, OID_AUTO, prefetch_enable, CTLFLAG_RDTUN, + &zfs_prefetch_enable, 0, "Enable prefetch for systems with less than 4GB"); SYSCTL_NODE(_vfs_zfs, OID_AUTO, zfetch, CTLFLAG_RW, 0, "ZFS ZFETCH"); TUNABLE_INT("vfs.zfs.zfetch.max_streams", &zfetch_max_streams); SYSCTL_UINT(_vfs_zfs_zfetch, OID_AUTO, max_streams, CTLFLAG_RDTUN, @@ -599,7 +598,7 @@ unsigned int blkshft; uint64_t blksz; - if (zfs_prefetch_disable) + if (zfs_prefetch_enable == 0) return; /* files that aren't ln2 blocksz are only one block -- nothing to do */ ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#3 (text+ko) ==== @@ -179,9 +179,9 @@ spa_history_zone() { #ifdef _KERNEL - /* XXX: pr_host can be changed by default from within a jail! */ + /* XXX: pr_hostname can be changed by default from within a jail! */ if (jailed(curthread->td_ucred)) - return (curthread->td_ucred->cr_prison->pr_host); + return (curthread->td_ucred->cr_prison->pr_hostname); #endif return ("global"); } ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 (text+ko) ==== @@ -457,7 +457,7 @@ int dmu_write_pages(objset_t *os, uint64_t object, uint64_t offset, uint64_t size, struct page *pp, dmu_tx_t *tx); -extern int zfs_prefetch_disable; +extern int zfs_prefetch_enable; /* * Asynchronously try to read in the data. ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_futex.c#9 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.22 2009/05/07 16:14:31 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.23 2009/06/14 17:53:55 dchagin Exp $"); #if 0 __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $"); #endif >>> TRUNCATED FOR MAIL (1000 lines) <<<