svn commit: r222858 - in user/hrs/ipv6: . bin/sh contrib/groff/tmac
contrib/top etc gnu/usr.bin/gdb/kgdb gnu/usr.bin/groff/tmac
lib/libiconv lib/libkvm lib/libmemstat libexec/comsat
release/ia64 sb...
Hiroki Sato
hrs at FreeBSD.org
Wed Jun 8 12:03:35 UTC 2011
Author: hrs
Date: Wed Jun 8 12:03:34 2011
New Revision: 222858
URL: http://svn.freebsd.org/changeset/base/222858
Log:
Merge from HEAD at 222848.
Added:
user/hrs/ipv6/sys/boot/ia64/common/icache.c
- copied unchanged from r222855, head/sys/boot/ia64/common/icache.c
user/hrs/ipv6/sys/netinet/in_pcbgroup.c
- copied unchanged from r222855, head/sys/netinet/in_pcbgroup.c
user/hrs/ipv6/sys/netinet6/in6_pcbgroup.c
- copied unchanged from r222855, head/sys/netinet6/in6_pcbgroup.c
user/hrs/ipv6/sys/sys/_cpuset.h
- copied unchanged from r222855, head/sys/sys/_cpuset.h
user/hrs/ipv6/tools/regression/bin/sh/expansion/heredoc1.0
- copied unchanged from r222731, head/tools/regression/bin/sh/expansion/heredoc1.0
user/hrs/ipv6/tools/regression/bin/sh/expansion/heredoc2.0
- copied unchanged from r222731, head/tools/regression/bin/sh/expansion/heredoc2.0
Replaced:
user/hrs/ipv6/share/man/man4/geom_map.4
- copied unchanged from r222855, head/share/man/man4/geom_map.4
user/hrs/ipv6/sys/dev/iicbus/ad7417.c
- copied unchanged from r222855, head/sys/dev/iicbus/ad7417.c
user/hrs/ipv6/sys/nfs/nfs_kdtrace.h
- copied unchanged from r222855, head/sys/nfs/nfs_kdtrace.h
user/hrs/ipv6/sys/sys/_stdint.h
- copied unchanged from r222855, head/sys/sys/_stdint.h
user/hrs/ipv6/tools/build/options/WITHOUT_GPIO
- copied unchanged from r222855, head/tools/build/options/WITHOUT_GPIO
user/hrs/ipv6/tools/build/options/WITH_OFED
- copied unchanged from r222855, head/tools/build/options/WITH_OFED
user/hrs/ipv6/tools/regression/bin/sh/builtins/set1.0
- copied unchanged from r222855, head/tools/regression/bin/sh/builtins/set1.0
user/hrs/ipv6/tools/regression/bin/sh/parser/dollar-quote1.0
- copied unchanged from r222855, head/tools/regression/bin/sh/parser/dollar-quote1.0
user/hrs/ipv6/tools/regression/bin/sh/parser/dollar-quote2.0
- copied unchanged from r222855, head/tools/regression/bin/sh/parser/dollar-quote2.0
user/hrs/ipv6/tools/regression/bin/sh/parser/dollar-quote3.0
- copied unchanged from r222855, head/tools/regression/bin/sh/parser/dollar-quote3.0
user/hrs/ipv6/tools/regression/bin/sh/parser/dollar-quote4.0
- copied unchanged from r222855, head/tools/regression/bin/sh/parser/dollar-quote4.0
user/hrs/ipv6/tools/regression/bin/sh/parser/dollar-quote5.0
- copied unchanged from r222855, head/tools/regression/bin/sh/parser/dollar-quote5.0
user/hrs/ipv6/tools/regression/bin/sh/parser/dollar-quote6.0
- copied unchanged from r222855, head/tools/regression/bin/sh/parser/dollar-quote6.0
user/hrs/ipv6/tools/regression/bin/sh/parser/dollar-quote7.0
- copied unchanged from r222855, head/tools/regression/bin/sh/parser/dollar-quote7.0
user/hrs/ipv6/tools/regression/bin/sh/parser/dollar-quote8.0
- copied unchanged from r222855, head/tools/regression/bin/sh/parser/dollar-quote8.0
user/hrs/ipv6/tools/regression/bin/sh/parser/dollar-quote9.0
- copied unchanged from r222855, head/tools/regression/bin/sh/parser/dollar-quote9.0
Modified:
user/hrs/ipv6/UPDATING
user/hrs/ipv6/bin/sh/eval.c
user/hrs/ipv6/contrib/groff/tmac/doc-common
user/hrs/ipv6/contrib/groff/tmac/doc-syms
user/hrs/ipv6/contrib/groff/tmac/doc.tmac
user/hrs/ipv6/etc/network.subr
user/hrs/ipv6/gnu/usr.bin/gdb/kgdb/kthr.c
user/hrs/ipv6/gnu/usr.bin/groff/tmac/mdoc.local
user/hrs/ipv6/lib/libiconv/Makefile
user/hrs/ipv6/lib/libkvm/kvm_pcpu.c
user/hrs/ipv6/lib/libmemstat/memstat_uma.c
user/hrs/ipv6/libexec/comsat/comsat.c
user/hrs/ipv6/release/ia64/mkisoimages.sh
user/hrs/ipv6/sbin/geom/class/part/geom_part.c
user/hrs/ipv6/sbin/geom/class/part/gpart.8
user/hrs/ipv6/sbin/geom/class/sched/Makefile
user/hrs/ipv6/sbin/ifconfig/af_inet6.c
user/hrs/ipv6/sbin/ifconfig/af_nd6.c
user/hrs/ipv6/sbin/ipfw/main.c
user/hrs/ipv6/sbin/mount/mount.8
user/hrs/ipv6/sbin/mount/mount.c
user/hrs/ipv6/sbin/rcorder/rcorder.8
user/hrs/ipv6/share/man/man4/amdsbwd.4
user/hrs/ipv6/share/man/man4/atkbd.4
user/hrs/ipv6/share/man/man5/fstab.5
user/hrs/ipv6/share/misc/committers-ports.dot
user/hrs/ipv6/sys/amd64/acpica/acpi_wakeup.c
user/hrs/ipv6/sys/amd64/amd64/intr_machdep.c
user/hrs/ipv6/sys/amd64/amd64/machdep.c
user/hrs/ipv6/sys/amd64/amd64/mp_machdep.c
user/hrs/ipv6/sys/amd64/amd64/pmap.c
user/hrs/ipv6/sys/amd64/amd64/vm_machdep.c
user/hrs/ipv6/sys/amd64/include/_types.h
user/hrs/ipv6/sys/amd64/include/pmap.h
user/hrs/ipv6/sys/amd64/include/smp.h
user/hrs/ipv6/sys/arm/arm/pmap.c
user/hrs/ipv6/sys/arm/include/_types.h
user/hrs/ipv6/sys/arm/include/pmap.h
user/hrs/ipv6/sys/boot/ia64/common/Makefile
user/hrs/ipv6/sys/boot/ia64/common/exec.c
user/hrs/ipv6/sys/boot/ia64/common/libia64.h
user/hrs/ipv6/sys/boot/ia64/efi/efimd.c
user/hrs/ipv6/sys/boot/ia64/efi/main.c
user/hrs/ipv6/sys/boot/ia64/efi/version
user/hrs/ipv6/sys/cddl/compat/opensolaris/sys/atomic.h
user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
user/hrs/ipv6/sys/cddl/dev/cyclic/i386/cyclic_machdep.c
user/hrs/ipv6/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
user/hrs/ipv6/sys/cddl/dev/dtrace/i386/dtrace_subr.c
user/hrs/ipv6/sys/conf/NOTES
user/hrs/ipv6/sys/conf/files
user/hrs/ipv6/sys/conf/options
user/hrs/ipv6/sys/ddb/db_command.c
user/hrs/ipv6/sys/dev/amdsbwd/amdsbwd.c
user/hrs/ipv6/sys/dev/ath/ath_hal/ah.h
user/hrs/ipv6/sys/dev/ath/ath_hal/ar5212/ar5212.h
user/hrs/ipv6/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
user/hrs/ipv6/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
user/hrs/ipv6/sys/dev/ath/ath_hal/ar5416/ar5416.h
user/hrs/ipv6/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
user/hrs/ipv6/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
user/hrs/ipv6/sys/dev/ath/if_athvar.h
user/hrs/ipv6/sys/dev/atkbdc/atkbd.c
user/hrs/ipv6/sys/dev/atkbdc/atkbdreg.h
user/hrs/ipv6/sys/dev/cardbus/cardbus_cis.c
user/hrs/ipv6/sys/dev/hwpmc/hwpmc_mod.c
user/hrs/ipv6/sys/dev/pccard/pccard.c
user/hrs/ipv6/sys/dev/pci/pci.c
user/hrs/ipv6/sys/dev/puc/pucdata.c
user/hrs/ipv6/sys/dev/sound/pcm/sound.c
user/hrs/ipv6/sys/dev/usb/usb_device.h
user/hrs/ipv6/sys/dev/usb/usb_freebsd.h
user/hrs/ipv6/sys/dev/usb/usb_generic.c
user/hrs/ipv6/sys/dev/usb/usb_hub.c
user/hrs/ipv6/sys/dev/usb/usb_request.c
user/hrs/ipv6/sys/dev/usb/usb_request.h
user/hrs/ipv6/sys/dev/usb/usb_transfer.c
user/hrs/ipv6/sys/dev/usb/usbdi.h
user/hrs/ipv6/sys/dev/xen/control/control.c
user/hrs/ipv6/sys/fs/nfs/nfs_var.h
user/hrs/ipv6/sys/fs/nfsclient/nfs_clport.c
user/hrs/ipv6/sys/fs/nfsclient/nfs_clrpcops.c
user/hrs/ipv6/sys/fs/nfsclient/nfs_clstate.c
user/hrs/ipv6/sys/fs/nfsclient/nfs_clvnops.c
user/hrs/ipv6/sys/geom/eli/g_eli.c
user/hrs/ipv6/sys/i386/i386/intr_machdep.c
user/hrs/ipv6/sys/i386/i386/machdep.c
user/hrs/ipv6/sys/i386/i386/mp_machdep.c
user/hrs/ipv6/sys/i386/i386/pmap.c
user/hrs/ipv6/sys/i386/i386/vm_machdep.c
user/hrs/ipv6/sys/i386/include/_types.h
user/hrs/ipv6/sys/i386/include/pmap.h
user/hrs/ipv6/sys/i386/include/sf_buf.h
user/hrs/ipv6/sys/i386/include/smp.h
user/hrs/ipv6/sys/i386/xen/mp_machdep.c
user/hrs/ipv6/sys/i386/xen/pmap.c
user/hrs/ipv6/sys/ia64/acpica/acpi_machdep.c
user/hrs/ipv6/sys/ia64/ia64/machdep.c
user/hrs/ipv6/sys/ia64/ia64/mp_machdep.c
user/hrs/ipv6/sys/ia64/ia64/pal.S
user/hrs/ipv6/sys/ia64/include/_types.h
user/hrs/ipv6/sys/ia64/include/smp.h
user/hrs/ipv6/sys/kern/kern_cpuset.c
user/hrs/ipv6/sys/kern/kern_ktr.c
user/hrs/ipv6/sys/kern/kern_pmc.c
user/hrs/ipv6/sys/kern/kern_rmlock.c
user/hrs/ipv6/sys/kern/kern_shutdown.c
user/hrs/ipv6/sys/kern/ksched.c
user/hrs/ipv6/sys/kern/sched_4bsd.c
user/hrs/ipv6/sys/kern/sched_ule.c
user/hrs/ipv6/sys/kern/subr_kdb.c
user/hrs/ipv6/sys/kern/subr_pcpu.c
user/hrs/ipv6/sys/kern/subr_prf.c
user/hrs/ipv6/sys/kern/subr_rman.c
user/hrs/ipv6/sys/kern/subr_smp.c
user/hrs/ipv6/sys/kern/uipc_syscalls.c
user/hrs/ipv6/sys/mips/cavium/octeon_mp.c
user/hrs/ipv6/sys/mips/include/_types.h
user/hrs/ipv6/sys/mips/include/hwfunc.h
user/hrs/ipv6/sys/mips/include/pmap.h
user/hrs/ipv6/sys/mips/include/smp.h
user/hrs/ipv6/sys/mips/mips/mp_machdep.c
user/hrs/ipv6/sys/mips/mips/pmap.c
user/hrs/ipv6/sys/mips/rmi/xlr_machdep.c
user/hrs/ipv6/sys/mips/sibyte/sb_scd.c
user/hrs/ipv6/sys/net/bridgestp.c
user/hrs/ipv6/sys/net/bridgestp.h
user/hrs/ipv6/sys/net/if_stf.c
user/hrs/ipv6/sys/netgraph/ng_nat.c
user/hrs/ipv6/sys/netinet/in_pcb.c
user/hrs/ipv6/sys/netinet/in_pcb.h
user/hrs/ipv6/sys/netinet/ip_divert.c
user/hrs/ipv6/sys/netinet/ip_input.c
user/hrs/ipv6/sys/netinet/ip_ipsec.c
user/hrs/ipv6/sys/netinet/ipfw/ip_fw2.c
user/hrs/ipv6/sys/netinet/ipfw/ip_fw_nat.c
user/hrs/ipv6/sys/netinet/ipfw/ip_fw_sockopt.c
user/hrs/ipv6/sys/netinet/libalias/alias_sctp.h
user/hrs/ipv6/sys/netinet/raw_ip.c
user/hrs/ipv6/sys/netinet/tcp_subr.c
user/hrs/ipv6/sys/netinet/tcp_syncache.c
user/hrs/ipv6/sys/netinet/udp_usrreq.c
user/hrs/ipv6/sys/netinet6/in6_pcb.c
user/hrs/ipv6/sys/netinet6/in6_pcb.h
user/hrs/ipv6/sys/netinet6/ip6_ipsec.c
user/hrs/ipv6/sys/ofed/include/linux/list.h
user/hrs/ipv6/sys/pc98/pc98/machdep.c
user/hrs/ipv6/sys/powerpc/aim/mmu_oea.c
user/hrs/ipv6/sys/powerpc/aim/mmu_oea64.c
user/hrs/ipv6/sys/powerpc/booke/platform_bare.c
user/hrs/ipv6/sys/powerpc/booke/pmap.c
user/hrs/ipv6/sys/powerpc/include/_types.h
user/hrs/ipv6/sys/powerpc/include/openpicvar.h
user/hrs/ipv6/sys/powerpc/include/pmap.h
user/hrs/ipv6/sys/powerpc/include/smp.h
user/hrs/ipv6/sys/powerpc/mpc85xx/openpic_fdt.c
user/hrs/ipv6/sys/powerpc/powerpc/intr_machdep.c
user/hrs/ipv6/sys/powerpc/powerpc/mp_machdep.c
user/hrs/ipv6/sys/powerpc/powerpc/openpic.c
user/hrs/ipv6/sys/powerpc/powerpc/pic_if.m
user/hrs/ipv6/sys/sparc64/include/_types.h
user/hrs/ipv6/sys/sparc64/include/ktr.h
user/hrs/ipv6/sys/sparc64/include/pmap.h
user/hrs/ipv6/sys/sparc64/include/smp.h
user/hrs/ipv6/sys/sparc64/sparc64/exception.S
user/hrs/ipv6/sys/sparc64/sparc64/genassym.c
user/hrs/ipv6/sys/sparc64/sparc64/intr_machdep.c
user/hrs/ipv6/sys/sparc64/sparc64/mp_exception.S
user/hrs/ipv6/sys/sparc64/sparc64/mp_locore.S
user/hrs/ipv6/sys/sparc64/sparc64/mp_machdep.c
user/hrs/ipv6/sys/sparc64/sparc64/pmap.c
user/hrs/ipv6/sys/sparc64/sparc64/swtch.S
user/hrs/ipv6/sys/sparc64/sparc64/tlb.c
user/hrs/ipv6/sys/sys/_rmlock.h
user/hrs/ipv6/sys/sys/conf.h
user/hrs/ipv6/sys/sys/cpuset.h
user/hrs/ipv6/sys/sys/ktr.h
user/hrs/ipv6/sys/sys/pcpu.h
user/hrs/ipv6/sys/sys/pmckern.h
user/hrs/ipv6/sys/sys/smp.h
user/hrs/ipv6/sys/sys/soundcard.h
user/hrs/ipv6/sys/sys/types.h
user/hrs/ipv6/sys/ufs/ffs/ffs_alloc.c
user/hrs/ipv6/sys/x86/x86/local_apic.c
user/hrs/ipv6/usr.bin/calendar/calendars/calendar.freebsd
user/hrs/ipv6/usr.bin/calendar/io.c
user/hrs/ipv6/usr.bin/grep/Makefile
user/hrs/ipv6/usr.bin/iconv/Makefile
user/hrs/ipv6/usr.bin/kdump/mksubr
user/hrs/ipv6/usr.bin/rctl/Makefile
user/hrs/ipv6/usr.bin/su/su.1
user/hrs/ipv6/usr.sbin/bluetooth/ath3kfw/Makefile
user/hrs/ipv6/usr.sbin/bsdinstall/scripts/netconfig_ipv6
user/hrs/ipv6/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile
user/hrs/ipv6/usr.sbin/lastlogin/lastlogin.8
user/hrs/ipv6/usr.sbin/lastlogin/lastlogin.c
user/hrs/ipv6/usr.sbin/pmccontrol/pmccontrol.c
user/hrs/ipv6/usr.sbin/route6d/route6d.c
user/hrs/ipv6/usr.sbin/rtadvd/advcap.c
user/hrs/ipv6/usr.sbin/rtadvd/config.c
user/hrs/ipv6/usr.sbin/rtadvd/dump.c
user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c
user/hrs/ipv6/usr.sbin/rtsold/rtsol.c
user/hrs/ipv6/usr.sbin/rtsold/rtsold.c
user/hrs/ipv6/usr.sbin/tcpdrop/tcpdrop.c
Directory Properties:
user/hrs/ipv6/ (props changed)
user/hrs/ipv6/cddl/contrib/opensolaris/ (props changed)
user/hrs/ipv6/contrib/bind9/ (props changed)
user/hrs/ipv6/contrib/binutils/ (props changed)
user/hrs/ipv6/contrib/bzip2/ (props changed)
user/hrs/ipv6/contrib/compiler-rt/ (props changed)
user/hrs/ipv6/contrib/dialog/ (props changed)
user/hrs/ipv6/contrib/ee/ (props changed)
user/hrs/ipv6/contrib/expat/ (props changed)
user/hrs/ipv6/contrib/file/ (props changed)
user/hrs/ipv6/contrib/gcc/ (props changed)
user/hrs/ipv6/contrib/gdb/ (props changed)
user/hrs/ipv6/contrib/gdtoa/ (props changed)
user/hrs/ipv6/contrib/gnu-sort/ (props changed)
user/hrs/ipv6/contrib/groff/ (props changed)
user/hrs/ipv6/contrib/less/ (props changed)
user/hrs/ipv6/contrib/libpcap/ (props changed)
user/hrs/ipv6/contrib/libstdc++/ (props changed)
user/hrs/ipv6/contrib/llvm/ (props changed)
user/hrs/ipv6/contrib/llvm/tools/clang/ (props changed)
user/hrs/ipv6/contrib/ncurses/ (props changed)
user/hrs/ipv6/contrib/netcat/ (props changed)
user/hrs/ipv6/contrib/ntp/ (props changed)
user/hrs/ipv6/contrib/one-true-awk/ (props changed)
user/hrs/ipv6/contrib/openbsm/ (props changed)
user/hrs/ipv6/contrib/openpam/ (props changed)
user/hrs/ipv6/contrib/pf/ (props changed)
user/hrs/ipv6/contrib/sendmail/ (props changed)
user/hrs/ipv6/contrib/tcpdump/ (props changed)
user/hrs/ipv6/contrib/tcsh/ (props changed)
user/hrs/ipv6/contrib/top/ (props changed)
user/hrs/ipv6/contrib/top/install-sh (props changed)
user/hrs/ipv6/contrib/tzcode/stdtime/ (props changed)
user/hrs/ipv6/contrib/tzcode/zic/ (props changed)
user/hrs/ipv6/contrib/tzdata/ (props changed)
user/hrs/ipv6/contrib/wpa/ (props changed)
user/hrs/ipv6/contrib/xz/ (props changed)
user/hrs/ipv6/crypto/openssh/ (props changed)
user/hrs/ipv6/crypto/openssl/ (props changed)
user/hrs/ipv6/gnu/lib/ (props changed)
user/hrs/ipv6/gnu/usr.bin/binutils/ (props changed)
user/hrs/ipv6/gnu/usr.bin/cc/cc_tools/ (props changed)
user/hrs/ipv6/gnu/usr.bin/gdb/ (props changed)
user/hrs/ipv6/lib/libc/ (props changed)
user/hrs/ipv6/lib/libc/stdtime/ (props changed)
user/hrs/ipv6/lib/libutil/ (props changed)
user/hrs/ipv6/lib/libz/ (props changed)
user/hrs/ipv6/sbin/ (props changed)
user/hrs/ipv6/sbin/ipfw/ (props changed)
user/hrs/ipv6/share/mk/bsd.arch.inc.mk (props changed)
user/hrs/ipv6/share/zoneinfo/ (props changed)
user/hrs/ipv6/sys/ (props changed)
user/hrs/ipv6/sys/amd64/include/xen/ (props changed)
user/hrs/ipv6/sys/boot/ (props changed)
user/hrs/ipv6/sys/boot/i386/efi/ (props changed)
user/hrs/ipv6/sys/boot/ia64/efi/ (props changed)
user/hrs/ipv6/sys/boot/ia64/ski/ (props changed)
user/hrs/ipv6/sys/boot/powerpc/boot1.chrp/ (props changed)
user/hrs/ipv6/sys/boot/powerpc/ofw/ (props changed)
user/hrs/ipv6/sys/cddl/contrib/opensolaris/ (props changed)
user/hrs/ipv6/sys/conf/ (props changed)
user/hrs/ipv6/sys/contrib/dev/acpica/ (props changed)
user/hrs/ipv6/sys/contrib/octeon-sdk/ (props changed)
user/hrs/ipv6/sys/contrib/pf/ (props changed)
user/hrs/ipv6/sys/contrib/x86emu/ (props changed)
user/hrs/ipv6/usr.bin/calendar/ (props changed)
user/hrs/ipv6/usr.bin/csup/ (props changed)
user/hrs/ipv6/usr.bin/procstat/ (props changed)
user/hrs/ipv6/usr.sbin/ndiscvt/ (props changed)
user/hrs/ipv6/usr.sbin/zic/ (props changed)
Modified: user/hrs/ipv6/UPDATING
==============================================================================
--- user/hrs/ipv6/UPDATING Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/UPDATING Wed Jun 8 12:03:34 2011 (r222858)
@@ -22,6 +22,33 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
machines to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20110608:
+ The following sysctls and tunables are retired on x86 platforms:
+ machdep.hlt_cpus
+ machdep.hlt_logical_cpus
+ The following sysctl is retired:
+ machdep.hyperthreading_allowed
+ The sysctls were supposed to provide a way to dynamically offline and
+ online selected CPUs on x86 platforms, but the implementation has not
+ been reliable especially with SCHED_ULE scheduler.
+ machdep.hyperthreading_allowed tunable is still available to ignore
+ hyperthreading CPUs at OS level.
+ Individual CPUs can be disabled using hint.lapic.X.disabled tunable,
+ where X is an APIC ID of a CPU. Be advised, though, that disabling
+ CPUs in non-uniform fashion will result in non-uniform topology and
+ may lead to sub-optimal system performance with SCHED_ULE, which is
+ a default scheduler.
+
+20110607:
+ cpumask_t type is retired and cpuset_t is used in order to describe
+ a mask of CPUs.
+
+20110531:
+ Changes to ifconfig(8) for dynamic address family detection mandate
+ that you are running a kernel of 20110525 or later. Make sure to
+ follow the update procedure to boot a new kernel before installing
+ world.
+
20110513:
Support for sun4v architecture is officially dropped
Modified: user/hrs/ipv6/bin/sh/eval.c
==============================================================================
--- user/hrs/ipv6/bin/sh/eval.c Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/bin/sh/eval.c Wed Jun 8 12:03:34 2011 (r222858)
@@ -409,6 +409,7 @@ evalsubshell(union node *n, int flags)
struct job *jp;
int backgnd = (n->type == NBACKGND);
+ oexitstatus = exitstatus;
expredir(n->nredir.redirect);
if ((!backgnd && flags & EV_EXIT && !have_traps()) ||
forkshell(jp = makejob(n, 1), n, backgnd) == 0) {
@@ -436,6 +437,7 @@ evalredir(union node *n, int flags)
struct jmploc *savehandler;
volatile int in_redirect = 1;
+ oexitstatus = exitstatus;
expredir(n->nredir.redirect);
savehandler = handler;
if (setjmp(jmploc.loc)) {
@@ -478,7 +480,6 @@ expredir(union node *n)
for (redir = n ; redir ; redir = redir->nfile.next) {
struct arglist fn;
fn.lastp = &fn.list;
- oexitstatus = exitstatus;
switch (redir->type) {
case NFROM:
case NTO:
Modified: user/hrs/ipv6/contrib/groff/tmac/doc-common
==============================================================================
--- user/hrs/ipv6/contrib/groff/tmac/doc-common Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/contrib/groff/tmac/doc-common Wed Jun 8 12:03:34 2011 (r222858)
@@ -543,6 +543,7 @@
.ds doc-operating-system-FreeBSD-7.3 7.3
.ds doc-operating-system-FreeBSD-8.0 8.0
.ds doc-operating-system-FreeBSD-8.1 8.1
+.ds doc-operating-system-FreeBSD-8.2 8.2
.
.ds doc-operating-system-Darwin-8.0.0 8.0.0
.ds doc-operating-system-Darwin-8.1.0 8.1.0
@@ -563,6 +564,17 @@
.ds doc-operating-system-Darwin-9.4.0 9.4.0
.ds doc-operating-system-Darwin-9.5.0 9.5.0
.ds doc-operating-system-Darwin-9.6.0 9.6.0
+.ds doc-operating-system-Darwin-9.7.0 9.7.0
+.ds doc-operating-system-Darwin-9.8.0 9.8.0
+.ds doc-operating-system-Darwin-10.6.0 10.6.0
+.ds doc-operating-system-Darwin-10.1.0 10.1.0
+.ds doc-operating-system-Darwin-10.2.0 10.2.0
+.ds doc-operating-system-Darwin-10.3.0 10.3.0
+.ds doc-operating-system-Darwin-10.4.0 10.4.0
+.ds doc-operating-system-Darwin-10.5.0 10.5.0
+.ds doc-operating-system-Darwin-10.6.0 10.6.0
+.ds doc-operating-system-Darwin-10.7.0 10.7.0
+.ds doc-operating-system-Darwin-11.0.0 11.0.0
.
.ds doc-operating-system-DragonFly-1.0 1.0
.ds doc-operating-system-DragonFly-1.1 1.1
Modified: user/hrs/ipv6/contrib/groff/tmac/doc-syms
==============================================================================
--- user/hrs/ipv6/contrib/groff/tmac/doc-syms Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/contrib/groff/tmac/doc-syms Wed Jun 8 12:03:34 2011 (r222858)
@@ -617,6 +617,8 @@
.\" POSIX Part 1: System API
.ds doc-str-St--p1003.1 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1
.as doc-str-St--p1003.1 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.ds doc-str-St--p1003.1b \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1b
+.as doc-str-St--p1003.1b " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
.ds doc-str-St--p1003.1-88 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-1988
.as doc-str-St--p1003.1-88 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
.ds doc-str-St--p1003.1-90 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9945-1:1990
@@ -754,6 +756,7 @@
.
.ds doc-str-Lb-libarm ARM Architecture Library (libarm, \-larm)
.ds doc-str-Lb-libarm32 ARM32 Architecture Library (libarm32, \-larm32)
+.ds doc-str-Lb-libbsm Basic Security Module Library (libbsm, \-lbsm)
.ds doc-str-Lb-libc Standard C\~Library (libc, \-lc)
.ds doc-str-Lb-libcdk Curses Development Kit Library (libcdk, \-lcdk)
.ds doc-str-Lb-libcompat Compatibility Library (libcompat, \-lcompat)
@@ -779,6 +782,7 @@
.ds doc-str-Lb-libpthread \*[Px] \*[doc-str-Lb]Threads Library (libpthread, \-lpthread)
.ds doc-str-Lb-libresolv DNS Resolver Library (libresolv, \-lresolv)
.ds doc-str-Lb-librt \*[Px] \*[doc-str-Lb]Real-time Library (librt, \-lrt)
+.ds doc-str-Lb-libSystem System Library (libSystem, \-lSystem)
.ds doc-str-Lb-libtermcap Termcap Access Library (libtermcap, \-ltermcap)
.ds doc-str-Lb-libusbhid USB Human Interface Devices Library (libusbhid, \-lusbhid)
.ds doc-str-Lb-libutil System Utilities Library (libutil, \-lutil)
Modified: user/hrs/ipv6/contrib/groff/tmac/doc.tmac
==============================================================================
--- user/hrs/ipv6/contrib/groff/tmac/doc.tmac Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/contrib/groff/tmac/doc.tmac Wed Jun 8 12:03:34 2011 (r222858)
@@ -1197,8 +1197,14 @@
. if !\n[doc-arg-limit] \
. ds doc-macro-name Aq
.
-. ds doc-quote-left <
-. ds doc-quote-right >
+. ie "\*[doc-macro-name]"An" \{\
+. ds doc-quote-left <
+. ds doc-quote-right >
+. \}
+. el \{\
+. ds doc-quote-left \[la]
+. ds doc-quote-right \[ra]
+. \}
.
. doc-enclose-string \$@
..
@@ -1527,7 +1533,10 @@
. if !\n[doc-arg-limit] \
. ds doc-macro-name Ao
.
-. ds doc-quote-left \[la]
+. ie "\*[doc-macro-name]"An" \
+. ds doc-quote-left <
+. el \
+. ds doc-quote-left \[la]
.
. doc-enclose-open \$@
..
@@ -1546,7 +1555,10 @@
. if !\n[doc-arg-limit] \
. ds doc-macro-name Ac
.
-. ds doc-quote-right \[ra]
+. ie "\*[doc-macro-name]"An" \
+. ds doc-quote-right >
+. el \
+. ds doc-quote-right \[ra]
.
. doc-enclose-close \$@
..
Modified: user/hrs/ipv6/etc/network.subr
==============================================================================
--- user/hrs/ipv6/etc/network.subr Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/etc/network.subr Wed Jun 8 12:03:34 2011 (r222858)
@@ -100,25 +100,19 @@ ifconfig_up()
# inet6 specific
if afexists inet6; then
- if ipv6if $1; then
- if checkyesno ipv6_gateway_enable; then
- _ipv6_opts="-accept_rtadv"
- fi
- else
- if checkyesno ipv6_activate_all_interfaces; then
- _ipv6_opts="-ifdisabled"
- else
- _ipv6_opts="ifdisabled"
- fi
-
- # backward compatibility: $ipv6_enable
- case $ipv6_enable in
- [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
- _ipv6_opts="${_ipv6_opts} accept_rtadv"
- ;;
- esac
+ if checkyesno ipv6_activate_all_interfaces; then
+ _ipv6_opts="-ifdisabled"
+ elif [ "$1" != "lo0" ]; then
+ _ipv6_opts="ifdisabled"
fi
+ # backward compatibility: $ipv6_enable
+ case $ipv6_enable in
+ [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+ _ipv6_opts="${_ipv6_opts} accept_rtadv"
+ ;;
+ esac
+
if [ -n "${_ipv6_opts}" ]; then
ifconfig $1 inet6 ${_ipv6_opts}
fi
Modified: user/hrs/ipv6/gnu/usr.bin/gdb/kgdb/kthr.c
==============================================================================
--- user/hrs/ipv6/gnu/usr.bin/gdb/kgdb/kthr.c Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/gnu/usr.bin/gdb/kgdb/kthr.c Wed Jun 8 12:03:34 2011 (r222858)
@@ -28,6 +28,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
+#include <sys/cpuset.h>
#include <sys/proc.h>
#include <sys/types.h>
#include <sys/signal.h>
@@ -37,6 +38,7 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include <defs.h>
#include <frame-unwind.h>
@@ -48,7 +50,7 @@ static CORE_ADDR dumppcb;
static int dumptid;
static CORE_ADDR stoppcbs;
-static __cpumask_t stopped_cpus;
+static cpuset_t stopped_cpus;
static struct kthr *first;
struct kthr *curkthr;
@@ -76,6 +78,7 @@ kgdb_thr_init(void)
{
struct proc p;
struct thread td;
+ long cpusetsize;
struct kthr *kt;
CORE_ADDR addr;
uintptr_t paddr;
@@ -102,10 +105,11 @@ kgdb_thr_init(void)
dumptid = -1;
addr = kgdb_lookup("stopped_cpus");
- if (addr != 0)
- kvm_read(kvm, addr, &stopped_cpus, sizeof(stopped_cpus));
- else
- stopped_cpus = 0;
+ CPU_ZERO(&stopped_cpus);
+ cpusetsize = sysconf(_SC_CPUSET_SIZE);
+ if (cpusetsize != -1 && (u_long)cpusetsize <= sizeof(cpuset_t) &&
+ addr != 0)
+ kvm_read(kvm, addr, &stopped_cpus, cpusetsize);
stoppcbs = kgdb_lookup("stoppcbs");
@@ -126,8 +130,8 @@ kgdb_thr_init(void)
kt->kaddr = addr;
if (td.td_tid == dumptid)
kt->pcb = dumppcb;
- else if (td.td_state == TDS_RUNNING && ((1 << td.td_oncpu) & stopped_cpus)
- && stoppcbs != 0)
+ else if (td.td_state == TDS_RUNNING && stoppcbs != 0 &&
+ CPU_ISSET(td.td_oncpu, &stopped_cpus))
kt->pcb = (uintptr_t) stoppcbs + sizeof(struct pcb) * td.td_oncpu;
else
kt->pcb = (uintptr_t)td.td_pcb;
Modified: user/hrs/ipv6/gnu/usr.bin/groff/tmac/mdoc.local
==============================================================================
--- user/hrs/ipv6/gnu/usr.bin/groff/tmac/mdoc.local Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/gnu/usr.bin/groff/tmac/mdoc.local Wed Jun 8 12:03:34 2011 (r222858)
@@ -34,7 +34,6 @@
.\" FreeBSD .Lb values
.ds doc-str-Lb-libarchive Streaming Archive Library (libarchive, \-larchive)
.ds doc-str-Lb-libbluetooth Bluetooth User Library (libbluetooth, \-lbluetooth)
-.ds doc-str-Lb-libbsm Basic Security Module User Library (libbsm, \-lbsm)
.ds doc-str-Lb-libc_r Reentrant C\~Library (libc_r, \-lc_r)
.ds doc-str-Lb-libcalendar Calendar Arithmetic Library (libcalendar, \-lcalendar)
.ds doc-str-Lb-libcam Common Access Method User Library (libcam, \-lcam)
@@ -75,7 +74,7 @@
.
.\" FreeBSD releases not found in doc-common
.ds doc-operating-system-FreeBSD-7.4 7.4
-.ds doc-operating-system-FreeBSD-8.2 8.2
+.ds doc-operating-system-FreeBSD-8.3 8.3
.ds doc-operating-system-FreeBSD-9.0 9.0
.
.\" Definitions not (yet) in doc-syms
Modified: user/hrs/ipv6/lib/libiconv/Makefile
==============================================================================
--- user/hrs/ipv6/lib/libiconv/Makefile Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/lib/libiconv/Makefile Wed Jun 8 12:03:34 2011 (r222858)
@@ -19,7 +19,6 @@ SRCS= citrus_bcs.c citrus_bcs_strtol.c c
citrus_module.c citrus_none.c citrus_pivot_factory.c \
citrus_prop.c citrus_stdenc.c iconv.c
-WARNS?= 6
CFLAGS+= --param max-inline-insns-single=128 -I ${.CURDIR}/../../include -I${.CURDIR}/../libc/include
.include <bsd.lib.mk>
Modified: user/hrs/ipv6/lib/libkvm/kvm_pcpu.c
==============================================================================
--- user/hrs/ipv6/lib/libkvm/kvm_pcpu.c Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/lib/libkvm/kvm_pcpu.c Wed Jun 8 12:03:34 2011 (r222858)
@@ -39,11 +39,13 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
+#include <sys/cpuset.h>
#include <sys/pcpu.h>
#include <sys/sysctl.h>
#include <kvm.h>
#include <limits.h>
#include <stdlib.h>
+#include <unistd.h>
#include "kvm_private.h"
@@ -118,6 +120,9 @@ _kvm_pcpu_clear(void)
void *
kvm_getpcpu(kvm_t *kd, int cpu)
{
+ long kcpusetsize;
+ ssize_t nbytes;
+ uintptr_t readptr;
char *buf;
if (kd == NULL) {
@@ -125,6 +130,10 @@ kvm_getpcpu(kvm_t *kd, int cpu)
return (NULL);
}
+ kcpusetsize = sysconf(_SC_CPUSET_SIZE);
+ if (kcpusetsize == -1 || (u_long)kcpusetsize > sizeof(cpuset_t))
+ return ((void *)-1);
+
if (maxcpu == 0)
if (_kvm_pcpu_init(kd) < 0)
return ((void *)-1);
@@ -137,8 +146,26 @@ kvm_getpcpu(kvm_t *kd, int cpu)
_kvm_err(kd, kd->program, "out of memory");
return ((void *)-1);
}
- if (kvm_read(kd, (uintptr_t)pcpu_data[cpu], buf, sizeof(struct pcpu)) !=
- sizeof(struct pcpu)) {
+ nbytes = sizeof(struct pcpu) - 2 * kcpusetsize;
+ readptr = (uintptr_t)pcpu_data[cpu];
+ if (kvm_read(kd, readptr, buf, nbytes) != nbytes) {
+ _kvm_err(kd, kd->program, "unable to read per-CPU data");
+ free(buf);
+ return ((void *)-1);
+ }
+
+ /* Fetch the valid cpuset_t objects. */
+ CPU_ZERO((cpuset_t *)(buf + nbytes));
+ CPU_ZERO((cpuset_t *)(buf + nbytes + sizeof(cpuset_t)));
+ readptr += nbytes;
+ if (kvm_read(kd, readptr, buf + nbytes, kcpusetsize) != kcpusetsize) {
+ _kvm_err(kd, kd->program, "unable to read per-CPU data");
+ free(buf);
+ return ((void *)-1);
+ }
+ readptr += kcpusetsize;
+ if (kvm_read(kd, readptr, buf + nbytes + sizeof(cpuset_t),
+ kcpusetsize) != kcpusetsize) {
_kvm_err(kd, kd->program, "unable to read per-CPU data");
free(buf);
return ((void *)-1);
Modified: user/hrs/ipv6/lib/libmemstat/memstat_uma.c
==============================================================================
--- user/hrs/ipv6/lib/libmemstat/memstat_uma.c Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/lib/libmemstat/memstat_uma.c Wed Jun 8 12:03:34 2011 (r222858)
@@ -27,6 +27,7 @@
*/
#include <sys/param.h>
+#include <sys/cpuset.h>
#include <sys/sysctl.h>
#define LIBMEMSTAT /* Cause vm_page.h not to include opt_vmpage.h */
@@ -44,6 +45,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include "memstat.h"
#include "memstat_internal.h"
@@ -313,7 +315,8 @@ memstat_kvm_uma(struct memory_type_list
struct uma_keg *kzp, kz;
int hint_dontsearch, i, mp_maxid, ret;
char name[MEMTYPE_MAXNAME];
- __cpumask_t all_cpus;
+ cpuset_t all_cpus;
+ long cpusetsize;
kvm_t *kvm;
kvm = (kvm_t *)kvm_handle;
@@ -337,7 +340,13 @@ memstat_kvm_uma(struct memory_type_list
list->mtl_error = ret;
return (-1);
}
- ret = kread_symbol(kvm, X_ALL_CPUS, &all_cpus, sizeof(all_cpus), 0);
+ cpusetsize = sysconf(_SC_CPUSET_SIZE);
+ if (cpusetsize == -1 || (u_long)cpusetsize > sizeof(cpuset_t)) {
+ list->mtl_error = MEMSTAT_ERROR_KVM_NOSYMBOL;
+ return (-1);
+ }
+ CPU_ZERO(&all_cpus);
+ ret = kread_symbol(kvm, X_ALL_CPUS, &all_cpus, cpusetsize, 0);
if (ret != 0) {
list->mtl_error = ret;
return (-1);
@@ -407,7 +416,7 @@ memstat_kvm_uma(struct memory_type_list
if (kz.uk_flags & UMA_ZFLAG_INTERNAL)
goto skip_percpu;
for (i = 0; i < mp_maxid + 1; i++) {
- if ((all_cpus & (1 << i)) == 0)
+ if (!CPU_ISSET(i, &all_cpus))
continue;
ucp = &ucp_array[i];
mtp->mt_numallocs += ucp->uc_allocs;
Modified: user/hrs/ipv6/libexec/comsat/comsat.c
==============================================================================
--- user/hrs/ipv6/libexec/comsat/comsat.c Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/libexec/comsat/comsat.c Wed Jun 8 12:03:34 2011 (r222858)
@@ -180,7 +180,7 @@ notify(struct utmpx *utp, char file[], o
dsyslog(LOG_DEBUG, "%s: wrong mode on %s", utp->ut_user, tty);
return;
}
- dsyslog(LOG_DEBUG, "notify %s on %s\n", utp->ut_user, tty);
+ dsyslog(LOG_DEBUG, "notify %s on %s", utp->ut_user, tty);
switch (fork()) {
case -1:
syslog(LOG_NOTICE, "fork failed (%m)");
Modified: user/hrs/ipv6/release/ia64/mkisoimages.sh
==============================================================================
--- user/hrs/ipv6/release/ia64/mkisoimages.sh Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/release/ia64/mkisoimages.sh Wed Jun 8 12:03:34 2011 (r222858)
@@ -48,28 +48,32 @@ EFIPART=efipart.sys
if [ $bootable = yes ]; then
EFISZ=65536
MNT=/mnt
- dd if=/dev/zero of=$BASE/$EFIPART count=$EFISZ
- md=`mdconfig -a -t vnode -f $BASE/$EFIPART`
+ dd if=/dev/zero of=$EFIPART count=$EFISZ
+ md=`mdconfig -a -t vnode -f $EFIPART`
newfs_msdos -F 12 -S 512 -h 4 -o 0 -s $EFISZ -u 16 $md
mount -t msdosfs /dev/$md $MNT
mkdir -p $MNT/efi/boot $MNT/boot $MNT/boot/kernel
cp -R $BASE/boot/defaults $MNT/boot
cp $BASE/boot/kernel/kernel $MNT/boot/kernel
- cp $BASE/boot/kernel/ispfw.ko $MNT/boot/kernel
+ if [ -s $BASE/boot/kernel/ispfw.ko ]; then
+ cp $BASE/boot/kernel/ispfw.ko $MNT/boot/kernel
+ fi
cp $BASE/boot/device.hints $MNT/boot
cp $BASE/boot/loader.* $MNT/boot
- cp $BASE/boot/mfsroot.gz $MNT/boot
+ if [ -s $BASE/boot/mfsroot.gz ]; then
+ cp $BASE/boot/mfsroot.gz $MNT/boot
+ fi
cp $BASE/boot/support.4th $MNT/boot
mv $MNT/boot/loader.efi $MNT/efi/boot/bootia64.efi
umount $MNT
mdconfig -d -u $md
- BOOTOPTS="-b bootimage=i386;$EFIPART -o no-emul-boot"
+ BOOTOPTS="-o bootimage=i386;$EFIPART -o no-emul-boot"
else
BOOTOPTS=""
fi
-echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
+echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $BASE/etc/fstab
makefs -t cd9660 $BOOTOPTS -o rockridge -o label=$LABEL $NAME $BASE $*
-rm -f $BASE/$EFIPART
+rm -f $EFIPART
rm $1/etc/fstab
exit 0
Modified: user/hrs/ipv6/sbin/geom/class/part/geom_part.c
==============================================================================
--- user/hrs/ipv6/sbin/geom/class/part/geom_part.c Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/sbin/geom/class/part/geom_part.c Wed Jun 8 12:03:34 2011 (r222858)
@@ -341,9 +341,10 @@ gpart_autofill_resize(struct gctl_req *r
errc(EXIT_FAILURE, error, "Invalid alignment param");
if (alignment == 0)
errx(EXIT_FAILURE, "Invalid alignment param");
+ } else {
lba = pp->lg_stripesize / pp->lg_sectorsize;
if (lba > 0)
- alignment = g_lcm(lba, alignment);
+ alignment = lba;
}
error = gctl_delete_param(req, "alignment");
if (error)
@@ -491,13 +492,9 @@ gpart_autofill(struct gctl_req *req)
if (has_size && has_start && !has_alignment)
goto done;
- /*
- * If stripesize is not zero, then recalculate alignment value.
- * Use LCM from stripesize and user specified alignment.
- */
len = pp->lg_stripesize / pp->lg_sectorsize;
- if (len > 0 )
- alignment = g_lcm(len, alignment);
+ if (len > 0 && !has_alignment)
+ alignment = len;
/* Adjust parameters to stripeoffset */
offset = pp->lg_stripeoffset / pp->lg_sectorsize;
Modified: user/hrs/ipv6/sbin/geom/class/part/gpart.8
==============================================================================
--- user/hrs/ipv6/sbin/geom/class/part/gpart.8 Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/sbin/geom/class/part/gpart.8 Wed Jun 8 12:03:34 2011 (r222858)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 30, 2011
+.Dd June 6, 2011
.Dt GPART 8
.Os
.Sh NAME
@@ -530,16 +530,17 @@ about its use.
.El
.\"
.Sh PARTITION TYPES
+Partition types are identified on disk by particular strings or magic
+values.
The
.Nm
-utility uses symbolic names for common partition types to avoid that the
-user needs to know what the partitioning scheme in question is and what
-the actual number or identification needs to be used for a particular
-type.
+utility uses symbolic names for common partition types to avoid the
+user needing to know these values or other details of the partitioning
+scheme in question.
The
.Nm
utility also allows the user to specify scheme-specific partition types
-for partition types that do not have symbol names.
+for partition types that do not have symbolic names.
The symbolic names currently understood are:
.Bl -tag -width ".Cm freebsd-vinum"
.It Cm bios-boot
@@ -740,30 +741,30 @@ action or reverted with the
.Cm undo
action.
.Sh RECOVERING
-The GEOM class PART supports recovering of partition tables only for GPT.
+The GEOM PART class supports recovering of partition tables only for GPT.
The GUID partition table has a primary and secondary (backup) copy of
-metadata for redundance.
-They are stored in the begining and in the end of device respectively.
-Therefore it is acceptable to have some corruptions in the metadata that
-are not fatal to work with GPT.
-When kernel detects corrupt metadata it marks this table as corrupt and
-reports about corruption.
-Any changes in corrupt table are prohibited except
+metadata for redundance, these are stored at the begining and the end
+of the device respectively.
+As a result of having two copies, it is acceptable to have some corruption
+within the metadata that is not fatal to the working of GPT.
+When the kernel detects corrupt metadata it marks this table as corrupt and
+reports the corruption.
+Any operations on corrupt tables are prohibited except for
.Cm destroy
and
.Cm recover .
.Pp
-In case when only first sector is corrupt kernel can not detect GPT even
-if partition table is not corrupt.
-You can write protective MBR with
+If the first sector of a provider is corrupt, the kernel can not detect GPT
+even if partition table itself is not corrupt.
+You can rewrite the protective MBR using the
.Xr dd 1
-command to restore ability of GPT detection.
-The copy of protective MBR is usually located in the
+command, to restore the ability to detect the GPT.
+The copy of the protective MBR is usually located in the
.Pa /boot/pmbr
file.
.Pp
-In case when some of metadata is corrupt you will get to know about this
-from kernel's messages like these:
+If one GPT header appears to be corrupt but the other copy remains intact,
+the kernel will log the following:
.Bd -literal -offset indent
GEOM: provider: the primary GPT table is corrupt or invalid.
GEOM: provider: using the secondary instead -- recovery strongly advised.
@@ -777,32 +778,31 @@ GEOM: provider: using the primary only -
.Pp
Also
.Nm
-commands like
+commands such as
.Cm show , status
and
.Cm list
-will report about corrupt table.
+will report about corrupt tables.
.Pp
-In case when the size of device has changed (e.g.\& volume expansion) the
-secondary GPT header will become located not in the last sector.
+If the size of the device has changed (e.g.\& volume expansion) the
+secondary GPT header will no longer be located in the last sector.
This is not a metadata corruption, but it is dangerous because any
-corruption of the primary GPT will lead to lost of partition table.
-Kernel reports about this problem with message:
+corruption of the primary GPT will lead to loss of partition table.
+This problem is reported by the kernel with the message:
.Bd -literal -offset indent
GEOM: provider: the secondary GPT header is not in the last LBA.
.Ed
.Pp
-A corrupt table can be recovered with
+This situation can be recovered with the
.Cm recover
command.
-This command does reconstruction of corrupt metadata using
-known valid metadata.
-Also it can relocate secondary GPT to the end of device.
+This command reconstructs the corrupt metadata using known valid
+metadata and relocates the secondary GPT to the end of the device.
.Pp
.Em NOTE :
-The GEOM class PART can detect the same partition table on different GEOM
-providers and some of them will be marked as corrupt.
-Be careful when choosing a provider for recovering.
+The GEOM PART class can detect the same partition table visible through
+different GEOM providers, and some of them will be marked as corrupt.
+Be careful when choosing a provider for recovery.
If you choose incorrectly you can destroy the metadata of another GEOM class,
e.g.\& GEOM MIRROR or GEOM LABEL.
.Sh SYSCTL VARIABLES
@@ -815,11 +815,11 @@ The default value is shown next to each
.Bl -tag -width indent
.It Va kern.geom.part.check_integrity : No 1
This variable controls the behaviour of metadata integrity checks.
-When integrity checks are enabled
+When integrity checks are enabled, the
.Nm PART
-GEOM class verifies all generic partition parameters that it gets from the
+GEOM class verifies all generic partition parameters obtained from the
disk metadata.
-If some inconsistency is detected, partition table will be
+If some inconsistency is detected, the partition table will be
rejected with a diagnostic message:
.Sy "GEOM_PART: Integrity check failed (provider, scheme)" .
.El
Modified: user/hrs/ipv6/sbin/geom/class/sched/Makefile
==============================================================================
--- user/hrs/ipv6/sbin/geom/class/sched/Makefile Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/sbin/geom/class/sched/Makefile Wed Jun 8 12:03:34 2011 (r222858)
@@ -5,6 +5,4 @@
GEOM_CLASS= sched
-WARNS?= 6
-
.include <bsd.lib.mk>
Modified: user/hrs/ipv6/sbin/ifconfig/af_inet6.c
==============================================================================
--- user/hrs/ipv6/sbin/ifconfig/af_inet6.c Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/sbin/ifconfig/af_inet6.c Wed Jun 8 12:03:34 2011 (r222858)
@@ -499,8 +499,8 @@ static struct cmd inet6_cmds[] = {
DEF_CMD("-autoconf", -IN6_IFF_AUTOCONF, setip6flags),
DEF_CMD("accept_rtadv", ND6_IFF_ACCEPT_RTADV, setnd6flags),
DEF_CMD("-accept_rtadv",-ND6_IFF_ACCEPT_RTADV, setnd6flags),
- DEF_CMD("defroute_rtadv",ND6_IFF_DEFROUTE_RTADV,setnd6flags),
- DEF_CMD("-defroute_rtadv",-ND6_IFF_DEFROUTE_RTADV,setnd6flags),
+ DEF_CMD("no_radr", ND6_IFF_NO_RADR, setnd6flags),
+ DEF_CMD("-no_radr", -ND6_IFF_NO_RADR, setnd6flags),
DEF_CMD("defaultif", 1, setnd6defif),
DEF_CMD("-defaultif", -1, setnd6defif),
DEF_CMD("ifdisabled", ND6_IFF_IFDISABLED, setnd6flags),
Modified: user/hrs/ipv6/sbin/ifconfig/af_nd6.c
==============================================================================
--- user/hrs/ipv6/sbin/ifconfig/af_nd6.c Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/sbin/ifconfig/af_nd6.c Wed Jun 8 12:03:34 2011 (r222858)
@@ -58,7 +58,7 @@ static const char rcsid[] =
#define MAX_SYSCTL_TRY 5
#define ND6BITS "\020\001PERFORMNUD\002ACCEPT_RTADV\003PREFER_SOURCE" \
"\004IFDISABLED\005DONT_SET_IFROUTE\006AUTO_LINKLOCAL" \
- "\007DEFROUTE_RTADV\020DEFAULTIF"
+ "\007NO_RADR\020DEFAULTIF"
static int isnd6defif(int);
void setnd6flags(const char *, int, int, const struct afswtch *);
@@ -159,7 +159,6 @@ nd6_status(int s)
}
isdefif = isnd6defif(s6);
close(s6);
-
if (nd.ndi.flags == 0 && !isdefif)
return;
printb("\tnd6 options",
Modified: user/hrs/ipv6/sbin/ipfw/main.c
==============================================================================
--- user/hrs/ipv6/sbin/ipfw/main.c Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/sbin/ipfw/main.c Wed Jun 8 12:03:34 2011 (r222858)
@@ -356,6 +356,7 @@ ipfw_main(int oldac, char **oldav)
*/
co.do_nat = 0;
co.do_pipe = 0;
+ co.use_set = 0;
if (!strncmp(*av, "nat", strlen(*av)))
co.do_nat = 1;
else if (!strncmp(*av, "pipe", strlen(*av)))
@@ -444,7 +445,7 @@ static void
ipfw_readfile(int ac, char *av[])
{
#define MAX_ARGS 32
- char buf[BUFSIZ];
+ char buf[4096];
char *progname = av[0]; /* original program name */
const char *cmd = NULL; /* preprocessor name, if any */
const char *filename = av[ac-1]; /* file to read */
@@ -552,7 +553,7 @@ ipfw_readfile(int ac, char *av[])
}
}
- while (fgets(buf, BUFSIZ, f)) { /* read commands */
+ while (fgets(buf, sizeof(buf), f)) { /* read commands */
char linename[20];
char *args[2];
Modified: user/hrs/ipv6/sbin/mount/mount.8
==============================================================================
--- user/hrs/ipv6/sbin/mount/mount.8 Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/sbin/mount/mount.8 Wed Jun 8 12:03:34 2011 (r222858)
@@ -28,7 +28,7 @@
.\" @(#)mount.8 8.8 (Berkeley) 6/16/94
.\" $FreeBSD$
.\"
-.Dd April 28, 2011
+.Dd June 6, 2011
.Dt MOUNT 8
.Os
.Sh NAME
@@ -348,7 +348,6 @@ option) may be passed as a comma separat
distinguished by a leading
.Dq \&-
(dash).
-Options that take a value are specified using the syntax -option=value.
For example, the
.Nm
command:
@@ -363,6 +362,16 @@ to execute the equivalent of:
/sbin/mount_cd9660 -e /dev/cd0 /cdrom
.Ed
.Pp
+Options that take a value are specified using the -option=value syntax:
+.Bd -literal -offset indent
+mount -t msdosfs -o -u=fred,-g=wheel /dev/da0s1 /mnt
+.Ed
+.Pp
+is equivalent to
+.Bd -literal -offset indent
+/sbin/mount_msdosfs -u fred -g wheel /dev/da0s1 /mnt
+.Ed
+.Pp
Additional options specific to file system types
which are not internally known
(see the description of the
Modified: user/hrs/ipv6/sbin/mount/mount.c
==============================================================================
--- user/hrs/ipv6/sbin/mount/mount.c Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/sbin/mount/mount.c Wed Jun 8 12:03:34 2011 (r222858)
@@ -243,7 +243,7 @@ main(int argc, char *argv[])
const char *mntfromname, **vfslist, *vfstype;
struct fstab *fs;
struct statfs *mntbuf;
- int all, ch, i, init_flags, late, mntsize, rval, have_fstab, ro;
+ int all, ch, i, init_flags, late, failok, mntsize, rval, have_fstab, ro;
char *cp, *ep, *options;
all = init_flags = late = 0;
@@ -328,6 +328,10 @@ main(int argc, char *argv[])
continue;
if (hasopt(fs->fs_mntops, "late") && !late)
continue;
+ if (hasopt(fs->fs_mntops, "failok"))
+ failok = 1;
+ else
+ failok = 0;
if (!(init_flags & MNT_UPDATE) &&
ismounted(fs, mntbuf, mntsize))
continue;
@@ -335,7 +339,7 @@ main(int argc, char *argv[])
mntbuf->f_flags);
if (mountfs(fs->fs_vfstype, fs->fs_spec,
fs->fs_file, init_flags, options,
- fs->fs_mntops))
+ fs->fs_mntops) && !failok)
rval = 1;
}
} else if (fstab_style) {
@@ -717,6 +721,14 @@ mangle(char *options, struct cpa *a)
* before mountd starts.
*/
continue;
+ } else if (strcmp(p, "failok") == 0) {
+ /*
+ * "failok" is used to prevent certain file
+ * systems from being causing the system to
+ * drop into single user mode in the boot
+ * cycle, and is not a real mount option.
+ */
+ continue;
} else if (strncmp(p, "mountprog", 9) == 0) {
/*
* "mountprog" is used to force the use of
Modified: user/hrs/ipv6/sbin/rcorder/rcorder.8
==============================================================================
--- user/hrs/ipv6/sbin/rcorder/rcorder.8 Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/sbin/rcorder/rcorder.8 Wed Jun 8 12:03:34 2011 (r222858)
@@ -31,7 +31,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 9, 2008
+.Dd June 6, 2011
.Dt RCORDER 8
.Os
.Sh NAME
@@ -89,6 +89,12 @@ and
lines may appear, but all such lines must appear in a sequence without
any intervening lines, as once a line that does not follow the format
is reached, parsing stops.
+Note that for historical reasons,
+.Dq Li REQUIRES ,
+.Dq Li PROVIDES ,
+and
+.Dq Li KEYWORDS
+are also accepted in addition to the above.
.Pp
The options are as follows:
.Bl -tag -width indent
Modified: user/hrs/ipv6/share/man/man4/amdsbwd.4
==============================================================================
--- user/hrs/ipv6/share/man/man4/amdsbwd.4 Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/share/man/man4/amdsbwd.4 Wed Jun 8 12:03:34 2011 (r222858)
@@ -25,12 +25,12 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 30, 2009
+.Dd June 7, 2011
.Dt AMDSBWD 4
.Os
.Sh NAME
.Nm amdsbwd
-.Nd device driver for the AMD SB600/SB700/SB710/SB750 watchdog timer
+.Nd device driver for the AMD SB600/SB7xx/SB8xx watchdog timers
.Sh SYNOPSIS
To compile this driver into the kernel,
place the following line in your
@@ -51,7 +51,7 @@ The
driver provides
.Xr watchdog 4
support for the watchdog timers present on
-AMD SB600 and SB7xx south bridge chips.
+AMD SB600, SB7xx and SB8xx southbridges.
.Sh SEE ALSO
.Xr watchdog 4 ,
.Xr watchdog 8 ,
@@ -61,12 +61,14 @@ AMD SB600 and SB7xx south bridge chips.
The
.Nm
driver first appeared in
-.Fx 9.0 .
+.Fx 7.3
+and
+.Fx 8.1 .
.Sh AUTHORS
.An -nosplit
The
.Nm
driver was written by
-.An Andiry Gapon Aq avg at FreeBSD.org .
+.An Andriy Gapon Aq avg at FreeBSD.org .
This manual page was written by
-.An Andiry Gapon Aq avg at FreeBSD.org .
+.An Andriy Gapon Aq avg at FreeBSD.org .
Modified: user/hrs/ipv6/share/man/man4/atkbd.4
==============================================================================
--- user/hrs/ipv6/share/man/man4/atkbd.4 Wed Jun 8 11:36:06 2011 (r222857)
+++ user/hrs/ipv6/share/man/man4/atkbd.4 Wed Jun 8 12:03:34 2011 (r222858)
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 20, 2011
+.Dd January 29, 2008
.Dt ATKBD 4
.Os
.Sh NAME
@@ -176,11 +176,6 @@ When this option is given, the
.Nm
driver will not test the keyboard port during the probe routine.
Some machines hang during boot when this test is performed.
-.It bit 4 (PROBE_TYPEMATIC)
-When this option is given, the
-.Nm
-driver will try to probe the keyboard typematic rate on boot.
-Some machines hang during boot when this test is performed.
.El
.\".Sh FILES
.Sh EXAMPLES
Copied: user/hrs/ipv6/share/man/man4/geom_map.4 (from r222855, head/share/man/man4/geom_map.4)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/hrs/ipv6/share/man/man4/geom_map.4 Wed Jun 8 12:03:34 2011 (r222858, copy of r222855, head/share/man/man4/geom_map.4)
@@ -0,0 +1,211 @@
+.\"
+.\" Copyright (c) 2011 Aleksandr Rybalko
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 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.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd May 17, 2011
+.Dt GEOM_MAP 4
+.Os
+.Sh NAME
+.Nm geom_map
+.Nd "GEOM module that maps defined items as separate partitions"
+.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following line in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device geom_map"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+framework provides support for mapping defined parts of the media.
+Basically it is helpful for embedded devices where in the one continuous
+flash are loader, kernel and rootfs parts.
+.Nm
+allows making them available as separate parts and protects the loader from
+being overwritten.
+.Pp
+At boot time
+.Nm
+partitions are listed (only with bootverbose) as:
+.Bd -literal -offset indent
+MAP: 0x30000, data=0x30000 "/dev/map/bootloader"
+MAP: 30000x10000, data=0x10000 "/dev/map/factory"
+MAP: 40000x7a0000, data=0x7a0000 "/dev/map/upgrade"
+MAP: search key ".!/bin/sh" from 0x100000, step 0x10000
+MAP: 40000x110000, data=0x110000 "/dev/map/kernel"
+MAP: search key ".!/bin/sh" from 0x100000, step 0x10000
+MAP: 150000x690000, data=0x690000 "/dev/map/rootfs"
+MAP: 7e0000x20000, data=0x20000 "/dev/map/config"
+.Ed
+.Pp
+The current
+.Nm
+configuration can be accessed with the following
+.Xr sysctl 8
+nodes:
+.Va kern.geom.conftxt , kern.geom.confxml ,
+and
+.Va kern.geom.confdot
+or by using
+.Dq Li "geom map list" .
+.Bd -literal -offset indent
+# sysctl -n kern.geom.conftxt
+0 MD md0 10485760 512 u 0 s 512 f 0 fs 0 l 10485760 t malloc
+0 DISK cfid0 8388608 4 hd 0 sc 0
+1 MAP map/config 131072 4 i 5 o 8257536 entry 0 dsize 131072
+1 MAP map/rootfs 6881280 4 i 4 o 1376256 entry 0 dsize 6881280
+2 UNCOMPRESS map/rootfs.uncompress 18677760 512
+1 MAP map/kernel 1114112 4 i 3 o 262144 entry 0 dsize 1114112
+1 MAP map/upgrade 7995392 4 i 2 o 262144 entry 0 dsize 7995392
+1 MAP map/factory 65536 4 i 1 o 196608 entry 0 dsize 65536
+1 MAP map/bootloader 196608 4 i 0 o 0 entry 0 dsize 196608
+.Ed
+.Pp
+Driver configuration can be done in
+.Xr device.hints 5 .
+List of used parameters:
+.Bl -tag -width indent
+.It Va at
+select media to attach
+.It Va name
+name of partition (will create device
+.Pa /dev/map/ Ns Ar that_name )
+.It Va start
+offset from the beginning of the parent media to start of the mapped partition.
+This field can also have a special value
+.Qq Li search: Ns Ar searchstart Ns Li : Ns Ar searchstep Ns Li : Ns Ar searchkey ,
+where:
+.Bl -tag -width indent
+.It Ar searchstart
+offset from the beginning of the parent media where search will be started
+.It Ar searchstep
+value of the increment used while searching for the partition boundary markers
+.It Ar searchkey
+key which will be used to find partition boundary markers.
+The wildcard
+.Ql .\&
+can be used to match any character on that position
+.El
+.It Va end
+offset from the beginning of the parent media to the end of the mapped partition.
+This field can also have the special value
+.Qq Li search: Ns Ar searchstart Ns Li : Ns Ar searchstep Ns Li : Ns Ar searchkey ,
+as described above.
+.It Va offset
+offset where the data of the mapped partition begins
+.El
+.Pp
+Each record contains the start address (in bytes) from the media begin, size
+(in bytes), offset where the data of mapped partition begins, and the name of
+new device.
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list