svn commit: r253942 - in user/attilio/vmobj-readlock: cddl/contrib/opensolaris/cmd/zfs etc/devd sys/dev/iwn sys/geom/part sys/sparc64/include sys/sparc64/sparc64
Attilio Rao
attilio at FreeBSD.org
Sun Aug 4 21:24:56 UTC 2013
Author: attilio
Date: Sun Aug 4 21:24:54 2013
New Revision: 253942
URL: http://svnweb.freebsd.org/changeset/base/253942
Log:
MFC
Modified:
user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
user/attilio/vmobj-readlock/etc/devd/usb.conf
user/attilio/vmobj-readlock/sys/dev/iwn/if_iwn.c
user/attilio/vmobj-readlock/sys/geom/part/g_part.c
user/attilio/vmobj-readlock/sys/geom/part/g_part_apm.c
user/attilio/vmobj-readlock/sys/sparc64/include/pmap.h
user/attilio/vmobj-readlock/sys/sparc64/sparc64/pmap.c
Directory Properties:
user/attilio/vmobj-readlock/ (props changed)
user/attilio/vmobj-readlock/cddl/ (props changed)
user/attilio/vmobj-readlock/cddl/contrib/opensolaris/ (props changed)
user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zfs/ (props changed)
user/attilio/vmobj-readlock/sys/ (props changed)
user/attilio/vmobj-readlock/sys/cddl/contrib/opensolaris/ (props changed)
Modified: user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sun Aug 4 21:20:14 2013 (r253941)
+++ user/attilio/vmobj-readlock/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sun Aug 4 21:24:54 2013 (r253942)
@@ -57,6 +57,7 @@
#include <sys/fs/zfs.h>
#include <sys/types.h>
#include <time.h>
+#include <err.h>
#include <libzfs.h>
#include <libzfs_core.h>
Modified: user/attilio/vmobj-readlock/etc/devd/usb.conf
==============================================================================
--- user/attilio/vmobj-readlock/etc/devd/usb.conf Sun Aug 4 21:20:14 2013 (r253941)
+++ user/attilio/vmobj-readlock/etc/devd/usb.conf Sun Aug 4 21:24:54 2013 (r253942)
@@ -777,7 +777,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x050d";
- match "product" "(0x8053|0x805c|0x815c|0x825a|0x825b)";
+ match "product" "(0x8053|0x805c|0x815c)";
action "kldload -n if_run";
};
@@ -785,6 +785,30 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x050d";
+ match "product" "0x815f";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x050d";
+ match "product" "(0x825a|0x825b)";
+ action "kldload -n if_run";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x050d";
+ match "product" "0x845a";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x050d";
match "product" "0x905b";
action "kldload -n if_rum";
};
@@ -800,6 +824,14 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "vendor" "0x050d";
+ match "product" "0x945a";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "vendor" "0x0525";
match "product" "(0x1080|0xa4a0)";
action "kldload -n udbp";
@@ -1249,6 +1281,14 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x06f8";
+ match "product" "(0xe031|0xe032)";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x06f8";
match "product" "0xe033";
action "kldload -n if_urtwn";
};
@@ -1457,6 +1497,14 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x07aa";
+ match "product" "0x0047";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x07aa";
match "product" "0x0056";
action "kldload -n if_urtwn";
};
@@ -1561,6 +1609,14 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x07d1";
+ match "product" "(0x3300|0x3302|0x3303)";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x07d1";
match "product" "0x3a0c";
action "kldload -n if_uath";
};
@@ -1657,7 +1713,23 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x083a";
- match "product" "(0x6618|0x7511|0x7512|0x7522|0x8522|0xa512|0xa618|0xa701|0xa702|0xb522|0xc522|0xd522)";
+ match "product" "(0x6618|0x7511|0x7512|0x7522|0x8522|0xa512|0xa618|0xa701|0xa702|0xb522)";
+ action "kldload -n if_run";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x083a";
+ match "product" "0xc512";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x083a";
+ match "product" "(0xc522|0xd522)";
action "kldload -n if_run";
};
@@ -2137,7 +2209,39 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0b05";
- match "product" "(0x1731|0x1732|0x1742|0x1760|0x1761|0x1784|0x1790|0x179d)";
+ match "product" "(0x1731|0x1732|0x1742|0x1760|0x1761|0x1784)";
+ action "kldload -n if_run";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0b05";
+ match "product" "0x1786";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0b05";
+ match "product" "0x1790";
+ action "kldload -n if_run";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0b05";
+ match "product" "0x1791";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0b05";
+ match "product" "0x179d";
action "kldload -n if_run";
};
@@ -2273,7 +2377,23 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0bda";
- match "product" "(0x8170|0x8176|0x8177|0x8178|0x817a|0x817b|0x817c|0x817d|0x817e)";
+ match "product" "0x8170";
+ action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0bda";
+ match "product" "(0x8171|0x8172|0x8173|0x8174)";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0bda";
+ match "product" "(0x8176|0x8177|0x8178|0x817a|0x817b|0x817c|0x817d|0x817e)";
action "kldload -n if_urtwn";
};
@@ -2305,6 +2425,14 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0bda";
+ match "product" "(0x8712|0x8712)";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0bda";
match "product" "0x8754";
action "kldload -n if_urtwn";
};
@@ -2312,6 +2440,14 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "vendor" "0x0bda";
+ match "product" "0xc512";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "vendor" "0x0bed";
match "product" "(0x1100|0x1101)";
action "kldload -n uslcom";
@@ -2609,7 +2745,39 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0df6";
- match "product" "(0x002b|0x002c|0x002d|0x0039|0x003b|0x003c|0x003d|0x003e|0x003f|0x0040|0x0041|0x0042|0x0047|0x0048|0x004a|0x004d)";
+ match "product" "(0x002b|0x002c|0x002d|0x0039|0x003b|0x003c|0x003d|0x003e|0x003f|0x0040|0x0041|0x0042)";
+ action "kldload -n if_run";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0df6";
+ match "product" "0x0045";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0df6";
+ match "product" "(0x0047|0x0048|0x004a)";
+ action "kldload -n if_run";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0df6";
+ match "product" "0x004b";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0df6";
+ match "product" "0x004d";
action "kldload -n if_run";
};
@@ -2681,6 +2849,14 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0e66";
+ match "product" "(0x0015|0x0016)";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x0e66";
match "product" "0x0019";
action "kldload -n if_urtwn";
};
@@ -3401,6 +3577,14 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x13d3";
+ match "product" "(0x3306|0x3309|0x3310|0x3311|0x3325)";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x13d3";
match "product" "(0x3357|0x3358|0x3359)";
action "kldload -n if_urtwn";
};
@@ -3553,6 +3737,14 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x14b2";
+ match "product" "(0x3300|0x3301|0x3302)";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x14b2";
match "product" "0x3c02";
action "kldload -n if_ural";
};
@@ -3945,6 +4137,14 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x1740";
+ match "product" "(0x9603|0x9605)";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x1740";
match "product" "(0x9701|0x9702|0x9703|0x9705|0x9706|0x9707|0x9708|0x9709|0x9801)";
action "kldload -n if_run";
};
@@ -3961,7 +4161,23 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x177f";
- match "product" "(0x0153|0x0302|0x0313)";
+ match "product" "0x0153";
+ action "kldload -n if_run";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x177f";
+ match "product" "0x0154";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x177f";
+ match "product" "(0x0302|0x0313)";
action "kldload -n if_run";
};
@@ -4353,6 +4569,14 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x2019";
+ match "product" "0xab28";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x2019";
match "product" "(0xab2a|0xab2b|0xab2e)";
action "kldload -n if_urtwn";
};
@@ -4681,6 +4905,14 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x7392";
+ match "product" "(0x7611|0x7612|0x7622)";
+ action "kldload -n if_rsu";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x7392";
match "product" "(0x7711|0x7717|0x7718)";
action "kldload -n if_run";
};
@@ -4936,5 +5168,5 @@ nomatch 32 {
action "kldload -n umass";
};
-# 2477 USB entries processed
+# 2515 USB entries processed
Modified: user/attilio/vmobj-readlock/sys/dev/iwn/if_iwn.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/dev/iwn/if_iwn.c Sun Aug 4 21:20:14 2013 (r253941)
+++ user/attilio/vmobj-readlock/sys/dev/iwn/if_iwn.c Sun Aug 4 21:24:54 2013 (r253942)
@@ -7489,7 +7489,7 @@ iwn_hw_reset(void *arg0, int pending)
#define COUNTOF(array) (sizeof(array) / sizeof(array[0]))
/*
- * Transate CSR code to string
+ * Translate CSR code to string
*/
static char *iwn_get_csr_string(int csr)
{
Modified: user/attilio/vmobj-readlock/sys/geom/part/g_part.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/geom/part/g_part.c Sun Aug 4 21:20:14 2013 (r253941)
+++ user/attilio/vmobj-readlock/sys/geom/part/g_part.c Sun Aug 4 21:24:54 2013 (r253942)
@@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/bio.h>
-#include <sys/diskmbr.h>
#include <sys/endian.h>
#include <sys/kernel.h>
#include <sys/kobj.h>
Modified: user/attilio/vmobj-readlock/sys/geom/part/g_part_apm.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/geom/part/g_part_apm.c Sun Aug 4 21:20:14 2013 (r253941)
+++ user/attilio/vmobj-readlock/sys/geom/part/g_part_apm.c Sun Aug 4 21:24:54 2013 (r253942)
@@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/apm.h>
#include <sys/bio.h>
-#include <sys/diskmbr.h>
#include <sys/endian.h>
#include <sys/kernel.h>
#include <sys/kobj.h>
Modified: user/attilio/vmobj-readlock/sys/sparc64/include/pmap.h
==============================================================================
--- user/attilio/vmobj-readlock/sys/sparc64/include/pmap.h Sun Aug 4 21:20:14 2013 (r253941)
+++ user/attilio/vmobj-readlock/sys/sparc64/include/pmap.h Sun Aug 4 21:24:54 2013 (r253942)
@@ -56,7 +56,6 @@ struct md_page {
struct pmap *pmap;
uint32_t colors[DCACHE_COLORS];
int32_t color;
- uint32_t flags;
};
struct pmap {
Modified: user/attilio/vmobj-readlock/sys/sparc64/sparc64/pmap.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/sparc64/sparc64/pmap.c Sun Aug 4 21:20:14 2013 (r253941)
+++ user/attilio/vmobj-readlock/sys/sparc64/sparc64/pmap.c Sun Aug 4 21:24:54 2013 (r253942)
@@ -765,7 +765,6 @@ pmap_page_init(vm_page_t m)
TAILQ_INIT(&m->md.tte_list);
m->md.color = DCACHE_COLOR(VM_PAGE_TO_PHYS(m));
- m->md.flags = 0;
m->md.pmap = NULL;
}
More information about the svn-src-user
mailing list