svn commit: r265907 - head/usr.bin/units
Author: eadler Date: Mon May 12 07:14:09 2014 New Revision: 265907 URL: http://svnweb.freebsd.org/changeset/base/265907 Log: units(1): call el_end() Add missing el_end() call Modified: head/usr.bin/units/units.c Modified: head/usr.bin/units/units.c == --- head/usr.bin/units/units.c Mon May 12 07:06:03 2014(r265906) +++ head/usr.bin/units/units.c Mon May 12 07:14:09 2014(r265907) @@ -810,5 +810,6 @@ main(int argc, char **argv) } history_end(inhistory); + el_end(el); return(0); } ___ 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: r265908 - in head/sys: dev/usb/controller modules/usb/saf1761
Author: hselasky
Date: Mon May 12 09:05:07 2014
New Revision: 265908
URL: http://svnweb.freebsd.org/changeset/base/265908
Log:
Create driver file templates, kernel module Makefile and add initial
version of register definitions for ISP1761 and SAF1761 compatible
chips.
Sponsored by: DARPA, AFRL
Added:
head/sys/dev/usb/controller/saf1761_dci.c (contents, props changed)
head/sys/dev/usb/controller/saf1761_dci.h (contents, props changed)
head/sys/dev/usb/controller/saf1761_dci_fdt.c (contents, props changed)
head/sys/dev/usb/controller/saf1761_dci_reg.h (contents, props changed)
head/sys/modules/usb/saf1761/
head/sys/modules/usb/saf1761/Makefile (contents, props changed)
Added: head/sys/dev/usb/controller/saf1761_dci.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/usb/controller/saf1761_dci.c Mon May 12 09:05:07 2014
(r265908)
@@ -0,0 +1,33 @@
+/* $FreeBSD$ */
+/*-
+ * Copyright (c) 2014 Hans Petter Selasky
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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.
+ */
+
+#include
+#include
Added: head/sys/dev/usb/controller/saf1761_dci.h
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/usb/controller/saf1761_dci.h Mon May 12 09:05:07 2014
(r265908)
@@ -0,0 +1,36 @@
+/* $FreeBSD$ */
+/*-
+ * Copyright (c) 2014 Hans Petter Selasky
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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.
+ */
+
+#ifndef _SAF1761_DCI_H_
+#define_SAF1761_DCI_H_
+
+
+#endif /* _SAF1761_DCI_H_ */
Added: head/sys/dev/usb/controller/saf1761_dci_fdt.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/usb/controller/saf1761_dci_fdt.c Mon May 12 09:05:07
2
svn commit: r265909 - head/sys/netinet
Author: tuexen
Date: Mon May 12 09:46:48 2014
New Revision: 265909
URL: http://svnweb.freebsd.org/changeset/base/265909
Log:
Disable TX checksum offload for UDP-Lite completely. It wasn't used for
partial checksum coverage, but even for full checksum coverage it doesn't
work.
This was discussed with Kevin Lo (kevlo@).
Modified:
head/sys/netinet/udp_usrreq.c
Modified: head/sys/netinet/udp_usrreq.c
==
--- head/sys/netinet/udp_usrreq.c Mon May 12 09:05:07 2014
(r265908)
+++ head/sys/netinet/udp_usrreq.c Mon May 12 09:46:48 2014
(r265909)
@@ -1370,13 +1370,17 @@ udp_output(struct inpcb *inp, struct mbu
* Set up checksum and output datagram.
*/
ui->ui_sum = 0;
- if (cscov_partial) {
+ if (pr == IPPROTO_UDPLITE) {
if (inp->inp_flags & INP_ONESBCAST)
faddr.s_addr = INADDR_BROADCAST;
- if ((ui->ui_sum = in_cksum(m, sizeof(struct ip) + cscov)) == 0)
- ui->ui_sum = 0x;
- } else if (V_udp_cksum || pr == IPPROTO_UDPLITE) {
- /* for UDP-Lite full checksum coverage is requested */
+ if (cscov_partial) {
+ if ((ui->ui_sum = in_cksum(m, sizeof(struct ip) +
cscov)) == 0)
+ ui->ui_sum = 0x;
+ } else {
+ if ((ui->ui_sum = in_cksum(m, sizeof(struct udpiphdr) +
len)) == 0)
+ ui->ui_sum = 0x;
+ }
+ } else if (V_udp_cksum) {
if (inp->inp_flags & INP_ONESBCAST)
faddr.s_addr = INADDR_BROADCAST;
ui->ui_sum = in_pseudo(ui->ui_src.s_addr, faddr.s_addr,
___
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: r265913 - head/sys/arm/arm
Author: ian
Date: Mon May 12 13:05:03 2014
New Revision: 265913
URL: http://svnweb.freebsd.org/changeset/base/265913
Log:
Interrupts need to be disabled on entry to cpu_sleep() for ARM. Given
that and the need to be in a critical section when switching to idleclock
mode for event timers, use spinlock_enter()/exit() to achieve both needs.
The ARM WFI (wait for interrupt) instruction blocks until an interrupt is
asserted, and it will unblock even if interrupts are masked, and it will
unblock immediately if an interrupt is already pending. It is necessary
to execute it with interrupts disabled, otherwise the interrupt that
should unblock it may occur and be serviced just prior to executing the
instruction. At that point the system is inappropriately asleep until
the next timer tick or some other random interrupt happens.
In general, interrupts need to be disabled continuously from the time the
decision is made that there is no work to be done and sleeping is needed
until actually going to sleep, to avoid a race where handling a new
interrupt changes the basis for deciding there is no work to be done.
Submitted by: hps@ (in slightly different form)
Modified:
head/sys/arm/arm/machdep.c
Modified: head/sys/arm/arm/machdep.c
==
--- head/sys/arm/arm/machdep.c Mon May 12 12:04:44 2014(r265912)
+++ head/sys/arm/arm/machdep.c Mon May 12 13:05:03 2014(r265913)
@@ -426,9 +426,9 @@ cpu_idle(int busy)
CTR2(KTR_SPARE2, "cpu_idle(%d) at %d",
busy, curcpu);
+ spinlock_enter();
#ifndef NO_EVENTTIMERS
if (!busy) {
- critical_enter();
cpu_idleclock();
}
#endif
@@ -437,9 +437,9 @@ cpu_idle(int busy)
#ifndef NO_EVENTTIMERS
if (!busy) {
cpu_activeclock();
- critical_exit();
}
#endif
+ spinlock_exit();
CTR2(KTR_SPARE2, "cpu_idle(%d) at %d done",
busy, curcpu);
}
___
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: r265914 - head/sys/arm/arm
Author: ian
Date: Mon May 12 13:08:37 2014
New Revision: 265914
URL: http://svnweb.freebsd.org/changeset/base/265914
Log:
Cleanup some style nits.
Modified:
head/sys/arm/arm/machdep.c
Modified: head/sys/arm/arm/machdep.c
==
--- head/sys/arm/arm/machdep.c Mon May 12 13:05:03 2014(r265913)
+++ head/sys/arm/arm/machdep.c Mon May 12 13:08:37 2014(r265914)
@@ -424,24 +424,20 @@ void
cpu_idle(int busy)
{
- CTR2(KTR_SPARE2, "cpu_idle(%d) at %d",
- busy, curcpu);
+ CTR2(KTR_SPARE2, "cpu_idle(%d) at %d", busy, curcpu);
spinlock_enter();
#ifndef NO_EVENTTIMERS
- if (!busy) {
+ if (!busy)
cpu_idleclock();
- }
#endif
if (!sched_runnable())
cpu_sleep(0);
#ifndef NO_EVENTTIMERS
- if (!busy) {
+ if (!busy)
cpu_activeclock();
- }
#endif
spinlock_exit();
- CTR2(KTR_SPARE2, "cpu_idle(%d) at %d done",
- busy, curcpu);
+ CTR2(KTR_SPARE2, "cpu_idle(%d) at %d done", busy, curcpu);
}
int
___
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: r265914 - head/sys/arm/arm
On 05/12/14 15:08, Ian Lepore wrote:
Author: ian
Date: Mon May 12 13:08:37 2014
New Revision: 265914
URL: http://svnweb.freebsd.org/changeset/base/265914
Log:
Cleanup some style nits.
Modified:
head/sys/arm/arm/machdep.c
Modified: head/sys/arm/arm/machdep.c
==
--- head/sys/arm/arm/machdep.c Mon May 12 13:05:03 2014(r265913)
+++ head/sys/arm/arm/machdep.c Mon May 12 13:08:37 2014(r265914)
@@ -424,24 +424,20 @@ void
cpu_idle(int busy)
{
- CTR2(KTR_SPARE2, "cpu_idle(%d) at %d",
- busy, curcpu);
+ CTR2(KTR_SPARE2, "cpu_idle(%d) at %d", busy, curcpu);
spinlock_enter();
#ifndef NO_EVENTTIMERS
- if (!busy) {
+ if (!busy)
cpu_idleclock();
- }
#endif
if (!sched_runnable())
cpu_sleep(0);
#ifndef NO_EVENTTIMERS
- if (!busy) {
+ if (!busy)
cpu_activeclock();
- }
#endif
spinlock_exit();
- CTR2(KTR_SPARE2, "cpu_idle(%d) at %d done",
- busy, curcpu);
+ CTR2(KTR_SPARE2, "cpu_idle(%d) at %d done", busy, curcpu);
}
int
Thanks!
Don't forget to MFC, if any.
--HPS
___
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: r265915 - head/sys/modules
Author: ian Date: Mon May 12 13:33:12 2014 New Revision: 265915 URL: http://svnweb.freebsd.org/changeset/base/265915 Log: Build modules in parallel. This has been tested by several people at various -j levels from 6 to 48 without problems. Modified: head/sys/modules/Makefile Modified: head/sys/modules/Makefile == --- head/sys/modules/Makefile Mon May 12 13:08:37 2014(r265914) +++ head/sys/modules/Makefile Mon May 12 13:33:12 2014(r265915) @@ -2,6 +2,8 @@ .include +SUBDIR_PARALLEL= + # Modules that include binary-only blobs of microcode should be selectable by # MK_SOURCELESS_UCODE option (see below). ___ 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: r265923 - head/sys/kern
Author: truckman Date: Mon May 12 17:56:52 2014 New Revision: 265923 URL: http://svnweb.freebsd.org/changeset/base/265923 Log: Nuke a couple of unnecessary assigments. Nothing uses the values of rstart and rend after this point. MFC after:1 week Modified: head/sys/kern/subr_rman.c Modified: head/sys/kern/subr_rman.c == --- head/sys/kern/subr_rman.c Mon May 12 17:55:24 2014(r265922) +++ head/sys/kern/subr_rman.c Mon May 12 17:56:52 2014(r265923) @@ -607,8 +607,6 @@ rman_reserve_resource_bound(struct rman break; if ((s->r_flags & flags) != flags) continue; - rstart = ulmax(s->r_start, start); - rend = ulmin(s->r_end, ulmax(start + count - 1, end)); if (s->r_start >= start && s->r_end <= end && (s->r_end - s->r_start + 1) == count && (s->r_start & amask) == 0 && ___ 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: r265924 - head/release/doc/en_US.ISO8859-1/readme
Author: skreuzer (doc,ports committer) Date: Mon May 12 17:58:17 2014 New Revision: 265924 URL: http://svnweb.freebsd.org/changeset/base/265924 Log: Bump copyright date Approved by: hrs@ (mentor) Modified: head/release/doc/en_US.ISO8859-1/readme/article.xml Modified: head/release/doc/en_US.ISO8859-1/readme/article.xml == --- head/release/doc/en_US.ISO8859-1/readme/article.xml Mon May 12 17:56:52 2014(r265923) +++ head/release/doc/en_US.ISO8859-1/readme/article.xml Mon May 12 17:58:17 2014(r265924) @@ -35,6 +35,7 @@ 2011 2012 2013 + 2014 mailto:d...@freebsd.org";>The &os; Documentation Project ___ 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: r265925 - in head: . contrib/llvm/include/llvm/IR contrib/llvm/include/llvm/MC contrib/llvm/lib/Analysis contrib/llvm/lib/CodeGen/AsmPrinter contrib/llvm/lib/CodeGen/SelectionDAG contri...
/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
head/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp
head/etc/mtree/BSD.include.dist
head/lib/clang/include/Makefile
head/lib/clang/include/clang/Basic/Version.inc
head/lib/clang/include/llvm/Config/config.h
head/lib/clang/include/llvm/Config/llvm-config.h
head/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
head/contrib/llvm/ (props changed)
head/contrib/llvm/tools/clang/ (props changed)
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Mon May 12 17:58:17 2014(r265924)
+++ head/ObsoleteFiles.inc Mon May 12 18:45:56 2014(r265925)
@@ -38,6 +38,43 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20140512: new clang import which bumps version from 3.4 to 3.4.1.
+OLD_FILES+=usr/include/clang/3.4/__wmmintrin_aes.h
+OLD_FILES+=usr/include/clang/3.4/__wmmintrin_pclmul.h
+OLD_FILES+=usr/include/clang/3.4/altivec.h
+OLD_FILES+=usr/include/clang/3.4/ammintrin.h
+OLD_FILES+=usr/include/clang/3.4/avx2intrin.h
+OLD_FILES+=usr/include/clang/3.4/avxintrin.h
+OLD_FILES+=usr/include/clang/3.4/bmi2intrin.h
+OLD_FILES+=usr/include/clang/3.4/bmiintrin.h
+OLD_FILES+=usr/include/clang/3.4/cpuid.h
+OLD_FILES+=usr/include/clang/3.4/emmintrin.h
+OLD_FILES+=usr/include/clang/3.4/f16cintrin.h
+OLD_FILES+=usr/include/clang/3.4/fma4intrin.h
+OLD_FILES+=usr/include/clang/3.4/fmaintrin.h
+OLD_FILES+=usr/include/clang/3.4/immintrin.h
+OLD_FILES+=usr/include/clang/3.4/lzcntintrin.h
+OLD_FILES+=usr/include/clang/3.4/mm3dnow.h
+OLD_FILES+=usr/include/clang/3.4/mm_malloc.h
+OLD_FILES+=usr/include/clang/3.4/mmintrin.h
+OLD_FILES+=usr/include/clang/3.4/module.map
+OLD_FILES+=usr/include/clang/3.4/nmmintrin.h
+OLD_FILES+=usr/include/clang/3.4/pmmintrin.h
+OLD_FILES+=usr/include/clang/3.4/popcntintrin.h
+OLD_FILES+=usr/include/clang/3.4/prfchwintrin.h
+OLD_FILES+=usr/include/clang/3.4/rdseedintrin.h
+OLD_FILES+=usr/include/clang/3.4/rtmintrin.h
+OLD_FILES+=usr/include/clang/3.4/shaintrin.h
+OLD_FILES+=usr/include/clang/3.4/smmintrin.h
+OLD_FILES+=usr/include/clang/3.4/tbmintrin.h
+OLD_FILES+=usr/include/clang/3.4/tmmintrin.h
+OLD_FILES+=usr/include/clang/3.4/wmmintrin.h
+OLD_FILES+=usr/include/clang/3.4/x86intrin.h
+OLD_FILES+=usr/include/clang/3.4/xmmintrin.h
+OLD_FILES+=usr/include/clang/3.4/xopintrin.h
+OLD_FILES+=usr/include/clang/3.4/arm_neon.h
+OLD_FILES+=usr/include/clang/3.4/module.map
+OLD_DIRS+=usr/include/clang/3.4
# 20140505: Bogusly installing src.opts.mk
OLD_FILES+=usr/share/mk/src.opts.mk
# 20140505: Reject PR kern/187551
Modified: head/UPDATING
==
--- head/UPDATING Mon May 12 17:58:17 2014(r265924)
+++ head/UPDATING Mon May 12 18:45:56 2014(r265925)
@@ -31,6 +31,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20140512:
+ Clang and llvm have been upgraded to 3.4.1 release.
+
20140508:
We bogusly installed src.opts.mk in /usr/share/mk. This file should
be removed to avoid issues in the future (and has been added to
Modified: head/contrib/llvm/include/llvm/IR/IntrinsicsX86.td
==
--- head/contrib/llvm/include/llvm/IR/IntrinsicsX86.td Mon May 12 17:58:17
2014(r265924)
+++ head/contrib/llvm/include/llvm/IR/IntrinsicsX86.td Mon May 12 18:45:56
2014(r265925)
@@ -1758,68 +1758,68 @@ let TargetPrefix = "x86" in { // All in
def int_x86_avx2_gather_d_pd : GCCBuiltin<"__builtin_ia32_gatherd_pd">,
Intrinsic<[llvm_v2f64_ty],
[llvm_v2f64_ty, llvm_ptr_ty, llvm_v4i32_ty, llvm_v2f64_ty, llvm_i8_ty],
-[IntrReadMem]>;
+[IntrReadArgMem]>;
def int_x86_avx2_gather_d_pd_256 :
GCCBuiltin<"__builtin_ia32_gatherd_pd256">,
Intrinsic<[llvm_v4f64_ty],
[llvm_v4f64_ty, llvm_ptr_ty, llvm_v4i32_ty, llvm_v4f64_ty, llvm_i8_ty],
-[IntrReadMem]>;
+[IntrReadArgMem]>;
def int_x86_avx2_gather_q_pd : GCCBuiltin<"__builtin_ia32_gatherq_pd">,
Intrinsic<[llvm_v2f64_ty],
[llvm_v2f64_ty, llvm_ptr_ty, llvm_v2i64_ty, llvm_v2f64_ty, llvm_i8_ty],
-[IntrReadMem]>;
+[IntrReadArgMem]>;
def int_x86_avx2_gather_q_pd_256 :
GCCBuiltin<"__builtin_ia32_gatherq_pd256">,
Intrinsic<[llvm_v4f64_ty],
[llvm_v4f64_ty, llvm_ptr_ty, llvm_v4i64_ty, llvm_v4f64_ty, llvm_i8_ty],
-[IntrReadMem]>;
+[IntrReadArgMem]>;
def int_x86_avx2_gather_d_ps : GCCBuiltin<"__b
svn commit: r265926 - head/tools/tools/nanobsd
Author: thomas
Date: Mon May 12 19:11:39 2014
New Revision: 265926
URL: http://svnweb.freebsd.org/changeset/base/265926
Log:
(NANO_CONFIG): New variable containing path of config file, so that
the configuration can reference additional files relative to its own
location.
(NANO_MODULES): If set to "default", install all built modules.
Reviewed by: imp
MFC after:1 week
Modified:
head/tools/tools/nanobsd/nanobsd.sh
Modified: head/tools/tools/nanobsd/nanobsd.sh
==
--- head/tools/tools/nanobsd/nanobsd.sh Mon May 12 18:45:56 2014
(r265925)
+++ head/tools/tools/nanobsd/nanobsd.sh Mon May 12 19:11:39 2014
(r265926)
@@ -79,7 +79,8 @@ CONF_WORLD=' '
# Kernel config file to use
NANO_KERNEL=GENERIC
-# Kernel modules to build; default is none
+# Kernel modules to install. If empty, no modules are installed.
+# Use "default" to install all built modules.
NANO_MODULES=
# Customize commands.
@@ -321,13 +322,19 @@ install_kernel ( ) (
kernconf=${NANO_KERNEL}
fi
+ # Install all built modules if NANO_MODULES=default,
+ # else install only listed modules (none if NANO_MODULES is empty).
+ if [ "${NANO_MODULES}" != "default" ]; then
+ modules_override_arg="MODULES_OVERRIDE='${NANO_MODULES}'"
+ fi
+
cd ${NANO_SRC}
eval "TARGET_ARCH=${NANO_ARCH} ${NANO_MAKE} installkernel \
DESTDIR='${NANO_WORLDDIR}' \
SRCCONF='${SRCCONF}' \
__MAKE_CONF='${NANO_MAKE_CONF_INSTALL}' \
${kernconfdir_arg} KERNCONF=${kernconf} \
- MODULES_OVERRIDE='${NANO_MODULES}'"
+ ${modules_override_arg}"
) > ${NANO_OBJ}/_.ik 2>&1
)
@@ -925,6 +932,10 @@ do
shift
;;
-c)
+ # Make config file path available to the config file
+ # itself so that it can access additional files relative
+ # to its own location.
+ NANO_CONFIG=$2
. "$2"
shift
shift
___
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: r265927 - head/sys/dev/vt
Author: ray
Date: Mon May 12 19:29:38 2014
New Revision: 265927
URL: http://svnweb.freebsd.org/changeset/base/265927
Log:
Update terminal sizes in any case when new vt(4) driver arrive.
(Plus remove one unused newline)
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/vt/vt_core.c
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Mon May 12 19:11:39 2014(r265926)
+++ head/sys/dev/vt/vt_core.c Mon May 12 19:29:38 2014(r265927)
@@ -1981,8 +1981,11 @@ vt_upgrade(struct vt_device *vd)
unsigned int i;
/* Device didn't pass vd_init() or already upgraded. */
- if (vd->vd_flags & (VDF_ASYNC|VDF_DEAD))
+ if (vd->vd_flags & (VDF_ASYNC|VDF_DEAD)) {
+ /* Refill settings with new sizes anyway. */
+ vt_resize(vd);
return;
+ }
vd->vd_flags |= VDF_ASYNC;
for (i = 0; i < VT_MAXWINDOWS; i++) {
@@ -2019,7 +2022,6 @@ vt_upgrade(struct vt_device *vd)
/* Refill settings with new sizes. */
vt_resize(vd);
-
}
static 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: r265931 - head/sys/kern
Author: truckman
Date: Mon May 12 20:22:42 2014
New Revision: 265931
URL: http://svnweb.freebsd.org/changeset/base/265931
Log:
Be even more paranoid about overflow.
Requested by: ache
Modified:
head/sys/kern/subr_rman.c
Modified: head/sys/kern/subr_rman.c
==
--- head/sys/kern/subr_rman.c Mon May 12 20:19:40 2014(r265930)
+++ head/sys/kern/subr_rman.c Mon May 12 20:22:42 2014(r265931)
@@ -466,8 +466,8 @@ rman_reserve_resource_bound(struct rman
}
amask = (1ul << RF_ALIGNMENT(flags)) - 1;
- if (start + amask < start) {
- DPRINTF(("start+amask wrapped around\n"));
+ if (start > ULONG_MAX - amask) {
+ DPRINTF(("start+amask would wrap around\n"));
goto out;
}
@@ -487,8 +487,8 @@ rman_reserve_resource_bound(struct rman
s->r_start, end));
break;
}
- if (s->r_start + amask < s->r_start) {
- DPRINTF(("s->r_start (%#lx) + amask (%#lx) wrapped\n",
+ if (s->r_start > ULONG_MAX - amask) {
+ DPRINTF(("s->r_start (%#lx) + amask (%#lx) too large\n",
s->r_start, amask));
break;
}
___
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: r265931 - head/sys/kern
On 12 May, To: src-committ...@freebsd.org wrote:
> Author: truckman
> Date: Mon May 12 20:22:42 2014
> New Revision: 265931
> URL: http://svnweb.freebsd.org/changeset/base/265931
>
> Log:
> Be even more paranoid about overflow.
>
> Requested by: ache
>
> Modified:
> head/sys/kern/subr_rman.c
>
> Modified: head/sys/kern/subr_rman.c
> ==
> --- head/sys/kern/subr_rman.c Mon May 12 20:19:40 2014(r265930)
> +++ head/sys/kern/subr_rman.c Mon May 12 20:22:42 2014(r265931)
> @@ -466,8 +466,8 @@ rman_reserve_resource_bound(struct rman
> }
>
> amask = (1ul << RF_ALIGNMENT(flags)) - 1;
> - if (start + amask < start) {
> - DPRINTF(("start+amask wrapped around\n"));
> + if (start > ULONG_MAX - amask) {
> + DPRINTF(("start+amask would wrap around\n"));
> goto out;
> }
>
> @@ -487,8 +487,8 @@ rman_reserve_resource_bound(struct rman
> s->r_start, end));
> break;
> }
> - if (s->r_start + amask < s->r_start) {
> - DPRINTF(("s->r_start (%#lx) + amask (%#lx) wrapped\n",
> + if (s->r_start > ULONG_MAX - amask) {
> + DPRINTF(("s->r_start (%#lx) + amask (%#lx) too large\n",
> s->r_start, amask));
> break;
> }
>
MFC after: 1 week
___
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: r265933 - head/tools/build/mk
Author: jmmv
Date: Mon May 12 21:21:32 2014
New Revision: 265933
URL: http://svnweb.freebsd.org/changeset/base/265933
Log:
Fix delete-old when WITH_TESTS is set.
r265423 removed the WITHOUT_BMAKE option, which in turn broke a conditional
in OptionalObsoleteFiles.inc that inspected MK_BMAKE.
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon May 12 20:48:04
2014(r265932)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon May 12 21:21:32
2014(r265933)
@@ -4129,7 +4129,7 @@ OLD_FILES+=usr/tests/lib/atf/libatf-c/pr
OLD_FILES+=usr/tests/lib/atf/libatf-c/sanity_test
OLD_FILES+=usr/tests/lib/atf/libatf-c/text_test
OLD_FILES+=usr/tests/lib/atf/libatf-c/user_test
-.if ${MK_MAKE} == yes && ${MK_BMAKE} == yes
+.if ${MK_MAKE} == yes
OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/legacy_test
OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Kyuafile
OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Makefile.test
___
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: r265941 - head/usr.sbin/bhyve
Author: neel
Date: Mon May 12 23:35:10 2014
New Revision: 265941
URL: http://svnweb.freebsd.org/changeset/base/265941
Log:
abort(3) the process in response to a VMEXIT_ABORT. This usually happens in
response to an unhandled VM exit or an unexpected error so a core is useful.
Remove unused macro VMEXIT_SWITCH.
Reviewed by: grehan
Modified:
head/usr.sbin/bhyve/bhyverun.c
Modified: head/usr.sbin/bhyve/bhyverun.c
==
--- head/usr.sbin/bhyve/bhyverun.c Mon May 12 22:33:22 2014
(r265940)
+++ head/usr.sbin/bhyve/bhyverun.c Mon May 12 23:35:10 2014
(r265941)
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
#define GUEST_NIO_PORT 0x488 /* guest upcalls via i/o port */
-#defineVMEXIT_SWITCH 0 /* force vcpu switch in mux
mode */
#defineVMEXIT_CONTINUE 1 /* continue from next
instruction */
#defineVMEXIT_RESTART 2 /* restart current instruction
*/
#defineVMEXIT_ABORT3 /* abort the vm run loop */
@@ -272,12 +271,6 @@ fbsdrun_deletecpu(struct vmctx *ctx, int
}
static int
-vmexit_catch_inout(void)
-{
- return (VMEXIT_ABORT);
-}
-
-static int
vmexit_handle_notify(struct vmctx *ctx, struct vm_exit *vme, int *pvcpu,
uint32_t eax)
{
@@ -330,7 +323,7 @@ vmexit_inout(struct vmctx *ctx, struct v
fprintf(stderr, "Unhandled %s%c 0x%04x\n",
in ? "in" : "out",
bytes == 1 ? 'b' : (bytes == 2 ? 'w' : 'l'), port);
- return (vmexit_catch_inout());
+ return (VMEXIT_ABORT);
}
}
@@ -575,6 +568,8 @@ vm_loop(struct vmctx *ctx, int vcpu, uin
assert(error == 0 || errno == EALREADY);
rip = vmexit[vcpu].rip + vmexit[vcpu].inst_length;
break;
+ case VMEXIT_ABORT:
+ abort();
default:
exit(1);
}
___
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: r265942 - head/sys/netinet
Author: yongari
Date: Tue May 13 05:07:03 2014
New Revision: 265942
URL: http://svnweb.freebsd.org/changeset/base/265942
Log:
Fix checksum computation. Previously it didn't include carry.
Reviewed by: tuexen
Modified:
head/sys/netinet/ip_input.c
Modified: head/sys/netinet/ip_input.c
==
--- head/sys/netinet/ip_input.c Mon May 12 23:35:10 2014(r265941)
+++ head/sys/netinet/ip_input.c Tue May 13 05:07:03 2014(r265942)
@@ -1080,8 +1080,9 @@ found:
* (and not in for{} loop), though it implies we are not going to
* reassemble more than 64k fragments.
*/
- m->m_pkthdr.csum_data =
- (m->m_pkthdr.csum_data & 0x) + (m->m_pkthdr.csum_data >> 16);
+ while (m->m_pkthdr.csum_data & 0x)
+ m->m_pkthdr.csum_data = (m->m_pkthdr.csum_data & 0x) +
+ (m->m_pkthdr.csum_data >> 16);
#ifdef MAC
mac_ipq_reassemble(fp, m);
mac_ipq_destroy(fp);
___
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: r265943 - head/sys/dev/re
Author: yongari
Date: Tue May 13 05:19:29 2014
New Revision: 265943
URL: http://svnweb.freebsd.org/changeset/base/265943
Log:
Disable TX IP/TCP/UDP checksum offloading for RTL8168C/RTL8168CP.
Previously only TX IP checksum offloading was disabled but it's
reported that TX checksum offloading for UDP datagrams with IP
options also generates corrupted frames. Reporter's controller is
RTL8168CP but I guess RTL8168C also have the same issue since it
shall share the same core.
Reported and tested by: tuexen
Modified:
head/sys/dev/re/if_re.c
Modified: head/sys/dev/re/if_re.c
==
--- head/sys/dev/re/if_re.c Tue May 13 05:07:03 2014(r265942)
+++ head/sys/dev/re/if_re.c Tue May 13 05:19:29 2014(r265943)
@@ -1619,16 +1619,18 @@ re_attach(device_t dev)
ifp->if_start = re_start;
/*
* RTL8168/8111C generates wrong IP checksummed frame if the
-* packet has IP options so disable TX IP checksum offloading.
+* packet has IP options so disable TX checksum offloading.
*/
if (sc->rl_hwrev->rl_rev == RL_HWREV_8168C ||
sc->rl_hwrev->rl_rev == RL_HWREV_8168C_SPIN2 ||
- sc->rl_hwrev->rl_rev == RL_HWREV_8168CP)
- ifp->if_hwassist = CSUM_TCP | CSUM_UDP;
- else
+ sc->rl_hwrev->rl_rev == RL_HWREV_8168CP) {
+ ifp->if_hwassist = 0;
+ ifp->if_capabilities = IFCAP_RXCSUM | IFCAP_TSO4;
+ } else {
ifp->if_hwassist = CSUM_IP | CSUM_TCP | CSUM_UDP;
+ ifp->if_capabilities = IFCAP_HWCSUM | IFCAP_TSO4;
+ }
ifp->if_hwassist |= CSUM_TSO;
- ifp->if_capabilities = IFCAP_HWCSUM | IFCAP_TSO4;
ifp->if_capenable = ifp->if_capabilities;
ifp->if_init = re_init;
IFQ_SET_MAXLEN(&ifp->if_snd, RL_IFQ_MAXLEN);
@@ -3364,7 +3366,6 @@ re_ioctl(struct ifnet *ifp, u_long comma
struct rl_softc *sc = ifp->if_softc;
struct ifreq*ifr = (struct ifreq *) data;
struct mii_data *mii;
- uint32_trev;
int error = 0;
switch (command) {
@@ -3453,15 +3454,9 @@ re_ioctl(struct ifnet *ifp, u_long comma
if ((mask & IFCAP_TXCSUM) != 0 &&
(ifp->if_capabilities & IFCAP_TXCSUM) != 0) {
ifp->if_capenable ^= IFCAP_TXCSUM;
- if ((ifp->if_capenable & IFCAP_TXCSUM) != 0) {
- rev = sc->rl_hwrev->rl_rev;
- if (rev == RL_HWREV_8168C ||
- rev == RL_HWREV_8168C_SPIN2 ||
- rev == RL_HWREV_8168CP)
- ifp->if_hwassist |= CSUM_TCP | CSUM_UDP;
- else
- ifp->if_hwassist |= RE_CSUM_FEATURES;
- } else
+ if ((ifp->if_capenable & IFCAP_TXCSUM) != 0)
+ ifp->if_hwassist |= RE_CSUM_FEATURES;
+ else
ifp->if_hwassist &= ~RE_CSUM_FEATURES;
reinit = 1;
}
___
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"
