svn commit: r246355 - in stable/9/sys: dev/netmap net
Author: luigi
Date: Tue Feb 5 09:40:31 2013
New Revision: 246355
URL: http://svnweb.freebsd.org/changeset/base/246355
Log:
MFH: sync netmap with the version in HEAD
Deleted:
stable/9/sys/dev/netmap/netmap_mem1.c
Modified:
stable/9/sys/dev/netmap/if_em_netmap.h
stable/9/sys/dev/netmap/if_igb_netmap.h
stable/9/sys/dev/netmap/if_lem_netmap.h
stable/9/sys/dev/netmap/if_re_netmap.h
stable/9/sys/dev/netmap/netmap.c
stable/9/sys/dev/netmap/netmap_kern.h
stable/9/sys/dev/netmap/netmap_mem2.c
stable/9/sys/net/netmap.h
stable/9/sys/net/netmap_user.h
Modified: stable/9/sys/dev/netmap/if_em_netmap.h
==
--- stable/9/sys/dev/netmap/if_em_netmap.h Tue Feb 5 05:16:02 2013
(r246354)
+++ stable/9/sys/dev/netmap/if_em_netmap.h Tue Feb 5 09:40:31 2013
(r246355)
@@ -171,7 +171,7 @@ em_netmap_txsync(struct ifnet *ifp, u_in
u_int j, k, l, n = 0, lim = kring->nkr_num_slots - 1;
/* generate an interrupt approximately every half ring */
- int report_frequency = kring->nkr_num_slots >> 1;
+ u_int report_frequency = kring->nkr_num_slots >> 1;
k = ring->cur;
if (k > lim)
@@ -292,6 +292,8 @@ em_netmap_rxsync(struct ifnet *ifp, u_in
l = rxr->next_to_check;
j = netmap_idx_n2k(kring, l);
if (netmap_no_pendintr || force_update) {
+ uint16_t slot_flags = kring->nkr_slot_flags;
+
for (n = 0; ; n++) {
struct e1000_rx_desc *curr = &rxr->rx_base[l];
uint32_t staterr = le32toh(curr->status);
@@ -299,6 +301,7 @@ em_netmap_rxsync(struct ifnet *ifp, u_in
if ((staterr & E1000_RXD_STAT_DD) == 0)
break;
ring->slot[j].len = le16toh(curr->length);
+ ring->slot[j].flags = slot_flags;
bus_dmamap_sync(rxr->rxtag, rxr->rx_buffers[l].map,
BUS_DMASYNC_POSTREAD);
j = (j == lim) ? 0 : j + 1;
Modified: stable/9/sys/dev/netmap/if_igb_netmap.h
==
--- stable/9/sys/dev/netmap/if_igb_netmap.h Tue Feb 5 05:16:02 2013
(r246354)
+++ stable/9/sys/dev/netmap/if_igb_netmap.h Tue Feb 5 09:40:31 2013
(r246355)
@@ -125,7 +125,7 @@ igb_netmap_txsync(struct ifnet *ifp, u_i
u_int j, k, l, n = 0, lim = kring->nkr_num_slots - 1;
/* generate an interrupt approximately every half ring */
- int report_frequency = kring->nkr_num_slots >> 1;
+ u_int report_frequency = kring->nkr_num_slots >> 1;
k = ring->cur;
if (k > lim)
@@ -263,6 +263,8 @@ igb_netmap_rxsync(struct ifnet *ifp, u_i
l = rxr->next_to_check;
j = netmap_idx_n2k(kring, l);
if (netmap_no_pendintr || force_update) {
+ uint16_t slot_flags = kring->nkr_slot_flags;
+
for (n = 0; ; n++) {
union e1000_adv_rx_desc *curr = &rxr->rx_base[l];
uint32_t staterr = le32toh(curr->wb.upper.status_error);
@@ -270,6 +272,7 @@ igb_netmap_rxsync(struct ifnet *ifp, u_i
if ((staterr & E1000_RXD_STAT_DD) == 0)
break;
ring->slot[j].len = le16toh(curr->wb.upper.length);
+ ring->slot[j].flags = slot_flags;
bus_dmamap_sync(rxr->ptag,
rxr->rx_buffers[l].pmap, BUS_DMASYNC_POSTREAD);
j = (j == lim) ? 0 : j + 1;
Modified: stable/9/sys/dev/netmap/if_lem_netmap.h
==
--- stable/9/sys/dev/netmap/if_lem_netmap.h Tue Feb 5 05:16:02 2013
(r246354)
+++ stable/9/sys/dev/netmap/if_lem_netmap.h Tue Feb 5 09:40:31 2013
(r246355)
@@ -253,6 +253,8 @@ lem_netmap_rxsync(struct ifnet *ifp, u_i
l = adapter->next_rx_desc_to_check;
j = netmap_idx_n2k(kring, l);
if (netmap_no_pendintr || force_update) {
+ uint16_t slot_flags = kring->nkr_slot_flags;
+
for (n = 0; ; n++) {
struct e1000_rx_desc *curr = &adapter->rx_desc_base[l];
uint32_t staterr = le32toh(curr->status);
@@ -266,6 +268,7 @@ lem_netmap_rxsync(struct ifnet *ifp, u_i
len = 0;
}
ring->slot[j].len = len;
+ ring->slot[j].flags = slot_flags;
bus_dmamap_sync(adapter->rxtag,
adapter->rx_buffer_area[l].map,
BUS_DMASYNC_POSTREAD);
Modified: stable/9/sys/dev/netmap/if_re_netmap.h
=
Re: svn commit: r246354 - head/share/mk
Just for comparison whats the size difference between clang built
clang and gcc built clang on arm?
On Tue, Feb 05, 2013 at 05:16:02AM +, Andrew Turner wrote:
> Author: andrew
> Date: Tue Feb 5 05:16:02 2013
> New Revision: 246354
> URL: http://svnweb.freebsd.org/changeset/base/246354
>
> Log:
> Build clang for little-endian arm by default. Due to size issues when built
> with gcc disable CLANG_FULL for now.
>
> Modified:
> head/share/mk/bsd.own.mk
>
> Modified: head/share/mk/bsd.own.mk
> ==
> --- head/share/mk/bsd.own.mk Tue Feb 5 04:13:34 2013(r246353)
> +++ head/share/mk/bsd.own.mk Tue Feb 5 05:16:02 2013(r246354)
> @@ -389,9 +389,13 @@ __T=${TARGET_ARCH}
> .else
> __T=${MACHINE_ARCH}
> .endif
> -# Clang is only for x86 and powerpc right now, by default.
> +# Clang is only for x86, powerpc and little-endian arm right now, by default.
> .if ${__T} == "amd64" || ${__T} == "i386" || ${__T:Mpowerpc*}
> __DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL
> +.elif ${__T} == "arm" || ${__T} == "armv6"
> +__DEFAULT_YES_OPTIONS+=CLANG
> +# GCC is unable to build the full clang on arm, disable it by default.
> +__DEFAULT_NO_OPTIONS+=CLANG_FULL
> .else
> __DEFAULT_NO_OPTIONS+=CLANG CLANG_FULL
> .endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246356 - in stable: 7/lib/libc/gen 8/lib/libc/gen 9/lib/libc/gen
Author: delphij
Date: Tue Feb 5 09:50:33 2013
New Revision: 246356
URL: http://svnweb.freebsd.org/changeset/base/246356
Log:
MFC r243758 (marcel):
In globextend() when the pathv vector cannot be (re-)allocated, don't
free and clear the gl_pathv pointer in the glob_t structure. Such
breaks the invariant of the glob_t structure, as stated in the comment
right in front of the globextend() function. If gl_pathv was non-NULL,
then gl_pathc was > 0. Making gl_pathv a NULL pointer without also
setting gl_pathc to 0 is wrong.
Since we otherwise don't free the memory associated with a glob_t in
error cases, it's unlikely that this change will cause a memory leak
that wasn't already there to begin with. Callers of glob(3) must
call globfree(3) irrespective of whether glob(3) returned an error
or not.
MFC r243759 (marcel):
In globextend(), take advantage of the fact that realloc(NULL, size) is
equivalent to malloc(size). This eliminates the conditional expression
used for calling either realloc() or malloc() when realloc() will do
all the time.
Modified:
stable/9/lib/libc/gen/glob.c
Directory Properties:
stable/9/lib/libc/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/7/lib/libc/gen/glob.c
stable/8/lib/libc/gen/glob.c
Directory Properties:
stable/7/lib/libc/ (props changed)
stable/8/lib/libc/ (props changed)
Modified: stable/9/lib/libc/gen/glob.c
==
--- stable/9/lib/libc/gen/glob.cTue Feb 5 09:40:31 2013
(r246355)
+++ stable/9/lib/libc/gen/glob.cTue Feb 5 09:50:33 2013
(r246356)
@@ -715,16 +715,10 @@ globextend(const Char *path, glob_t *pgl
}
newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
- pathv = pglob->gl_pathv ?
- realloc((char *)pglob->gl_pathv, newsize) :
- malloc(newsize);
- if (pathv == NULL) {
- if (pglob->gl_pathv) {
- free(pglob->gl_pathv);
- pglob->gl_pathv = NULL;
- }
+ /* realloc(NULL, newsize) is equivalent to malloc(newsize). */
+ pathv = realloc((void *)pglob->gl_pathv, newsize);
+ if (pathv == NULL)
return(GLOB_NOSPACE);
- }
if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) {
/* first time around -- clear initial gl_offs items */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246356 - in stable: 7/lib/libc/gen 8/lib/libc/gen 9/lib/libc/gen
Author: delphij
Date: Tue Feb 5 09:50:33 2013
New Revision: 246356
URL: http://svnweb.freebsd.org/changeset/base/246356
Log:
MFC r243758 (marcel):
In globextend() when the pathv vector cannot be (re-)allocated, don't
free and clear the gl_pathv pointer in the glob_t structure. Such
breaks the invariant of the glob_t structure, as stated in the comment
right in front of the globextend() function. If gl_pathv was non-NULL,
then gl_pathc was > 0. Making gl_pathv a NULL pointer without also
setting gl_pathc to 0 is wrong.
Since we otherwise don't free the memory associated with a glob_t in
error cases, it's unlikely that this change will cause a memory leak
that wasn't already there to begin with. Callers of glob(3) must
call globfree(3) irrespective of whether glob(3) returned an error
or not.
MFC r243759 (marcel):
In globextend(), take advantage of the fact that realloc(NULL, size) is
equivalent to malloc(size). This eliminates the conditional expression
used for calling either realloc() or malloc() when realloc() will do
all the time.
Modified:
stable/8/lib/libc/gen/glob.c
Directory Properties:
stable/8/lib/libc/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/7/lib/libc/gen/glob.c
stable/9/lib/libc/gen/glob.c
Directory Properties:
stable/7/lib/libc/ (props changed)
stable/9/lib/libc/ (props changed)
Modified: stable/8/lib/libc/gen/glob.c
==
--- stable/8/lib/libc/gen/glob.cTue Feb 5 09:40:31 2013
(r246355)
+++ stable/8/lib/libc/gen/glob.cTue Feb 5 09:50:33 2013
(r246356)
@@ -710,16 +710,10 @@ globextend(const Char *path, glob_t *pgl
}
newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
- pathv = pglob->gl_pathv ?
- realloc((char *)pglob->gl_pathv, newsize) :
- malloc(newsize);
- if (pathv == NULL) {
- if (pglob->gl_pathv) {
- free(pglob->gl_pathv);
- pglob->gl_pathv = NULL;
- }
+ /* realloc(NULL, newsize) is equivalent to malloc(newsize). */
+ pathv = realloc((void *)pglob->gl_pathv, newsize);
+ if (pathv == NULL)
return(GLOB_NOSPACE);
- }
if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) {
/* first time around -- clear initial gl_offs items */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246356 - in stable: 7/lib/libc/gen 8/lib/libc/gen 9/lib/libc/gen
Author: delphij
Date: Tue Feb 5 09:50:33 2013
New Revision: 246356
URL: http://svnweb.freebsd.org/changeset/base/246356
Log:
MFC r243758 (marcel):
In globextend() when the pathv vector cannot be (re-)allocated, don't
free and clear the gl_pathv pointer in the glob_t structure. Such
breaks the invariant of the glob_t structure, as stated in the comment
right in front of the globextend() function. If gl_pathv was non-NULL,
then gl_pathc was > 0. Making gl_pathv a NULL pointer without also
setting gl_pathc to 0 is wrong.
Since we otherwise don't free the memory associated with a glob_t in
error cases, it's unlikely that this change will cause a memory leak
that wasn't already there to begin with. Callers of glob(3) must
call globfree(3) irrespective of whether glob(3) returned an error
or not.
MFC r243759 (marcel):
In globextend(), take advantage of the fact that realloc(NULL, size) is
equivalent to malloc(size). This eliminates the conditional expression
used for calling either realloc() or malloc() when realloc() will do
all the time.
Modified:
stable/7/lib/libc/gen/glob.c
Directory Properties:
stable/7/lib/libc/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/8/lib/libc/gen/glob.c
stable/9/lib/libc/gen/glob.c
Directory Properties:
stable/8/lib/libc/ (props changed)
stable/9/lib/libc/ (props changed)
Modified: stable/7/lib/libc/gen/glob.c
==
--- stable/7/lib/libc/gen/glob.cTue Feb 5 09:40:31 2013
(r246355)
+++ stable/7/lib/libc/gen/glob.cTue Feb 5 09:50:33 2013
(r246356)
@@ -710,16 +710,10 @@ globextend(const Char *path, glob_t *pgl
}
newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
- pathv = pglob->gl_pathv ?
- realloc((char *)pglob->gl_pathv, newsize) :
- malloc(newsize);
- if (pathv == NULL) {
- if (pglob->gl_pathv) {
- free(pglob->gl_pathv);
- pglob->gl_pathv = NULL;
- }
+ /* realloc(NULL, newsize) is equivalent to malloc(newsize). */
+ pathv = realloc((void *)pglob->gl_pathv, newsize);
+ if (pathv == NULL)
return(GLOB_NOSPACE);
- }
if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) {
/* first time around -- clear initial gl_offs items */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246357 - in stable: 7/lib/libc/gen 8/lib/libc/gen 9/lib/libc/gen
Author: delphij
Date: Tue Feb 5 09:53:32 2013
New Revision: 246357
URL: http://svnweb.freebsd.org/changeset/base/246357
Log:
MFC r243779 (marcel):
Protect against DoS attacks, such as being described in CVE-2010-2632.
The changes were derived from what has been committed to NetBSD, with
modifications. These are:
1. Preserve the existsing GLOB_LIMIT behaviour by including the number
of matches to the set of parameters to limit.
2. Change some of the limits to avoid impacting normal use cases:
GLOB_LIMIT_STRING - change from 65536 to ARG_MAX so that glob(3)
can still provide a full command line of expanded names.
GLOB_LIMIT_STAT - change from 128 to 1024 for no other reason than
that 128 feels too low (it's not a limit that impacts the
behaviour of the test program listed in CVE-2010-2632).
GLOB_LIMIT_PATH - change from 1024 to 65536 so that glob(3) can
still provide a fill command line of expanded names.
3. Protect against buffer overruns when we hit the GLOB_LIMIT_STAT or
GLOB_LIMIT_READDIR limits. We append SEP and EOS to pathend in
those cases. Return GLOB_ABORTED instead of GLOB_NOSPACE when we
would otherwise overrun the buffer.
This change also modifies the existing behaviour of glob(3) in case
GLOB_LIMIT is specifies by limiting the *new* matches and not all
matches. This is an important distinction when GLOB_APPEND is set or
when the caller uses a non-zero gl_offs. Previously pre-existing
matches or the value of gl_offs would be counted in the number of
matches even though the man page states that glob(3) would return
GLOB_NOSPACE when gl_matchc or more matches were found.
The limits that cannot be circumvented are GLOB_LIMIT_STRING and
GLOB_LIMIT_PATH all others can be crossed by simply calling glob(3)
again and with GLOB_APPEND set.
The entire description above applies only when GLOB_LIMIT has been
specified of course. No limits apply when this flag isn't set!
Obtained from: Juniper Networks, Inc
Modified:
stable/8/lib/libc/gen/glob.c
Directory Properties:
stable/8/lib/libc/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/7/lib/libc/gen/glob.c
stable/9/lib/libc/gen/glob.c
Directory Properties:
stable/7/lib/libc/ (props changed)
stable/9/lib/libc/ (props changed)
Modified: stable/8/lib/libc/gen/glob.c
==
--- stable/8/lib/libc/gen/glob.cTue Feb 5 09:50:33 2013
(r246356)
+++ stable/8/lib/libc/gen/glob.cTue Feb 5 09:53:32 2013
(r246357)
@@ -89,6 +89,25 @@ __FBSDID("$FreeBSD$");
#include "collate.h"
+/*
+ * glob(3) expansion limits. Stop the expansion if any of these limits
+ * is reached. This caps the runtime in the face of DoS attacks. See
+ * also CVE-2010-2632
+ */
+#defineGLOB_LIMIT_BRACE128 /* number of brace calls */
+#defineGLOB_LIMIT_PATH 65536 /* number of path elements */
+#defineGLOB_LIMIT_READDIR 16384 /* number of readdirs */
+#defineGLOB_LIMIT_STAT 1024/* number of stat system calls
*/
+#defineGLOB_LIMIT_STRING ARG_MAX /* maximum total size for paths
*/
+
+struct glob_limit {
+ size_t l_brace_cnt;
+ size_t l_path_lim;
+ size_t l_readdir_cnt;
+ size_t l_stat_cnt;
+ size_t l_string_cnt;
+};
+
#defineDOLLAR '$'
#defineDOT '.'
#defineEOS '\0'
@@ -148,15 +167,18 @@ static const Char *g_strchr(const Char *
static Char*g_strcat(Char *, const Char *);
#endif
static int g_stat(Char *, struct stat *, glob_t *);
-static int glob0(const Char *, glob_t *, size_t *);
-static int glob1(Char *, glob_t *, size_t *);
-static int glob2(Char *, Char *, Char *, Char *, glob_t *, size_t *);
-static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, size_t
*);
-static int globextend(const Char *, glob_t *, size_t *);
-static const Char *
+static int glob0(const Char *, glob_t *, struct glob_limit *);
+static int glob1(Char *, glob_t *, struct glob_limit *);
+static int glob2(Char *, Char *, Char *, Char *, glob_t *,
+struct glob_limit *);
+static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *,
+struct glob_limit *);
+static int globextend(const Char *, glob_t *, struct glob_limit *);
+static const Char *
globtilde(const Char *, Char *, size_t, glob_t *);
-static int globexp1(const Char *, glob_t *, size_t *);
-static int globexp2(const Char *, const Char *, glob_t *, int *, size_t
*);
+static int globexp1(const Char *, glob_t *, struct glob_limit *);
+static int globexp2(const Char *, const Char *, glob_t *, int *,
+struct glob_limit *);
static int match(Char *, Char *, Char
svn commit: r246357 - in stable: 7/lib/libc/gen 8/lib/libc/gen 9/lib/libc/gen
Author: delphij
Date: Tue Feb 5 09:53:32 2013
New Revision: 246357
URL: http://svnweb.freebsd.org/changeset/base/246357
Log:
MFC r243779 (marcel):
Protect against DoS attacks, such as being described in CVE-2010-2632.
The changes were derived from what has been committed to NetBSD, with
modifications. These are:
1. Preserve the existsing GLOB_LIMIT behaviour by including the number
of matches to the set of parameters to limit.
2. Change some of the limits to avoid impacting normal use cases:
GLOB_LIMIT_STRING - change from 65536 to ARG_MAX so that glob(3)
can still provide a full command line of expanded names.
GLOB_LIMIT_STAT - change from 128 to 1024 for no other reason than
that 128 feels too low (it's not a limit that impacts the
behaviour of the test program listed in CVE-2010-2632).
GLOB_LIMIT_PATH - change from 1024 to 65536 so that glob(3) can
still provide a fill command line of expanded names.
3. Protect against buffer overruns when we hit the GLOB_LIMIT_STAT or
GLOB_LIMIT_READDIR limits. We append SEP and EOS to pathend in
those cases. Return GLOB_ABORTED instead of GLOB_NOSPACE when we
would otherwise overrun the buffer.
This change also modifies the existing behaviour of glob(3) in case
GLOB_LIMIT is specifies by limiting the *new* matches and not all
matches. This is an important distinction when GLOB_APPEND is set or
when the caller uses a non-zero gl_offs. Previously pre-existing
matches or the value of gl_offs would be counted in the number of
matches even though the man page states that glob(3) would return
GLOB_NOSPACE when gl_matchc or more matches were found.
The limits that cannot be circumvented are GLOB_LIMIT_STRING and
GLOB_LIMIT_PATH all others can be crossed by simply calling glob(3)
again and with GLOB_APPEND set.
The entire description above applies only when GLOB_LIMIT has been
specified of course. No limits apply when this flag isn't set!
Obtained from: Juniper Networks, Inc
Modified:
stable/9/lib/libc/gen/glob.c
Directory Properties:
stable/9/lib/libc/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/7/lib/libc/gen/glob.c
stable/8/lib/libc/gen/glob.c
Directory Properties:
stable/7/lib/libc/ (props changed)
stable/8/lib/libc/ (props changed)
Modified: stable/9/lib/libc/gen/glob.c
==
--- stable/9/lib/libc/gen/glob.cTue Feb 5 09:50:33 2013
(r246356)
+++ stable/9/lib/libc/gen/glob.cTue Feb 5 09:53:32 2013
(r246357)
@@ -94,6 +94,25 @@ __FBSDID("$FreeBSD$");
#include "collate.h"
+/*
+ * glob(3) expansion limits. Stop the expansion if any of these limits
+ * is reached. This caps the runtime in the face of DoS attacks. See
+ * also CVE-2010-2632
+ */
+#defineGLOB_LIMIT_BRACE128 /* number of brace calls */
+#defineGLOB_LIMIT_PATH 65536 /* number of path elements */
+#defineGLOB_LIMIT_READDIR 16384 /* number of readdirs */
+#defineGLOB_LIMIT_STAT 1024/* number of stat system calls
*/
+#defineGLOB_LIMIT_STRING ARG_MAX /* maximum total size for paths
*/
+
+struct glob_limit {
+ size_t l_brace_cnt;
+ size_t l_path_lim;
+ size_t l_readdir_cnt;
+ size_t l_stat_cnt;
+ size_t l_string_cnt;
+};
+
#defineDOLLAR '$'
#defineDOT '.'
#defineEOS '\0'
@@ -153,15 +172,18 @@ static const Char *g_strchr(const Char *
static Char*g_strcat(Char *, const Char *);
#endif
static int g_stat(Char *, struct stat *, glob_t *);
-static int glob0(const Char *, glob_t *, size_t *);
-static int glob1(Char *, glob_t *, size_t *);
-static int glob2(Char *, Char *, Char *, Char *, glob_t *, size_t *);
-static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, size_t
*);
-static int globextend(const Char *, glob_t *, size_t *);
-static const Char *
+static int glob0(const Char *, glob_t *, struct glob_limit *);
+static int glob1(Char *, glob_t *, struct glob_limit *);
+static int glob2(Char *, Char *, Char *, Char *, glob_t *,
+struct glob_limit *);
+static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *,
+struct glob_limit *);
+static int globextend(const Char *, glob_t *, struct glob_limit *);
+static const Char *
globtilde(const Char *, Char *, size_t, glob_t *);
-static int globexp1(const Char *, glob_t *, size_t *);
-static int globexp2(const Char *, const Char *, glob_t *, int *, size_t
*);
+static int globexp1(const Char *, glob_t *, struct glob_limit *);
+static int globexp2(const Char *, const Char *, glob_t *, int *,
+struct glob_limit *);
static int match(Char *, Char *, Char
svn commit: r246357 - in stable: 7/lib/libc/gen 8/lib/libc/gen 9/lib/libc/gen
Author: delphij
Date: Tue Feb 5 09:53:32 2013
New Revision: 246357
URL: http://svnweb.freebsd.org/changeset/base/246357
Log:
MFC r243779 (marcel):
Protect against DoS attacks, such as being described in CVE-2010-2632.
The changes were derived from what has been committed to NetBSD, with
modifications. These are:
1. Preserve the existsing GLOB_LIMIT behaviour by including the number
of matches to the set of parameters to limit.
2. Change some of the limits to avoid impacting normal use cases:
GLOB_LIMIT_STRING - change from 65536 to ARG_MAX so that glob(3)
can still provide a full command line of expanded names.
GLOB_LIMIT_STAT - change from 128 to 1024 for no other reason than
that 128 feels too low (it's not a limit that impacts the
behaviour of the test program listed in CVE-2010-2632).
GLOB_LIMIT_PATH - change from 1024 to 65536 so that glob(3) can
still provide a fill command line of expanded names.
3. Protect against buffer overruns when we hit the GLOB_LIMIT_STAT or
GLOB_LIMIT_READDIR limits. We append SEP and EOS to pathend in
those cases. Return GLOB_ABORTED instead of GLOB_NOSPACE when we
would otherwise overrun the buffer.
This change also modifies the existing behaviour of glob(3) in case
GLOB_LIMIT is specifies by limiting the *new* matches and not all
matches. This is an important distinction when GLOB_APPEND is set or
when the caller uses a non-zero gl_offs. Previously pre-existing
matches or the value of gl_offs would be counted in the number of
matches even though the man page states that glob(3) would return
GLOB_NOSPACE when gl_matchc or more matches were found.
The limits that cannot be circumvented are GLOB_LIMIT_STRING and
GLOB_LIMIT_PATH all others can be crossed by simply calling glob(3)
again and with GLOB_APPEND set.
The entire description above applies only when GLOB_LIMIT has been
specified of course. No limits apply when this flag isn't set!
Obtained from: Juniper Networks, Inc
Modified:
stable/7/lib/libc/gen/glob.c
Directory Properties:
stable/7/lib/libc/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/8/lib/libc/gen/glob.c
stable/9/lib/libc/gen/glob.c
Directory Properties:
stable/8/lib/libc/ (props changed)
stable/9/lib/libc/ (props changed)
Modified: stable/7/lib/libc/gen/glob.c
==
--- stable/7/lib/libc/gen/glob.cTue Feb 5 09:50:33 2013
(r246356)
+++ stable/7/lib/libc/gen/glob.cTue Feb 5 09:53:32 2013
(r246357)
@@ -89,6 +89,25 @@ __FBSDID("$FreeBSD$");
#include "collate.h"
+/*
+ * glob(3) expansion limits. Stop the expansion if any of these limits
+ * is reached. This caps the runtime in the face of DoS attacks. See
+ * also CVE-2010-2632
+ */
+#defineGLOB_LIMIT_BRACE128 /* number of brace calls */
+#defineGLOB_LIMIT_PATH 65536 /* number of path elements */
+#defineGLOB_LIMIT_READDIR 16384 /* number of readdirs */
+#defineGLOB_LIMIT_STAT 1024/* number of stat system calls
*/
+#defineGLOB_LIMIT_STRING ARG_MAX /* maximum total size for paths
*/
+
+struct glob_limit {
+ size_t l_brace_cnt;
+ size_t l_path_lim;
+ size_t l_readdir_cnt;
+ size_t l_stat_cnt;
+ size_t l_string_cnt;
+};
+
#defineDOLLAR '$'
#defineDOT '.'
#defineEOS '\0'
@@ -148,15 +167,18 @@ static Char *g_strchr(Char *, wchar_t);
static Char*g_strcat(Char *, const Char *);
#endif
static int g_stat(Char *, struct stat *, glob_t *);
-static int glob0(const Char *, glob_t *, size_t *);
-static int glob1(Char *, glob_t *, size_t *);
-static int glob2(Char *, Char *, Char *, Char *, glob_t *, size_t *);
-static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, size_t
*);
-static int globextend(const Char *, glob_t *, size_t *);
-static const Char *
+static int glob0(const Char *, glob_t *, struct glob_limit *);
+static int glob1(Char *, glob_t *, struct glob_limit *);
+static int glob2(Char *, Char *, Char *, Char *, glob_t *,
+struct glob_limit *);
+static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *,
+struct glob_limit *);
+static int globextend(const Char *, glob_t *, struct glob_limit *);
+static const Char *
globtilde(const Char *, Char *, size_t, glob_t *);
-static int globexp1(const Char *, glob_t *, size_t *);
-static int globexp2(const Char *, const Char *, glob_t *, int *, size_t
*);
+static int globexp1(const Char *, glob_t *, struct glob_limit *);
+static int globexp2(const Char *, const Char *, glob_t *, int *,
+struct glob_limit *);
static int match(Char *, Char *,
Re: svn commit: r246354 - head/share/mk
On Tue, 5 Feb 2013 10:36:32 +0100 Roman Divacky wrote: > Just for comparison whats the size difference between clang built > clang and gcc built clang on arm? When I use WITHOUT_CLANG_FULL: clang built with gcc is 43MB clang built with clang is 25MB When I use WITH_CLANG_FULL: clang built with gcc fails to link clang built with clang is 28MB Andrew ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246358 - head/etc/rc.d
Author: des
Date: Tue Feb 5 12:18:39 2013
New Revision: 246358
URL: http://svnweb.freebsd.org/changeset/base/246358
Log:
Load the pfsync module if necessary.
Reviewed by: glebius@
MFC after:1 week
Modified:
head/etc/rc.d/pfsync
Modified: head/etc/rc.d/pfsync
==
--- head/etc/rc.d/pfsyncTue Feb 5 09:53:32 2013(r246357)
+++ head/etc/rc.d/pfsyncTue Feb 5 12:18:39 2013(r246358)
@@ -35,6 +35,7 @@ pfsync_start()
if [ -n "${pfsync_syncpeer}" ]; then
_syncpeer="syncpeer ${pfsync_syncpeer}"
fi
+ load_kld pfsync
ifconfig pfsync0 $_syncpeer syncdev $pfsync_syncdev $pfsync_ifconfig up
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246359 - head/sys/boot/usb
Author: hselasky
Date: Tue Feb 5 12:37:50 2013
New Revision: 246359
URL: http://svnweb.freebsd.org/changeset/base/246359
Log:
Fix depend target.
Modified:
head/sys/boot/usb/Makefile
Modified: head/sys/boot/usb/Makefile
==
--- head/sys/boot/usb/Makefile Tue Feb 5 12:18:39 2013(r246358)
+++ head/sys/boot/usb/Makefile Tue Feb 5 12:37:50 2013(r246359)
@@ -42,13 +42,13 @@ OBJCOPY?= objcopy
SYSCC?=cc
CFLAGS+= -DBOOTPROG=\"usbloader\"
-CFLAGS+= -DUSB_GLOBAL_INCLUDE_FILE="\"bsd_global.h\""
+CFLAGS+= -DUSB_GLOBAL_INCLUDE_FILE=\"bsd_global.h\"
CFLAGS+= -ffunction-sections -fdata-sections
CFLAGS+= -ffreestanding
CFLAGS+= -Wformat -Wall
-CFLAGS+= -I ${S}
-CFLAGS+= -I ${T}
-CFLAGS+= -I ${.CURDIR}
+CFLAGS+= -I${S}
+CFLAGS+= -I${T}
+CFLAGS+= -I${.CURDIR}
CFLAGS+= -g
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246360 - head/sys/dev/usb
Author: hselasky
Date: Tue Feb 5 13:30:07 2013
New Revision: 246360
URL: http://svnweb.freebsd.org/changeset/base/246360
Log:
Fix some nits.
Modified:
head/sys/dev/usb/usb_bus.h
head/sys/dev/usb/usb_dynamic.c
head/sys/dev/usb/usb_msctest.c
head/sys/dev/usb/usb_process.c
head/sys/dev/usb/usb_request.c
Modified: head/sys/dev/usb/usb_bus.h
==
--- head/sys/dev/usb/usb_bus.h Tue Feb 5 12:37:50 2013(r246359)
+++ head/sys/dev/usb/usb_bus.h Tue Feb 5 13:30:07 2013(r246360)
@@ -51,7 +51,9 @@ struct usb_bus_stat {
struct usb_bus {
struct usb_bus_stat stats_err;
struct usb_bus_stat stats_ok;
+#if USB_HAVE_ROOT_MOUNT_HOLD
struct root_hold_token *bus_roothold;
+#endif
/*
* There are two callback processes. One for Giant locked
* callbacks. One for non-Giant locked callbacks. This should
Modified: head/sys/dev/usb/usb_dynamic.c
==
--- head/sys/dev/usb/usb_dynamic.c Tue Feb 5 12:37:50 2013
(r246359)
+++ head/sys/dev/usb/usb_dynamic.c Tue Feb 5 13:30:07 2013
(r246360)
@@ -68,7 +68,7 @@ usb_temp_setup_by_index_t *usb_temp_setu
usb_temp_unsetup_t *usb_temp_unsetup_p = &usb_temp_unsetup_w;
usb_test_quirk_t *usb_test_quirk_p = &usb_test_quirk_w;
usb_quirk_ioctl_t *usb_quirk_ioctl_p = &usb_quirk_ioctl_w;
-devclass_t usb_devclass_ptr = NULL;
+devclass_t usb_devclass_ptr;
static usb_error_t
usb_temp_setup_by_index_w(struct usb_device *udev, uint16_t index)
Modified: head/sys/dev/usb/usb_msctest.c
==
--- head/sys/dev/usb/usb_msctest.c Tue Feb 5 12:37:50 2013
(r246359)
+++ head/sys/dev/usb/usb_msctest.c Tue Feb 5 13:30:07 2013
(r246360)
@@ -848,7 +848,7 @@ usb_msc_eject(struct usb_device *udev, u
sizeof(scsi_tct_eject), USB_MS_HZ);
break;
default:
- printf("usb_msc_eject: unknown eject method (%d)\n", method);
+ DPRINTF("Unknown eject method (%d)\n", method);
break;
}
DPRINTF("Eject CD command status: %s\n", usbd_errstr(err));
Modified: head/sys/dev/usb/usb_process.c
==
--- head/sys/dev/usb/usb_process.c Tue Feb 5 12:37:50 2013
(r246359)
+++ head/sys/dev/usb/usb_process.c Tue Feb 5 13:30:07 2013
(r246360)
@@ -24,8 +24,6 @@
* SUCH DAMAGE.
*/
-#defineUSB_DEBUG_VAR usb_proc_debug
-
#ifdef USB_GLOBAL_INCLUDE_FILE
#include USB_GLOBAL_INCLUDE_FILE
#else
@@ -52,6 +50,8 @@
#include
#include
#include
+
+#defineUSB_DEBUG_VAR usb_proc_debug
#include
#include
Modified: head/sys/dev/usb/usb_request.c
==
--- head/sys/dev/usb/usb_request.c Tue Feb 5 12:37:50 2013
(r246359)
+++ head/sys/dev/usb/usb_request.c Tue Feb 5 13:30:07 2013
(r246360)
@@ -800,8 +800,6 @@ usbd_req_reset_port(struct usb_device *u
/* check for errors */
if (err)
goto done;
-#ifdef USB_DEBUG
-#endif
n = 0;
while (1) {
/* wait for the device to recover from reset */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246361 - head/sbin/devd
Author: zeising (doc,ports committer) Date: Tue Feb 5 14:29:37 2013 New Revision: 246361 URL: http://svnweb.freebsd.org/changeset/base/246361 Log: Bump .Dd for the change in r246121. Approved by: joel (mentor) Modified: head/sbin/devd/devd.8 Modified: head/sbin/devd/devd.8 == --- head/sbin/devd/devd.8 Tue Feb 5 13:30:07 2013(r246360) +++ head/sbin/devd/devd.8 Tue Feb 5 14:29:37 2013(r246361) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 24, 2005 +.Dd January 30, 2013 .Dt DEVD 8 .Os .Sh NAME ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246362 - head/games/fortune/datfiles
Author: des Date: Tue Feb 5 14:39:37 2013 New Revision: 246362 URL: http://svnweb.freebsd.org/changeset/base/246362 Log: Remove political propaganda Modified: head/games/fortune/datfiles/fortunes-o.real Modified: head/games/fortune/datfiles/fortunes-o.real == --- head/games/fortune/datfiles/fortunes-o.real Tue Feb 5 14:29:37 2013 (r246361) +++ head/games/fortune/datfiles/fortunes-o.real Tue Feb 5 14:39:37 2013 (r246362) @@ -11437,233 +11437,6 @@ two new uses for sheep. Meat and wool. % Runners do it alone. % -Rush Limbaugh's 35 Undeniable Truths of Life: - -(1) The greatest threat to the human spirit is liberalism. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(10) Liberalism poisons the soul. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(11) Neither the United States, nor anyone else, "imposes" freedom on - the people of other nations. Freedom is not an imposition. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(12) Freedom is God-given. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(13) To dictatorships, peace means the absence of opposition. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(14) To free people, peace means the absence of threat. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(15) The Peace Movement in the United States was, whether by accident or - design, pro-communist. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(16) The collective knowledge and wisdom of seasoned citizens is the - most valuable, yet untapped, resource our young people have. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(17) The greatest football team in the history of civilization was the - Pittsburgh Steelers of 1975 through 1980. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(18) There is no such thing as "war atrocities." War is an atrocity. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(19) Regardless of the pain in our memories, nostalgia only reminds us - of the good times in our past. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(2) The single greatest threat to the free people of the world is posed -by the heinous idea of centralized government control. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(20) There is a God. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(21) Abortion is wrong. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(22) Morality is not defined by individual choice. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(23) Evolution cannot explain creation. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(24) Feminism was established so that unattractive women could have - easier access to the mainstream of society. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(25) Love is the only human emotion which cannot be controlled. You - either do or you don't. You can't fake it. (Except women, and - thank God they can.) - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(26) The only difference between Mikhail Gorbachev and previous Soviet - leaders is that he is alive. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(27) Soviet leaders were actually left-wing dictators. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(28) Abraham Lincoln saved this nation. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(29) The Los Angeles Raide
svn commit: r246363 - in head/sys: boot/usb dev/usb dev/usb/controller
Author: hselasky
Date: Tue Feb 5 14:44:25 2013
New Revision: 246363
URL: http://svnweb.freebsd.org/changeset/base/246363
Log:
Add defines to more easily allow a single threaded version of the FreeBSD
USB stack. This is useful for non-kernel purposes, like the loader.
Modified:
head/sys/boot/usb/bsd_global.h
head/sys/boot/usb/bsd_kernel.c
head/sys/boot/usb/bsd_kernel.h
head/sys/dev/usb/controller/usb_controller.c
head/sys/dev/usb/controller/xhci.c
head/sys/dev/usb/controller/xhci.h
head/sys/dev/usb/usb_bus.h
head/sys/dev/usb/usb_device.c
head/sys/dev/usb/usb_freebsd.h
head/sys/dev/usb/usb_freebsd_loader.h
head/sys/dev/usb/usb_hub.c
head/sys/dev/usb/usb_transfer.c
Modified: head/sys/boot/usb/bsd_global.h
==
--- head/sys/boot/usb/bsd_global.h Tue Feb 5 14:39:37 2013
(r246362)
+++ head/sys/boot/usb/bsd_global.h Tue Feb 5 14:44:25 2013
(r246363)
@@ -60,4 +60,6 @@
#include
#include
+extern struct usb_process usb_process[USB_PROC_MAX];
+
#endif /* _BSD_GLOBAL_H_ */
Modified: head/sys/boot/usb/bsd_kernel.c
==
--- head/sys/boot/usb/bsd_kernel.c Tue Feb 5 14:39:37 2013
(r246362)
+++ head/sys/boot/usb/bsd_kernel.c Tue Feb 5 14:44:25 2013
(r246363)
@@ -26,7 +26,8 @@
#include
-static struct usb_process usb_process[USB_PROC_MAX];
+struct usb_process usb_process[USB_PROC_MAX];
+
static device_t usb_pci_root;
/**
@@ -977,41 +978,6 @@ repeat:
return (worked);
}
-int
-usb_proc_create(struct usb_process *up, struct mtx *p_mtx,
-const char *pmesg, uint8_t prio)
-{
-#defineUSB_PROC_OFFSET(a,b) \
- ((int)(((long)&((struct usb_bus *)0)->a) - \
-((long)&((struct usb_bus *)0)->b)))
-
- /* figure out which process we are creating */
- switch ((int)((long)up - (long)p_mtx)) {
- case USB_PROC_OFFSET(giant_callback_proc, bus_mtx):
- up->up_ptr = (void *)(usb_process + 2);
- break;
- case USB_PROC_OFFSET(non_giant_callback_proc, bus_mtx):
- up->up_ptr = (void *)(usb_process + 2);
- break;
- case USB_PROC_OFFSET(explore_proc, bus_mtx):
- up->up_ptr = (void *)(usb_process + 0);
- break;
- case USB_PROC_OFFSET(control_xfer_proc, bus_mtx):
- up->up_ptr = (void *)(usb_process + 1);
- break;
- default:
- up->up_ptr = (void *)(usb_process + 1);
- break;
- }
- return (0); /* success */
-}
-
-void
-usb_proc_free(struct usb_process *up)
-{
- /* NOP */
-}
-
void *
usb_proc_msignal(struct usb_process *up, void *_pm0, void *_pm1)
{
@@ -1021,10 +987,6 @@ usb_proc_msignal(struct usb_process *up,
usb_size_t d;
uint8_t t;
- /* find the correct parent */
- while (up->up_ptr != NULL)
- up = (struct usb_process *)up->up_ptr;
-
t = 0;
if (pm0->pm_qentry.tqe_prev) {
@@ -1104,10 +1066,6 @@ usb_proc_mwait(struct usb_process *up, v
struct usb_proc_msg *pm0 = _pm0;
struct usb_proc_msg *pm1 = _pm1;
- /* find the correct parent */
- while (up->up_ptr != NULL)
- up = (struct usb_process *)up->up_ptr;
-
/* Just remove the messages from the queue. */
if (pm0->pm_qentry.tqe_prev) {
TAILQ_REMOVE(&up->up_qhead, pm0, pm_qentry);
Modified: head/sys/boot/usb/bsd_kernel.h
==
--- head/sys/boot/usb/bsd_kernel.h Tue Feb 5 14:39:37 2013
(r246362)
+++ head/sys/boot/usb/bsd_kernel.h Tue Feb 5 14:44:25 2013
(r246363)
@@ -40,6 +40,10 @@
#defineM_USB 0
#defineM_USBDEV 0
#defineUSB_PROC_MAX 3
+#defineUSB_BUS_GIANT_PROC(bus) (usb_process + 2)
+#defineUSB_BUS_NON_GIANT_PROC(bus) (usb_process + 2)
+#defineUSB_BUS_EXPLORE_PROC(bus) (usb_process + 0)
+#defineUSB_BUS_CONTROL_XFER_PROC(bus) (usb_process + 1)
#defineSYSCTL_DECL(...)
#defineSYSCTL_NODE(name,...) struct { } name __used
#defineSYSCTL_INT(...)
Modified: head/sys/dev/usb/controller/usb_controller.c
==
--- head/sys/dev/usb/controller/usb_controller.cTue Feb 5 14:39:37
2013(r246362)
+++ head/sys/dev/usb/controller/usb_controller.cTue Feb 5 14:44:25
2013(r246363)
@@ -214,27 +214,29 @@ usb_detach(device_t dev)
USB_BUS_LOCK(bus);
/* Queue detach job */
- usb_proc_msignal(&bus->explore_proc,
+ usb_proc_msignal(USB_BUS_EXPLORE_PROC(bus),
&bus->detach_msg
svn commit: r246364 - stable/9/games/fortune/datfiles
Author: des Date: Tue Feb 5 14:53:05 2013 New Revision: 246364 URL: http://svnweb.freebsd.org/changeset/base/246364 Log: MFH r246362: remove political propaganda Modified: stable/9/games/fortune/datfiles/fortunes-o.real Directory Properties: stable/9/games/fortune/ (props changed) Modified: stable/9/games/fortune/datfiles/fortunes-o.real == --- stable/9/games/fortune/datfiles/fortunes-o.real Tue Feb 5 14:44:25 2013(r246363) +++ stable/9/games/fortune/datfiles/fortunes-o.real Tue Feb 5 14:53:05 2013(r246364) @@ -11437,233 +11437,6 @@ two new uses for sheep. Meat and wool. % Runners do it alone. % -Rush Limbaugh's 35 Undeniable Truths of Life: - -(1) The greatest threat to the human spirit is liberalism. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(10) Liberalism poisons the soul. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(11) Neither the United States, nor anyone else, "imposes" freedom on - the people of other nations. Freedom is not an imposition. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(12) Freedom is God-given. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(13) To dictatorships, peace means the absence of opposition. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(14) To free people, peace means the absence of threat. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(15) The Peace Movement in the United States was, whether by accident or - design, pro-communist. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(16) The collective knowledge and wisdom of seasoned citizens is the - most valuable, yet untapped, resource our young people have. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(17) The greatest football team in the history of civilization was the - Pittsburgh Steelers of 1975 through 1980. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(18) There is no such thing as "war atrocities." War is an atrocity. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(19) Regardless of the pain in our memories, nostalgia only reminds us - of the good times in our past. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(2) The single greatest threat to the free people of the world is posed -by the heinous idea of centralized government control. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(20) There is a God. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(21) Abortion is wrong. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(22) Morality is not defined by individual choice. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(23) Evolution cannot explain creation. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(24) Feminism was established so that unattractive women could have - easier access to the mainstream of society. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(25) Love is the only human emotion which cannot be controlled. You - either do or you don't. You can't fake it. (Except women, and - thank God they can.) - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(26) The only difference between Mikhail Gorbachev and previous Soviet - leaders is that he is alive. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(27) Soviet leaders were actually left-wing dictators. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(28) Abraham Lincoln saved this nation. - - -- "The Limbaugh Letter," Copyright 199
svn commit: r246365 - stable/8/games/fortune/datfiles
Author: des Date: Tue Feb 5 14:53:16 2013 New Revision: 246365 URL: http://svnweb.freebsd.org/changeset/base/246365 Log: MFH r246362: remove political propaganda Modified: stable/8/games/fortune/datfiles/fortunes-o.real Directory Properties: stable/8/games/fortune/ (props changed) Modified: stable/8/games/fortune/datfiles/fortunes-o.real == --- stable/8/games/fortune/datfiles/fortunes-o.real Tue Feb 5 14:53:05 2013(r246364) +++ stable/8/games/fortune/datfiles/fortunes-o.real Tue Feb 5 14:53:16 2013(r246365) @@ -11437,233 +11437,6 @@ two new uses for sheep. Meat and wool. % Runners do it alone. % -Rush Limbaugh's 35 Undeniable Truths of Life: - -(1) The greatest threat to the human spirit is liberalism. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(10) Liberalism poisons the soul. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(11) Neither the United States, nor anyone else, "imposes" freedom on - the people of other nations. Freedom is not an imposition. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(12) Freedom is God-given. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(13) To dictatorships, peace means the absence of opposition. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(14) To free people, peace means the absence of threat. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(15) The Peace Movement in the United States was, whether by accident or - design, pro-communist. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(16) The collective knowledge and wisdom of seasoned citizens is the - most valuable, yet untapped, resource our young people have. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(17) The greatest football team in the history of civilization was the - Pittsburgh Steelers of 1975 through 1980. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(18) There is no such thing as "war atrocities." War is an atrocity. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(19) Regardless of the pain in our memories, nostalgia only reminds us - of the good times in our past. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(2) The single greatest threat to the free people of the world is posed -by the heinous idea of centralized government control. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(20) There is a God. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(21) Abortion is wrong. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(22) Morality is not defined by individual choice. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(23) Evolution cannot explain creation. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(24) Feminism was established so that unattractive women could have - easier access to the mainstream of society. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(25) Love is the only human emotion which cannot be controlled. You - either do or you don't. You can't fake it. (Except women, and - thank God they can.) - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(26) The only difference between Mikhail Gorbachev and previous Soviet - leaders is that he is alive. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(27) Soviet leaders were actually left-wing dictators. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(28) Abraham Lincoln saved this nation. - - -- "The Limbaugh Letter," Copyright 199
svn commit: r246366 - stable/7/games/fortune/datfiles
Author: des Date: Tue Feb 5 14:55:33 2013 New Revision: 246366 URL: http://svnweb.freebsd.org/changeset/base/246366 Log: MFH r246362: remove political propaganda Modified: stable/7/games/fortune/datfiles/fortunes-o.real Directory Properties: stable/7/games/fortune/ (props changed) Modified: stable/7/games/fortune/datfiles/fortunes-o.real == --- stable/7/games/fortune/datfiles/fortunes-o.real Tue Feb 5 14:53:16 2013(r246365) +++ stable/7/games/fortune/datfiles/fortunes-o.real Tue Feb 5 14:55:33 2013(r246366) @@ -11437,233 +11437,6 @@ two new uses for sheep. Meat and wool. % Runners do it alone. % -Rush Limbaugh's 35 Undeniable Truths of Life: - -(1) The greatest threat to the human spirit is liberalism. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(10) Liberalism poisons the soul. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(11) Neither the United States, nor anyone else, "imposes" freedom on - the people of other nations. Freedom is not an imposition. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(12) Freedom is God-given. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(13) To dictatorships, peace means the absence of opposition. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(14) To free people, peace means the absence of threat. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(15) The Peace Movement in the United States was, whether by accident or - design, pro-communist. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(16) The collective knowledge and wisdom of seasoned citizens is the - most valuable, yet untapped, resource our young people have. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(17) The greatest football team in the history of civilization was the - Pittsburgh Steelers of 1975 through 1980. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(18) There is no such thing as "war atrocities." War is an atrocity. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(19) Regardless of the pain in our memories, nostalgia only reminds us - of the good times in our past. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(2) The single greatest threat to the free people of the world is posed -by the heinous idea of centralized government control. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(20) There is a God. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(21) Abortion is wrong. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(22) Morality is not defined by individual choice. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(23) Evolution cannot explain creation. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(24) Feminism was established so that unattractive women could have - easier access to the mainstream of society. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(25) Love is the only human emotion which cannot be controlled. You - either do or you don't. You can't fake it. (Except women, and - thank God they can.) - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(26) The only difference between Mikhail Gorbachev and previous Soviet - leaders is that he is alive. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(27) Soviet leaders were actually left-wing dictators. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(28) Abraham Lincoln saved this nation. - - -- "The Limbaugh Letter," Copyright 199
Re: svn commit: r246362 - head/games/fortune/datfiles
On 02/05/2013 09:39 AM, Dag-Erling Smørgrav wrote: > Author: des Date: Tue Feb 5 14:39:37 2013 New Revision: 246362 > URL: http://svnweb.freebsd.org/changeset/base/246362 > > Log: Remove political propaganda > > Modified: head/games/fortune/datfiles/fortunes-o.real > > Modified: head/games/fortune/datfiles/fortunes-o.real > == > > --- head/games/fortune/datfiles/fortunes-o.real Tue Feb 5 14:29:37 2013(r246361) > +++ head/games/fortune/datfiles/fortunes-o.real Tue Feb 5 14:39:37 > 2013 (r246362) @@ -11437,233 +11437,6 @@ two new uses for sheep. > Meat and wool. % Runners do it alone. % -Rush Limbaugh's 35 > Undeniable Truths of Life: - -(1) The greatest threat to the human > spirit is liberalism. - - -- "The Limbaugh Letter," Copyright 1992, > EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of > Life: - -(10) Liberalism poisons the soul. - --- "The Limbaugh > Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's > 35 Undeniable Truths of Life: - -(11) Neither the United States, > nor anyone else, "imposes" freedom on - the people of other > nations. Freedom is not an imposition. - --- "The Limbaugh > Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's > 35 Undeniable Truths of Life: - -(12) Freedom is God-given. - - -- > "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% > -Rush Limbaugh's 35 Undeniable Truths of Life: - -(13) To > dictatorships, peace means the absence of opposition. - - -- "The > Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush > Limbaugh's 35 Undeniable Truths of Life: - -(14) To free people, > peace means the absence of threat. - --- "The Limbaugh Letter," > Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 > Undeniable Truths of Life: - -(15) The Peace Movement in the United > States was, whether by accident or - design, pro-communist. - - > -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% > -Rush Limbaugh's 35 Undeniable Truths of Life: - -(16) The > collective knowledge and wisdom of seasoned citizens is the - > most valuable, yet untapped, resource our young people have. - - -- > "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% > -Rush Limbaugh's 35 Undeniable Truths of Life: - -(17) The greatest > football team in the history of civilization was the - > Pittsburgh Steelers of 1975 through 1980. - - -- "The Limbaugh > Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's > 35 Undeniable Truths of Life: - -(18) There is no such thing as > "war atrocities." War is an atrocity. - - -- "The Limbaugh Letter," > Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's 35 > Undeniable Truths of Life: - -(19) Regardless of the pain in our > memories, nostalgia only reminds us - of the good times in our > past. - - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, > Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(2) The > single greatest threat to the free people of the world is posed - > by the heinous idea of centralized government control. - --- "The > Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush > Limbaugh's 35 Undeniable Truths of Life: - -(20) There is a God. - > - -- "The Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. > -% -Rush Limbaugh's 35 Undeniable Truths of Life: - -(21) Abortion > is wrong. - - -- "The Limbaugh Letter," Copyright 1992, EFM > Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: > - -(22) Morality is not defined by individual choice. - - -- "The > Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush > Limbaugh's 35 Undeniable Truths of Life: - -(23) Evolution cannot > explain creation. - - -- "The Limbaugh Letter," Copyright 1992, EFM > Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: > - -(24) Feminism was established so that unattractive women could > have - easier access to the mainstream of society. - --- "The > Limbaugh Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush > Limbaugh's 35 Undeniable Truths of Life: - -(25) Love is the only > human emotion which cannot be controlled. You - either do or > you don't. You can't fake it. (Except women, and - thank God > they can.) - --- "The Limbaugh Letter," Copyright 1992, EFM > Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of Life: > - -(26) The only difference between Mikhail Gorbachev and previous > Soviet - leaders is that he is alive. - - -- "The Limbaugh > Letter," Copyright 1992, EFM Publishing, Inc. -% -Rush Limbaugh's > 35 Undeniable Truths of Life: - -(27) Soviet leaders were actually > left-wing dictators. - - -- "The Limbaugh Letter," Copyright 1992, > EFM Publishing, Inc. -% -Rush Limbaugh's 35 Undeniable Truths of > Life: - -(28) Abraham Lincoln saved this nation. - - -- "Th
Re: svn commit: r245848 - head/sys/boot/i386/libi386
On Tuesday, February 05, 2013 2:46:15 am Sergey Kandaurov wrote: > Err.. No, I haven't set hw.uart.console. Sorry for being misleading. > The cited snippet from my previous mail was to demonstrate how the > resulting hw.uart.console value depends (or rather not :)) on hints. > All I have (changed) wrt console is: > > /boot/device.hints > #hint.uart.0.flags="0x10" > hint.uart.1.flags="0x10" > > /boot/loader.conf > boot_multicons="YES" > boot_serial="YES" > boot_verbose="YES" > console="comconsole,vidconsole" > > This setup worked for ages. To isolate this problem I took /boot/loader > from my older current machine (also with COM2) to replace it here, > and it started to work again. Right, so with this setup, you are using a non-working serial console for the loader on COM1 and then wanting the kernel to use COM2? Why? If you want to do that, set hw.uart.console manually. I think that is a very rare case and that most folks want to use the same console in both the loader and kernel. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r246282 - in head/sys: conf kern
On Monday, February 04, 2013 3:56:22 pm Andriy Gapon wrote: > on 04/02/2013 21:29 John Baldwin said the following: > > On Sunday, February 03, 2013 4:57:39 am Andriy Gapon wrote: > >> Author: avg > >> Date: Sun Feb 3 09:57:39 2013 > >> New Revision: 246282 > >> URL: http://svnweb.freebsd.org/changeset/base/246282 > >> > >> Log: > >> allow for large KTR_ENTRIES values by allocating ktr_buf using malloc(9) > >> > >> Only during very early boot, before malloc(9) is functional > >> (SI_SUB_KMEM), > >> the static ktr_buf_init is used. Size of the static buffer is determined > >> by a new kernel option KTR_BOOT_ENTRIES. Its default value is 1024. > >> > >> This commit builds on top of r243046. > > > > Does this lose "early" entries once the SYSINIT runs? It doesn't seem to > > make > > any effort to copy the existing entries over to the new buffer? > > Yes, this is true and glebius has also noticed that... > I think that a simple bcopy should be fine here? Almost. To handle the case where the boot buffer might have wrapped I think you should copy the entries at the "end" into the head of the KTR buffer first, then the entries from the front to the current index, and then update the index to point at the end (it should effectively be KTR_BOOT_ENTRIES I think). -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r246362 - head/games/fortune/datfiles
On Tuesday, February 05, 2013 9:39:38 am Dag-Erling SmXXrgrav wrote: > Author: des > Date: Tue Feb 5 14:39:37 2013 > New Revision: 246362 > URL: http://svnweb.freebsd.org/changeset/base/246362 > > Log: > Remove political propaganda > > Modified: > head/games/fortune/datfiles/fortunes-o.real *sigh* I'm sure there are other quotes that people who do not share your political persuasion might find propaganda or offensive, etc. Censorship and freedom of speech is quite a sticky widget, and I think the only truly sane policy is that fortune files are append-only (unless we outright remove them and that seems excessive). And new things should have a very high bar to be added to fortune. Perhaps we should move fortunes-o to ports entirely? -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r246362 - head/games/fortune/datfiles
Nikolai Lifanov writes:
> Remove political propaganda -- Why?
Because FreeBSD does not engage in politics.
> This is the "offensive" file.
Yes, and it is meant for dirty jokes and the like. These are not dirty
jokes. Some of these quotes are harmless, but others verge on hate
speech.
We already had this discussion when they were added way back when, and
the consensus was that we *shouldn't* have them. However, the person
who added them was extremely vocal about them (and about what he
perceived as political censorship etc.), so as a compromise, we moved
them to -o. That person is no longer with the project, so there is no
longer a need for such compromise.
Besides, what I removed were not isolated quotes, but a complete copy of
a copyrighted work, and therefore legally questionable.
> It's supposed to have potentially offensive political, sexist,
> religious, racist, and miscellaneously off content.
If there is racist content in that file, it should be removed. The only
people who think racist jokes are OK ("geez, they're just jokes, lighten
up") are those who have never been at the receiving end of them and are
incapable of empathizing with those who have. There is a word for
people like that: they're called "racists".
DES
--
Dag-Erling Smørgrav - d...@des.no
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r246362 - head/games/fortune/datfiles
On Tue, Feb 5, 2013 at 11:45 AM, John Baldwin wrote: > On Tuesday, February 05, 2013 9:39:38 am Dag-Erling SmXXrgrav wrote: > > Author: des > > Date: Tue Feb 5 14:39:37 2013 > > New Revision: 246362 > > URL: http://svnweb.freebsd.org/changeset/base/246362 > > > > Log: > > Remove political propaganda > > > > Modified: > > head/games/fortune/datfiles/fortunes-o.real > > *sigh* > > I'm sure there are other quotes that people who do not share your political > persuasion might find propaganda or offensive, etc. Censorship and freedom > of speech is quite a sticky widget, and I think the only truly sane policy > is that fortune files are append-only (unless we outright remove them and > that seems excessive). And new things should have a very high bar to be > added to fortune. Perhaps we should move fortunes-o to ports entirely? > I am more concerned about the insta-MFC than the removal per se. Only security or legal issues are cause to go under 3 days, was my impression. -Ben ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r246362 - head/games/fortune/datfiles
Benjamin Kaduk writes: > I am more concerned about the insta-MFC than the removal per se. > Only security or legal issues are cause to go under 3 days, was my > impression. The text I removed was a full copy of the source document, rather than selected quotes from it, so yes, there is a legal issue as well. However, my primary motivation is that these are not jokes or "words of wisdom" but political statements, and FreeBSD does not engage in politics. DES -- Dag-Erling Smørgrav - d...@des.no ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r246362 - head/games/fortune/datfiles
John Baldwin writes: > I'm sure there are other quotes that people who do not share your > political persuasion might find propaganda or offensive, etc. If you think this is about my political persuasion, feel free to point out left-leaning material and I will remove it as well. > And new things should have a very high bar to be added to fortune. The bar, in this specific case, was set at "whatever will shut up the person who committed them" (resulting in a move to -o rather than an outright reversal). DES -- Dag-Erling Smørgrav - d...@des.no ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r246362 - head/games/fortune/datfiles
On Tuesday, February 05, 2013 11:51:00 am Benjamin Kaduk wrote: > On Tue, Feb 5, 2013 at 11:45 AM, John Baldwin wrote: > > > On Tuesday, February 05, 2013 9:39:38 am Dag-Erling SmXXrgrav wrote: > > > Author: des > > > Date: Tue Feb 5 14:39:37 2013 > > > New Revision: 246362 > > > URL: http://svnweb.freebsd.org/changeset/base/246362 > > > > > > Log: > > > Remove political propaganda > > > > > > Modified: > > > head/games/fortune/datfiles/fortunes-o.real > > > > *sigh* > > > > I'm sure there are other quotes that people who do not share your political > > persuasion might find propaganda or offensive, etc. Censorship and freedom > > of speech is quite a sticky widget, and I think the only truly sane policy > > is that fortune files are append-only (unless we outright remove them and > > that seems excessive). And new things should have a very high bar to be > > added to fortune. Perhaps we should move fortunes-o to ports entirely? > > > > I am more concerned about the insta-MFC than the removal per se. > Only security or legal issues are cause to go under 3 days, was my > impression. Yes, the insta-MFC is also not appropriate, esp. for something that you know is going to raise eyebrows when it is committed. Having to debate this sort of thing in public on mailing lists is also distinctly unhelpful and very distracting from productive work. Also, I'd like to preemptively ask developers to refrain from any further commits to the fortunes datfiles for the time being as the last thing we need is a commit war over this sort of thing. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r246362 - head/games/fortune/datfiles
On 5 Feb 2013 17:01, "John Baldwin" wrote: > > On Tuesday, February 05, 2013 11:51:00 am Benjamin Kaduk wrote: > > On Tue, Feb 5, 2013 at 11:45 AM, John Baldwin wrote: > > > > > On Tuesday, February 05, 2013 9:39:38 am Dag-Erling SmXXrgrav wrote: > > > > Author: des > > > > Date: Tue Feb 5 14:39:37 2013 > > > > New Revision: 246362 > > > > URL: http://svnweb.freebsd.org/changeset/base/246362 > > > > > > > > Log: > > > > Remove political propaganda > > > > > > > > Modified: > > > > head/games/fortune/datfiles/fortunes-o.real > > > > > > *sigh* > > > > > > I'm sure there are other quotes that people who do not share your political > > > persuasion might find propaganda or offensive, etc. Censorship and freedom > > > of speech is quite a sticky widget, and I think the only truly sane policy > > > is that fortune files are append-only (unless we outright remove them and > > > that seems excessive). And new things should have a very high bar to be > > > added to fortune. Perhaps we should move fortunes-o to ports entirely? > > > > > > > I am more concerned about the insta-MFC than the removal per se. > > Only security or legal issues are cause to go under 3 days, was my > > impression. > > Yes, the insta-MFC is also not appropriate, esp. for something that you know > is going to raise eyebrows when it is committed. Having to debate this sort > of thing in public on mailing lists is also distinctly unhelpful and very > distracting from productive work. Also, I'd like to preemptively ask > developers to refrain from any further commits to the fortunes datfiles for > the time being as the last thing we need is a commit war over this sort of > thing. Moving the -o file to ports as you suggested is probably the best idea. Or simply allowing people to fetch their own I don't see why we should have trash installed by default on a professional operating system; we have higher standards in other areas. Chris ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r246362 - head/games/fortune/datfiles
Dag-Erling Smrgrav wrote this message on Tue, Feb 05, 2013 at 17:47 +0100:
> > It's supposed to have potentially offensive political, sexist,
> > religious, racist, and miscellaneously off content.
>
> If there is racist content in that file, it should be removed. The only
> people who think racist jokes are OK ("geez, they're just jokes, lighten
> up") are those who have never been at the receiving end of them and are
> incapable of empathizing with those who have. There is a word for
> people like that: they're called "racists".
Clearly you don't run fortune -o very often, or you'd be removing a lot
more from the file...
--
John-Mark Gurney Voice: +1 415 225 5579
"All that I will do, has been done, All that I have, has not."
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246367 - in head: etc/mtree include usr.sbin/bhyve usr.sbin/pciconf
Author: jhb
Date: Tue Feb 5 18:55:09 2013
New Revision: 246367
URL: http://svnweb.freebsd.org/changeset/base/246367
Log:
Install and as userland headers
in /usr/include.
MFC after:2 weeks
Modified:
head/etc/mtree/BSD.include.dist
head/include/Makefile
head/usr.sbin/bhyve/Makefile
head/usr.sbin/pciconf/Makefile
Modified: head/etc/mtree/BSD.include.dist
==
--- head/etc/mtree/BSD.include.dist Tue Feb 5 14:55:33 2013
(r246366)
+++ head/etc/mtree/BSD.include.dist Tue Feb 5 18:55:09 2013
(r246367)
@@ -100,6 +100,8 @@
dev
acpica
..
+agp
+..
an
..
bktr
@@ -136,6 +138,8 @@
..
pbio
..
+pci
+..
powermac_nvram
..
ppbus
Modified: head/include/Makefile
==
--- head/include/Makefile Tue Feb 5 14:55:33 2013(r246366)
+++ head/include/Makefile Tue Feb 5 18:55:09 2013(r246367)
@@ -42,9 +42,10 @@ LDIRS= bsm cam geom net net80211 netatal
sys vm
LSUBDIRS= cam/ata cam/scsi \
- dev/acpica dev/an dev/bktr dev/ciss dev/filemon dev/firewire dev/hwpmc \
+ dev/acpica dev/agp dev/an dev/bktr dev/ciss dev/filemon dev/firewire \
+ dev/hwpmc \
dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/nvme \
- dev/ofw dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
+ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \
dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \
fs/procfs fs/udf fs/unionfs \
@@ -154,7 +155,7 @@ copies:
done
.endif
.endfor
-.for i in ${LDIRS} ${LSUBDIRS:Ndev/acpica:Ndev/bktr:Ndev/nand} ${LSUBSUBDIRS}
+.for i in ${LDIRS}
${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/bktr:Ndev/nand:Ndev/pci} ${LSUBSUBDIRS}
cd ${.CURDIR}/../sys; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
${DESTDIR}${INCLUDEDIR}/$i
@@ -162,6 +163,9 @@ copies:
cd ${.CURDIR}/../sys/dev/acpica; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 acpiio.h \
${DESTDIR}${INCLUDEDIR}/dev/acpica
+ cd ${.CURDIR}/../sys/dev/agp; \
+ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 agpreg.h \
+ ${DESTDIR}${INCLUDEDIR}/dev/agp
cd ${.CURDIR}/../sys/dev/bktr; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ioctl_*.h \
${DESTDIR}${INCLUDEDIR}/dev/bktr
@@ -172,6 +176,9 @@ copies:
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 nand_dev.h \
${DESTDIR}${INCLUDEDIR}/dev/nand
.endif
+ cd ${.CURDIR}/../sys/dev/pci; \
+ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 pcireg.h \
+ ${DESTDIR}${INCLUDEDIR}/dev/pci
cd ${.CURDIR}/../sys/contrib/altq/altq; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/altq
@@ -225,7 +232,7 @@ symlinks:
ln -fs ../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \
done
.endfor
-.for i in ${LSUBDIRS:Ndev/acpica:Ndev/bktr:Ndev/nand}
+.for i in ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/bktr:Ndev/nand:Ndev/pci}
cd ${.CURDIR}/../sys/$i; \
for h in *.h; do \
ln -fs ../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \
@@ -236,6 +243,11 @@ symlinks:
ln -fs ../../../../sys/dev/acpica/$$h \
${DESTDIR}${INCLUDEDIR}/dev/acpica; \
done
+ cd ${.CURDIR}/../sys/dev/agp; \
+ for h in agpreg.h; do \
+ ln -fs ../../../../sys/dev/agp/$$h \
+ ${DESTDIR}${INCLUDEDIR}/dev/agp; \
+ done
cd ${.CURDIR}/../sys/dev/bktr; \
for h in ioctl_*.h; do \
ln -fs ../../../../sys/dev/bktr/$$h \
@@ -248,6 +260,11 @@ symlinks:
${DESTDIR}${INCLUDEDIR}/dev/nand; \
done
.endif
+ cd ${.CURDIR}/../sys/dev/pci; \
+ for h in pcireg.h; do \
+ ln -fs ../../../../sys/dev/pci/$$h \
+ ${DESTDIR}${INCLUDEDIR}/dev/pci; \
+ done
.for i in ${LSUBSUBDIRS}
cd ${.CURDIR}/../sys/$i; \
for h in *.h; do \
Modified: head/usr.sbin/bhyve/Makefile
==
--- head/usr.sbin/bhyve/MakefileTue Feb 5 14:55:33 2013
(r246366)
+++ head/usr.sbin/bhyve/MakefileTue Feb 5 18:55:09 2013
(r246367)
@@ -22,6 +22,4 @@ LDADD=-lvmmapi -lmd -lpthread
WARNS?=2
-CFLAGS+= -I${.CURDIR}/../../sys
-
.include
Modified: head/usr.sbin/pciconf/Makefile
==
--- head/usr.sbin/pciconf/Makefile Tue Feb 5 14:55:33 2013
(r24
svn commit: r246368 - in stable/9: gnu/lib/libsupc++ lib/libcxxrt
Author: dim
Date: Tue Feb 5 19:10:50 2013
New Revision: 246368
URL: http://svnweb.freebsd.org/changeset/base/246368
Log:
MFC r246028 (by theraven):
Fix some symbol version mismatches between libstdc++ and libsupc++/libcxxrt
that were causing the runtime and STL libraries to see different versions of
various classes and functions when libstdc++ is used as a filter.
Note: This changes the ABI for libcxxrt, but libcxxrt is currently only in
-STABLE for testing and is not used by anything unless explicitly enabled by
the end user. No default compiler configurations use it.
libc++ will need to be recompiled after this change. make buildworld will
do
this automatically, but make in lib/libc++ will not necessarily work unless
the
new libcxxrt is installed first.
PR: kern/171610, stand/175453
Reviewed by:kib
MFC r246297:
Add several missing symbols to libcxxrt's symbol version map, and remove
a few duplicates. This should fix building world with -stdlib=libc++
after r246028.
Submitted by: Yamaya Takashi
Modified:
stable/9/gnu/lib/libsupc++/Version.map
stable/9/lib/libcxxrt/Version.map
Directory Properties:
stable/9/gnu/lib/libsupc++/ (props changed)
stable/9/lib/libcxxrt/ (props changed)
Modified: stable/9/gnu/lib/libsupc++/Version.map
==
--- stable/9/gnu/lib/libsupc++/Version.map Tue Feb 5 18:55:09 2013
(r246367)
+++ stable/9/gnu/lib/libsupc++/Version.map Tue Feb 5 19:10:50 2013
(r246368)
@@ -142,8 +142,37 @@ GLIBCXX_3.4 {
_ZdaPvRKSt9nothrow_t;
_ZdlPv;
_ZdlPvRKSt9nothrow_t;
+extern "C++" {
+ std::set_new_handler*;
+ std::set_terminate*;
+ std::set_unexpected*;
+
+ std::bad_alloc;
+ std::bad_cast;
+ std::exception*;
+
+ "typeinfo for std::bad_alloc";
+ "typeinfo for std::bad_cast";
+ "typeinfo for std::exception";
+
+ "typeinfo name for std::bad_alloc";
+ "typeinfo name for std::bad_cast";
+ "typeinfo name for std::exception";
+
+ "vtable for std::bad_alloc";
+ "vtable for std::bad_cast";
+ "vtable for std::exception";
+};
};
+GLIBCXX_3.4.9 {
+extern "C++" {
+"std::bad_alloc::what() const";
+"std::bad_cast::what() const";
+"std::bad_typeid::what() const";
+};
+} GLIBCXX_3.4;
+
CXXABI_1.3.1 {
__cxa_get_exception_ptr;
Modified: stable/9/lib/libcxxrt/Version.map
==
--- stable/9/lib/libcxxrt/Version.map Tue Feb 5 18:55:09 2013
(r246367)
+++ stable/9/lib/libcxxrt/Version.map Tue Feb 5 19:10:50 2013
(r246368)
@@ -208,19 +208,7 @@ CXXABI_1.3 {
"typeinfo name for __cxxabiv1::__vmi_class_type_info";
"std::type_info::type_info(std::type_info const&)";
-"std::type_info::type_info(std::type_info const&)";
-"std::type_info::~type_info()";
-"std::type_info::~type_info()";
-"std::type_info::~type_info()";
"std::type_info::operator=(std::type_info const&)";
-"std::unexpected()";
-"std::get_terminate()";
-"std::set_terminate(void (*)())";
-"std::get_unexpected()";
-"std::set_unexpected(void (*)())";
-"std::set_new_handler(void (*)())";
-"std::uncaught_exception()";
-"std::terminate()";
# Extensions
@@ -243,69 +231,22 @@ CXXABI_1.3.1 {
CXXRT_1.0 {
extern "C++" {
-"std::bad_cast::what() const";
-"std::bad_typeid::what() const";
-"std::bad_alloc::what() const";
-"std::exception::what() const";
"std::type_info::name() const";
"std::type_info::before(std::type_info const&) const";
"std::type_info::operator==(std::type_info const&) const";
"std::type_info::operator!=(std::type_info const&) const";
-"std::bad_typeid::bad_typeid(std::bad_typeid const&)";
-"std::bad_typeid::bad_typeid()";
-"std::bad_typeid::bad_typeid(std::bad_typeid const&)";
-"std::bad_typeid::bad_typeid()";
-"std::bad_typeid::~bad_typeid()";
-"std::bad_typeid::~bad_typeid()";
-"std::bad_typeid::~bad_typeid()";
-"std::bad_typeid::operator=(std::bad_typeid const&)";
"std::bad_cast::bad_cast(std::bad_cast const&)";
"std::bad_cast::bad_cast()";
-"std::bad_cast::bad_cast(std::bad_cast const&)";
-"std::bad_cast::bad_cast()";
-"std::bad_cast::~bad_cast()";
-"std::bad_cast::~bad_cast()";
-"std::bad_cast::~bad_cast()";
"std::bad_cast::operator=(std::bad_cast const&)";
-"std::bad_alloc::bad_alloc(std::bad_alloc const&)";
-"std::bad_alloc::bad_alloc()";
-"std::bad_alloc::bad_alloc(std::bad_alloc const&)";
-"std::bad_alloc::bad_alloc()";
-"
svn commit: r246369 - in head: lib/libstand sys/boot/arm/uboot
Author: andrew
Date: Tue Feb 5 20:03:58 2013
New Revision: 246369
URL: http://svnweb.freebsd.org/changeset/base/246369
Log:
* Add the integer div & mod functions and ARM EABI support functions to
libstand.
* Stop linking the ARM U-Boot loader against libgcc now libstand has the
required symbols.
Modified:
head/lib/libstand/Makefile
head/sys/boot/arm/uboot/Makefile
Modified: head/lib/libstand/Makefile
==
--- head/lib/libstand/Makefile Tue Feb 5 19:10:50 2013(r246368)
+++ head/lib/libstand/Makefile Tue Feb 5 20:03:58 2013(r246369)
@@ -61,7 +61,20 @@ SRCS+= bcmp.c bcopy.c bzero.c ffs.c memc
.endif
.if ${MACHINE_CPUARCH} == "arm"
.PATH: ${.CURDIR}/../libc/arm/gen
+
+.if ${MK_ARM_EABI} == "no"
SRCS+= divsi3.S
+.else
+# Compiler support functions
+.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/
+SRCS+= divmoddi4.c divmodsi4.c divdi3.c divsi3.c moddi3.c modsi3.c
+SRCS+= udivmoddi4.c udivmodsi4.c udivdi3.c udivsi3.c umoddi3.c umodsi3.c
+
+.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/arm/
+SRCS+= aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S
+SRCS+= aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S
+.endif
+
.endif
.if ${MACHINE_CPUARCH} == "ia64"
.PATH: ${.CURDIR}/../libc/ia64/string
Modified: head/sys/boot/arm/uboot/Makefile
==
--- head/sys/boot/arm/uboot/MakefileTue Feb 5 19:10:50 2013
(r246368)
+++ head/sys/boot/arm/uboot/MakefileTue Feb 5 20:03:58 2013
(r246369)
@@ -112,8 +112,8 @@ CFLAGS+=-I${.CURDIR}/../../../../lib/li
# clang doesn't understand %D as a specifier to printf
NO_WERROR.clang=
-DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND} ${LIBGCC}
-LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand -lgcc
+DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND}
+LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand
vers.c:${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246370 - head/sys/kern
Author: pluknet Date: Tue Feb 5 20:08:33 2013 New Revision: 246370 URL: http://svnweb.freebsd.org/changeset/base/246370 Log: Remove reference to the rlist code from comments, and fix a typo visible in the resulted change. Reviewed by: kib MFC after:1 week Modified: head/sys/kern/subr_blist.c Modified: head/sys/kern/subr_blist.c == --- head/sys/kern/subr_blist.c Tue Feb 5 20:03:58 2013(r246369) +++ head/sys/kern/subr_blist.c Tue Feb 5 20:08:33 2013(r246370) @@ -52,14 +52,10 @@ * radix tree should be able to operate well no matter how much * fragmentation there is and no matter how large a bitmap is used. * - * Unlike the rlist code, the blist code wires all necessary memory at - * creation time. Neither allocations nor frees require interaction with - * the memory subsystem. In contrast, the rlist code may allocate memory - * on an rlist_free() call. The non-blocking features of the blist code - * are used to great advantage in the swap code (vm/nswap_pager.c). The - * rlist code uses a little less overall memory than the blist code (but - * due to swap interleaving not all that much less), but the blist code - * scales much, much better. + * The blist code wires all necessary memory at creation time. Neither + * allocations nor frees require interaction with the memory subsystem. + * The non-blocking features of the blist code are used in the swap code + * (vm/swap_pager.c). * * LAYOUT: The radix tree is layed out recursively using a * linear array. Each meta node is immediately followed (layed out ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r246362 - head/games/fortune/datfiles
John-Mark Gurney writes: > Clearly you don't run fortune -o very often, or you'd be removing a lot > more from the file... Actually, I spent about fifteen minutes this afternoon running fortune -o repeatedly and didn't come across much, except one joke which could be considered antisemitic. There was nothing that came anywhere close to Limbaugh's "the purpose of feminism is to give ugly women a place in society". If you think that's just a tasteless joke (disregarding for a moment the fact that he actually means it), try replacing "feminism" and "ugly women" with categories you fit in and epithets that might apply to you, and you'll understand why it is not acceptable. DES -- Dag-Erling Smørgrav - d...@des.no ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r246362 - head/games/fortune/datfiles
On Tue, Feb 05, 2013 at 11:58:54AM -0500, John Baldwin wrote: J> > > On Tuesday, February 05, 2013 9:39:38 am Dag-Erling SmXXrgrav wrote: J> > > > Author: des J> > > > Date: Tue Feb 5 14:39:37 2013 J> > > > New Revision: 246362 J> > > > URL: http://svnweb.freebsd.org/changeset/base/246362 J> > > > J> > > > Log: J> > > > Remove political propaganda J> > > > J> > > > Modified: J> > > > head/games/fortune/datfiles/fortunes-o.real J> > > J> > > *sigh* J> > > J> > > I'm sure there are other quotes that people who do not share your political J> > > persuasion might find propaganda or offensive, etc. Censorship and freedom J> > > of speech is quite a sticky widget, and I think the only truly sane policy J> > > is that fortune files are append-only (unless we outright remove them and J> > > that seems excessive). And new things should have a very high bar to be J> > > added to fortune. Perhaps we should move fortunes-o to ports entirely? J> > > J> > J> > I am more concerned about the insta-MFC than the removal per se. J> > Only security or legal issues are cause to go under 3 days, was my J> > impression. J> J> Yes, the insta-MFC is also not appropriate, esp. for something that you know J> is going to raise eyebrows when it is committed. Having to debate this sort J> of thing in public on mailing lists is also distinctly unhelpful and very J> distracting from productive work. Also, I'd like to preemptively ask J> developers to refrain from any further commits to the fortunes datfiles for J> the time being as the last thing we need is a commit war over this sort of J> thing. What about just moving the entire games subdirectory to ports repo? -- Totus tuus, Glebius. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r246362 - head/games/fortune/datfiles
On Tuesday, February 05, 2013 3:55:47 pm Gleb Smirnoff wrote: > On Tue, Feb 05, 2013 at 11:58:54AM -0500, John Baldwin wrote: > J> > > On Tuesday, February 05, 2013 9:39:38 am Dag-Erling SmXXrgrav wrote: > J> > > > Author: des > J> > > > Date: Tue Feb 5 14:39:37 2013 > J> > > > New Revision: 246362 > J> > > > URL: http://svnweb.freebsd.org/changeset/base/246362 > J> > > > > J> > > > Log: > J> > > > Remove political propaganda > J> > > > > J> > > > Modified: > J> > > > head/games/fortune/datfiles/fortunes-o.real > J> > > > J> > > *sigh* > J> > > > J> > > I'm sure there are other quotes that people who do not share your > political > J> > > persuasion might find propaganda or offensive, etc. Censorship and > freedom > J> > > of speech is quite a sticky widget, and I think the only truly sane > policy > J> > > is that fortune files are append-only (unless we outright remove them > and > J> > > that seems excessive). And new things should have a very high bar to > be > J> > > added to fortune. Perhaps we should move fortunes-o to ports entirely? > J> > > > J> > > J> > I am more concerned about the insta-MFC than the removal per se. > J> > Only security or legal issues are cause to go under 3 days, was my > J> > impression. > J> > J> Yes, the insta-MFC is also not appropriate, esp. for something that you > know > J> is going to raise eyebrows when it is committed. Having to debate this > sort > J> of thing in public on mailing lists is also distinctly unhelpful and very > J> distracting from productive work. Also, I'd like to preemptively ask > J> developers to refrain from any further commits to the fortunes datfiles for > J> the time being as the last thing we need is a commit war over this sort of > J> thing. > > What about just moving the entire games subdirectory to ports repo? We've already moved most of it many years ago. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246371 - head/bin/sh
Author: jilles
Date: Tue Feb 5 22:54:09 2013
New Revision: 246371
URL: http://svnweb.freebsd.org/changeset/base/246371
Log:
sh: Do not test for digit_contig in mksyntax.
ISO/IEC 9899:1999 (E) 5.2.1p3 guarantees that the values of the characters
0123456789 are contiguous.
The generated syntax.c and syntax.h remain the same.
Submitted by: Christoph Mallon
Modified:
head/bin/sh/mksyntax.c
Modified: head/bin/sh/mksyntax.c
==
--- head/bin/sh/mksyntax.c Tue Feb 5 20:08:33 2013(r246370)
+++ head/bin/sh/mksyntax.c Tue Feb 5 22:54:09 2013(r246371)
@@ -107,14 +107,12 @@ static const char *syntax[513];
static int base;
static int size; /* number of values which a char variable can have */
static int nbits; /* number of bits in a character */
-static int digit_contig;/* true if digits are contiguous */
static void filltable(const char *);
static void init(void);
static void add(const char *, const char *);
static void print(const char *);
static void output_type_macros(void);
-static void digit_convert(void);
int
main(int argc __unused, char **argv __unused)
@@ -125,7 +123,6 @@ main(int argc __unused, char **argv __un
int i;
char buf[80];
int pos;
- static char digit[] = "0123456789";
/* Create output files */
if ((cfile = fopen("syntax.c", "w")) == NULL) {
@@ -158,11 +155,6 @@ main(int argc __unused, char **argv __un
base = 1;
if (sign)
base += 1 << (nbits - 1);
- digit_contig = 1;
- for (i = 0 ; i < 10 ; i++) {
- if (digit[i] != '0' + i)
- digit_contig = 0;
- }
fputs("#include \n", hfile);
@@ -248,8 +240,6 @@ main(int argc __unused, char **argv __un
add("_", "ISUNDER");
add("#?$!-*@", "ISSPECL");
print("is_type");
- if (! digit_contig)
- digit_convert();
exit(0);
}
@@ -341,12 +331,13 @@ print(const char *name)
*/
static const char *macro[] = {
- "#define is_digit(c)\t((is_type+SYNBASE)[(int)c] & ISDIGIT)",
+ "#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)",
"#define is_eof(c)\t((c) == PEOF)",
"#define is_alpha(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER))",
"#define is_name(c)\t((is_type+SYNBASE)[(int)c] &
(ISUPPER|ISLOWER|ISUNDER))",
"#define is_in_name(c)\t((is_type+SYNBASE)[(int)c] &
(ISUPPER|ISLOWER|ISUNDER|ISDIGIT))",
"#define is_special(c)\t((is_type+SYNBASE)[(int)c] &
(ISSPECL|ISDIGIT))",
+ "#define digit_val(c)\t((c) - '0')",
NULL
};
@@ -355,41 +346,6 @@ output_type_macros(void)
{
const char **pp;
- if (digit_contig)
- macro[0] = "#define is_digit(c)\t((unsigned int)((c) - '0') <=
9)";
for (pp = macro ; *pp ; pp++)
fprintf(hfile, "%s\n", *pp);
- if (digit_contig)
- fputs("#define digit_val(c)\t((c) - '0')\n", hfile);
- else
- fputs("#define digit_val(c)\t(digit_value[c])\n", hfile);
-}
-
-
-
-/*
- * Output digit conversion table (if digits are not contiguous).
- */
-
-static void
-digit_convert(void)
-{
- int maxdigit;
- static char digit[] = "0123456789";
- char *p;
- int i;
-
- maxdigit = 0;
- for (p = digit ; *p ; p++)
- if (*p > maxdigit)
- maxdigit = *p;
- fputs("extern const char digit_value[];\n", hfile);
- fputs("\n\nconst char digit_value[] = {\n", cfile);
- for (i = 0 ; i <= maxdigit ; i++) {
- for (p = digit ; *p && *p != i ; p++);
- if (*p == '\0')
- p = digit;
- fprintf(cfile, " %d,\n", (int)(p - digit));
- }
- fputs("};\n", cfile);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246372 - head/lib/libcompiler_rt
Author: andrew
Date: Wed Feb 6 00:01:28 2013
New Revision: 246372
URL: http://svnweb.freebsd.org/changeset/base/246372
Log:
Add the __aeabi_mem* functions to compiler-rt as clang uses them.
Modified:
head/lib/libcompiler_rt/Makefile
Modified: head/lib/libcompiler_rt/Makefile
==
--- head/lib/libcompiler_rt/MakefileTue Feb 5 22:54:09 2013
(r246371)
+++ head/lib/libcompiler_rt/MakefileWed Feb 6 00:01:28 2013
(r246372)
@@ -188,6 +188,10 @@ SRCS+= ${file}.c
.if ${MACHINE_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
SRCS+= aeabi_idivmod.S \
aeabi_ldivmod.S \
+ aeabi_memcmp.S \
+ aeabi_memcpy.S \
+ aeabi_memmove.S \
+ aeabi_memset.S \
aeabi_uidivmod.S \
aeabi_uldivmod.S
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246373 - stable/9/contrib/one-true-awk
Author: delphij
Date: Wed Feb 6 00:42:23 2013
New Revision: 246373
URL: http://svnweb.freebsd.org/changeset/base/246373
Log:
MFC:
one-true-awk 20121220.
Modified:
stable/9/contrib/one-true-awk/FIXES
stable/9/contrib/one-true-awk/main.c
stable/9/contrib/one-true-awk/makefile
stable/9/contrib/one-true-awk/proto.h
stable/9/contrib/one-true-awk/run.c
stable/9/contrib/one-true-awk/tran.c
Directory Properties:
stable/9/contrib/one-true-awk/ (props changed)
Modified: stable/9/contrib/one-true-awk/FIXES
==
--- stable/9/contrib/one-true-awk/FIXES Wed Feb 6 00:01:28 2013
(r246372)
+++ stable/9/contrib/one-true-awk/FIXES Wed Feb 6 00:42:23 2013
(r246373)
@@ -25,6 +25,22 @@ THIS SOFTWARE.
This file lists all bug fixes, changes, etc., made since the AWK book
was sent to the printers in August, 1987.
+Dec 20, 2012:
+ fiddled makefile to get correct yacc and bison flags. pick yacc
+ (linux) or bison (mac) as necessary.
+
+ added __attribute__((__noreturn__)) to a couple of lines in
+ proto.h, to silence someone's enthusiastic checker.
+
+ fixed obscure call by value bug in split(a[1],a) reported on
+ 9fans. the management of temporary values is just a mess; i
+ took a shortcut by making an extra string copy. thanks
+ to paul patience and arnold robbins for passing it on and for
+ proposed patches.
+
+ tiny fiddle in setfval to eliminate -0 results in T.expr, which
+ has irritated me for 20+ years.
+
Aug 10, 2011:
another fix to avoid core dump with delete(ARGV); again, many thanks
to ruslan ermilov.
Modified: stable/9/contrib/one-true-awk/main.c
==
--- stable/9/contrib/one-true-awk/main.cWed Feb 6 00:01:28 2013
(r246372)
+++ stable/9/contrib/one-true-awk/main.cWed Feb 6 00:42:23 2013
(r246373)
@@ -25,7 +25,7 @@ THIS SOFTWARE.
#include
__FBSDID("$FreeBSD$");
-const char *version = "version 20110810 (FreeBSD)";
+const char *version = "version 20121220 (FreeBSD)";
#define DEBUG
#include
Modified: stable/9/contrib/one-true-awk/makefile
==
--- stable/9/contrib/one-true-awk/makefile Wed Feb 6 00:01:28 2013
(r246372)
+++ stable/9/contrib/one-true-awk/makefile Wed Feb 6 00:42:23 2013
(r246373)
@@ -26,15 +26,15 @@ CFLAGS = -g
CFLAGS = -O2
CFLAGS =
-CC = gcc -Wall -g
-CC = cc
CC = gcc -Wall -g -Wwrite-strings
CC = gcc -fprofile-arcs -ftest-coverage # then gcov f1.c; cat f1.c.gcov
+CC = gcc -g -Wall -pedantic
CC = gcc -O4 -Wall -pedantic -fno-strict-aliasing
-YACC = bison -y
-YACC = yacc
-YFLAGS = -d
+YACC = bison -d -y
+YACC = yacc -d -S
+#YFLAGS = -d -S
+ # -S uses sprintf in yacc parser instead of sprint
OFILES = b.o main.o parse.o proctab.o tran.o lib.o run.o lex.o
Modified: stable/9/contrib/one-true-awk/proto.h
==
--- stable/9/contrib/one-true-awk/proto.h Wed Feb 6 00:01:28 2013
(r246372)
+++ stable/9/contrib/one-true-awk/proto.h Wed Feb 6 00:42:23 2013
(r246373)
@@ -46,7 +46,7 @@ externvoidfreetr(Node *);
extern int hexstr(uschar **);
extern int quoted(uschar **);
extern char*cclenter(const char *);
-extern voidoverflo(const char *);
+extern voidoverflo(const char *) __attribute__((__noreturn__));
extern voidcfoll(fa *, Node *);
extern int first(Node *);
extern voidfollow(Node *);
@@ -132,7 +132,7 @@ extern voidfpecatch(int);
extern voidbracecheck(void);
extern voidbcheck2(int, int, int);
extern voidSYNTAX(const char *, ...);
-extern voidFATAL(const char *, ...);
+extern voidFATAL(const char *, ...) __attribute__((__noreturn__));
extern voidWARNING(const char *, ...);
extern voiderror(void);
extern voideprint(void);
Modified: stable/9/contrib/one-true-awk/run.c
==
--- stable/9/contrib/one-true-awk/run.c Wed Feb 6 00:01:28 2013
(r246372)
+++ stable/9/contrib/one-true-awk/run.c Wed Feb 6 00:42:23 2013
(r246373)
@@ -1213,13 +1213,13 @@ Cell *dopa2(Node **a, int n)/* a[0], a[
Cell *split(Node **a, int nnn) /* split(a[0], a[1], a[2]); a[3] is type */
{
Cell *x = 0, *y, *ap;
- char *s;
+ char *s, *origs;
int sep;
char *t, temp, num[50], *fs = 0;
int n, tempstat, arg3type;
y = execute(a[0]); /* source string */
- s = getsval(y);
+ origs = s = strdup(getsval(y));
arg3type = ptoi(a[3]);
if (a[2] == 0) /* fs string */
fs = *FS;
@@ -1339,6 +1339,7 @@ Cell *split
svn commit: r246374 - stable/8/contrib/one-true-awk
Author: delphij
Date: Wed Feb 6 00:43:10 2013
New Revision: 246374
URL: http://svnweb.freebsd.org/changeset/base/246374
Log:
MFC:
one-true-awk 20121220.
Modified:
stable/8/contrib/one-true-awk/FIXES
stable/8/contrib/one-true-awk/main.c
stable/8/contrib/one-true-awk/makefile
stable/8/contrib/one-true-awk/proto.h
stable/8/contrib/one-true-awk/run.c
stable/8/contrib/one-true-awk/tran.c
Directory Properties:
stable/8/contrib/one-true-awk/ (props changed)
Modified: stable/8/contrib/one-true-awk/FIXES
==
--- stable/8/contrib/one-true-awk/FIXES Wed Feb 6 00:42:23 2013
(r246373)
+++ stable/8/contrib/one-true-awk/FIXES Wed Feb 6 00:43:10 2013
(r246374)
@@ -25,6 +25,22 @@ THIS SOFTWARE.
This file lists all bug fixes, changes, etc., made since the AWK book
was sent to the printers in August, 1987.
+Dec 20, 2012:
+ fiddled makefile to get correct yacc and bison flags. pick yacc
+ (linux) or bison (mac) as necessary.
+
+ added __attribute__((__noreturn__)) to a couple of lines in
+ proto.h, to silence someone's enthusiastic checker.
+
+ fixed obscure call by value bug in split(a[1],a) reported on
+ 9fans. the management of temporary values is just a mess; i
+ took a shortcut by making an extra string copy. thanks
+ to paul patience and arnold robbins for passing it on and for
+ proposed patches.
+
+ tiny fiddle in setfval to eliminate -0 results in T.expr, which
+ has irritated me for 20+ years.
+
Aug 10, 2011:
another fix to avoid core dump with delete(ARGV); again, many thanks
to ruslan ermilov.
Modified: stable/8/contrib/one-true-awk/main.c
==
--- stable/8/contrib/one-true-awk/main.cWed Feb 6 00:42:23 2013
(r246373)
+++ stable/8/contrib/one-true-awk/main.cWed Feb 6 00:43:10 2013
(r246374)
@@ -25,7 +25,7 @@ THIS SOFTWARE.
#include
__FBSDID("$FreeBSD$");
-const char *version = "version 20110810 (FreeBSD)";
+const char *version = "version 20121220 (FreeBSD)";
#define DEBUG
#include
Modified: stable/8/contrib/one-true-awk/makefile
==
--- stable/8/contrib/one-true-awk/makefile Wed Feb 6 00:42:23 2013
(r246373)
+++ stable/8/contrib/one-true-awk/makefile Wed Feb 6 00:43:10 2013
(r246374)
@@ -26,15 +26,15 @@ CFLAGS = -g
CFLAGS = -O2
CFLAGS =
-CC = gcc -Wall -g
-CC = cc
CC = gcc -Wall -g -Wwrite-strings
CC = gcc -fprofile-arcs -ftest-coverage # then gcov f1.c; cat f1.c.gcov
+CC = gcc -g -Wall -pedantic
CC = gcc -O4 -Wall -pedantic -fno-strict-aliasing
-YACC = bison -y
-YACC = yacc
-YFLAGS = -d
+YACC = bison -d -y
+YACC = yacc -d -S
+#YFLAGS = -d -S
+ # -S uses sprintf in yacc parser instead of sprint
OFILES = b.o main.o parse.o proctab.o tran.o lib.o run.o lex.o
Modified: stable/8/contrib/one-true-awk/proto.h
==
--- stable/8/contrib/one-true-awk/proto.h Wed Feb 6 00:42:23 2013
(r246373)
+++ stable/8/contrib/one-true-awk/proto.h Wed Feb 6 00:43:10 2013
(r246374)
@@ -46,7 +46,7 @@ externvoidfreetr(Node *);
extern int hexstr(uschar **);
extern int quoted(uschar **);
extern char*cclenter(const char *);
-extern voidoverflo(const char *);
+extern voidoverflo(const char *) __attribute__((__noreturn__));
extern voidcfoll(fa *, Node *);
extern int first(Node *);
extern voidfollow(Node *);
@@ -132,7 +132,7 @@ extern voidfpecatch(int);
extern voidbracecheck(void);
extern voidbcheck2(int, int, int);
extern voidSYNTAX(const char *, ...);
-extern voidFATAL(const char *, ...);
+extern voidFATAL(const char *, ...) __attribute__((__noreturn__));
extern voidWARNING(const char *, ...);
extern voiderror(void);
extern voideprint(void);
Modified: stable/8/contrib/one-true-awk/run.c
==
--- stable/8/contrib/one-true-awk/run.c Wed Feb 6 00:42:23 2013
(r246373)
+++ stable/8/contrib/one-true-awk/run.c Wed Feb 6 00:43:10 2013
(r246374)
@@ -1213,13 +1213,13 @@ Cell *dopa2(Node **a, int n)/* a[0], a[
Cell *split(Node **a, int nnn) /* split(a[0], a[1], a[2]); a[3] is type */
{
Cell *x = 0, *y, *ap;
- char *s;
+ char *s, *origs;
int sep;
char *t, temp, num[50], *fs = 0;
int n, tempstat, arg3type;
y = execute(a[0]); /* source string */
- s = getsval(y);
+ origs = s = strdup(getsval(y));
arg3type = ptoi(a[3]);
if (a[2] == 0) /* fs string */
fs = *FS;
@@ -1339,6 +1339,7 @@ Cell *split
svn commit: r246375 - head/sys/arm/allwinner
Author: ganbold (doc committer)
Date: Wed Feb 6 01:03:13 2013
New Revision: 246375
URL: http://svnweb.freebsd.org/changeset/base/246375
Log:
Use and set gpio pin to high to power up usb.
Approved by: gonzo@
Modified:
head/sys/arm/allwinner/a10_ehci.c
Modified: head/sys/arm/allwinner/a10_ehci.c
==
--- head/sys/arm/allwinner/a10_ehci.c Wed Feb 6 00:43:10 2013
(r246374)
+++ head/sys/arm/allwinner/a10_ehci.c Wed Feb 6 01:03:13 2013
(r246375)
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
@@ -58,6 +59,8 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include "gpio_if.h"
+
#include "a10_clk.h"
#define EHCI_HC_DEVSTR "Allwinner Integrated USB 2.0
controller"
@@ -70,8 +73,9 @@ __FBSDID("$FreeBSD$");
#define SW_ULPI_BYPASS (1 << 0)
#define SW_AHB_INCRX_ALIGN (1 << 8)
-#defineSW_AHB_INCR4(1 << 9)
+#define SW_AHB_INCR4 (1 << 9)
#define SW_AHB_INCR8 (1 << 10)
+#define GPIO_USB2_PWR 227
#define A10_READ_4(sc, reg)\
bus_space_read_4((sc)->sc_io_tag, (sc)->sc_io_hdl, reg)
@@ -101,6 +105,7 @@ a10_ehci_attach(device_t self)
{
ehci_softc_t *sc = device_get_softc(self);
bus_space_handle_t bsh;
+ device_t sc_gpio_dev;
int err;
int rid;
uint32_t reg_value = 0;
@@ -153,6 +158,13 @@ a10_ehci_attach(device_t self)
sprintf(sc->sc_vendor, "Allwinner");
+/* Get the GPIO device, we need this to give power to USB */
+ sc_gpio_dev = devclass_get_device(devclass_find("gpio"), 0);
+ if (sc_gpio_dev == NULL) {
+ device_printf(self, "Error: failed to get the GPIO device\n");
+ goto error;
+ }
+
err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
NULL, (driver_intr_t *)ehci_interrupt, sc, &sc->sc_intr_hdl);
if (err) {
@@ -166,6 +178,10 @@ a10_ehci_attach(device_t self)
/* Enable clock for USB */
a10_clk_usb_activate();
+ /* Give power to USB */
+ GPIO_PIN_SETFLAGS(sc_gpio_dev, GPIO_USB2_PWR, GPIO_PIN_OUTPUT);
+ GPIO_PIN_SET(sc_gpio_dev, GPIO_USB2_PWR, GPIO_PIN_HIGH);
+
/* Enable passby */
reg_value = A10_READ_4(sc, SW_USB_PMU_IRQ_ENABLE);
reg_value |= SW_AHB_INCR8; /* AHB INCR8 enable */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r246362 - head/games/fortune/datfiles
On Tuesday, 5 February 2013 at 11:45:40 -0500, John Baldwin wrote: > On Tuesday, February 05, 2013 9:39:38 am Dag-Erling SmXXrgrav wrote: >> Author: des >> Date: Tue Feb 5 14:39:37 2013 >> New Revision: 246362 >> URL: http://svnweb.freebsd.org/changeset/base/246362 >> >> Log: >> Remove political propaganda >> >> Modified: >> head/games/fortune/datfiles/fortunes-o.real > > *sigh* > > I'm sure there are other quotes that people who do not share your > political persuasion might find propaganda or offensive, etc. > Censorship and freedom of speech is quite a sticky widget, and I > think the only truly sane policy is that fortune files are > append-only (unless we outright remove them and that seems > excessive). And new things should have a very high bar to be added > to fortune. Perhaps we should move fortunes-o to ports entirely? Agreed, it shouldn't be up to individuals to decide which fortunes are *too* offensive. In this case, I suspect that there's a distinct difference between the perceptions of people inside and outside the USA. I also find Limbaugh particularly hard to stomach, but I don't think it should have been removed. The real issue I see is that, for whatever reason, the Limbaugh fortunes pop up far too frequently. It's as if the random number generation is failing. Comments? Greg -- Sent from my desktop computer. Finger g...@freebsd.org for PGP public key. See complete headers for address and phone numbers. This message is digitally signed. If your Microsoft MUA reports problems, please read http://tinyurl.com/broken-mua pgpjHnVydc9Ht.pgp Description: PGP signature
svn commit: r246376 - stable/9/sys/ufs/ufs
Author: pfg
Date: Wed Feb 6 02:51:25 2013
New Revision: 246376
URL: http://svnweb.freebsd.org/changeset/base/246376
Log:
MFC r246299;
UFS: Remove dead assignment.
PR: kern/175794
Submitted by: Christoph Mallon
Modified:
stable/9/sys/ufs/ufs/ufs_lookup.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/ufs/ufs/ufs_lookup.c
==
--- stable/9/sys/ufs/ufs/ufs_lookup.c Wed Feb 6 01:03:13 2013
(r246375)
+++ stable/9/sys/ufs/ufs/ufs_lookup.c Wed Feb 6 02:51:25 2013
(r246376)
@@ -1432,7 +1432,6 @@ ufs_checkpath(ino_t source_ino, ino_t pa
return (0);
if (target->i_number == ROOTINO)
return (0);
- error = 0;
for (;;) {
error = ufs_dir_dd_ino(vp, cred, &dd_ino);
if (error != 0)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246377 - stable/8/sys/ufs/ufs
Author: pfg
Date: Wed Feb 6 03:00:18 2013
New Revision: 246377
URL: http://svnweb.freebsd.org/changeset/base/246377
Log:
MFC r246299;
UFS: Remove dead assignment.
PR: kern/175794
Submitted by: Christoph Mallon
Modified:
stable/8/sys/ufs/ufs/ufs_lookup.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/ufs/ (props changed)
Modified: stable/8/sys/ufs/ufs/ufs_lookup.c
==
--- stable/8/sys/ufs/ufs/ufs_lookup.c Wed Feb 6 02:51:25 2013
(r246376)
+++ stable/8/sys/ufs/ufs/ufs_lookup.c Wed Feb 6 03:00:18 2013
(r246377)
@@ -1415,7 +1415,6 @@ ufs_checkpath(ino_t source_ino, ino_t pa
return (0);
if (target->i_number == ROOTINO)
return (0);
- error = 0;
for (;;) {
error = ufs_dir_dd_ino(vp, cred, &dd_ino);
if (error != 0)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246384 - in head/sys/amd64: amd64 include
Author: neel
Date: Wed Feb 6 04:53:00 2013
New Revision: 246384
URL: http://svnweb.freebsd.org/changeset/base/246384
Log:
Compute the number of initial kernel page table pages (NKPT) dynamically.
This eliminates the need to recompile the kernel when the default value
of NKPT is not big enough - for e.g. when loading large kernel modules
or memory disk images from the loader.
If NKPT is defined in the kernel configuration file then it overrides the
dynamic calculation.
Reviewed by: alc, kib
Modified:
head/sys/amd64/amd64/minidump_machdep.c
head/sys/amd64/amd64/pmap.c
head/sys/amd64/include/pmap.h
Modified: head/sys/amd64/amd64/minidump_machdep.c
==
--- head/sys/amd64/amd64/minidump_machdep.c Wed Feb 6 04:40:02 2013
(r246383)
+++ head/sys/amd64/amd64/minidump_machdep.c Wed Feb 6 04:53:00 2013
(r246384)
@@ -232,7 +232,7 @@ minidumpsys(struct dumperinfo *di)
/* Walk page table pages, set bits in vm_page_dump */
pmapsize = 0;
pdp = (uint64_t *)PHYS_TO_DMAP(KPDPphys);
- for (va = VM_MIN_KERNEL_ADDRESS; va < MAX(KERNBASE + NKPT * NBPDR,
+ for (va = VM_MIN_KERNEL_ADDRESS; va < MAX(KERNBASE + nkpt * NBPDR,
kernel_vm_end); ) {
/*
* We always write a page, even if it is zero. Each
@@ -364,7 +364,7 @@ minidumpsys(struct dumperinfo *di)
/* Dump kernel page directory pages */
bzero(fakepd, sizeof(fakepd));
pdp = (uint64_t *)PHYS_TO_DMAP(KPDPphys);
- for (va = VM_MIN_KERNEL_ADDRESS; va < MAX(KERNBASE + NKPT * NBPDR,
+ for (va = VM_MIN_KERNEL_ADDRESS; va < MAX(KERNBASE + nkpt * NBPDR,
kernel_vm_end); va += NBPDP) {
i = (va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1);
Modified: head/sys/amd64/amd64/pmap.c
==
--- head/sys/amd64/amd64/pmap.c Wed Feb 6 04:40:02 2013(r246383)
+++ head/sys/amd64/amd64/pmap.c Wed Feb 6 04:53:00 2013(r246384)
@@ -202,6 +202,10 @@ struct pmap kernel_pmap_store;
vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */
vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */
+int nkpt;
+SYSCTL_INT(_machdep, OID_AUTO, nkpt, CTLFLAG_RD, &nkpt, 0,
+"Number of kernel page table pages allocated on bootup");
+
static int ndmpdp;
static vm_paddr_t dmaplimit;
vm_offset_t kernel_vm_end = VM_MIN_KERNEL_ADDRESS;
@@ -495,17 +499,42 @@ allocpages(vm_paddr_t *firstaddr, int n)
CTASSERT(powerof2(NDMPML4E));
+/* number of kernel PDP slots */
+#defineNKPDPE(ptpgs) howmany((ptpgs), NPDEPG)
+
static void
-create_pagetables(vm_paddr_t *firstaddr)
+nkpt_init(vm_paddr_t addr)
{
- int i, j, ndm1g;
+ int pt_pages;
+
+#ifdef NKPT
+ pt_pages = NKPT;
+#else
+ pt_pages = howmany(addr, 1 << PDRSHIFT);
+ pt_pages += NKPDPE(pt_pages);
- /* Allocate pages */
- KPTphys = allocpages(firstaddr, NKPT);
- KPML4phys = allocpages(firstaddr, 1);
- KPDPphys = allocpages(firstaddr, NKPML4E);
- KPDphys = allocpages(firstaddr, NKPDPE);
+ /*
+* Add some slop beyond the bare minimum required for bootstrapping
+* the kernel.
+*
+* This is quite important when allocating KVA for kernel modules.
+* The modules are required to be linked in the negative 2GB of
+* the address space. If we run out of KVA in this region then
+* pmap_growkernel() will need to allocate page table pages to map
+* the entire 512GB of KVA space which is an unnecessary tax on
+* physical memory.
+*/
+ pt_pages += 8; /* 16MB additional slop for kernel modules */
+#endif
+ nkpt = pt_pages;
+}
+static void
+create_pagetables(vm_paddr_t *firstaddr)
+{
+ int i, j, ndm1g, nkpdpe;
+
+ /* Allocate page table pages for the direct map */
ndmpdp = (ptoa(Maxmem) + NBPDP - 1) >> PDPSHIFT;
if (ndmpdp < 4) /* Minimum 4GB of dirmap */
ndmpdp = 4;
@@ -517,6 +546,22 @@ create_pagetables(vm_paddr_t *firstaddr)
DMPDphys = allocpages(firstaddr, ndmpdp - ndm1g);
dmaplimit = (vm_paddr_t)ndmpdp << PDPSHIFT;
+ /* Allocate pages */
+ KPML4phys = allocpages(firstaddr, 1);
+ KPDPphys = allocpages(firstaddr, NKPML4E);
+
+ /*
+* Allocate the initial number of kernel page table pages required to
+* bootstrap. We defer this until after all memory-size dependent
+* allocations are done (e.g. direct map), so that we don't have to
+* build in too much slop in our estimate.
+*/
+ nkpt_init(*firstaddr);
+ nkpdpe = NKPDPE(nkpt);
+
+ KPTphys = allocpages(firstaddr, nkpt);
+ KPDphys = allocpages(firstaddr, nkpdpe);
+
/*
svn commit: r246385 - head/sys/dev/cxgbe/common
Author: np
Date: Wed Feb 6 06:44:42 2013
New Revision: 246385
URL: http://svnweb.freebsd.org/changeset/base/246385
Log:
Busy-wait when cold.
Reported by: gnn, jhb
MFC after:3 days
Modified:
head/sys/dev/cxgbe/common/t4_hw.c
Modified: head/sys/dev/cxgbe/common/t4_hw.c
==
--- head/sys/dev/cxgbe/common/t4_hw.c Wed Feb 6 04:53:00 2013
(r246384)
+++ head/sys/dev/cxgbe/common/t4_hw.c Wed Feb 6 06:44:42 2013
(r246385)
@@ -35,7 +35,12 @@ __FBSDID("$FreeBSD$");
#include "firmware/t4fw_interface.h"
#undef msleep
-#define msleep(x) pause("t4hw", (x) * hz / 1000)
+#define msleep(x) do { \
+ if (cold) \
+ DELAY((x) * 1000); \
+ else \
+ pause("t4hw", (x) * hz / 1000); \
+} while (0)
/**
* t4_wait_op_done_val - wait until an operation is completed
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r246362 - head/games/fortune/datfiles
On Tue, Feb 05, 2013 at 04:17:25PM -0500, John Baldwin wrote: J> On Tuesday, February 05, 2013 3:55:47 pm Gleb Smirnoff wrote: J> > On Tue, Feb 05, 2013 at 11:58:54AM -0500, John Baldwin wrote: J> > J> > > On Tuesday, February 05, 2013 9:39:38 am Dag-Erling SmXXrgrav wrote: J> > J> > > > Author: des J> > J> > > > Date: Tue Feb 5 14:39:37 2013 J> > J> > > > New Revision: 246362 J> > J> > > > URL: http://svnweb.freebsd.org/changeset/base/246362 J> > J> > > > J> > J> > > > Log: J> > J> > > > Remove political propaganda J> > J> > > > J> > J> > > > Modified: J> > J> > > > head/games/fortune/datfiles/fortunes-o.real J> > J> > > J> > J> > > *sigh* J> > J> > > J> > J> > > I'm sure there are other quotes that people who do not share your political J> > J> > > persuasion might find propaganda or offensive, etc. Censorship and freedom J> > J> > > of speech is quite a sticky widget, and I think the only truly sane policy J> > J> > > is that fortune files are append-only (unless we outright remove them and J> > J> > > that seems excessive). And new things should have a very high bar to be J> > J> > > added to fortune. Perhaps we should move fortunes-o to ports entirely? J> > J> > > J> > J> > J> > J> > I am more concerned about the insta-MFC than the removal per se. J> > J> > Only security or legal issues are cause to go under 3 days, was my J> > J> > impression. J> > J> J> > J> Yes, the insta-MFC is also not appropriate, esp. for something that you know J> > J> is going to raise eyebrows when it is committed. Having to debate this sort J> > J> of thing in public on mailing lists is also distinctly unhelpful and very J> > J> distracting from productive work. Also, I'd like to preemptively ask J> > J> developers to refrain from any further commits to the fortunes datfiles for J> > J> the time being as the last thing we need is a commit war over this sort of J> > J> thing. J> > J> > What about just moving the entire games subdirectory to ports repo? J> J> We've already moved most of it many years ago. The yesterday bikeshed proves that "most" isn't enough. :( The entire games subdir needs to be moved. -- Totus tuus, Glebius. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246386 - stable/9/sys/ia64/conf
Author: hrs Date: Wed Feb 6 07:20:09 2013 New Revision: 246386 URL: http://svnweb.freebsd.org/changeset/base/246386 Log: MFC: Remove firewire devices missed in r244992. Modified: stable/9/sys/ia64/conf/GENERIC Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/ia64/conf/GENERIC == --- stable/9/sys/ia64/conf/GENERIC Wed Feb 6 06:44:42 2013 (r246385) +++ stable/9/sys/ia64/conf/GENERIC Wed Feb 6 07:20:09 2013 (r246386) @@ -167,11 +167,6 @@ device uslcom # SI Labs CP2101/CP2102 device uvisor # Visor and Palm devices device uvscom # USB serial support for DDI pocket's PHS -# FireWire support -device fwip# IP over FireWire (RFC 2734,3146) -# sbp(4) works for some systems but causes boot failure on others -#devicesbp # SCSI over FireWire (need scbus & da) - # Various (pseudo) devices device ether # Ethernet support device faith # IPv6-to-IPv4 relaying (translation) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246387 - head/sys/sys
Author: glebius
Date: Wed Feb 6 07:27:25 2013
New Revision: 246387
URL: http://svnweb.freebsd.org/changeset/base/246387
Log:
Fixes to QUEUE_MACRO_DEBUG support:
- Add const quilifiers to fields that store value of __FILE__.
- Use long type for fields that store value of __LINE__.
- Sort and style(9) debugging fields.
- Add initializer for debugging fields into TAILQ_INITIALIZER macro.
PR: 175759
Submitted by: Andrey Simonenko
Reviewed by: bde
Modified:
head/sys/sys/queue.h
Modified: head/sys/sys/queue.h
==
--- head/sys/sys/queue.hWed Feb 6 07:20:09 2013(r246386)
+++ head/sys/sys/queue.hWed Feb 6 07:27:25 2013(r246387)
@@ -105,13 +105,14 @@
#ifdef QUEUE_MACRO_DEBUG
/* Store the last 2 places the queue element or head was altered */
struct qm_trace {
- char * lastfile;
- int lastline;
- char * prevfile;
- int prevline;
+ unsigned longlastline;
+ unsigned longprevline;
+ const char *lastfile;
+ const char *prevfile;
};
#defineTRACEBUFstruct qm_trace trace;
+#defineTRACEBUF_INITIALIZER{ __FILE__, __LINE__, NULL, 0 } ,
#defineTRASHIT(x) do {(x) = (void *)-1;} while (0)
#defineQMD_SAVELINK(name, link)void **name = (void *)&(link)
@@ -134,6 +135,7 @@ struct qm_trace {
#defineQMD_TRACE_HEAD(head)
#defineQMD_SAVELINK(name, link)
#defineTRACEBUF
+#defineTRACEBUF_INITIALIZER
#defineTRASHIT(x)
#endif /* QUEUE_MACRO_DEBUG */
@@ -461,7 +463,7 @@ struct name {
\
}
#defineTAILQ_HEAD_INITIALIZER(head)
\
- { NULL, &(head).tqh_first }
+ { NULL, &(head).tqh_first, TRACEBUF_INITIALIZER }
#defineTAILQ_ENTRY(type)
\
struct { \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r246362 - head/games/fortune/datfiles
On 06-02-2013 11:18, Gleb Smirnoff wrote: > On Tue, Feb 05, 2013 at 04:17:25PM -0500, John Baldwin wrote: > J> On Tuesday, February 05, 2013 3:55:47 pm Gleb Smirnoff wrote: > J> > On Tue, Feb 05, 2013 at 11:58:54AM -0500, John Baldwin wrote: > J> > J> > > On Tuesday, February 05, 2013 9:39:38 am Dag-Erling SmXXrgrav > wrote: > J> > J> > > > Author: des > J> > J> > > > Date: Tue Feb 5 14:39:37 2013 > J> > J> > > > New Revision: 246362 > J> > J> > > > URL: http://svnweb.freebsd.org/changeset/base/246362 > J> > J> > > > > J> > J> > > > Log: > J> > J> > > > Remove political propaganda > J> > J> > > > > J> > J> > > > Modified: > J> > J> > > > head/games/fortune/datfiles/fortunes-o.real > J> > J> > > > J> > J> > > *sigh* > J> > J> > > > J> > J> > > I'm sure there are other quotes that people who do not share your > political > J> > J> > > persuasion might find propaganda or offensive, etc. Censorship > and freedom > J> > J> > > of speech is quite a sticky widget, and I think the only truly > sane policy > J> > J> > > is that fortune files are append-only (unless we outright remove > them and > J> > J> > > that seems excessive). And new things should have a very high > bar to be > J> > J> > > added to fortune. Perhaps we should move fortunes-o to ports > entirely? > J> > J> > > > J> > J> > > J> > J> > I am more concerned about the insta-MFC than the removal per se. > J> > J> > Only security or legal issues are cause to go under 3 days, was my > J> > J> > impression. > J> > J> > J> > J> Yes, the insta-MFC is also not appropriate, esp. for something that > you know > J> > J> is going to raise eyebrows when it is committed. Having to debate > this sort > J> > J> of thing in public on mailing lists is also distinctly unhelpful and > very > J> > J> distracting from productive work. Also, I'd like to preemptively ask > J> > J> developers to refrain from any further commits to the fortunes > datfiles for > J> > J> the time being as the last thing we need is a commit war over this > sort of > J> > J> thing. > J> > > J> > What about just moving the entire games subdirectory to ports repo? > J> > J> We've already moved most of it many years ago. > > The yesterday bikeshed proves that "most" isn't enough. :( The entire games > subdir > needs to be moved. +1 This is a worthless discussion that seems to pop up from time to time. Move it to ports. -- Joel ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246388 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/lib/libzfs/common
Author: mm
Date: Wed Feb 6 07:54:46 2013
New Revision: 246388
URL: http://svnweb.freebsd.org/changeset/base/246388
Log:
Update vendor/illumos/dist and vendor-sys/illumos/dist
to illumos-gate 13934:9e23a7f7b812
Illumos ZFS issues:
3422 zpool create/syseventd race yield non-importable pool
3425 first write to a new zvol can fail with EFBIG
Modified:
vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c
vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c
Changes in other areas also in this revision:
Modified:
vendor/illumos/dist/lib/libzfs/common/libzfs_import.c
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c
==
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c Wed Feb 6 07:27:25
2013(r246387)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c Wed Feb 6 07:54:46
2013(r246388)
@@ -21,7 +21,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
*/
#include
@@ -284,6 +284,7 @@ dmu_tx_count_write(dmu_tx_hold_t *txh, u
delta = P2NPHASE(off, dn->dn_datablksz);
}
+ min_ibs = max_ibs = dn->dn_indblkshift;
if (dn->dn_maxblkid > 0) {
/*
* The blocksize can't change,
@@ -291,13 +292,6 @@ dmu_tx_count_write(dmu_tx_hold_t *txh, u
*/
ASSERT(dn->dn_datablkshift != 0);
min_bs = max_bs = dn->dn_datablkshift;
- min_ibs = max_ibs = dn->dn_indblkshift;
- } else if (dn->dn_indblkshift > max_ibs) {
- /*
-* This ensures that if we reduce DN_MAX_INDBLKSHIFT,
-* the code will still work correctly on older pools.
-*/
- min_ibs = max_ibs = dn->dn_indblkshift;
}
/*
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c
==
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.cWed Feb 6 07:27:25
2013(r246387)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.cWed Feb 6 07:54:46
2013(r246388)
@@ -1327,7 +1327,8 @@ vdev_validate(vdev_t *vd, boolean_t stri
if (vd->vdev_ops->vdev_op_leaf && vdev_readable(vd)) {
uint64_t aux_guid = 0;
nvlist_t *nvl;
- uint64_t txg = strict ? spa->spa_config_txg : -1ULL;
+ uint64_t txg = spa_last_synced_txg(spa) != 0 ?
+ spa_last_synced_txg(spa) : -1ULL;
if ((label = vdev_label_read_config(vd, txg)) == NULL) {
vdev_set_state(vd, B_TRUE, VDEV_STATE_CANT_OPEN,
@@ -1511,7 +1512,7 @@ vdev_reopen(vdev_t *vd)
!l2arc_vdev_present(vd))
l2arc_add_vdev(spa, vd);
} else {
- (void) vdev_validate(vd, spa_last_synced_txg(spa));
+ (void) vdev_validate(vd, B_TRUE);
}
/*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246388 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/lib/libzfs/common
Author: mm Date: Wed Feb 6 07:54:46 2013 New Revision: 246388 URL: http://svnweb.freebsd.org/changeset/base/246388 Log: Update vendor/illumos/dist and vendor-sys/illumos/dist to illumos-gate 13934:9e23a7f7b812 Illumos ZFS issues: 3422 zpool create/syseventd race yield non-importable pool 3425 first write to a new zvol can fail with EFBIG Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_import.c Changes in other areas also in this revision: Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_import.c == --- vendor/illumos/dist/lib/libzfs/common/libzfs_import.c Wed Feb 6 07:27:25 2013(r246387) +++ vendor/illumos/dist/lib/libzfs/common/libzfs_import.c Wed Feb 6 07:54:46 2013(r246388) @@ -528,13 +528,12 @@ get_configs(libzfs_handle_t *hdl, pool_l * version * pool guid * name -* pool txg (if available) * comment (if available) * pool state * hostid (if available) * hostname (if available) */ - uint64_t state, version, pool_txg; + uint64_t state, version; char *comment = NULL; version = fnvlist_lookup_uint64(tmp, @@ -550,11 +549,6 @@ get_configs(libzfs_handle_t *hdl, pool_l fnvlist_add_string(config, ZPOOL_CONFIG_POOL_NAME, name); - if (nvlist_lookup_uint64(tmp, - ZPOOL_CONFIG_POOL_TXG, &pool_txg) == 0) - fnvlist_add_uint64(config, - ZPOOL_CONFIG_POOL_TXG, pool_txg); - if (nvlist_lookup_string(tmp, ZPOOL_CONFIG_COMMENT, &comment) == 0) fnvlist_add_string(config, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r246389 - vendor/illumos/dist/man/man1m
Author: mm Date: Wed Feb 6 07:59:14 2013 New Revision: 246389 URL: http://svnweb.freebsd.org/changeset/base/246389 Log: Update vendor/illumos/dist to illumos-gate version 13936:60077db1e2cc Illumos ZFS issues: 3380 zfs man page: documentation for zfs allow is confusing Modified: vendor/illumos/dist/man/man1m/zfs.1m Modified: vendor/illumos/dist/man/man1m/zfs.1m == --- vendor/illumos/dist/man/man1m/zfs.1mWed Feb 6 07:54:46 2013 (r246388) +++ vendor/illumos/dist/man/man1m/zfs.1mWed Feb 6 07:59:14 2013 (r246389) @@ -24,10 +24,10 @@ .\" Copyright 2011 Joshua M. Clulow .\" Copyright (c) 2012 by Delphix. All rights reserved. .\" Copyright (c) 2012, Joyent, Inc. All rights reserved. -.\" Copyright 2012 Nexenta Systems, Inc. All Rights Reserved. .\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved. +.\" Copyright 2013 Nexenta Systems, Inc. All Rights Reserved. .\" -.TH ZFS 1M "Sep 16, 2012" +.TH ZFS 1M "Jan 26, 2013" .SH NAME zfs \- configures ZFS file systems .SH SYNOPSIS @@ -38,12 +38,12 @@ zfs \- configures ZFS file systems .LP .nf -\fBzfs\fR \fBcreate\fR [\fB-p\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fIfilesystem\fR +\fBzfs\fR \fBcreate\fR [\fB-p\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR]... \fIfilesystem\fR .fi .LP .nf -\fBzfs\fR \fBcreate\fR [\fB-ps\fR] [\fB-b\fR \fIblocksize\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fB-V\fR \fIsize\fR \fIvolume\fR +\fBzfs\fR \fBcreate\fR [\fB-ps\fR] [\fB-b\fR \fIblocksize\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR]... \fB-V\fR \fIsize\fR \fIvolume\fR .fi .LP @@ -53,7 +53,7 @@ zfs \- configures ZFS file systems .LP .nf -\fBzfs\fR \fBdestroy\fR [\fB-dnpRrv\fR] \fIfilesystem\fR|\fIvolume\fR@\fIsnap\fR[%\fIsnap\fR][,...] +\fBzfs\fR \fBdestroy\fR [\fB-dnpRrv\fR] \fIfilesystem\fR|\fIvolume\fR@\fIsnap\fR[%\fIsnap\fR][,\fIsnap\fR[%\fIsnap\fR]]... .fi .LP @@ -69,7 +69,7 @@ zfs \- configures ZFS file systems .LP .nf -\fBzfs\fR \fBclone\fR [\fB-p\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR +\fBzfs\fR \fBclone\fR [\fB-p\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR]... \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR .fi .LP @@ -95,24 +95,25 @@ zfs \- configures ZFS file systems .LP .nf -\fBzfs\fR \fBlist\fR [\fB-r\fR|\fB-d\fR \fIdepth\fR][\fB-H\fR][\fB-o\fR \fIproperty\fR[,...]] [\fB-t\fR \fItype\fR[,...]] - [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR] ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ... +\fBzfs\fR \fBlist\fR [\fB-r\fR|\fB-d\fR \fIdepth\fR][\fB-H\fR][\fB-o\fR \fIproperty\fR[,\fIproperty\fR]...] [\fB-t\fR \fItype\fR[,\fItype\fR]...] + [\fB-s\fR \fIproperty\fR]... [\fB-S\fR \fIproperty\fR]... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR]... .fi .LP .nf -\fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ... +\fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR... .fi .LP .nf -\fBzfs\fR \fBget\fR [\fB-r\fR|\fB-d\fR \fIdepth\fR][\fB-Hp\fR][\fB-o\fR \fIfield\fR[,...]] [\fB-t\fR \fItype\fR[,...]] -[\fB-s\fR \fIsource\fR[,...]] "\fIall\fR" | \fIproperty\fR[,...] \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ... +\fBzfs\fR \fBget\fR [\fB-r\fR|\fB-d\fR \fIdepth\fR][\fB-Hp\fR][\fB-o\fR \fIfield\fR[,\fIfield\fR]...] [\fB-t\fR \fItype\fR[,\fItype\fR]...] +[\fB-s\fR \fIsource\fR[,\fIsource\fR]...] \fBall\fR | \fIproperty\fR[,\fIproperty\fR]... +\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR... .fi .LP .nf -\fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume|snapshot\fR ... +\fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume|snapshot\fR... .fi .LP @@ -127,14 +128,14 @@ zfs \- configures ZFS file systems .LP .nf -\fBzfs\fR \fBuserspace\fR [\fB-Hinp\fR] [\fB-o\fR \fIfield\fR[,...]] [\fB-s\fR \fIfield\fR] ... -[\fB-S\fR \fIfield\fR] ... [\fB-t\fR \fItype\fR[,...]] \fIfilesystem\fR|\fIsnapshot\fR +\fBzfs\fR \fBuserspace\fR [\fB-Hinp\fR] [\fB-o\fR \fIfield\fR[,\fIfield\fR]...] [\fB-s\fR \fIfield\fR]... +[\fB-S\fR \fIfield\fR]... [\fB-t\fR \fItype\fR[,\fItype\fR]...] \fIfilesystem\fR|\fIsnapshot\fR .fi .LP .nf -\fBzfs\fR \fBgroupspace\fR [\fB-Hinp\fR] [\fB-o\fR \fIfield\fR[,...]] [\fB-s\fR \fIfield\fR] ... -[\fB-S\fR \fIfield\fR] ... [\fB-t\fR \fItype\fR[,...]] \fIfilesystem\fR|\fIsnapshot\fR +\fBzfs\fR \fBgroupspace\fR [\fB-Hinp\fR] [\fB-o\fR \fIfield\fR[,\fIfield\fR]...] [\fB-s\fR \fIfield\fR]... +[\fB-S\fR \fIfield\fR]... [\fB-t\fR \fItype\fR[,\fItype\fR]...] \fIfilesystem\fR|\fIsnapshot\fR .fi .LP @@ -184,44 +185,47 @@ zfs \- configures ZFS file systems .LP .nf -\fBzfs\fR \fBallow\fR [\fB-ldug\fR] "\fIeveryone\fR"|\fIuser\fR|\fIgroup\fR[,...] \fIperm\fR|\fI@setname\fR[,...] - \fIfilesystem\fR|\fIvolume\fR +\fBzfs\fR \fB
