CVS commit: src/sys/dev/raidframe
Module Name:src
Committed By: mrg
Date: Fri Jul 10 09:49:56 UTC 2015
Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c
Log Message:
mark all the device entry points static.
To generate a diff of this commit:
cvs rdiff -u -r1.323 -r1.324 src/sys/dev/raidframe/rf_netbsdkintf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.323 src/sys/dev/raidframe/rf_netbsdkintf.c:1.324
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.323 Sun Apr 26 15:15:20 2015
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Fri Jul 10 09:49:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.323 2015/04/26 15:15:20 mlelstv Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.324 2015/07/10 09:49:56 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.323 2015/04/26 15:15:20 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.324 2015/07/10 09:49:56 mrg Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -195,14 +195,14 @@ static int raidread_component_label(unsi
dev_t, struct vnode *, RF_ComponentLabel_t *);
-dev_type_open(raidopen);
-dev_type_close(raidclose);
-dev_type_read(raidread);
-dev_type_write(raidwrite);
-dev_type_ioctl(raidioctl);
-dev_type_strategy(raidstrategy);
-dev_type_dump(raiddump);
-dev_type_size(raidsize);
+static dev_type_open(raidopen);
+static dev_type_close(raidclose);
+static dev_type_read(raidread);
+static dev_type_write(raidwrite);
+static dev_type_ioctl(raidioctl);
+static dev_type_strategy(raidstrategy);
+static dev_type_dump(raiddump);
+static dev_type_size(raidsize);
const struct bdevsw raid_bdevsw = {
.d_open = raidopen,
@@ -597,8 +597,7 @@ rf_buildroothack(RF_ConfigSet_t *config_
}
}
-
-int
+static int
raidsize(dev_t dev)
{
struct raid_softc *rs;
@@ -631,7 +630,7 @@ raidsize(dev_t dev)
}
-int
+static int
raiddump(dev_t dev, daddr_t blkno, void *va, size_t size)
{
int unit = raidunit(dev);
@@ -767,8 +766,9 @@ out:
return error;
}
+
/* ARGSUSED */
-int
+static int
raidopen(dev_t dev, int flags, int fmt,
struct lwp *l)
{
@@ -852,8 +852,9 @@ bad:
}
+
/* ARGSUSED */
-int
+static int
raidclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
int unit = raidunit(dev);
@@ -902,7 +903,7 @@ raidclose(dev_t dev, int flags, int fmt,
}
-void
+static void
raidstrategy(struct buf *bp)
{
unsigned int unit = raidunit(bp-b_dev);
@@ -972,8 +973,9 @@ done:
bp-b_resid = bp-b_bcount;
biodone(bp);
}
+
/* ARGSUSED */
-int
+static int
raidread(dev_t dev, struct uio *uio, int flags)
{
int unit = raidunit(dev);
@@ -988,8 +990,9 @@ raidread(dev_t dev, struct uio *uio, int
return (physio(raidstrategy, NULL, dev, B_READ, minphys, uio));
}
+
/* ARGSUSED */
-int
+static int
raidwrite(dev_t dev, struct uio *uio, int flags)
{
int unit = raidunit(dev);
@@ -1037,7 +1040,7 @@ raid_detach_unlocked(struct raid_softc *
return 0;
}
-int
+static int
raidioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
{
int unit = raidunit(dev);
CVS import: src/external/bsd/ntp/dist
Module Name:src Committed By: christos Date: Fri Jul 10 13:03:28 UTC 2015 Update of /cvsroot/src/external/bsd/ntp/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29273 Log Message: Import ntp 4.2.8p3 Status: Vendor Tag: UDEL Release Tags: ntp-4-2-8p3 U src/external/bsd/ntp/dist/packageinfo.sh U src/external/bsd/ntp/dist/CommitLog U src/external/bsd/ntp/dist/configure.ac U src/external/bsd/ntp/dist/bincheck.mf U src/external/bsd/ntp/dist/includes.mf U src/external/bsd/ntp/dist/build U src/external/bsd/ntp/dist/readme.y2kfixes U src/external/bsd/ntp/dist/CommitLog-4.1.0 U src/external/bsd/ntp/dist/Makefile.am U src/external/bsd/ntp/dist/config.sub U src/external/bsd/ntp/dist/INSTALL U src/external/bsd/ntp/dist/results.y2kfixes U src/external/bsd/ntp/dist/README U src/external/bsd/ntp/dist/README.patches U src/external/bsd/ntp/dist/COPYRIGHT U src/external/bsd/ntp/dist/ChangeLog U src/external/bsd/ntp/dist/Makefile.in U src/external/bsd/ntp/dist/NOTES.y2kfixes U src/external/bsd/ntp/dist/bootstrap U src/external/bsd/ntp/dist/configure U src/external/bsd/ntp/dist/NEWS U src/external/bsd/ntp/dist/README.refclocks U src/external/bsd/ntp/dist/compile U src/external/bsd/ntp/dist/check-libopts.mf U src/external/bsd/ntp/dist/README.bk U src/external/bsd/ntp/dist/aclocal.m4 U src/external/bsd/ntp/dist/flock-build U src/external/bsd/ntp/dist/install-sh U src/external/bsd/ntp/dist/README.versions U src/external/bsd/ntp/dist/dot.emacs U src/external/bsd/ntp/dist/deps-ver U src/external/bsd/ntp/dist/WHERE-TO-START U src/external/bsd/ntp/dist/TODO U src/external/bsd/ntp/dist/ltmain.sh U src/external/bsd/ntp/dist/depcomp U src/external/bsd/ntp/dist/README.hackers U src/external/bsd/ntp/dist/ylwrap N src/external/bsd/ntp/dist/README.leapsmear U src/external/bsd/ntp/dist/depsver.mf U src/external/bsd/ntp/dist/missing U src/external/bsd/ntp/dist/config.h.in U src/external/bsd/ntp/dist/config.guess U src/external/bsd/ntp/dist/scripts/plot_summary.texi U src/external/bsd/ntp/dist/scripts/summary-opts U src/external/bsd/ntp/dist/scripts/plot_summary.man.in U src/external/bsd/ntp/dist/scripts/plot_summary.in U src/external/bsd/ntp/dist/scripts/plot_summary.1plot_summarymdoc U src/external/bsd/ntp/dist/scripts/invoke-plot_summary.texi U src/external/bsd/ntp/dist/scripts/invoke-plot_summary.menu U src/external/bsd/ntp/dist/scripts/summary.1summarymdoc U src/external/bsd/ntp/dist/scripts/plot_summary.html U src/external/bsd/ntp/dist/scripts/plot_summary.mdoc.in U src/external/bsd/ntp/dist/scripts/README U src/external/bsd/ntp/dist/scripts/summary.html U src/external/bsd/ntp/dist/scripts/summary.in U src/external/bsd/ntp/dist/scripts/summary.mdoc.in U src/external/bsd/ntp/dist/scripts/Makefile.in U src/external/bsd/ntp/dist/scripts/plot_summary.1plot_summaryman U src/external/bsd/ntp/dist/scripts/plot_summary-opts.def U src/external/bsd/ntp/dist/scripts/summary-opts.def U src/external/bsd/ntp/dist/scripts/summary.texi U src/external/bsd/ntp/dist/scripts/ntpver.in U src/external/bsd/ntp/dist/scripts/plot_summary-opts U src/external/bsd/ntp/dist/scripts/Makefile.am U src/external/bsd/ntp/dist/scripts/summary.1summaryman U src/external/bsd/ntp/dist/scripts/summary.man.in U src/external/bsd/ntp/dist/scripts/invoke-summary.texi U src/external/bsd/ntp/dist/scripts/invoke-summary.menu U src/external/bsd/ntp/dist/scripts/monitoring/ntploopwatch U src/external/bsd/ntp/dist/scripts/monitoring/timelocal.pl U src/external/bsd/ntp/dist/scripts/monitoring/ntp.pl U src/external/bsd/ntp/dist/scripts/monitoring/README U src/external/bsd/ntp/dist/scripts/monitoring/loopwatch.config.SAMPLE U src/external/bsd/ntp/dist/scripts/monitoring/lr.pl U src/external/bsd/ntp/dist/scripts/monitoring/ntptrap U src/external/bsd/ntp/dist/scripts/monitoring/ntploopstat U src/external/bsd/ntp/dist/scripts/lib/Makefile.am U src/external/bsd/ntp/dist/scripts/lib/Makefile.in U src/external/bsd/ntp/dist/scripts/lib/NTP/Util.pm U src/external/bsd/ntp/dist/scripts/update-leap/update-leap.mdoc.in U src/external/bsd/ntp/dist/scripts/update-leap/update-leap.texi U src/external/bsd/ntp/dist/scripts/update-leap/update-leap.html U src/external/bsd/ntp/dist/scripts/update-leap/Makefile.in U src/external/bsd/ntp/dist/scripts/update-leap/update-leap-opts.def N src/external/bsd/ntp/dist/scripts/update-leap/update-leap.in N src/external/bsd/ntp/dist/scripts/update-leap/update-leap.sh U src/external/bsd/ntp/dist/scripts/update-leap/invoke-update-leap.menu U src/external/bsd/ntp/dist/scripts/update-leap/update-leap.man.in U src/external/bsd/ntp/dist/scripts/update-leap/Makefile.am U src/external/bsd/ntp/dist/scripts/update-leap/update-leap.1update-leapmdoc U src/external/bsd/ntp/dist/scripts/update-leap/invoke-update-leap.texi U src/external/bsd/ntp/dist/scripts/update-leap/update-leap.1update-leapman U src/external/bsd/ntp/dist/scripts/update-leap/update-leap-opts U src/external/bsd/ntp/dist/scripts/build/checkHtmlFileDates U
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: msaitoh
Date: Sat Jul 11 03:06:25 UTC 2015
Modified Files:
src/sys/dev/usb: ehci.c
Log Message:
Use correct E[O]{READ,WRITE} function.
To generate a diff of this commit:
cvs rdiff -u -r1.241 -r1.242 src/sys/dev/usb/ehci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.241 src/sys/dev/usb/ehci.c:1.242
--- src/sys/dev/usb/ehci.c:1.241 Thu Jul 2 09:05:06 2015
+++ src/sys/dev/usb/ehci.c Sat Jul 11 03:06:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.241 2015/07/02 09:05:06 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.242 2015/07/11 03:06:25 msaitoh Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.241 2015/07/02 09:05:06 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.242 2015/07/11 03:06:25 msaitoh Exp $);
#include ohci.h
#include uhci.h
@@ -421,7 +421,7 @@ ehci_init(ehci_softc_t *sc)
if (EHCI_HCC_64BIT(cparams)) {
/* MUST clear segment register if 64 bit capable. */
- EWRITE4(sc, EHCI_CTRLDSSEGMENT, 0);
+ EOWRITE4(sc, EHCI_CTRLDSSEGMENT, 0);
}
sc-sc_bus.usbrev = USBREV_2_0;
@@ -452,10 +452,10 @@ ehci_init(ehci_softc_t *sc)
* the controller to host mode.
*/
if (sc-sc_flags EHCIF_ETTF) {
- uint32_t usbmode = EREAD4(sc, EHCI_USBMODE);
+ uint32_t usbmode = EOREAD4(sc, EHCI_USBMODE);
usbmode = ~EHCI_USBMODE_CM;
usbmode |= EHCI_USBMODE_CM_HOST;
- EWRITE4(sc, EHCI_USBMODE, usbmode);
+ EOWRITE4(sc, EHCI_USBMODE, usbmode);
}
/* XXX need proper intr scheduling */
CVS commit: src/external/bsd/ntp
Module Name:src Committed By: christos Date: Fri Jul 10 14:20:36 UTC 2015 Modified Files: src/external/bsd/ntp: importdate src/external/bsd/ntp/bin/ntpd: Makefile src/external/bsd/ntp/dist/adjtimed: adjtimed.c src/external/bsd/ntp/dist/clockstuff: chutest.c propdelay.c src/external/bsd/ntp/dist/html/pic: freq1211.gif offset1211.gif src/external/bsd/ntp/dist/include: adjtime.h ascii.h audio.h binio.h declcond.h gps.h hopf6039.h icom.h ieee754io.h intreswork.h iosignal.h l_stdlib.h lib_strbuf.h libntp.h mbg_gps166.h mx4200.h ntif.h ntp.h ntp_assert.h ntp_calendar.h ntp_cmdargs.h ntp_config.h ntp_control.h ntp_crypto.h ntp_datum.h ntp_debug.h ntp_filegen.h ntp_fp.h ntp_if.h ntp_intres.h ntp_io.h ntp_libopts.h ntp_lineedit.h ntp_lists.h ntp_machine.h ntp_malloc.h ntp_md5.h ntp_net.h ntp_prio_q.h ntp_proto.h ntp_random.h ntp_refclock.h ntp_request.h ntp_rfc2553.h ntp_select.h ntp_stdlib.h ntp_string.h ntp_syscall.h ntp_syslog.h ntp_tty.h ntp_types.h ntp_unixtime.h ntp_worker.h ntp_workimpl.h ntpd.h ntpsim.h parse.h parse_conf.h recvbuff.h refclock_atom.h ssl_applink.c timepps-SCO.h timepps-Solaris.h timepps-SunOS.h timespecops.h timetoa.h timevalops.h trimble.h vint64ops.h src/external/bsd/ntp/dist/include/isc: mem.h src/external/bsd/ntp/dist/kernel/sys: bsd_audioirig.h i8253.h parsestreams.h pcl720.h ppsclock.h timex.h tpro.h tt560_api.h src/external/bsd/ntp/dist/lib/isc: app_api.c assertions.c backtrace-emptytbl.c backtrace.c base32.c base64.c bitstring.c buffer.c bufferlist.c commandline.c entropy.c error.c event.c fsaccess.c hash.c heap.c hex.c hmacmd5.c hmacsha.c httpd.c inet_aton.c inet_ntop.c inet_pton.c iterated_hash.c lex.c lfsr.c lib.c log.c md5.c mem.c mem_api.c mutexblock.c netaddr.c netscope.c ondestroy.c parseint.c portset.c print.c quota.c radix.c random.c ratelimiter.c refcount.c region.c result.c rwlock.c serial.c sha1.c sha2.c sockaddr.c socket_api.c stats.c string.c strtoul.c symtab.c task.c task_api.c task_p.h taskpool.c timer.c timer_api.c timer_p.h version.c src/external/bsd/ntp/dist/lib/isc/alpha/include/isc: atomic.h src/external/bsd/ntp/dist/lib/isc/ia64/include/isc: atomic.h src/external/bsd/ntp/dist/lib/isc/include/isc: app.h assertions.h backtrace.h base32.h base64.h bind9.h bitstring.h boolean.h buffer.h bufferlist.h commandline.h entropy.h error.h event.h eventclass.h file.h formatcheck.h fsaccess.h hash.h heap.h hex.h hmacmd5.h hmacsha.h httpd.h interfaceiter.h ipv6.h iterated_hash.h lang.h lex.h lfsr.h lib.h list.h log.h magic.h md5.h mem.h msgcat.h msgs.h mutexblock.h namespace.h netaddr.h netscope.h ondestroy.h os.h parseint.h platform.h portset.h print.h queue.h quota.h radix.h random.h ratelimiter.h refcount.h region.h resource.h result.h resultclass.h rwlock.h serial.h sha1.h sha2.h sockaddr.h socket.h stats.h stdio.h stdlib.h string.h symtab.h task.h taskpool.h timer.h types.h util.h version.h xml.h src/external/bsd/ntp/dist/lib/isc/mips/include/isc: atomic.h src/external/bsd/ntp/dist/lib/isc/nls: msgcat.c src/external/bsd/ntp/dist/lib/isc/noatomic/include/isc: atomic.h src/external/bsd/ntp/dist/lib/isc/nothreads: condition.c mutex.c thread.c src/external/bsd/ntp/dist/lib/isc/nothreads/include/isc: condition.h mutex.h once.h thread.h src/external/bsd/ntp/dist/lib/isc/powerpc/include/isc: atomic.h src/external/bsd/ntp/dist/lib/isc/pthreads: condition.c mutex.c thread.c src/external/bsd/ntp/dist/lib/isc/pthreads/include/isc: condition.h mutex.h once.h thread.h src/external/bsd/ntp/dist/lib/isc/sparc64/include/isc: atomic.h src/external/bsd/ntp/dist/lib/isc/tests: hash_test.c isctest.c isctest.h queue_test.c socket_test.c symtab_test.c task_test.c taskpool_test.c src/external/bsd/ntp/dist/lib/isc/unix: app.c dir.c entropy.c errno2result.c errno2result.h file.c fsaccess.c ifiter_getifaddrs.c ifiter_ioctl.c ifiter_sysctl.c interfaceiter.c ipv6.c keyboard.c net.c os.c resource.c socket.c socket_p.h stdio.c stdtime.c strerror.c syslog.c time.c src/external/bsd/ntp/dist/lib/isc/unix/include/isc: dir.h int.h keyboard.h net.h netdb.h offset.h stat.h stdtime.h strerror.h syslog.h time.h src/external/bsd/ntp/dist/lib/isc/win32: DLLMain.c app.c condition.c dir.c entropy.c errno2result.c errno2result.h file.c
CVS commit: src/common/lib/libc/arch/m68k/atomic
Module Name:src Committed By: mlelstv Date: Fri Jul 10 20:16:01 UTC 2015 Modified Files: src/common/lib/libc/arch/m68k/atomic: atomic_cas.S Log Message: fix comment To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/common/lib/libc/arch/m68k/atomic/atomic_cas.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/m68k/atomic/atomic_cas.S diff -u src/common/lib/libc/arch/m68k/atomic/atomic_cas.S:1.12 src/common/lib/libc/arch/m68k/atomic/atomic_cas.S:1.13 --- src/common/lib/libc/arch/m68k/atomic/atomic_cas.S:1.12 Sat Jul 4 07:11:45 2015 +++ src/common/lib/libc/arch/m68k/atomic/atomic_cas.S Fri Jul 10 20:16:01 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_cas.S,v 1.12 2015/07/04 07:11:45 isaki Exp $ */ +/* $NetBSD: atomic_cas.S,v 1.13 2015/07/10 20:16:01 mlelstv Exp $ */ /*- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ ENTRY(__sync_bool_compare_and_swap_2) movw 8+2(%sp), %d0 /* lower word */ movw 12+2(%sp), %d1 /* lower word */ casw %d0, %d1, (%a0) - /* %d3 now contains the old value */ + /* %d0 now contains the old value */ beqs 1f clrl %d0 /* return failure */ rts @@ -116,7 +116,7 @@ ENTRY(__sync_bool_compare_and_swap_1) movb 8+3(%sp), %d0 /* lower byte */ movb 12+3(%sp), %d1 /* lower byte */ casb %d0, %d1, (%a0) - /* %d3 now contains the old value */ + /* %d0 now contains the old value */ beqs 1f clrl %d0 /* return failure */ rts
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Jul 10 15:28:02 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new ntpd To generate a diff of this commit: cvs rdiff -u -r1.1235 -r1.1236 src/doc/3RDPARTY cvs rdiff -u -r1.2084 -r1.2085 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1235 src/doc/3RDPARTY:1.1236 --- src/doc/3RDPARTY:1.1235 Thu Jul 9 11:58:51 2015 +++ src/doc/3RDPARTY Fri Jul 10 11:28:01 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1235 2015/07/09 15:58:51 taca Exp $ +# $NetBSD: 3RDPARTY,v 1.1236 2015/07/10 15:28:01 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -921,7 +921,7 @@ and ndbootd-raw.c. Restore saved config HAVE_STRICT_ALIGNMENT. Fix RCS IDs, import. Package: ntp -Version: 4.2.8p2 +Version: 4.2.8p3 Current Vers: 4.2.8p3 Maintainer: David L. Mills mi...@udel.edu Archive Site: http://www.ntp.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2084 src/doc/CHANGES:1.2085 --- src/doc/CHANGES:1.2084 Thu Jul 9 10:32:24 2015 +++ src/doc/CHANGES Fri Jul 10 11:28:02 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2084 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2085 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -169,3 +169,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: dhcpcd: Import dhcpcd 6.9.1. [roy 20150709] iostat(8): Support fnmatch(3) patterns for disknames. [mrg 20150709] openssl: Import openssl 1.0.1p [christos 20150709] + ntp: Import ntp 4.2.8p3. [christos 20150710]
CVS commit: src/external/bsd/ntp/scripts
Module Name:src
Committed By: kardel
Date: Fri Jul 10 21:27:49 UTC 2015
Modified Files:
src/external/bsd/ntp/scripts: mkver
Log Message:
update imported version to reality
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/scripts/mkver
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/scripts/mkver
diff -u src/external/bsd/ntp/scripts/mkver:1.6 src/external/bsd/ntp/scripts/mkver:1.7
--- src/external/bsd/ntp/scripts/mkver:1.6 Tue Apr 7 17:34:21 2015
+++ src/external/bsd/ntp/scripts/mkver Fri Jul 10 21:27:49 2015
@@ -3,7 +3,7 @@ PROG=${1-UNKNOWN}
ConfStr=$PROG
-ConfStr=$ConfStr 4.2.8p2
+ConfStr=$ConfStr 4.2.8p3
case $CSET in
'') ;;
CVS commit: src/external/bsd/ntp/dist/ntpd
Module Name:src
Committed By: kardel
Date: Fri Jul 10 21:31:19 UTC 2015
Modified Files:
src/external/bsd/ntp/dist/ntpd: ntp_control.c
Log Message:
backport fix for bug 2867 - ntpd with autokey active crashed by 'ntpq -crv'
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/dist/ntpd/ntp_control.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/ntpd/ntp_control.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_control.c:1.12 src/external/bsd/ntp/dist/ntpd/ntp_control.c:1.13
--- src/external/bsd/ntp/dist/ntpd/ntp_control.c:1.12 Fri Jul 10 14:20:32 2015
+++ src/external/bsd/ntp/dist/ntpd/ntp_control.c Fri Jul 10 21:31:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_control.c,v 1.12 2015/07/10 14:20:32 christos Exp $ */
+/* $NetBSD: ntp_control.c,v 1.13 2015/07/10 21:31:19 kardel Exp $ */
/*
* ntp_control.c - respond to mode 6 control messages and send async
@@ -422,10 +422,10 @@ static const struct ctl_var sys_var[] =
{ CS_TIMER_XMTS, RO, timer_xmts }, /* 87 */
{ CS_FUZZ, RO, fuzz }, /* 88 */
{ CS_WANDER_THRESH, RO, clk_wander_threshold }, /* 89 */
-#ifdef LEAP_SMEAR
+
{ CS_LEAPSMEARINTV, RO, leapsmearinterval },/* 90 */
{ CS_LEAPSMEAROFFS, RO, leapsmearoffset }, /* 91 */
-#endif /* LEAP_SMEAR */
+
#ifdef AUTOKEY
{ CS_FLAGS, RO, flags }, /* 1 + CS_MAX_NOAUTOKEY */
{ CS_HOST, RO, host }, /* 2 + CS_MAX_NOAUTOKEY */
@@ -2404,6 +2404,9 @@ ctl_putsys(
ntohl(hostval.tstamp));
break;
#endif /* AUTOKEY */
+
+ default:
+ break;
}
}
CVS commit: src/sys/dev/pad
Module Name:src
Committed By: nat
Date: Fri Jul 10 21:58:56 UTC 2015
Modified Files:
src/sys/dev/pad: pad.c
Log Message:
Wrap up calls to sc_intr in kpreempt[en/dis]able.
This commit was approved by christos@
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pad/pad.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.22 src/sys/dev/pad/pad.c:1.23
--- src/sys/dev/pad/pad.c:1.22 Tue Nov 18 01:53:17 2014
+++ src/sys/dev/pad/pad.c Fri Jul 10 21:58:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.22 2014/11/18 01:53:17 jmcneill Exp $ */
+/* $NetBSD: pad.c,v 1.23 2015/07/10 21:58:56 nat Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pad.c,v 1.22 2014/11/18 01:53:17 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: pad.c,v 1.23 2015/07/10 21:58:56 nat Exp $);
#include sys/types.h
#include sys/param.h
@@ -354,6 +354,7 @@ pad_read(dev_t dev, struct uio *uio, int
intr = sc-sc_intr;
intrarg = sc-sc_intrarg;
+ kpreempt_disable();
while (uio-uio_resid 0 !err) {
err = pad_get_block(sc, pb, min(uio-uio_resid, PAD_BLKSIZE));
if (!err) {
@@ -375,6 +376,7 @@ pad_read(dev_t dev, struct uio *uio, int
err = cv_wait_sig(sc-sc_condvar, sc-sc_lock);
if (err != 0) {
mutex_exit(sc-sc_lock);
+ kpreempt_enable();
return err;
}
intr = sc-sc_intr;
@@ -387,6 +389,7 @@ pad_read(dev_t dev, struct uio *uio, int
mutex_exit(sc-sc_intr_lock);
}
mutex_exit(sc-sc_lock);
+ kpreempt_enable();
return err;
}
CVS commit: src/sys/dev/bluetooth
Module Name:src Committed By: nat Date: Fri Jul 10 22:03:12 UTC 2015 Modified Files: src/sys/dev/bluetooth: btsco.c Log Message: Wrap up calls to softint_schedule in kpeempt_[dis/en]able. Addresses PR kern/48459. This commit was approved by christos@ To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/dev/bluetooth/btsco.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/bluetooth/btsco.c diff -u src/sys/dev/bluetooth/btsco.c:1.33 src/sys/dev/bluetooth/btsco.c:1.34 --- src/sys/dev/bluetooth/btsco.c:1.33 Tue Aug 5 07:55:31 2014 +++ src/sys/dev/bluetooth/btsco.c Fri Jul 10 22:03:12 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: btsco.c,v 1.33 2014/08/05 07:55:31 rtr Exp $ */ +/* $NetBSD: btsco.c,v 1.34 2015/07/10 22:03:12 nat Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: btsco.c,v 1.33 2014/08/05 07:55:31 rtr Exp $); +__KERNEL_RCSID(0, $NetBSD: btsco.c,v 1.34 2015/07/10 22:03:12 nat Exp $); #include sys/param.h #include sys/audioio.h @@ -798,7 +798,9 @@ btsco_start_output(void *hdl, void *bloc sc-sc_tx_intr = intr; sc-sc_tx_intrarg = intrarg; + kpreempt_disable(); softint_schedule(sc-sc_intr); + kpreempt_enable(); return 0; }
