svn commit: r249640 - head/sys/dev/ath
Author: adrian Date: Fri Apr 19 07:56:22 2013 New Revision: 249640 URL: http://svnweb.freebsd.org/changeset/base/249640 Log: Print out the chainmask configuration. Modified: head/sys/dev/ath/if_ath.c Modified: head/sys/dev/ath/if_ath.c == --- head/sys/dev/ath/if_ath.c Fri Apr 19 06:59:10 2013(r249639) +++ head/sys/dev/ath/if_ath.c Fri Apr 19 07:56:22 2013(r249640) @@ -781,6 +781,11 @@ ath_attach(u_int16_t devid, struct ath_s ath_hal_getrxchainmask(ah, &sc->sc_rxchainmask); ath_hal_gettxchainmask(ah, &sc->sc_txchainmask); + device_printf(sc->sc_dev, "Chainmasks: TX=0x%x; RX=0x%x\n", + __func__, + sc->sc_txchainmask, + sc->sc_rxchainmask); + ic->ic_txstream = txs; ic->ic_rxstream = rxs; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r249641 - head/sys/dev/ath
Author: adrian Date: Fri Apr 19 08:01:34 2013 New Revision: 249641 URL: http://svnweb.freebsd.org/changeset/base/249641 Log: .. don't know how this snuck into this commit. Sorry. Fix compile build before anyone notices. Modified: head/sys/dev/ath/if_ath.c Modified: head/sys/dev/ath/if_ath.c == --- head/sys/dev/ath/if_ath.c Fri Apr 19 07:56:22 2013(r249640) +++ head/sys/dev/ath/if_ath.c Fri Apr 19 08:01:34 2013(r249641) @@ -782,7 +782,6 @@ ath_attach(u_int16_t devid, struct ath_s ath_hal_gettxchainmask(ah, &sc->sc_txchainmask); device_printf(sc->sc_dev, "Chainmasks: TX=0x%x; RX=0x%x\n", - __func__, sc->sc_txchainmask, sc->sc_rxchainmask); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r249642 - head/sys/dev/ath
Author: adrian
Date: Fri Apr 19 08:06:45 2013
New Revision: 249642
URL: http://svnweb.freebsd.org/changeset/base/249642
Log:
Add a debug statement to log the currently chosen chainmask configuration.
Modified:
head/sys/dev/ath/if_ath.c
Modified: head/sys/dev/ath/if_ath.c
==
--- head/sys/dev/ath/if_ath.c Fri Apr 19 08:01:34 2013(r249641)
+++ head/sys/dev/ath/if_ath.c Fri Apr 19 08:06:45 2013(r249642)
@@ -1529,6 +1529,12 @@ ath_update_chainmasks(struct ath_softc *
} else {
sc->sc_cur_txchainmask = 1;
}
+
+ DPRINTF(sc, ATH_DEBUG_RESET,
+ "%s: TX chainmask is now 0x%x, RX is now 0x%x\n",
+ __func__,
+ sc->sc_cur_txchainmask,
+ sc->sc_cur_rxchainmask);
}
void
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r249644 - head/sys/kern
Author: jilles
Date: Fri Apr 19 10:16:00 2013
New Revision: 249644
URL: http://svnweb.freebsd.org/changeset/base/249644
Log:
sem: Restart the POSIX sem_* calls after signals with SA_RESTART set.
Programs often do not expect an [EINTR] return from sem_wait() and POSIX
only allows it if the signal was installed without SA_RESTART. The timeout
in sem_timedwait() is absolute so it can be restarted normally.
The umtx call can be invoked with a relative timeout and in that case
[ERESTART] must be changed to [EINTR]. However, libc does not do this.
The old POSIX semaphore implementation did this correctly (before r249566),
unlike the new umtx one.
It may be desirable to avoid [EINTR] completely, which matches the pthread
functions and is explicitly permitted by POSIX. However, the kernel must
return [EINTR] at least for signals with SA_RESTART clear, otherwise pthread
cancellation will not abort a semaphore wait. In this commit, only restore
the 8.x behaviour which is also permitted by POSIX.
Discussed with: jhb
MFC after:1 week
Modified:
head/sys/kern/kern_umtx.c
head/sys/kern/uipc_sem.c
Modified: head/sys/kern/kern_umtx.c
==
--- head/sys/kern/kern_umtx.c Fri Apr 19 09:19:10 2013(r249643)
+++ head/sys/kern/kern_umtx.c Fri Apr 19 10:16:00 2013(r249644)
@@ -2980,7 +2980,9 @@ do_sem_wait(struct thread *td, struct _u
error = 0;
else {
umtxq_remove(uq);
- if (error == ERESTART)
+ /* A relative timeout cannot be restarted. */
+ if (error == ERESTART && timeout != NULL &&
+ (timeout->_flags & UMTX_ABSTIME) == 0)
error = EINTR;
}
umtxq_unlock(&uq->uq_key);
Modified: head/sys/kern/uipc_sem.c
==
--- head/sys/kern/uipc_sem.cFri Apr 19 09:19:10 2013(r249643)
+++ head/sys/kern/uipc_sem.cFri Apr 19 10:16:00 2013(r249644)
@@ -846,8 +846,6 @@ kern_sem_wait(struct thread *td, semid_t
err:
mtx_unlock(&sem_lock);
fdrop(fp, td);
- if (error == ERESTART)
- error = EINTR;
DP(("<<< kern_sem_wait leaving, pid=%d, error = %d\n",
(int)td->td_proc->p_pid, error));
return (error);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r249649 - head/sys/kern
Author: glebius
Date: Fri Apr 19 13:40:13 2013
New Revision: 249649
URL: http://svnweb.freebsd.org/changeset/base/249649
Log:
Don't compare unsigned socklen_t against < 0.
Reviewed by: jhb
Modified:
head/sys/kern/uipc_syscalls.c
Modified: head/sys/kern/uipc_syscalls.c
==
--- head/sys/kern/uipc_syscalls.c Fri Apr 19 11:56:25 2013
(r249648)
+++ head/sys/kern/uipc_syscalls.c Fri Apr 19 13:40:13 2013
(r249649)
@@ -382,11 +382,8 @@ kern_accept(struct thread *td, int s, st
pid_t pgid;
int tmp;
- if (name) {
+ if (name)
*name = NULL;
- if (*namelen < 0)
- return (EINVAL);
- }
AUDIT_ARG_FD(s);
fdp = td->td_proc->p_fd;
@@ -1565,9 +1562,6 @@ kern_getsockname(struct thread *td, int
socklen_t len;
int error;
- if (*alen < 0)
- return (EINVAL);
-
AUDIT_ARG_FD(fd);
error = getsock_cap(td->td_proc->p_fd, fd, CAP_GETSOCKNAME, &fp, NULL);
if (error)
@@ -1665,9 +1659,6 @@ kern_getpeername(struct thread *td, int
socklen_t len;
int error;
- if (*alen < 0)
- return (EINVAL);
-
AUDIT_ARG_FD(fd);
error = getsock_cap(td->td_proc->p_fd, fd, CAP_GETPEERNAME, &fp, NULL);
if (error)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r249649 - head/sys/kern
On 19 April 2013 17:40, Gleb Smirnoff wrote: > Author: glebius > Date: Fri Apr 19 13:40:13 2013 > New Revision: 249649 > URL: http://svnweb.freebsd.org/changeset/base/249649 > > Log: > Don't compare unsigned socklen_t against < 0. > > Reviewed by: jhb > Thank you. This is long overdue since socklen_t. You may also want to update man page. Index: lib/libc/sys/accept.2 === --- lib/libc/sys/accept.2 (revision 245745) +++ lib/libc/sys/accept.2 (working copy) @@ -28,7 +28,7 @@ .\" @(#)accept.2 8.2 (Berkeley) 12/11/93 .\" $FreeBSD$ .\" -.Dd December 11, 1993 +.Dd February 20, 2013 .Dt ACCEPT 2 .Os .Sh NAME @@ -154,10 +154,6 @@ The descriptor references a file, not a socket. .It Bq Er EINVAL .Xr listen 2 has not been called on the socket descriptor. -.It Bq Er EINVAL -The -.Fa addrlen -argument is negative. .It Bq Er EFAULT The .Fa addr -- wbr, pluknet ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r249650 - head/sys/kern
Author: jh
Date: Fri Apr 19 15:19:29 2013
New Revision: 249650
URL: http://svnweb.freebsd.org/changeset/base/249650
Log:
Include PID in the error message which is printed when the maxproc limit
is exceeded. Improve formatting of the message while here.
PR: kern/60550
Submitted by: Lowell Gilbert, bde
Modified:
head/sys/kern/kern_fork.c
Modified: head/sys/kern/kern_fork.c
==
--- head/sys/kern/kern_fork.c Fri Apr 19 13:40:13 2013(r249649)
+++ head/sys/kern/kern_fork.c Fri Apr 19 15:19:29 2013(r249650)
@@ -930,8 +930,8 @@ fork1(struct thread *td, int flags, int
fail:
sx_sunlock(&proctree_lock);
if (ppsratecheck(&lastfail, &curfail, 1))
- printf("maxproc limit exceeded by uid %i, please see tuning(7)
and login.conf(5).\n",
- td->td_ucred->cr_ruid);
+ printf("maxproc limit exceeded by uid %u (pid %d); see
tuning(7) and login.conf(5)\n",
+ td->td_ucred->cr_ruid, p1->p_pid);
sx_xunlock(&allproc_lock);
#ifdef MAC
mac_proc_destroy(newproc);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r249484 - head/lib
On Apr 17, 2013, at 10:33 AM, Dimitry Andric wrote: > In any case, the layout has been like this since the initial clangbsd > import, and I never saw any reason to change it. Maybe Ed can tell a > bit more, since he seems to have done the initial infrastructure setup. FreeBSD/ARM just switched from GCC to Clang, which is why this just got noticed. U-Boot is used quite heavily for FreeBSD/ARM (and MIPS and PowerPC as well, I believe). Here are the options I see for getting cc -print-file-name=include to work again: * Hack clang to handle -print-file-name=include specially. I did this for GCC already, but I'm not thrilled about it. * Configure clang differently so that this option works. * Symlink /usr/include to appear somewhere that clang expects. * Rearrange our directory layout slightly to match clang's expectations. Tim ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r249484 - head/lib
On Apr 19, 2013, at 06:50, Tim Kientzle wrote: > On Apr 17, 2013, at 10:33 AM, Dimitry Andric wrote: > >> In any case, the layout has been like this since the initial clangbsd >> import, and I never saw any reason to change it. Maybe Ed can tell a >> bit more, since he seems to have done the initial infrastructure setup. > > FreeBSD/ARM just switched from GCC to Clang, which is > why this just got noticed. U-Boot is used quite heavily for > FreeBSD/ARM (and MIPS and PowerPC as well, I believe). > > Here are the options I see for getting > cc -print-file-name=include > to work again: > > * Hack clang to handle -print-file-name=include specially. >I did this for GCC already, but I'm not thrilled about it. > > * Configure clang differently so that this option works. > > * Symlink /usr/include to appear somewhere that clang expects. > > * Rearrange our directory layout slightly to match clang's expectations. You seem to have left out the most obvious one: * Fixing U-Boot's configuration script(s) so they don't depend on undocumented compiler options. I don't understand why we would want to go through all this trouble, just for telling U-Boot where a bunch of headers are located? What happened to configure scripts with options, they did not disappear overnight, I hope? ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r249651 - in head/sys: conf dev/etherswitch/ukswitch
Author: adrian
Date: Fri Apr 19 17:50:38 2013
New Revision: 249651
URL: http://svnweb.freebsd.org/changeset/base/249651
Log:
Implement a very basic multi-PHY aware switch device.
This is intended to be used as a stop-gap for switch devices
which expose multiple ethernet PHYs but we don't have a driver
for - here, etherswitchcfg and the general switch configuration
API can be used to interface to said PHYs.
Submitted by: Luiz Otavio O Souza
Added:
head/sys/dev/etherswitch/ukswitch/
head/sys/dev/etherswitch/ukswitch/ukswitch.c (contents, props changed)
Modified:
head/sys/conf/files
Modified: head/sys/conf/files
==
--- head/sys/conf/files Fri Apr 19 15:19:29 2013(r249650)
+++ head/sys/conf/files Fri Apr 19 17:50:38 2013(r249651)
@@ -1284,6 +1284,7 @@ dev/etherswitch/mdio_if.m optional miip
dev/etherswitch/mdio.c optional miiproxy
dev/etherswitch/miiproxy.c optional miiproxy
dev/etherswitch/rtl8366/rtl8366rb.coptional rtl8366rb
+dev/etherswitch/ukswitch/ukswitch.coptional ukswitch
dev/ex/if_ex.c optional ex
dev/ex/if_ex_isa.c optional ex isa
dev/ex/if_ex_pccard.c optional ex pccard
Added: head/sys/dev/etherswitch/ukswitch/ukswitch.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/etherswitch/ukswitch/ukswitch.cFri Apr 19 17:50:38
2013(r249651)
@@ -0,0 +1,570 @@
+/*-
+ * Copyright (c) 2013 Luiz Otavio O Souza.
+ * Copyright (c) 2011-2012 Stefan Bethke.
+ * Copyright (c) 2012 Adrian Chadd.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include
+
+#include "mdio_if.h"
+#include "miibus_if.h"
+#include "etherswitch_if.h"
+
+MALLOC_DECLARE(M_UKSWITCH);
+MALLOC_DEFINE(M_UKSWITCH, "ukswitch", "ukswitch data structures");
+
+struct ukswitch_softc {
+ struct mtx sc_mtx; /* serialize access to softc */
+ device_tsc_dev;
+ int media; /* cpu port media */
+ int cpuport;/* which PHY is connected to the CPU */
+ int phymask;/* PHYs we manage */
+ int numports; /* number of ports */
+ int ifpport[MII_NPHY];
+ int *portphy;
+ char**ifname;
+ device_t**miibus;
+ struct ifnet**ifp;
+ struct callout callout_tick;
+ etherswitch_info_t info;
+};
+
+#define UKSWITCH_LOCK(_sc) \
+ mtx_lock(&(_sc)->sc_mtx)
+#define UKSWITCH_UNLOCK(_sc) \
+ mtx_unlock(&(_sc)->sc_mtx)
+#define UKSWITCH_LOCK_ASSERT(_sc, _what) \
+ mtx_assert(&(_sc)->sc_mtx, (_what))
+#define UKSWITCH_TRYLOCK(_sc) \
+ mtx_trylock(&(_sc)->sc_mtx)
+
+#if defined(DEBUG)
+#defineDPRINTF(dev, args...) device_printf(dev, args)
+#else
+#defineDPRINTF(dev, args...)
+#endif
+
+static inline int ukswitch_portforphy(struct ukswitch_softc *, int);
+static void ukswitch_tick(void *);
+static int ukswitch_ifmedia_upd(struct ifnet *);
+static void ukswitch_ifmedia_sts(struct ifnet *, struct ifmediareq *);
+
+static int
+ukswitch_probe(device_t dev)
+{
+ struct ukswitch_softc *sc;
+
+ sc = device
svn commit: r249656 - head/cddl/contrib/opensolaris/tools/ctf/cvt
Author: ed
Date: Fri Apr 19 19:38:39 2013
New Revision: 249656
URL: http://svnweb.freebsd.org/changeset/base/249656
Log:
Fix -Wmissing-variable-declarations compiler warnings.
References:
https://www.illumos.org/issues/3700
Modified:
head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
head/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c
head/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.c
head/cddl/contrib/opensolaris/tools/ctf/cvt/util.c
Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
==
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Fri Apr 19 19:28:48
2013(r249655)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Fri Apr 19 19:38:39
2013(r249656)
@@ -47,7 +47,7 @@
*
* The value is only valid during a call to ctf_load.
*/
-char *curfile;
+static char *curfile;
#defineCTF_BUF_CHUNK_SIZE (64 * 1024)
#defineRES_BUF_CHUNK_SIZE (64 * 1024)
Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c
==
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c Fri Apr 19
19:28:48 2013(r249655)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c Fri Apr 19
19:38:39 2013(r249656)
@@ -54,7 +54,7 @@ static int faketypenumber = 1;
static tdesc_t *hash_table[BUCKETS];
static tdesc_t *name_table[BUCKETS];
-list_t *typedbitfldmems;
+static list_t *typedbitfldmems;
static void reset(void);
static jmp_buf resetbuf;
Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.c
==
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.c Fri Apr 19
19:28:48 2013(r249655)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.c Fri Apr 19
19:38:39 2013(r249656)
@@ -37,8 +37,8 @@
#include "traverse.h"
#include "memory.h"
-int (*tddescenders[])(tdesc_t *, tdtrav_data_t *);
-tdtrav_cb_f tdnops[];
+static int (*tddescenders[])(tdesc_t *, tdtrav_data_t *);
+static tdtrav_cb_f tdnops[];
void
tdtrav_init(tdtrav_data_t *tdtd, int *vgenp, tdtrav_cb_f *firstops,
@@ -111,7 +111,7 @@ tdtrav_assert(tdesc_t *node __unused, td
return (-1);
}
-tdtrav_cb_f tdnops[] = {
+static tdtrav_cb_f tdnops[] = {
NULL,
NULL, /* intrinsic */
NULL, /* pointer */
@@ -128,7 +128,7 @@ tdtrav_cb_f tdnops[] = {
NULL/* restrict */
};
-int (*tddescenders[])(tdesc_t *, tdtrav_data_t *) = {
+static int (*tddescenders[])(tdesc_t *, tdtrav_data_t *) = {
NULL,
NULL, /* intrinsic */
tdtrav_plain, /* pointer */
Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/util.c
==
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/util.c Fri Apr 19 19:28:48
2013(r249655)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/util.c Fri Apr 19 19:38:39
2013(r249656)
@@ -249,8 +249,8 @@ tdesc_name(tdesc_t *tdp)
return (tdp->t_name == NULL ? "(anon)" : tdp->t_name);
}
-char *watch_address = NULL;
-intwatch_length = 0;
+static char*watch_address = NULL;
+static int watch_length = 0;
void
watch_set(void *addr, int len)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r249657 - in head: bin/expr lib/csu sbin/gbde sbin/geom/class sbin/hastctl sbin/hastd sbin/md5 share/mk usr.bin/ar usr.bin/bc usr.bin/bzip2recover usr.bin/find usr.bin/indent usr.bin/m4...
Author: ed
Date: Fri Apr 19 19:45:00 2013
New Revision: 249657
URL: http://svnweb.freebsd.org/changeset/base/249657
Log:
Add the Clang specific -Wmissing-variable-declarations to WARNS=6.
This compiler flag enforces that that people either mark variables
static or use an external declarations for the variable, similar to how
-Wmissing-prototypes works for functions.
Due to the fact that Yacc/Lex generate code that cannot trivially be
changed to not warn because of this (lots of yy* variables), add a
NO_WMISSING_VARIABLE_DECLARATIONS that can be used to turn off this
specific compiler warning.
Announced on: toolchain@
Modified:
head/bin/expr/Makefile
head/lib/csu/Makefile.inc
head/sbin/gbde/Makefile
head/sbin/geom/class/Makefile.inc
head/sbin/hastctl/Makefile
head/sbin/hastd/Makefile
head/sbin/md5/Makefile
head/share/mk/bsd.sys.mk
head/usr.bin/ar/Makefile
head/usr.bin/bc/Makefile
head/usr.bin/bzip2recover/Makefile
head/usr.bin/find/Makefile
head/usr.bin/indent/Makefile
head/usr.bin/m4/Makefile
head/usr.bin/mklocale/Makefile
head/usr.sbin/auditdistd/Makefile
head/usr.sbin/bluetooth/bthidd/Makefile
head/usr.sbin/bsnmpd/modules/Makefile.inc
head/usr.sbin/config/Makefile
head/usr.sbin/fifolog/lib/Makefile
head/usr.sbin/jail/Makefile
Modified: head/bin/expr/Makefile
==
--- head/bin/expr/Makefile Fri Apr 19 19:38:39 2013(r249656)
+++ head/bin/expr/Makefile Fri Apr 19 19:45:00 2013(r249657)
@@ -4,4 +4,6 @@ PROG= expr
SRCS= expr.y
YFLAGS=
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
.include
Modified: head/lib/csu/Makefile.inc
==
--- head/lib/csu/Makefile.inc Fri Apr 19 19:38:39 2013(r249656)
+++ head/lib/csu/Makefile.inc Fri Apr 19 19:45:00 2013(r249657)
@@ -4,4 +4,6 @@ SSP_CFLAGS=
SED_FIX_NOTE = -i "" -e '/\.note\.tag/s/progbits/note/'
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
.include "../Makefile.inc"
Modified: head/sbin/gbde/Makefile
==
--- head/sbin/gbde/Makefile Fri Apr 19 19:38:39 2013(r249656)
+++ head/sbin/gbde/Makefile Fri Apr 19 19:45:00 2013(r249657)
@@ -10,6 +10,7 @@ SRCS+=g_bde_lock.c
# rijndael-fst.c does evil casting things which can results in warnings,
# the test-vectors check out however, so it works right.
NO_WCAST_ALIGN=
+NO_WMISSING_VARIABLE_DECLARATIONS=
CFLAGS+= -I${.CURDIR}/../../sys
.PATH: ${.CURDIR}/../../sys/geom/bde \
Modified: head/sbin/geom/class/Makefile.inc
==
--- head/sbin/geom/class/Makefile.inc Fri Apr 19 19:38:39 2013
(r249656)
+++ head/sbin/geom/class/Makefile.inc Fri Apr 19 19:45:00 2013
(r249657)
@@ -6,6 +6,8 @@ LINKS= ${BINDIR}/geom ${BINDIR}/g${GEOM_
MAN= g${GEOM_CLASS}.8
SRCS+= geom_${GEOM_CLASS}.c subr.c
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
CFLAGS+= -I${.CURDIR}/../..
.include "../Makefile.inc"
Modified: head/sbin/hastctl/Makefile
==
--- head/sbin/hastctl/Makefile Fri Apr 19 19:38:39 2013(r249656)
+++ head/sbin/hastctl/Makefile Fri Apr 19 19:45:00 2013(r249657)
@@ -21,6 +21,7 @@ MAN= hastctl.8
NO_WFORMAT=
NO_WCAST_ALIGN=
+NO_WMISSING_VARIABLE_DECLARATIONS=
CFLAGS+=-I${.CURDIR}/../hastd
CFLAGS+=-DHAVE_CAPSICUM
CFLAGS+=-DINET
Modified: head/sbin/hastd/Makefile
==
--- head/sbin/hastd/MakefileFri Apr 19 19:38:39 2013(r249656)
+++ head/sbin/hastd/MakefileFri Apr 19 19:45:00 2013(r249657)
@@ -21,6 +21,7 @@ MAN= hastd.8 hast.conf.5
NO_WFORMAT=
NO_WCAST_ALIGN=
+NO_WMISSING_VARIABLE_DECLARATIONS=
CFLAGS+=-I${.CURDIR}
CFLAGS+=-DHAVE_CAPSICUM
CFLAGS+=-DPROTO_TCP_DEFAULT_PORT=8457
Modified: head/sbin/md5/Makefile
==
--- head/sbin/md5/Makefile Fri Apr 19 19:38:39 2013(r249656)
+++ head/sbin/md5/Makefile Fri Apr 19 19:45:00 2013(r249657)
@@ -13,6 +13,7 @@ MLINKS= md5.1 rmd160.1 \
md5.1 sha256.1 \
md5.1 sha512.1
+NO_WMISSING_VARIABLE_DECLARATIONS=
WFORMAT?= 1
DPADD= ${LIBMD}
Modified: head/share/mk/bsd.sys.mk
==
--- head/share/mk/bsd.sys.mkFri Apr 19 19:38:39 2013(r249656)
+++ head/share/mk/bsd.sys.mkFri Apr 19 19:45:00 2013(r249657)
@@ -54,6 +54,10 @@ CWARNFLAGS+= -Wcast-align
.if ${WARNS} >= 6
CWARNFLAGS+= -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls\
-Wold-style-definition
+.if ${COMPILER_TYPE} == "clang" && !define
Re: svn commit: r247960 - head/cddl/contrib/opensolaris/tools/ctf/cvt
On Thu, 2013-03-07 at 20:45:20 -0500, Eitan Adler wrote: > On 7 March 2013 18:00, Dimitry Andric wrote: > > On 2013-03-07 23:29, Andriy Gapon wrote: > > ... > > > >> I was not really kidding when I said that this change, as is, is a nop: > > > > ... > > > >>> + bname = strrchr(match.iim_name, '/'); > >>> + bname = bname == NULL ? match.iim_name : bname + > >>> 1; > >> > >> > >> It would probably make sense to make use of bname after going to through > >> all the > >> trouble of calculating it: > >> > >>> match.iim_file = match.iim_name; > >> > >> > >> Should be match.iim_file = bname ? > > > > > > Yes, I actually had this in my test code, and committed the wrong diff > > by accident. :( Fixed in r247962, in any case. > > > > > > > >> Surprised that clang hasn't warned you about this one :-) > > > > > > Clang currently does not have the -Wunused-but-set-variable warning; it > > is apparently available in the static analyzer. On the other hand, that > > warning is one of the most annoying ones that newer gcc's have. :-) > > I have found real bugs in FreeBSD's code base as a result of this > warning, but the vast majority were more annoying than useful. > That's why I've disabled them on http://scan.freebsd.your.org/freebsd-head/ :) Uli ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r249658 - in head: bin/chio sys/cam/scsi sys/sys
Author: ken
Date: Fri Apr 19 20:03:51 2013
New Revision: 249658
URL: http://svnweb.freebsd.org/changeset/base/249658
Log:
Update chio(1) and ch(4) to support reporting element designators.
This allows mapping a tape drive in a changer (as reported by
'chio status') to a sa(4) driver instance by comparing the
serial numbers.
The designators can be ASCII (which is printed out directly), binary
(which is printed in hex format) or UTF-8, which is printed in either
native UTF-8 format if the terminal can support it, or in %XX notation
for non-ASCII characters. Thanks to Hiroki Sato for the
explaining UTF-8 printing and example UTF-8 printing code.
chio.h: Modify the changer_element_status structure to add new
fields and definitions from the SMC3r16 spec.
Rename the original CHIOGSTATUS ioctl to OCHIOGTATUS and
define a new CHIOGSTATUS ioctl.
Clean up some tab/space issues.
chio.c: For the 'status' subcommand, print the designator field
if it is supplied by a device.
scsi_ch.h:Add new flags for DVCID and CURDATA to the READ
ELEMENT STATUS command structure.
Add a read_element_status_device_id structure
for the data fields in the new standard. Add new
unions, dt_or_obsolete and voltage_devid, to hold
and address data from either SCSI-2 or newer devices.
scsi_ch.c:Implement support for fetching device IDs with READ
ELEMENT STATUS data.
Add new arguments to scsi_read_element_status() to
allow the user to request the DVCID and CURDATA bits.
This isn't compiled into libcam (it's only an internal
kernel interface), so we don't need any special
handling for the API change.
If the user issues the new CHIOGSTATUS ioctl, copy all of
the available element status data out. If he issues the
OCHIOGSTATUS ioctl, we don't copy the new fields in the
structure.
Fix a bug in chopen() that would result in the peripheral
never getting unheld if chgetparams() failed.
Sponsored by: Spectra Logic
Submitted by: Po-Li Soong
MFC After:1 week
Modified:
head/bin/chio/chio.c
head/sys/cam/scsi/scsi_ch.c
head/sys/cam/scsi/scsi_ch.h
head/sys/sys/chio.h
Modified: head/bin/chio/chio.c
==
--- head/bin/chio/chio.cFri Apr 19 19:45:00 2013(r249657)
+++ head/bin/chio/chio.cFri Apr 19 20:03:51 2013(r249658)
@@ -54,6 +54,8 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
+#include
#include "defs.h"
#include "pathnames.h"
@@ -81,6 +83,7 @@ staticint do_status(const char *, int,
static int do_ielem(const char *, int, char **);
static int do_return(const char *, int, char **);
static int do_voltag(const char *, int, char **);
+static void print_designator(const char *, u_int8_t, u_int8_t);
#ifndef CHET_VT
#defineCHET_VT 10 /* Completely Arbitrary
*/
@@ -723,6 +726,10 @@ do_status(const char *cname, int argc, c
putchar('?');
putchar('>');
}
+ if (ces->ces_designator_length > 0)
+ print_designator(ces->ces_designator,
+ces->ces_code_set,
+ces->ces_designator_length);
putchar('\n');
}
@@ -1177,3 +1184,66 @@ usage(void)
"arg1 arg2 [arg3 [...]]\n", getprogname());
exit(1);
}
+
+#defineUTF8CODESET "UTF-8"
+
+static void
+print_designator(const char *designator, u_int8_t code_set,
+u_int8_t designator_length)
+{
+ printf(" serial number: <");
+ switch (code_set) {
+ case CES_CODE_SET_ASCII: {
+ /*
+* The driver insures that the string is always NUL terminated.
+*/
+ printf("%s", designator);
+ break;
+ }
+ case CES_CODE_SET_UTF_8: {
+ char *cs_native;
+
+ setlocale(LC_ALL, "");
+ cs_native = nl_langinfo(CODESET);
+
+ /* See if we can natively print UTF-8 */
+ if (strcmp(cs_native, UTF8CODESET) == 0)
+ cs_native = NULL;
+
+ if (cs_native == NULL) {
+ /* We can natively print UTF-8, so use printf. */
+ printf("%s", designator);
+ } else {
+ int i;
+
+ /*
+* We can't nati
svn commit: r249659 - head/sys/dev/netmap
Author: luigi
Date: Fri Apr 19 21:08:21 2013
New Revision: 249659
URL: http://svnweb.freebsd.org/changeset/base/249659
Log:
mostly whitespace changes:
- remove vestiges of the old memory allocator
- clean up some comments
Modified:
head/sys/dev/netmap/netmap.c
head/sys/dev/netmap/netmap_kern.h
head/sys/dev/netmap/netmap_mem2.c
Modified: head/sys/dev/netmap/netmap.c
==
--- head/sys/dev/netmap/netmap.cFri Apr 19 20:03:51 2013
(r249658)
+++ head/sys/dev/netmap/netmap.cFri Apr 19 21:08:21 2013
(r249659)
@@ -324,11 +324,7 @@ netmap_update_config(struct netmap_adapt
}
/*- memory allocator -*/
-#ifdef NETMAP_MEM2
#include "netmap_mem2.c"
-#else /* !NETMAP_MEM2 */
-#include "netmap_mem1.c"
-#endif /* !NETMAP_MEM2 */
/* end of memory allocator --*/
@@ -498,16 +494,16 @@ netmap_dtor(void *data)
{
struct netmap_priv_d *priv = data;
struct ifnet *ifp = priv->np_ifp;
- struct netmap_adapter *na;
NMA_LOCK();
if (ifp) {
- na = NA(ifp);
+ struct netmap_adapter *na = NA(ifp);
+
na->nm_lock(ifp, NETMAP_REG_LOCK, 0);
netmap_dtor_locked(data);
na->nm_lock(ifp, NETMAP_REG_UNLOCK, 0);
- nm_if_rele(ifp);
+ nm_if_rele(ifp); /* might also destroy *na */
}
if (priv->ref_done) {
netmap_memory_deref();
Modified: head/sys/dev/netmap/netmap_kern.h
==
--- head/sys/dev/netmap/netmap_kern.h Fri Apr 19 20:03:51 2013
(r249658)
+++ head/sys/dev/netmap/netmap_kern.h Fri Apr 19 21:08:21 2013
(r249659)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2012 Matteo Landi, Luigi Rizzo. All rights reserved.
+ * Copyright (C) 2011-2013 Matteo Landi, Luigi Rizzo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -34,8 +34,6 @@
#ifndef _NET_NETMAP_KERN_H_
#define _NET_NETMAP_KERN_H_
-#define NETMAP_MEM2// use the new memory allocator
-
#if defined(__FreeBSD__)
#define likely(x) __builtin_expect(!!(x), 1)
#define unlikely(x)__builtin_expect(!!(x), 0)
@@ -45,7 +43,7 @@
#defineMBUF_LEN(m) ((m)->m_pkthdr.len)
#defineNM_SEND_UP(ifp, m) ((ifp)->if_input)(ifp, m)
#elif defined (linux)
-#defineNM_LOCK_T spinlock_t
+#defineNM_LOCK_T safe_spinlock_t // see bsd_glue.h
#defineNM_SELINFO_Twait_queue_head_t
#defineMBUF_LEN(m) ((m)->len)
#defineNM_SEND_UP(ifp, m) netif_rx(m)
@@ -431,7 +429,6 @@ netmap_idx_k2n(struct netmap_kring *kr,
}
-#ifdef NETMAP_MEM2
/* Entries of the look-up table. */
struct lut_entry {
void *vaddr;/* virtual address. */
@@ -442,9 +439,6 @@ struct netmap_obj_pool;
extern struct lut_entry *netmap_buffer_lut;
#define NMB_VA(i) (netmap_buffer_lut[i].vaddr)
#define NMB_PA(i) (netmap_buffer_lut[i].paddr)
-#else /* NETMAP_MEM1 */
-#define NMB_VA(i) (netmap_buffer_base + (i * NETMAP_BUF_SIZE) )
-#endif /* NETMAP_MEM2 */
/*
* NMB return the virtual address of a buffer (buffer 0 on bad index)
@@ -462,11 +456,8 @@ PNMB(struct netmap_slot *slot, uint64_t
{
uint32_t i = slot->buf_idx;
void *ret = (i >= netmap_total_buffers) ? NMB_VA(0) : NMB_VA(i);
-#ifdef NETMAP_MEM2
+
*pp = (i >= netmap_total_buffers) ? NMB_PA(0) : NMB_PA(i);
-#else
- *pp = vtophys(ret);
-#endif
return ret;
}
@@ -474,5 +465,6 @@ PNMB(struct netmap_slot *slot, uint64_t
int netmap_rx_irq(struct ifnet *, int, int *);
#define netmap_tx_irq(_n, _q) netmap_rx_irq(_n, _q, NULL)
+
extern int netmap_copy;
#endif /* _NET_NETMAP_KERN_H_ */
Modified: head/sys/dev/netmap/netmap_mem2.c
==
--- head/sys/dev/netmap/netmap_mem2.c Fri Apr 19 20:03:51 2013
(r249658)
+++ head/sys/dev/netmap/netmap_mem2.c Fri Apr 19 21:08:21 2013
(r249659)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Matteo Landi, Luigi Rizzo, Giuseppe Lettieri. All rights
reserved.
+ * Copyright (C) 2012-2013 Matteo Landi, Luigi Rizzo, Giuseppe Lettieri. All
rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -31,16 +31,18 @@
*/
/*
- * This allocator creates three memory regions:
+ * This allocator creates three memory pools:
* nm_if_pool for the struct netmap_if
* nm_ring_poolfor the struct netmap_ring
* nm_buf_pool for the packet buffers.
*
- * All regions need to be multiple of a page size as we export them to
- * userspa
svn commit: r249662 - head/sys/dev/ath
Author: adrian Date: Fri Apr 19 21:49:11 2013 New Revision: 249662 URL: http://svnweb.freebsd.org/changeset/base/249662 Log: Initialise the chainmask fields regardless of whether 11n support is compiled in or not. This fixes issues with people running -HEAD but who build modules without doing a "make buildkernel KERNCONF=XXX", thus picking up opt_*.h. The resulting module wouldn't have 11n enabled and the chainmask configuration would just be plain wrong. Modified: head/sys/dev/ath/if_ath.c Modified: head/sys/dev/ath/if_ath.c == --- head/sys/dev/ath/if_ath.c Fri Apr 19 21:09:27 2013(r249661) +++ head/sys/dev/ath/if_ath.c Fri Apr 19 21:49:11 2013(r249662) @@ -721,6 +721,14 @@ ath_attach(u_int16_t devid, struct ath_s } /* +* Query the TX/RX chainmask configuration. +* +* This is only relevant for 11n devices. +*/ + ath_hal_getrxchainmask(ah, &sc->sc_rxchainmask); + ath_hal_gettxchainmask(ah, &sc->sc_txchainmask); + + /* * Disable MRR with protected frames by default. * Only 802.11n series NICs can handle this. */ @@ -777,14 +785,6 @@ ath_attach(u_int16_t devid, struct ath_s */ (void) ath_hal_getcapability(ah, HAL_CAP_STREAMS, 0, &txs); (void) ath_hal_getcapability(ah, HAL_CAP_STREAMS, 1, &rxs); - - ath_hal_getrxchainmask(ah, &sc->sc_rxchainmask); - ath_hal_gettxchainmask(ah, &sc->sc_txchainmask); - - device_printf(sc->sc_dev, "Chainmasks: TX=0x%x; RX=0x%x\n", - sc->sc_txchainmask, - sc->sc_rxchainmask); - ic->ic_txstream = txs; ic->ic_rxstream = rxs; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r249663 - in head: sys/conf sys/contrib/dev/acpica sys/contrib/dev/acpica/compiler sys/contrib/dev/acpica/components/debugger sys/contrib/dev/acpica/components/events sys/contrib/dev/ac...
Author: jkim Date: Fri Apr 19 23:49:34 2013 New Revision: 249663 URL: http://svnweb.freebsd.org/changeset/base/249663 Log: Merge ACPICA 20130418. Added: head/sys/contrib/dev/acpica/components/namespace/nsarguments.c - copied, changed from r249661, vendor-sys/acpica/dist/source/components/namespace/nsarguments.c Modified: head/sys/conf/files head/sys/contrib/dev/acpica/changes.txt (contents, props changed) head/sys/contrib/dev/acpica/compiler/aslpredef.c head/sys/contrib/dev/acpica/compiler/aslprepkg.c head/sys/contrib/dev/acpica/components/debugger/dbdisply.c head/sys/contrib/dev/acpica/components/debugger/dbexec.c head/sys/contrib/dev/acpica/components/debugger/dbmethod.c head/sys/contrib/dev/acpica/components/debugger/dbnames.c head/sys/contrib/dev/acpica/components/events/evgpe.c head/sys/contrib/dev/acpica/components/events/evregion.c head/sys/contrib/dev/acpica/components/executer/exconfig.c head/sys/contrib/dev/acpica/components/executer/exfldio.c head/sys/contrib/dev/acpica/components/hardware/hwxface.c head/sys/contrib/dev/acpica/components/namespace/nseval.c head/sys/contrib/dev/acpica/components/namespace/nsinit.c head/sys/contrib/dev/acpica/components/namespace/nspredef.c head/sys/contrib/dev/acpica/components/namespace/nsprepkg.c head/sys/contrib/dev/acpica/components/namespace/nsrepair.c head/sys/contrib/dev/acpica/components/namespace/nsrepair2.c head/sys/contrib/dev/acpica/components/namespace/nsxfeval.c head/sys/contrib/dev/acpica/components/parser/psxface.c head/sys/contrib/dev/acpica/components/resources/rsutils.c head/sys/contrib/dev/acpica/components/utilities/uteval.c head/sys/contrib/dev/acpica/components/utilities/utosi.c head/sys/contrib/dev/acpica/components/utilities/utpredef.c head/sys/contrib/dev/acpica/components/utilities/utxferror.c head/sys/contrib/dev/acpica/include/acconfig.h head/sys/contrib/dev/acpica/include/aclocal.h head/sys/contrib/dev/acpica/include/acmacros.h head/sys/contrib/dev/acpica/include/acnamesp.h head/sys/contrib/dev/acpica/include/acoutput.h head/sys/contrib/dev/acpica/include/acpixf.h head/sys/contrib/dev/acpica/include/acpredef.h head/sys/contrib/dev/acpica/include/acstruct.h head/sys/contrib/dev/acpica/include/acutils.h head/sys/modules/acpi/acpi/Makefile head/usr.sbin/acpi/acpidb/Makefile Directory Properties: head/sys/contrib/dev/acpica/ (props changed) head/sys/contrib/dev/acpica/compiler/ (props changed) head/sys/contrib/dev/acpica/components/debugger/ (props changed) head/sys/contrib/dev/acpica/components/events/ (props changed) head/sys/contrib/dev/acpica/components/executer/ (props changed) head/sys/contrib/dev/acpica/components/hardware/ (props changed) head/sys/contrib/dev/acpica/components/namespace/ (props changed) head/sys/contrib/dev/acpica/components/parser/ (props changed) head/sys/contrib/dev/acpica/components/resources/ (props changed) head/sys/contrib/dev/acpica/components/utilities/ (props changed) head/sys/contrib/dev/acpica/include/ (props changed) head/sys/contrib/dev/acpica/os_specific/ (props changed) Modified: head/sys/conf/files == --- head/sys/conf/files Fri Apr 19 21:49:11 2013(r249662) +++ head/sys/conf/files Fri Apr 19 23:49:34 2013(r249663) @@ -374,6 +374,7 @@ contrib/dev/acpica/components/hardware/h contrib/dev/acpica/components/hardware/hwxfsleep.c optional acpi contrib/dev/acpica/components/namespace/nsaccess.c optional acpi contrib/dev/acpica/components/namespace/nsalloc.c optional acpi +contrib/dev/acpica/components/namespace/nsarguments.c optional acpi contrib/dev/acpica/components/namespace/nsconvert.coptional acpi contrib/dev/acpica/components/namespace/nsdump.c optional acpi contrib/dev/acpica/components/namespace/nseval.c optional acpi Modified: head/sys/contrib/dev/acpica/changes.txt == --- head/sys/contrib/dev/acpica/changes.txt Fri Apr 19 21:49:11 2013 (r249662) +++ head/sys/contrib/dev/acpica/changes.txt Fri Apr 19 23:49:34 2013 (r249663) @@ -1,4 +1,91 @@ +18 April 2013. Summary of changes for version 20130418: + +This release is available at https://acpica.org/downloads + + +1) ACPICA kernel-resident subsystem: + +Fixed a possible buffer overrun during some rare but specific field unit +read operations. This overrun can only happen if the DSDT version is 1 -- +meaning that all AML integers are 32 bits -- and the field length is +between 33 and 55 bits long. During the read, an internal buffer object is +created for the field unit because the field is larger than an integer (32 +bits). However, in this case, the buffer will be incorrectly written +beyond the end because the buffer length is less than t
svn commit: r249664 - in head/sys: cam conf
Author: sbruno Date: Sat Apr 20 00:33:37 2013 New Revision: 249664 URL: http://svnweb.freebsd.org/changeset/base/249664 Log: Expose CAM_BOOT_DELAY as a kernel conf item now. This allows users who boot without loader to adjust their environments around slightly buggy or slow hardware. PR: kern/161809 Submitted by: rozhuk...@gmail.com MFC after:2 weeks Modified: head/sys/cam/cam_xpt.c head/sys/conf/options Modified: head/sys/cam/cam_xpt.c == --- head/sys/cam/cam_xpt.c Fri Apr 19 23:49:34 2013(r249663) +++ head/sys/cam/cam_xpt.c Sat Apr 20 00:33:37 2013(r249664) @@ -878,6 +878,13 @@ xpt_init(void *dummy) mtx_init(&xsoftc.xpt_lock, "XPT lock", NULL, MTX_DEF); mtx_init(&xsoftc.xpt_topo_lock, "XPT topology lock", NULL, MTX_DEF); +#ifdef CAM_BOOT_DELAY + /* +* Override this value at compile time to assist our users +* who don't use loader to boot a kernel. +*/ + xsoftc.boot_delay = CAM_BOOT_DELAY; +#endif /* * The xpt layer is, itself, the equivelent of a SIM. * Allow 16 ccbs in the ccb pool for it. This should Modified: head/sys/conf/options == --- head/sys/conf/options Fri Apr 19 23:49:34 2013(r249663) +++ head/sys/conf/options Sat Apr 20 00:33:37 2013(r249664) @@ -307,6 +307,7 @@ CAM_DEBUG_BUS opt_cam.h CAM_DEBUG_TARGET opt_cam.h CAM_DEBUG_LUN opt_cam.h CAM_DEBUG_FLAGSopt_cam.h +CAM_BOOT_DELAY opt_cam.h SCSI_DELAY opt_scsi.h SCSI_NO_SENSE_STRINGS opt_scsi.h SCSI_NO_OP_STRINGS opt_scsi.h ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r249665 - head
Author: imp Date: Sat Apr 20 01:12:23 2013 New Revision: 249665 URL: http://svnweb.freebsd.org/changeset/base/249665 Log: Add note about fagility of the clang upgrade process. Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Sat Apr 20 00:33:37 2013(r249664) +++ head/UPDATING Sat Apr 20 01:12:23 2013(r249665) @@ -11,6 +11,11 @@ handbook: Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +NOTE: FreeBSD has switched from gcc to clang. If you have trouble bootstrapping +from older versions of FreeBSD, try WITHOUT_CLANG and WITHOUT_CLANG_IS_CC to +bootstrap to tip of head, and then rebuild without those options. The bootstrap +process from older version of current is a bit fragile. + NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW: FreeBSD 10.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
