Date: Thu, 30 Oct 2008 10:50:27 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 152203 for review Message-ID: <200810301050.m9UAoRxK008453@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=152203 Change 152203 by zec@zec_tpx32 on 2008/10/30 10:50:16 IFC @ 152201 Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#12 integrate .. //depot/projects/vimage/src/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91.c#7 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_mci.c#9 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_getcwd.c#5 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#17 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#14 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_util.c#5 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#35 integrate .. //depot/projects/vimage/src/sys/conf/files#41 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#14 integrate .. //depot/projects/vimage/src/sys/conf/options#34 integrate .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_cbq.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_hfsc.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_priq.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_red.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_rmclass.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#11 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_compat.h#7 integrate .. //depot/projects/vimage/src/sys/dev/adb/adb.h#1 branch .. //depot/projects/vimage/src/sys/dev/adb/adb_bus.c#1 branch .. //depot/projects/vimage/src/sys/dev/adb/adb_hb_if.m#1 branch .. //depot/projects/vimage/src/sys/dev/adb/adb_if.m#1 branch .. //depot/projects/vimage/src/sys/dev/adb/adb_kbd.c#1 branch .. //depot/projects/vimage/src/sys/dev/adb/adb_mouse.c#1 branch .. //depot/projects/vimage/src/sys/dev/adb/adbvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/ar/if_ar.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ath/ah_osdep.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/amrr/amrr.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/onoe/onoe.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/sample/sample.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#21 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athrate.h#5 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#11 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#17 integrate .. //depot/projects/vimage/src/sys/dev/ce/if_ce.c#7 integrate .. //depot/projects/vimage/src/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cfi/cfi_bus_lbc.c#1 branch .. //depot/projects/vimage/src/sys/dev/cfi/cfi_core.c#1 branch .. //depot/projects/vimage/src/sys/dev/cfi/cfi_dev.c#1 branch .. //depot/projects/vimage/src/sys/dev/cfi/cfi_reg.h#1 branch .. //depot/projects/vimage/src/sys/dev/cfi/cfi_var.h#1 branch .. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#8 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_fops.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_lock.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_dma.c#8 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_drv.h#4 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_amd.c#5 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_logging.c#5 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_mod.c#9 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_piv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_ppro.c#5 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_x86.c#5 integrate .. //depot/projects/vimage/src/sys/dev/iwn/if_iwn.c#5 integrate .. //depot/projects/vimage/src/sys/dev/lmc/if_lmc.c#7 integrate .. //depot/projects/vimage/src/sys/dev/mii/atphy.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#9 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcbrvar.h#5 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcsd.c#10 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcvar.h#8 integrate .. //depot/projects/vimage/src/sys/dev/mxge/eth_z8e.h#5 integrate .. //depot/projects/vimage/src/sys/dev/mxge/ethp_z8e.h#5 integrate .. //depot/projects/vimage/src/sys/dev/mxge/rss_eth_z8e.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mxge/rss_ethp_z8e.h#3 integrate .. //depot/projects/vimage/src/sys/dev/ofw/ofw_console.c#5 integrate .. //depot/projects/vimage/src/sys/dev/puc/pucdata.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#16 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2661.c#14 integrate .. //depot/projects/vimage/src/sys/dev/ray/if_ray.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ray/if_rayvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sdhci/sdhci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#22 integrate .. //depot/projects/vimage/src/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_zyd.c#12 integrate .. //depot/projects/vimage/src/sys/dev/usb/u3g.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/ucom.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/udbp.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/ufoma.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#33 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdi.c#6 integrate .. //depot/projects/vimage/src/sys/dev/wpi/if_wpi.c#8 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/console.c#4 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vfsops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_vnops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#20 integrate .. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vfsops.c#6 integrate .. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vnops.c#10 integrate .. //depot/projects/vimage/src/sys/fs/fifofs/fifo_vnops.c#9 integrate .. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_subr.c#2 integrate .. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_vfsops.c#6 integrate .. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_vnops.c#6 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_denode.c#6 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#16 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vnops.c#14 integrate .. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_subr.c#4 integrate .. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vfsops.c#8 integrate .. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vnops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_subr.c#6 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_node.c#5 integrate .. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/portalfs/portal_vfsops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/portalfs/portal_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs.c#5 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vncache.c#7 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_node.c#9 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_vfsops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_vnops.c#6 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#14 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vfsops.c#8 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vnops.c#9 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#13 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vnops.c#12 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_bsd.c#5 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.h#4 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_drive.c#8 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_init.c#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_raid5.c#2 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_rm.c#4 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_state.c#2 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_subr.c#4 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_volume.c#3 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_lookup.c#3 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#11 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vnops.c#7 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#4 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#6 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#4 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#7 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#24 integrate .. //depot/projects/vimage/src/sys/i386/i386/local_apic.c#12 integrate .. //depot/projects/vimage/src/sys/i386/i386/sys_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/i386/include/apicvar.h#6 integrate .. //depot/projects/vimage/src/sys/i386/include/smp.h#9 integrate .. //depot/projects/vimage/src/sys/i386/isa/pmtimer.c#3 integrate .. //depot/projects/vimage/src/sys/i386/xen/clock.c#3 integrate .. //depot/projects/vimage/src/sys/i386/xen/mp_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/i386/xen/xen_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/sscdisk.c#3 integrate .. //depot/projects/vimage/src/sys/kern/init_main.c#24 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#19 integrate .. //depot/projects/vimage/src/sys/kern/kern_event.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_jail.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_linker.c#20 integrate .. //depot/projects/vimage/src/sys/kern/kern_lockf.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_mtxpool.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_prot.c#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_resource.c#15 integrate .. //depot/projects/vimage/src/sys/kern/kern_thr.c#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_timeout.c#16 integrate .. //depot/projects/vimage/src/sys/kern/sched_ule.c#25 integrate .. //depot/projects/vimage/src/sys/kern/subr_acl_posix1e.c#3 integrate .. //depot/projects/vimage/src/sys/kern/subr_blist.c#3 integrate .. //depot/projects/vimage/src/sys/kern/subr_param.c#5 integrate .. //depot/projects/vimage/src/sys/kern/subr_sleepqueue.c#13 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#19 integrate .. //depot/projects/vimage/src/sys/kern/uipc_accf.c#4 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mqueue.c#11 integrate .. //depot/projects/vimage/src/sys/kern/uipc_shm.c#4 integrate .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#22 integrate .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#21 integrate .. //depot/projects/vimage/src/sys/kern/vfs_export.c#14 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#19 integrate .. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#17 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#15 integrate .. //depot/projects/vimage/src/sys/kern/vnode_if.src#8 integrate .. //depot/projects/vimage/src/sys/modules/mac_bsdextended/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/u3g/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net/bpf.c#28 integrate .. //depot/projects/vimage/src/sys/net/bsd_comp.c#3 integrate .. //depot/projects/vimage/src/sys/net/if.c#46 integrate .. //depot/projects/vimage/src/sys/net/if_arcsubr.c#2 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#30 integrate .. //depot/projects/vimage/src/sys/net/if_fddisubr.c#4 integrate .. //depot/projects/vimage/src/sys/net/if_iso88025subr.c#5 integrate .. //depot/projects/vimage/src/sys/net/if_ppp.c#11 integrate .. //depot/projects/vimage/src/sys/net/if_sl.c#3 integrate .. //depot/projects/vimage/src/sys/net/if_tap.c#11 integrate .. //depot/projects/vimage/src/sys/net/if_tun.c#10 integrate .. //depot/projects/vimage/src/sys/net/ppp_deflate.c#2 integrate .. //depot/projects/vimage/src/sys/net/rtsock.c#20 integrate .. //depot/projects/vimage/src/sys/net80211/_ieee80211.h#10 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#23 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_acl.c#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_adhoc.c#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto.c#7 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_ccmp.c#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_tkip.c#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_wep.c#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#16 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.h#12 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_hostap.c#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.c#12 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.h#9 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_input.c#12 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#14 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#14 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.h#9 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#14 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_power.c#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_power.h#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.c#11 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.h#11 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_regdomain.c#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.c#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_sta.c#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#16 integrate .. //depot/projects/vimage/src/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#7 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#6 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/netflow/netflow.c#6 integrate .. //depot/projects/vimage/src/sys/netgraph/netflow/ng_netflow.c#6 integrate .. //depot/projects/vimage/src/sys/netgraph/netgraph.h#15 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_UI.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_async.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_atmllc.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#41 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_bpf.c#5 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_bridge.c#7 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_cisco.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_device.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#18 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_etf.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ether.c#16 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_gif.c#11 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_gif_demux.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_hole.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#14 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ksocket.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_l2tp.c#7 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_lmi.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_mppc.c#5 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_nat.c#7 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_one2many.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_parse.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_pipe.c#10 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ppp.c#10 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_pptpgre.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_rfc1490.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_sample.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_split.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_sppp.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_tag.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_tcpmss.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_tee.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_tty.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_vjc.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_vlan.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.c#20 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#39 integrate .. //depot/projects/vimage/src/sys/netinet/ip_carp.c#15 integrate .. //depot/projects/vimage/src/sys/netinet/ip_dummynet.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#22 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#34 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#22 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.h#9 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#41 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#44 integrate .. //depot/projects/vimage/src/sys/netinet6/frag6.c#21 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#24 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#25 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#27 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_var.h#14 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#27 integrate .. //depot/projects/vimage/src/sys/netipsec/keysock.c#17 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_ah.c#19 integrate .. //depot/projects/vimage/src/sys/netipx/ipx_pcb.c#4 integrate .. //depot/projects/vimage/src/sys/netipx/spx_usrreq.c#4 integrate .. //depot/projects/vimage/src/sys/netnatm/natm.c#3 integrate .. //depot/projects/vimage/src/sys/netnatm/natm_pcb.c#3 integrate .. //depot/projects/vimage/src/sys/netncp/ncp_conn.c#5 integrate .. //depot/projects/vimage/src/sys/netncp/ncp_rq.c#3 integrate .. //depot/projects/vimage/src/sys/netncp/ncp_sock.c#6 integrate .. //depot/projects/vimage/src/sys/netncp/ncp_subr.c#2 integrate .. //depot/projects/vimage/src/sys/netsmb/smb_rq.c#3 integrate .. //depot/projects/vimage/src/sys/netsmb/smb_trantcp.c#5 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_dev.c#2 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_idmap.c#4 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_socket.c#3 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_vfsops.c#8 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/nfsclient/krpc_subr.c#4 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_lock.c#4 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_node.c#5 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_socket.c#13 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_subs.c#7 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#23 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#21 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_serv.c#11 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_srvcache.c#4 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsock.c#8 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_syscalls.c#11 integrate .. //depot/projects/vimage/src/sys/opencrypto/cryptodev.c#8 integrate .. //depot/projects/vimage/src/sys/opencrypto/cryptosoft.c#4 integrate .. //depot/projects/vimage/src/sys/opencrypto/deflate.c#2 integrate .. //depot/projects/vimage/src/sys/opencrypto/xform.c#3 integrate .. //depot/projects/vimage/src/sys/pc98/pc98/pc98_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/pc98/pc98/pc98_machdep.h#2 integrate .. //depot/projects/vimage/src/sys/pci/if_rl.c#10 integrate .. //depot/projects/vimage/src/sys/pci/if_rlreg.h#14 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/locore.S#4 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/locore.S#3 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/pmap.c#5 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#15 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/cpu.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/include/endian.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/profile.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/lbc.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/lbc.h#1 branch .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/ata_dbdma.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/ata_kauai.c#5 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/cuda.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/powermac/cudavar.h#1 branch .. //depot/projects/vimage/src/sys/powerpc/powermac/dbdma.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/dbdmavar.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/macgpio.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/powermac/macgpiovar.h#1 branch .. //depot/projects/vimage/src/sys/powerpc/powermac/macio.c#6 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/pmu.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/powermac/pmuvar.h#1 branch .. //depot/projects/vimage/src/sys/powerpc/powermac/viareg.h#1 branch .. //depot/projects/vimage/src/sys/rpc/rpcclnt.c#8 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_cred.c#1 branch .. //depot/projects/vimage/src/sys/security/mac/mac_framework.h#15 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_inet6.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_policy.h#15 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_process.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_syscalls.c#8 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_vfs.c#9 integrate .. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#12 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#14 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/ugidfw_internal.h#1 branch .. //depot/projects/vimage/src/sys/security/mac_bsdextended/ugidfw_system.c#1 branch .. //depot/projects/vimage/src/sys/security/mac_bsdextended/ugidfw_vnode.c#1 branch .. //depot/projects/vimage/src/sys/security/mac_lomac/mac_lomac.c#13 integrate .. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#14 integrate .. //depot/projects/vimage/src/sys/security/mac_partition/mac_partition.c#10 integrate .. //depot/projects/vimage/src/sys/security/mac_stub/mac_stub.c#14 integrate .. //depot/projects/vimage/src/sys/security/mac_test/mac_test.c#14 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/schizo.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/db_trace.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/stack_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/db_trace.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/stack_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sys/_types.h#3 integrate .. //depot/projects/vimage/src/sys/sys/cfictl.h#1 branch .. //depot/projects/vimage/src/sys/sys/cons.h#3 integrate .. //depot/projects/vimage/src/sys/sys/extattr.h#3 integrate .. //depot/projects/vimage/src/sys/sys/malloc.h#4 integrate .. //depot/projects/vimage/src/sys/sys/param.h#30 integrate .. //depot/projects/vimage/src/sys/sys/types.h#6 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#13 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_inode.c#7 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#12 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#11 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#15 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_dirhash.c#5 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_extattr.c#6 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vnops.c#12 integrate .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn.c#5 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#12 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.46 2008/08/23 12:35:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.48 2008/10/27 21:45:18 sobomax Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -401,7 +401,10 @@ lapic_timer_hz = hz * 2; else lapic_timer_hz = hz * 4; - stathz = lapic_timer_hz / (lapic_timer_hz / 128); + if (lapic_timer_hz < 128) + stathz = lapic_timer_hz; + else + stathz = lapic_timer_hz / (lapic_timer_hz / 128); profhz = lapic_timer_hz; lapic_timer_period = value / lapic_timer_hz; ==== //depot/projects/vimage/src/sys/arm/arm/undefined.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.15 2007/06/04 21:38:45 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.16 2008/10/23 15:53:51 des Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -106,7 +106,7 @@ KASSERT(handler != NULL, ("handler is NULL")); /* Used to be legal. */ /* XXX: M_TEMP??? */ - MALLOC(uh, struct undefined_handler *, sizeof(*uh), M_TEMP, M_WAITOK); + uh = malloc(sizeof(*uh), M_TEMP, M_WAITOK); uh->uh_handler = handler; install_coproc_handler_static(coproc, uh); return uh; @@ -125,7 +125,7 @@ struct undefined_handler *uh = cookie; LIST_REMOVE(uh, uh_link); - FREE(uh, M_TEMP); + free(uh, M_TEMP); } ==== //depot/projects/vimage/src/sys/arm/at91/at91.c#7 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.18 2008/09/05 22:27:10 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.20 2008/10/26 22:53:59 stas Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -168,6 +168,42 @@ generic_armv4_bs_c_2, NULL, NULL, + + /* read (single) stream */ + generic_bs_r_1, + generic_armv4_bs_r_2, + generic_bs_r_4, + NULL, + + /* read multiple stream */ + generic_bs_rm_1, + generic_armv4_bs_rm_2, + generic_bs_rm_4, + NULL, + + /* read region stream */ + generic_bs_rr_1, + generic_armv4_bs_rr_2, + generic_bs_rr_4, + NULL, + + /* write (single) stream */ + generic_bs_w_1, + generic_armv4_bs_w_2, + generic_bs_w_4, + NULL, + + /* write multiple stream */ + generic_bs_wm_1, + generic_armv4_bs_wm_2, + generic_bs_wm_4, + NULL, + + /* write region stream */ + NULL, + generic_armv4_bs_wr_2, + generic_bs_wr_4, + NULL, }; static int @@ -534,8 +570,10 @@ case SYS_RES_MEMORY: rle->res = rman_reserve_resource(&sc->sc_mem_rman, start, end, count, flags, child); - rman_set_bustag(rle->res, &at91_bs_tag); - rman_set_bushandle(rle->res, start); + if (rle->res != NULL) { + rman_set_bustag(rle->res, &at91_bs_tag); + rman_set_bushandle(rle->res, start); + } break; } if (rle->res) { ==== //depot/projects/vimage/src/sys/arm/at91/at91_mci.c#9 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.8 2008/10/07 17:23:16 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.9 2008/10/29 20:01:26 mav Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -642,6 +642,9 @@ case MMCBR_IVAR_VDD: *(int *)result = sc->host.ios.vdd; break; + case MMCBR_IVAR_MAX_DATA: + *(int *)result = 1; + break; } return (0); } @@ -682,6 +685,7 @@ case MMCBR_IVAR_HOST_OCR: case MMCBR_IVAR_F_MIN: case MMCBR_IVAR_F_MAX: + case MMCBR_IVAR_MAX_DATA: return (EINVAL); } return (0); ==== //depot/projects/vimage/src/sys/cam/scsi/scsi_target.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.75 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.76 2008/10/23 15:53:51 des Exp $"); #include <sys/param.h> @@ -183,7 +183,7 @@ make_dev(&targ_cdevsw, dev2unit(dev), UID_ROOT, GID_WHEEL, 0600, "targ%d", dev2unit(dev)); } - MALLOC(softc, struct targ_softc *, sizeof(*softc), M_TARG, + softc = malloc(sizeof(*softc), M_TARG, M_WAITOK | M_ZERO); dev->si_drv1 = softc; softc->state = TARG_STATE_OPENED; @@ -211,7 +211,7 @@ if ((softc->periph == NULL) || (softc->state & TARG_STATE_LUN_ENABLED) == 0) { destroy_dev(dev); - FREE(softc, M_TARG); + free(softc, M_TARG); return (0); } @@ -230,7 +230,7 @@ softc->periph = NULL; } destroy_dev(dev); - FREE(softc, M_TARG); + free(softc, M_TARG); } cam_periph_unlock(periph); cam_periph_release(periph); @@ -531,7 +531,7 @@ } while ((descr = TAILQ_FIRST(&softc->abort_queue)) != NULL) { TAILQ_REMOVE(&softc->abort_queue, descr, tqe); - FREE(descr, M_TARG); + free(descr, M_TARG); } softc->periph = NULL; @@ -966,7 +966,7 @@ int ccb_len; ccb_len = targccblen(type); - MALLOC(ccb, union ccb *, ccb_len, M_TARG, M_WAITOK); + ccb = malloc(ccb_len, M_TARG, M_WAITOK); CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("getccb %p\n", ccb)); xpt_setup_ccb(&ccb->ccb_h, softc->path, priority); @@ -981,13 +981,13 @@ { CAM_DEBUG_PRINT(CAM_DEBUG_PERIPH, ("targfreeccb descr %p and\n", ccb->ccb_h.targ_descr)); - FREE(ccb->ccb_h.targ_descr, M_TARG); + free(ccb->ccb_h.targ_descr, M_TARG); switch (ccb->ccb_h.func_code) { case XPT_ACCEPT_TARGET_IO: case XPT_IMMED_NOTIFY: CAM_DEBUG_PRINT(CAM_DEBUG_PERIPH, ("freeing ccb %p\n", ccb)); - FREE(ccb, M_TARG); + free(ccb, M_TARG); break; default: /* Send back CCB if we got it from the periph */ @@ -998,7 +998,7 @@ } else { CAM_DEBUG_PRINT(CAM_DEBUG_PERIPH, ("freeing ccb %p\n", ccb)); - FREE(ccb, M_TARG); + free(ccb, M_TARG); } break; } @@ -1009,7 +1009,7 @@ { struct targ_cmd_descr *descr; - MALLOC(descr, struct targ_cmd_descr *, sizeof(*descr), M_TARG, + descr = malloc(sizeof(*descr), M_TARG, M_WAITOK); descr->mapinfo.num_bufs_used = 0; return (descr); ==== //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.3 2008/03/28 22:16:05 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.4 2008/10/28 13:44:11 trasz Exp $"); #include <sys/param.h> #include <sys/priv.h> @@ -91,17 +91,17 @@ int secpolicy_vnode_access(struct ucred *cred, struct vnode *vp, uint64_t owner, - int mode) + accmode_t accmode) { - if ((mode & VREAD) && priv_check_cred(cred, PRIV_VFS_READ, 0) != 0) { + if ((accmode & VREAD) && priv_check_cred(cred, PRIV_VFS_READ, 0) != 0) { return (EACCES); } - if ((mode & VWRITE) && + if ((accmode & VWRITE) && priv_check_cred(cred, PRIV_VFS_WRITE, 0) != 0) { return (EACCES); } - if (mode & VEXEC) { + if (accmode & VEXEC) { if (vp->v_type == VDIR) { if (priv_check_cred(cred, PRIV_VFS_LOOKUP, 0) != 0) { return (EACCES); ==== //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/policy.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - $ $FreeBSD: src/sys/cddl/compat/opensolaris/sys/policy.h,v 1.2 2008/03/28 22:16:06 jb Exp $ + $ $FreeBSD: src/sys/cddl/compat/opensolaris/sys/policy.h,v 1.3 2008/10/28 13:44:11 trasz Exp $ */ #ifndef _OPENSOLARIS_SYS_POLICY_H_ @@ -46,7 +46,7 @@ int secpolicy_vnode_stky_modify(struct ucred *cred); int secpolicy_vnode_remove(struct ucred *cred); int secpolicy_vnode_access(struct ucred *cred, struct vnode *vp, - uint64_t owner, int mode); + uint64_t owner, accmode_t accmode); int secpolicy_vnode_setdac(struct ucred *cred, uid_t owner); int secpolicy_vnode_setattr(struct ucred *cred, struct vnode *vp, struct vattr *vap, const struct vattr *ovap, int flags, ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 (text+ko) ==== @@ -237,14 +237,14 @@ zfsctl_common_access(ap) struct vop_access_args /* { struct vnode *a_vp; - int a_mode; + accmode_t a_accmode; struct ucred *a_cred; struct thread *a_td; } */ *ap; { - int mode = ap->a_mode; + accmode_t accmode = ap->a_accmode; - if (mode & VWRITE) + if (accmode & VWRITE) return (EACCES); return (0); ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 (text+ko) ==== @@ -3194,13 +3194,13 @@ zfs_freebsd_access(ap) struct vop_access_args /* { struct vnode *a_vp; - int a_mode; + accmode_t a_accmode; struct ucred *a_cred; struct thread *a_td; } */ *ap; { - return (zfs_access(ap->a_vp, ap->a_mode, 0, ap->a_cred)); + return (zfs_access(ap->a_vp, ap->a_accmode, 0, ap->a_cred)); } static int ==== //depot/projects/vimage/src/sys/compat/linux/linux_getcwd.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.30 2008/08/28 15:23:18 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.31 2008/10/28 13:44:11 trasz Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -307,7 +307,7 @@ struct vnode *uvp = NULL; char *bp = NULL; int error; - int perms = VEXEC; + accmode_t accmode = VEXEC; if (rvp == NULL) { rvp = fdp->fd_rdir; @@ -352,10 +352,10 @@ * whether or not caller cares. */ if (flags & GETCWD_CHECK_ACCESS) { - error = VOP_ACCESS(lvp, perms, td->td_ucred, td); + error = VOP_ACCESS(lvp, accmode, td->td_ucred, td); if (error) goto out; - perms = VEXEC|VREAD; + accmode = VEXEC|VREAD; } /* ==== //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#17 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_compat.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.144 2008/10/02 15:37:58 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.145 2008/10/23 15:53:51 des Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -2673,7 +2673,7 @@ break; } if (he == NULL) { - MALLOC(he, struct handler_element *, sizeof(*he), + he = malloc(sizeof(*he), M_LINUX, M_WAITOK); he->func = h->func; } else @@ -2711,7 +2711,7 @@ if (he->func == h->func) { TAILQ_REMOVE(&handlers, he, list); sx_xunlock(&linux_ioctl_sx); - FREE(he, M_LINUX); + free(he, M_LINUX); return (0); } } ==== //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.77 2008/10/02 15:37:58 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.78 2008/10/23 15:53:51 des Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -120,7 +120,7 @@ } #endif - MALLOC(kosa, struct osockaddr *, alloclen, mtype, M_WAITOK); + kosa = malloc(alloclen, mtype, M_WAITOK); if ((error = copyin(osa, kosa, *osalen))) goto out; @@ -168,7 +168,7 @@ return (0); out: - FREE(kosa, mtype); + free(kosa, mtype); return (error); } @@ -458,7 +458,7 @@ bad: if (to) - FREE(to, M_SONAME); + free(to, M_SONAME); return (error); } ==== //depot/projects/vimage/src/sys/compat/linux/linux_util.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.35 2008/06/02 08:40:06 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.36 2008/10/23 15:53:51 des Exp $"); #include "opt_compat.h" @@ -165,7 +165,7 @@ char formated[256]; int current_size = 0, string_size = 1024; - MALLOC(string, char *, string_size, M_LINUX, M_WAITOK); + string = malloc(string_size, M_LINUX, M_WAITOK); string[0] = '\000'; last = ""; TAILQ_FOREACH(de, &devices, list) { @@ -181,10 +181,10 @@ if (strlen(formated) + current_size >= string_size) { string_size *= 2; - MALLOC(string, char *, string_size, + string = malloc(string_size, M_LINUX, M_WAITOK); bcopy(temp, string, current_size); - FREE(temp, M_LINUX); + free(temp, M_LINUX); } strcat(string, formated); current_size = strlen(string); @@ -197,7 +197,7 @@ void linux_free_get_char_devices(char *string) { - FREE(string, M_LINUX); + free(string, M_LINUX); } static int linux_major_starting = 200; @@ -210,7 +210,7 @@ if (d == NULL) return (EINVAL); - MALLOC(de, struct device_element *, sizeof(*de), + de = malloc(sizeof(*de), M_LINUX, M_WAITOK); if (d->linux_major < 0) { d->linux_major = linux_major_starting++; @@ -234,7 +234,7 @@ TAILQ_FOREACH(de, &devices, list) { if (bcmp(d, &de->entry, sizeof(*d)) == 0) { TAILQ_REMOVE(&devices, de, list); - FREE(de, M_LINUX); + free(de, M_LINUX); return (0); } } ==== //depot/projects/vimage/src/sys/conf/NOTES#35 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1510 2008/10/22 17:50:45 obrien Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1511 2008/10/24 07:16:13 n_hibma Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2419,7 +2419,7 @@ # # USB serial support device ucom -# USB support for 3G modem cards by Option, Huawei and Sierra +# USB support for 3G modem cards by Option, Novatel, Huawei and Sierra device u3g # USB support for Technologies ARK3116 based serial adapters device uark @@ -2486,6 +2486,7 @@ # debugging options for the USB subsystem # options USB_DEBUG +options U3G_DEBUG # options for ukbd: options UKBD_DFLT_KEYMAP # specify the built-in keymap ==== //depot/projects/vimage/src/sys/conf/files#41 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1339 2008/10/21 20:33:40 mav Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1342 2008/10/28 21:53:10 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -532,6 +532,8 @@ dev/cardbus/cardbus.c optional cardbus dev/cardbus/cardbus_cis.c optional cardbus dev/cardbus/cardbus_device.c optional cardbus +dev/cfi/cfi_core.c optional cfi +dev/cfi/cfi_dev.c optional cfi dev/ciss/ciss.c optional ciss dev/cm/smc90cx6.c optional cm dev/cmx/cmx.c optional cmx @@ -2176,6 +2178,7 @@ security/audit/audit_worker.c optional audit security/mac/mac_atalk.c optional mac netatalk security/mac/mac_audit.c optional mac audit +security/mac/mac_cred.c optional mac security/mac/mac_framework.c optional mac security/mac/mac_inet.c optional mac inet security/mac/mac_inet6.c optional mac inet6 @@ -2195,6 +2198,8 @@ security/mac/mac_vfs.c optional mac security/mac_biba/mac_biba.c optional mac_biba security/mac_bsdextended/mac_bsdextended.c optional mac_bsdextended +security/mac_bsdextended/ugidfw_system.c optional mac_bsdextended +security/mac_bsdextended/ugidfw_vnode.c optional mac_bsdextended security/mac_ifoff/mac_ifoff.c optional mac_ifoff security/mac_lomac/mac_lomac.c optional mac_lomac security/mac_mls/mac_mls.c optional mac_mls ==== //depot/projects/vimage/src/sys/conf/files.powerpc#14 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.82 2008/10/14 14:54:14 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.85 2008/10/26 19:37:38 nwhitehorn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -28,6 +28,12 @@ crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/bm/if_bm.c optional bm powermac +dev/adb/adb_bus.c optional adb +dev/adb/adb_kbd.c optional adb +dev/adb/adb_mouse.c optional adb +dev/adb/adb_hb_if.m optional adb +dev/adb/adb_if.m optional adb +dev/cfi/cfi_bus_lbc.c optional cfi dev/fb/fb.c optional sc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc @@ -99,6 +105,7 @@ powerpc/fpu/fpu_mul.c optional fpu_emu powerpc/fpu/fpu_sqrt.c optional fpu_emu >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810301050.m9UAoRxK008453>