svn commit: r258404 - in projects/random_number_generator: . cddl/contrib/opensolaris/cmd/plockstat cddl/contrib/opensolaris/cmd/zfs contrib/gcc contrib/llvm/lib/Analysis etc/devd lib/libfetch lib/...
Peter Wemm
peter at FreeBSD.org
Wed Nov 20 21:48:12 UTC 2013
Author: peter
Date: Wed Nov 20 21:48:06 2013
New Revision: 258404
URL: http://svnweb.freebsd.org/changeset/base/258404
Log:
Merge up to r258403 from head.
Added:
projects/random_number_generator/share/man/man4/axge.4
- copied unchanged from r258400, head/share/man/man4/axge.4
projects/random_number_generator/sys/dev/usb/net/if_axge.c
- copied unchanged from r258400, head/sys/dev/usb/net/if_axge.c
projects/random_number_generator/sys/dev/usb/net/if_axgereg.h
- copied unchanged from r258400, head/sys/dev/usb/net/if_axgereg.h
projects/random_number_generator/sys/modules/usb/axge/
- copied from r258400, head/sys/modules/usb/axge/
projects/random_number_generator/usr.sbin/bsdconfig/includes/
- copied from r258400, head/usr.sbin/bsdconfig/includes/
Modified:
projects/random_number_generator/ObsoleteFiles.inc
projects/random_number_generator/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c
projects/random_number_generator/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
projects/random_number_generator/contrib/gcc/ChangeLog.gcc43
projects/random_number_generator/contrib/llvm/lib/Analysis/CaptureTracking.cpp
projects/random_number_generator/etc/devd/usb.conf
projects/random_number_generator/lib/libfetch/common.c
projects/random_number_generator/lib/libiconv_modules/UTF7/citrus_utf7.c
projects/random_number_generator/release/Makefile
projects/random_number_generator/release/amd64/pkg-stage.conf
projects/random_number_generator/release/i386/pkg-stage.conf
projects/random_number_generator/sbin/geom/class/mirror/geom_mirror.c
projects/random_number_generator/sbin/geom/class/mirror/gmirror.8
projects/random_number_generator/share/man/man4/Makefile
projects/random_number_generator/share/man/man7/release.7
projects/random_number_generator/share/mk/bsd.progs.mk
projects/random_number_generator/sys/arm/arm/machdep.c
projects/random_number_generator/sys/arm/arm/pmap-v6.c
projects/random_number_generator/sys/arm/conf/BEAGLEBONE
projects/random_number_generator/sys/arm/ti/ti_sdhci.c
projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
projects/random_number_generator/sys/cddl/dev/fbt/fbt_powerpc.c
projects/random_number_generator/sys/conf/files
projects/random_number_generator/sys/crypto/aesni/aesni.c
projects/random_number_generator/sys/dev/nand/nand_cdev.c
projects/random_number_generator/sys/dev/nand/nand_geom.c
projects/random_number_generator/sys/dev/usb/serial/u3g.c
projects/random_number_generator/sys/dev/usb/usbdevs
projects/random_number_generator/sys/fs/pseudofs/pseudofs_vnops.c
projects/random_number_generator/sys/geom/mirror/g_mirror.c
projects/random_number_generator/sys/geom/mirror/g_mirror_ctl.c
projects/random_number_generator/sys/kern/subr_taskqueue.c
projects/random_number_generator/sys/kern/vfs_vnops.c
projects/random_number_generator/sys/modules/usb/Makefile
projects/random_number_generator/sys/net/if_ethersubr.c
projects/random_number_generator/sys/sys/bufobj.h
projects/random_number_generator/sys/ufs/ffs/ffs_softdep.c
projects/random_number_generator/sys/ufs/ffs/softdep.h
projects/random_number_generator/sys/vm/uma_core.c
projects/random_number_generator/sys/vm/uma_int.h
projects/random_number_generator/sys/vm/vm_fault.c
projects/random_number_generator/sys/vm/vm_map.c
projects/random_number_generator/tools/regression/fsx/fsx.c
projects/random_number_generator/tools/tools/bus_autoconf/bus_autoconf.sh
projects/random_number_generator/tools/tools/umastat/umastat.c
projects/random_number_generator/usr.bin/cmp/cmp.1
projects/random_number_generator/usr.bin/uname/uname.1
projects/random_number_generator/usr.sbin/bsdconfig/Makefile
projects/random_number_generator/usr.sbin/bsdconfig/includes/USAGE
projects/random_number_generator/usr.sbin/bsdconfig/includes/includes
projects/random_number_generator/usr.sbin/bsdconfig/networking/share/device.subr
projects/random_number_generator/usr.sbin/bsdconfig/share/variable.subr
projects/random_number_generator/usr.sbin/pkg/pkg.7
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/gcc/ (props changed)
projects/random_number_generator/contrib/llvm/ (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)
projects/random_number_generator/sys/conf/ (props changed)
Modified: projects/random_number_generator/ObsoleteFiles.inc
==============================================================================
--- projects/random_number_generator/ObsoleteFiles.inc Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/ObsoleteFiles.inc Wed Nov 20 21:48:06 2013 (r258404)
@@ -53,6 +53,10 @@ OLD_FILES+=usr/lib/libiconv.a
OLD_FILES+=usr/lib/libiconv.so
OLD_FILES+=usr/lib/libiconv.so.3
OLD_FILES+=usr/lib/libiconv_p.a
+OLD_FILES+=usr/lib32/libiconv.a
+OLD_FILES+=usr/lib32/libiconv.so
+OLD_FILES+=usr/lib32/libiconv.so.3
+OLD_FILES+=usr/lib32/libiconv_p.a
# 20131103: removal of utxrm(8), use 'utx rm' instead.
OLD_FILES+=usr/sbin/utxrm
OLD_FILES+=usr/share/man/man8/utxrm.8.gz
@@ -128,6 +132,7 @@ OLD_FILES+=usr/bin/gnu-ranlib
OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz
OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz
# 20130930: BIND removed from base
+OLD_FILES+=etc/mtree/BIND.chroot.dist
OLD_FILES+=etc/namedb
OLD_FILES+=etc/periodic/daily/470.status-named
OLD_FILES+=usr/bin/dig
Modified: projects/random_number_generator/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c
==============================================================================
--- projects/random_number_generator/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c Wed Nov 20 21:48:06 2013 (r258404)
@@ -778,7 +778,8 @@ main(int argc, char **argv)
#endif
int err;
int opt_C = 0, opt_H = 0, opt_p = 0, opt_v = 0;
- char c, *p, *end;
+ int c;
+ char *p, *end;
struct sigaction act;
int done = 0;
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 Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Wed Nov 20 21:48:06 2013 (r258404)
@@ -2011,7 +2011,7 @@ zfs_do_upgrade(int argc, char **argv)
boolean_t showversions = B_FALSE;
int ret = 0;
upgrade_cbdata_t cb = { 0 };
- char c;
+ int c;
int flags = ZFS_ITER_ARGS_CAN_BE_PATHS;
/* check options */
@@ -3561,7 +3561,7 @@ static int
zfs_do_snapshot(int argc, char **argv)
{
int ret = 0;
- char c;
+ int c;
nvlist_t *props;
snap_cbdata_t sd = { 0 };
boolean_t multiple_snaps = B_FALSE;
Modified: projects/random_number_generator/contrib/gcc/ChangeLog.gcc43
==============================================================================
--- projects/random_number_generator/contrib/gcc/ChangeLog.gcc43 Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/contrib/gcc/ChangeLog.gcc43 Wed Nov 20 21:48:06 2013 (r258404)
@@ -1,3 +1,9 @@
+2007-08-08 Andrew Haley <aph at redhat.com> (r128087)
+
+ * config/arm/libunwind.S (UNWIND_WRAPPER _Unwind_Backtrace): New.
+ * config/arm/unwind-arm.h (__gnu_Unwind_Backtrace): New.
+ * config/arm/unwind-arm.c (__gnu_Unwind_Backtrace): New.
+
2007-06-05 Joerg Wunsch <j.gnu at uriah.heep.sax.de> (r125346)
PR preprocessor/23479
@@ -365,6 +371,35 @@
(override_options): Add entries for Core2.
(ix86_issue_rate): Add case for Core2.
+2006-10-31 Geoffrey Keating <geoffk at apple.com> (r118356)
+
+ * c-decl.c (grokdeclarator): Don't set DECL_EXTERNAL on
+ inline static functions in c99 mode.
+
+ PR 16622
+ * doc/extend.texi (Inline): Update.
+ * c-tree.h (struct language_function): Remove field 'extern_inline'.
+ * c-decl.c (current_extern_inline): Delete.
+ (pop_scope): Adjust test for an undefined nested function.
+ Add warning about undeclared inline function.
+ (diagnose_mismatched_decls): Update comments. Disallow overriding
+ of inline functions in a translation unit in C99. Allow inline
+ declarations in C99 at any time.
+ (merge_decls): Boolize variables. Handle C99 'extern inline'
+ semantics.
+ (grokdeclarator): Set DECL_EXTERNAL here for functions. Handle
+ C99 inline semantics.
+ (start_function): Don't clear current_extern_inline. Don't set
+ DECL_EXTERNAL.
+ (c_push_function_context): Don't push current_extern_inline.
+ (c_pop_function_context): Don't restore current_extern_inline.
+
+ PR 11377
+ * c-typeck.c (build_external_ref): Warn about static variables
+ used in extern inline functions.
+ * c-decl.c (start_decl): Warn about static variables declared
+ in extern inline functions.
+
2006-10-27 Vladimir Makarov <vmakarov at redhat.com> (r118090)
* config/i386/i386.h (TARGET_GEODE):
Modified: projects/random_number_generator/contrib/llvm/lib/Analysis/CaptureTracking.cpp
==============================================================================
--- projects/random_number_generator/contrib/llvm/lib/Analysis/CaptureTracking.cpp Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/contrib/llvm/lib/Analysis/CaptureTracking.cpp Wed Nov 20 21:48:06 2013 (r258404)
@@ -146,8 +146,14 @@ void llvm::PointerMayBeCaptured(const Va
case Instruction::PHI:
case Instruction::Select:
// The original value is not captured via this if the new value isn't.
+ Count = 0;
for (Instruction::use_iterator UI = I->use_begin(), UE = I->use_end();
UI != UE; ++UI) {
+ // If there are lots of uses, conservatively say that the value
+ // is captured to avoid taking too much compile time.
+ if (Count++ >= Threshold)
+ return Tracker->tooManyUses();
+
Use *U = &UI.getUse();
if (Visited.insert(U))
if (Tracker->shouldExplore(U))
Modified: projects/random_number_generator/etc/devd/usb.conf
==============================================================================
--- projects/random_number_generator/etc/devd/usb.conf Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/etc/devd/usb.conf Wed Nov 20 21:48:06 2013 (r258404)
@@ -1,7 +1,7 @@
#
# $FreeBSD$
#
-# This file was automatically generated by "tools/bus_autoconf.sh".
+# This file was automatically generated by "tools/tools/bus_autoconf/bus_autoconf.sh".
# Please do not edit!
#
@@ -833,7 +833,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x050d";
- match "product" "0x935a";
+ match "product" "(0x935a|0x935b)";
action "kldload -n if_run";
};
@@ -1801,6 +1801,14 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0846";
+ match "product" "0x1100";
+ action "kldload -n uslcom";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0846";
match "product" "0x4240";
action "kldload -n if_upgt";
};
@@ -2185,7 +2193,23 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0af0";
- match "product" "(0x7601|0xc031|0xd013|0xd031)";
+ match "product" "0x7601";
+ action "kldload -n uhso";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0af0";
+ match "product" "0x9000";
+ action "kldload -n u3g";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0af0";
+ match "product" "(0xc031|0xd013|0xd031)";
action "kldload -n uhso";
};
@@ -2289,7 +2313,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0b05";
- match "product" "0x17b5";
+ match "product" "(0x17b5|0x17cb)";
action "kldload -n ng_ubt";
};
@@ -2361,7 +2385,23 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0b95";
- match "product" "(0x1720|0x1780|0x7720|0x772a|0x772b|0x7e2b)";
+ match "product" "(0x1720|0x1780)";
+ action "kldload -n if_axe";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0b95";
+ match "product" "(0x178a|0x1790)";
+ action "kldload -n if_axge";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0b95";
+ match "product" "(0x7720|0x772a|0x772b|0x7e2b)";
action "kldload -n if_axe";
};
@@ -2433,7 +2473,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0bda";
- match "product" "(0x8176|0x8177|0x8178|0x817a|0x817b|0x817c|0x817d|0x817e)";
+ match "product" "(0x8176|0x8176|0x8177|0x8178|0x817a|0x817b|0x817c|0x817d|0x817e)";
action "kldload -n if_urtwn";
};
@@ -3104,6 +3144,14 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "vendor" "0x0fde";
+ match "product" "0xca05";
+ action "kldload -n uslcom";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "vendor" "0x0fe6";
match "product" "(0x8101|0x9700)";
action "kldload -n if_udav";
@@ -3265,7 +3313,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x10c4";
- match "product" "(0x8066|0x806f|0x807a|0x80c4|0x80ca|0x80dd|0x80ed|0x80f6|0x8115|0x813d|0x813f|0x814a|0x814a|0x814b|0x8156|0x815e|0x815f|0x818b|0x819f|0x81a6|0x81a9|0x81ac|0x81ad|0x81c8|0x81e2|0x81e7|0x81e8|0x81f2|0x8218|0x822b|0x826b|0x8293|0x82f9|0x8341|0x8382|0x83a8|0x83d8|0x8411|0x8418|0x846e|0x8477|0x85ea|0x85eb|0x8664|0x8665|0xea60|0xea61|0xea70|0xea71|0xea80|0xf001|0xf002|0xf003|0xf004)";
+ match "product" "(0x8066|0x806f|0x807a|0x80c4|0x80ca|0x80dd|0x80ed|0x80f6|0x8115|0x813d|0x813f|0x814a|0x814a|0x814b|0x8156|0x815e|0x815f|0x818b|0x819f|0x81a6|0x81a9|0x81ac|0x81ad|0x81c8|0x81e2|0x81e7|0x81e8|0x81f2|0x8218|0x822b|0x826b|0x8293|0x82f9|0x8341|0x8382|0x83a8|0x83d8|0x8411|0x8418|0x846e|0x8477|0x85ea|0x85eb|0x85f8|0x8664|0x8665|0x88a4|0x88a5|0xea60|0xea61|0xea70|0xea71|0xea80|0xf001|0xf002|0xf003|0xf004)";
action "kldload -n uslcom";
};
@@ -3665,7 +3713,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x1410";
- match "product" "(0x1100|0x1110|0x1120|0x1130|0x1400|0x1410|0x1420|0x1430|0x1450|0x2100|0x2110|0x2120|0x2130|0x2400|0x2410|0x2420|0x4100|0x4400|0x5010|0x5041|0x5100|0x6000|0x6002|0x7042)";
+ match "product" "(0x1100|0x1110|0x1120|0x1130|0x1400|0x1410|0x1420|0x1430|0x1450|0x2100|0x2110|0x2120|0x2130|0x2400|0x2410|0x2420|0x4100|0x4400|0x5010|0x5020|0x5041|0x5100|0x6000|0x6002|0x7042)";
action "kldload -n u3g";
};
@@ -3777,7 +3825,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x148f";
- match "product" "(0x2770|0x2870|0x3070|0x3071|0x3072|0x3370|0x3572|0x8070)";
+ match "product" "(0x2770|0x2870|0x3070|0x3071|0x3072|0x3370|0x3572|0x5370|0x8070)";
action "kldload -n if_run";
};
@@ -4376,6 +4424,14 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "vendor" "0x1adb";
+ match "product" "0x0001";
+ action "kldload -n uslcom";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "vendor" "0x1b3d";
match "product" "(0x0100|0x0101|0x0102|0x0103|0x0104|0x0105|0x0106|0x0107|0x0108|0x0109|0x010a|0x010b|0x010c|0x010d|0x010e|0x010f|0x0110|0x0111|0x0112|0x0113|0x0114|0x0115|0x0116|0x0117|0x0118|0x0119|0x011a|0x011b|0x011c|0x011d|0x011e|0x011f|0x0120|0x0121|0x0122|0x0123|0x0124|0x0125|0x0126|0x0128|0x0129|0x012a|0x012b|0x012d|0x012e|0x012f|0x0130|0x0131|0x0132|0x0133|0x0134|0x0135|0x0136|0x0137|0x0138|0x0139|0x013a|0x013b|0x013c|0x013d|0x013e|0x013f|0x0140|0x0141|0x0142|0x0143|0x0144|0x0145|0x0146|0x0147|0x0148|0x0149|0x014a|0x014b|0x014c|0x014d|0x014e|0x014f|0x0150|0x0151|0x0152|0x0153|0x0159|0x015a|0x015b|0x015c|0x015d|0x015e|0x015f|0x0160|0x0161|0x0162|0x0163|0x0164|0x0165|0x0166|0x0167|0x0168|0x0169|0x016a|0x016b|0x016c|0x016d|0x016e|0x016f|0x0170|0x0171|0x0172|0x0173|0x0174|0x0175|0x0176|0x0177|0x0178|0x0179|0x017a|0x017b|0x017c|0x017d|0x017e|0x017f|0x0180|0x0181|0x0182|0x0183|0x0184|0x0185|0x0186|0x0187|0x0188|0x0189|0x018a|0x018b|0x018c|0x018d|0x018e|0x018f|0x0190|0x0191|0x019
2|0x0193|0x0194|0x0195|0x0196|0x0197|0x0198|0x0199|0x019a|0x019b|0x019c|0x019d|0x019e|0x019f|0x01a0|0x01a1|0x01a2|0x01a3|0x01a4|0x01a5|0x01a6|0x01a7|0x01a8|0x01a9|0x01aa|0x01ab|0x01ac|0x01ad|0x01ae|0x01af|0x01b0|0x01b1|0x01b2|0x01b3|0x01b4|0x01b5|0x01b6|0x01b7|0x01b8|0x01b9|0x01ba|0x01bb|0x01bc|0x01bd|0x01be|0x01bf|0x01c0|0x01c1|0x01c2|0x01c3|0x01c4|0x01c5|0x01c6|0x01c7|0x01c8|0x01c9|0x01ca|0x01cb|0x01cc|0x01cd|0x01ce|0x01cf|0x01d0|0x01d1|0x01d2|0x01d3|0x01d4|0x01d5|0x01d6|0x01d7|0x01d8|0x01d9|0x01da|0x01db|0x01dc|0x01dd|0x01de|0x01df|0x01e0|0x01e1|0x01e2|0x01e3|0x01e4|0x01e5|0x01e6|0x01e7|0x01e8|0x01e9|0x01ea|0x01eb|0x01ec|0x01ed|0x01ee|0x01ef|0x01f0|0x01f1|0x01f2|0x01f3|0x01f4|0x01f5|0x01f6|0x01f7|0x01f8|0x01f9|0x01fa|0x01fb|0x01fc|0x01fd|0x01fe|0x01ff)";
action "kldload -n uftdi";
@@ -4512,6 +4568,14 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "vendor" "0x1fb9";
+ match "product" "(0x0100|0x0200|0x0201|0x0202|0x0203|0x0300|0x0301|0x0302|0x0303|0x0400|0x0401|0x0402|0x0403|0x0404|0x0600|0x0601|0x0602|0x0700|0x0701)";
+ action "kldload -n uslcom";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "vendor" "0x2001";
match "product" "(0x1a00|0x1a02)";
action "kldload -n if_axe";
@@ -4561,7 +4625,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x2001";
- match "product" "(0x3c09|0x3c0a)";
+ match "product" "(0x3c09|0x3c0a|0x3c15|0x3c1b)";
action "kldload -n if_run";
};
@@ -4768,6 +4832,14 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "vendor" "0x2405";
+ match "product" "0x0003";
+ action "kldload -n uslcom";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "vendor" "0x2478";
match "product" "0x2008";
action "kldload -n uplcom";
@@ -5122,6 +5194,15 @@ nomatch 32 {
match "mode" "host";
match "intclass" "0x02";
match "intsubclass" "0x02";
+ match "intprotocol" "0x00";
+ action "kldload -n umodem";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "intclass" "0x02";
+ match "intsubclass" "0x02";
match "intprotocol" "0x01";
action "kldload -n umodem";
};
@@ -5260,5 +5341,5 @@ nomatch 32 {
action "kldload -n umass";
};
-# 2537 USB entries processed
+# 2574 USB entries processed
Modified: projects/random_number_generator/lib/libfetch/common.c
==============================================================================
--- projects/random_number_generator/lib/libfetch/common.c Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/lib/libfetch/common.c Wed Nov 20 21:48:06 2013 (r258404)
@@ -829,6 +829,16 @@ fetch_ssl(conn_t *conn, const struct url
return (-1);
}
SSL_set_fd(conn->ssl, conn->sd);
+
+#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+ if (!SSL_set_tlsext_host_name(conn->ssl,
+ __DECONST(struct url *, URL)->host)) {
+ fprintf(stderr,
+ "TLS server name indication extension failed for host %s\n",
+ URL->host);
+ return (-1);
+ }
+#endif
while ((ret = SSL_connect(conn->ssl)) == -1) {
ssl_err = SSL_get_error(conn->ssl, ret);
if (ssl_err != SSL_ERROR_WANT_READ &&
Modified: projects/random_number_generator/lib/libiconv_modules/UTF7/citrus_utf7.c
==============================================================================
--- projects/random_number_generator/lib/libiconv_modules/UTF7/citrus_utf7.c Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/lib/libiconv_modules/UTF7/citrus_utf7.c Wed Nov 20 21:48:06 2013 (r258404)
@@ -113,9 +113,9 @@ static const char base64[] =
static const char direct[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
- "0123456789(),-./:?";
+ "0123456789'(),-./:?";
-static const char option[] = "!\"#$%&';<=>@[]^_`{|}";
+static const char option[] = "!\"#$%&*;<=>@[]^_`{|}";
static const char spaces[] = " \t\r\n";
#define BASE64_BIT 6
@@ -165,6 +165,7 @@ _citrus_UTF7_mbtoutf16(_UTF7EncodingInfo
*nresult = (size_t)-2;
*s = s0;
sv.chlen = psenc->chlen;
+ memcpy(sv.ch, psenc->ch, sizeof(sv.ch));
*psenc = sv;
return (0);
}
@@ -202,6 +203,9 @@ _citrus_UTF7_mbtoutf16(_UTF7EncodingInfo
goto ilseq;
*u16 = (uint16_t)psenc->ch[i];
done = 1;
+ } else {
+ psenc->chlen--;
+ i--;
}
} else {
psenc->cache =
@@ -241,7 +245,6 @@ _citrus_UTF7_mbrtowc_priv(_UTF7EncodingI
wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
_UTF7State * __restrict psenc, size_t * __restrict nresult)
{
- const char *s0;
uint32_t u32;
uint16_t hi, lo;
size_t nr, siz;
@@ -252,14 +255,13 @@ _citrus_UTF7_mbrtowc_priv(_UTF7EncodingI
*nresult = (size_t)_ENCODING_IS_STATE_DEPENDENT;
return (0);
}
- s0 = *s;
if (psenc->surrogate) {
- hi = (psenc->cache >> 2) & UTF16_MAX;
+ hi = (psenc->cache >> psenc->bits) & UTF16_MAX;
if (hi < HISRG_MIN || hi > HISRG_MAX)
return (EINVAL);
siz = 0;
} else {
- err = _citrus_UTF7_mbtoutf16(ei, &hi, &s0, n, psenc, &nr);
+ err = _citrus_UTF7_mbtoutf16(ei, &hi, s, n, psenc, &nr);
if (nr == (size_t)-1 || nr == (size_t)-2) {
*nresult = nr;
return (err);
@@ -274,7 +276,7 @@ _citrus_UTF7_mbrtowc_priv(_UTF7EncodingI
}
psenc->surrogate = 1;
}
- err = _citrus_UTF7_mbtoutf16(ei, &lo, &s0, n, psenc, &nr);
+ err = _citrus_UTF7_mbtoutf16(ei, &lo, s, n, psenc, &nr);
if (nr == (size_t)-1 || nr == (size_t)-2) {
*nresult = nr;
return (err);
@@ -286,7 +288,6 @@ _citrus_UTF7_mbrtowc_priv(_UTF7EncodingI
u32 = (hi << 10 | lo) + SRG_BASE;
siz += nr;
done:
- *s = s0;
if (pwc != NULL)
*pwc = (wchar_t)u32;
if (u32 == (uint32_t)0) {
Modified: projects/random_number_generator/release/Makefile
==============================================================================
--- projects/random_number_generator/release/Makefile Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/release/Makefile Wed Nov 20 21:48:06 2013 (r258404)
@@ -172,8 +172,7 @@ dvd:
# Install system
mkdir -p ${.TARGET}
cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
- DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \
- WITHOUT_PROFILE=1
+ DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1
# Copy distfiles
mkdir -p ${.TARGET}/usr/freebsd-dist
cp *.txz MANIFEST ${.TARGET}/usr/freebsd-dist
Modified: projects/random_number_generator/release/amd64/pkg-stage.conf
==============================================================================
--- projects/random_number_generator/release/amd64/pkg-stage.conf Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/release/amd64/pkg-stage.conf Wed Nov 20 21:48:06 2013 (r258404)
@@ -3,7 +3,7 @@
# $FreeBSD$
#
-export PKG_ABI="freebsd:$(echo ${REVISION} | sed -e 's/\.[0-9]//'):x86:64"
+export PKG_ABI="freebsd:${REVISION%.[0-9]*}:x86:64"
export ASSUME_ALWAYS_YES=1
export __PKG_CONF="/etc/pkg/FreeBSD.conf"
export PACKAGESITE="http://pkg.FreeBSD.org/${PKG_ABI}/latest"
Modified: projects/random_number_generator/release/i386/pkg-stage.conf
==============================================================================
--- projects/random_number_generator/release/i386/pkg-stage.conf Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/release/i386/pkg-stage.conf Wed Nov 20 21:48:06 2013 (r258404)
@@ -3,7 +3,7 @@
# $FreeBSD$
#
-export PKG_ABI="freebsd:$(echo ${REVISION} | sed -e 's/\.[0-9]//'):x86:32"
+export PKG_ABI="freebsd:${REVISION%.[0-9]*}:x86:32"
export ASSUME_ALWAYS_YES=1
export __PKG_CONF="/etc/pkg/FreeBSD.conf"
export PACKAGESITE="http://pkg.FreeBSD.org/${PKG_ABI}/latest"
Modified: projects/random_number_generator/sbin/geom/class/mirror/geom_mirror.c
==============================================================================
--- projects/random_number_generator/sbin/geom/class/mirror/geom_mirror.c Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/sbin/geom/class/mirror/geom_mirror.c Wed Nov 20 21:48:06 2013 (r258404)
@@ -28,6 +28,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
+#include <err.h>
#include <errno.h>
#include <paths.h>
#include <stdio.h>
@@ -53,6 +54,7 @@ static void mirror_activate(struct gctl_
static void mirror_clear(struct gctl_req *req);
static void mirror_dump(struct gctl_req *req);
static void mirror_label(struct gctl_req *req);
+static void mirror_resize(struct gctl_req *req, unsigned flags);
struct g_command class_commands[] = {
{ "activate", G_FLAG_VERBOSE, mirror_main, G_NULL_OPTS,
@@ -112,6 +114,13 @@ struct g_command class_commands[] = {
{ "remove", G_FLAG_VERBOSE, NULL, G_NULL_OPTS,
"[-v] name prov ..."
},
+ { "resize", G_FLAG_VERBOSE, mirror_resize,
+ {
+ { 's', "size", "*", G_TYPE_STRING },
+ G_OPT_SENTINEL
+ },
+ "[-s size] [-v] name"
+ },
{ "stop", G_FLAG_VERBOSE, NULL,
{
{ 'f', "force", NULL, G_TYPE_BOOL },
@@ -376,3 +385,96 @@ mirror_activate(struct gctl_req *req)
printf("Provider %s activated.\n", path);
}
}
+
+static struct gclass *
+find_class(struct gmesh *mesh, const char *name)
+{
+ struct gclass *classp;
+
+ LIST_FOREACH(classp, &mesh->lg_class, lg_class) {
+ if (strcmp(classp->lg_name, name) == 0)
+ return (classp);
+ }
+ return (NULL);
+}
+
+static struct ggeom *
+find_geom(struct gclass *classp, const char *name)
+{
+ struct ggeom *gp;
+
+ LIST_FOREACH(gp, &classp->lg_geom, lg_geom) {
+ if (strcmp(gp->lg_name, name) == 0)
+ return (gp);
+ }
+ return (NULL);
+}
+
+static void
+mirror_resize(struct gctl_req *req, unsigned flags __unused)
+{
+ struct gmesh mesh;
+ struct gclass *classp;
+ struct ggeom *gp;
+ struct gprovider *pp;
+ struct gconsumer *cp;
+ off_t size;
+ int error, nargs;
+ const char *name;
+ char ssize[30];
+
+ nargs = gctl_get_int(req, "nargs");
+ if (nargs < 1) {
+ gctl_error(req, "Too few arguments.");
+ return;
+ }
+ error = geom_gettree(&mesh);
+ if (error)
+ errc(EXIT_FAILURE, error, "Cannot get GEOM tree");
+ name = gctl_get_ascii(req, "class");
+ if (name == NULL)
+ abort();
+ classp = find_class(&mesh, name);
+ if (classp == NULL)
+ errx(EXIT_FAILURE, "Class %s not found.", name);
+ name = gctl_get_ascii(req, "arg0");
+ if (name == NULL)
+ abort();
+ gp = find_geom(classp, name);
+ if (gp == NULL)
+ errx(EXIT_FAILURE, "No such geom: %s.", name);
+ pp = LIST_FIRST(&gp->lg_provider);
+ if (pp == NULL)
+ errx(EXIT_FAILURE, "Provider of geom %s not found.", name);
+ size = pp->lg_mediasize;
+ name = gctl_get_ascii(req, "size");
+ if (name == NULL)
+ errx(EXIT_FAILURE, "The size is not specified.");
+ if (*name == '*') {
+#define CSZ(c) ((c)->lg_provider->lg_mediasize - \
+ (c)->lg_provider->lg_sectorsize)
+ /* Find the maximum possible size */
+ LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) {
+ if (CSZ(cp) > size)
+ size = CSZ(cp);
+ }
+ LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) {
+ if (CSZ(cp) < size)
+ size = CSZ(cp);
+ }
+#undef CSZ
+ if (size == pp->lg_mediasize)
+ errx(EXIT_FAILURE,
+ "Cannot expand provider %s\n",
+ pp->lg_name);
+ } else {
+ error = g_parse_lba(name, pp->lg_sectorsize, &size);
+ if (error)
+ errc(EXIT_FAILURE, error, "Invalid size param");
+ size *= pp->lg_sectorsize;
+ }
+ snprintf(ssize, sizeof(ssize), "%ju", (uintmax_t)size);
+ gctl_change_param(req, "size", -1, ssize);
+ geom_deletetree(&mesh);
+ gctl_issue(req);
+}
Modified: projects/random_number_generator/sbin/geom/class/mirror/gmirror.8
==============================================================================
--- projects/random_number_generator/sbin/geom/class/mirror/gmirror.8 Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/sbin/geom/class/mirror/gmirror.8 Wed Nov 20 21:48:06 2013 (r258404)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 8, 2009
+.Dd November 20, 2013
.Dt GMIRROR 8
.Os
.Sh NAME
@@ -60,6 +60,11 @@
.Ar name
.Ar prov ...
.Nm
+.Cm resize
+.Op Fl v
+.Op Fl s Ar size
+.Ar name
+.Nm
.Cm insert
.Op Fl hiv
.Op Fl p Ar priority
@@ -193,6 +198,16 @@ balance algorithm.
Rebuild the given mirror components forcibly.
If autosynchronization was not turned off for the given device, this command
should be unnecessary.
+.It Cm resize
+Change the size of the given mirror.
+.Pp
+Additional options include:
+.Bl -tag -width ".Fl s Ar size"
+.It Fl s Ar size
+New size of the mirror is expressed in logical block numbers.
+This option can be omitted, then it will be automatically calculated to
+maximum available size.
+.El
.It Cm insert
Add the given component(s) to the existing mirror.
.Pp
Modified: projects/random_number_generator/share/man/man4/Makefile
==============================================================================
--- projects/random_number_generator/share/man/man4/Makefile Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/share/man/man4/Makefile Wed Nov 20 21:48:06 2013 (r258404)
@@ -67,6 +67,7 @@ MAN= aac.4 \
auditpipe.4 \
aue.4 \
axe.4 \
+ axge.4 \
bce.4 \
bfe.4 \
bge.4 \
Copied: projects/random_number_generator/share/man/man4/axge.4 (from r258400, head/share/man/man4/axge.4)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/random_number_generator/share/man/man4/axge.4 Wed Nov 20 21:48:06 2013 (r258404, copy of r258400, head/share/man/man4/axge.4)
@@ -0,0 +1,149 @@
+.\" Copyright (c) 1997, 1998, 1999, 2000-2003
+.\" Bill Paul <wpaul at windriver.com>. 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Bill Paul.
+.\" 4. Neither the name of the author nor the names of any co-contributors
+.\" may be used to endorse or promote products derived from this software
+.\" without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
+.\" 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 November 12, 2013
+.Dt AXGE 4
+.Os
+.Sh NAME
+.Nm axge
+.Nd "ASIX Electronics AX88178A/AX88179 USB Gigabit Ethernet driver"
+.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following lines in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device ehci"
+.Cd "device uhci"
+.Cd "device ohci"
+.Cd "device usb"
+.Cd "device miibus"
+.Cd "device axge"
+.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
+if_axge_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for USB Gigabit Ethernet adapters based on the ASIX
+Electronics AX88179 USB 3.0 and AX88178A USB 2.0 chipsets.
+.Pp
+The AX88179 and AX88178A contain a 10/100/1000 Ethernet MAC with a GMII
+interface for interfacing with the Gigabit Ethernet PHY.
+.Pp
+These devices will operate with both USB 1.x and USB 2.0 controllers, and the
+AX88179 will operate with USB 3.0 controllers.
+Packets are received and transmitted over separate USB bulk transfer endpoints.
+.Pp
+The
+.Nm
+driver supports the following media types:
+.Bl -tag -width ".Cm 10baseT/UTP"
+.It Cm autoselect
+Enable autoselection of the media type and options.
+The user can manually override
+the autoselected mode by adding media options to
+.Xr rc.conf 5 .
+.It Cm 10baseT/UTP
+Set 10Mbps operation.
+The
+.Xr ifconfig 8
+.Cm mediaopt
+option can also be used to select either
+.Cm full-duplex
+or
+.Cm half-duplex
+modes.
+.It Cm 100baseTX
+Set 100Mbps (Fast Ethernet) operation.
+The
+.Xr ifconfig 8
+.Cm mediaopt
+option can also be used to select either
+.Cm full-duplex
+or
+.Cm half-duplex
+modes.
+.It Cm 1000baseT
+Set 1000Mbps (Gigabit Ethernet) operation (AX88178 only).
+The
+.Xr ifconfig 8
+.Cm mediaopt
+option can also be used to select either
+.Cm full-duplex
+or
+.Cm half-duplex
+modes.
+.El
+.Pp
+The
+.Nm
+driver supports the following media options:
+.Bl -tag -width ".Cm full-duplex"
+.It Cm full-duplex
+Force full duplex operation.
+.It Cm half-duplex
+Force half duplex operation.
+.El
+.Pp
+For more information on configuring this device, see
+.Xr ifconfig 8 .
+.Sh SEE ALSO
+.Xr altq 4 ,
+.Xr arp 4 ,
+.Xr miibus 4 ,
+.Xr netintro 4 ,
+.Xr ng_ether 4 ,
+.Xr rgephy 4 ,
+.Xr vlan 4 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 10.1 .
+.Sh AUTHORS
+The
+.Nm
+driver was written by
+.An Kevin Lo Aq kevlo at FreeBSD.org
+and
+.An Li-Wen Hsu Aq lwhsu at FreeBSD.org .
+This manual page was adapted by
+.An Mark Johnston Aq markj at FreeBSD.org
+from the
+.Xr axe 4
+manual page.
Modified: projects/random_number_generator/share/man/man7/release.7
==============================================================================
--- projects/random_number_generator/share/man/man7/release.7 Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/share/man/man7/release.7 Wed Nov 20 21:48:06 2013 (r258404)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 7, 2013
+.Dd November 18, 2013
.Dt RELEASE 7
.Os
.Sh NAME
@@ -230,6 +230,10 @@ When set,
will prevent the
.Fa doc.txz
distribution package from being created.
+.It Va NODVD
+Set to a non-empty value to skip the
+.Cm dvdrom
+target.
.It Va NOPORTS
Set to a non-empty value to skip the
.Li ports/
@@ -270,6 +274,15 @@ This target produces files called
and
.Pa bootonly.iso
as its output.
+.It Cm dvdrom
+Builds installation DVD-ROM images.
+This may require the
+.Xr md 4
+(memory disk) device driver be present in the kernel
+(either by being compiled in or available as a module).
+This target produces the
+.Pa dvd1.iso
+file as its output.
.It Cm memstick
Builds an installation memory stick image named
.Pa memstick.img .
@@ -302,7 +315,8 @@ Builds a bootable installation system co
packaged by the
.Cm packagesystem
target, and suitable for imaging by the
-.Cm cdrom
+.Cm cdrom ,
+.Cm dvdrom
and
.Cm memstick
targets.
Modified: projects/random_number_generator/share/mk/bsd.progs.mk
==============================================================================
--- projects/random_number_generator/share/mk/bsd.progs.mk Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/share/mk/bsd.progs.mk Wed Nov 20 21:48:06 2013 (r258404)
@@ -44,7 +44,7 @@ PROG ?= $t
# just one of many
PROG_VARS += BINDIR CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD MAN SRCS
.for v in ${PROG_VARS:O:u}
-.if defined(${v}.${PROG})
+.if defined(${v}.${PROG}) || defined(${v}_${PROG})
$v += ${${v}_${PROG}:U${${v}.${PROG}}}
.else
$v ?=
Modified: projects/random_number_generator/sys/arm/arm/machdep.c
==============================================================================
--- projects/random_number_generator/sys/arm/arm/machdep.c Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/sys/arm/arm/machdep.c Wed Nov 20 21:48:06 2013 (r258404)
@@ -361,7 +361,6 @@ cpu_startup(void *dummy)
#endif
#endif
- cpu_setup("");
identify_arm_cpu();
printf("real memory = %ju (%ju MB)\n", (uintmax_t)ptoa(physmem),
@@ -1431,6 +1430,12 @@ initarm(struct arm_boot_params *abp)
cpu_domains(DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2));
/*
+ * Now that proper page tables are installed, call cpu_setup() to enable
+ * instruction and data caches and other chip-specific features.
+ */
+ cpu_setup("");
+
+ /*
* Only after the SOC registers block is mapped we can perform device
* tree fixups, as they may attempt to read parameters from hardware.
*/
Modified: projects/random_number_generator/sys/arm/arm/pmap-v6.c
==============================================================================
--- projects/random_number_generator/sys/arm/arm/pmap-v6.c Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/sys/arm/arm/pmap-v6.c Wed Nov 20 21:48:06 2013 (r258404)
@@ -1519,10 +1519,10 @@ pmap_fault_fixup(pmap_t pmap, vm_offset_
vm_page_dirty(m);
/* Re-enable write permissions for the page */
- pmap_set_prot(ptep, VM_PROT_WRITE, *ptep & L2_S_PROT_U);
- CTR1(KTR_PMAP, "pmap_fault_fix: new pte:0x%x", pte);
+ *ptep = (pte & ~L2_APX);
PTE_SYNC(ptep);
rv = 1;
+ CTR1(KTR_PMAP, "pmap_fault_fix: new pte:0x%x", *ptep);
} else if (!L2_S_REFERENCED(pte)) {
/*
* This looks like a good candidate for "page referenced"
@@ -1545,6 +1545,7 @@ pmap_fault_fixup(pmap_t pmap, vm_offset_
*ptep = pte | L2_S_REF;
PTE_SYNC(ptep);
rv = 1;
+ CTR1(KTR_PMAP, "pmap_fault_fix: new pte:0x%x", *ptep);
}
/*
@@ -3078,36 +3079,38 @@ validate:
* then continue setting mapping parameters
*/
if (m != NULL) {
- if (prot & (VM_PROT_ALL)) {
- if ((m->oflags & VPO_UNMANAGED) == 0)
+ if ((m->oflags & VPO_UNMANAGED) == 0) {
+ if (prot & (VM_PROT_ALL)) {
vm_page_aflag_set(m, PGA_REFERENCED);
- } else {
- /*
- * Need to do page referenced emulation.
- */
- npte &= ~L2_S_REF;
+ } else {
+ /*
+ * Need to do page referenced emulation.
+ */
+ npte &= ~L2_S_REF;
+ }
}
if (prot & VM_PROT_WRITE) {
- /*
- * Enable write permission if the access type
- * indicates write intention. Emulate modified
- * bit otherwise.
- */
- if ((access & VM_PROT_WRITE) != 0)
- npte &= ~(L2_APX);
-
if ((m->oflags & VPO_UNMANAGED) == 0) {
- vm_page_aflag_set(m, PGA_WRITEABLE);
/*
- * The access type and permissions indicate
- * that the page will be written as soon as
- * returned from fault service.
- * Mark it dirty from the outset.
+ * Enable write permission if the access type
+ * indicates write intention. Emulate modified
+ * bit otherwise.
*/
- if ((access & VM_PROT_WRITE) != 0)
+ if ((access & VM_PROT_WRITE) != 0) {
+ npte &= ~(L2_APX);
+ vm_page_aflag_set(m, PGA_WRITEABLE);
+ /*
+ * The access type and permissions
+ * indicate that the page will be
+ * written as soon as returned from
+ * fault service.
+ * Mark it dirty from the outset.
+ */
vm_page_dirty(m);
- }
+ }
+ } else
+ npte &= ~(L2_APX);
}
if (!(prot & VM_PROT_EXECUTE))
npte |= L2_XN;
Modified: projects/random_number_generator/sys/arm/conf/BEAGLEBONE
==============================================================================
--- projects/random_number_generator/sys/arm/conf/BEAGLEBONE Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/sys/arm/conf/BEAGLEBONE Wed Nov 20 21:48:06 2013 (r258404)
@@ -104,6 +104,7 @@ device gpio
# USB support
device usb
+options USB_HOST_ALIGN=64 # Cacheline size is 64 on AM335x.
options USB_DEBUG
#options USB_REQ_DEBUG
#options USB_VERBOSE
Modified: projects/random_number_generator/sys/arm/ti/ti_sdhci.c
==============================================================================
--- projects/random_number_generator/sys/arm/ti/ti_sdhci.c Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/sys/arm/ti/ti_sdhci.c Wed Nov 20 21:48:06 2013 (r258404)
@@ -108,7 +108,7 @@ static struct ofw_compat_data compat_dat
#define MMCHS_CON 0x02C
#define MMCHS_CON_DW8 (1 << 5)
#define MMCHS_CON_DVAL_8_4MS (3 << 9)
-#define MMCHS_SD_CAPA 0x240
+#define MMCHS_SD_CAPA 0x140
#define MMCHS_SD_CAPA_VS18 (1 << 26)
#define MMCHS_SD_CAPA_VS30 (1 << 25)
#define MMCHS_SD_CAPA_VS33 (1 << 24)
@@ -432,9 +432,9 @@ ti_sdhci_attach(device_t dev)
* that it can set the right values in the CAPA register, which can only
* be done once and never reset.
*/
- sc->slot.host.host_ocr |= MMC_OCR_LOW_VOLTAGE;
+ sc->slot.host.caps |= MMC_OCR_LOW_VOLTAGE;
if (sc->mmchs_device_id == 0 || OF_hasprop(node, "ti,dual-volt")) {
- sc->slot.host.host_ocr |= MMC_OCR_290_300 | MMC_OCR_300_310;
+ sc->slot.host.caps |= MMC_OCR_290_300 | MMC_OCR_300_310;
}
/*
Modified: projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Wed Nov 20 21:21:29 2013 (r258403)
+++ projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Wed Nov 20 21:48:06 2013 (r258404)
@@ -20,9 +20,9 @@
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list