svn commit: r256136 - in projects/random_number_generator: . cddl/contrib/opensolaris/cmd/zfs contrib/binutils/opcodes etc/rc.d lib/libutil libexec libexec/freebsd-version libexec/rtld-elf sbin/cam...
Mark Murray
markm at FreeBSD.org
Tue Oct 8 07:02:32 UTC 2013
Author: markm
Date: Tue Oct 8 07:02:23 2013
New Revision: 256136
URL: http://svnweb.freebsd.org/changeset/base/256136
Log:
MFC - tracking commit.
Added:
projects/random_number_generator/libexec/freebsd-version/
- copied from r256135, head/libexec/freebsd-version/
projects/random_number_generator/share/man/man9/VOP_ADVISE.9
- copied unchanged from r256135, head/share/man/man9/VOP_ADVISE.9
projects/random_number_generator/share/man/man9/VOP_ALLOCATE.9
- copied unchanged from r256135, head/share/man/man9/VOP_ALLOCATE.9
projects/random_number_generator/tools/regression/lib/libutil/test-humanize_number.c
- copied unchanged from r256135, head/tools/regression/lib/libutil/test-humanize_number.c
projects/random_number_generator/tools/regression/lib/libutil/test-humanize_number.t
- copied unchanged from r256135, head/tools/regression/lib/libutil/test-humanize_number.t
Modified:
projects/random_number_generator/UPDATING
projects/random_number_generator/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
projects/random_number_generator/contrib/binutils/opcodes/i386-dis.c
projects/random_number_generator/contrib/binutils/opcodes/i386-opc.h
projects/random_number_generator/contrib/binutils/opcodes/i386-opc.tbl
projects/random_number_generator/contrib/binutils/opcodes/i386-tbl.h
projects/random_number_generator/etc/rc.d/sshd
projects/random_number_generator/lib/libutil/humanize_number.3
projects/random_number_generator/lib/libutil/humanize_number.c
projects/random_number_generator/libexec/Makefile
projects/random_number_generator/libexec/rtld-elf/rtld.c
projects/random_number_generator/libexec/rtld-elf/rtld.h
projects/random_number_generator/sbin/camcontrol/camcontrol.c
projects/random_number_generator/sbin/camcontrol/fwdownload.c
projects/random_number_generator/share/man/man4/altera_avgen.4
projects/random_number_generator/share/man/man4/rsu.4
projects/random_number_generator/share/man/man5/src.conf.5
projects/random_number_generator/share/man/man8/picobsd.8
projects/random_number_generator/share/man/man9/Makefile
projects/random_number_generator/share/man/man9/VOP_FSYNC.9
projects/random_number_generator/share/man/man9/firmware.9
projects/random_number_generator/share/man/man9/vm_page_grab.9
projects/random_number_generator/share/man/man9/vnode.9
projects/random_number_generator/share/misc/bsd-family-tree
projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c
projects/random_number_generator/sys/dev/cxgbe/t4_sge.c
projects/random_number_generator/sys/dev/isci/isci.c
projects/random_number_generator/sys/dev/xen/control/control.c
projects/random_number_generator/sys/i386/ibcs2/ibcs2_sysvec.c
projects/random_number_generator/sys/i386/include/xen/xen-os.h
projects/random_number_generator/sys/netinet6/ip6_mroute.c
projects/random_number_generator/sys/ofed/include/rdma/ib_verbs.h
projects/random_number_generator/sys/sys/elf_common.h
projects/random_number_generator/sys/x86/include/stdarg.h
projects/random_number_generator/tools/regression/lib/libutil/Makefile
projects/random_number_generator/usr.bin/kdump/kdump.c
Directory Properties:
projects/random_number_generator/ (props changed)
projects/random_number_generator/cddl/ (props changed)
projects/random_number_generator/cddl/contrib/opensolaris/ (props changed)
projects/random_number_generator/cddl/contrib/opensolaris/cmd/zfs/ (props changed)
projects/random_number_generator/contrib/binutils/ (props changed)
projects/random_number_generator/lib/libutil/ (props changed)
projects/random_number_generator/sbin/ (props changed)
projects/random_number_generator/share/man/man4/ (props changed)
projects/random_number_generator/sys/ (props changed)
projects/random_number_generator/sys/cddl/contrib/opensolaris/ (props changed)
Modified: projects/random_number_generator/UPDATING
==============================================================================
--- projects/random_number_generator/UPDATING Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/UPDATING Tue Oct 8 07:02:23 2013 (r256136)
@@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20131006:
+ RCS has been removed from the base system. If you need RCS
+ install either devel/rcs or devel/rcs57.
+
20130930:
BIND has been removed from the base system. If all you need
is a local resolver, simply enable and start the local_unbound
Modified: projects/random_number_generator/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- projects/random_number_generator/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Oct 8 07:02:23 2013 (r256136)
@@ -58,6 +58,7 @@
#include <sys/types.h>
#include <time.h>
#include <err.h>
+#include <jail.h>
#include <libzfs.h>
#include <libzfs_core.h>
Modified: projects/random_number_generator/contrib/binutils/opcodes/i386-dis.c
==============================================================================
--- projects/random_number_generator/contrib/binutils/opcodes/i386-dis.c Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/contrib/binutils/opcodes/i386-dis.c Tue Oct 8 07:02:23 2013 (r256136)
@@ -6438,14 +6438,22 @@ VMX_Fixup (int extrachar ATTRIBUTE_UNUSE
static void
OP_VMX (int bytemode, int sizeflag)
{
- used_prefixes |= (prefixes & (PREFIX_DATA | PREFIX_REPZ));
- if (prefixes & PREFIX_DATA)
- strcpy (obuf, "vmclear");
- else if (prefixes & PREFIX_REPZ)
- strcpy (obuf, "vmxon");
+ if (modrm.mod == 3)
+ {
+ strcpy (obuf, "rdrand");
+ OP_E (v_mode, sizeflag);
+ }
else
- strcpy (obuf, "vmptrld");
- OP_E (bytemode, sizeflag);
+ {
+ used_prefixes |= (prefixes & (PREFIX_DATA | PREFIX_REPZ));
+ if (prefixes & PREFIX_DATA)
+ strcpy (obuf, "vmclear");
+ else if (prefixes & PREFIX_REPZ)
+ strcpy (obuf, "vmxon");
+ else
+ strcpy (obuf, "vmptrld");
+ OP_E (bytemode, sizeflag);
+ }
}
static void
Modified: projects/random_number_generator/contrib/binutils/opcodes/i386-opc.h
==============================================================================
--- projects/random_number_generator/contrib/binutils/opcodes/i386-opc.h Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/contrib/binutils/opcodes/i386-opc.h Tue Oct 8 07:02:23 2013 (r256136)
@@ -79,6 +79,7 @@ typedef struct template
#define CpuNo64 0x8000000 /* Not supported in the 64bit mode */
#define CpuPCLMUL 0x10000000 /* Carry-less Multiplication extensions */
+#define CpuRdRnd 0x20000000 /* Intel Random Number Generator extensions */
/* SSE4.1/4.2 Instructions required */
#define CpuSSE4 (CpuSSE4_1|CpuSSE4_2)
@@ -87,7 +88,7 @@ typedef struct template
#define CpuUnknownFlags (Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686 \
|CpuP4|CpuSledgehammer|CpuMMX|CpuMMX2|CpuSSE|CpuSSE2|CpuSSE3|CpuVMX \
|Cpu3dnow|Cpu3dnowA|CpuK6|CpuPadLock|CpuSVME|CpuSSSE3|CpuSSE4_1 \
- |CpuSSE4_2|CpuABM|CpuSSE4a|CpuXSAVE|CpuAES|CpuPCLMUL)
+ |CpuSSE4_2|CpuABM|CpuSSE4a|CpuXSAVE|CpuAES|CpuPCLMUL|CpuRdRnd)
/* the bits in opcode_modifier are used to generate the final opcode from
the base_opcode. These bits also are used to detect alternate forms of
Modified: projects/random_number_generator/contrib/binutils/opcodes/i386-opc.tbl
==============================================================================
--- projects/random_number_generator/contrib/binutils/opcodes/i386-opc.tbl Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/contrib/binutils/opcodes/i386-opc.tbl Tue Oct 8 07:02:23 2013 (r256136)
@@ -1502,3 +1502,21 @@ xrstor, 1, 0xfae, 0x5, CpuXSAVE, Modrm|N
// INVPCID
invpcid, 2, 0x660f3882, None, CpuNo64, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, { BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg32 }
invpcid, 2, 0x660f3882, None, Cpu64, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, { BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg64 }
+
+// Intel AES extensions
+aesdec, 2, 0x660f38de, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { RegXMM|LLongMem, RegXMM }
+aesdeclast, 2, 0x660f38df, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { RegXMM|LLongMem, RegXMM }
+aesenc, 2, 0x660f38dc, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { RegXMM|LLongMem, RegXMM }
+aesenclast, 2, 0x660f38dd, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { RegXMM|LLongMem, RegXMM }
+aesimc, 2, 0x660f38db, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { RegXMM|LLongMem, RegXMM }
+aeskeygenassist, 3, 0x660f3adf, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { Imm8, RegXMM|LLongMem, RegXMM }
+
+// Intel Carry-less Multiplication extensions
+pclmulqdq, 3, 0x660f3a44, None, CpuPCLMUL, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { Imm8, RegXMM|LLongMem, RegXMM }
+pclmullqlqdq, 2, 0x660f3a44, 0x0, CpuPCLMUL, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf|ImmExt, { RegXMM|LLongMem, RegXMM }
+pclmulhqlqdq, 2, 0x660f3a44, 0x1, CpuPCLMUL, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf|ImmExt, { RegXMM|LLongMem, RegXMM }
+pclmullqhqdq, 2, 0x660f3a44, 0x10, CpuPCLMUL, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf|ImmExt, { RegXMM|LLongMem, RegXMM }
+pclmulhqhqdq, 2, 0x660f3a44, 0x11, CpuPCLMUL, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf|ImmExt, { RegXMM|LLongMem, RegXMM }
+
+// Intel Random Number Generator extensions
+rdrand, 1, 0x0fc7, 0x6, CpuRdRnd, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { Reg16|Reg32|Reg64 }
Modified: projects/random_number_generator/contrib/binutils/opcodes/i386-tbl.h
==============================================================================
--- projects/random_number_generator/contrib/binutils/opcodes/i386-tbl.h Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/contrib/binutils/opcodes/i386-tbl.h Tue Oct 8 07:02:23 2013 (r256136)
@@ -4374,6 +4374,11 @@ const template i386_optab[] =
Modrm|IgnoreSize|NoSuf|ImmExt,
{ RegXMM|LLongMem,
RegXMM } },
+
+ /* Intel Random Number Generator extensions */
+ {"rdrand", 1, 0x0fc7, 0x6, CpuRdRnd,
+ Modrm|NoSuf,
+ { Reg16|Reg32|Reg64 } },
{ NULL, 0, 0, 0, 0, 0, { 0 } }
};
Modified: projects/random_number_generator/etc/rc.d/sshd
==============================================================================
--- projects/random_number_generator/etc/rc.d/sshd Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/etc/rc.d/sshd Tue Oct 8 07:02:23 2013 (r256136)
@@ -53,7 +53,7 @@ sshd_keygen_alg()
fi
if [ -f "${keyfile}" ] ; then
- echo "$ALG host key exists."
+ info "$ALG host key exists."
else
echo "Generating $ALG host key."
/usr/bin/ssh-keygen -q -t $alg -f "$keyfile" -N ""
Modified: projects/random_number_generator/lib/libutil/humanize_number.3
==============================================================================
--- projects/random_number_generator/lib/libutil/humanize_number.3 Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/lib/libutil/humanize_number.3 Tue Oct 8 07:02:23 2013 (r256136)
@@ -28,7 +28,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd Apr 12, 2011
+.Dd October 7, 2013
.Dt HUMANIZE_NUMBER 3
.Os
.Sh NAME
@@ -140,7 +140,7 @@ The following flags may be passed in
.Fa flags :
.Bl -tag -width ".Dv HN_DIVISOR_1000" -offset indent
.It Dv HN_DECIMAL
-If the final result is less than 10, display it using one digit.
+If the final result is less than 10, display it using one decimal place.
.It Dv HN_NOSPACE
Do not put a space between
.Fa number
@@ -160,13 +160,18 @@ This flag has no effect when
is also specified.
.El
.Sh RETURN VALUES
-The
-.Fn humanize_number
-function returns the number of characters stored in
+Upon success, the
+.Nm
+function returns the number of characters that would have been stored in
.Fa buf
(excluding the terminating
.Dv NUL )
-upon success, or \-1 upon failure.
+if
+.Fa buf
+was large enough, or \-1 upon failure.
+Even upon failure, the contents of
+.Fa buf
+may be modified.
If
.Dv HN_GETSCALE
is specified, the prefix index number will be returned instead.
Modified: projects/random_number_generator/lib/libutil/humanize_number.c
==============================================================================
--- projects/random_number_generator/lib/libutil/humanize_number.c Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/lib/libutil/humanize_number.c Tue Oct 8 07:02:23 2013 (r256136)
@@ -2,6 +2,7 @@
/*
* Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
+ * Copyright 2013 John-Mark Gurney <jmg at FreeBSD.org>
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -50,15 +51,26 @@ humanize_number(char *buf, size_t len, i
{
const char *prefixes, *sep;
int i, r, remainder, s1, s2, sign;
+ int divisordeccut;
int64_t divisor, max;
size_t baselen;
- assert(buf != NULL);
- assert(suffix != NULL);
- assert(scale >= 0);
- assert(scale < maxscale || (((scale & (HN_AUTOSCALE | HN_GETSCALE)) != 0)));
- assert(!((flags & HN_DIVISOR_1000) && (flags & HN_IEC_PREFIXES)));
+ /* Since so many callers don't check -1, NUL terminate the buffer */
+ if (len > 0)
+ buf[0] = '\0';
+ /* validate args */
+ if (buf == NULL || suffix == NULL)
+ return (-1);
+ if (scale < 0)
+ return (-1);
+ else if (scale >= maxscale &&
+ ((scale & ~(HN_AUTOSCALE|HN_GETSCALE)) != 0))
+ return (-1);
+ if ((flags & HN_DIVISOR_1000) && (flags & HN_IEC_PREFIXES))
+ return (-1);
+
+ /* setup parameters */
remainder = 0;
if (flags & HN_IEC_PREFIXES) {
@@ -73,34 +85,32 @@ humanize_number(char *buf, size_t len, i
* an assertion earlier).
*/
divisor = 1024;
+ divisordeccut = 973; /* ceil(.95 * 1024) */
if (flags & HN_B)
prefixes = "B\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
else
prefixes = "\0\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
} else {
baselen = 1;
- if (flags & HN_DIVISOR_1000)
+ if (flags & HN_DIVISOR_1000) {
divisor = 1000;
- else
+ divisordeccut = 950;
+ if (flags & HN_B)
+ prefixes = "B\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E";
+ else
+ prefixes = "\0\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E";
+ } else {
divisor = 1024;
-
- if (flags & HN_B)
- prefixes = "B\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E";
- else
- prefixes = "\0\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E";
+ divisordeccut = 973; /* ceil(.95 * 1024) */
+ if (flags & HN_B)
+ prefixes = "B\0\0K\0\0M\0\0G\0\0T\0\0P\0\0E";
+ else
+ prefixes = "\0\0\0K\0\0M\0\0G\0\0T\0\0P\0\0E";
+ }
}
#define SCALE2PREFIX(scale) (&prefixes[(scale) * 3])
- if (scale < 0 || (scale >= maxscale &&
- (scale & (HN_AUTOSCALE | HN_GETSCALE)) == 0))
- return (-1);
-
- if (buf == NULL || suffix == NULL)
- return (-1);
-
- if (len > 0)
- buf[0] = '\0';
if (quotient < 0) {
sign = -1;
quotient = -quotient;
@@ -132,8 +142,8 @@ humanize_number(char *buf, size_t len, i
* divide once more.
*/
for (i = 0;
- (quotient >= max || (quotient == max - 1 && remainder >= 950)) &&
- i < maxscale; i++) {
+ (quotient >= max || (quotient == max - 1 &&
+ remainder >= divisordeccut)) && i < maxscale; i++) {
remainder = quotient % divisor;
quotient /= divisor;
}
@@ -148,20 +158,22 @@ humanize_number(char *buf, size_t len, i
}
/* If a value <= 9.9 after rounding and ... */
- if (quotient <= 9 && remainder < 950 && i > 0 && flags & HN_DECIMAL) {
- /* baselen + \0 + .N */
- if (len < baselen + 1 + 2)
- return (-1);
- s1 = (int)quotient + ((remainder + 50) / 1000);
- s2 = ((remainder + 50) / 100) % 10;
+ /*
+ * XXX - should we make sure there is enough space for the decimal
+ * place and if not, don't do HN_DECIMAL?
+ */
+ if (((quotient == 9 && remainder < divisordeccut) || quotient < 9) &&
+ i > 0 && flags & HN_DECIMAL) {
+ s1 = (int)quotient + ((remainder * 10 + divisor / 2) /
+ divisor / 10);
+ s2 = ((remainder * 10 + divisor / 2) / divisor) % 10;
r = snprintf(buf, len, "%d%s%d%s%s%s",
sign * s1, localeconv()->decimal_point, s2,
sep, SCALE2PREFIX(i), suffix);
} else
r = snprintf(buf, len, "%" PRId64 "%s%s%s",
- sign * (quotient + (remainder + 50) / 1000),
+ sign * (quotient + (remainder + divisor / 2) / divisor),
sep, SCALE2PREFIX(i), suffix);
return (r);
}
-
Modified: projects/random_number_generator/libexec/Makefile
==============================================================================
--- projects/random_number_generator/libexec/Makefile Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/libexec/Makefile Tue Oct 8 07:02:23 2013 (r256136)
@@ -8,6 +8,7 @@ SUBDIR= ${_atf} \
bootpd \
${_comsat} \
fingerd \
+ freebsd-version \
ftpd \
getty \
${_mail.local} \
Modified: projects/random_number_generator/libexec/rtld-elf/rtld.c
==============================================================================
--- projects/random_number_generator/libexec/rtld-elf/rtld.c Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/libexec/rtld-elf/rtld.c Tue Oct 8 07:02:23 2013 (r256136)
@@ -116,6 +116,7 @@ static Objlist_Entry *objlist_find(Objli
static void objlist_init(Objlist *);
static void objlist_push_head(Objlist *, Obj_Entry *);
static void objlist_push_tail(Objlist *, Obj_Entry *);
+static void objlist_put_after(Objlist *, Obj_Entry *, Obj_Entry *);
static void objlist_remove(Objlist *, Obj_Entry *);
static void *path_enumerate(const char *, path_enum_proc, void *);
static int relocate_object_dag(Obj_Entry *root, bool bind_now,
@@ -323,6 +324,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_
Objlist_Entry *entry;
Obj_Entry *obj;
Obj_Entry **preload_tail;
+ Obj_Entry *last_interposer;
Objlist initlist;
RtldLockState lockstate;
char *library_path_rpath;
@@ -537,8 +539,14 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_
die();
/* Make a list of all objects loaded at startup. */
+ last_interposer = obj_main;
for (obj = obj_list; obj != NULL; obj = obj->next) {
- objlist_push_tail(&list_main, obj);
+ if (obj->z_interpose && obj != obj_main) {
+ objlist_put_after(&list_main, last_interposer, obj);
+ last_interposer = obj;
+ } else {
+ objlist_push_tail(&list_main, obj);
+ }
obj->refcount++;
}
@@ -1128,6 +1136,8 @@ digest_dynamic1(Obj_Entry *obj, int earl
obj->z_nodelete = true;
if (dynp->d_un.d_val & DF_1_LOADFLTR)
obj->z_loadfltr = true;
+ if (dynp->d_un.d_val & DF_1_INTERPOSE)
+ obj->z_interpose = true;
if (dynp->d_un.d_val & DF_1_NODEFLIB)
obj->z_nodeflib = true;
break;
@@ -1976,6 +1986,7 @@ static int
load_preload_objects(void)
{
char *p = ld_preload;
+ Obj_Entry *obj;
static const char delim[] = " \t:;";
if (p == NULL)
@@ -1988,8 +1999,10 @@ load_preload_objects(void)
savech = p[len];
p[len] = '\0';
- if (load_object(p, -1, NULL, 0) == NULL)
+ obj = load_object(p, -1, NULL, 0);
+ if (obj == NULL)
return -1; /* XXX - cleanup */
+ obj->z_interpose = true;
p[len] = savech;
p += len;
p += strspn(p, delim);
@@ -2378,6 +2391,23 @@ objlist_push_tail(Objlist *list, Obj_Ent
}
static void
+objlist_put_after(Objlist *list, Obj_Entry *listobj, Obj_Entry *obj)
+{
+ Objlist_Entry *elm, *listelm;
+
+ STAILQ_FOREACH(listelm, list, link) {
+ if (listelm->obj == listobj)
+ break;
+ }
+ elm = NEW(Objlist_Entry);
+ elm->obj = obj;
+ if (listelm != NULL)
+ STAILQ_INSERT_AFTER(list, listelm, elm, link);
+ else
+ STAILQ_INSERT_TAIL(list, elm, link);
+}
+
+static void
objlist_remove(Objlist *list, Obj_Entry *obj)
{
Objlist_Entry *elm;
Modified: projects/random_number_generator/libexec/rtld-elf/rtld.h
==============================================================================
--- projects/random_number_generator/libexec/rtld-elf/rtld.h Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/libexec/rtld-elf/rtld.h Tue Oct 8 07:02:23 2013 (r256136)
@@ -259,6 +259,7 @@ typedef struct Struct_Obj_Entry {
bool z_nodelete : 1; /* Do not unload the object and dependencies */
bool z_noopen : 1; /* Do not load on dlopen */
bool z_loadfltr : 1; /* Immediately load filtees */
+ bool z_interpose : 1; /* Interpose all objects but main */
bool z_nodeflib : 1; /* Don't search default library path */
bool ref_nodel : 1; /* Refcount increased to prevent dlclose */
bool init_scanned: 1; /* Object is already on init list. */
Modified: projects/random_number_generator/sbin/camcontrol/camcontrol.c
==============================================================================
--- projects/random_number_generator/sbin/camcontrol/camcontrol.c Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/sbin/camcontrol/camcontrol.c Tue Oct 8 07:02:23 2013 (r256136)
@@ -2748,7 +2748,7 @@ atasecurity(struct cam_device *device, i
if (strcasecmp(optarg, "user") == 0) {
pwd.ctrl |= ATA_SECURITY_PASSWORD_USER;
pwd.ctrl &= ~ATA_SECURITY_PASSWORD_MASTER;
- } else if (strcasecmp(optarg, "master") != 0) {
+ } else if (strcasecmp(optarg, "master") == 0) {
pwd.ctrl |= ATA_SECURITY_PASSWORD_MASTER;
pwd.ctrl &= ~ATA_SECURITY_PASSWORD_USER;
} else {
Modified: projects/random_number_generator/sbin/camcontrol/fwdownload.c
==============================================================================
--- projects/random_number_generator/sbin/camcontrol/fwdownload.c Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/sbin/camcontrol/fwdownload.c Tue Oct 8 07:02:23 2013 (r256136)
@@ -224,6 +224,7 @@ fw_read_img(const char *fw_img_path, con
goto bailout;
}
*num_bytes = img_size;
+ close(fd);
return (buf);
bailout:
free(buf);
@@ -286,6 +287,7 @@ fw_download_img(struct cam_device *cam_d
ata_28bit_cmd(&ccb->ataio, ATA_ATA_IDENTIFY, 0, 0, 0);
} else {
warnx("weird disk type '%s'", type);
+ cam_freeccb(ccb);
return 1;
}
/* Disable freezing the device queue. */
Modified: projects/random_number_generator/share/man/man4/altera_avgen.4
==============================================================================
--- projects/random_number_generator/share/man/man4/altera_avgen.4 Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/share/man/man4/altera_avgen.4 Tue Oct 8 07:02:23 2013 (r256136)
@@ -56,11 +56,11 @@ entries configure the address, size, I/O
.Pa /dev
device node name that will be used.
The
-.Xr open ,
-.Xr read ,
-.Xr write ,
+.Xr open 2 ,
+.Xr read 2 ,
+.Xr write 2 ,
and
-.Xr mmap
+.Xr mmap 2
system calls (and variations) may be used on
.Nm
device nodes, subject to constraints imposed using
Modified: projects/random_number_generator/share/man/man4/rsu.4
==============================================================================
--- projects/random_number_generator/share/man/man4/rsu.4 Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/share/man/man4/rsu.4 Tue Oct 8 07:02:23 2013 (r256136)
@@ -35,9 +35,9 @@ place the following lines in your kernel
.Pp
Alternatively, to load the driver as a module at boot time,
place the following line in
-.Xr loader.conf 5:
+.Xr loader.conf 5 :
.Bd -literal -offset indent
-.Xr if_rsu_load="YES"
+if_rsu_load="YES"
.Ed
.Pp
After you have read the license in /usr/share/doc/legal/realtek
Modified: projects/random_number_generator/share/man/man5/src.conf.5
==============================================================================
--- projects/random_number_generator/share/man/man5/src.conf.5 Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/share/man/man5/src.conf.5 Tue Oct 8 07:02:23 2013 (r256136)
@@ -1,7 +1,7 @@
.\" DO NOT EDIT-- this file is automatically generated.
-.\" from FreeBSD: head/tools/build/options/makeman 253304 2013-07-12 23:08:44Z bapt
+.\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
.\" $FreeBSD$
-.Dd September 30, 2013
+.Dd October 6, 2013
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -200,7 +200,7 @@ When set, it also enforces the following
Set to not build the Clang C/C++ compiler.
.Pp
It is a default setting on
-arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
+arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
When set, it also enforces the following options:
.Pp
.Bl -item -compact
@@ -228,7 +228,7 @@ Set to avoid building the ARCMigrate, Re
the Clang C/C++ compiler.
.Pp
It is a default setting on
-arm/arm, arm/armeb, arm/armv6, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
+arm/arm, arm/armeb, arm/armv6, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
.It Va WITH_CLANG_FULL
.\" from FreeBSD: head/tools/build/options/WITH_CLANG_FULL 246259 2013-02-02 22:28:29Z dim
Set to build the ARCMigrate, Rewriter and StaticAnalyzer components of the
@@ -245,7 +245,7 @@ and
.Pa /usr/bin/cpp .
.Pp
It is a default setting on
-arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
When set, it also enforces the following options:
.Pp
.Bl -item -compact
@@ -369,7 +369,7 @@ Set to build Flattened Device Tree suppo
This includes the device tree compiler (dtc) and libfdt support library.
.Pp
It is a default setting on
-arm/arm, arm/armeb, arm/armv6, arm/armv6eb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc and powerpc/powerpc64.
+arm/arm, arm/armeb, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc and powerpc/powerpc64.
.It Va WITHOUT_FLOPPY
.\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 221540 2011-05-06 19:13:03Z ru
Set to not build or install programs
@@ -406,7 +406,7 @@ amd64/amd64, arm/arm, arm/armv6 and i386
Set to build and install gcc and g++.
.Pp
It is a default setting on
-arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
.It Va WITHOUT_GCOV
.\" from FreeBSD: head/tools/build/options/WITHOUT_GCOV 156932 2006-03-21 07:50:50Z ru
Set to not build the
@@ -443,7 +443,7 @@ Build the GNU C++ stack (g++, libstdc++)
This is the default on platforms where gcc is the system compiler.
.Pp
It is a default setting on
-arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
.It Va WITHOUT_GNU_SUPPORT
.\" from FreeBSD: head/tools/build/options/WITHOUT_GNU_SUPPORT 156932 2006-03-21 07:50:50Z ru
Set to build some programs without optional GNU support.
@@ -909,11 +909,6 @@ This includes
.Xr rlogin 1 ,
.Xr rsh 1 ,
etc.
-.It Va WITHOUT_RCS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 156932 2006-03-21 07:50:50Z ru
-Set to not build
-.Xr rcs 1
-and related utilities.
.It Va WITHOUT_RESCUE
.\" from FreeBSD: head/tools/build/options/WITHOUT_RESCUE 156932 2006-03-21 07:50:50Z ru
Set to not build
Modified: projects/random_number_generator/share/man/man8/picobsd.8
==============================================================================
--- projects/random_number_generator/share/man/man8/picobsd.8 Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/share/man/man8/picobsd.8 Tue Oct 8 07:02:23 2013 (r256136)
@@ -20,7 +20,7 @@ utility is a script which produces a min
which typically fits on a small media such as a floppy disk,
or can be downloaded as a
single image file from some media such as CDROM, flash memory, or through
-.Xr etherboot .
+etherboot.
.Pp
The
.Nm
@@ -64,7 +64,7 @@ kernel.
This is the default behaviour, and is
extremely useful as the kernel itself can be loaded,
using
-.Xr etherboot
+etherboot
or
.Xr pxeboot 8 ,
.\"
@@ -378,9 +378,7 @@ If the build is successful, the director
.Pa build_dir-bridge/
will contain a
.Pa kernel
-that can be downloaded with
-.Xr etherboot ,
-a floppy image called
+that can be downloaded with etherboot, a floppy image called
.Pa picobsd.bin ,
plus the products of the compilation in other directories.
If you want to modify the source tree in
@@ -480,9 +478,7 @@ Booting from a floppy is normally rather
minutes), things are much faster if you store your image on
a hard disk, Compact Flash, or CDROM.
.Pp
-You can also use
-.Xr etherboot
-to load the preloaded, uncompressed kernel image
+You can also use etherboot to load the preloaded, uncompressed kernel image
which is a byproduct of the
.Nm
build.
Modified: projects/random_number_generator/share/man/man9/Makefile
==============================================================================
--- projects/random_number_generator/share/man/man9/Makefile Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/share/man/man9/Makefile Tue Oct 8 07:02:23 2013 (r256136)
@@ -343,7 +343,9 @@ MAN= accept_filter.9 \
vnode.9 \
VOP_ACCESS.9 \
VOP_ACLCHECK.9 \
+ VOP_ADVISE.9 \
VOP_ADVLOCK.9 \
+ VOP_ALLOCATE.9 \
VOP_ATTRIB.9 \
VOP_BWRITE.9 \
VOP_CREATE.9 \
Copied: projects/random_number_generator/share/man/man9/VOP_ADVISE.9 (from r256135, head/share/man/man9/VOP_ADVISE.9)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/random_number_generator/share/man/man9/VOP_ADVISE.9 Tue Oct 8 07:02:23 2013 (r256136, copy of r256135, head/share/man/man9/VOP_ADVISE.9)
@@ -0,0 +1,88 @@
+.\" -*- nroff -*-
+.\"
+.\" Copyright (c) 2013 Advanced Computing Technologies LLC
+.\" Written by: John H. Baldwin <jhb at FreeBSD.org>
+.\" 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 October 3, 2013
+.Dt VOP_ADVISE 9
+.Os
+.Sh NAME
+.Nm VOP_ADVISE
+.Nd apply advice about use of file data
+.Sh SYNOPSIS
+.In sys/param.h
+.In sys/vnode.h
+.Ft int
+.Fn VOP_ADVISE "struct vnode *vp" "off_t start" "off_t end" "int advice"
+.Sh DESCRIPTION
+This call applies advice for a range of a file's data.
+It is used to implement the
+.Xr posix_fadvise
+system call.
+.Pp
+Its arguments are:
+.Bl -tag -width offset
+.It Fa vp
+The vnode of the file.
+.It Fa start
+The start of the range of file data.
+.It Fa end
+The end of the range of file data.
+.It Fa advice
+The type of operation to apply to the file data.
+Possible values are:
+.Bl -tag -width POSIX_FADV_WILLNEED
+.It Dv POSIX_FADV_WILLNEED
+Initiate an asynchronous read of the file data if it is not already resident.
+.It Dv POSIX_FADV_DONTNEED
+Decrease the in-memory priority of clean file data or discard clean file data.
+.El
+.El
+.Pp
+If the
+.Fa start
+and
+.Fa end
+offsets are both zero,
+then the operation should be applied to the entire file.
+Note that this call is advisory only and may perform the requested
+operation on a subset of the requested range
+.Pq including not performing it at all
+and still return success.
+.Sh LOCKS
+The file should be unlocked on entry.
+.Sh RETURN VALUES
+Zero is returned if the call is successful, otherwise an appropriate
+error code is returned.
+.Sh ERRORS
+.Bl -tag -width Er
+.It Bq Er EINVAL
+An invalid value was given for
+.Fa advice .
+.El
+.Sh SEE ALSO
+.Xr vnode 9
Copied: projects/random_number_generator/share/man/man9/VOP_ALLOCATE.9 (from r256135, head/share/man/man9/VOP_ALLOCATE.9)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/random_number_generator/share/man/man9/VOP_ALLOCATE.9 Tue Oct 8 07:02:23 2013 (r256136, copy of r256135, head/share/man/man9/VOP_ALLOCATE.9)
@@ -0,0 +1,84 @@
+.\" -*- nroff -*-
+.\"
+.\" Copyright (c) 2013 Advanced Computing Technologies LLC
+.\" Written by: John H. Baldwin <jhb at FreeBSD.org>
+.\" 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 October 3, 2013
+.Dt VOP_ALLOCATE 9
+.Os
+.Sh NAME
+.Nm VOP_ALLOCATE
+.Nd allocate storage for a file
+.Sh SYNOPSIS
+.In sys/param.h
+.In sys/vnode.h
+.Ft int
+.Fn VOP_ALLOCATE "struct vnode *vp" "off_t *offset" "off_t *len"
+.Sh DESCRIPTION
+This call allocates storage for a range of offsets in a file.
+It is used to implement the
+.Xr posix_fallocate
+system call.
+.Pp
+Its arguments are:
+.Bl -tag -width offset
+.It Fa vp
+The vnode of the file.
+.It Fa offset
+The start of the range to allocate storage for in the file.
+.It Fa len
+The length of the range to allocate storage for in the file.
+.El
+.Pp
+The
+.Fa offset
+and
+.Fa len
+arguments are updated to reflect the portion of the range that
+still needs to be allocated on return.
+A partial allocation is considered a successful operation.
+The file's contents are not changed.
+.Sh LOCKS
+The file should be exclusively locked on entry and will still be locked on exit.
+.Sh RETURN VALUES
+Zero is returned if the call is successful, otherwise an appropriate
+error code is returned.
+.Sh ERRORS
+.Bl -tag -width Er
+.It Bq Er EFBIG
+An attempt was made to write a file that exceeds the process's file size
+limit or the maximum file size.
+.It Bq Er ENOSPC
+The file system is full.
+.It Bq Er EPERM
+An append-only flag is set on the file, but the caller is attempting to
+write before the current end of file.
+.El
+.Sh SEE ALSO
+.Xr vnode 9 ,
+.Xr VOP_READ 9 ,
+.Xr VOP_WRITE 9
Modified: projects/random_number_generator/share/man/man9/VOP_FSYNC.9
==============================================================================
--- projects/random_number_generator/share/man/man9/VOP_FSYNC.9 Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/share/man/man9/VOP_FSYNC.9 Tue Oct 8 07:02:23 2013 (r256136)
@@ -65,15 +65,6 @@ Push data not written by file system syn
.It Fa td
The calling thread.
.El
-.Pp
-The argument
-.Fa waitfor
-is either
-.Dv MNT_WAIT
-or
-.Dv MNT_NOWAIT
-and specifies whether or not the function should wait for the writes
-to finish before returning.
.Sh LOCKS
The file should be locked on entry.
.Sh RETURN VALUES
Modified: projects/random_number_generator/share/man/man9/firmware.9
==============================================================================
--- projects/random_number_generator/share/man/man9/firmware.9 Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/share/man/man9/firmware.9 Tue Oct 8 07:02:23 2013 (r256136)
@@ -254,8 +254,8 @@ IxNpeMicrocode.dat
.Pp
Note that generating the firmware modules in this way requires
the availability of the following tools:
-.Xr awk ,
-.Xr make ,
+.Xr awk 1 ,
+.Xr make 1 ,
the compiler and the linker.
.Sh SEE ALSO
.Xr kld 4 ,
Modified: projects/random_number_generator/share/man/man9/vm_page_grab.9
==============================================================================
--- projects/random_number_generator/share/man/man9/vm_page_grab.9 Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/share/man/man9/vm_page_grab.9 Tue Oct 8 07:02:23 2013 (r256136)
@@ -64,7 +64,7 @@ function sleeps for any reason, the obje
The
.Fn vm_page_grab
supports all of the flags supported by
-.Xr vm_page_alloc .
+.Xr vm_page_alloc 9 .
In addition,
.Fn vm_page_grab
supports the following flags:
Modified: projects/random_number_generator/share/man/man9/vnode.9
==============================================================================
--- projects/random_number_generator/share/man/man9/vnode.9 Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/share/man/man9/vnode.9 Tue Oct 8 07:02:23 2013 (r256136)
@@ -163,7 +163,9 @@ intertwining of VM Objects and Vnodes.
.Xr malloc 9 ,
.Xr VOP_ACCESS 9 ,
.Xr VOP_ACLCHECK 9 ,
+.Xr VOP_ADVISE 9 ,
.Xr VOP_ADVLOCK 9 ,
+.Xr VOP_ALLOCATE 9 ,
.Xr VOP_ATTRIB 9 ,
.Xr VOP_BWRITE 9 ,
.Xr VOP_CREATE 9 ,
Modified: projects/random_number_generator/share/misc/bsd-family-tree
==============================================================================
--- projects/random_number_generator/share/misc/bsd-family-tree Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/share/misc/bsd-family-tree Tue Oct 8 07:02:23 2013 (r256136)
@@ -270,17 +270,23 @@ FreeBSD 5.2 | |
| | | | | | \ | |
| | | | | | NetBSD | |
| | | | | | 6.0.1 | |
+ | | | | | | | | |
+ | | | | | | NetBSD | |
+ | | | | | | 6.0.2 | |
| | | | | | | OpenBSD 5.3 DragonFly 3.4.1
| | | | | | NetBSD | |
| | | | | | 6.0.2 | |
| | | | | | | |
- | | | | | `-NetBSD 6.1 | |
- | | FreeBSD | | | |
- | | 8.4 | | | |
- | | | | | |
- | FreeBSD | | | |
+ | | | | | |`-NetBSD 6.1 | |
+ | | FreeBSD | | | | |
+ | | 8.4 | | NetBSD 6.1.1 | |
+ | | | | | | |
+ | FreeBSD | | NetBSD 6.1.2 | |
| 9.2 | | | |
| | | | |
+ | | | | |
+ | | | | |
+ | | | | |
FreeBSD 10 -current | NetBSD -current OpenBSD -current |
| | | | |
v v v v v
@@ -588,9 +594,12 @@ OpenBSD 5.3 2013-05-01 [OBD]
NetBSD 6.0.2 2013-05-18 [NBD] (security/critical release)
NetBSD 6.1 2013-05-18 [NBD]
FreeBSD 8.4 2013-06-07 [FBD]
+NetBSD 6.1.1 2013-08-22 [NBD]
NetBSD 5.1.3 2013-09-29 [NBD]
NetBSD 5.2.1 2013-09-29 [NBD]
FreeBSD 9.2 2013-09-30 [FBD]
+NetBSD 6.0.3 2013-09-30 [NBD]
+NetBSD 6.1.2 2013-09-30 [NBD]
Bibliography
------------------------
Modified: projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c
==============================================================================
--- projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c Tue Oct 8 07:02:23 2013 (r256136)
@@ -117,7 +117,9 @@ lzjb_decompress(void *s_start, void *d_s
src += 2;
if ((cpy = dst - offset) < (uchar_t *)d_start)
return (-1);
- while (--mlen >= 0 && dst < d_end)
+ if (mlen > (d_end - dst))
+ mlen = d_end - dst;
+ while (--mlen >= 0)
*dst++ = *cpy++;
} else {
*dst++ = *src++;
Modified: projects/random_number_generator/sys/dev/cxgbe/t4_sge.c
==============================================================================
--- projects/random_number_generator/sys/dev/cxgbe/t4_sge.c Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/sys/dev/cxgbe/t4_sge.c Tue Oct 8 07:02:23 2013 (r256136)
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip.h>
#include <netinet/ip6.h>
#include <netinet/tcp.h>
+#include <machine/md_var.h>
#include "common/common.h"
#include "common/t4_regs.h"
@@ -215,10 +216,6 @@ static int handle_fw_msg(struct sge_iq *
static int sysctl_uint16(SYSCTL_HANDLER_ARGS);
-#if defined(__i386__) || defined(__amd64__)
-extern u_int cpu_clflush_line_size;
-#endif
-
/*
* Called on MOD_LOAD. Validates and calculates the SGE tunables.
*/
Modified: projects/random_number_generator/sys/dev/isci/isci.c
==============================================================================
--- projects/random_number_generator/sys/dev/isci/isci.c Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/sys/dev/isci/isci.c Tue Oct 8 07:02:23 2013 (r256136)
@@ -84,6 +84,7 @@ static driver_t isci_pci_driver = {
};
DRIVER_MODULE(isci, pci, isci_pci_driver, isci_devclass, 0, 0);
+MODULE_DEPEND(isci, cam, 1, 1, 1);
static struct _pcsid
{
Modified: projects/random_number_generator/sys/dev/xen/control/control.c
==============================================================================
--- projects/random_number_generator/sys/dev/xen/control/control.c Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/sys/dev/xen/control/control.c Tue Oct 8 07:02:23 2013 (r256136)
@@ -371,6 +371,7 @@ xctrl_suspend()
mtx_unlock(&Giant);
#ifdef SMP
+ CPU_ZERO(&cpu_suspend_map); /* silence gcc */
if (smp_started) {
/*
* Suspend other CPUs. This prevents IPIs while we
Modified: projects/random_number_generator/sys/i386/ibcs2/ibcs2_sysvec.c
==============================================================================
--- projects/random_number_generator/sys/i386/ibcs2/ibcs2_sysvec.c Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/sys/i386/ibcs2/ibcs2_sysvec.c Tue Oct 8 07:02:23 2013 (r256136)
@@ -54,8 +54,6 @@ MODULE_VERSION(ibcs2, 1);
extern int bsd_to_ibcs2_errno[];
extern struct sysent ibcs2_sysent[IBCS2_SYS_MAXSYSCALL];
-extern int szsigcode;
-extern char sigcode[];
static int ibcs2_fixup(register_t **, struct image_params *);
struct sysentvec ibcs2_svr3_sysvec = {
Modified: projects/random_number_generator/sys/i386/include/xen/xen-os.h
==============================================================================
--- projects/random_number_generator/sys/i386/include/xen/xen-os.h Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/sys/i386/include/xen/xen-os.h Tue Oct 8 07:02:23 2013 (r256136)
@@ -37,9 +37,6 @@
/* Everything below this point is not included by assembler (.S) files. */
#ifndef __ASSEMBLY__
-/* Force a proper event-channel callback from Xen. */
-void force_evtchn_callback(void);
-
/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
static inline void rep_nop(void)
{
Modified: projects/random_number_generator/sys/netinet6/ip6_mroute.c
==============================================================================
--- projects/random_number_generator/sys/netinet6/ip6_mroute.c Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/sys/netinet6/ip6_mroute.c Tue Oct 8 07:02:23 2013 (r256136)
@@ -616,7 +616,7 @@ X_ip6_mrouter_done(void)
for (rte = rt->mf6c_stall; rte != NULL; ) {
struct rtdetq *n = rte->next;
- m_free(rte->m);
+ m_freem(rte->m);
free(rte, M_MRTABLE6);
rte = n;
}
Modified: projects/random_number_generator/sys/ofed/include/rdma/ib_verbs.h
==============================================================================
--- projects/random_number_generator/sys/ofed/include/rdma/ib_verbs.h Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/sys/ofed/include/rdma/ib_verbs.h Tue Oct 8 07:02:23 2013 (r256136)
@@ -660,7 +660,7 @@ struct ib_qp_init_attr {
union {
struct ib_qp *qpg_parent; /* see qpg_type */
struct ib_qpg_init_attrib parent_attrib;
- };
+ } pp;
enum ib_sig_type sq_sig_type;
enum ib_qp_type qp_type;
enum ib_qp_create_flags create_flags;
Modified: projects/random_number_generator/sys/sys/elf_common.h
==============================================================================
--- projects/random_number_generator/sys/sys/elf_common.h Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/sys/sys/elf_common.h Tue Oct 8 07:02:23 2013 (r256136)
@@ -487,6 +487,7 @@ typedef struct {
#define DF_1_LOADFLTR 0x00000010 /* Immediate loading of filtees */
#define DF_1_NOOPEN 0x00000040 /* Do not allow loading on dlopen() */
#define DF_1_ORIGIN 0x00000080 /* Process $ORIGIN */
+#define DF_1_INTERPOSE 0x00000400 /* Interpose all objects but main */
#define DF_1_NODEFLIB 0x00000800 /* Do not search default paths */
/* Values for n_type. Used in core files. */
Modified: projects/random_number_generator/sys/x86/include/stdarg.h
==============================================================================
--- projects/random_number_generator/sys/x86/include/stdarg.h Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/sys/x86/include/stdarg.h Tue Oct 8 07:02:23 2013 (r256136)
@@ -64,6 +64,8 @@ typedef __va_list va_list;
(((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long))
#define va_start(ap, last) \
((ap) = (va_list)&(last) + __va_size(last))
+#define va_copy(dst, src) \
+ ((dst) = (src))
#define va_arg(ap, type) \
(*(type *)((ap) += __va_size(type), (ap) - __va_size(type)))
#define va_end(ap)
Modified: projects/random_number_generator/tools/regression/lib/libutil/Makefile
==============================================================================
--- projects/random_number_generator/tools/regression/lib/libutil/Makefile Tue Oct 8 06:54:52 2013 (r256135)
+++ projects/random_number_generator/tools/regression/lib/libutil/Makefile Tue Oct 8 07:02:23 2013 (r256136)
@@ -1,6 +1,7 @@
# $FreeBSD$
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list