PERFORCE change 167530 for review
Alexander Motin
mav at FreeBSD.org
Thu Aug 20 11:40:55 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=167530
Change 167530 by mav at mav_mavbook on 2009/08/20 11:40:44
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate
.. //depot/projects/scottl-camlock/src/cddl/lib/libnvpair/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/top/display.c#3 integrate
.. //depot/projects/scottl-camlock/src/etc/freebsd-update.conf#3 integrate
.. //depot/projects/scottl-camlock/src/release/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate
.. //depot/projects/scottl-camlock/src/release/svnbranch.awk#1 branch
.. //depot/projects/scottl-camlock/src/sbin/bsdlabel/bsdlabel.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/part/geom_part.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/umount/umount.8#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mfi.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mpt.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/polling.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/freebsd-update.conf.5#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man7/release.7#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/taskqueue.9#3 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/pmc_mdep.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_dev_at91usart.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/gptboot/gptboot.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#27 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#97 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/taskq.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/vnode.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#3 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#30 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pfvar.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_core.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_piv.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_ppro.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_x86.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iscsi/initiator/isc_cam.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/e1000phy.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_busdma.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_process.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_process.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clsubs.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_gpt.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/apicvar.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/pmc_mdep.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/mp_machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/genassym.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mp_machdep.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_poll.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_rwlock.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sx.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_taskqueue.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty_pty.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/zfs/Makefile#9 integrate
.. //depot/projects/scottl-camlock/src/sys/net/flowtable.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/net/flowtable.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if.c#34 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_var.h#24 integrate
.. //depot/projects/scottl-camlock/src/sys/net/vnet.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_input.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_os_bsd.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_timer.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/systm.h#21 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/taskqueue.h#7 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.freebsd#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/fstat/fstat.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/fstat/zfs.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/iostat/iostat.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mfiutil/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mfiutil/README#2 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/mfiutil/mfiutil.1#2 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/mfiutil/mfiutil.8#1 branch
.. //depot/projects/scottl-camlock/src/usr.sbin/mptutil/mptutil.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pstat/pstat.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/media.c#4 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 (text+ko) ====
@@ -1126,7 +1126,7 @@
uint64_t originguid = 0;
uint64_t stream_originguid = 0;
uint64_t parent_fromsnap_guid, stream_parent_fromsnap_guid;
- char *fsname, *stream_fsname;
+ char *fsname, *stream_fsname, *p1, *p2;
nextfselem = nvlist_next_nvpair(local_nv, fselem);
@@ -1295,10 +1295,11 @@
"parentfromsnap", &stream_parent_fromsnap_guid));
/* check for rename */
+ p1 = strrchr(fsname, '/');
+ p2 = strrchr(stream_fsname, '/');
if ((stream_parent_fromsnap_guid != 0 &&
stream_parent_fromsnap_guid != parent_fromsnap_guid) ||
- strcmp(strrchr(fsname, '/'),
- strrchr(stream_fsname, '/')) != 0) {
+ (p1 != NULL && p2 != NULL && strcmp (p1, p2) != 0)) {
nvlist_t *parent;
char tryname[ZFS_MAXNAMELEN];
@@ -1317,7 +1318,7 @@
VERIFY(0 == nvlist_lookup_string(parent, "name",
&pname));
(void) snprintf(tryname, sizeof (tryname),
- "%s%s", pname, strrchr(stream_fsname, '/'));
+ "%s%s", pname, p2 != NULL ? p2 : "");
} else {
tryname[0] = '\0';
if (flags.verbose) {
==== //depot/projects/scottl-camlock/src/cddl/lib/libnvpair/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.4 2008/03/27 23:21:23 jb Exp $
+# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.5 2009/08/17 08:03:02 pjd Exp $
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/nvpair
@@ -13,5 +13,6 @@
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys
.include <bsd.lib.mk>
==== //depot/projects/scottl-camlock/src/contrib/top/display.c#3 (text+ko) ====
@@ -8,7 +8,7 @@
* Copyright (c) 1984, 1989, William LeFebvre, Rice University
* Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
*
- * $FreeBSD: src/contrib/top/display.c,v 1.10 2008/01/18 01:43:13 peter Exp $
+ * $FreeBSD: src/contrib/top/display.c,v 1.11 2009/08/19 15:17:13 jhb Exp $
*/
/*
@@ -452,6 +452,7 @@
lastline++;
/* now walk thru the names and print the line */
+ Move_to(cpustates_column, y_cpustates + cpu);
while ((thisname = *names++) != NULL)
{
if (*thisname != '\0')
@@ -543,6 +544,7 @@
printf("\nCPU %d: ", cpu);
lastline++;
+ Move_to(cpustates_column, y_cpustates + cpu);
while ((thisname = *names++) != NULL)
{
if (*thisname != '\0')
==== //depot/projects/scottl-camlock/src/etc/freebsd-update.conf#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/freebsd-update.conf,v 1.6 2008/08/08 10:36:16 cperciva Exp $
+# $FreeBSD: src/etc/freebsd-update.conf,v 1.7 2009/08/19 20:47:31 simon Exp $
# Trusted keyprint. Changing this is a Bad Idea unless you've received
# a PGP-signed email from <security-officer at FreeBSD.org> telling you to
@@ -63,3 +63,14 @@
# which *might* be installed of which FreeBSD Update should figure out
# which actually are installed and upgrade those (StrictComponents no)?
# StrictComponents no
+
+# When installing a new kernel perform a backup of the old one first
+# so it is possible to boot the old kernel in case of problems.
+# BackupKernel yes
+
+# If BackupKernel is enabled, the backup kernel is saved to this
+# directory.
+# BackupKernelDir /boot/kernel.old
+
+# When backing up a kernel also back up debug symbol files?
+# BackupKernelSymbolFiles no
==== //depot/projects/scottl-camlock/src/release/Makefile#5 (text+ko) ====
@@ -1,7 +1,8 @@
-# $FreeBSD: src/release/Makefile,v 1.943 2009/06/28 08:59:46 blackend Exp $
+# $FreeBSD: src/release/Makefile,v 1.944 2009/08/14 20:35:42 jhb Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
-# [RELEASETAG=tag]
+# [RELEASETAG=tag] [SVNROOT=svn://svn.freebsd.org/base] \
+# [SVNBRANCH=some/branch]
#
# Where "/some/dir" is the pathname of a directory on a some filesystem with
# at least 1000MB of free space, "somename" is what you want the release to
@@ -9,6 +10,11 @@
# which CVS "tag" name should be used when checking out the sources to build
# the release (default is HEAD).
#
+# Please note the support for building from SVN is preliminary and there
+# are still questions about things like how to handle updates of
+# /usr/src on production systems (csup(1) replacement). It is a work
+# in progress and may change as the other issues get worked out.
+#
# Please note: the md(4) driver must be present in the kernel
# (either by being compiled in or available as a kld(4) module),
# otherwise the target 'release.8' and possibly others will fail.
@@ -49,12 +55,25 @@
# To add other options to the CVS command, set
#CVSARGS="-lfq"
#
-# To prefix the cvs command
+# To prefix the CVS command
#CVSPREFIX="/usr/bin/time"
#
# Where the CVS repository is
#CVSROOT="/home/ncvs"
#
+# To add other options to the Subversion subcommands (co,up), set
+#SVNCMDARGS="-r '{ 01/01/2002 00:00:00 UTC }'"
+#
+# To prefix the Subversion command
+#SVNPREFIX="/usr/bin/time"
+#
+# Where the Subversion repository is
+#SVNROOT=svn://svn.freebsd.org/base
+#
+# Subversion branch to build for src. If this is not set then it is
+# automatically computed from RELEASETAG.
+#SVNBRANCH=stable/7
+#
# Non-zero if ${RELEASETAG} is in the form "RELENG_ver_RELEASE"; we
# are building an official release. Otherwise, we are building for
# a branch.
@@ -68,6 +87,16 @@
.endif
.endif
+# Determine the Subversion source branch that corresponds to the requested
+# RELEASETAG.
+.if !defined(SVNBRANCH)
+.if defined(RELEASETAG)
+SVNBRANCH!= echo "${RELEASETAG}" | awk -f ${.CURDIR}/svnbranch.awk
+.else
+SVNBRANCH= head
+.endif
+.endif
+
# If you want to pass flags to the world build such as -j X, use
# WORLD_FLAGS. Similarly, you can specify make flags for kernel
# builds via KERNEL_FLAGS.
@@ -341,8 +370,17 @@
WORLDDIR?= ${.CURDIR}/..
release rerelease:
-.if !defined(CHROOTDIR) || !defined(BUILDNAME) || !defined(CVSROOT)
- @echo "To make a release you must set CHROOTDIR, BUILDNAME and CVSROOT" && false
+.if !defined(CHROOTDIR) || !defined(BUILDNAME)
+ @echo "To make a release you must set CHROOTDIR and BUILDNAME" && false
+.endif
+.if !defined(NOPORTSATALL) && !defined(EXTPORTSDIR) && !defined(CVSROOT)
+ @echo "Building ports requires CVSROOT or EXTPORTSDIR" && false
+.endif
+.if !defined(NODOC) && !defined(EXTDOCDIR) && !defined(CVSROOT)
+ @echo "Building docs requires CVSROOT or EXTDOCDIR" && false
+.endif
+.if !defined(EXTSRCDIR) && !defined(CVSROOT) && !defined(SVNROOT)
+ @echo "The source tree requires SVNROOT, CVSROOT, or EXTSRCDIR" && false
.endif
.if defined(NOPORTSATALL) && !defined(NODOC)
@echo "Ports are required for building the release docs. Either set NODOC or"
@@ -387,6 +425,10 @@
.if defined(EXTSRCDIR)
cd ${CHROOTDIR}/usr && \
cp -R -H ${EXTSRCDIR} src
+.elif defined(SVNROOT)
+ cd ${CHROOTDIR}/usr && \
+ ${SVNPREFIX} svn co ${SVNCMDARGS} ${SVNROOT}/${SVNBRANCH} \
+ ${RELEASESRCMODULE}
.else
cd ${CHROOTDIR}/usr && \
${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} \
@@ -432,7 +474,10 @@
.endif
.if make(rerelease)
.if !defined(RELEASENOUPDATE) && !defined(EXTSRCDIR)
-.if !defined(RELEASETAG)
+.if defined(SVNROOT)
+ cd ${CHROOTDIR}/usr/src && ${SVNPREFIX} svn switch ${SVNCMDARGS} \
+ ${SVNROOT}/${SVNBRANCH}
+.elif !defined(RELEASETAG)
cd ${CHROOTDIR}/usr/src && ${CVSPREFIX} cvs -R ${CVSARGS} -q \
update ${CVSCMDARGS} -P -d -A
.else
==== //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 (text+ko) ====
@@ -17,7 +17,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1101 2009/05/18 22:46:59 delphij Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1102 2009/08/19 03:52:15 edwin Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -411,6 +411,9 @@
<para>&man.top.1; now supports a <option>-P</option> flag to
provide per-CPU usage statistics.</para>
+ <para>&man.zdump.8; is now working properly on 64 bit architectures.
+ </para>
+
<para>&man.traceroute.8; now has the ability to print the AS
number for each hop with the new <option>-a</option> switch; a
new <option>-A</option> option allows selecting a particular
@@ -468,8 +471,15 @@
8.14.1 to 8.14.3.</para>
<para role="merged">The timezone database has been updated from
- the <application>tzdata2008b</application> release to
- the <application>tzdata2008h</application> release.</para>
+ the <application>tzdata2008h</application> release to
+ the <application>tzdata2009j</application> release.</para>
+
+ <para>The stdtime part of libc, &man.zdump.8 and &man.zic.8
+ have been updated from the <application>tzcode2004a</application>
+ release to the <application>tzcode2009h</application> release.
+ If you have upgraded from source or via the &man.freebsd-update.8,
+ then please run &man.tzsetup.8 to install a new /etc/localtime.
+ </para>
<para><application>WPA Supplicant</application> has been
updated from 0.5.8 to 0.5.10.</para>
==== //depot/projects/scottl-camlock/src/sbin/bsdlabel/bsdlabel.c#3 (text+ko) ====
@@ -53,7 +53,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.117 2008/09/30 11:46:14 lulf Exp $");
+__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.118 2009/08/19 16:29:20 marcel Exp $");
#include <sys/param.h>
#include <stdint.h>
@@ -118,7 +118,7 @@
static int allfields; /* present all fields in edit */
static char const *xxboot; /* primary boot */
-static off_t mbroffset;
+static uint32_t lba_offset;
#ifndef LABELSECTOR
#define LABELSECTOR -1
#endif
@@ -403,7 +403,7 @@
readboot();
for (i = 0; i < lab.d_npartitions; i++)
if (lab.d_partitions[i].p_size)
- lab.d_partitions[i].p_offset += mbroffset;
+ lab.d_partitions[i].p_offset += lba_offset;
bsd_disklabel_le_enc(bootarea + labeloffset + labelsoffset * secsize,
lp);
if (alphacksum) {
@@ -479,10 +479,9 @@
static int
readlabel(int flag)
{
+ uint32_t lba;
int f, i;
int error;
- struct gctl_req *grq;
- char const *errstr;
f = open(specname, O_RDONLY);
if (f < 0)
@@ -510,22 +509,28 @@
if (is_file)
return(0);
- grq = gctl_get_handle();
- gctl_ro_param(grq, "verb", -1, "read mbroffset");
- gctl_ro_param(grq, "class", -1, "BSD");
- gctl_ro_param(grq, "geom", -1, pname);
- gctl_rw_param(grq, "mbroffset", sizeof(mbroffset), &mbroffset);
- errstr = gctl_issue(grq);
- if (errstr != NULL) {
- mbroffset = 0;
- gctl_free(grq);
- return (error);
+
+ /*
+ * Compensate for absolute block addressing by finding the
+ * smallest partition offset and if the offset of the 'c'
+ * partition is equal to that, subtract it from all offsets.
+ */
+ lba = ~0;
+ for (i = 0; i < lab.d_npartitions; i++) {
+ if (lab.d_partitions[i].p_size)
+ lba = MIN(lba, lab.d_partitions[i].p_offset);
}
- mbroffset /= lab.d_secsize;
- if (lab.d_partitions[RAW_PART].p_offset == mbroffset)
- for (i = 0; i < lab.d_npartitions; i++)
+ if (lba != 0 && lab.d_partitions[RAW_PART].p_offset == lba) {
+ for (i = 0; i < lab.d_npartitions; i++) {
if (lab.d_partitions[i].p_size)
- lab.d_partitions[i].p_offset -= mbroffset;
+ lab.d_partitions[i].p_offset -= lba;
+ }
+ /*
+ * Save the offset so that we can write the label
+ * back with absolute block addresses.
+ */
+ lba_offset = lba;
+ }
return (error);
}
==== //depot/projects/scottl-camlock/src/sbin/geom/class/part/geom_part.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.20 2009/06/08 15:54:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.21 2009/08/16 21:27:35 marcel Exp $");
#include <sys/stat.h>
@@ -274,8 +274,18 @@
error = geom_gettree(&mesh);
if (error)
return (error);
- cp = find_class(&mesh, gctl_get_ascii(req, "class"));
- gp = find_geom(cp, gctl_get_ascii(req, "geom"));
+ s = gctl_get_ascii(req, "class");
+ if (s == NULL)
+ abort();
+ cp = find_class(&mesh, s);
+ if (cp == NULL)
+ errx(EXIT_FAILURE, "Class %s not found.", s);
+ s = gctl_get_ascii(req, "geom");
+ if (s == NULL)
+ abort();
+ gp = find_geom(cp, s);
+ if (gp == NULL)
+ errx(EXIT_FAILURE, "No such geom: %s.", s);
first = atoll(find_geomcfg(gp, "first"));
last = atoll(find_geomcfg(gp, "last"));
grade = ~0ULL;
@@ -536,6 +546,8 @@
errx(EXIT_FAILURE, "Class %s not found.", s);
}
s = gctl_get_ascii(req, "geom");
+ if (s == NULL)
+ abort();
gp = find_geom(classp, s);
if (gp == NULL)
errx(EXIT_FAILURE, "No such geom: %s.", s);
==== //depot/projects/scottl-camlock/src/sbin/umount/umount.8#2 (text+ko) ====
@@ -26,7 +26,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)umount.8 8.2 (Berkeley) 5/8/95
-.\" $FreeBSD: src/sbin/umount/umount.8,v 1.20 2004/04/09 19:58:40 markm Exp $
+.\" $FreeBSD: src/sbin/umount/umount.8,v 1.21 2009/08/17 07:38:47 pjd Exp $
.\"
.Dd July 18, 2003
.Dt UMOUNT 8
@@ -57,7 +57,8 @@
or by the file system ID
.Ar fsid
as reported by
-.Dq mount -v .
+.Dq mount -v
+when run by root.
.Pp
The options are as follows:
.Bl -tag -width indent
==== //depot/projects/scottl-camlock/src/share/man/man4/mfi.4#3 (text) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/mfi.4,v 1.7 2008/01/17 19:36:13 ambrisko Exp $
+.\" $FreeBSD: src/share/man/man4/mfi.4,v 1.8 2009/08/15 11:47:05 trasz Exp $
.\"
-.Dd January 17, 2008
+.Dd August 15, 2009
.Dt MFI 4
.Os
.Sh NAME
@@ -102,6 +102,7 @@
An attempt was made to remove a mounted volume.
.El
.Sh SEE ALSO
+.Xr mfiutil 1 ,
.Xr amr 4 ,
.Xr pci 4
.Sh HISTORY
==== //depot/projects/scottl-camlock/src/share/man/man4/mpt.4#4 (text+ko) ====
@@ -33,9 +33,9 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/mpt.4,v 1.16 2009/05/05 13:48:53 trasz Exp $
+.\" $FreeBSD: src/share/man/man4/mpt.4,v 1.17 2009/08/15 11:47:05 trasz Exp $
.\"
-.Dd April 6, 2007
+.Dd August 15, 2009
.Dt MPT 4
.Os
.Sh NAME
@@ -155,6 +155,7 @@
.Xr sa 4 ,
.Xr scsi 4 ,
.Xr targ 4 ,
+.Xr mptutil 8 ,
.Xr gmultipath 8
.Rs
.%T "LSI Logic Website"
==== //depot/projects/scottl-camlock/src/share/man/man4/polling.4#3 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/polling.4,v 1.27 2007/04/06 14:25:14 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/polling.4,v 1.28 2009/08/15 23:07:43 rwatson Exp $
.\"
.Dd April 6, 2007
.Dt POLLING 4
@@ -87,6 +87,16 @@
It is turned on and off with help of
.Xr ifconfig 8
command.
+.Pp
+The historic
+.Va kern.polling.enable ,
+which enabled polling for all interfaces, can be replaced with the following
+code:
+.Bd -literal
+for i in `ifconfig -l` ;
+ do ifconfig $i polling; # use -polling to disable
+done
+.Ed
.Ss MIB Variables
The operation of
.Nm
@@ -156,15 +166,6 @@
How many active devices have registered for
.Nm .
.Pp
-.It Va kern.polling.enable
-Legacy MIB, that was used to enable or disable polling globally.
-Currently if set to 1,
-.Nm
-is enabled on all capable interfaces.
-If set to 0,
-.Nm
-is disabled on all interfaces.
-.Pp
.It Va kern.polling.short_ticks
.It Va kern.polling.lost_polls
.It Va kern.polling.pending_polls
==== //depot/projects/scottl-camlock/src/share/man/man5/freebsd-update.conf.5#3 (text+ko) ====
@@ -23,9 +23,9 @@
.\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/freebsd-update.conf.5,v 1.4 2008/08/02 00:13:51 cperciva Exp $
+.\" $FreeBSD: src/share/man/man5/freebsd-update.conf.5,v 1.5 2009/08/19 20:47:31 simon Exp $
.\"
-.Dd August 30, 2006
+.Dd August 19, 2009
.Dt FREEBSD-UPDATE.CONF 5
.Os FreeBSD
.Sh NAME
@@ -48,7 +48,7 @@
.Pp
The possible options and their meanings are as follows:
.Pp
-.Bl -tag -width "KeepModifiedMetadata"
+.Bl -tag -width ".Cm BackupKernelSymbolFiles"
.It Cm KeyPrint
The single parameter following this keyword is the SHA256 hash
of the RSA key which will be trusted to sign updates.
@@ -171,6 +171,54 @@
which might be installed, of which
.Cm freebsd-update
should identify which in fact are present ("no").
+.It Cm BackupKernel
+The single parameter following this keyword must be
+.Dq yes
+or
+.Dq no
+and specifies whether
+.Cm freebsd-update
+will create a backup of the old kernel before installing a new kernel.
+This backup kernel can be used to recover a system where the newly
+installed kernel somehow did not work.
+Note that the backup kernel is not reverted to its original state by
+the
+.Cm freebsd-update
+rollback command.
+.It Cm BackupKernelDir
+This keyword sets the directory which is used to store a backup
+kernel, if the BackupKernel feature is enabled.
+If the directory already exist, and it was not created by
+.Cm freebsd-update ,
+the directory is skipped.
+In the case of the primary directory name not being usable, a number
+starting with
+.Sq 1
+is appended to the directory name.
+Like with the primary directory name, the constructed directory name is
+only used if the path name does not exist, or if the directory was
+previously created by
+.Cm freebsd-update .
+If the constructed directory still exist the appended number is
+incremented with 1 and the directory search process restarted.
+Should the number increment go above 9,
+.Cm freebsd-update
+will abort.
+.It Cm BackupKernelSymbolFiles
+The single parameter following this keyword must be
+.Dq yes
+or
+.Dq no
+and specifies whether
+.Cm freebsd-update
+will also backup kernel symbol files, if they exist.
+The kernel symbol files takes up a lot of disk space and are not
+needed for recovery purposes.
+If the symbol files are needed, after recovering a system using the
+backup kernel, the
+.Cm freebsd-update
+rollback command will recreate the symbol files along with the old
+kernel.
.El
.Sh FILES
.Bl -tag -width "/etc/freebsd-update.conf"
==== //depot/projects/scottl-camlock/src/share/man/man7/release.7#2 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man7/release.7,v 1.58 2006/11/11 23:18:28 ru Exp $
+.\" $FreeBSD: src/share/man/man7/release.7,v 1.60 2009/08/18 12:24:27 trhodes Exp $
.\"
-.Dd November 12, 2006
+.Dd August 17, 2009
.Dt RELEASE 7
.Os
.Sh NAME
@@ -332,6 +332,10 @@
A script that will be run in the
.Xr chroot 8
environment immediately after any local patches are applied.
+.It Va MAKE_DVD
+If defined, build a bootable ISO DVD image in the CD-ROM
+stage directory.
+This option may not be available for all architectures.
.It Va MAKE_ISOS
If defined, bootable ISO CD-ROM images will be created from the
contents of the CD-ROM stage directory.
@@ -390,6 +394,35 @@
.It Va SEPARATE_LIVEFS
Store the live file system on its own CD-ROM image rather than placing it on
the first disc.
+.It Va SVNCMDARGS
+Additional arguments for svn
+.Ic checkout
+and
+.Ic switch
+commands.
+.It Va SVNROOT
+The location of the FreeBSD SVN source repository.
+If this variable is set,
+then the source tree will be extracted using Subversion rather than
+CVS.
+.It Va SVNBRANCH
+The branch to check out from a SVN source repository.
+It is specified as a path such as
+.Pa head
+or
+.Pa stable/7 .
+If this variable is not set,
+then the branch that corresponds to the current value of
+.Va RELEASETAG
+will be used.
+If neither
+.Va SVNBRANCH
+nor
+.Va RELEASETAG
+are set,
+then the
+.Pa head
+branch will be used.
.It Va TARGET_ARCH
The target machine processor architecture.
This is analogous to the
@@ -474,6 +507,7 @@
.Xr install 1 ,
.Xr make 1 ,
.Xr patch 1 ,
+.Xr svn 1 Pq Pa ports/devel/subversion-freebsd ,
.Xr uname 1 ,
.Xr md 4 ,
.Xr make.conf 5 ,
@@ -511,7 +545,7 @@
into a shape where it could at least automate most of the tediousness
of building a release in a sterile environment.
.Pp
-With its almost 1000 revisions spread over multiple branches, the
+At near 1000 revisions spread over multiple branches, the
.Xr cvs 1
log of
.Pa src/release/Makefile
==== //depot/projects/scottl-camlock/src/share/man/man9/taskqueue.9#3 (text+ko) ====
@@ -26,9 +26,9 @@
.\" (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: src/share/man/man9/taskqueue.9,v 1.24 2008/06/13 19:45:12 gonzo Exp $
+.\" $FreeBSD: src/share/man/man9/taskqueue.9,v 1.27 2009/08/18 13:55:48 pjd Exp $
.\"
-.Dd June 13, 2008
+.Dd August 18, 2009
.Dt TASKQUEUE 9
.Os
.Sh NAME
@@ -59,8 +59,6 @@
.Fn taskqueue_create_fast "const char *name" "int mflags" "taskqueue_enqueue_fn enqueue" "void *context"
.Ft void
.Fn taskqueue_free "struct taskqueue *queue"
-.Ft struct taskqueue *
-.Fn taskqueue_find "const char *name"
.Ft int
.Fn taskqueue_enqueue "struct taskqueue *queue" "struct task *task"
.Ft int
@@ -71,6 +69,8 @@
.Fn taskqueue_run_fast "struct taskqueue *queue"
.Ft void
.Fn taskqueue_drain "struct taskqueue *queue" "struct task *task"
+.Ft int
+.Fn taskqueue_member "struct taskqueue *queue" "struct thread *td"
.Fn TASK_INIT "struct task *task" "int priority" "task_fn_t *func" "void *context"
.Fn TASKQUEUE_DECLARE "name"
.Fn TASKQUEUE_DEFINE "name" "taskqueue_enqueue_fn enqueue" "void *context" "init"
@@ -113,16 +113,10 @@
.Pp
The function
.Fn taskqueue_free
-should be used to remove the queue from the global list of queues
-and free the memory used by the queue.
+should be used to free the memory used by the queue.
Any tasks that are on the queue will be executed at this time after
which the thread servicing the queue will be signaled that it should exit.
.Pp
-The system maintains a list of all queues which can be searched using
-.Fn taskqueue_find .
-The first queue whose name matches is returned, otherwise
-.Dv NULL .
-.Pp
To add a task to the list of tasks queued on a taskqueue, call
.Fn taskqueue_enqueue
with pointers to the queue and task.
@@ -182,6 +176,18 @@
enqueued after call to
.Fn taskqueue_drain .
.Pp
+The
+.Fn taskqueue_member
+function returns
+.No 1
+if the given thread
+.Fa td
+is part of the given taskqeueue
+.Fa queue
+and
+.No 0
+otherwise.
+.Pp
A convenience macro,
.Fn TASK_INIT "task" "priority" "func" "context"
is provided to initialise a
==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#22 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.59 2009/08/13 17:09:45 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.60 2009/08/14 21:05:08 jhb Exp $");
#include "opt_hwpmc_hooks.h"
#include "opt_kdtrace.h"
@@ -123,7 +123,7 @@
{ 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 }, /* LINT1: NMI */
{ 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_TIMER_INT }, /* Timer */
{ 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_ERROR_INT }, /* Error */
- { 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 }, /* PMC */
+ { 1, 1, 1, 1, APIC_LVT_DM_NMI, 0 }, /* PMC */
{ 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_THERMAL_INT }, /* Thermal */
};
@@ -305,11 +305,9 @@
lapic->lvt_lint0 = lvt_mode(la, LVT_LINT0, lapic->lvt_lint0);
lapic->lvt_lint1 = lvt_mode(la, LVT_LINT1, lapic->lvt_lint1);
-#ifdef HWPMC_HOOKS
/* Program the PMC LVT entry if present. */
if (maxlvt >= LVT_PMC)
lapic->lvt_pcint = lvt_mode(la, LVT_PMC, lapic->lvt_pcint);
-#endif
/* Program timer LVT and setup handler. */
lapic->lvt_timer = lvt_mode(la, LVT_TIMER, lapic->lvt_timer);
@@ -332,6 +330,88 @@
intr_restore(eflags);
}
+void
+lapic_reenable_pmc(void)
+{
+#ifdef HWPMC_HOOKS
+ uint32_t value;
+
+ value = lapic->lvt_pcint;
+ value &= ~APIC_LVT_M;
+ lapic->lvt_pcint = value;
+#endif
+}
+
+#ifdef HWPMC_HOOKS
+static void
+lapic_update_pmc(void *dummy)
+{
+ struct lapic *la;
+
+ la = &lapics[lapic_id()];
+ lapic->lvt_pcint = lvt_mode(la, LVT_PMC, lapic->lvt_pcint);
+}
+#endif
+
+int
+lapic_enable_pmc(void)
+{
+#ifdef HWPMC_HOOKS
+ u_int32_t maxlvt;
+
+ /* Fail if the local APIC is not present. */
+ if (lapic == NULL)
+ return (0);
+
+ /* Fail if the PMC LVT is not present. */
+ maxlvt = (lapic->version & APIC_VER_MAXLVT) >> MAXLVTSHIFT;
+ if (maxlvt < LVT_PMC)
+ return (0);
+
+ lvts[LVT_PMC].lvt_masked = 0;
+
+#ifdef SMP
+ /*
+ * If hwpmc was loaded at boot time then the APs may not be
+ * started yet. In that case, don't forward the request to
+ * them as they will program the lvt when they start.
+ */
+ if (smp_started)
+ smp_rendezvous(NULL, lapic_update_pmc, NULL, NULL);
+ else
+#endif
+ lapic_update_pmc(NULL);
+ return (1);
+#else
+ return (0);
+#endif
+}
+
+void
+lapic_disable_pmc(void)
+{
+#ifdef HWPMC_HOOKS
+ u_int32_t maxlvt;
+
+ /* Fail if the local APIC is not present. */
+ if (lapic == NULL)
+ return;
+
+ /* Fail if the PMC LVT is not present. */
+ maxlvt = (lapic->version & APIC_VER_MAXLVT) >> MAXLVTSHIFT;
+ if (maxlvt < LVT_PMC)
+ return;
+
+ lvts[LVT_PMC].lvt_masked = 1;
+
+#ifdef SMP
+ /* The APs should always be started when hwpmc is unloaded. */
+ KASSERT(mp_ncpus == 1 || smp_started, ("hwpmc unloaded too early"));
+#endif
+ smp_rendezvous(NULL, lapic_update_pmc, NULL, NULL);
+#endif
+}
+
/*
* Called by cpu_initclocks() on the BSP to setup the local APIC timer so
* that it can drive hardclock, statclock, and profclock. This function
==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#26 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.707 2009/08/02 11:26:23 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.708 2009/08/19 20:39:33 ed Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -217,6 +217,7 @@
strncmp(sysenv, "MacBook3,1", 10) == 0 ||
strncmp(sysenv, "MacBookPro1,1", 13) == 0 ||
strncmp(sysenv, "MacBookPro1,2", 13) == 0 ||
+ strncmp(sysenv, "MacBookPro3,1", 13) == 0 ||
strncmp(sysenv, "Macmini1,1", 10) == 0) {
if (bootverbose)
printf("Disabling LEGACY_USB_EN bit on "
==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#30 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.667 2009/07/24 13:50:29 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.668 2009/08/17 13:27:55 kib Exp $");
/*
* Manages physical address maps.
@@ -2261,6 +2261,8 @@
" in pmap %p", va, pmap);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list