Date: Sun, 26 Oct 2008 13:39:45 GMT From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 151949 for review Message-ID: <200810261339.m9QDdjdj064697@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=151949 Change 151949 by ed@ed_dull on 2008/10/26 13:39:20 IFC. Affected files ... .. //depot/projects/mpsafetty/Makefile.inc1#5 integrate .. //depot/projects/mpsafetty/etc/periodic/security/200.chkmounts#2 integrate .. //depot/projects/mpsafetty/lib/libc/sys/mmap.2#2 integrate .. //depot/projects/mpsafetty/lib/libfetch/http.c#2 integrate .. //depot/projects/mpsafetty/share/man/man4/snd_hda.4#6 integrate .. //depot/projects/mpsafetty/share/man/man9/Makefile#10 integrate .. //depot/projects/mpsafetty/share/man/man9/malloc.9#2 integrate .. //depot/projects/mpsafetty/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#9 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/mpsafetty/sys/conf/NOTES#14 integrate .. //depot/projects/mpsafetty/sys/conf/files#21 integrate .. //depot/projects/mpsafetty/sys/conf/files.powerpc#5 integrate .. //depot/projects/mpsafetty/sys/conf/options#12 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_rmclass.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_subr.c#5 integrate .. //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cfi/cfi_bus_lbc.c#1 branch .. //depot/projects/mpsafetty/sys/dev/cfi/cfi_core.c#1 branch .. //depot/projects/mpsafetty/sys/dev/cfi/cfi_dev.c#1 branch .. //depot/projects/mpsafetty/sys/dev/cfi/cfi_reg.h#1 branch .. //depot/projects/mpsafetty/sys/dev/cfi/cfi_var.h#1 branch .. //depot/projects/mpsafetty/sys/dev/drm/drm_drv.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_fops.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_lock.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_dma.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_ppro.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/mii/atphy.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/mxge/eth_z8e.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/mxge/ethp_z8e.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/mxge/rss_eth_z8e.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/mxge/rss_ethp_z8e.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ray/if_rayvar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/mpsafetty/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/usb/u3g.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ucom.c#10 integrate .. //depot/projects/mpsafetty/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ufoma.c#7 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/mpsafetty/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/hpfs/hpfs_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/hpfs/hpfs_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/portalfs/portal_vnops.c#6 integrate .. //depot/projects/mpsafetty/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/mpsafetty/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/conf/NOTES#7 integrate .. //depot/projects/mpsafetty/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/mpsafetty/sys/i386/include/smp.h#6 integrate .. //depot/projects/mpsafetty/sys/i386/xen/clock.c#5 integrate .. //depot/projects/mpsafetty/sys/i386/xen/mp_machdep.c#7 integrate .. //depot/projects/mpsafetty/sys/i386/xen/xen_machdep.c#11 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/sscdisk.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/kern_event.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_jail.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/kern_linker.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_mtxpool.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_proc.c#8 integrate .. //depot/projects/mpsafetty/sys/kern/kern_prot.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_resource.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/subr_blist.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/subr_witness.c#11 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_accf.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_export.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/mpsafetty/sys/modules/u3g/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/net/bpf.c#6 integrate .. //depot/projects/mpsafetty/sys/net/bsd_comp.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if.c#8 integrate .. //depot/projects/mpsafetty/sys/net/if_arcsubr.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_iso88025subr.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_ppp.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_sl.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_tap.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if_tun.c#5 integrate .. //depot/projects/mpsafetty/sys/net/ppp_deflate.c#2 integrate .. //depot/projects/mpsafetty/sys/net/rtsock.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_adhoc.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto_tkip.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_hostap.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ht.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ht.h#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_node.h#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_power.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_power.h#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_regdomain.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_sta.c#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/mpsafetty/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_UI.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_async.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_atmllc.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_bpf.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_device.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_etf.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_gif.c#4 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_gif_demux.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_hole.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_ipfw.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_lmi.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_mppc.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_one2many.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_pipe.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_rfc1490.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_sample.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_split.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_tag.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#10 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_vjc.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/igmp.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.c#11 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.c#11 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_pcb.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_src.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet6/raw_ip6.c#8 integrate .. //depot/projects/mpsafetty/sys/netipsec/keysock.c#5 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_ah.c#4 integrate .. //depot/projects/mpsafetty/sys/netipx/ipx_pcb.c#2 integrate .. //depot/projects/mpsafetty/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/mpsafetty/sys/netnatm/natm.c#2 integrate .. //depot/projects/mpsafetty/sys/netnatm/natm_pcb.c#2 integrate .. //depot/projects/mpsafetty/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/mpsafetty/sys/netncp/ncp_rq.c#2 integrate .. //depot/projects/mpsafetty/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/mpsafetty/sys/netncp/ncp_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/netsmb/smb_rq.c#2 integrate .. //depot/projects/mpsafetty/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/mpsafetty/sys/nfs4client/nfs4_dev.c#2 integrate .. //depot/projects/mpsafetty/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/mpsafetty/sys/nfs4client/nfs4_socket.c#3 integrate .. //depot/projects/mpsafetty/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/mpsafetty/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/nfsclient/krpc_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_serv.c#6 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/mpsafetty/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/mpsafetty/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/mpsafetty/sys/opencrypto/deflate.c#2 integrate .. //depot/projects/mpsafetty/sys/opencrypto/xform.c#2 integrate .. //depot/projects/mpsafetty/sys/pci/if_rl.c#2 integrate .. //depot/projects/mpsafetty/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/conf/MPC85XX#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/lbc.c#1 branch .. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/lbc.h#1 branch .. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/mpsafetty/sys/rpc/rpcclnt.c#4 integrate .. //depot/projects/mpsafetty/sys/security/mac_bsdextended/mac_bsdextended.c#7 integrate .. //depot/projects/mpsafetty/sys/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/mpsafetty/sys/sys/cfictl.h#1 branch .. //depot/projects/mpsafetty/sys/sys/malloc.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/param.h#16 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_inode.c#4 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_vfsops.c#9 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_dirhash.c#4 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/mpsafetty/sys/xen/evtchn/evtchn.c#5 integrate Differences ... ==== //depot/projects/mpsafetty/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.613 2008/10/23 16:06:49 des Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir ==== //depot/projects/mpsafetty/etc/periodic/security/200.chkmounts#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.5 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.6 2008/10/25 18:45:40 ed Exp $ # # Show changes in the way filesystems are mounted @@ -50,7 +50,7 @@ ignore="${ignore}|^amd:" esac [ -n "$ignore" ] && cmd="egrep -v ${ignore#|}" || cmd=cat - mount -p | ${cmd} | + mount -p | sort | ${cmd} | check_diff mount - "${host} changes in mounted filesystems:" rc=$?;; *) rc=0;; ==== //depot/projects/mpsafetty/lib/libc/sys/mmap.2#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 -.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.56 2007/01/09 00:28:15 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.57 2008/10/24 14:40:13 alc Exp $ .\" -.Dd April 21, 2006 +.Dd October 24, 2008 .Dt MMAP 2 .Os .Sh NAME @@ -252,6 +252,11 @@ in which the file descriptor argument specifies a file or device to which swapping should be done. +.Sh NOTES +Although this implementation does not impose any alignment restrictions on +the +.Fa offset +argument, a portable program must only use page-aligned values. .Sh RETURN VALUES Upon successful completion, .Fn mmap @@ -307,13 +312,6 @@ was specified and the .Fa fd argument was not -1. -The -.Fa offset -argument -was not page-aligned. -(See -.Sx BUGS -below.) .It Bq Er ENODEV .Dv MAP_ANON has not been specified and ==== //depot/projects/mpsafetty/lib/libfetch/http.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.84 2008/02/08 09:48:48 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.85 2008/10/24 07:56:01 ru Exp $"); /* * The following copyright applies to the base64 code: @@ -1064,6 +1064,7 @@ if (url->offset == size && url->length == 0) { /* asked for 0 bytes; fake it */ offset = url->offset; + clength = -1; conn->err = HTTP_OK; break; } else { ==== //depot/projects/mpsafetty/share/man/man4/snd_hda.4#6 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.21 2008/10/03 09:19:07 mav Exp $ +.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.23 2008/10/24 18:57:11 mav Exp $ .\" -.Dd Sep 17, 2008 +.Dd October 24, 2008 .Dt SND_HDA 4 .Os .Sh NAME @@ -129,6 +129,8 @@ GPIO combination required for your system. ivrefX/ovrefX options controls voltage used to power external microphones and so on. +.It Va hint.hdac.%d.msi +Controls MSI (Message Signaled Interrupts) support. .It Va hint.hdac.%d.cad%d.nid%d.config Overrides codec pin configuration set by BIOS. May be specified as a 32bit HEX value with a leading "0x" or as a set of ==== //depot/projects/mpsafetty/share/man/man9/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.342 2008/09/28 20:15:45 ed Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.343 2008/10/23 15:53:51 des Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -745,9 +745,7 @@ MLINKS+=make_dev.9 destroy_dev.9 \ make_dev.9 dev_depends.9 \ make_dev.9 make_dev_alias.9 -MLINKS+=malloc.9 FREE.9 \ - malloc.9 free.9 \ - malloc.9 MALLOC.9 \ +MLINKS+=malloc.9 free.9 \ malloc.9 MALLOC_DECLARE.9 \ malloc.9 MALLOC_DEFINE.9 \ malloc.9 realloc.9 \ ==== //depot/projects/mpsafetty/share/man/man9/malloc.9#2 (text+ko) ==== @@ -34,16 +34,14 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $ -.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.43 2008/03/25 15:44:49 ru Exp $ +.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.44 2008/10/23 15:53:51 des Exp $ .\" -.Dd June 12, 2003 +.Dd October 23, 2008 .Dt MALLOC 9 .Os .Sh NAME .Nm malloc , -.Nm MALLOC , .Nm free , -.Nm FREE , .Nm realloc , .Nm reallocf , .Nm MALLOC_DEFINE , @@ -54,10 +52,8 @@ .In sys/malloc.h .Ft void * .Fn malloc "unsigned long size" "struct malloc_type *type" "int flags" -.Fn MALLOC space cast "unsigned long size" "struct malloc_type *type" "int flags" .Ft void .Fn free "void *addr" "struct malloc_type *type" -.Fn FREE "void *addr" "struct malloc_type *type" .Ft void * .Fn realloc "void *addr" "unsigned long size" "struct malloc_type *type" "int flags" .Ft void * @@ -123,20 +119,6 @@ except that it will free the passed pointer when the requested memory cannot be allocated. .Pp -The -.Fn MALLOC -macro variant is functionally equivalent to -.Bd -literal -offset indent -(space) = (cast)malloc((u_long)(size), type, flags) -.Ed -.Pp -and the -.Fn FREE -macro variant is equivalent to -.Bd -literal -offset indent -free((addr), type) -.Ed -.Pp Unlike its standard C library counterpart .Pq Xr malloc 3 , the kernel version takes two more arguments. @@ -219,7 +201,7 @@ /* sys/something/foo_subr.c */ \&... -MALLOC(buf, struct foo_buf *, sizeof *buf, M_FOOBUF, M_NOWAIT); +buf = malloc(sizeof *buf, M_FOOBUF, M_NOWAIT); .Ed .Pp ==== //depot/projects/mpsafetty/sys/arm/arm/undefined.c#2 (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/mpsafetty/sys/cam/scsi/scsi_target.c#4 (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/mpsafetty/sys/compat/linux/linux_ioctl.c#9 (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/mpsafetty/sys/compat/linux/linux_socket.c#5 (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/mpsafetty/sys/compat/linux/linux_util.c#2 (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/mpsafetty/sys/conf/NOTES#14 (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/mpsafetty/sys/conf/files#21 (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.1340 2008/10/25 06:18:12 marcel 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 ==== //depot/projects/mpsafetty/sys/conf/files.powerpc#5 (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.84 2008/10/25 06:18:12 marcel 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,7 @@ 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/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 +100,7 @@ powerpc/fpu/fpu_mul.c optional fpu_emu powerpc/fpu/fpu_sqrt.c optional fpu_emu powerpc/fpu/fpu_subr.c optional fpu_emu +powerpc/mpc85xx/lbc.c optional mpc85xx powerpc/mpc85xx/mpc85xx.c optional mpc85xx powerpc/mpc85xx/nexus.c optional mpc85xx powerpc/mpc85xx/ocpbus.c optional mpc85xx ==== //depot/projects/mpsafetty/sys/conf/options#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.642 2008/10/01 19:24:16 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.643 2008/10/24 07:16:13 n_hibma Exp $ # # On the handling of kernel options # @@ -618,6 +618,7 @@ # options for USB support USB_DEBUG opt_usb.h USBVERBOSE opt_usb.h +U3G_DEBUG opt_u3g.h UKBD_DFLT_KEYMAP opt_ukbd.h UPLCOM_INTR_INTERVAL opt_uplcom.h UVSCOM_DEFAULT_OPKTSIZE opt_uvscom.h ==== //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_cbq.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_cbq.c,v 1.5 2007/07/03 12:46:05 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_cbq.c,v 1.6 2008/10/23 15:53:51 des Exp $ */ /* $KAME: altq_cbq.c,v 1.19 2003/09/17 14:23:25 kjc Exp $ */ /* @@ -273,7 +273,7 @@ return (ENODEV); /* allocate and initialize cbq_state_t */ - MALLOC(cbqp, cbq_state_t *, sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); + cbqp = malloc(sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); if (cbqp == NULL) return (ENOMEM); bzero(cbqp, sizeof(cbq_state_t)); @@ -304,7 +304,7 @@ cbq_class_destroy(cbqp, cbqp->ifnp.root_); /* deallocate cbq_state_t */ - FREE(cbqp, M_DEVBUF); + free(cbqp, M_DEVBUF); return (0); } @@ -927,7 +927,7 @@ return (ENXIO); /* allocate and initialize cbq_state_t */ - MALLOC(new_cbqp, cbq_state_t *, sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); + new_cbqp = malloc(sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); if (new_cbqp == NULL) return (ENOMEM); bzero(new_cbqp, sizeof(cbq_state_t)); @@ -943,7 +943,7 @@ cbq_enqueue, cbq_dequeue, cbq_request, &new_cbqp->cbq_classifier, acc_classify); if (error) { - FREE(new_cbqp, M_DEVBUF); + free(new_cbqp, M_DEVBUF); return (error); } @@ -987,7 +987,7 @@ } /* deallocate cbq_state_t */ - FREE(cbqp, M_DEVBUF); + free(cbqp, M_DEVBUF); return (0); } ==== //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_cdnr.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_cdnr.c,v 1.3 2006/11/06 13:41:50 rwatson Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_cdnr.c,v 1.4 2008/10/23 15:53:51 des Exp $ */ /* $KAME: altq_cdnr.c,v 1.14 2003/09/05 22:40:36 itojun Exp $ */ /* @@ -274,7 +274,7 @@ return (NULL); } - MALLOC(cb, struct cdnr_block *, size, M_DEVBUF, M_WAITOK); + cb = malloc(size, M_DEVBUF, M_WAITOK); if (cb == NULL) return (NULL); bzero(cb, size); @@ -319,7 +319,7 @@ if (cb->cb_top != cblock) LIST_REMOVE(cb, cb_next); - FREE(cb, M_DEVBUF); + free(cb, M_DEVBUF); } /* ==== //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_hfsc.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_hfsc.c,v 1.4 2007/07/03 12:46:05 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_hfsc.c,v 1.6 2008/10/23 20:26:15 des Exp $ */ /* $KAME: altq_hfsc.c,v 1.24 2003/12/05 05:40:46 kjc Exp $ */ /* @@ -202,15 +202,14 @@ if (!ALTQ_IS_READY(&ifp->if_snd)) return (ENODEV); - MALLOC(hif, struct hfsc_if *, sizeof(struct hfsc_if), - M_DEVBUF, M_WAITOK); + hif = malloc(sizeof(struct hfsc_if), M_DEVBUF, M_WAITOK); if (hif == NULL) return (ENOMEM); bzero(hif, sizeof(struct hfsc_if)); hif->hif_eligible = ellist_alloc(); if (hif->hif_eligible == NULL) { - FREE(hif, M_DEVBUF); + free(hif, M_DEVBUF); return (ENOMEM); } @@ -236,7 +235,7 @@ ellist_destroy(hif->hif_eligible); - FREE(hif, M_DEVBUF); + free(hif, M_DEVBUF); return (0); } @@ -404,14 +403,12 @@ } #endif - MALLOC(cl, struct hfsc_class *, sizeof(struct hfsc_class), - M_DEVBUF, M_WAITOK); + cl = malloc(sizeof(struct hfsc_class), M_DEVBUF, M_WAITOK); if (cl == NULL) return (NULL); bzero(cl, sizeof(struct hfsc_class)); - MALLOC(cl->cl_q, class_queue_t *, sizeof(class_queue_t), - M_DEVBUF, M_WAITOK); + cl->cl_q = malloc(sizeof(class_queue_t), M_DEVBUF, M_WAITOK); if (cl->cl_q == NULL) goto err_ret; bzero(cl->cl_q, sizeof(class_queue_t)); @@ -471,8 +468,8 @@ #endif /* ALTQ_RED */ if (rsc != NULL && (rsc->m1 != 0 || rsc->m2 != 0)) { - MALLOC(cl->cl_rsc, struct internal_sc *, - sizeof(struct internal_sc), M_DEVBUF, M_WAITOK); + cl->cl_rsc = malloc(sizeof(struct internal_sc), + M_DEVBUF, M_WAITOK); if (cl->cl_rsc == NULL) goto err_ret; sc2isc(rsc, cl->cl_rsc); @@ -480,16 +477,16 @@ rtsc_init(&cl->cl_eligible, cl->cl_rsc, 0, 0); } if (fsc != NULL && (fsc->m1 != 0 || fsc->m2 != 0)) { - MALLOC(cl->cl_fsc, struct internal_sc *, - sizeof(struct internal_sc), M_DEVBUF, M_WAITOK); + cl->cl_fsc = malloc(sizeof(struct internal_sc), + M_DEVBUF, M_WAITOK); if (cl->cl_fsc == NULL) goto err_ret; sc2isc(fsc, cl->cl_fsc); rtsc_init(&cl->cl_virtual, cl->cl_fsc, 0, 0); } if (usc != NULL && (usc->m1 != 0 || usc->m2 != 0)) { - MALLOC(cl->cl_usc, struct internal_sc *, - sizeof(struct internal_sc), M_DEVBUF, M_WAITOK); + cl->cl_usc = malloc(sizeof(struct internal_sc), + M_DEVBUF, M_WAITOK); if (cl->cl_usc == NULL) goto err_ret; sc2isc(usc, cl->cl_usc); @@ -565,14 +562,14 @@ #endif } if (cl->cl_fsc != NULL) - FREE(cl->cl_fsc, M_DEVBUF); + free(cl->cl_fsc, M_DEVBUF); if (cl->cl_rsc != NULL) - FREE(cl->cl_rsc, M_DEVBUF); + free(cl->cl_rsc, M_DEVBUF); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810261339.m9QDdjdj064697>