PERFORCE change 110223 for review
Sam Leffler
sam at FreeBSD.org
Tue Nov 21 16:17:04 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=110223
Change 110223 by sam at sam_ebb on 2006/11/18 18:43:31
IFC @ 110222
Affected files ...
.. //depot/projects/arm/src/ObsoleteFiles.inc#12 integrate
.. //depot/projects/arm/src/UPDATING#8 integrate
.. //depot/projects/arm/src/lib/libarchive/archive.h.in#4 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_private.h#4 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_read_open_file.c#5 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_write.c#5 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_write_open_file.c#3 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_cpio.c#3 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_pax.c#3 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_shar.c#3 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_ustar.c#3 integrate
.. //depot/projects/arm/src/release/Makefile#7 integrate
.. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 integrate
.. //depot/projects/arm/src/release/scripts/package-split.py#4 integrate
.. //depot/projects/arm/src/release/sun4v/boot_crunch.conf#1 branch
.. //depot/projects/arm/src/sbin/mount/mount.c#4 integrate
.. //depot/projects/arm/src/share/man/man4/Makefile#4 integrate
.. //depot/projects/arm/src/share/man/man4/uark.4#1 branch
.. //depot/projects/arm/src/share/man/man4/ucom.4#2 integrate
.. //depot/projects/arm/src/share/man/man4/uhid.4#2 integrate
.. //depot/projects/arm/src/share/man/man4/uhidev.4#2 delete
.. //depot/projects/arm/src/share/man/man9/sleepqueue.9#2 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/db_trace.c#10 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#8 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#9 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#17 integrate
.. //depot/projects/arm/src/sys/amd64/include/reg.h#3 integrate
.. //depot/projects/arm/src/sys/arm/arm/nexus.c#5 integrate
.. //depot/projects/arm/src/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate
.. //depot/projects/arm/src/sys/arm/xscale/i80321/iq31244_machdep.c#13 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0/Makefile#11 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/Makefile#10 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#15 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/Makefile#9 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#23 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#21 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#19 integrate
.. //depot/projects/arm/src/sys/boot/i386/loader/main.c#7 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_getcwd.c#7 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#19 integrate
.. //depot/projects/arm/src/sys/conf/files.sun4v#4 integrate
.. //depot/projects/arm/src/sys/ddb/db_watch.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-all.c#15 integrate
.. //depot/projects/arm/src/sys/dev/bce/if_bce.c#12 integrate
.. //depot/projects/arm/src/sys/dev/bce/if_bcereg.h#5 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp.c#14 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_library.c#8 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_library.h#5 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#17 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_stds.h#3 integrate
.. //depot/projects/arm/src/sys/dev/isp/ispmbox.h#8 integrate
.. //depot/projects/arm/src/sys/dev/isp/ispvar.h#13 integrate
.. //depot/projects/arm/src/sys/dev/mfi/mfi.c#11 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#27 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#18 integrate
.. //depot/projects/arm/src/sys/dev/nfe/if_nfe.c#7 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci.c#17 integrate
.. //depot/projects/arm/src/sys/dev/syscons/syscons.c#12 integrate
.. //depot/projects/arm/src/sys/fs/procfs/procfs_ioctl.c#5 integrate
.. //depot/projects/arm/src/sys/i386/i386/db_trace.c#9 integrate
.. //depot/projects/arm/src/sys/i386/i386/intr_machdep.c#8 integrate
.. //depot/projects/arm/src/sys/i386/i386/io_apic.c#8 integrate
.. //depot/projects/arm/src/sys/i386/i386/machdep.c#21 integrate
.. //depot/projects/arm/src/sys/i386/i386/pmap.c#24 integrate
.. //depot/projects/arm/src/sys/i386/include/reg.h#4 integrate
.. //depot/projects/arm/src/sys/kern/kern_condvar.c#5 integrate
.. //depot/projects/arm/src/sys/kern/kern_synch.c#14 integrate
.. //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#11 integrate
.. //depot/projects/arm/src/sys/kern/sysv_msg.c#6 integrate
.. //depot/projects/arm/src/sys/net/ethernet.h#3 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_node.c#8 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_vnops.c#14 integrate
.. //depot/projects/arm/src/sys/sparc64/sparc64/autoconf.c#3 integrate
.. //depot/projects/arm/src/sys/sparc64/sparc64/identcpu.c#3 integrate
.. //depot/projects/arm/src/sys/sparc64/sparc64/mem.c#3 integrate
.. //depot/projects/arm/src/sys/sun4v/include/cache.h#2 integrate
.. //depot/projects/arm/src/sys/sun4v/include/tte_hash.h#3 integrate
.. //depot/projects/arm/src/sys/sun4v/sun4v/autoconf.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/clock.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/counter.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/db_disasm.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/eeprom.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/elf_machdep.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/gdb_machdep.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/identcpu.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/in_cksum.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/iommu.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/mem.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/ofw_bus.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/ofw_machdep.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/pmap.c#5 integrate
.. //depot/projects/arm/src/sys/sun4v/sun4v/prof_machdep.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/rwindow.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/sys_machdep.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/tlb.c#2 delete
.. //depot/projects/arm/src/sys/sun4v/sun4v/tte_hash.c#3 integrate
.. //depot/projects/arm/src/sys/sys/sleepqueue.h#3 integrate
.. //depot/projects/arm/src/tools/regression/sockets/unix_sendtorace/Makefile#1 branch
.. //depot/projects/arm/src/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c#1 branch
.. //depot/projects/arm/src/tools/regression/sysvmsg/msgtest.c#2 integrate
.. //depot/projects/arm/src/tools/tools/nanobsd/FlashDevice.sub#3 integrate
.. //depot/projects/arm/src/usr.sbin/Makefile#9 integrate
.. //depot/projects/arm/src/usr.sbin/kbdcontrol/kbdcontrol.1#3 integrate
.. //depot/projects/arm/src/usr.sbin/kbdcontrol/kbdcontrol.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/route6d/route6d.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/config.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/wpa/Makefile#2 integrate
.. //depot/projects/arm/src/usr.sbin/wpa/wpa_passphrase/Makefile#1 branch
.. //depot/projects/arm/src/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8#1 branch
.. //depot/projects/arm/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#2 integrate
Differences ...
==== //depot/projects/arm/src/ObsoleteFiles.inc#12 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.59 2006/11/08 03:23:49 marcel Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.61 2006/11/16 22:34:17 brueffer Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20061116: uhidev.4 removed
+OLD_FILES+=usr/share/man/man4/uhidev.4.gz
.if ${TARGET_ARCH} == "ia64"
# 20061104: skiload.help removed
OLD_FILES+=boot/skiload.help
@@ -708,6 +710,8 @@
OLD_FILES+=usr/sbin/pim6stat
OLD_FILES+=usr/sbin/pim6sd
OLD_FILES+=usr/sbin/pim6dd
+# 20010217
+OLD_FILES+=usr/share/doc/bind/misc/dns-setup
# 20001200
OLD_FILES+=usr/lib/libgcc_r_pic.a
# 200009XX
==== //depot/projects/arm/src/UPDATING#8 (text+ko) ====
@@ -20,6 +20,14 @@
in userland, and various verbose features in the kernel. Many
developers choose to disable these features on build machines
to maximize performance.
+
+20061113:
+ Support for PCI Message Signalled Interrupts on i386 and amd64
+ has been added to the kernel and various drivers will soon be
+ updated to use MSI when it is available. If there are any problems,
+ MSI can be disabled completely by setting the 'hw.pci.enable_msi'
+ and 'hw.pci.enable_msix' tunables to 0 in the loader.
+
20061110:
The MUTEX_PROFILING option has been renamed to LOCK_PROFILING.
The lockmgr object layout has been changed as a result of having
@@ -645,4 +653,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.463 2006/11/11 03:18:06 kmacy Exp $
+$FreeBSD: src/UPDATING,v 1.464 2006/11/15 20:02:20 jhb Exp $
==== //depot/projects/arm/src/lib/libarchive/archive.h.in#4 (text+ko) ====
@@ -23,7 +23,7 @@
* (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/lib/libarchive/archive.h.in,v 1.31 2006/09/05 05:59:45 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.32 2006/11/15 05:33:38 kientzle Exp $
*/
#ifndef ARCHIVE_H_INCLUDED
@@ -46,8 +46,8 @@
/*
* If ARCHIVE_API_VERSION != archive_api_version(), then the library you
- * were linked with is using an incompatible API. This is almost
- * certainly a fatal problem.
+ * were linked with is using an incompatible API to the one you were
+ * compiled with. This is almost certainly a fatal problem.
*
* ARCHIVE_API_FEATURE is incremented with each significant feature
* addition, so you can test (at compile or run time) if a particular
@@ -196,12 +196,17 @@
archive_skip_callback *, archive_close_callback *);
/*
- * The archive_read_open_file function is a convenience function built
- * on archive_read_open that uses a canned callback suitable for
- * common situations. Note that a NULL filename indicates stdin.
+ * A variety of shortcuts that invoke archive_read_open() with
+ * canned callbacks suitable for common situations. The ones that
+ * accept a block size handle tape blocking correctly.
*/
-int archive_read_open_file(struct archive *, const char *_file,
- size_t _block_size);
+/* Use this if you know the filename. Note: NULL indicates stdin. */
+int archive_read_open_filename(struct archive *,
+ const char *_filename, size_t _block_size);
+/* archive_read_open_file() is a deprecated synonym for ..._open_filename(). */
+int archive_read_open_file(struct archive *,
+ const char *_filename, size_t _block_size);
+/* Read an archive that's already open, using the file descriptor. */
int archive_read_open_fd(struct archive *, int _fd,
size_t _block_size);
@@ -325,6 +330,8 @@
archive_open_callback *, archive_write_callback *,
archive_close_callback *);
int archive_write_open_fd(struct archive *, int _fd);
+int archive_write_open_filename(struct archive *, const char *_file);
+/* A deprecated synonym for archive_write_open_filename() */
int archive_write_open_file(struct archive *, const char *_file);
/*
==== //depot/projects/arm/src/lib/libarchive/archive_private.h#4 (text+ko) ====
@@ -23,7 +23,7 @@
* (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/lib/libarchive/archive_private.h,v 1.23 2006/09/05 05:59:45 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.24 2006/11/15 05:14:20 kientzle Exp $
*/
#ifndef ARCHIVE_PRIVATE_H_INCLUDED
@@ -182,7 +182,7 @@
int (*format_finish_entry)(struct archive *);
int (*format_write_header)(struct archive *,
struct archive_entry *);
- int (*format_write_data)(struct archive *,
+ ssize_t (*format_write_data)(struct archive *,
const void *buff, size_t);
/*
==== //depot/projects/arm/src/lib/libarchive/archive_read_open_file.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.14 2006/11/13 00:29:57 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.15 2006/11/15 05:33:38 kientzle Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -65,6 +65,13 @@
archive_read_open_file(struct archive *a, const char *filename,
size_t block_size)
{
+ return (archive_read_open_filename(a, filename, block_size));
+}
+
+int
+archive_read_open_filename(struct archive *a, const char *filename,
+ size_t block_size)
+{
struct read_file_data *mine;
if (filename == NULL || filename[0] == '\0') {
==== //depot/projects/arm/src/lib/libarchive/archive_write.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.20 2006/11/10 06:39:46 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.21 2006/11/15 05:14:20 kientzle Exp $");
/*
* This file contains the "essential" portions of the write API, that
@@ -271,9 +271,7 @@
int
archive_write_data(struct archive *a, const void *buff, size_t s)
{
- int ret;
__archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_DATA, "archive_write_data");
archive_string_empty(&a->error_string);
- ret = (a->format_write_data)(a, buff, s);
- return (ret == ARCHIVE_OK ? (ssize_t)s : -1);
+ return ((a->format_write_data)(a, buff, s));
}
==== //depot/projects/arm/src/lib/libarchive/archive_write_open_file.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.14 2006/11/13 00:29:57 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.15 2006/11/15 05:33:38 kientzle Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -60,6 +60,12 @@
int
archive_write_open_file(struct archive *a, const char *filename)
{
+ return (archive_write_open_filename(a, filename));
+}
+
+int
+archive_write_open_filename(struct archive *a, const char *filename)
+{
struct write_file_data *mine;
if (filename == NULL || filename[0] == '\0') {
==== //depot/projects/arm/src/lib/libarchive/archive_write_set_format_cpio.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio.c,v 1.7 2006/11/10 06:39:46 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio.c,v 1.8 2006/11/15 05:14:20 kientzle Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -45,7 +45,7 @@
#include "archive_entry.h"
#include "archive_private.h"
-static int archive_write_cpio_data(struct archive *, const void *buff,
+static ssize_t archive_write_cpio_data(struct archive *, const void *buff,
size_t s);
static int archive_write_cpio_finish(struct archive *);
static int archive_write_cpio_finish_entry(struct archive *);
@@ -167,7 +167,7 @@
return (ret);
}
-static int
+static ssize_t
archive_write_cpio_data(struct archive *a, const void *buff, size_t s)
{
struct cpio *cpio;
@@ -179,7 +179,10 @@
ret = (a->compression_write)(a, buff, s);
cpio->entry_bytes_remaining -= s;
- return (ret);
+ if (ret >= 0)
+ return (s);
+ else
+ return (ret);
}
/*
==== //depot/projects/arm/src/lib/libarchive/archive_write_set_format_pax.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.35 2006/11/10 06:39:46 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.36 2006/11/15 05:14:20 kientzle Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -70,7 +70,7 @@
unsigned long nanos);
static void add_pax_attr_w(struct archive_string *,
const char *key, const wchar_t *wvalue);
-static int archive_write_pax_data(struct archive *,
+static ssize_t archive_write_pax_data(struct archive *,
const void *, size_t);
static int archive_write_pax_finish(struct archive *);
static int archive_write_pax_finish_entry(struct archive *);
@@ -1081,7 +1081,7 @@
return (ARCHIVE_OK);
}
-static int
+static ssize_t
archive_write_pax_data(struct archive *a, const void *buff, size_t s)
{
struct pax *pax;
@@ -1094,7 +1094,10 @@
ret = (a->compression_write)(a, buff, s);
pax->entry_bytes_remaining -= s;
- return (ret);
+ if (ret == ARCHIVE_OK)
+ return (s);
+ else
+ return (ret);
}
static int
==== //depot/projects/arm/src/lib/libarchive/archive_write_set_format_shar.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.12 2006/11/10 06:39:46 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.14 2006/11/15 05:20:14 kientzle Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -64,9 +64,9 @@
static int archive_write_shar_finish(struct archive *);
static int archive_write_shar_header(struct archive *,
struct archive_entry *);
-static int archive_write_shar_data_sed(struct archive *,
+static ssize_t archive_write_shar_data_sed(struct archive *,
const void * buff, size_t);
-static int archive_write_shar_data_uuencode(struct archive *,
+static ssize_t archive_write_shar_data_uuencode(struct archive *,
const void * buff, size_t);
static int archive_write_shar_finish_entry(struct archive *);
static int shar_printf(struct archive *, const char *fmt, ...);
@@ -323,12 +323,13 @@
}
/* XXX TODO: This could be more efficient XXX */
-static int
+static ssize_t
archive_write_shar_data_sed(struct archive *a, const void *buff, size_t n)
{
struct shar *shar;
const char *src;
int ret;
+ size_t written = n;
shar = (struct shar *)a->format_data;
if (!shar->has_data)
@@ -357,7 +358,9 @@
if (shar->outpos > 0)
ret = (a->compression_write)(a, shar->outbuff, shar->outpos);
- return (ret);
+ if (ret != ARCHIVE_OK)
+ return (ret);
+ return (written);
}
#define UUENC(c) (((c)!=0) ? ((c) & 077) + ' ': '`')
@@ -384,7 +387,7 @@
shar->outbuff[shar->outpos] = 0;
}
-static int
+static ssize_t
archive_write_shar_data_uuencode(struct archive *a, const void *buff,
size_t length)
{
@@ -413,7 +416,7 @@
shar->uubuffer[shar->uuavail++] = *src++;
shar->outbytes++;
}
- return (ARCHIVE_OK);
+ return (length);
}
static int
==== //depot/projects/arm/src/lib/libarchive/archive_write_set_format_ustar.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.15 2006/11/10 06:39:46 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.16 2006/11/15 05:14:20 kientzle Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -113,7 +113,7 @@
{ "" } /* padding */
};
-static int archive_write_ustar_data(struct archive *a, const void *buff,
+static ssize_t archive_write_ustar_data(struct archive *a, const void *buff,
size_t s);
static int archive_write_ustar_finish(struct archive *);
static int archive_write_ustar_finish_entry(struct archive *);
@@ -493,7 +493,7 @@
return (ARCHIVE_OK);
}
-static int
+static ssize_t
archive_write_ustar_data(struct archive *a, const void *buff, size_t s)
{
struct ustar *ustar;
@@ -504,5 +504,7 @@
s = ustar->entry_bytes_remaining;
ret = (a->compression_write)(a, buff, s);
ustar->entry_bytes_remaining -= s;
- return (ret);
+ if (ret != ARCHIVE_OK)
+ return (ret);
+ return (s);
}
==== //depot/projects/arm/src/release/Makefile#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.917 2006/11/11 23:18:28 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.918 2006/11/16 23:09:35 kensmith Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -257,6 +257,9 @@
CD_BOOT= ${CD}/bootonly
CD_DISC1= ${CD}/disc1
CD_DISC2= ${CD}/disc2
+.if !defined(NODOC)
+CD_DOCS= ${CD}/docs
+.endif
.if defined(SEPARATE_LIVEFS)
CD_LIVEFS= ${CD}/livefs
.else
@@ -982,12 +985,15 @@
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf
@echo "CD_VOLUME = 2" >> ${CD_DISC2}/cdrom.inf
.if !defined(NODOC)
- @mkdir -p ${CD_DISC2}/usr/share/doc
+ echo "Building CDROM docs filesystem image"
+ @mkdir -p ${CD_DOCS}
+ @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DOCS}/cdrom.inf
+ @mkdir -p ${CD_DOCS}/usr/share/doc
@for i in `ls ${CD_LIVEFS}/usr/share/doc`; do \
if [ -L ${CD_LIVEFS}/usr/share/doc/$$i -o \
-d /usr/doc/$$i ]; then \
mv ${CD_LIVEFS}/usr/share/doc/$$i \
- ${CD_DISC2}/usr/share/doc; \
+ ${CD_DOCS}/usr/share/doc; \
fi \
done
.endif
@@ -1039,6 +1045,11 @@
FreeBSD_Packages \
${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} \
${CD_DISC2_PKGS}
+.if !defined(NODOC)
+ @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \
+ FreeBSD_Documentation \
+ ${CD}/${BUILDNAME}-${TARGET}-docs.iso ${CD_DOCS}
+.endif
.if defined(SEPARATE_LIVEFS)
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
FreeBSD_LiveFS \
==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.988 2006/11/13 19:13:39 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.990 2006/11/17 20:15:26 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -1519,6 +1519,11 @@
<para>The &man.snapinfo.8; utility, which shows snapshot locations
on UFS filesystems, has been added. &merged;</para>
+ <para>The &man.sockstat.1; utility, which shows connected and
+ listening network sockets, now supports a new <option>-P</option>
+ command-line option, which can be used to filter displayed sockets
+ by protocol name (as listed in &man.protocols.5;).</para>
+
<para>The &man.strtonum.3; library function has been implemented
based on OpenBSD's implementation. This is an improved version of
&man.strtoll.3;. &merged;</para>
@@ -1919,7 +1924,11 @@
<para>The supported version of
the <application>GNOME</application> desktop environment
(<filename role="package">x11/gnome2</filename>) has been
- updated from 2.10.2 to 2.16.1. &merged;</para>
+ updated from 2.10.2 to 2.16.1. As a part of this update, the
+ default prefix for <application>GNOME</application> (and some
+ related programs) has moved from
+ <filename>/usr/X11R6</filename>
+ to <filename>/usr/local</filename>. &merged;</para>
<para>The supported version of
the <application>KDE</application> desktop environment
==== //depot/projects/arm/src/release/scripts/package-split.py#4 (text+ko) ====
@@ -7,7 +7,7 @@
#
# Usage: package-split.py <INDEX> <master INDEX>
#
-# $FreeBSD: src/release/scripts/package-split.py,v 1.13 2006/10/17 13:50:22 bmah Exp $
+# $FreeBSD: src/release/scripts/package-split.py,v 1.16 2006/11/17 05:10:41 kensmith Exp $
import os
import sys
@@ -31,10 +31,8 @@
pkgs.extend(['x11/xorg',
'x11/xorg-manpages',
'devel/imake-6'])
- if arch == 'alpha':
- pkgs.append('emulators/osf1_base')
- elif arch == 'i386':
- pkgs.append('emulators/linux_base-8')
+ if arch == 'i386':
+ pkgs.append('emulators/linux_base-fc4')
return pkgs
# List of packages for disc2. This includes packages that the X desktop
@@ -56,7 +54,7 @@
'astro/xearth',
'devel/gmake',
'editors/emacs',
- 'editors/vim',
+ 'editors/vim-lite',
'emulators/mtools',
'graphics/png',
'graphics/xv',
==== //depot/projects/arm/src/sbin/mount/mount.c#4 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/mount/mount.c,v 1.91 2006/10/31 21:54:51 pjd Exp $";
+ "$FreeBSD: src/sbin/mount/mount.c,v 1.92 2006/11/14 01:07:42 rodrigc Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -530,7 +530,10 @@
argv[argc] = NULL;
if (debug) {
- (void)printf("exec: mount_%s", vfstype);
+ if (use_mountprog(vfstype))
+ printf("exec: mount_%s", vfstype);
+ else
+ printf("mount -t %s", vfstype);
for (i = 1; i < argc; i++)
(void)printf(" %s", argv[i]);
(void)printf("\n");
==== //depot/projects/arm/src/share/man/man4/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.365 2006/10/08 17:05:15 ceri Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.367 2006/11/16 22:32:26 brueffer Exp $
MAN= aac.4 \
acpi.4 \
@@ -349,6 +349,7 @@
twe.4 \
tx.4 \
txp.4 \
+ uark.4 \
uart.4 \
ubsa.4 \
ubsec.4 \
@@ -365,7 +366,6 @@
ugen.4 \
uhci.4 \
uhid.4 \
- uhidev.4 \
ukbd.4 \
ulpt.4 \
umass.4 \
==== //depot/projects/arm/src/share/man/man4/ucom.4#2 (text+ko) ====
@@ -34,16 +34,28 @@
.\" 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/ucom.4,v 1.6 2005/04/17 16:08:51 simon Exp $
+.\" $FreeBSD: src/share/man/man4/ucom.4,v 1.7 2006/11/18 08:07:43 brueffer Exp $
.\"
-.Dd November 25, 1999
+.Dd November 18, 2006
.Dt UCOM 4
.Os
.Sh NAME
.Nm ucom
.Nd USB tty support
.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following line in your
+kernel configuration file:
+.Bd -ragged -offset indent
.Cd "device ucom"
+.Ed
+.Pp
+Alternatively, to load the driver as a
+module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+ucom_load="YES"
+.Ed
.Sh DESCRIPTION
The
.Nm
@@ -69,6 +81,7 @@
.El
.Sh SEE ALSO
.Xr tty 4 ,
+.Xr uark 4 ,
.Xr uftdi 4 ,
.Xr umct 4 ,
.Xr umodem 4 ,
==== //depot/projects/arm/src/share/man/man4/uhid.4#2 (text+ko) ====
@@ -34,9 +34,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/uhid.4,v 1.5 2005/08/04 21:26:38 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/uhid.4,v 1.6 2006/11/16 22:32:27 brueffer Exp $
.\"
-.Dd July 12, 1998
+.Dd November 16, 2006
.Dt UHID 4
.Os
.Sh NAME
@@ -128,7 +128,6 @@
.El
.Sh SEE ALSO
.Xr usbhidctl 1 ,
-.Xr uhidev 4 ,
.Xr usb 4
.Sh HISTORY
The
==== //depot/projects/arm/src/share/man/man9/sleepqueue.9#2 (text+ko) ====
@@ -21,7 +21,7 @@
.\" (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/sleepqueue.9,v 1.12 2005/04/19 16:30:25 jkoshy Exp $
+.\" $FreeBSD: src/share/man/man9/sleepqueue.9,v 1.13 2006/11/16 01:02:00 pjd Exp $
.\"
.Dd March 10, 2004
.Dt SLEEPQUEUE 9
@@ -54,7 +54,7 @@
.Ft void
.Fn sleepq_abort "struct thread *td"
.Ft void
-.Fn sleepq_add "void *wchan" "struct mtx *lock" "const char *wmesg" "int flags"
+.Fn sleepq_add "void *wchan" "struct lock_object *lock" "const char *wmesg" "int flags"
.Ft struct sleepqueue *
.Fn sleepq_alloc "void"
.Ft void
@@ -157,12 +157,12 @@
must be locked by a prior call to
.Fn sleepq_lock
when this function is called.
-If a mutex is specified via the
+If a lock is specified via the
.Fa lock
argument, and if the kernel was compiled with
.Cd "options INVARIANTS" ,
then the sleep queue code will perform extra checks to ensure that
-the mutex is used by all threads sleeping on
+the lock is used by all threads sleeping on
.Fa wchan .
The
.Fa wmesg
==== //depot/projects/arm/src/sys/amd64/amd64/db_trace.c#10 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.77 2006/11/15 19:53:47 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.80 2006/11/17 20:27:00 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -200,7 +200,7 @@
static void db_print_stack_entry(const char *, int, char **, long *, db_addr_t);
static void decode_syscall(int, struct thread *);
-static char * watchtype_str(int type);
+static const char * watchtype_str(int type);
int amd64_set_watch(int watchnum, unsigned long watchaddr, int size,
int access, struct dbreg *d);
int amd64_clr_watch(int watchnum, struct dbreg *d);
@@ -538,12 +538,11 @@
int access;
struct dbreg *d;
{
- int i;
- unsigned int mask;
+ int i, len;
if (watchnum == -1) {
- for (i = 0, mask = 0x3; i < 4; i++, mask <<= 2)
- if ((d->dr[7] & mask) == 0)
+ for (i = 0; i < 4; i++)
+ if (!DBREG_DR7_ENABLED(d->dr[7], i))
break;
if (i < 4)
watchnum = i;
@@ -563,25 +562,34 @@
}
/*
- * we can watch a 1, 2, or 4 byte sized location
+ * we can watch a 1, 2, 4, or 8 byte sized location
*/
switch (size) {
- case 1 : mask = 0x00; break;
- case 2 : mask = 0x01 << 2; break;
- case 4 : mask = 0x03 << 2; break;
- default : return (-1);
+ case 1:
+ len = DBREG_DR7_LEN_1;
+ break;
+ case 2:
+ len = DBREG_DR7_LEN_2;
+ break;
+ case 4:
+ len = DBREG_DR7_LEN_4;
+ break;
+ case 8:
+ len = DBREG_DR7_LEN_8;
+ break;
+ default:
+ return (-1);
}
- mask |= access;
-
/* clear the bits we are about to affect */
- d->dr[7] &= ~((0x3 << (watchnum*2)) | (0x0f << (watchnum*4+16)));
+ d->dr[7] &= ~DBREG_DR7_MASK(watchnum);
/* set drN register to the address, N=watchnum */
DBREG_DRX(d, watchnum) = watchaddr;
/* enable the watchpoint */
- d->dr[7] |= (0x2 << (watchnum*2)) | (mask << (watchnum*4+16));
+ d->dr[7] |= DBREG_DR7_SET(watchnum, len, access,
+ DBREG_DR7_GLOBAL_ENABLE);
return (watchnum);
}
@@ -596,7 +604,7 @@
if (watchnum < 0 || watchnum >= 4)
return (-1);
- d->dr[7] = d->dr[7] & ~((0x3 << (watchnum*2)) | (0x0f << (watchnum*4+16)));
+ d->dr[7] &= ~DBREG_DR7_MASK(watchnum);
DBREG_DRX(d, watchnum) = 0;
return (0);
@@ -615,25 +623,26 @@
avail = 0;
for(i = 0; i < 4; i++) {
- if ((d.dr[7] & (3 << (i*2))) == 0)
+ if (!DBREG_DR7_ENABLED(d.dr[7], i))
avail++;
}
- if (avail * 4 < size)
+ if (avail * 8 < size)
return (-1);
- for (i = 0; i < 4 && (size != 0); i++) {
- if ((d.dr[7] & (3<<(i*2))) == 0) {
- if (size > 4)
+ for (i = 0; i < 4 && (size > 0); i++) {
+ if (!DBREG_DR7_ENABLED(d.dr[7], i)) {
+ if (size >= 8 || (avail == 1 && size > 4))
+ wsize = 8;
+ else if (size > 2)
wsize = 4;
else
wsize = size;
- if (wsize == 3)
- wsize++;
amd64_set_watch(i, addr, wsize,
DBREG_DR7_WRONLY, &d);
addr += wsize;
size -= wsize;
+ avail--;
}
}
@@ -648,13 +657,13 @@
db_expr_t addr;
db_expr_t size;
{
+ struct dbreg d;
int i;
- struct dbreg d;
fill_dbregs(NULL, &d);
for(i = 0; i < 4; i++) {
- if (d.dr[7] & (3 << (i*2))) {
+ if (DBREG_DR7_ENABLED(d.dr[7], i)) {
if ((DBREG_DRX((&d), i) >= addr) &&
(DBREG_DRX((&d), i) < addr+size))
amd64_clr_watch(i, &d);
@@ -668,8 +677,7 @@
}
-static
-char *
+static const char *
watchtype_str(type)
int type;
{
@@ -691,17 +699,21 @@
fill_dbregs(NULL, &d);
db_printf("\nhardware watchpoints:\n");
- db_printf(" watch status type len address\n");
- db_printf(" ----- -------- ---------- --- ----------\n");
+ db_printf(" watch status type len address\n");
+ db_printf(" ----- -------- ---------- --- ------------------\n");
for (i = 0; i < 4; i++) {
- if (d.dr[7] & (0x03 << (i*2))) {
- type = (d.dr[7] >> (16+(i*4))) & 3;
- len = (d.dr[7] >> (16+(i*4)+2)) & 3;
- db_printf(" %-5d %-8s %10s %3d 0x%016lx\n",
- i, "enabled", watchtype_str(type),
- len + 1, DBREG_DRX((&d), i));
- }
- else {
+ if (DBREG_DR7_ENABLED(d.dr[7], i)) {
+ type = DBREG_DR7_ACCESS(d.dr[7], i);
+ len = DBREG_DR7_LEN(d.dr[7], i);
+ if (len == DBREG_DR7_LEN_8)
+ len = 8;
+ else
+ len++;
+ db_printf(" %-5d %-8s %10s %3d ",
+ i, "enabled", watchtype_str(type), len);
+ db_printsym((db_addr_t)DBREG_DRX((&d), i), DB_STGY_ANY);
+ db_printf("\n");
+ } else {
db_printf(" %-5d disabled\n", i);
}
}
==== //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#8 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.25 2006/10/16 21:40:46 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.26 2006/11/17 16:41:03 jhb Exp $
*/
/*
@@ -446,10 +446,6 @@
current_cpu++;
if (current_cpu >= num_cpus)
current_cpu = 0;
- if (bootverbose) {
- printf("INTR: Assigning IRQ %d", pic->pic_vector(isrc));
- printf(" to local APIC %u\n", apic_id);
- }
pic->pic_assign_cpu(isrc, apic_id);
}
@@ -483,7 +479,7 @@
if (num_cpus <= 1)
return;
- /* Round-robin assign each enabled source a CPU. */
+ /* Round-robin assign a CPU to each enabled source. */
mtx_lock_spin(&intr_table_lock);
assign_cpu = 1;
for (i = 0; i < NUM_IO_INTS; i++) {
==== //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#9 (text+ko) ====
@@ -28,7 +28,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list