Re: CVS commit: src/sys/sys
On Fri, 14 Mar 2014, Joerg Sonnenberger wrote: Modified Files: src/sys/sys: cdefs.h Log Message: For compilers without __COUNTER__, make the ctassert name contain __INCLUDE_LEVEL__ ## _ ## __LINE__. It's not perfect, but at least it's better than just __LINE__ since it avoids collisions between .c's and .h's. This is wrong, __INCLUDE_LEVEL__ does not exist unconditionally. You could define a special token in each include file, and then use that token if it is defined. You could also use __INCLUDE_LEVEL__ only if it's defined. Something like this (untested): /* in foo/bar.h: */ #ifndef _FOO_BAR_H #define _FOO_BAR_H #undef __HEADER_NAME_TOKEN #define __HEADER_NAME_TOKEN _FOO_BAR_H /* insert real content here */ #endif /* _FOO_BAR_H */ /* in sys/cdefs.h: */ #define __CTASSERT0(x, y, z1, z2, z3)__CTASSERT1(x, y, z1, z2, z3) #define __CTASSERT1(x, y, z) \ typedef char y ## z1 ## z2 ## z3[/*CONSTCOND*/(x) ? 1 : -1] __unused #if defined(__COUNTER__) # define __CTASSERT(x) __CTASSERT0(x, __ctassert, __COUNTER__,,) #else # if defined(__INCLUDE_LEVEL__) # define __tmp_z1 __INCLUDE_LEVEL__ # else # define __tmp_z1 /* Empty */ # endif # if defined(__HEADER_NAME_TOKEN) # define __tmp_z2 __HEADER_NAME_TOKEN # else # define __tmp_z2 /* Empty */ # endif # define __CTASSERT(x) _CTASSERT0(x, __ctassert, __tmp_z1, __tmp_z2, __LINE__) # undef __tmp_z1 # undef __tmp_z2 #endif --apb (Alan Barrett)
CVS commit: src/sys/arch/dreamcast/dreamcast
Module Name:src
Committed By: martin
Date: Fri Mar 14 08:51:06 UTC 2014
Modified Files:
src/sys/arch/dreamcast/dreamcast: machdep.c
Log Message:
Remove an unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/dreamcast/dreamcast/machdep.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/arch/dreamcast/dreamcast/machdep.c
diff -u src/sys/arch/dreamcast/dreamcast/machdep.c:1.43 src/sys/arch/dreamcast/dreamcast/machdep.c:1.44
--- src/sys/arch/dreamcast/dreamcast/machdep.c:1.43 Mon Jun 11 16:27:08 2012
+++ src/sys/arch/dreamcast/dreamcast/machdep.c Fri Mar 14 08:51:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.43 2012/06/11 16:27:08 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.44 2014/03/14 08:51:06 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.43 2012/06/11 16:27:08 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.44 2014/03/14 08:51:06 martin Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -270,7 +270,7 @@ void
intc_intr(int ssr, int spc, int ssp)
{
struct intc_intrhand *ih;
- int s, evtcode;
+ int evtcode;
curcpu()-ci_data.cpu_nintr++;
@@ -282,7 +282,7 @@ intc_intr(int ssr, int spc, int ssp)
* On entry, all interrrupts are disabled, and exception is enabled.
* Enable higher level interrupt here.
*/
- s = _cpu_intr_resume(ih-ih_level);
+ _cpu_intr_resume(ih-ih_level);
if (evtcode == SH_INTEVT_TMU0_TUNI0) { /* hardclock */
struct clockframe cf;
CVS commit: src/sys/arch/dreamcast/dev/maple
Module Name:src
Committed By: martin
Date: Fri Mar 14 08:55:41 UTC 2014
Modified Files:
src/sys/arch/dreamcast/dev/maple: maple.c mlcd.c
Log Message:
Remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/dreamcast/dev/maple/maple.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/dreamcast/dev/maple/mlcd.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/arch/dreamcast/dev/maple/maple.c
diff -u src/sys/arch/dreamcast/dev/maple/maple.c:1.46 src/sys/arch/dreamcast/dev/maple/maple.c:1.47
--- src/sys/arch/dreamcast/dev/maple/maple.c:1.46 Sun Oct 13 06:55:34 2013
+++ src/sys/arch/dreamcast/dev/maple/maple.c Fri Mar 14 08:55:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: maple.c,v 1.46 2013/10/13 06:55:34 riz Exp $ */
+/* $NetBSD: maple.c,v 1.47 2014/03/14 08:55:40 martin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: maple.c,v 1.46 2013/10/13 06:55:34 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: maple.c,v 1.47 2014/03/14 08:55:40 martin Exp $);
#include sys/param.h
#include sys/device.h
@@ -554,10 +554,7 @@ static void
maple_check_unit_change(struct maple_softc *sc, struct maple_unit *u)
{
struct maple_devinfo *newinfo = (void *) (u-u_rxbuf + 1);
- int port, subunit;
- port = u-port;
- subunit = u-subunit;
if (memcmp(u-devinfo, newinfo, sizeof(struct maple_devinfo)) == 0)
goto out; /* no change */
Index: src/sys/arch/dreamcast/dev/maple/mlcd.c
diff -u src/sys/arch/dreamcast/dev/maple/mlcd.c:1.14 src/sys/arch/dreamcast/dev/maple/mlcd.c:1.15
--- src/sys/arch/dreamcast/dev/maple/mlcd.c:1.14 Sun Oct 17 14:17:49 2010
+++ src/sys/arch/dreamcast/dev/maple/mlcd.c Fri Mar 14 08:55:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mlcd.c,v 1.14 2010/10/17 14:17:49 tsutsui Exp $ */
+/* $NetBSD: mlcd.c,v 1.15 2014/03/14 08:55:40 martin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mlcd.c,v 1.14 2010/10/17 14:17:49 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: mlcd.c,v 1.15 2014/03/14 08:55:40 martin Exp $);
#include sys/param.h
#include sys/device.h
@@ -526,10 +526,8 @@ static void
mlcdstart_bp(struct mlcd_softc *sc)
{
struct mlcd_buf *bp;
- struct mlcd_pt *pt;
bp = sc-sc_bp;
- pt = sc-sc_pt[bp-lb_partno];
/* handle retry */
if (sc-sc_retry++ MLCD_MAXRETRY) {
@@ -720,14 +718,11 @@ mlcdwrite(dev_t dev, struct uio *uio, in
int
mlcdioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
{
- int unit, part;
+ int unit;
struct mlcd_softc *sc;
- struct mlcd_pt *pt;
unit = MLCD_UNIT(dev);
- part = MLCD_PART(dev);
sc = device_lookup_private(mlcd_cd, unit);
- pt = sc-sc_pt[part];
switch (cmd) {
CVS commit: src/sys/rump/net/lib/libvirtif
Module Name:src Committed By: pooka Date: Fri Mar 14 10:06:22 UTC 2014 Modified Files: src/sys/rump/net/lib/libvirtif: virtif_user.c virtif_user.h Log Message: Remember to bump revision for the int my time VIF_DYING change yesterday. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libvirtif/virtif_user.c \ src/sys/rump/net/lib/libvirtif/virtif_user.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/net/lib/libvirtif/virtif_user.c diff -u src/sys/rump/net/lib/libvirtif/virtif_user.c:1.2 src/sys/rump/net/lib/libvirtif/virtif_user.c:1.3 --- src/sys/rump/net/lib/libvirtif/virtif_user.c:1.2 Thu Mar 13 20:55:26 2014 +++ src/sys/rump/net/lib/libvirtif/virtif_user.c Fri Mar 14 10:06:22 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: virtif_user.c,v 1.2 2014/03/13 20:55:26 pooka Exp $ */ +/* $NetBSD: virtif_user.c,v 1.3 2014/03/14 10:06:22 pooka Exp $ */ /* * Copyright (c) 2013 Antti Kantee. All Rights Reserved. @@ -51,7 +51,7 @@ #include if_virt.h #include virtif_user.h -#if VIFHYPER_REVISION != 20140302 +#if VIFHYPER_REVISION != 20140313 #error VIFHYPER_REVISION mismatch #endif Index: src/sys/rump/net/lib/libvirtif/virtif_user.h diff -u src/sys/rump/net/lib/libvirtif/virtif_user.h:1.2 src/sys/rump/net/lib/libvirtif/virtif_user.h:1.3 --- src/sys/rump/net/lib/libvirtif/virtif_user.h:1.2 Thu Mar 13 20:55:26 2014 +++ src/sys/rump/net/lib/libvirtif/virtif_user.h Fri Mar 14 10:06:22 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: virtif_user.h,v 1.2 2014/03/13 20:55:26 pooka Exp $ */ +/* $NetBSD: virtif_user.h,v 1.3 2014/03/14 10:06:22 pooka Exp $ */ /* * Copyright (c) 2013 Antti Kantee. All Rights Reserved. @@ -27,7 +27,7 @@ struct virtif_user; -#define VIFHYPER_REVISION 20140302 +#define VIFHYPER_REVISION 20140313 int VIFHYPER_CREATE(const char *, struct virtif_sc *, uint8_t *, struct virtif_user **);
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri Mar 14 11:27:41 UTC 2014 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14709 Log Message: Import dhcpcd-6.3.2 with the following changes: * Improvements to autoconf build emulation * CARRIER/NOCARRIER are now run outside of the IPv4 runs * validate domains correctly which contain a - on non bash shells * don't remove IPv6 addresses from internal state when added as tentative * HUP now rebinds, ALRM now releases - the -x and -k flags work as they used to * Add -M, --master option to force dhcpcd into master mode even if one interface is specified on the command line * Fix a crash when receiving a reconfigure key * Dumping a DHCPv4 lease works again * SEND_DAD code removed * hoplimit is no longer defined for DHCPv6 messages * hoplimit of 255 for IPv6 RS/ND message is now defined at the socket instead of ancillary data with the message Status: Vendor Tag: roy Release Tags: dhcpcd-6-3-2 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c C src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c C src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/if-pref.c C src/external/bsd/dhcpcd/dist/net.c U src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c U src/external/bsd/dhcpcd/dist/bpf.c C src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/platform-bsd.c U src/external/bsd/dhcpcd/dist/arp.c C src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c C src/external/bsd/dhcpcd/dist/ipv6nd.c U src/external/bsd/dhcpcd/dist/dhcp6.c U src/external/bsd/dhcpcd/dist/auth.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in C src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/auth.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dev.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if-pref.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6nd.h U src/external/bsd/dhcpcd/dist/net.h U src/external/bsd/dhcpcd/dist/platform.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c U src/external/bsd/dhcpcd/dist/crypt/crypt.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind 7 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist
CVS commit: src
Module Name:src
Committed By: rmind
Date: Fri Mar 14 11:29:45 UTC 2014
Modified Files:
src/sys/net/npf: npf.h npf_handler.c npf_impl.h npf_nat.c npf_session.c
src/usr.sbin/npf/npfctl: npf_parse.y npf_scan.l npf_show.c
Log Message:
NPF: add support for stateful-ends.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/net/npf/npf.h
cvs rdiff -u -r1.28 -r1.29 src/sys/net/npf/npf_handler.c
cvs rdiff -u -r1.49 -r1.50 src/sys/net/npf/npf_impl.h
cvs rdiff -u -r1.26 -r1.27 src/sys/net/npf/npf_nat.c
cvs rdiff -u -r1.30 -r1.31 src/sys/net/npf/npf_session.c
cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/npf/npfctl/npf_parse.y
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/npf/npfctl/npf_scan.l
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/npf/npfctl/npf_show.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/net/npf/npf.h
diff -u src/sys/net/npf/npf.h:1.37 src/sys/net/npf/npf.h:1.38
--- src/sys/net/npf/npf.h:1.37 Thu Feb 13 03:34:40 2014
+++ src/sys/net/npf/npf.h Fri Mar 14 11:29:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.h,v 1.37 2014/02/13 03:34:40 rmind Exp $ */
+/* $NetBSD: npf.h,v 1.38 2014/03/14 11:29:44 rmind Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -210,6 +210,7 @@ bool npf_autounload_p(void);
#define NPF_RULE_RETRST 0x0010
#define NPF_RULE_RETICMP 0x0020
#define NPF_RULE_DYNAMIC 0x0040
+#define NPF_RULE_MULTIENDS 0x0080
#define NPF_DYNAMIC_GROUP (NPF_RULE_GROUP | NPF_RULE_DYNAMIC)
Index: src/sys/net/npf/npf_handler.c
diff -u src/sys/net/npf/npf_handler.c:1.28 src/sys/net/npf/npf_handler.c:1.29
--- src/sys/net/npf/npf_handler.c:1.28 Fri Nov 8 00:38:26 2013
+++ src/sys/net/npf/npf_handler.c Fri Mar 14 11:29:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_handler.c,v 1.28 2013/11/08 00:38:26 rmind Exp $ */
+/* $NetBSD: npf_handler.c,v 1.29 2014/03/14 11:29:44 rmind Exp $ */
/*-
* Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_handler.c,v 1.28 2013/11/08 00:38:26 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_handler.c,v 1.29 2014/03/14 11:29:44 rmind Exp $);
#include sys/types.h
#include sys/param.h
@@ -229,7 +229,8 @@ npf_packet_handler(void *arg, struct mbu
* if session creation fails (e.g. due to unsupported protocol).
*/
if ((retfl NPF_RULE_STATEFUL) != 0 !se) {
- se = npf_session_establish(npc, nbuf, di);
+ se = npf_session_establish(npc, nbuf, di,
+ (retfl NPF_RULE_MULTIENDS) == 0);
if (se) {
/*
* Note: the reference on the rule procedure is
Index: src/sys/net/npf/npf_impl.h
diff -u src/sys/net/npf/npf_impl.h:1.49 src/sys/net/npf/npf_impl.h:1.50
--- src/sys/net/npf/npf_impl.h:1.49 Wed Feb 19 03:51:31 2014
+++ src/sys/net/npf/npf_impl.h Fri Mar 14 11:29:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_impl.h,v 1.49 2014/02/19 03:51:31 rmind Exp $ */
+/* $NetBSD: npf_impl.h,v 1.50 2014/03/14 11:29:44 rmind Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -311,7 +311,7 @@ void sess_htable_destroy(npf_sehash_t *
npf_session_t * npf_session_lookup(const npf_cache_t *, const nbuf_t *,
const int, bool *);
npf_session_t * npf_session_inspect(npf_cache_t *, nbuf_t *, const int, int *);
-npf_session_t * npf_session_establish(npf_cache_t *, nbuf_t *, const int);
+npf_session_t * npf_session_establish(npf_cache_t *, nbuf_t *, int, bool);
void npf_session_release(npf_session_t *);
void npf_session_expire(npf_session_t *);
bool npf_session_pass(const npf_session_t *, npf_rproc_t **);
Index: src/sys/net/npf/npf_nat.c
diff -u src/sys/net/npf/npf_nat.c:1.26 src/sys/net/npf/npf_nat.c:1.27
--- src/sys/net/npf/npf_nat.c:1.26 Wed Feb 19 03:51:31 2014
+++ src/sys/net/npf/npf_nat.c Fri Mar 14 11:29:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_nat.c,v 1.26 2014/02/19 03:51:31 rmind Exp $ */
+/* $NetBSD: npf_nat.c,v 1.27 2014/03/14 11:29:44 rmind Exp $ */
/*-
* Copyright (c) 2014 Mindaugas Rasiukevicius rmind at netbsd org
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_nat.c,v 1.26 2014/02/19 03:51:31 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_nat.c,v 1.27 2014/03/14 11:29:44 rmind Exp $);
#include sys/param.h
#include sys/types.h
@@ -669,7 +669,7 @@ npf_do_nat(npf_cache_t *npc, npf_session
* stream depends on other, stateless filtering rules.
*/
if (se == NULL) {
- nse = npf_session_establish(npc, nbuf, di);
+ nse = npf_session_establish(npc, nbuf, di, true);
if (nse == NULL) {
atomic_dec_uint(np-n_refcnt);
return ENOMEM;
Index: src/sys/net/npf/npf_session.c
diff -u src/sys/net/npf/npf_session.c:1.30 src/sys/net/npf/npf_session.c:1.31
--- src/sys/net/npf/npf_session.c:1.30 Fri Dec 6 01:33:37 2013
+++ src/sys/net/npf/npf_session.c Fri Mar 14 11:29:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_session.c,v 1.30 2013/12/06 01:33:37 rmind Exp $ */
+/*
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src
Committed By: roy
Date: Fri Mar 14 11:31:11 UTC 2014
Modified Files:
src/external/bsd/dhcpcd/dist: dhcp.c dhcpcd.8.in dhcpcd.c if-bsd.c
if-options.c ipv6nd.c net.c
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.26 -r1.27 src/external/bsd/dhcpcd/dist/dhcpcd.8.in
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcpcd/dist/dhcpcd.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcpcd/dist/if-bsd.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcpcd/dist/if-options.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/ipv6nd.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcpcd/dist/net.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/dhcpcd/dist/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/dhcp.c:1.11 src/external/bsd/dhcpcd/dist/dhcp.c:1.12
--- src/external/bsd/dhcpcd/dist/dhcp.c:1.11 Sat Mar 1 11:04:21 2014
+++ src/external/bsd/dhcpcd/dist/dhcp.c Fri Mar 14 11:31:11 2014
@@ -1,5 +1,5 @@
#include sys/cdefs.h
- __RCSID($NetBSD: dhcp.c,v 1.11 2014/03/01 11:04:21 roy Exp $);
+ __RCSID($NetBSD: dhcp.c,v 1.12 2014/03/14 11:31:11 roy Exp $);
/*
* dhcpcd - DHCP client daemon
@@ -1064,8 +1064,12 @@ read_lease(struct interface *ifp)
free(dhcp);
return NULL;
}
- syslog(LOG_DEBUG, %s: validated using 0x%08 PRIu32,
- ifp-name, state-auth.token-secretid);
+ if (state-auth.token)
+ syslog(LOG_DEBUG, %s: validated using 0x%08 PRIu32,
+ ifp-name, state-auth.token-secretid);
+ else
+ syslog(LOG_DEBUG, %s: accepted reconfigure key,
+ ifp-name);
}
return dhcp;
@@ -1347,7 +1351,7 @@ dhcp_close(struct interface *ifp)
state-raw_fd = -1;
}
if (state-udp_fd != -1) {
- /* we don't listen to events on the udp */
+ eloop_event_delete(ifp-ctx-eloop, state-udp_fd);
close(state-udp_fd);
state-udp_fd = -1;
}
@@ -2200,8 +2204,12 @@ dhcp_handledhcp(struct interface *iface,
iface, dhcp, from, 0);
return;
}
- syslog(LOG_DEBUG, %s: validated using 0x%08 PRIu32,
- iface-name, state-auth.token-secretid);
+ if (state-auth.token)
+ syslog(LOG_DEBUG, %s: validated using 0x%08 PRIu32,
+ iface-name, state-auth.token-secretid);
+ else
+ syslog(LOG_DEBUG, %s: accepted reconfigure key,
+ iface-name);
} else if (ifo-auth.options DHCPCD_AUTH_REQUIRE) {
log_dhcp1(LOG_ERR, no authentication, iface, dhcp, from, 0);
return;
@@ -2614,7 +2622,7 @@ dhcp_handleudp(void *arg)
/* Just read what's in the UDP fd and discard it as we always read
* from the raw fd */
- read(ctx-udp_fd, buffer, sizeof(buffer));
+ (void)read(ctx-udp_fd, buffer, sizeof(buffer));
}
static void
@@ -2629,7 +2637,7 @@ dhcp_handleifudp(void *arg)
/* Just read what's in the UDP fd and discard it as we always read
* from the raw fd */
- read(state-udp_fd, buffer, sizeof(buffer));
+ (void)read(state-udp_fd, buffer, sizeof(buffer));
}
static int
@@ -2673,25 +2681,23 @@ dhcp_open(struct interface *ifp)
}
int
-dhcp_dump(const char *ifname)
+dhcp_dump(struct dhcpcd_ctx *ctx, const char *ifname)
{
- struct dhcpcd_ctx ctx;
struct interface *ifp;
struct dhcp_state *state;
- int r;
- ifp = NULL;
+ if (ctx-ifaces == NULL) {
+ ctx-ifaces = malloc(sizeof(*ctx-ifaces));
+ if (ctx-ifaces == NULL)
+ return -1;
+ TAILQ_INIT(ctx-ifaces);
+ }
state = NULL;
- memset(ctx, 0, sizeof(ctx));
- ctx.ifaces = malloc(sizeof(*ctx.ifaces));
- if (ctx.ifaces == NULL)
- goto eexit;
- TAILQ_INIT(ctx.ifaces);
ifp = calloc(1, sizeof(*ifp));
if (ifp == NULL)
goto eexit;
- ifp-ctx = ctx;
- TAILQ_INSERT_HEAD(ctx.ifaces, ifp, next);
+ ifp-ctx = ctx;
+ TAILQ_INSERT_HEAD(ctx-ifaces, ifp, next);
ifp-if_data[IF_DATA_DHCP] = state = calloc(1, sizeof(*state));
if (state == NULL)
goto eexit;
@@ -2701,7 +2707,6 @@ dhcp_dump(const char *ifname)
strlcpy(ifp-name, ifname, sizeof(ifp-name));
snprintf(state-leasefile, sizeof(state-leasefile),
LEASEFILE, ifp-name);
- strlcpy(ifp-options-script, SCRIPT, sizeof(ifp-options-script));
state-new = read_lease(ifp);
if (state-new == NULL errno == ENOENT) {
strlcpy(state-leasefile, ifname, sizeof(state-leasefile));
@@ -2710,28 +2715,14 @@ dhcp_dump(const char *ifname)
if (state-new == NULL) {
if (errno == ENOENT)
syslog(LOG_ERR, %s: no lease to dump, ifname);
- r = -1;
- goto cexit;
+ return -1;
}
state-reason = DUMP;
- r = script_runreason(ifp, state-reason);
- goto cexit;
+ return script_runreason(ifp, state-reason);
eexit:
syslog(LOG_ERR, %s: %m, __func__);
- r = -1;
-
-cexit:
- if (state) {
- free(state-new);
- free(state);
- }
- if (ifp) {
- free(ifp-options);
- free(ifp);
- }
- free(ctx.ifaces);
- return r;
+ return -1;
}
void
Index: src/external/bsd/dhcpcd/dist/dhcpcd.8.in
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.26
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri Mar 14 11:32:34 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.3.2 To generate a diff of this commit: cvs rdiff -u -r1.1100 -r1.1101 src/doc/3RDPARTY cvs rdiff -u -r1.1903 -r1.1904 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.1100 src/doc/3RDPARTY:1.1101 --- src/doc/3RDPARTY:1.1100 Sun Mar 9 17:16:09 2014 +++ src/doc/3RDPARTY Fri Mar 14 11:32:34 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1100 2014/03/09 17:16:09 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1101 2014/03/14 11:32:34 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -302,8 +302,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 6.3.1 -Current Vers: 6.3.1 +Version: 6.3.2 +Current Vers: 6.3.2 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1903 src/doc/CHANGES:1.1904 --- src/doc/CHANGES:1.1903 Tue Mar 11 23:23:44 2014 +++ src/doc/CHANGES Fri Mar 14 11:32:34 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1903 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1904 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -372,3 +372,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: arm: Switched to GCC 4.8. [skrll 20140307] elftoolchain: import FreeBSD-2014-03-08 [christos 20140309] amd64: Switched to GCC 4.8. [christos 20140311] + dhcpcd(8): Import dhcpcd-6.3.2 [roy 20140314]
CVS commit: src/external/gpl3/gcc/lib/libobjc
Module Name:src
Committed By: christos
Date: Fri Mar 14 12:17:53 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libobjc: Makefile
Log Message:
Don't SSP a file that uses alloca.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/lib/libobjc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libobjc/Makefile
diff -u src/external/gpl3/gcc/lib/libobjc/Makefile:1.10 src/external/gpl3/gcc/lib/libobjc/Makefile:1.11
--- src/external/gpl3/gcc/lib/libobjc/Makefile:1.10 Sat Mar 1 05:00:42 2014
+++ src/external/gpl3/gcc/lib/libobjc/Makefile Fri Mar 14 08:17:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/03/01 10:00:42 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2014/03/14 12:17:53 christos Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -58,6 +58,7 @@ OBJCOPTS+= -fno-strict-aliasing -fexcept
OBJCOPTS.Object.m = -Wno-stack-protector
COPTS.sendmsg.c = -Wno-stack-protector
+COPTS.objc-act.c = -Wno-stack-protector
INCS= ${G_OBJC_H}
INCSDIR= /usr/include/objc
CVS commit: src/usr.bin/getaddrinfo
Module Name:src Committed By: ginsbach Date: Fri Mar 14 13:17:18 UTC 2014 Modified Files: src/usr.bin/getaddrinfo: getaddrinfo.c Log Message: add missing break To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/getaddrinfo/getaddrinfo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/getaddrinfo/getaddrinfo.c diff -u src/usr.bin/getaddrinfo/getaddrinfo.c:1.1 src/usr.bin/getaddrinfo/getaddrinfo.c:1.2 --- src/usr.bin/getaddrinfo/getaddrinfo.c:1.1 Mon Sep 30 06:19:22 2013 +++ src/usr.bin/getaddrinfo/getaddrinfo.c Fri Mar 14 13:17:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: getaddrinfo.c,v 1.1 2013/09/30 06:19:22 riastradh Exp $ */ +/* $NetBSD: getaddrinfo.c,v 1.2 2014/03/14 13:17:18 ginsbach Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: getaddrinfo.c,v 1.1 2013/09/30 06:19:22 riastradh Exp $); +__RCSID($NetBSD: getaddrinfo.c,v 1.2 2014/03/14 13:17:18 ginsbach Exp $); #include assert.h #include err.h @@ -101,6 +101,7 @@ main(int argc, char **argv) warnx(invalid protocol: %s, optarg); usage(); } + break; case 'P': hints.ai_flags |= AI_PASSIVE;
CVS commit: src/sys/arch/ia64/include
Module Name:src Committed By: cherry Date: Fri Mar 14 17:36:03 UTC 2014 Modified Files: src/sys/arch/ia64/include: asm.h Log Message: Add RCSID() macro To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/ia64/include/asm.h diff -u src/sys/arch/ia64/include/asm.h:1.6 src/sys/arch/ia64/include/asm.h:1.7 --- src/sys/arch/ia64/include/asm.h:1.6 Tue Jan 15 13:30:12 2013 +++ src/sys/arch/ia64/include/asm.h Fri Mar 14 17:36:03 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.6 2013/01/15 13:30:12 kiyohara Exp $ */ +/* $NetBSD: asm.h,v 1.7 2014/03/14 17:36:03 cherry Exp $ */ /* - * Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University @@ -202,6 +202,12 @@ label: ASCIZ msg;\ #endif /* __STDC__ */ +#ifdef __ELF__ +#define RCSID(name) .pushsection .ident; .asciz name; .popsection +#else +#define RCSID(name) .asciz name +#endif + /* * Kernel RCS ID tag and copyright macros */
CVS commit: src/sys/arch/ia64/ia64
Module Name:src
Committed By: cherry
Date: Fri Mar 14 17:45:38 UTC 2014
Modified Files:
src/sys/arch/ia64/ia64: machdep.c
Log Message:
Tweak the argument order passed to the elf executable entry point (usually
__start),
so as to make call to the C function ___start() easier from assembler.
We setup the memory stack frame for ___start(), before calling it.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/ia64/ia64/machdep.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/arch/ia64/ia64/machdep.c
diff -u src/sys/arch/ia64/ia64/machdep.c:1.34 src/sys/arch/ia64/ia64/machdep.c:1.35
--- src/sys/arch/ia64/ia64/machdep.c:1.34 Sun Jan 6 11:29:35 2013
+++ src/sys/arch/ia64/ia64/machdep.c Fri Mar 14 17:45:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.34 2013/01/06 11:29:35 kiyohara Exp $ */
+/* $NetBSD: machdep.c,v 1.35 2014/03/14 17:45:37 cherry Exp $ */
/*-
* Copyright (c) 2003,2004 Marcel Moolenaar
@@ -716,16 +716,16 @@ setregs(register struct lwp *l, struct e
kst = ksttop - 1;
if (((uintptr_t)kst 0x1ff) == 0x1f8)
*kst-- = 0;
- *kst-- = l-l_proc-p_psstrp; /* in3 = ps_strings */
+ *kst-- = stack;/* in3 = sp */
if (((uintptr_t)kst 0x1ff) == 0x1f8)
*kst-- = 0;
- *kst-- = 0;/* in2 = *obj */
+ *kst-- = l-l_proc-p_psstrp; /* in2 = ps_strings */
if (((uintptr_t)kst 0x1ff) == 0x1f8)
*kst-- = 0;
- *kst-- = 0;/* in1 = *cleanup */
+ *kst-- = 0;/* in1 = *obj */
if (((uintptr_t)kst 0x1ff) == 0x1f8)
*kst-- = 0;
- *kst = stack; /* in0 = sp */
+ *kst = 0;/* in0 = *cleanup */
tf-tf_special.ndirty = (ksttop - kst) 3;
} else {/* epc syscalls (default). */
tf-tf_special.cfm = (3UL62) | (3UL7) | 3UL;
@@ -737,18 +737,18 @@ setregs(register struct lwp *l, struct e
* Assumes that (bspstore 0x1f8) 0x1e0.
*/
- /* in0 = sp */
- suword((char *)tf-tf_special.bspstore - 32, stack);
+ /* in0 = *cleanup */
+ suword((char *)tf-tf_special.bspstore - 32, 0);
- /* in1 == *cleanup */
+ /* in1 == *obj */
suword((char *)tf-tf_special.bspstore - 24, 0);
- /* in2 == *obj */
- suword((char *)tf-tf_special.bspstore - 16, 0);
+ /* in2 == ps_strings */
+ suword((char *)tf-tf_special.bspstore - 16, l-l_proc-p_psstrp);
- /* in3 = ps_strings */
+ /* in3 = sp */
suword((char *)tf-tf_special.bspstore - 8,
- l-l_proc-p_psstrp);
+ stack);
}
CVS commit: src/lib/csu/arch/ia64
Module Name:src
Committed By: cherry
Date: Fri Mar 14 18:15:02 UTC 2014
Added Files:
src/lib/csu/arch/ia64: Makefile.inc crt0.S crtbegin.h crtend.S crti.S
crtn.S
Log Message:
Add crtstuff for ia64. Compile tested only
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/lib/csu/arch/ia64/Makefile.inc \
src/lib/csu/arch/ia64/crt0.S src/lib/csu/arch/ia64/crtbegin.h \
src/lib/csu/arch/ia64/crtend.S src/lib/csu/arch/ia64/crti.S \
src/lib/csu/arch/ia64/crtn.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/lib/csu/arch/ia64/Makefile.inc
diff -u /dev/null src/lib/csu/arch/ia64/Makefile.inc:1.1
--- /dev/null Fri Mar 14 18:15:02 2014
+++ src/lib/csu/arch/ia64/Makefile.inc Fri Mar 14 18:15:02 2014
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/03/14 18:15:02 cherry Exp $
+
+CPPFLAGS+= -DELFSIZE=64 -I${ARCHDIR}
Index: src/lib/csu/arch/ia64/crt0.S
diff -u /dev/null src/lib/csu/arch/ia64/crt0.S:1.1
--- /dev/null Fri Mar 14 18:15:02 2014
+++ src/lib/csu/arch/ia64/crt0.S Fri Mar 14 18:15:02 2014
@@ -0,0 +1,56 @@
+/* $NetBSD: crt0.S,v 1.1 2014/03/14 18:15:02 cherry Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Cherry G. Mathew of Backyard Innovations, UK, Ltd.
+ *
+ * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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 machine/asm.h
+
+RCSID($NetBSD: crt0.S,v 1.1 2014/03/14 18:15:02 cherry Exp $)
+
+STRONG_ALIAS(_start,__start)
+
+.proc __start
+.global __start
+
+/*
+ * Called with:
+ * in0 = cleanup
+ * in1 = obj
+ * in2 = ps_strings
+ * in3 = sp
+ * See: sys/arch/ia64/ia64/machdep.c:setregs()
+ */
+
+__start:
+ .regstk 4, 0, 0, 0
+
+ mov sp = in3 /* Setup Memory Stack Pointer. */
+ alloc r31 = ar.pfs, 3, 0, 0, 0 /* Adjust backingstore for ___start() */
+ br.call.sptk.many rp = ___start
+
Index: src/lib/csu/arch/ia64/crtbegin.h
diff -u /dev/null src/lib/csu/arch/ia64/crtbegin.h:1.1
--- /dev/null Fri Mar 14 18:15:02 2014
+++ src/lib/csu/arch/ia64/crtbegin.h Fri Mar 14 18:15:02 2014
@@ -0,0 +1,41 @@
+/*-
+ * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry and
+ * Cherry G. Mathew of Backyard Innovations, UK, Ltd.
+ *
+ * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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
CVS commit: src/sys/arch/x68k/x68k
Module Name:src Committed By: tsutsui Date: Fri Mar 14 20:24:24 UTC 2014 Modified Files: src/sys/arch/x68k/x68k: locore.s vectors.s Log Message: Sync bus error and address error handlers with other m68k implementation. Tested on X68030. Needs tests on 040 and 060turbo (though it should work as other m68k ports). The x68k port implemented 68060 support including these vector handlers as early as amiga back in 1996, but even after amiga's locore.s was improved several times (updating vectors at runtime to switch handlers per CPU types etc.), x68k's one has not been updated. After that, atari and mac68k pulled amiga's implementation, hp300 pulled mac68k, and then most other m68k ports pulled hp300 ones. Probably that's the reason why only x68k had different implementations (i.e. no reason that avoids using common handler implementation), and now it's time to prepare common arch/m68k/m68k/busaddrerr.s. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/sys/arch/x68k/x68k/locore.s cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x68k/x68k/vectors.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x68k/x68k/locore.s diff -u src/sys/arch/x68k/x68k/locore.s:1.114 src/sys/arch/x68k/x68k/locore.s:1.115 --- src/sys/arch/x68k/x68k/locore.s:1.114 Sat Mar 8 17:44:37 2014 +++ src/sys/arch/x68k/x68k/locore.s Fri Mar 14 20:24:24 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.114 2014/03/08 17:44:37 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.115 2014/03/14 20:24:24 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -185,6 +185,35 @@ Lis68020: movl #CPU_68020,%a0@ | and a 68020 CPU Lstart1: + /* + * Now that we know what CPU we have, initialize the address error + * and bus error handlers in the vector table: + * + * vectab+8bus error + * vectab+12 address error + */ + RELOC(cputype,%a0) + RELOC(vectab,%a2) +#if defined(M68060) + cmpl #CPU_68060,%a0@ | 68060? + jne 1f + movl #_C_LABEL(buserr60),%a2@(8) + movl #_C_LABEL(addrerr4060),%a2@(12) + jra Lstart2 +1: +#endif +#if defined(M68040) + cmpl #CPU_68040,%a0@ | 68040? + jne 1f + movl #_C_LABEL(buserr40),%a2@(8) + movl #_C_LABEL(addrerr4060),%a2@(12) + jra Lstart2 +1: +#endif + movl #_C_LABEL(busaddrerr2030),%a2@(8) + movl #_C_LABEL(busaddrerr2030),%a2@(12) + +Lstart2: /* initialize source/destination control registers for movs */ moveq #FC_USERD,%d0 | user space movc %d0,%sfc | as source @@ -205,10 +234,10 @@ Lstart1: #if NKSYMS || defined(DDB) || defined(MODULAR) RELOC(esym,%a0) | end of static kernel test/data/syms movl %a0@,%d5 - jne Lstart2 + jne Lstart3 #endif movl #_C_LABEL(end),%d5 | end of static kernel text/data -Lstart2: +Lstart3: RELOC(setmemrange,%a0) | call setmemrange() jbsr %a0@ | to probe all memory regions addl #PAGE_SIZE-1,%d5 @@ -363,39 +392,36 @@ Lenab3: */ #include m68k/m68k/trap_subr.s -ENTRY_NOPROFILE(buserr) -ENTRY_NOPROFILE(buserr60) | XXX - tstl _C_LABEL(nofault) | device probe? - jeq Lberr | no, handle as usual - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) -Lberr: #if defined(M68040) || defined(M68060) - cmpl #MMU_68040,_C_LABEL(mmutype) | 68040/060? - jne _C_LABEL(addrerr) | no, skip +ENTRY_NOPROFILE(addrerr4060) clrl %sp@- | stack adjust count moveml #0x,%sp@- | save user registers movl %usp,%a0 | save the user SP movl %a0,%sp@(FR_SP) | in the savearea - lea %sp@(FR_HW),%a1 | grab base of HW berr frame + movl %sp@(FR_HW+8),%sp@- + clrl %sp@- | dummy code + movl #T_ADDRERR,%sp@- | mark address error + jra _ASM_LABEL(faultstkadj) | and deal with it +#endif + #if defined(M68060) - cmpl #CPU_68060,_C_LABEL(cputype) | 68060? - jne Lbenot060 - movel %a1@(12),%d0 | grap FSLW +ENTRY_NOPROFILE(buserr60) | XXX + clrl %sp@- | stack adjust count + moveml %d0-%d7/%a0-%a7,%sp@- | save user registers + movl %usp,%a0 | save the user SP + movl %a0,%sp@(FR_SP) | in the savearea + movel %sp@(FR_HW+12),%d0 | FSLW btst #2,%d0 | branch prediction error? - jeq Lnobpe | no, skip - movc %cacr,%d1 - orl #IC60_CABC,%d1 | clear all branch cache entries - movc %d1,%cacr + jeq Lnobpe + movc %cacr,%d2 + orl #IC60_CABC,%d2 | clear all branch cache entries + movc %d2,%cacr movl %d0,%d1 andl #0x7ffd,%d1 | check other faults jeq _ASM_LABEL(faultstkadjnotrap2) Lnobpe: -| XXX this is not needed. -| movl %d0,%sp@ | code is FSLW now. - | we need to adjust for misaligned addresses - movl %a1@(8),%d1 | grab VA + movl %sp@(FR_HW+8),%d1 | grab VA btst #27,%d0 | check for mis-aligned access jeq Lberr3 | no, skip addl #28,%d1 | yes, get into next page @@ -404,68 +430,74 @@ Lnobpe: | XXX instr. case not done yet andl #PG_FRAME,%d1 | and truncate Lberr3: - movl %d1,%sp@- | push fault VA - movl %d0,%sp@- | and FSLW + movl %d1,%sp@- + movl %d0,%sp@- |
CVS commit: src/sys/arch/arm/s3c2xx0
Module Name:src Committed By: matt Date: Fri Mar 14 21:39:29 UTC 2014 Modified Files: src/sys/arch/arm/s3c2xx0: s3c2xx0_intr.h Log Message: #include sys/evcnt.h To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.h diff -u src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.h:1.14 src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.h:1.15 --- src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.h:1.14 Mon Jan 30 03:28:33 2012 +++ src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.h Fri Mar 14 21:39:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: s3c2xx0_intr.h,v 1.14 2012/01/30 03:28:33 nisimura Exp $ */ +/* $NetBSD: s3c2xx0_intr.h,v 1.15 2014/03/14 21:39:29 matt Exp $ */ /* * Copyright (c) 2002, 2003 Fujitsu Component Limited @@ -72,7 +72,7 @@ #ifndef _S3C2XX0_INTR_H_ #define _S3C2XX0_INTR_H_ - +#include sys/evcnt.h #include arm/cpu.h #include arm/armreg.h
CVS commit: src/sys/arch/evbarm/mini2440
Module Name:src Committed By: matt Date: Fri Mar 14 21:39:49 UTC 2014 Modified Files: src/sys/arch/evbarm/mini2440: mini2440_machdep.c Log Message: #include arm/locore.h To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/mini2440/mini2440_machdep.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/arch/evbarm/mini2440/mini2440_machdep.c diff -u src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.7 src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.8 --- src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.7 Wed Oct 30 06:47:18 2013 +++ src/sys/arch/evbarm/mini2440/mini2440_machdep.c Fri Mar 14 21:39:48 2014 @@ -131,7 +131,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mini2440_machdep.c,v 1.7 2013/10/30 06:47:18 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: mini2440_machdep.c,v 1.8 2014/03/14 21:39:48 matt Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -176,6 +176,7 @@ __KERNEL_RCSID(0, $NetBSD: mini2440_mac #include machine/autoconf.h +#include arm/locore.h #include arm/arm32/machdep.h #include arm/s3c2xx0/s3c2440reg.h
CVS commit: src/sys/arch/arm/s3c2xx0
Module Name:src Committed By: matt Date: Fri Mar 14 21:40:48 UTC 2014 Modified Files: src/sys/arch/arm/s3c2xx0: sscom.c sscom_s3c2410.c sscom_s3c2440.c sscom_s3c2800.c sscom_var.h Log Message: Cleanup sscom to make more SoC invariant To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/s3c2xx0/sscom.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/s3c2xx0/sscom_s3c2440.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/s3c2xx0/sscom_s3c2800.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/s3c2xx0/sscom_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/s3c2xx0/sscom.c diff -u src/sys/arch/arm/s3c2xx0/sscom.c:1.40 src/sys/arch/arm/s3c2xx0/sscom.c:1.41 --- src/sys/arch/arm/s3c2xx0/sscom.c:1.40 Mon Mar 10 04:25:51 2014 +++ src/sys/arch/arm/s3c2xx0/sscom.c Fri Mar 14 21:40:48 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sscom.c,v 1.40 2014/03/10 04:25:51 htodd Exp $ */ +/* $NetBSD: sscom.c,v 1.41 2014/03/14 21:40:48 matt Exp $ */ /* * Copyright (c) 2002, 2003 Fujitsu Component Limited @@ -98,7 +98,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sscom.c,v 1.40 2014/03/10 04:25:51 htodd Exp $); +__KERNEL_RCSID(0, $NetBSD: sscom.c,v 1.41 2014/03/14 21:40:48 matt Exp $); #include opt_sscom.h #include opt_ddb.h @@ -142,6 +142,7 @@ __KERNEL_RCSID(0, $NetBSD: sscom.c,v 1. #include sys/kauth.h #include sys/intr.h #include sys/bus.h +#include sys/mutex.h #include arm/s3c2xx0/s3c2xx0reg.h #include arm/s3c2xx0/s3c2xx0var.h @@ -244,8 +245,8 @@ void sscom_kgdb_putc (void *, int); #if (defined(MULTIPROCESSOR) || defined(LOCKDEBUG)) defined(SSCOM_MPLOCK) -#define SSCOM_LOCK(sc) simple_lock((sc)-sc_lock) -#define SSCOM_UNLOCK(sc) simple_unlock((sc)-sc_lock) +#define SSCOM_LOCK(sc) mutex_enter((sc)-sc_lock) +#define SSCOM_UNLOCK(sc) mutex_exit((sc)-sc_lock) #else @@ -365,7 +366,7 @@ sscom_enable_debugport(struct sscom_soft sc-sc_ucon = UCON_DEBUGPORT; bus_space_write_2(sc-sc_iot, sc-sc_ioh, SSCOM_UCON, sc-sc_ucon); sc-sc_umcon = UMCON_RTS|UMCON_DTR; - sc-set_modem_control(sc); + sc-sc_set_modem_control(sc); sscom_enable_rxint(sc); sscom_disable_txint(sc); SSCOM_UNLOCK(sc); @@ -402,7 +403,7 @@ sscom_attach_subr(struct sscom_softc *sc callout_init(sc-sc_diag_callout, 0); #if (defined(MULTIPROCESSOR) || defined(LOCKDEBUG)) defined(SSCOM_MPLOCK) - simple_lock_init(sc-sc_lock); + sc-sc_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_SERIAL); #endif sc-sc_ucon = UCON_RXINT_ENABLE|UCON_TXINT_ENABLE; @@ -410,12 +411,13 @@ sscom_attach_subr(struct sscom_softc *sc /* * set default for modem control hook */ - if (sc-set_modem_control == NULL) - sc-set_modem_control = sscom_set_modem_control; - if (sc-read_modem_status == NULL) - sc-read_modem_status = sscom_read_modem_status; + if (sc-sc_set_modem_control == NULL) + sc-sc_set_modem_control = sscom_set_modem_control; + if (sc-sc_read_modem_status == NULL) + sc-sc_read_modem_status = sscom_read_modem_status; /* Disable interrupts before configuring the device. */ + KASSERT(sc-sc_change_txrx_interrupts != NULL); sscom_disable_txrxint(sc); #ifdef KGDB @@ -640,7 +642,7 @@ sscomopen(dev_t dev, int flag, int mode, sscom_enable_txrxint(sc); /* Fetch the current modem control status, needed later. */ - sc-sc_msts = sc-read_modem_status(sc); + sc-sc_msts = sc-sc_read_modem_status(sc); #if 0 /* Clear PPS capture state on first open. */ @@ -1206,7 +1208,7 @@ sscom_loadchannelregs(struct sscom_softc bus_space_write_2(iot, ioh, SSCOM_UBRDIV, sc-sc_ubrdiv); bus_space_write_1(iot, ioh, SSCOM_ULCON, sc-sc_ulcon); - sc-set_modem_control(sc); + sc-sc_set_modem_control(sc); bus_space_write_2(iot, ioh, SSCOM_UCON, sc-sc_ucon); } @@ -1262,7 +1264,7 @@ sscom_hwiflow(struct sscom_softc *sc) SET(sc-sc_umcon, sc-sc_mcr_rts); SET(sc-sc_mcr_active, sc-sc_mcr_rts); } - sc-set_modem_control(sc); + sc-sc_set_modem_control(sc); } @@ -1634,7 +1636,7 @@ sscomrxintr(void *arg) } - msts = sc-read_modem_status(sc); + msts = sc-sc_read_modem_status(sc); delta = msts ^ sc-sc_msts; sc-sc_msts = msts; Index: src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c diff -u src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c:1.6 src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c:1.7 --- src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c:1.6 Sat Oct 27 17:17:40 2012 +++ src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c Fri Mar 14 21:40:48 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sscom_s3c2410.c,v 1.6 2012/10/27 17:17:40 chs Exp $ */ +/* $NetBSD: sscom_s3c2410.c,v 1.7 2014/03/14 21:40:48 matt Exp $ */ /* * Copyright (c) 2002, 2003 Fujitsu Component Limited @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sscom_s3c2410.c,v 1.6 2012/10/27 17:17:40 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: sscom_s3c2410.c,v 1.7
CVS commit: [matt-nb5-mips64] src/sys/kern
Module Name:src
Committed By: matt
Date: Fri Mar 14 21:45:42 UTC 2014
Modified Files:
src/sys/kern [matt-nb5-mips64]: kern_malloc.c
Log Message:
Make sure uvm_km_suballoc returned the correctly sized submap.
To generate a diff of this commit:
cvs rdiff -u -r1.121.10.1 -r1.121.10.2 src/sys/kern/kern_malloc.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/kern/kern_malloc.c
diff -u src/sys/kern/kern_malloc.c:1.121.10.1 src/sys/kern/kern_malloc.c:1.121.10.2
--- src/sys/kern/kern_malloc.c:1.121.10.1 Wed Apr 21 00:28:16 2010
+++ src/sys/kern/kern_malloc.c Fri Mar 14 21:45:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_malloc.c,v 1.121.10.1 2010/04/21 00:28:16 matt Exp $ */
+/* $NetBSD: kern_malloc.c,v 1.121.10.2 2014/03/14 21:45:41 matt Exp $ */
/*
* Copyright (c) 1987, 1991, 1993
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_malloc.c,v 1.121.10.1 2010/04/21 00:28:16 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_malloc.c,v 1.121.10.2 2014/03/14 21:45:41 matt Exp $);
#include sys/param.h
#include sys/proc.h
@@ -918,9 +918,6 @@ kmeminit(void)
*/
kmeminit_nkmempages();
- kmemusage = (struct kmemusage *) uvm_km_alloc(kernel_map,
- (vsize_t)(nkmempages * sizeof(struct kmemusage)), 0,
- UVM_KMF_WIRED|UVM_KMF_ZERO);
kmb = 0;
kmem_map = uvm_km_suballoc(kernel_map, kmb,
kml, ((vsize_t)nkmempages PAGE_SHIFT),
@@ -928,6 +925,12 @@ kmeminit(void)
uvm_km_vacache_init(kmem_map, kvakmem, 0);
kmembase = (char *)kmb;
kmemlimit = (char *)kml;
+
+ KASSERT(((kmemlimit - kmembase) PAGE_SHIFT) == nkmempages);
+
+ kmemusage = (struct kmemusage *) uvm_km_alloc(kernel_map,
+ (vsize_t)(nkmempages * sizeof(struct kmemusage)), 0,
+ UVM_KMF_WIRED|UVM_KMF_ZERO);
#ifdef KMEMSTATS
for (indx = 0; indx MINBUCKET + 16; indx++) {
if (1 indx = PAGE_SIZE)
CVS commit: src/sys
Module Name:src
Committed By: mrg
Date: Fri Mar 14 21:59:41 UTC 2014
Modified Files:
src/sys/arch/macppc/dev: am79c950.c cuda.c mesh.c pmu.c snapper.c
src/sys/arch/macppc/macppc: disksubr.c
src/sys/arch/powerpc/oea: cpu_subr.c
src/sys/dev/pci: gffb.c
Log Message:
remove various set-but-unused variables.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/macppc/dev/am79c950.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/macppc/dev/cuda.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/macppc/dev/mesh.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/macppc/dev/pmu.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/macppc/dev/snapper.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/macppc/macppc/disksubr.c
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/powerpc/oea/cpu_subr.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/gffb.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/arch/macppc/dev/am79c950.c
diff -u src/sys/arch/macppc/dev/am79c950.c:1.32 src/sys/arch/macppc/dev/am79c950.c:1.33
--- src/sys/arch/macppc/dev/am79c950.c:1.32 Tue Jul 26 08:36:02 2011
+++ src/sys/arch/macppc/dev/am79c950.c Fri Mar 14 21:59:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: am79c950.c,v 1.32 2011/07/26 08:36:02 macallan Exp $ */
+/* $NetBSD: am79c950.c,v 1.33 2014/03/14 21:59:41 mrg Exp $ */
/*-
* Copyright (c) 1997 David Huang k...@bga.com
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: am79c950.c,v 1.32 2011/07/26 08:36:02 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: am79c950.c,v 1.33 2014/03/14 21:59:41 mrg Exp $);
#include opt_inet.h
@@ -484,9 +484,9 @@ mcintr(void *arg)
integrate void
mc_tint(struct mc_softc *sc)
{
- u_int8_t xmtrc, xmtfs;
+ u_int8_t xmtfs;
- xmtrc = NIC_GET(sc, MACE_XMTRC);
+ (void)NIC_GET(sc, MACE_XMTRC);
xmtfs = NIC_GET(sc, MACE_XMTFS);
if ((xmtfs XMTSV) == 0)
Index: src/sys/arch/macppc/dev/cuda.c
diff -u src/sys/arch/macppc/dev/cuda.c:1.18 src/sys/arch/macppc/dev/cuda.c:1.19
--- src/sys/arch/macppc/dev/cuda.c:1.18 Tue Jul 30 15:31:49 2013
+++ src/sys/arch/macppc/dev/cuda.c Fri Mar 14 21:59:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cuda.c,v 1.18 2013/07/30 15:31:49 joerg Exp $ */
+/* $NetBSD: cuda.c,v 1.19 2014/03/14 21:59:41 mrg Exp $ */
/*-
* Copyright (c) 2006 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cuda.c,v 1.18 2013/07/30 15:31:49 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: cuda.c,v 1.19 2014/03/14 21:59:41 mrg Exp $);
#include sys/param.h
#include sys/systm.h
@@ -270,7 +270,6 @@ cuda_attach(device_t parent, device_t se
static void
cuda_init(struct cuda_softc *sc)
{
- volatile int i;
uint8_t reg;
reg = cuda_read_reg(sc, vDirB);
@@ -293,7 +292,7 @@ cuda_init(struct cuda_softc *sc)
cuda_idle(sc); /* set ADB bus state to idle */
/* sort of a device reset */
- i = cuda_read_reg(sc, vSR); /* clear interrupt */
+ (void)cuda_read_reg(sc, vSR); /* clear interrupt */
cuda_write_reg(sc, vIER, 0x04); /* no interrupts while clearing */
cuda_idle(sc); /* reset state to idle */
delay(150);
@@ -304,7 +303,7 @@ cuda_init(struct cuda_softc *sc)
cuda_clear_tip(sc);
delay(150);
cuda_idle(sc); /* back to idle state */
- i = cuda_read_reg(sc, vSR); /* clear interrupt */
+ (void)cuda_read_reg(sc, vSR); /* clear interrupt */
cuda_write_reg(sc, vIER, 0x84); /* ints ok now */
}
@@ -506,7 +505,7 @@ static int
cuda_intr(void *arg)
{
struct cuda_softc *sc = arg;
- int i, ending, type;
+ int ending, type;
uint8_t reg;
reg = cuda_read_reg(sc, vIFR); /* Read the interrupts */
@@ -651,7 +650,7 @@ switch_start:
break;
case CUDA_OUT:
- i = cuda_read_reg(sc, vSR); /* reset SR-intr in IFR */
+ (void)cuda_read_reg(sc, vSR); /* reset SR-intr in IFR */
sc-sc_sent++;
if (cuda_intr_state(sc)) { /* ADB intr low during write */
Index: src/sys/arch/macppc/dev/mesh.c
diff -u src/sys/arch/macppc/dev/mesh.c:1.35 src/sys/arch/macppc/dev/mesh.c:1.36
--- src/sys/arch/macppc/dev/mesh.c:1.35 Thu Jun 30 00:52:57 2011
+++ src/sys/arch/macppc/dev/mesh.c Fri Mar 14 21:59:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mesh.c,v 1.35 2011/06/30 00:52:57 matt Exp $ */
+/* $NetBSD: mesh.c,v 1.36 2014/03/14 21:59:41 mrg Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari.
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mesh.c,v 1.35 2011/06/30 00:52:57 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: mesh.c,v 1.36 2014/03/14 21:59:41 mrg Exp $);
#include sys/param.h
#include sys/buf.h
@@ -321,7 +321,7 @@ mesh_intr(void *arg)
struct mesh_softc *sc = arg;
struct mesh_scb *scb;
int fifocnt;
- u_char intr, exception, error, status0, status1;
+ u_char intr, exception, error, status0;
intr = mesh_read_reg(sc, MESH_INTERRUPT);
if (intr == 0) {
@@ -332,7 +332,7 @@ mesh_intr(void *arg)
exception = mesh_read_reg(sc, MESH_EXCEPTION);
error = mesh_read_reg(sc,
CVS commit: src/lib/libm/src
Module Name:src
Committed By: dsl
Date: Fri Mar 14 22:21:32 UTC 2014
Modified Files:
src/lib/libm/src: math_private.h
Log Message:
There is some very odd code in s_exp2.c that only works if 'double'
values are rounded to 53 bit mantissa in teh x87 registers.
This hasn't been true since Nov 11 2013.
Forcing a store-load for 'double' in STRICT_ASSIGN() seems to fix things
(at least enough for the few random test cases).
I suspect the code could be changed so that the number of mantissa bits
didn't matter.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libm/src/math_private.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/math_private.h
diff -u src/lib/libm/src/math_private.h:1.20 src/lib/libm/src/math_private.h:1.21
--- src/lib/libm/src/math_private.h:1.20 Tue Nov 19 19:24:34 2013
+++ src/lib/libm/src/math_private.h Fri Mar 14 22:21:31 2014
@@ -11,7 +11,7 @@
/*
* from: @(#)fdlibm.h 5.1 93/09/24
- * $NetBSD: math_private.h,v 1.20 2013/11/19 19:24:34 joerg Exp $
+ * $NetBSD: math_private.h,v 1.21 2014/03/14 22:21:31 dsl Exp $
*/
#ifndef _MATH_PRIVATE_H_
@@ -185,7 +185,7 @@ do {\
#define STRICT_ASSIGN(type, lval, rval) do { \
volatile type __lval; \
\
- if (sizeof(type) = sizeof(double)) \
+ if (sizeof(type) = sizeof(long double)) \
(lval) = (rval); \
else { \
__lval = (rval); \
CVS commit: [matt-nb5-mips64] src/sys/kern
Module Name:src Committed By: matt Date: Fri Mar 14 22:34:35 UTC 2014 Modified Files: src/sys/kern [matt-nb5-mips64]: kern_malloc.c Log Message: Deal with the issue that VM_MAP_INTRSAFE km_suballoc returns more than asked for so the space needs for kmemusage accounting has to needs adjusted as well. To generate a diff of this commit: cvs rdiff -u -r1.121.10.2 -r1.121.10.3 src/sys/kern/kern_malloc.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/kern/kern_malloc.c diff -u src/sys/kern/kern_malloc.c:1.121.10.2 src/sys/kern/kern_malloc.c:1.121.10.3 --- src/sys/kern/kern_malloc.c:1.121.10.2 Fri Mar 14 21:45:41 2014 +++ src/sys/kern/kern_malloc.c Fri Mar 14 22:34:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_malloc.c,v 1.121.10.2 2014/03/14 21:45:41 matt Exp $ */ +/* $NetBSD: kern_malloc.c,v 1.121.10.3 2014/03/14 22:34:35 matt Exp $ */ /* * Copyright (c) 1987, 1991, 1993 @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_malloc.c,v 1.121.10.2 2014/03/14 21:45:41 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_malloc.c,v 1.121.10.3 2014/03/14 22:34:35 matt Exp $); #include sys/param.h #include sys/proc.h @@ -926,7 +926,12 @@ kmeminit(void) kmembase = (char *)kmb; kmemlimit = (char *)kml; - KASSERT(((kmemlimit - kmembase) PAGE_SHIFT) == nkmempages); + /* + * Since the suballoc was VM_MAP_INTRSAFE, the allocated size + * may be larger than was we asked for. Recompute nkmempages + * to cover the additional space allocated. + */ + nkmempages = (kmemlimit - kmembase) PAGE_SHIFT; kmemusage = (struct kmemusage *) uvm_km_alloc(kernel_map, (vsize_t)(nkmempages * sizeof(struct kmemusage)), 0,
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: ozaki-r Date: Sat Mar 15 05:54:20 UTC 2014 Modified Files: src/sys/arch/arm/include: trap.h Log Message: Add breakpoint definitions for DTrace To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/include/trap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/trap.h diff -u src/sys/arch/arm/include/trap.h:1.8 src/sys/arch/arm/include/trap.h:1.9 --- src/sys/arch/arm/include/trap.h:1.8 Sat Jan 19 13:11:09 2008 +++ src/sys/arch/arm/include/trap.h Sat Mar 15 05:54:20 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.h,v 1.8 2008/01/19 13:11:09 chris Exp $ */ +/* $NetBSD: trap.h,v 1.9 2014/03/15 05:54:20 ozaki-r Exp $ */ /* * Copyright (c) 1995 Mark Brinicombe. @@ -62,6 +62,14 @@ #define GDB_THUMB_BREAKPOINT 0xdefe /* Thumb in GDB */ #define KERNEL_BREAKPOINT 0xe7ff /* Used by DDB */ +/* + * DTrace uses 0xe7fffef0 to 0xe7fffeff as breakpoints. + * The first byte is used to encode a cond value. + */ +#define DTRACE_BREAKPOINT 0xe7fffef0 +#define DTRACE_BREAKPOINT_MASK 0xfff0 +#define DTRACE_IS_BREAKPOINT(insn) ((insn DTRACE_BREAKPOINT_MASK) == DTRACE_BREAKPOINT) + #define KBPT_ASM .word 0xe7ffdefe #define USER_BREAKPOINT GDB_BREAKPOINT
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: ozaki-r
Date: Sat Mar 15 05:58:30 UTC 2014
Modified Files:
src/sys/arch/arm/arm: undefined.c
Log Message:
Add a trap handler for DTrace FBT provider
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/arm/undefined.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/arch/arm/arm/undefined.c
diff -u src/sys/arch/arm/arm/undefined.c:1.52 src/sys/arch/arm/arm/undefined.c:1.53
--- src/sys/arch/arm/arm/undefined.c:1.52 Wed Mar 5 02:18:30 2014
+++ src/sys/arch/arm/arm/undefined.c Sat Mar 15 05:58:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: undefined.c,v 1.52 2014/03/05 02:18:30 matt Exp $ */
+/* $NetBSD: undefined.c,v 1.53 2014/03/15 05:58:30 ozaki-r Exp $ */
/*
* Copyright (c) 2001 Ben Harris.
@@ -48,13 +48,14 @@
#include opt_ddb.h
#include opt_kgdb.h
+#include opt_dtrace.h
#include sys/param.h
#ifdef KGDB
#include sys/kgdb.h
#endif
-__KERNEL_RCSID(0, $NetBSD: undefined.c,v 1.52 2014/03/05 02:18:30 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: undefined.c,v 1.53 2014/03/15 05:58:30 ozaki-r Exp $);
#include sys/kmem.h
#include sys/queue.h
@@ -220,6 +221,45 @@ static struct undefined_handler gdb_uh;
static struct undefined_handler gdb_uh_thumb;
#endif
+#ifdef KDTRACE_HOOKS
+#include sys/dtrace_bsd.h
+
+/* Not used for now, but needed for dtrace/fbt modules */
+dtrace_doubletrap_func_t dtrace_doubletrap_func = NULL;
+dtrace_trap_func_t dtrace_trap_func = NULL;
+
+int (* dtrace_invop_jump_addr)(uintptr_t, uintptr_t *, uintptr_t);
+void (* dtrace_emulation_jump_addr)(int, struct trapframe *);
+
+static int
+dtrace_trapper(u_int addr, struct trapframe *frame)
+{
+ int op;
+ struct trapframe back;
+ u_int insn = read_insn(addr, false);
+
+ if (dtrace_invop_jump_addr == NULL || dtrace_emulation_jump_addr == NULL)
+ return 1;
+
+ if (!DTRACE_IS_BREAKPOINT(insn))
+ return 1;
+
+ /* cond value is encoded in the first byte */
+ if (!arm_cond_ok_p(__SHIFTIN(insn, INSN_COND_MASK), frame-tf_spsr)) {
+ frame-tf_pc += INSN_SIZE;
+ return 0;
+ }
+
+ back = *frame;
+ op = dtrace_invop_jump_addr(addr, (uintptr_t *) frame-tf_svc_sp, frame-tf_r0);
+ *frame = back;
+
+ dtrace_emulation_jump_addr(op, frame);
+
+ return 0;
+}
+#endif
+
void
undefined_init(void)
{
@@ -262,6 +302,15 @@ undefinedinstruction(trapframe_t *tf)
und_ev.ev_count++;
+#ifdef KDTRACE_HOOKS
+ if ((tf-tf_spsr PSR_MODE) != PSR_USR32_MODE) {
+ tf-tf_pc -= INSN_SIZE;
+ if (dtrace_trapper(tf-tf_pc, tf) == 0)
+ return;
+ tf-tf_pc += INSN_SIZE; /* Reset for the rest code */
+ }
+#endif
+
/* Enable interrupts if they were enabled before the exception. */
#ifdef acorn26
if ((tf-tf_r15 R15_IRQ_DISABLE) == 0)
CVS commit: src/sys/arch/dreamcast/dev
Module Name:src Committed By: martin Date: Fri Mar 14 08:50:08 UTC 2014 Modified Files: src/sys/arch/dreamcast/dev: gdrom.c Log Message: Remove an unused variable To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/arch/dreamcast/dev/gdrom.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/dreamcast/dreamcast
Module Name:src Committed By: martin Date: Fri Mar 14 08:51:06 UTC 2014 Modified Files: src/sys/arch/dreamcast/dreamcast: machdep.c Log Message: Remove an unused variable To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/dreamcast/dreamcast/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/dreamcast/dev/maple
Module Name:src Committed By: martin Date: Fri Mar 14 08:55:41 UTC 2014 Modified Files: src/sys/arch/dreamcast/dev/maple: maple.c mlcd.c Log Message: Remove unused variables To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/arch/dreamcast/dev/maple/maple.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/dreamcast/dev/maple/mlcd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/net/lib/libvirtif
Module Name:src Committed By: pooka Date: Fri Mar 14 10:06:22 UTC 2014 Modified Files: src/sys/rump/net/lib/libvirtif: virtif_user.c virtif_user.h Log Message: Remember to bump revision for the int my time VIF_DYING change yesterday. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libvirtif/virtif_user.c \ src/sys/rump/net/lib/libvirtif/virtif_user.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri Mar 14 11:27:41 UTC 2014 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14709 Log Message: Import dhcpcd-6.3.2 with the following changes: * Improvements to autoconf build emulation * CARRIER/NOCARRIER are now run outside of the IPv4 runs * validate domains correctly which contain a - on non bash shells * don't remove IPv6 addresses from internal state when added as tentative * HUP now rebinds, ALRM now releases - the -x and -k flags work as they used to * Add -M, --master option to force dhcpcd into master mode even if one interface is specified on the command line * Fix a crash when receiving a reconfigure key * Dumping a DHCPv4 lease works again * SEND_DAD code removed * hoplimit is no longer defined for DHCPv6 messages * hoplimit of 255 for IPv6 RS/ND message is now defined at the socket instead of ancillary data with the message Status: Vendor Tag: roy Release Tags: dhcpcd-6-3-2 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c C src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c C src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/if-pref.c C src/external/bsd/dhcpcd/dist/net.c U src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c U src/external/bsd/dhcpcd/dist/bpf.c C src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/platform-bsd.c U src/external/bsd/dhcpcd/dist/arp.c C src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c C src/external/bsd/dhcpcd/dist/ipv6nd.c U src/external/bsd/dhcpcd/dist/dhcp6.c U src/external/bsd/dhcpcd/dist/auth.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in C src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/auth.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dev.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if-pref.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6nd.h U src/external/bsd/dhcpcd/dist/net.h U src/external/bsd/dhcpcd/dist/platform.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c U src/external/bsd/dhcpcd/dist/crypt/crypt.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind 7 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist
CVS commit: src
Module Name:src Committed By: rmind Date: Fri Mar 14 11:29:45 UTC 2014 Modified Files: src/sys/net/npf: npf.h npf_handler.c npf_impl.h npf_nat.c npf_session.c src/usr.sbin/npf/npfctl: npf_parse.y npf_scan.l npf_show.c Log Message: NPF: add support for stateful-ends. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/net/npf/npf.h cvs rdiff -u -r1.28 -r1.29 src/sys/net/npf/npf_handler.c cvs rdiff -u -r1.49 -r1.50 src/sys/net/npf/npf_impl.h cvs rdiff -u -r1.26 -r1.27 src/sys/net/npf/npf_nat.c cvs rdiff -u -r1.30 -r1.31 src/sys/net/npf/npf_session.c cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/npf/npfctl/npf_parse.y cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/npf/npfctl/npf_scan.l cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/npf/npfctl/npf_show.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri Mar 14 11:31:11 UTC 2014 Modified Files: src/external/bsd/dhcpcd/dist: dhcp.c dhcpcd.8.in dhcpcd.c if-bsd.c if-options.c ipv6nd.c net.c Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/bsd/dhcpcd/dist/dhcp.c cvs rdiff -u -r1.26 -r1.27 src/external/bsd/dhcpcd/dist/dhcpcd.8.in cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcpcd/dist/dhcpcd.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcpcd/dist/if-bsd.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcpcd/dist/if-options.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/ipv6nd.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcpcd/dist/net.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri Mar 14 11:32:34 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.3.2 To generate a diff of this commit: cvs rdiff -u -r1.1100 -r1.1101 src/doc/3RDPARTY cvs rdiff -u -r1.1903 -r1.1904 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/lib/libobjc
Module Name:src Committed By: christos Date: Fri Mar 14 12:17:53 UTC 2014 Modified Files: src/external/gpl3/gcc/lib/libobjc: Makefile Log Message: Don't SSP a file that uses alloca. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/lib/libobjc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/getaddrinfo
Module Name:src Committed By: ginsbach Date: Fri Mar 14 13:17:18 UTC 2014 Modified Files: src/usr.bin/getaddrinfo: getaddrinfo.c Log Message: add missing break To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/getaddrinfo/getaddrinfo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/include
Module Name:src Committed By: cherry Date: Fri Mar 14 17:36:03 UTC 2014 Modified Files: src/sys/arch/ia64/include: asm.h Log Message: Add RCSID() macro To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/ia64
Module Name:src Committed By: cherry Date: Fri Mar 14 17:45:38 UTC 2014 Modified Files: src/sys/arch/ia64/ia64: machdep.c Log Message: Tweak the argument order passed to the elf executable entry point (usually __start), so as to make call to the C function ___start() easier from assembler. We setup the memory stack frame for ___start(), before calling it. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/ia64/ia64/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/csu/arch/ia64
Module Name:src Committed By: cherry Date: Fri Mar 14 18:15:02 UTC 2014 Added Files: src/lib/csu/arch/ia64: Makefile.inc crt0.S crtbegin.h crtend.S crti.S crtn.S Log Message: Add crtstuff for ia64. Compile tested only To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/lib/csu/arch/ia64/Makefile.inc \ src/lib/csu/arch/ia64/crt0.S src/lib/csu/arch/ia64/crtbegin.h \ src/lib/csu/arch/ia64/crtend.S src/lib/csu/arch/ia64/crti.S \ src/lib/csu/arch/ia64/crtn.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x68k/x68k
Module Name:src Committed By: tsutsui Date: Fri Mar 14 20:24:24 UTC 2014 Modified Files: src/sys/arch/x68k/x68k: locore.s vectors.s Log Message: Sync bus error and address error handlers with other m68k implementation. Tested on X68030. Needs tests on 040 and 060turbo (though it should work as other m68k ports). The x68k port implemented 68060 support including these vector handlers as early as amiga back in 1996, but even after amiga's locore.s was improved several times (updating vectors at runtime to switch handlers per CPU types etc.), x68k's one has not been updated. After that, atari and mac68k pulled amiga's implementation, hp300 pulled mac68k, and then most other m68k ports pulled hp300 ones. Probably that's the reason why only x68k had different implementations (i.e. no reason that avoids using common handler implementation), and now it's time to prepare common arch/m68k/m68k/busaddrerr.s. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/sys/arch/x68k/x68k/locore.s cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x68k/x68k/vectors.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/s3c2xx0
Module Name:src Committed By: matt Date: Fri Mar 14 21:39:29 UTC 2014 Modified Files: src/sys/arch/arm/s3c2xx0: s3c2xx0_intr.h Log Message: #include sys/evcnt.h To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/mini2440
Module Name:src Committed By: matt Date: Fri Mar 14 21:39:49 UTC 2014 Modified Files: src/sys/arch/evbarm/mini2440: mini2440_machdep.c Log Message: #include arm/locore.h To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/mini2440/mini2440_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/s3c2xx0
Module Name:src Committed By: matt Date: Fri Mar 14 21:40:48 UTC 2014 Modified Files: src/sys/arch/arm/s3c2xx0: sscom.c sscom_s3c2410.c sscom_s3c2440.c sscom_s3c2800.c sscom_var.h Log Message: Cleanup sscom to make more SoC invariant To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/s3c2xx0/sscom.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/s3c2xx0/sscom_s3c2440.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/s3c2xx0/sscom_s3c2800.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/s3c2xx0/sscom_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [matt-nb5-mips64] src/sys/kern
Module Name:src Committed By: matt Date: Fri Mar 14 21:45:42 UTC 2014 Modified Files: src/sys/kern [matt-nb5-mips64]: kern_malloc.c Log Message: Make sure uvm_km_suballoc returned the correctly sized submap. To generate a diff of this commit: cvs rdiff -u -r1.121.10.1 -r1.121.10.2 src/sys/kern/kern_malloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: mrg Date: Fri Mar 14 21:59:41 UTC 2014 Modified Files: src/sys/arch/macppc/dev: am79c950.c cuda.c mesh.c pmu.c snapper.c src/sys/arch/macppc/macppc: disksubr.c src/sys/arch/powerpc/oea: cpu_subr.c src/sys/dev/pci: gffb.c Log Message: remove various set-but-unused variables. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/macppc/dev/am79c950.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/macppc/dev/cuda.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/macppc/dev/mesh.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/macppc/dev/pmu.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/macppc/dev/snapper.c cvs rdiff -u -r1.48 -r1.49 src/sys/arch/macppc/macppc/disksubr.c cvs rdiff -u -r1.80 -r1.81 src/sys/arch/powerpc/oea/cpu_subr.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/gffb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/src
Module Name:src Committed By: dsl Date: Fri Mar 14 22:21:32 UTC 2014 Modified Files: src/lib/libm/src: math_private.h Log Message: There is some very odd code in s_exp2.c that only works if 'double' values are rounded to 53 bit mantissa in teh x87 registers. This hasn't been true since Nov 11 2013. Forcing a store-load for 'double' in STRICT_ASSIGN() seems to fix things (at least enough for the few random test cases). I suspect the code could be changed so that the number of mantissa bits didn't matter. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libm/src/math_private.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [matt-nb5-mips64] src/sys/kern
Module Name:src Committed By: matt Date: Fri Mar 14 22:34:35 UTC 2014 Modified Files: src/sys/kern [matt-nb5-mips64]: kern_malloc.c Log Message: Deal with the issue that VM_MAP_INTRSAFE km_suballoc returns more than asked for so the space needs for kmemusage accounting has to needs adjusted as well. To generate a diff of this commit: cvs rdiff -u -r1.121.10.2 -r1.121.10.3 src/sys/kern/kern_malloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: ozaki-r Date: Sat Mar 15 05:54:20 UTC 2014 Modified Files: src/sys/arch/arm/include: trap.h Log Message: Add breakpoint definitions for DTrace To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/include/trap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: ozaki-r Date: Sat Mar 15 05:58:30 UTC 2014 Modified Files: src/sys/arch/arm/arm: undefined.c Log Message: Add a trap handler for DTrace FBT provider To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/arm/undefined.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
