svn commit: r194840 - in projects/mesh11s: . bin/chflags bin/chmod
bin/df bin/hostname bin/sh cddl/contrib/opensolaris
contrib/bind9 contrib/cpio contrib/csup contrib/ee
contrib/file contrib/gdb co...
Rui Paulo
rpaulo at FreeBSD.org
Wed Jun 24 15:24:53 UTC 2009
Author: rpaulo
Date: Wed Jun 24 15:24:51 2009
New Revision: 194840
URL: http://svn.freebsd.org/changeset/base/194840
Log:
MFC 194776:194837
Modified:
projects/mesh11s/ (props changed)
projects/mesh11s/bin/chflags/chflags.c
projects/mesh11s/bin/chmod/chmod.c
projects/mesh11s/bin/df/df.c
projects/mesh11s/bin/hostname/hostname.c
projects/mesh11s/bin/sh/eval.c
projects/mesh11s/cddl/contrib/opensolaris/ (props changed)
projects/mesh11s/contrib/bind9/ (props changed)
projects/mesh11s/contrib/cpio/ (props changed)
projects/mesh11s/contrib/csup/ (props changed)
projects/mesh11s/contrib/ee/ (props changed)
projects/mesh11s/contrib/file/ (props changed)
projects/mesh11s/contrib/gdb/ (props changed)
projects/mesh11s/contrib/gdtoa/ (props changed)
projects/mesh11s/contrib/less/ (props changed)
projects/mesh11s/contrib/libpcap/ (props changed)
projects/mesh11s/contrib/ncurses/ (props changed)
projects/mesh11s/contrib/netcat/ (props changed)
projects/mesh11s/contrib/ntp/ (props changed)
projects/mesh11s/contrib/openbsm/ (props changed)
projects/mesh11s/contrib/openpam/ (props changed)
projects/mesh11s/contrib/pf/ (props changed)
projects/mesh11s/contrib/sendmail/ (props changed)
projects/mesh11s/contrib/tcpdump/ (props changed)
projects/mesh11s/contrib/top/ (props changed)
projects/mesh11s/contrib/top/install-sh (props changed)
projects/mesh11s/contrib/wpa/ (props changed)
projects/mesh11s/crypto/openssh/ (props changed)
projects/mesh11s/crypto/openssl/ (props changed)
projects/mesh11s/include/stdio.h
projects/mesh11s/lib/libc/ (props changed)
projects/mesh11s/lib/libc/db/btree/bt_split.c
projects/mesh11s/lib/libc/db/mpool/mpool.c
projects/mesh11s/lib/libc/gen/fmtcheck.c
projects/mesh11s/lib/libc/stdio/asprintf.c (props changed)
projects/mesh11s/lib/libc/stdtime/ (props changed)
projects/mesh11s/lib/libc/stdtime/localtime.c
projects/mesh11s/lib/libc/string/ffsll.c (props changed)
projects/mesh11s/lib/libc/string/flsll.c (props changed)
projects/mesh11s/lib/libc/string/wcpcpy.c (props changed)
projects/mesh11s/lib/libc/string/wcpncpy.c (props changed)
projects/mesh11s/lib/libcompat/4.3/cfree.c
projects/mesh11s/lib/libcompat/4.3/regex.c
projects/mesh11s/lib/libcompat/4.4/cuserid.c
projects/mesh11s/lib/libusb/ (props changed)
projects/mesh11s/lib/libusb/libusb20.3 (props changed)
projects/mesh11s/lib/libusb/usb.h (props changed)
projects/mesh11s/lib/libutil/ (props changed)
projects/mesh11s/lib/libutil/humanize_number.c
projects/mesh11s/lib/libutil/kinfo_getvmmap.3
projects/mesh11s/sbin/ (props changed)
projects/mesh11s/sbin/ifconfig/af_atalk.c
projects/mesh11s/sbin/ifconfig/af_inet.c
projects/mesh11s/sbin/ifconfig/af_inet6.c
projects/mesh11s/sbin/ifconfig/ifclone.c
projects/mesh11s/sbin/ifconfig/ifconfig.c
projects/mesh11s/sbin/ifconfig/ifconfig.h
projects/mesh11s/sbin/ifconfig/ifgif.c
projects/mesh11s/sbin/ifconfig/ifgre.c
projects/mesh11s/sbin/ifconfig/ifmac.c
projects/mesh11s/sbin/ifconfig/ifmedia.c
projects/mesh11s/sbin/ifconfig/ifvlan.c
projects/mesh11s/sbin/ipfw/ (props changed)
projects/mesh11s/sbin/kldload/kldload.8
projects/mesh11s/share/man/man9/stack.9
projects/mesh11s/share/mk/bsd.sys.mk
projects/mesh11s/share/zoneinfo/ (props changed)
projects/mesh11s/sys/ (props changed)
projects/mesh11s/sys/amd64/amd64/machdep.c
projects/mesh11s/sys/amd64/amd64/mp_machdep.c
projects/mesh11s/sys/amd64/include/xen/ (props changed)
projects/mesh11s/sys/amd64/isa/clock.c
projects/mesh11s/sys/arm/arm/elf_machdep.c
projects/mesh11s/sys/arm/at91/at91_machdep.c
projects/mesh11s/sys/arm/mv/mv_machdep.c
projects/mesh11s/sys/arm/sa11x0/assabet_machdep.c
projects/mesh11s/sys/arm/xscale/i80321/ep80219_machdep.c
projects/mesh11s/sys/arm/xscale/i80321/iq31244_machdep.c
projects/mesh11s/sys/arm/xscale/i8134x/crb_machdep.c
projects/mesh11s/sys/arm/xscale/ixp425/avila_machdep.c
projects/mesh11s/sys/arm/xscale/pxa/pxa_machdep.c
projects/mesh11s/sys/cddl/contrib/opensolaris/ (props changed)
projects/mesh11s/sys/compat/freebsd32/syscalls.master
projects/mesh11s/sys/conf/kern.mk
projects/mesh11s/sys/contrib/dev/acpica/ (props changed)
projects/mesh11s/sys/contrib/ngatm/netnatm/sig/sig_uni.c
projects/mesh11s/sys/contrib/pf/ (props changed)
projects/mesh11s/sys/dev/ata/ (props changed)
projects/mesh11s/sys/dev/ata/ata-usb.c (props changed)
projects/mesh11s/sys/dev/bce/if_bce.c
projects/mesh11s/sys/dev/bce/if_bcereg.h
projects/mesh11s/sys/dev/cxgb/ (props changed)
projects/mesh11s/sys/dev/mxge/if_mxge.c
projects/mesh11s/sys/dev/sound/pcm/feeder_rate.c
projects/mesh11s/sys/dev/sound/usb/uaudio.c (props changed)
projects/mesh11s/sys/dev/sound/usb/uaudio.h (props changed)
projects/mesh11s/sys/dev/sound/usb/uaudio_pcm.c (props changed)
projects/mesh11s/sys/dev/sound/usb/uaudioreg.h (props changed)
projects/mesh11s/sys/dev/usb/controller/at91dci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/at91dci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/at91dci_atmelarm.c (props changed)
projects/mesh11s/sys/dev/usb/controller/atmegadci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/atmegadci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/atmegadci_atmelarm.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ehci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ehci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/ehci_ixp4xx.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ehci_mbus.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ehci_pci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/musb_otg.c (props changed)
projects/mesh11s/sys/dev/usb/controller/musb_otg.h (props changed)
projects/mesh11s/sys/dev/usb/controller/musb_otg_atmelarm.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ohci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ohci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/ohci_atmelarm.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ohci_pci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/uhci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/uhci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/uhci_pci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/usb_controller.c (props changed)
projects/mesh11s/sys/dev/usb/controller/uss820dci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/uss820dci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/uss820dci_atmelarm.c (props changed)
projects/mesh11s/sys/dev/usb/input/uhid.c (props changed)
projects/mesh11s/sys/dev/usb/input/ukbd.c (props changed)
projects/mesh11s/sys/dev/usb/input/ums.c (props changed)
projects/mesh11s/sys/dev/usb/input/usb_rdesc.h (props changed)
projects/mesh11s/sys/dev/usb/misc/udbp.c (props changed)
projects/mesh11s/sys/dev/usb/misc/udbp.h (props changed)
projects/mesh11s/sys/dev/usb/misc/ufm.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_aue.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_auereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_axe.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_axereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_cdce.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_cdcereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_cue.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_cuereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_kue.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_kuefw.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_kuereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_rue.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_ruereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_udav.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_udavreg.h (props changed)
projects/mesh11s/sys/dev/usb/net/usb_ethernet.c (props changed)
projects/mesh11s/sys/dev/usb/net/usb_ethernet.h (props changed)
projects/mesh11s/sys/dev/usb/quirk/usb_quirk.c (props changed)
projects/mesh11s/sys/dev/usb/quirk/usb_quirk.h (props changed)
projects/mesh11s/sys/dev/usb/serial/u3g.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uark.c (props changed)
projects/mesh11s/sys/dev/usb/serial/ubsa.c (props changed)
projects/mesh11s/sys/dev/usb/serial/ubser.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uchcom.c (props changed)
projects/mesh11s/sys/dev/usb/serial/ucycom.c (props changed)
projects/mesh11s/sys/dev/usb/serial/ufoma.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uftdi.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uftdi_reg.h (props changed)
projects/mesh11s/sys/dev/usb/serial/ugensa.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uipaq.c (props changed)
projects/mesh11s/sys/dev/usb/serial/ulpt.c (props changed)
projects/mesh11s/sys/dev/usb/serial/umct.c (props changed)
projects/mesh11s/sys/dev/usb/serial/umodem.c (props changed)
projects/mesh11s/sys/dev/usb/serial/umoscom.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uplcom.c (props changed)
projects/mesh11s/sys/dev/usb/serial/usb_serial.c (props changed)
projects/mesh11s/sys/dev/usb/serial/usb_serial.h (props changed)
projects/mesh11s/sys/dev/usb/serial/uslcom.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uvisor.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uvscom.c (props changed)
projects/mesh11s/sys/dev/usb/storage/rio500_usb.h (props changed)
projects/mesh11s/sys/dev/usb/storage/umass.c (props changed)
projects/mesh11s/sys/dev/usb/storage/urio.c (props changed)
projects/mesh11s/sys/dev/usb/storage/ustorage_fs.c (props changed)
projects/mesh11s/sys/dev/usb/template/usb_template.c (props changed)
projects/mesh11s/sys/dev/usb/template/usb_template.h (props changed)
projects/mesh11s/sys/dev/usb/template/usb_template_cdce.c (props changed)
projects/mesh11s/sys/dev/usb/template/usb_template_msc.c (props changed)
projects/mesh11s/sys/dev/usb/template/usb_template_mtp.c (props changed)
projects/mesh11s/sys/dev/usb/ufm_ioctl.h (props changed)
projects/mesh11s/sys/dev/usb/usb.h (props changed)
projects/mesh11s/sys/dev/usb/usb_bus.h (props changed)
projects/mesh11s/sys/dev/usb/usb_busdma.c (props changed)
projects/mesh11s/sys/dev/usb/usb_busdma.h (props changed)
projects/mesh11s/sys/dev/usb/usb_cdc.h (props changed)
projects/mesh11s/sys/dev/usb/usb_compat_linux.c (props changed)
projects/mesh11s/sys/dev/usb/usb_compat_linux.h (props changed)
projects/mesh11s/sys/dev/usb/usb_controller.h (props changed)
projects/mesh11s/sys/dev/usb/usb_core.c (props changed)
projects/mesh11s/sys/dev/usb/usb_core.h (props changed)
projects/mesh11s/sys/dev/usb/usb_debug.c (props changed)
projects/mesh11s/sys/dev/usb/usb_debug.h (props changed)
projects/mesh11s/sys/dev/usb/usb_dev.c (props changed)
projects/mesh11s/sys/dev/usb/usb_dev.h (props changed)
projects/mesh11s/sys/dev/usb/usb_device.c (props changed)
projects/mesh11s/sys/dev/usb/usb_device.h (props changed)
projects/mesh11s/sys/dev/usb/usb_dynamic.c (props changed)
projects/mesh11s/sys/dev/usb/usb_dynamic.h (props changed)
projects/mesh11s/sys/dev/usb/usb_endian.h (props changed)
projects/mesh11s/sys/dev/usb/usb_error.c (props changed)
projects/mesh11s/sys/dev/usb/usb_generic.c (props changed)
projects/mesh11s/sys/dev/usb/usb_generic.h (props changed)
projects/mesh11s/sys/dev/usb/usb_handle_request.c (props changed)
projects/mesh11s/sys/dev/usb/usb_hid.c (props changed)
projects/mesh11s/sys/dev/usb/usb_hub.c (props changed)
projects/mesh11s/sys/dev/usb/usb_hub.h (props changed)
projects/mesh11s/sys/dev/usb/usb_if.m (props changed)
projects/mesh11s/sys/dev/usb/usb_ioctl.h (props changed)
projects/mesh11s/sys/dev/usb/usb_lookup.c (props changed)
projects/mesh11s/sys/dev/usb/usb_mbuf.c (props changed)
projects/mesh11s/sys/dev/usb/usb_mbuf.h (props changed)
projects/mesh11s/sys/dev/usb/usb_msctest.c (props changed)
projects/mesh11s/sys/dev/usb/usb_msctest.h (props changed)
projects/mesh11s/sys/dev/usb/usb_parse.c (props changed)
projects/mesh11s/sys/dev/usb/usb_pci.h (props changed)
projects/mesh11s/sys/dev/usb/usb_process.c (props changed)
projects/mesh11s/sys/dev/usb/usb_process.h (props changed)
projects/mesh11s/sys/dev/usb/usb_request.c (props changed)
projects/mesh11s/sys/dev/usb/usb_request.h (props changed)
projects/mesh11s/sys/dev/usb/usb_transfer.c (props changed)
projects/mesh11s/sys/dev/usb/usb_transfer.h (props changed)
projects/mesh11s/sys/dev/usb/usb_util.c (props changed)
projects/mesh11s/sys/dev/usb/usb_util.h (props changed)
projects/mesh11s/sys/dev/usb/usbdevs (props changed)
projects/mesh11s/sys/dev/usb/usbhid.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_rum.c (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_rumfw.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_rumreg.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_rumvar.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_ural.c (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_uralreg.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_uralvar.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_zyd.c (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_zydfw.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_zydreg.h (props changed)
projects/mesh11s/sys/dev/xen/netfront/ (props changed)
projects/mesh11s/sys/dev/xen/xenpci/ (props changed)
projects/mesh11s/sys/geom/geom_redboot.c
projects/mesh11s/sys/i386/i386/elf_machdep.c
projects/mesh11s/sys/i386/i386/machdep.c
projects/mesh11s/sys/i386/i386/mp_machdep.c
projects/mesh11s/sys/i386/isa/clock.c
projects/mesh11s/sys/i386/xen/mp_machdep.c
projects/mesh11s/sys/ia64/ia64/elf_machdep.c
projects/mesh11s/sys/ia64/ia64/machdep.c
projects/mesh11s/sys/ia64/ia64/mp_machdep.c
projects/mesh11s/sys/kern/link_elf.c
projects/mesh11s/sys/kern/link_elf_obj.c
projects/mesh11s/sys/kern/makesyscalls.sh
projects/mesh11s/sys/kern/sched_ule.c
projects/mesh11s/sys/kern/subr_pcpu.c
projects/mesh11s/sys/kern/subr_stack.c
projects/mesh11s/sys/kern/syscalls.master
projects/mesh11s/sys/kern/sysv_msg.c
projects/mesh11s/sys/kern/sysv_sem.c
projects/mesh11s/sys/kern/sysv_shm.c
projects/mesh11s/sys/mips/mips/elf_machdep.c
projects/mesh11s/sys/mips/mips/mp_machdep.c
projects/mesh11s/sys/mips/mips/pmap.c
projects/mesh11s/sys/modules/dtrace/dtnfsclient/ (props changed)
projects/mesh11s/sys/modules/ip6_mroute_mod/ (props changed)
projects/mesh11s/sys/modules/ipmi/ipmi_linux/ (props changed)
projects/mesh11s/sys/net/if.c
projects/mesh11s/sys/net/if_ethersubr.c
projects/mesh11s/sys/net/if_fddisubr.c
projects/mesh11s/sys/net/if_spppsubr.c
projects/mesh11s/sys/net/if_stf.c
projects/mesh11s/sys/netatalk/aarp.c
projects/mesh11s/sys/netatalk/at_control.c
projects/mesh11s/sys/netatalk/at_extern.h
projects/mesh11s/sys/netatalk/at_rmx.c
projects/mesh11s/sys/netgraph/atm/uni/ng_uni.c
projects/mesh11s/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c (props changed)
projects/mesh11s/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h (props changed)
projects/mesh11s/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c (props changed)
projects/mesh11s/sys/netinet/if_ether.c
projects/mesh11s/sys/netinet/ip_input.c
projects/mesh11s/sys/netinet/ipfw/ip_dummynet.c (props changed)
projects/mesh11s/sys/netinet/ipfw/ip_fw2.c (props changed)
projects/mesh11s/sys/netinet/ipfw/ip_fw_nat.c (props changed)
projects/mesh11s/sys/netinet/ipfw/ip_fw_pfil.c (props changed)
projects/mesh11s/sys/netinet/tcp_usrreq.c
projects/mesh11s/sys/netinet6/icmp6.c
projects/mesh11s/sys/netinet6/in6_pcb.c
projects/mesh11s/sys/netinet6/in6_pcb.h
projects/mesh11s/sys/netinet6/in6_src.c
projects/mesh11s/sys/netinet6/ip6_var.h
projects/mesh11s/sys/netinet6/nd6_nbr.c
projects/mesh11s/sys/netinet6/raw_ip6.c
projects/mesh11s/sys/netinet6/udp6_usrreq.c
projects/mesh11s/sys/netipx/spx_reass.c (props changed)
projects/mesh11s/sys/pc98/pc98/machdep.c
projects/mesh11s/sys/powerpc/aim/mmu_oea.c
projects/mesh11s/sys/powerpc/aim/mmu_oea64.c
projects/mesh11s/sys/powerpc/booke/pmap.c
projects/mesh11s/sys/powerpc/powerpc/elf_machdep.c
projects/mesh11s/sys/powerpc/powerpc/mp_machdep.c
projects/mesh11s/sys/sparc64/include/pcpu.h
projects/mesh11s/sys/sparc64/sparc64/elf_machdep.c
projects/mesh11s/sys/sparc64/sparc64/machdep.c
projects/mesh11s/sys/sparc64/sparc64/mp_machdep.c
projects/mesh11s/sys/sparc64/sparc64/pmap.c
projects/mesh11s/sys/sun4v/include/pcpu.h
projects/mesh11s/sys/sun4v/sun4v/machdep.c
projects/mesh11s/sys/sun4v/sun4v/mp_machdep.c
projects/mesh11s/sys/sun4v/sun4v/pmap.c
projects/mesh11s/sys/sys/linker.h
projects/mesh11s/sys/sys/pcpu.h
projects/mesh11s/sys/sys/stack.h
projects/mesh11s/sys/sys/sysctl.h
projects/mesh11s/sys/vm/swap_pager.c
projects/mesh11s/sys/vm/vm_object.c
projects/mesh11s/sys/vm/vm_pageout.c
projects/mesh11s/sys/xen/evtchn.h (props changed)
projects/mesh11s/sys/xen/hypervisor.h (props changed)
projects/mesh11s/sys/xen/xen_intr.h (props changed)
projects/mesh11s/tools/regression/lib/msun/test-conj.t (props changed)
projects/mesh11s/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed)
projects/mesh11s/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed)
projects/mesh11s/tools/regression/usr.bin/pkill/pkill-_g.t (props changed)
projects/mesh11s/tools/tools/ath/common/dumpregs.h (props changed)
projects/mesh11s/tools/tools/ath/common/dumpregs_5210.c (props changed)
projects/mesh11s/tools/tools/ath/common/dumpregs_5211.c (props changed)
projects/mesh11s/tools/tools/ath/common/dumpregs_5212.c (props changed)
projects/mesh11s/tools/tools/ath/common/dumpregs_5416.c (props changed)
projects/mesh11s/tools/tools/termcap/termcap.pl (props changed)
projects/mesh11s/usr.bin/csup/ (props changed)
projects/mesh11s/usr.bin/hexdump/parse.c
projects/mesh11s/usr.bin/keylogout/keylogout.c
projects/mesh11s/usr.bin/make/arch.c
projects/mesh11s/usr.bin/makewhatis/makewhatis.c
projects/mesh11s/usr.bin/nfsstat/nfsstat.c
projects/mesh11s/usr.bin/procstat/ (props changed)
projects/mesh11s/usr.bin/usbhidctl/usbhid.c
projects/mesh11s/usr.sbin/dumpcis/cardinfo.h (props changed)
projects/mesh11s/usr.sbin/dumpcis/cis.h (props changed)
projects/mesh11s/usr.sbin/makefs/ffs/ffs_bswap.c (props changed)
projects/mesh11s/usr.sbin/makefs/ffs/ffs_subr.c (props changed)
projects/mesh11s/usr.sbin/makefs/ffs/ufs_bswap.h (props changed)
projects/mesh11s/usr.sbin/makefs/getid.c (props changed)
projects/mesh11s/usr.sbin/sysinstall/devices.c
projects/mesh11s/usr.sbin/sysinstall/ufs.c
projects/mesh11s/usr.sbin/zic/ (props changed)
Modified: projects/mesh11s/bin/chflags/chflags.c
==============================================================================
--- projects/mesh11s/bin/chflags/chflags.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/bin/chflags/chflags.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <unistd.h>
-void usage(void);
+static void usage(void);
int
main(int argc, char *argv[])
@@ -196,7 +196,7 @@ main(int argc, char *argv[])
exit(rval);
}
-void
+static void
usage(void)
{
(void)fprintf(stderr,
Modified: projects/mesh11s/bin/chmod/chmod.c
==============================================================================
--- projects/mesh11s/bin/chmod/chmod.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/bin/chmod/chmod.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <unistd.h>
-void usage(void);
+static void usage(void);
int
main(int argc, char *argv[])
@@ -212,7 +212,7 @@ done: argv += optind;
exit(rval);
}
-void
+static void
usage(void)
{
(void)fprintf(stderr,
Modified: projects/mesh11s/bin/df/df.c
==============================================================================
--- projects/mesh11s/bin/df/df.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/bin/df/df.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -476,7 +476,7 @@ prtstat(struct statfs *sfsp, struct maxw
(void)printf("\n");
}
-void
+static void
addstat(struct statfs *totalfsp, struct statfs *statfsp)
{
uint64_t bsize;
Modified: projects/mesh11s/bin/hostname/hostname.c
==============================================================================
--- projects/mesh11s/bin/hostname/hostname.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/bin/hostname/hostname.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <unistd.h>
-void usage(void);
+static void usage(void);
int
main(int argc, char *argv[])
@@ -96,7 +96,7 @@ main(int argc, char *argv[])
exit(0);
}
-void
+static void
usage(void)
{
Modified: projects/mesh11s/bin/sh/eval.c
==============================================================================
--- projects/mesh11s/bin/sh/eval.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/bin/sh/eval.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -642,17 +642,32 @@ evalcommand(union node *cmd, int flags,
/* Print the command if xflag is set. */
if (xflag) {
char sep = 0;
+ const char *p;
out2str(ps4val());
for (sp = varlist.list ; sp ; sp = sp->next) {
if (sep != 0)
outc(' ', &errout);
- out2str(sp->text);
+ p = sp->text;
+ while (*p != '=' && *p != '\0')
+ out2c(*p++);
+ if (*p != '\0') {
+ out2c(*p++);
+ out2qstr(p);
+ }
sep = ' ';
}
for (sp = arglist.list ; sp ; sp = sp->next) {
if (sep != 0)
outc(' ', &errout);
- out2str(sp->text);
+ /* Disambiguate command looking like assignment. */
+ if (sp == arglist.list &&
+ strchr(sp->text, '=') != NULL &&
+ strchr(sp->text, '\'') == NULL) {
+ out2c('\'');
+ out2str(sp->text);
+ out2c('\'');
+ } else
+ out2qstr(sp->text);
sep = ' ';
}
outc('\n', &errout);
Modified: projects/mesh11s/include/stdio.h
==============================================================================
--- projects/mesh11s/include/stdio.h Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/include/stdio.h Wed Jun 24 15:24:51 2009 (r194840)
@@ -394,7 +394,7 @@ int asprintf(char **, const char *, ...
char *ctermid_r(char *);
void fcloseall(void);
char *fgetln(FILE *, size_t *);
-__const char *fmtcheck(const char *, const char *) __format_arg(2);
+const char *fmtcheck(const char *, const char *) __format_arg(2);
int fpurge(FILE *);
void setbuffer(FILE *, char *, int);
int setlinebuf(FILE *);
Modified: projects/mesh11s/lib/libc/db/btree/bt_split.c
==============================================================================
--- projects/mesh11s/lib/libc/db/btree/bt_split.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/lib/libc/db/btree/bt_split.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -31,7 +31,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_split.c 8.9 (Berkeley) 7/26/94";
+static char sccsid[] = "@(#)bt_split.c 8.10 (Berkeley) 1/9/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -644,8 +644,8 @@ bt_psplit(BTREE *t, PAGE *h, PAGE *l, PA
* where we decide to try and copy too much onto the left page.
* Make sure that doesn't happen.
*/
- if ((skip <= off && used + nbytes + sizeof(indx_t) >= full)
- || nxt == top - 1) {
+ if ((skip <= off && used + nbytes + sizeof(indx_t) >= full) ||
+ nxt == top - 1) {
--off;
break;
}
Modified: projects/mesh11s/lib/libc/db/mpool/mpool.c
==============================================================================
--- projects/mesh11s/lib/libc/db/mpool/mpool.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/lib/libc/db/mpool/mpool.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -28,7 +28,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mpool.c 8.5 (Berkeley) 7/26/94";
+static char sccsid[] = "@(#)mpool.c 8.7 (Berkeley) 11/2/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
Modified: projects/mesh11s/lib/libc/gen/fmtcheck.c
==============================================================================
--- projects/mesh11s/lib/libc/gen/fmtcheck.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/lib/libc/gen/fmtcheck.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -1,3 +1,5 @@
+/* $NetBSD: fmtcheck.c,v 1.8 2008/04/28 20:22:59 martin Exp $ */
+
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -12,13 +14,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -33,7 +28,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/* $NetBSD: fmtcheck.c,v 1.2 2000/11/01 01:17:20 briggs Exp $ */
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -308,7 +302,7 @@ get_next_format(const char **pf, EFT eft
/*NOTREACHED*/
}
-__const char *
+const char *
__fmtcheck(const char *f1, const char *f2)
{
const char *f1p, *f2p;
Modified: projects/mesh11s/lib/libc/stdtime/localtime.c
==============================================================================
--- projects/mesh11s/lib/libc/stdtime/localtime.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/lib/libc/stdtime/localtime.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -1472,18 +1472,16 @@ struct tm * const tmp;
{
register struct tm * result;
+ _MUTEX_LOCK(&gmt_mutex);
if (!gmt_is_set) {
- _MUTEX_LOCK(&gmt_mutex);
- if (!gmt_is_set) {
#ifdef ALL_STATE
- gmtptr = (struct state *) malloc(sizeof *gmtptr);
- if (gmtptr != NULL)
+ gmtptr = (struct state *) malloc(sizeof *gmtptr);
+ if (gmtptr != NULL)
#endif /* defined ALL_STATE */
- gmtload(gmtptr);
- gmt_is_set = TRUE;
- }
- _MUTEX_UNLOCK(&gmt_mutex);
+ gmtload(gmtptr);
+ gmt_is_set = TRUE;
}
+ _MUTEX_UNLOCK(&gmt_mutex);
result = timesub(timep, offset, gmtptr, tmp);
#ifdef TM_ZONE
/*
Modified: projects/mesh11s/lib/libcompat/4.3/cfree.c
==============================================================================
--- projects/mesh11s/lib/libcompat/4.3/cfree.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/lib/libcompat/4.3/cfree.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -37,8 +37,7 @@ static char sccsid[] = "@(#)cfree.c 8.1
#include <stdlib.h>
void
-cfree(p)
- void *p;
+cfree(void *p)
{
free(p);
}
Modified: projects/mesh11s/lib/libcompat/4.3/regex.c
==============================================================================
--- projects/mesh11s/lib/libcompat/4.3/regex.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/lib/libcompat/4.3/regex.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -56,8 +56,7 @@ static int re_goterr;
static char *re_errstr;
char *
-re_comp(s)
- char *s;
+re_comp(char *s)
{
if (s == NULL || *s == '\0') {
if (re_regexp == NULL)
@@ -74,8 +73,7 @@ re_comp(s)
}
int
-re_exec(s)
- char *s;
+re_exec(char *s)
{
int rc;
@@ -85,8 +83,7 @@ re_exec(s)
}
void
-regerror(s)
- const char *s;
+regerror(const char *s)
{
re_goterr = 1;
if (re_errstr)
Modified: projects/mesh11s/lib/libcompat/4.4/cuserid.c
==============================================================================
--- projects/mesh11s/lib/libcompat/4.4/cuserid.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/lib/libcompat/4.4/cuserid.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -39,8 +39,7 @@ __FBSDID("$FreeBSD$");
#include <unistd.h>
char *
-cuserid(s)
- char *s;
+cuserid(char *s)
{
struct passwd *pwd;
Modified: projects/mesh11s/lib/libutil/humanize_number.c
==============================================================================
--- projects/mesh11s/lib/libutil/humanize_number.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/lib/libutil/humanize_number.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -1,4 +1,4 @@
-/* $NetBSD: humanize_number.c,v 1.13 2007/12/14 17:26:19 christos Exp $ */
+/* $NetBSD: humanize_number.c,v 1.14 2008/04/28 20:22:59 martin Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Modified: projects/mesh11s/lib/libutil/kinfo_getvmmap.3
==============================================================================
--- projects/mesh11s/lib/libutil/kinfo_getvmmap.3 Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/lib/libutil/kinfo_getvmmap.3 Wed Jun 24 15:24:51 2009 (r194840)
@@ -37,9 +37,9 @@
.In sys/types.h
.In libutil.h
.Ft struct kinfo_vmentry *
-.Fn kinfo_getfile "pid_t pid" "int *cntp"
+.Fn kinfo_getvmmap "pid_t pid" "int *cntp"
.Sh DESCRIPTION
-This function is used for obtaining the file descriptor information
+This function is used for obtaining virtual memory mapping information
of a particular process.
.Pp
The
Modified: projects/mesh11s/sbin/ifconfig/af_atalk.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/af_atalk.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sbin/ifconfig/af_atalk.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -173,7 +173,7 @@ static __constructor void
atalk_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(atalk_cmds); i++)
cmd_register(&atalk_cmds[i]);
Modified: projects/mesh11s/sbin/ifconfig/af_inet.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/af_inet.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sbin/ifconfig/af_inet.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -130,7 +130,7 @@ in_getaddr(const char *s, int which)
return;
if ((hp = gethostbyname(s)) != 0)
bcopy(hp->h_addr, (char *)&sin->sin_addr,
- MIN(hp->h_length, sizeof(sin->sin_addr)));
+ MIN((size_t)hp->h_length, sizeof(sin->sin_addr)));
else if ((np = getnetbyname(s)) != 0)
sin->sin_addr = inet_makeaddr(np->n_net, INADDR_ANY);
else
Modified: projects/mesh11s/sbin/ifconfig/af_inet6.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/af_inet6.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sbin/ifconfig/af_inet6.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -58,12 +58,8 @@ static const char rcsid[] =
static struct in6_ifreq in6_ridreq;
static struct in6_aliasreq in6_addreq =
- { { 0 },
- { 0 },
- { 0 },
- { 0 },
- 0,
- { 0, 0, ND6_INFINITE_LIFETIME, ND6_INFINITE_LIFETIME } };
+ { .ifra_flags = 0,
+ .ifra_lifetime = { 0, 0, ND6_INFINITE_LIFETIME, ND6_INFINITE_LIFETIME } };
static int ip6lifetime;
static void in6_fillscopeid(struct sockaddr_in6 *sin6);
@@ -522,13 +518,13 @@ in6_Lopt_cb(const char *optarg __unused)
{
ip6lifetime++; /* print IPv6 address lifetime */
}
-static struct option in6_Lopt = { "L", "[-L]", in6_Lopt_cb };
+static struct option in6_Lopt = { .opt = "L", .opt_usage = "[-L]", .cb = in6_Lopt_cb };
static __constructor void
inet6_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(inet6_cmds); i++)
cmd_register(&inet6_cmds[i]);
Modified: projects/mesh11s/sbin/ifconfig/ifclone.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifclone.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sbin/ifconfig/ifclone.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -179,13 +179,13 @@ clone_Copt_cb(const char *optarg __unuse
list_cloners();
exit(0);
}
-static struct option clone_Copt = { "C", "[-C]", clone_Copt_cb };
+static struct option clone_Copt = { .opt = "C", .opt_usage = "[-C]", .cb = clone_Copt_cb };
static __constructor void
clone_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(clone_cmds); i++)
cmd_register(&clone_cmds[i]);
Modified: projects/mesh11s/sbin/ifconfig/ifconfig.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifconfig.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sbin/ifconfig/ifconfig.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -1053,7 +1053,7 @@ static __constructor void
ifconfig_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(basic_cmds); i++)
cmd_register(&basic_cmds[i]);
Modified: projects/mesh11s/sbin/ifconfig/ifconfig.h
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifconfig.h Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sbin/ifconfig/ifconfig.h Wed Jun 24 15:24:51 2009 (r194840)
@@ -68,12 +68,12 @@ void callback_register(callback_func *,
#define DECL_CMD_FUNC2(name, arg1, arg2) \
void name(const char *arg1, const char *arg2, int s, const struct afswtch *afp)
-#define DEF_CMD(name, param, func) { name, param, { .c_func = func } }
-#define DEF_CMD_ARG(name, func) { name, NEXTARG, { .c_func = func } }
-#define DEF_CMD_OPTARG(name, func) { name, OPTARG, { .c_func = func } }
-#define DEF_CMD_ARG2(name, func) { name, NEXTARG2, { .c_func2 = func } }
-#define DEF_CLONE_CMD(name, param, func) { name, param, { .c_func = func }, 1 }
-#define DEF_CLONE_CMD_ARG(name, func) { name, NEXTARG, { .c_func = func }, 1 }
+#define DEF_CMD(name, param, func) { name, param, { .c_func = func }, 0, NULL }
+#define DEF_CMD_ARG(name, func) { name, NEXTARG, { .c_func = func }, 0, NULL }
+#define DEF_CMD_OPTARG(name, func) { name, OPTARG, { .c_func = func }, 0, NULL }
+#define DEF_CMD_ARG2(name, func) { name, NEXTARG2, { .c_func2 = func }, 0, NULL }
+#define DEF_CLONE_CMD(name, param, func) { name, param, { .c_func = func }, 1, NULL }
+#define DEF_CLONE_CMD_ARG(name, func) { name, NEXTARG, { .c_func = func }, 1, NULL }
struct ifaddrs;
struct addrinfo;
Modified: projects/mesh11s/sbin/ifconfig/ifgif.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifgif.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sbin/ifconfig/ifgif.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -66,7 +66,7 @@ gif_status(int s)
{
int opts;
int nopts = 0;
- int i;
+ size_t i;
ifr.ifr_data = (caddr_t)&opts;
if (ioctl(s, GIFGOPTS, &ifr) == -1)
@@ -123,7 +123,7 @@ static __constructor void
gif_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(gif_cmds); i++)
cmd_register(&gif_cmds[i]);
Modified: projects/mesh11s/sbin/ifconfig/ifgre.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifgre.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sbin/ifconfig/ifgre.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -89,7 +89,7 @@ static __constructor void
gre_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(gre_cmds); i++)
cmd_register(&gre_cmds[i]);
Modified: projects/mesh11s/sbin/ifconfig/ifmac.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifmac.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sbin/ifconfig/ifmac.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -112,7 +112,7 @@ static __constructor void
mac_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(mac_cmds); i++)
cmd_register(&mac_cmds[i]);
Modified: projects/mesh11s/sbin/ifconfig/ifmedia.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifmedia.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sbin/ifconfig/ifmedia.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -331,7 +331,7 @@ setmediainst(const char *val, int d, int
ifmr = ifmedia_getstate(s);
inst = atoi(val);
- if (inst < 0 || inst > IFM_INST_MAX)
+ if (inst < 0 || inst > (int)IFM_INST_MAX)
errx(1, "invalid media instance: %s", val);
strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
@@ -823,7 +823,7 @@ static __constructor void
ifmedia_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(media_cmds); i++)
cmd_register(&media_cmds[i]);
Modified: projects/mesh11s/sbin/ifconfig/ifvlan.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifvlan.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sbin/ifconfig/ifvlan.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -192,7 +192,7 @@ static __constructor void
vlan_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(vlan_cmds); i++)
cmd_register(&vlan_cmds[i]);
Modified: projects/mesh11s/sbin/kldload/kldload.8
==============================================================================
--- projects/mesh11s/sbin/kldload/kldload.8 Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sbin/kldload/kldload.8 Wed Jun 24 15:24:51 2009 (r194840)
@@ -67,6 +67,11 @@ Be more verbose.
.It Fl q
Silence any extraneous warnings.
.El
+.Sh NOTES
+.Pp
+The kernel security level settings may prevent a module from being
+loaded or unloaded by giving
+.Em "Operation not permitted" .
.Sh FILES
.Bl -tag -width /boot/kernel -compact
.It Pa /boot/kernel
@@ -107,6 +112,7 @@ Modules may also be auto-loaded through
.Xr kldload 2 ,
.Xr loader.conf 5 ,
.Xr rc.conf 5 ,
+.Xr security 7 ,
.Xr kldconfig 8 ,
.Xr kldstat 8 ,
.Xr kldunload 8
Modified: projects/mesh11s/share/man/man9/stack.9
==============================================================================
--- projects/mesh11s/share/man/man9/stack.9 Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/share/man/man9/stack.9 Wed Jun 24 15:24:51 2009 (r194840)
@@ -1,5 +1,5 @@
.\"
-.\" Copyright (c) 2007 Robert N. M. Watson
+.\" Copyright (c) 2007-2009 Robert N. M. Watson
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 27, 2007
+.Dd June 24, 2009
.Dt STACK 9
.Os
.Sh NAME
@@ -54,6 +54,10 @@ In the kernel configuration file:
.Ft void
.Fn stack_print_ddb "struct stack *st"
.Ft void
+.Fn stack_print_short "struct stack *st"
+.Ft void
+.Fn stack_print_short_ddb "struct stack *st"
+.Ft void
.Fn stack_sbuf_print "struct sbuf sb*" "struct stack *st"
.Ft void
.Fn stack_sbuf_print_ddb "struct sbuf sb*" "struct stack *st"
@@ -84,6 +88,8 @@ A trace of the current kernel thread's c
.Fn stack_save .
.Pp
.Fn stack_print
+and
+.Fn stack_print_short
may be used to print a stack trace using the kernel
.Xr printf 9 ,
and may sleep as a result of acquiring
@@ -91,7 +97,9 @@ and may sleep as a result of acquiring
locks in the kernel linker while looking up symbol names.
In locking-sensitive environments, the unsynchronized
.Fn stack_print_ddb
-variant may be invoked.
+and
+.Fn stack_print_short_ddb
+variants may be invoked.
This function bypasses kernel linker locking, making it usable in
.Xr ddb 4 ,
but not in a live system where linker data structures may change.
Modified: projects/mesh11s/share/mk/bsd.sys.mk
==============================================================================
--- projects/mesh11s/share/mk/bsd.sys.mk Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/share/mk/bsd.sys.mk Wed Jun 24 15:24:51 2009 (r194840)
@@ -45,7 +45,7 @@ CWARNFLAGS += -Wreturn-type -Wcast-qual
. endif
# BDECFLAGS
. if ${WARNS} >= 6
-CWARNFLAGS += -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls
+CWARNFLAGS += -Wchar-subscripts -Wnested-externs -Wredundant-decls
. endif
. if ${WARNS} >= 2 && ${WARNS} <= 4
# XXX Delete -Wuninitialized by default for now -- the compiler doesn't
Modified: projects/mesh11s/sys/amd64/amd64/machdep.c
==============================================================================
--- projects/mesh11s/sys/amd64/amd64/machdep.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/amd64/amd64/machdep.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -1501,6 +1501,8 @@ hammer_time(u_int64_t modulep, u_int64_t
wrmsr(MSR_KGSBASE, 0); /* User value while in the kernel */
pcpu_init(pc, 0, sizeof(struct pcpu));
+ dpcpu_init((void *)(physfree + KERNBASE), 0);
+ physfree += DPCPU_SIZE;
PCPU_SET(prvspace, pc);
PCPU_SET(curthread, &thread0);
PCPU_SET(curpcb, thread0.td_pcb);
Modified: projects/mesh11s/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- projects/mesh11s/sys/amd64/amd64/mp_machdep.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/amd64/amd64/mp_machdep.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -91,9 +91,10 @@ static int bootAP;
/* Free these after use */
void *bootstacks[MAXCPU];
-/* Temporary holder for double fault stack */
+/* Temporary variables for init_secondary() */
char *doublefault_stack;
char *nmi_stack;
+void *dpcpu;
/* Hotwire a 0->4MB V==P mapping */
extern pt_entry_t *KPTphys;
@@ -487,6 +488,7 @@ init_secondary(void)
/* prime data page for it to use */
pcpu_init(pc, cpu, sizeof(struct pcpu));
+ dpcpu_init(dpcpu, cpu);
pc->pc_apic_id = cpu_apic_ids[cpu];
pc->pc_prvspace = pc;
pc->pc_curthread = 0;
@@ -766,6 +768,7 @@ start_all_aps(void)
bootstacks[cpu] = (void *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE);
doublefault_stack = (char *)kmem_alloc(kernel_map, PAGE_SIZE);
nmi_stack = (char *)kmem_alloc(kernel_map, PAGE_SIZE);
+ dpcpu = (void *)kmem_alloc(kernel_map, DPCPU_SIZE);
bootSTK = (char *)bootstacks[cpu] + KSTACK_PAGES * PAGE_SIZE - 8;
bootAP = cpu;
Modified: projects/mesh11s/sys/amd64/isa/clock.c
==============================================================================
--- projects/mesh11s/sys/amd64/isa/clock.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/amd64/isa/clock.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -169,7 +169,7 @@ clkintr(struct trapframe *frame)
#endif
hardclockintr(frame);
} else {
- if (--pscnt == 0) {
+ if (--pscnt <= 0) {
pscnt = psratio;
#ifdef SMP
if (smp_started)
@@ -262,7 +262,7 @@ rtcintr(struct trapframe *frame)
while (rtcin(RTC_INTR) & RTCIR_PERIOD) {
flag = 1;
- if (--pscnt == 0) {
+ if (--pscnt <= 0) {
pscnt = psdiv;
#ifdef SMP
if (smp_started)
Modified: projects/mesh11s/sys/arm/arm/elf_machdep.c
==============================================================================
--- projects/mesh11s/sys/arm/arm/elf_machdep.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/arm/arm/elf_machdep.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -149,7 +149,7 @@ elf_reloc_internal(linker_file_t lf, Elf
if (local) {
if (rtype == R_ARM_RELATIVE) { /* A + B */
- addr = relocbase + addend;
+ addr = elf_relocaddr(lf, relocbase + addend);
if (*where != addr)
*where = addr;
}
Modified: projects/mesh11s/sys/arm/at91/at91_machdep.c
==============================================================================
--- projects/mesh11s/sys/arm/at91/at91_machdep.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/arm/at91/at91_machdep.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -215,6 +215,7 @@ void *
initarm(void *arg, void *arg2)
{
struct pv_addr kernel_l1pt;
+ struct pv_addr dpcpu;
int loop, i;
u_int l1pagetable;
vm_offset_t freemempos;
@@ -264,6 +265,10 @@ initarm(void *arg, void *arg2)
*/
valloc_pages(systempage, 1);
+ /* Allocate dynamic per-cpu area. */
+ valloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE);
+ dpcpu_init((void *)dpcpu.pv_va, 0);
+
/* Allocate stacks for all modes */
valloc_pages(irqstack, IRQ_STACK_SIZE);
valloc_pages(abtstack, ABT_STACK_SIZE);
Modified: projects/mesh11s/sys/arm/mv/mv_machdep.c
==============================================================================
--- projects/mesh11s/sys/arm/mv/mv_machdep.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/arm/mv/mv_machdep.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -358,6 +358,7 @@ void *
initarm(void *mdp, void *unused __unused)
{
struct pv_addr kernel_l1pt;
+ struct pv_addr dpcpu;
vm_offset_t freemempos, l2_start, lastaddr;
uint32_t memsize, l2size;
struct bi_mem_region *mr;
@@ -479,6 +480,10 @@ initarm(void *mdp, void *unused __unused
*/
valloc_pages(systempage, 1);
+ /* Allocate dynamic per-cpu area. */
+ valloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE);
+ dpcpu_init((void *)dpcpu.pv_va, 0);
+
/* Allocate stacks for all modes */
valloc_pages(irqstack, IRQ_STACK_SIZE);
valloc_pages(abtstack, ABT_STACK_SIZE);
Modified: projects/mesh11s/sys/arm/sa11x0/assabet_machdep.c
==============================================================================
--- projects/mesh11s/sys/arm/sa11x0/assabet_machdep.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/arm/sa11x0/assabet_machdep.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -209,6 +209,7 @@ initarm(void *arg, void *arg2)
struct pv_addr kernel_l1pt;
struct pv_addr md_addr;
struct pv_addr md_bla;
+ struct pv_addr dpcpu;
int loop;
u_int l1pagetable;
vm_offset_t freemempos;
@@ -268,6 +269,10 @@ initarm(void *arg, void *arg2)
*/
valloc_pages(systempage, 1);
+ /* Allocate dynamic per-cpu area. */
+ valloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE);
+ dpcpu_init((void *)dpcpu.pv_va, 0);
+
/* Allocate stacks for all modes */
valloc_pages(irqstack, IRQ_STACK_SIZE);
valloc_pages(abtstack, ABT_STACK_SIZE);
Modified: projects/mesh11s/sys/arm/xscale/i80321/ep80219_machdep.c
==============================================================================
--- projects/mesh11s/sys/arm/xscale/i80321/ep80219_machdep.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/arm/xscale/i80321/ep80219_machdep.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -186,6 +186,7 @@ void *
initarm(void *arg, void *arg2)
{
struct pv_addr kernel_l1pt;
+ struct pv_addr dpcpu;
int loop, i;
u_int l1pagetable;
vm_offset_t freemempos;
@@ -236,6 +237,10 @@ initarm(void *arg, void *arg2)
*/
valloc_pages(systempage, 1);
+ /* Allocate dynamic per-cpu area. */
+ valloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE);
+ dpcpu_init((void *)dpcpu.pv_va, 0);
+
/* Allocate stacks for all modes */
valloc_pages(irqstack, IRQ_STACK_SIZE);
valloc_pages(abtstack, ABT_STACK_SIZE);
Modified: projects/mesh11s/sys/arm/xscale/i80321/iq31244_machdep.c
==============================================================================
--- projects/mesh11s/sys/arm/xscale/i80321/iq31244_machdep.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/arm/xscale/i80321/iq31244_machdep.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -187,6 +187,7 @@ void *
initarm(void *arg, void *arg2)
{
struct pv_addr kernel_l1pt;
+ struct pv_addr dpcpu;
int loop, i;
u_int l1pagetable;
vm_offset_t freemempos;
@@ -236,6 +237,10 @@ initarm(void *arg, void *arg2)
*/
valloc_pages(systempage, 1);
+ /* Allocate dynamic per-cpu area. */
+ valloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE);
+ dpcpu_init((void *)dpcpu.pv_va, 0);
+
/* Allocate stacks for all modes */
valloc_pages(irqstack, IRQ_STACK_SIZE);
valloc_pages(abtstack, ABT_STACK_SIZE);
Modified: projects/mesh11s/sys/arm/xscale/i8134x/crb_machdep.c
==============================================================================
--- projects/mesh11s/sys/arm/xscale/i8134x/crb_machdep.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/arm/xscale/i8134x/crb_machdep.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -183,6 +183,7 @@ void *
initarm(void *arg, void *arg2)
{
struct pv_addr kernel_l1pt;
+ struct pv_addr dpcpu;
int loop, i;
u_int l1pagetable;
vm_offset_t freemempos;
@@ -232,6 +233,10 @@ initarm(void *arg, void *arg2)
*/
valloc_pages(systempage, 1);
+ /* Allocate dynamic per-cpu area. */
+ valloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE);
+ dpcpu_init((void *)dpcpu.pv_va, 0);
+
/* Allocate stacks for all modes */
valloc_pages(irqstack, IRQ_STACK_SIZE);
valloc_pages(abtstack, ABT_STACK_SIZE);
Modified: projects/mesh11s/sys/arm/xscale/ixp425/avila_machdep.c
==============================================================================
--- projects/mesh11s/sys/arm/xscale/ixp425/avila_machdep.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/arm/xscale/ixp425/avila_machdep.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -232,6 +232,7 @@ initarm(void *arg, void *arg2)
#define next_chunk2(a,b) (((a) + (b)) &~ ((b)-1))
#define next_page(a) next_chunk2(a,PAGE_SIZE)
struct pv_addr kernel_l1pt;
+ struct pv_addr dpcpu;
int loop, i;
u_int l1pagetable;
vm_offset_t freemempos;
@@ -303,6 +304,10 @@ initarm(void *arg, void *arg2)
*/
valloc_pages(systempage, 1);
+ /* Allocate dynamic per-cpu area. */
+ valloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE);
+ dpcpu_init((void *)dpcpu.pv_va, 0);
+
/* Allocate stacks for all modes */
valloc_pages(irqstack, IRQ_STACK_SIZE);
valloc_pages(abtstack, ABT_STACK_SIZE);
Modified: projects/mesh11s/sys/arm/xscale/pxa/pxa_machdep.c
==============================================================================
--- projects/mesh11s/sys/arm/xscale/pxa/pxa_machdep.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/arm/xscale/pxa/pxa_machdep.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -166,6 +166,7 @@ void *
initarm(void *arg, void *arg2)
{
struct pv_addr kernel_l1pt;
+ struct pv_addr dpcpu;
int loop;
u_int l1pagetable;
vm_offset_t freemempos;
@@ -218,6 +219,10 @@ initarm(void *arg, void *arg2)
*/
valloc_pages(systempage, 1);
+ /* Allocate dynamic per-cpu area. */
+ valloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE);
+ dpcpu_init((void *)dpcpu.pv_va, 0);
+
/* Allocate stacks for all modes */
valloc_pages(irqstack, IRQ_STACK_SIZE);
valloc_pages(abtstack, ABT_STACK_SIZE);
Modified: projects/mesh11s/sys/compat/freebsd32/syscalls.master
==============================================================================
--- projects/mesh11s/sys/compat/freebsd32/syscalls.master Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/compat/freebsd32/syscalls.master Wed Jun 24 15:24:51 2009 (r194840)
@@ -13,7 +13,7 @@
; case where the event exists, but we don't want auditing, the
; event should be #defined to AUE_NULL in audit_kevents.h.
; type one of STD, OBSOL, UNIMPL, COMPAT, COMPAT4, COMPAT6,
-; LIBCOMPAT, NODEF, NOARGS, NOPROTO, NOSTD
+; COMPAT7, LIBCOMPAT, NODEF, NOARGS, NOPROTO, NOSTD
; The COMPAT* options may be combined with one or more NO*
; options separated by '|' with no spaces (e.g. COMPAT|NOARGS)
; name psuedo-prototype of syscall routine
@@ -28,6 +28,7 @@
; COMPAT included on COMPAT #ifdef
; COMPAT4 included on COMPAT4 #ifdef (FreeBSD 4 compat)
; COMPAT6 included on COMPAT6 #ifdef (FreeBSD 6 compat)
+; COMPAT7 included on COMPAT7 #ifdef (FreeBSD 7 compat)
; LIBCOMPAT included on COMPAT #ifdef, and placed in syscall.h
; OBSOL obsolete, not included in system, only specifies name
; UNIMPL not implemented, placeholder only
Modified: projects/mesh11s/sys/conf/kern.mk
==============================================================================
--- projects/mesh11s/sys/conf/kern.mk Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/conf/kern.mk Wed Jun 24 15:24:51 2009 (r194840)
@@ -11,7 +11,7 @@
CWARNFLAGS=
.else
CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
+ -Wmissing-prototypes -Wpointer-arith -Wcast-qual \
${_wundef} ${_Wno_pointer_sign} -fformat-extensions
.if !defined(WITH_GCC3)
_Wno_pointer_sign=-Wno-pointer-sign
Modified: projects/mesh11s/sys/contrib/ngatm/netnatm/sig/sig_uni.c
==============================================================================
--- projects/mesh11s/sys/contrib/ngatm/netnatm/sig/sig_uni.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/contrib/ngatm/netnatm/sig/sig_uni.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -109,7 +109,7 @@ static const char *sig_names[] = {
};
static const char *verb_names[] = {
-# define UNI_DEBUG_DEFINE(D) [UNI_FAC_##D] #D,
+# define UNI_DEBUG_DEFINE(D) [UNI_FAC_##D] = #D,
UNI_DEBUG_FACILITIES
# undef UNI_DEBUG_DEFINE
};
Modified: projects/mesh11s/sys/dev/bce/if_bce.c
==============================================================================
--- projects/mesh11s/sys/dev/bce/if_bce.c Wed Jun 24 15:10:12 2009 (r194839)
+++ projects/mesh11s/sys/dev/bce/if_bce.c Wed Jun 24 15:24:51 2009 (r194840)
@@ -329,6 +329,8 @@ static void bce_breakpoint (struct bce
/****************************************************************************/
static u32 bce_reg_rd_ind (struct bce_softc *, u32);
static void bce_reg_wr_ind (struct bce_softc *, u32, u32);
+static void bce_shmem_wr (struct bce_softc *, u32, u32);
+static u32 bce_shmem_rd (struct bce_softc *, u32);
static void bce_ctx_wr (struct bce_softc *, u32, u32, u32);
static int bce_miibus_read_reg (device_t, int, int);
static int bce_miibus_write_reg (device_t, int, int, int);
@@ -574,6 +576,8 @@ bce_probe(device_t dev)
static void
bce_print_adapter_info(struct bce_softc *sc)
{
+ int i = 0;
+
DBENTER(BCE_VERBOSE_LOAD);
BCE_PRINTF("ASIC (0x%08X); ", sc->bce_chipid);
@@ -596,19 +600,33 @@ bce_print_adapter_info(struct bce_softc
}
/* Firmware version and device features. */
- printf("B/C (0x%08X); Flags( ", sc->bce_bc_ver);
+ printf("B/C (%s); Flags (", sc->bce_bc_ver);
+
#ifdef ZERO_COPY_SOCKETS
printf("SPLT ");
+ i++;
#endif
- if (sc->bce_flags & BCE_MFW_ENABLE_FLAG)
- printf("MFW ");
- if (sc->bce_flags & BCE_USING_MSI_FLAG)
- printf("MSI ");
- if (sc->bce_flags & BCE_USING_MSIX_FLAG)
- printf("MSI-X ");
- if (sc->bce_phy_flags & BCE_PHY_2_5G_CAPABLE_FLAG)
- printf("2.5G ");
- printf(")\n");
+ if (sc->bce_flags & BCE_USING_MSI_FLAG) {
+ if (i > 0) printf("|");
+ printf("MSI"); i++;
+ }
+
+ if (sc->bce_flags & BCE_USING_MSIX_FLAG) {
+ if (i > 0) printf("|");
+ printf("MSI-X "); i++;
+ }
+
+ if (sc->bce_phy_flags & BCE_PHY_2_5G_CAPABLE_FLAG) {
+ if (i > 0) printf("|");
+ printf("2.5G"); i++;
+ }
+
+ if (sc->bce_flags & BCE_MFW_ENABLE_FLAG) {
+ if (i > 0) printf("|");
+ printf("MFW); MFW (%s)\n", sc->bce_mfw_ver);
+ } else {
+ printf(")\n");
+ }
DBEXIT(BCE_VERBOSE_LOAD);
}
@@ -847,13 +865,50 @@ bce_attach(device_t dev)
__FUNCTION__, sc->bce_shmem_base);
/* Fetch the bootcode revision. */
- sc->bce_bc_ver = REG_RD_IND(sc, sc->bce_shmem_base +
- BCE_DEV_INFO_BC_REV);
+ val = bce_shmem_rd(sc, BCE_DEV_INFO_BC_REV);
+ for (int i = 0, j = 0; i < 3; i++) {
+ u8 num;
+
+ num = (u8) (val >> (24 - (i * 8)));
+ for (int k = 100, skip0 = 1; k >= 1; num %= k, k /= 10) {
+ if (num >= k || !skip0 || k == 1) {
+ sc->bce_bc_ver[j++] = (num / k) + '0';
+ skip0 = 0;
+ }
+ }
+ if (i != 2)
+ sc->bce_bc_ver[j++] = '.';
+ }
+
+ /* Check if any management firwmare is running. */
+ val = bce_shmem_rd(sc, BCE_PORT_FEATURE);
+ if (val & BCE_PORT_FEATURE_ASF_ENABLED) {
+ sc->bce_flags |= BCE_MFW_ENABLE_FLAG;
+
+ /* Allow time for firmware to enter the running state. */
+ for (int i = 0; i < 30; i++) {
+ val = bce_shmem_rd(sc, BCE_BC_STATE_CONDITION);
+ if (val & BCE_CONDITION_MFW_RUN_MASK)
+ break;
+ DELAY(10000);
+ }
+ }
- /* Check if any management firmware is running. */
- val = REG_RD_IND(sc, sc->bce_shmem_base + BCE_PORT_FEATURE);
- if (val & (BCE_PORT_FEATURE_ASF_ENABLED | BCE_PORT_FEATURE_IMD_ENABLED))
- sc->bce_flags |= BCE_MFW_ENABLE_FLAG;
+ /* Check the current bootcode state. */
+ val = bce_shmem_rd(sc, BCE_BC_STATE_CONDITION);
+ val &= BCE_CONDITION_MFW_RUN_MASK;
+ if (val != BCE_CONDITION_MFW_RUN_UNKNOWN &&
+ val != BCE_CONDITION_MFW_RUN_NONE) {
+ u32 addr = bce_shmem_rd(sc, BCE_MFW_VER_PTR);
+ int i = 0;
+
+ for (int j = 0; j < 3; j++) {
+ val = bce_reg_rd_ind(sc, addr + j * 4);
+ val = bswap32(val);
+ memcpy(&sc->bce_mfw_ver[i], &val, 4);
+ i += 4;
+ }
+ }
/* Get PCI bus information (speed and type). */
val = REG_RD(sc, BCE_PCICFG_MISC_STATUS);
@@ -967,10 +1022,8 @@ bce_attach(device_t dev)
bce_get_media(sc);
/* Store data needed by PHY driver for backplane applications */
- sc->bce_shared_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base +
- BCE_SHARED_HW_CFG_CONFIG);
- sc->bce_port_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base +
- BCE_PORT_HW_CFG_CONFIG);
+ sc->bce_shared_hw_cfg = bce_shmem_rd(sc, BCE_SHARED_HW_CFG_CONFIG);
+ sc->bce_port_hw_cfg = bce_shmem_rd(sc, BCE_PORT_HW_CFG_CONFIG);
/* Allocate DMA memory resources. */
if (bce_dma_alloc(dev)) {
@@ -1293,6 +1346,36 @@ bce_reg_wr_ind(struct bce_softc *sc, u32
}
+/****************************************************************************/
+/* Shared memory write. */
+/* */
+/* Writes NetXtreme II shared memory region. */
+/* */
+/* Returns: */
+/* Nothing. */
+/****************************************************************************/
+static void
+bce_shmem_wr(struct bce_softc *sc, u32 offset, u32 val)
+{
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list