CVS commit: [pgoyette-compat] src/sys/net
Module Name:src
Committed By: pgoyette
Date: Fri Jan 11 07:55:53 UTC 2019
Modified Files:
src/sys/net [pgoyette-compat]: rtsock.c
Log Message:
Don't accept OIFLIST operation unless the rtsock_70_hook is loaded,
even though the results are otherwise identical to those on current.
To generate a diff of this commit:
cvs rdiff -u -r1.238.2.14 -r1.238.2.15 src/sys/net/rtsock.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/rtsock.c
diff -u src/sys/net/rtsock.c:1.238.2.14 src/sys/net/rtsock.c:1.238.2.15
--- src/sys/net/rtsock.c:1.238.2.14 Fri Jan 11 06:27:45 2019
+++ src/sys/net/rtsock.c Fri Jan 11 07:55:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock.c,v 1.238.2.14 2019/01/11 06:27:45 pgoyette Exp $ */
+/* $NetBSD: rtsock.c,v 1.238.2.15 2019/01/11 07:55:53 pgoyette Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.238.2.14 2019/01/11 06:27:45 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.238.2.15 2019/01/11 07:55:53 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1839,8 +1839,13 @@ sysctl_iflist(int af, struct rt_walkarg
info.rti_info[RTAX_IFP] = NULL;
if (w->w_where && w->w_tmem && w->w_needed <= 0) {
switch (type) {
- case NET_RT_IFLIST: /* current */
case NET_RT_OIFLIST: /* old _70 */
+if (rtsock_70_hook.f1 == NULL) {
+ error = EINVAL;
+ break;
+}
+/* FALLTHROUGH */
+ case NET_RT_IFLIST: /* current */
error = sysctl_iflist_if(ifp, w, , len);
break;
case NET_RT_OOIFLIST: /* old _50 */
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Fri Jan 11 07:14:58 UTC 2019 Modified Files: src/sys/dev/mii: brgphy.c Log Message: Remove extra PHY read in brgphy_mii_phy_auto(). To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/dev/mii/brgphy.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/mii/brgphy.c diff -u src/sys/dev/mii/brgphy.c:1.77 src/sys/dev/mii/brgphy.c:1.78 --- src/sys/dev/mii/brgphy.c:1.77 Tue Jan 8 03:14:51 2019 +++ src/sys/dev/mii/brgphy.c Fri Jan 11 07:14:57 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: brgphy.c,v 1.77 2019/01/08 03:14:51 msaitoh Exp $ */ +/* $NetBSD: brgphy.c,v 1.78 2019/01/11 07:14:57 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.77 2019/01/08 03:14:51 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.78 2019/01/11 07:14:57 msaitoh Exp $"); #include #include @@ -820,7 +820,6 @@ brgphy_mii_phy_auto(struct mii_softc *sc && (sc->mii_mpd_model == MII_MODEL_BROADCOM_BCM5701)) ktcr |= GTCR_MAN_MS | GTCR_ADV_MS; PHY_WRITE(sc, MII_100T2CR, ktcr); - ktcr = PHY_READ(sc, MII_100T2CR); } PHY_WRITE(sc, MII_ANAR, anar);
CVS commit: [pgoyette-compat] src/sys
Module Name:src
Committed By: pgoyette
Date: Fri Jan 11 06:27:45 UTC 2019
Modified Files:
src/sys/compat/common [pgoyette-compat]: compat_50_mod.c compat_mod.h
rtsock_50.c
src/sys/kern [pgoyette-compat]: compat_stub.c
src/sys/net [pgoyette-compat]: rtsock.c
src/sys/sys [pgoyette-compat]: compat_stub.h
Added Files:
src/sys/compat/net [pgoyette-compat]: route_50.h
Log Message:
Rework the various sysctl-related routines to call the correct code
for each version. While here, extract the 5.0 specific code instead
of including in the main rtsock.c code.
Also, clean up all the sysctl-related routines to prevent building
more than one copy, no matter how many places rtsock.c gets #include'd
into!
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/sys/compat/common/compat_50_mod.c
cvs rdiff -u -r1.1.42.23 -r1.1.42.24 src/sys/compat/common/compat_mod.h
cvs rdiff -u -r1.6.2.1 -r1.6.2.2 src/sys/compat/common/rtsock_50.c
cvs rdiff -u -r0 -r1.1.2.1 src/sys/compat/net/route_50.h
cvs rdiff -u -r1.1.2.32 -r1.1.2.33 src/sys/kern/compat_stub.c
cvs rdiff -u -r1.238.2.13 -r1.238.2.14 src/sys/net/rtsock.c
cvs rdiff -u -r1.1.2.44 -r1.1.2.45 src/sys/sys/compat_stub.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/compat/common/compat_50_mod.c
diff -u src/sys/compat/common/compat_50_mod.c:1.1.2.17 src/sys/compat/common/compat_50_mod.c:1.1.2.18
--- src/sys/compat/common/compat_50_mod.c:1.1.2.17 Fri Oct 12 22:30:54 2018
+++ src/sys/compat/common/compat_50_mod.c Fri Jan 11 06:27:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_50_mod.c,v 1.1.2.17 2018/10/12 22:30:54 pgoyette Exp $ */
+/* $NetBSD: compat_50_mod.c,v 1.1.2.18 2019/01/11 06:27:45 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.17 2018/10/12 22:30:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.18 2019/01/11 06:27:45 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -86,6 +86,7 @@ compat_50_init(void)
wsevent_50_init();
vnd_50_init();
rndpseudo_50_init();
+ rtsock_50_init();
return error;
@@ -106,6 +107,7 @@ compat_50_fini(void)
{
int error = 0;
+ rtsock_50_fini();
rndpseudo_50_fini();
vnd_50_fini();
wsevent_50_fini();
@@ -149,6 +151,7 @@ compat_50_fini(void)
wsevent_50_init();
vnd_50_init();
rndpseudo_50_init();
+ rtsock_50_init();
return error;
}
Index: src/sys/compat/common/compat_mod.h
diff -u src/sys/compat/common/compat_mod.h:1.1.42.23 src/sys/compat/common/compat_mod.h:1.1.42.24
--- src/sys/compat/common/compat_mod.h:1.1.42.23 Fri Oct 12 22:30:54 2018
+++ src/sys/compat/common/compat_mod.h Fri Jan 11 06:27:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_mod.h,v 1.1.42.23 2018/10/12 22:30:54 pgoyette Exp $ */
+/* $NetBSD: compat_mod.h,v 1.1.42.24 2019/01/11 06:27:45 pgoyette Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -74,6 +74,8 @@ void vnd_50_init(void);
void vnd_50_fini(void);
void rndpseudo_50_init(void);
void rndpseudo_50_fini(void);
+void rtsock_50_init(void);
+void rtsock_50_fini(void);
#endif
#ifdef COMPAT_40
Index: src/sys/compat/common/rtsock_50.c
diff -u src/sys/compat/common/rtsock_50.c:1.6.2.1 src/sys/compat/common/rtsock_50.c:1.6.2.2
--- src/sys/compat/common/rtsock_50.c:1.6.2.1 Mon May 21 04:36:03 2018
+++ src/sys/compat/common/rtsock_50.c Fri Jan 11 06:27:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_50.c,v 1.6.2.1 2018/05/21 04:36:03 pgoyette Exp $ */
+/* $NetBSD: rtsock_50.c,v 1.6.2.2 2019/01/11 06:27:45 pgoyette Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.6.2.1 2018/05/21 04:36:03 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.6.2.2 2019/01/11 06:27:45 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -78,6 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,
#define COMPAT_RTSOCK
#include
+#include
void
compat_50_rt_oifmsg(struct ifnet *ifp)
@@ -156,3 +157,20 @@ compat_50_iflist(struct ifnet *ifp, stru
w->w_where = (char *)w->w_where + len;
return 0;
}
+
+MODULE_SET_HOOK(rtsock_50_hook, "rts_50", compat_50_iflist);
+MODULE_UNSET_HOOK(rtsock_50_hook);
+
+void
+rtsock_50_init(void)
+{
+
+ rtsock_50_hook_set();
+}
+
+void
+rtsock_50_fini(void)
+{
+
+ rtsock_50_hook_unset();
+}
Index: src/sys/kern/compat_stub.c
diff -u src/sys/kern/compat_stub.c:1.1.2.32 src/sys/kern/compat_stub.c:1.1.2.33
--- src/sys/kern/compat_stub.c:1.1.2.32 Mon Oct 15 22:06:16 2018
+++ src/sys/kern/compat_stub.c Fri Jan 11 06:27:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_stub.c,v 1.1.2.32 2018/10/15 22:06:16 pgoyette Exp $ */
+/* $NetBSD: compat_stub.c,v 1.1.2.33 2019/01/11 06:27:45
CVS commit: [pgoyette-compat] src/sys/sys
Module Name:src
Committed By: pgoyette
Date: Fri Jan 11 06:18:17 UTC 2019
Modified Files:
src/sys/sys [pgoyette-compat]: module_hook.h
Log Message:
Separate macro arguments with for readability.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/sys/module_hook.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/sys/module_hook.h
diff -u src/sys/sys/module_hook.h:1.1.2.7 src/sys/sys/module_hook.h:1.1.2.8
--- src/sys/sys/module_hook.h:1.1.2.7 Fri Oct 12 10:28:29 2018
+++ src/sys/sys/module_hook.h Fri Jan 11 06:18:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: module_hook.h,v 1.1.2.7 2018/10/12 10:28:29 pgoyette Exp $ */
+/* $NetBSD: module_hook.h,v 1.1.2.8 2019/01/11 06:18:17 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
* unloaded.
*/
-#define MODULE_HOOK(hook,args) \
+#define MODULE_HOOK(hook, args) \
extern struct hook ## _t { \
kmutex_t mtx;\
kcondvar_t cv;\
@@ -55,7 +55,7 @@ extern struct hook ## _t { \
int (*f)args; \
} hook __cacheline_aligned;
-#define MODULE_HOOK2(hook,args1,args2)\
+#define MODULE_HOOK2(hook, args1, args2) \
extern struct hook ## _t { \
kmutex_t mtx;\
kcondvar_t cv;\
CVS commit: src/lib/libcurses
Module Name:src Committed By: dholland Date: Fri Jan 11 06:14:39 UTC 2019 Modified Files: src/lib/libcurses: curses_clear.3 Log Message: At some point we lost the text that explains the difference between clear() and erase(). Or possibly we never had any. Put some back. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libcurses/curses_clear.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/curses_clear.3 diff -u src/lib/libcurses/curses_clear.3:1.3 src/lib/libcurses/curses_clear.3:1.4 --- src/lib/libcurses/curses_clear.3:1.3 Wed Apr 16 13:35:00 2003 +++ src/lib/libcurses/curses_clear.3 Fri Jan 11 06:14:39 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: curses_clear.3,v 1.3 2003/04/16 13:35:00 wiz Exp $ +.\" $NetBSD: curses_clear.3,v 1.4 2019/01/11 06:14:39 dholland Exp $ .\" .\" Copyright (c) 2002 .\" Brett Lymn (bl...@netbsd.org, brett_l...@yahoo.com.au) @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" -.Dd August 12, 2002 +.Dd January 11, 2019 .Dt CURSES_CLEAR 3 .Os .Sh NAME @@ -78,6 +78,13 @@ and .Fn erase functions erase all characters on .Dv stdscr . +These differ in that +.Fn clear +uses +.Fn clearok +to force a complete redraw on the next refresh, and +.Fn erase +does not. .Fn wclear and .Fn werase
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Jan 11 05:13:26 UTC 2019 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Set I82579_LPI_CTRL register correctly in wm_set_eee_pchlan(). To generate a diff of this commit: cvs rdiff -u -r1.615 -r1.616 src/sys/dev/pci/if_wm.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/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.615 src/sys/dev/pci/if_wm.c:1.616 --- src/sys/dev/pci/if_wm.c:1.615 Wed Jan 9 08:28:22 2019 +++ src/sys/dev/pci/if_wm.c Fri Jan 11 05:13:26 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.615 2019/01/09 08:28:22 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.616 2019/01/11 05:13:26 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -83,7 +83,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.615 2019/01/09 08:28:22 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.616 2019/01/11 05:13:26 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -15077,7 +15077,7 @@ wm_set_eee_pchlan(struct wm_softc *sc) if ((rv = wm_read_emi_reg_locked(dev, pcs_status, )) != 0) goto release; - rv = wm_write_emi_reg_locked(dev, I82579_LPI_CTRL, lpi_ctrl); + rv = sc->phy.writereg_locked(dev, 1, I82579_LPI_CTRL, lpi_ctrl); release: sc->phy.release(sc);
CVS commit: src/sys/net
Module Name:src
Committed By: knakahara
Date: Fri Jan 11 02:57:21 UTC 2019
Modified Files:
src/sys/net: if_ppp.c
Log Message:
Fix missing splx in ppp_inproc().
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/sys/net/if_ppp.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/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.162 src/sys/net/if_ppp.c:1.163
--- src/sys/net/if_ppp.c:1.162 Fri Jan 11 02:55:41 2019
+++ src/sys/net/if_ppp.c Fri Jan 11 02:57:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.c,v 1.162 2019/01/11 02:55:41 knakahara Exp $ */
+/* $NetBSD: if_ppp.c,v 1.163 2019/01/11 02:57:21 knakahara Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/*
@@ -102,7 +102,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.162 2019/01/11 02:55:41 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.163 2019/01/11 02:57:21 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "ppp.h"
@@ -1725,6 +1725,7 @@ ppp_inproc(struct ppp_softc *sc, struct
/* pktq: inet or inet6 cases */
if (__predict_true(pktq)) {
if (__predict_false(!pktq_enqueue(pktq, m, 0))) {
+ splx(s);
ifp->if_iqdrops++;
goto bad;
}
@@ -1736,6 +1737,7 @@ ppp_inproc(struct ppp_softc *sc, struct
/* ifq: other protocol cases */
if (!inq) {
+ splx(s);
goto bad;
}
if (IF_QFULL(inq)) {
CVS commit: src/sys/net
Module Name:src
Committed By: knakahara
Date: Fri Jan 11 02:55:41 UTC 2019
Modified Files:
src/sys/net: if_ppp.c
Log Message:
Fix missing mutex_exit in ppp_create().
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/net/if_ppp.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/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.161 src/sys/net/if_ppp.c:1.162
--- src/sys/net/if_ppp.c:1.161 Tue Jun 26 06:48:02 2018
+++ src/sys/net/if_ppp.c Fri Jan 11 02:55:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ppp.c,v 1.161 2018/06/26 06:48:02 msaitoh Exp $ */
+/* $NetBSD: if_ppp.c,v 1.162 2019/01/11 02:55:41 knakahara Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/*
@@ -102,7 +102,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.161 2018/06/26 06:48:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.162 2019/01/11 02:55:41 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "ppp.h"
@@ -301,6 +301,7 @@ ppp_create(const char *name, int unit)
break;
else if (unit == sci->sc_unit) {
free(sc, M_DEVBUF);
+mutex_exit(_list_lock);
return NULL;
}
}
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Fri Jan 11 02:44:49 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc: rwlock.c
Log Message:
disable pause, only works on v9
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/rwlock.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/mpl/bind/dist/lib/isc/rwlock.c
diff -u src/external/mpl/bind/dist/lib/isc/rwlock.c:1.4 src/external/mpl/bind/dist/lib/isc/rwlock.c:1.5
--- src/external/mpl/bind/dist/lib/isc/rwlock.c:1.4 Thu Jan 10 13:09:45 2019
+++ src/external/mpl/bind/dist/lib/isc/rwlock.c Thu Jan 10 21:44:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rwlock.c,v 1.4 2019/01/10 18:09:45 christos Exp $ */
+/* $NetBSD: rwlock.c,v 1.5 2019/01/11 02:44:49 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -58,7 +58,8 @@
# define isc_rwlock_pause() __asm__ __volatile__ ("hint @pause")
#elif defined(__arm__) && defined(_ARM_ARCH_6)
# define isc_rwlock_pause() __asm__ __volatile__ ("yield")
-#elif defined(__sparc) || defined(__sparc__)
+// Disable pause, only works on v9
+#elif (defined(__sparc) || defined(__sparc__)) && defined(notdef)
# define isc_rwlock_pause() __asm__ __volatile__ ("pause")
#elif defined(__ppc__) || defined(_ARCH_PPC) || \
defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER)
CVS commit: xsrc/external/mit/libdrm/dist/amdgpu
Module Name:xsrc Committed By: christos Date: Fri Jan 11 02:34:53 UTC 2019 Modified Files: xsrc/external/mit/libdrm/dist/amdgpu: amdgpu_bo.c Log Message: fix compilation To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c diff -u xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c:1.1.1.3 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c:1.2 --- xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c:1.1.1.3 Thu Jan 10 03:49:54 2019 +++ xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c Thu Jan 10 21:34:53 2019 @@ -567,7 +567,7 @@ drm_public int amdgpu_find_bo_by_cpu_map if (!bo || !bo->cpu_ptr || size > bo->alloc_size) continue; if (cpu >= bo->cpu_ptr && - cpu < (void*)((uintptr_t)bo->cpu_ptr + bo->alloc_size)) + cpu < (void*)((char *)bo->cpu_ptr + bo->alloc_size)) break; }
CVS commit: src
Module Name:src Committed By: uwe Date: Thu Jan 10 23:10:23 UTC 2019 Modified Files: src/distrib/sets/lists/xdebug: md.amd64 md.i386 src/distrib/sets/lists/xserver: md.amd64 md.i386 src/external/mit/xorg/server/drivers: Makefile Log Message: Hook vboxvideo driver into the build. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/xdebug/md.amd64 cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/xdebug/md.i386 cvs rdiff -u -r1.103 -r1.104 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.120 -r1.121 src/distrib/sets/lists/xserver/md.i386 cvs rdiff -u -r1.96 -r1.97 src/external/mit/xorg/server/drivers/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xdebug/md.amd64 diff -u src/distrib/sets/lists/xdebug/md.amd64:1.41 src/distrib/sets/lists/xdebug/md.amd64:1.42 --- src/distrib/sets/lists/xdebug/md.amd64:1.41 Mon Dec 31 11:59:23 2018 +++ src/distrib/sets/lists/xdebug/md.amd64 Thu Jan 10 23:10:23 2019 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.41 2018/12/31 11:59:23 mrg Exp $ +# $NetBSD: md.amd64,v 1.42 2019/01/10 23:10:23 uwe Exp $ ./usr/X11R7/lib/libI810XvMC_g.a-unknown- debuglib,xorg,compatx11file ./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg,compatx11file ./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg,compatx11file @@ -169,6 +169,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tga_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vboxvideo_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vesa_drv.so.2.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmmouse_drv.so.13.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmware_drv.so.13.debug -unknown- xorg,debug Index: src/distrib/sets/lists/xdebug/md.i386 diff -u src/distrib/sets/lists/xdebug/md.i386:1.38 src/distrib/sets/lists/xdebug/md.i386:1.39 --- src/distrib/sets/lists/xdebug/md.i386:1.38 Mon Dec 31 11:59:23 2018 +++ src/distrib/sets/lists/xdebug/md.i386 Thu Jan 10 23:10:23 2019 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.38 2018/12/31 11:59:23 mrg Exp $ +# $NetBSD: md.i386,v 1.39 2019/01/10 23:10:23 uwe Exp $ ./usr/X11R7/lib/libI810XvMC_g.a-unknown- debuglib,xorg ./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg @@ -182,6 +182,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tga_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vboxvideo_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vesa_drv.so.2.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmmouse_drv.so.13.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmware_drv.so.13.debug -unknown- xorg,debug Index: src/distrib/sets/lists/xserver/md.amd64 diff -u src/distrib/sets/lists/xserver/md.amd64:1.103 src/distrib/sets/lists/xserver/md.amd64:1.104 --- src/distrib/sets/lists/xserver/md.amd64:1.103 Mon Dec 31 11:59:23 2018 +++ src/distrib/sets/lists/xserver/md.amd64 Thu Jan 10 23:10:23 2019 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.103 2018/12/31 11:59:23 mrg Exp $ +# $NetBSD: md.amd64,v 1.104 2019/01/10 23:10:23 uwe Exp $ ./usr/X11R7/bin/X -unknown- xorg ./usr/X11R7/bin/Xorg -unknown- xorg ./usr/X11R7/bin/cvt -unknown- xorg @@ -157,6 +157,8 @@ ./usr/X11R7/lib/modules/drivers/trident_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/tseng_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/vboxvideo_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/vboxvideo_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/vesa_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/vesa_drv.so.2 -unknown- xorg ./usr/X11R7/lib/modules/drivers/vga_drv.so -unknown- obsolete @@ -395,6 +397,7 @@ ./usr/X11R7/man/html4/tdfx.html-unknown- html,xorg ./usr/X11R7/man/html4/trident.html -unknown- html,xorg ./usr/X11R7/man/html4/tseng.html -unknown- html,xorg +./usr/X11R7/man/html4/vboxvideo.html -unknown- html,xorg ./usr/X11R7/man/html4/vesa.html-unknown- html,xorg ./usr/X11R7/man/html4/vga.html-unknown- obsolete ./usr/X11R7/man/html4/via.html-unknown- obsolete @@ -448,6 +451,7 @@ ./usr/X11R7/man/man4/tdfx.4-unknown- .man,xorg
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: mlelstv
Date: Thu Jan 10 23:01:57 UTC 2019
Modified Files:
src/sys/dev/ic: rtl8169.c
Log Message:
Fix handling of RTKQ_IM_HW quirk, the check was inverted.
Found by t...@useless-ficus.net, thanks.
Fixes PR/53858.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/dev/ic/rtl8169.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/ic/rtl8169.c
diff -u src/sys/dev/ic/rtl8169.c:1.155 src/sys/dev/ic/rtl8169.c:1.156
--- src/sys/dev/ic/rtl8169.c:1.155 Tue Nov 13 10:51:49 2018
+++ src/sys/dev/ic/rtl8169.c Thu Jan 10 23:01:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.155 2018/11/13 10:51:49 mlelstv Exp $ */
+/* $NetBSD: rtl8169.c,v 1.156 2019/01/10 23:01:57 mlelstv Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.155 2018/11/13 10:51:49 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.156 2019/01/10 23:01:57 mlelstv Exp $");
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
/*
@@ -1949,7 +1949,7 @@ re_init(struct ifnet *ifp)
*/
defer = 128000;
- if ((sc->sc_quirk & RTKQ_IM_HW) == 0) {
+ if ((sc->sc_quirk & RTKQ_IM_HW) != 0) {
period = 1;
defer = 0;
} else if ((sc->sc_quirk & RTKQ_PCIE) != 0) {
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Thu Jan 10 22:13:07 UTC 2019
Modified Files:
src/sys/dev/usb: usbdi.c
Log Message:
Avoid use after free when closing interrupt pipe transfer by calling
upm_close before destroying the interupt pipe xfer.
Found by kasan on wiz's machine.
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/sys/dev/usb/usbdi.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/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.180 src/sys/dev/usb/usbdi.c:1.181
--- src/sys/dev/usb/usbdi.c:1.180 Fri Nov 16 00:34:50 2018
+++ src/sys/dev/usb/usbdi.c Thu Jan 10 22:13:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.180 2018/11/16 00:34:50 manu Exp $ */
+/* $NetBSD: usbdi.c,v 1.181 2019/01/10 22:13:07 skrll Exp $ */
/*
* Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.180 2018/11/16 00:34:50 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.181 2019/01/10 22:13:07 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -258,13 +258,14 @@ usbd_close_pipe(struct usbd_pipe *pipe)
LIST_REMOVE(pipe, up_next);
pipe->up_endpoint->ue_refcnt--;
+ pipe->up_methods->upm_close(pipe);
+
if (pipe->up_intrxfer != NULL) {
usbd_unlock_pipe(pipe);
usbd_destroy_xfer(pipe->up_intrxfer);
usbd_lock_pipe(pipe);
}
- pipe->up_methods->upm_close(pipe);
usbd_unlock_pipe(pipe);
kmem_free(pipe, pipe->up_dev->ud_bus->ub_pipesize);
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Thu Jan 10 22:02:16 UTC 2019
Modified Files:
src/sys/kern: sysv_ipc.c
Log Message:
handle errors from loading the syscalls and bail early. establish sysctl
later.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/sysv_ipc.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/sysv_ipc.c
diff -u src/sys/kern/sysv_ipc.c:1.33 src/sys/kern/sysv_ipc.c:1.34
--- src/sys/kern/sysv_ipc.c:1.33 Mon Sep 3 12:29:35 2018
+++ src/sys/kern/sysv_ipc.c Thu Jan 10 17:02:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_ipc.c,v 1.33 2018/09/03 16:29:35 riastradh Exp $ */
+/* $NetBSD: sysv_ipc.c,v 1.34 2019/01/10 22:02:16 christos Exp $ */
/*-
* Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysv_ipc.c,v 1.33 2018/09/03 16:29:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_ipc.c,v 1.34 2019/01/10 22:02:16 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -195,15 +195,12 @@ sysv_ipc_modcmd(modcmd_t cmd, void *arg)
/* Set up the kauth listener */
sysvipcinit();
-#ifdef _MODULE
- /* Set up the common sysctl tree */
- sysctl_ipc_setup(_sysvipc_clog);
-#endif
-
/* Link the system calls */
error = syscall_establish(NULL, sysvipc_syscalls);
- if (error)
+ if (error) {
sysvipcfini();
+ return error;
+ }
/*
* Initialize each sub-component, including their
@@ -218,6 +215,11 @@ sysv_ipc_modcmd(modcmd_t cmd, void *arg)
#ifdef SYSVMSG
msginit(_sysvipc_clog);
#endif
+
+#ifdef _MODULE
+ /* Set up the common sysctl tree */
+ sysctl_ipc_setup(_sysvipc_clog);
+#endif
break;
case MODULE_CMD_FINI:
/*
@@ -253,16 +255,16 @@ sysv_ipc_modcmd(modcmd_t cmd, void *arg)
}
#endif
- /* Unlink the system calls. */
- error = syscall_disestablish(NULL, sysvipc_syscalls);
- if (error)
- return error;
-
#ifdef _MODULE
/* Remove the sysctl sub-trees */
sysctl_teardown(_sysvipc_clog);
#endif
+ /* Unlink the system calls. */
+ error = syscall_disestablish(NULL, sysvipc_syscalls);
+ if (error)
+ return error;
+
/* Remove the kauth listener */
sysvipcfini();
break;
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Thu Jan 10 19:00:17 UTC 2019
Modified Files:
src/usr.sbin/sysinst: menus.mi msg.mi.de msg.mi.en msg.mi.es msg.mi.fr
msg.mi.pl
Log Message:
PR install/53857: make the pkgsrc menu wider, so the first column fits
in various translations. While there shorten some (misleading) text.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/sysinst/menus.mi
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/msg.mi.de \
src/usr.sbin/sysinst/msg.mi.es
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/sysinst/msg.mi.en \
src/usr.sbin/sysinst/msg.mi.pl
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/sysinst/msg.mi.fr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/menus.mi
diff -u src/usr.sbin/sysinst/menus.mi:1.15 src/usr.sbin/sysinst/menus.mi:1.16
--- src/usr.sbin/sysinst/menus.mi:1.15 Thu Sep 20 12:27:42 2018
+++ src/usr.sbin/sysinst/menus.mi Thu Jan 10 19:00:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi,v 1.15 2018/09/20 12:27:42 rin Exp $ */
+/* $NetBSD: menus.mi,v 1.16 2019/01/10 19:00:17 martin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@ static menudesc menu_def[];
static void
src_legend(menudesc *menu, const char *legend, const char *text)
{
-wprintw(menu->mw, "%-25s %.50s", MSG_XLAT(legend), MSG_XLAT(text));
+wprintw(menu->mw, "%-35s %.50s", MSG_XLAT(legend), MSG_XLAT(text));
}
static void
Index: src/usr.sbin/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.10 src/usr.sbin/sysinst/msg.mi.de:1.11
--- src/usr.sbin/sysinst/msg.mi.de:1.10 Thu Nov 15 10:34:21 2018
+++ src/usr.sbin/sysinst/msg.mi.de Thu Jan 10 19:00:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.10 2018/11/15 10:34:21 martin Exp $ */
+/* $NetBSD: msg.mi.de,v 1.11 2019/01/10 19:00:17 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1093,14 +1093,13 @@ pkgin install
Weitere Informationen finden sich in der pkgin(1)-Manpage.}
message Install_pkgsrc {pkgsrc herunterladen und entpacken}
message pkgsrc
-{Welches Protokoll, welcher Host, welches Verzeichnis und welcher User/Passwort
-sollen zum Herunterladen von pkgsrc verwendet werden? Wenn der User auf "ftp"
-gesetzt wird, dann wird kein Passwort benötigt.
+{Welches Protokoll, welcher Host, welches Verzeichnis und welcher User/Passwort
+sollen zum Herunterladen von pkgsrc verwendet werden? Wenn der User auf "ftp"
+gesetzt wird, dann wird kein Passwort benötigt.
}
message Pkgsrc_dir {pkgsrc-Verzeichnis}
-message get_pkgsrc {pkgsrc zur Installation von Quellpaketen herunterladen und
-installieren}
+message get_pkgsrc {pkgsrc herunterladen und extrahieren}
message retry_pkgsrc_network {Netzwerkkonfiguration fehlgeschlagen. Noch einmal
versuchen?}
message quit_pkgsrc {Ohne Installation von pkgsrc beenden.}
Index: src/usr.sbin/sysinst/msg.mi.es
diff -u src/usr.sbin/sysinst/msg.mi.es:1.10 src/usr.sbin/sysinst/msg.mi.es:1.11
--- src/usr.sbin/sysinst/msg.mi.es:1.10 Thu Nov 15 10:34:21 2018
+++ src/usr.sbin/sysinst/msg.mi.es Thu Jan 10 19:00:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.10 2018/11/15 10:34:21 martin Exp $ */
+/* $NetBSD: msg.mi.es,v 1.11 2019/01/10 19:00:17 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1079,7 +1079,7 @@ la contraseña es opcional.
}
message Pkgsrc_dir {Directorio de pkgsrc}
message get_pkgsrc
-{Descargar y desempaquetar pkgsrc para compilar desde código fuente}
+{Descargar y desempaquetar pkgsrc}
message retry_pkgsrc_network
{La configuración de la red ha fallado. ¿Reintentar?}
message quit_pkgsrc {Salir sin instalar pkgsrc}
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.14 src/usr.sbin/sysinst/msg.mi.en:1.15
--- src/usr.sbin/sysinst/msg.mi.en:1.14 Thu Nov 15 10:34:21 2018
+++ src/usr.sbin/sysinst/msg.mi.en Thu Jan 10 19:00:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.14 2018/11/15 10:34:21 martin Exp $ */
+/* $NetBSD: msg.mi.en,v 1.15 2019/01/10 19:00:17 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1026,7 +1026,7 @@ will be used. If "user" is "ftp", then
}
message Pkgsrc_dir {pkgsrc directory}
-message get_pkgsrc {Fetch and unpack pkgsrc for building from source}
+message get_pkgsrc {Fetch and unpack pkgsrc}
message retry_pkgsrc_network {Network configuration failed. Retry?}
message quit_pkgsrc {Quit without installing pkgsrc}
message quit_pkgs_install {Quit installing binary pkgs}
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.14 src/usr.sbin/sysinst/msg.mi.pl:1.15
--- src/usr.sbin/sysinst/msg.mi.pl:1.14 Sun Dec 30 16:52:26 2018
+++ src/usr.sbin/sysinst/msg.mi.pl Thu Jan 10 19:00:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.14 2018/12/30 16:52:26 martin Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.15
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Thu Jan 10 18:41:56 UTC 2019
Modified Files:
src/lib/libedit: readline.c
Log Message:
PR/53856: F. Aragon: editline/libedit not prompting colors in readline mode
To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/lib/libedit/readline.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.148 src/lib/libedit/readline.c:1.149
--- src/lib/libedit/readline.c:1.148 Sun Dec 2 11:58:13 2018
+++ src/lib/libedit/readline.c Thu Jan 10 13:41:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.148 2018/12/02 16:58:13 christos Exp $ */
+/* $NetBSD: readline.c,v 1.149 2019/01/10 18:41:56 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.148 2018/12/02 16:58:13 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.149 2019/01/10 18:41:56 christos Exp $");
#endif /* not lint && not SCCSID */
#include
@@ -319,7 +319,7 @@ rl_initialize(void)
el_end(e);
return -1;
}
- el_set(e, EL_PROMPT, _get_prompt, RL_PROMPT_START_IGNORE);
+ el_set(e, EL_PROMPT_ESC, _get_prompt, RL_PROMPT_START_IGNORE);
el_set(e, EL_SIGNAL, rl_catch_signals);
/* set default mode to "emacs"-style and read setting afterwards */
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Thu Jan 10 18:09:45 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc: rwlock.c
Log Message:
no yield for early arm
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/isc/rwlock.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/mpl/bind/dist/lib/isc/rwlock.c
diff -u src/external/mpl/bind/dist/lib/isc/rwlock.c:1.3 src/external/mpl/bind/dist/lib/isc/rwlock.c:1.4
--- src/external/mpl/bind/dist/lib/isc/rwlock.c:1.3 Wed Jan 9 11:55:14 2019
+++ src/external/mpl/bind/dist/lib/isc/rwlock.c Thu Jan 10 13:09:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rwlock.c,v 1.3 2019/01/09 16:55:14 christos Exp $ */
+/* $NetBSD: rwlock.c,v 1.4 2019/01/10 18:09:45 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -56,7 +56,7 @@
# define isc_rwlock_pause() __asm__ __volatile__ ("rep; nop")
#elif defined(__ia64__)
# define isc_rwlock_pause() __asm__ __volatile__ ("hint @pause")
-#elif defined(__arm__)
+#elif defined(__arm__) && defined(_ARM_ARCH_6)
# define isc_rwlock_pause() __asm__ __volatile__ ("yield")
#elif defined(__sparc) || defined(__sparc__)
# define isc_rwlock_pause() __asm__ __volatile__ ("pause")
CVS commit: src/external/mpl/dhcp
Module Name:src
Committed By: christos
Date: Thu Jan 10 17:41:48 UTC 2019
Modified Files:
src/external/mpl/dhcp: Makefile.inc
src/external/mpl/dhcp/dist/common: dns.c
src/external/mpl/dhcp/dist/omapip: buffer.c connection.c dispatch.c
isclib.c
src/external/mpl/dhcp/dist/server: dhcpv6.c mdb6.c
src/external/mpl/dhcp/include: config.h
Log Message:
Gut omapip support since the socket stuff to support it is gone, and
adjust to the new isc library reality.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/dhcp/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/common/dns.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/omapip/buffer.c \
src/external/mpl/dhcp/dist/omapip/connection.c \
src/external/mpl/dhcp/dist/omapip/dispatch.c \
src/external/mpl/dhcp/dist/omapip/isclib.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/server/dhcpv6.c \
src/external/mpl/dhcp/dist/server/mdb6.c
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/dhcp/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/Makefile.inc
diff -u src/external/mpl/dhcp/Makefile.inc:1.4 src/external/mpl/dhcp/Makefile.inc:1.5
--- src/external/mpl/dhcp/Makefile.inc:1.4 Sun Aug 12 11:39:22 2018
+++ src/external/mpl/dhcp/Makefile.inc Thu Jan 10 12:41:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2018/08/12 15:39:22 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2019/01/10 17:41:47 christos Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -10,7 +10,7 @@ CWARNFLAGS.clang+= -Wno-tautological-com
-Wno-format-security -Wno-error=unused-const-variable
DIST:= ${.PARSEDIR}/dist
-BIND:= ${.PARSEDIR}/../../bsd/bind/dist
+BIND:= ${.PARSEDIR}/../../mpl/bind/dist
.PATH: ${DIST}/${DHCPSRCDIR}
COBJDIR!=cd ${.PARSEDIR}/lib/common && ${PRINTOBJDIR}
Index: src/external/mpl/dhcp/dist/common/dns.c
diff -u src/external/mpl/dhcp/dist/common/dns.c:1.2 src/external/mpl/dhcp/dist/common/dns.c:1.3
--- src/external/mpl/dhcp/dist/common/dns.c:1.2 Sat Apr 7 18:37:29 2018
+++ src/external/mpl/dhcp/dist/common/dns.c Thu Jan 10 12:41:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dns.c,v 1.2 2018/04/07 22:37:29 christos Exp $ */
+/* $NetBSD: dns.c,v 1.3 2019/01/10 17:41:47 christos Exp $ */
/* dns.c
@@ -29,14 +29,13 @@
*/
#include
-__RCSID("$NetBSD: dns.c,v 1.2 2018/04/07 22:37:29 christos Exp $");
+__RCSID("$NetBSD: dns.c,v 1.3 2019/01/10 17:41:47 christos Exp $");
/*! \file common/dns.c
*/
#include "dhcpd.h"
#include "arpa/nameser.h"
-#include
-#include
+#include
#include
/*
@@ -1482,8 +1481,9 @@ static int get_std_dhcid(dhcp_ddns_cb_t
unsigned id_len)
{
struct data_string *id = _cb->dhcid;
- isc_sha256_t sha256;
- unsigned char buf[ISC_SHA256_DIGESTLENGTH];
+ isc_md_t *md;
+ isc_result_t result;
+ unsigned char buf[256]; // XXX: big enough > 32
unsigned char fwd_buf[256];
unsigned fwd_buflen = 0;
@@ -1491,6 +1491,11 @@ static int get_std_dhcid(dhcp_ddns_cb_t
if (type < 0 || type > 65535)
return (0);
+ md = isc_md_new();
+ if (md == NULL) {
+ return (0);
+ }
+
/* We need to convert the fwd name to wire representation */
if (MRns_name_pton((char *)ddns_cb->fwd_name.data, fwd_buf, 256) == -1)
return (0);
@@ -1511,17 +1516,41 @@ static int get_std_dhcid(dhcp_ddns_cb_t
/* The next is the digest type, SHA-256 is 1 */
putUChar(id->buffer->data + 2, 1u);
+
/* Computing the digest */
- isc_sha256_init();
- isc_sha256_update(, identifier, id_len);
- isc_sha256_update(, fwd_buf, fwd_buflen);
- isc_sha256_final(buf, );
+ result = isc_md_init(md, ISC_MD_SHA256);
+ if (result != ISC_R_SUCCESS) {
+ goto end;
+ }
+
+ result = isc_md_update(md, identifier, id_len);
+ if (result != ISC_R_SUCCESS) {
+ goto end;
+ }
+
+ result = isc_md_update(md, fwd_buf, fwd_buflen);
+ if (result != ISC_R_SUCCESS) {
+ goto end;
+ }
+
+ result = isc_md_final(md, buf, _len);
+ if (result != ISC_R_SUCCESS) {
+ goto end;
+ }
+
+ isc_md_free(md);
+ md = NULL;
memcpy(id->buffer->data + 3, , ISC_SHA256_DIGESTLENGTH);
id->len = ISC_SHA256_DIGESTLENGTH + 2 + 1;
return (1);
+end:
+ if (md != NULL) {
+ isc_md_free(md);
+ }
+ return (0);
}
/*!
@@ -1551,8 +1580,9 @@ static int get_int_dhcid (dhcp_ddns_cb_t
unsigned len)
{
struct data_string *id = _cb->dhcid;
- unsigned char buf[ISC_MD5_DIGESTLENGTH];
- isc_md5_t md5;
+ unsigned char buf[256]; // XXX: big enough (> 16)
+ isc_md_t *md;
+ isc_result_t result;
int i;
/* Types can only be 0..(2^16)-1. */
@@ -1584,9 +1614,28 @@ static int get_int_dhcid (dhcp_ddns_cb_t
id->buffer->data[2] = "0123456789abcdef"[type % 15];
/* Mash together an MD5 hash of the identifier. */
- isc_md5_init();
- isc_md5_update(, data, len);
- isc_md5_final(, buf);
+ md = isc_md_new();
+ if (md == NULL) {
+ return (0);
+ }
+
+
CVS commit: src/sys/arch/ia64/include
Module Name:src
Committed By: scole
Date: Thu Jan 10 17:05:56 UTC 2019
Modified Files:
src/sys/arch/ia64/include: cpu.h lock.h
Log Message:
consolidate hint@pause in one place. remove mf.a from memory barriers
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/ia64/include/cpu.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/include/lock.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/cpu.h
diff -u src/sys/arch/ia64/include/cpu.h:1.16 src/sys/arch/ia64/include/cpu.h:1.17
--- src/sys/arch/ia64/include/cpu.h:1.16 Sat Apr 8 18:01:22 2017
+++ src/sys/arch/ia64/include/cpu.h Thu Jan 10 17:05:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.16 2017/04/08 18:01:22 scole Exp $ */
+/* $NetBSD: cpu.h,v 1.17 2019/01/10 17:05:56 scole Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -78,6 +78,7 @@
#include
#include
#include
+#include
#include
struct cpu_info {
@@ -178,12 +179,7 @@ int cpu_maxproc(void); /*XXX: Fill in ma
#define DELAY(x) __nothing /* XXX: FIXME */
-static inline void cpu_idle(void);
-static inline
-void cpu_idle(void)
-{
- asm ("hint @pause" ::: "memory");
-}
+#define cpu_idle() ia64_pause()
#endif /* _KERNEL_ */
#endif /* _IA64_CPU_H */
Index: src/sys/arch/ia64/include/lock.h
diff -u src/sys/arch/ia64/include/lock.h:1.6 src/sys/arch/ia64/include/lock.h:1.7
--- src/sys/arch/ia64/include/lock.h:1.6 Sun Sep 17 00:01:07 2017
+++ src/sys/arch/ia64/include/lock.h Thu Jan 10 17:05:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.6 2017/09/17 00:01:07 christos Exp $ */
+/* $NetBSD: lock.h,v 1.7 2019/01/10 17:05:56 scole Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@ __cpu_simple_lock_clear(__cpu_simple_loc
#ifdef _KERNEL
#define SPINLOCK_SPIN_HOOK /* nothing */
-#define SPINLOCK_BACKOFF_HOOK /* XXX(kochi): hint@pause */
+#define SPINLOCK_BACKOFF_HOOK /* XXX ia64_pause() */
#endif
@@ -116,26 +116,28 @@ __cpu_simple_unlock(__cpu_simple_lock_t
*lockp = __SIMPLELOCK_UNLOCKED;
}
-/* XXX mf.a overkill for these? */
static __inline void
mb_read(void)
{
- __asm __volatile("mf.a \n"
- "mf \n" ::: "memory");
+ __asm __volatile("mf \n" ::: "memory");
}
static __inline void
mb_write(void)
{
- __asm __volatile("mf.a \n"
- "mf \n" ::: "memory");
+ __asm __volatile("mf \n" ::: "memory");
}
static __inline void
mb_memory(void)
{
- __asm __volatile("mf.a \n"
- "mf \n" ::: "memory");
+ __asm __volatile("mf \n" ::: "memory");
+}
+
+static __inline void
+ia64_pause(void)
+{
+ __asm __volatile("hint @pause" ::: "memory");
}
#endif /* _IA64_LOCK_H_ */
CVS commit: xsrc/external/mit/xorg-server/dist/render
Module Name:xsrc Committed By: maya Date: Thu Jan 10 16:48:37 UTC 2019 Modified Files: xsrc/external/mit/xorg-server/dist/render: render.c Log Message: Remove duplicate length check (undo diff to upstream) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/render/render.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/dist/render/render.c diff -u xsrc/external/mit/xorg-server/dist/render/render.c:1.5 xsrc/external/mit/xorg-server/dist/render/render.c:1.6 --- xsrc/external/mit/xorg-server/dist/render/render.c:1.5 Mon Dec 31 09:50:02 2018 +++ xsrc/external/mit/xorg-server/dist/render/render.c Thu Jan 10 16:48:37 2019 @@ -262,7 +262,6 @@ ProcRenderQueryVersion(ClientPtr client) }; REQUEST(xRenderQueryVersionReq); -REQUEST_SIZE_MATCH(xRenderQueryVersionReq); REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
CVS commit: xsrc/external/mit/xorg-server/dist/glx
Module Name:xsrc
Committed By: maya
Date: Thu Jan 10 16:16:31 UTC 2019
Modified Files:
xsrc/external/mit/xorg-server/dist/glx: indirect_program.c
indirect_texture_compression.c singlepix.c swap_interval.c
Log Message:
Undo merge botch, duplicate length checks
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/glx/indirect_program.c \
xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c \
xsrc/external/mit/xorg-server/dist/glx/singlepix.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/glx/swap_interval.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/glx/indirect_program.c
diff -u xsrc/external/mit/xorg-server/dist/glx/indirect_program.c:1.4 xsrc/external/mit/xorg-server/dist/glx/indirect_program.c:1.5
--- xsrc/external/mit/xorg-server/dist/glx/indirect_program.c:1.4 Mon Dec 31 09:49:59 2018
+++ xsrc/external/mit/xorg-server/dist/glx/indirect_program.c Thu Jan 10 16:16:31 2019
@@ -58,8 +58,6 @@ DoGetProgramString(struct __GLXclientSta
REQUEST_FIXED_SIZE(xGLXVendorPrivateWithReplyReq, 8);
-REQUEST_FIXED_SIZE(xGLXVendorPrivateWithReplyReq, 8);
-
pc += __GLX_VENDPRIV_HDR_SIZE;
if (cx != NULL) {
GLenum target;
Index: xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c
diff -u xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c:1.4 xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c:1.5
--- xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c:1.4 Mon Dec 31 09:49:59 2018
+++ xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c Thu Jan 10 16:16:31 2019
@@ -45,8 +45,6 @@ __glXDisp_GetCompressedTexImage(struct _
REQUEST_FIXED_SIZE(xGLXSingleReq, 8);
-REQUEST_FIXED_SIZE(xGLXSingleReq, 8);
-
pc += __GLX_SINGLE_HDR_SIZE;
if (cx != NULL) {
const GLenum target = *(GLenum *) (pc + 0);
@@ -94,8 +92,6 @@ __glXDispSwap_GetCompressedTexImage(stru
REQUEST_FIXED_SIZE(xGLXSingleReq, 8);
-REQUEST_FIXED_SIZE(xGLXSingleReq, 8);
-
pc += __GLX_SINGLE_HDR_SIZE;
if (cx != NULL) {
const GLenum target = (GLenum) bswap_32(*(int *) (pc + 0));
Index: xsrc/external/mit/xorg-server/dist/glx/singlepix.c
diff -u xsrc/external/mit/xorg-server/dist/glx/singlepix.c:1.4 xsrc/external/mit/xorg-server/dist/glx/singlepix.c:1.5
--- xsrc/external/mit/xorg-server/dist/glx/singlepix.c:1.4 Mon Dec 31 09:49:59 2018
+++ xsrc/external/mit/xorg-server/dist/glx/singlepix.c Thu Jan 10 16:16:31 2019
@@ -105,8 +105,6 @@ __glXDisp_GetTexImage(__GLXclientState *
REQUEST_FIXED_SIZE(xGLXSingleReq, 20);
-REQUEST_FIXED_SIZE(xGLXSingleReq, 20);
-
cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), );
if (!cx) {
return error;
Index: xsrc/external/mit/xorg-server/dist/glx/swap_interval.c
diff -u xsrc/external/mit/xorg-server/dist/glx/swap_interval.c:1.3 xsrc/external/mit/xorg-server/dist/glx/swap_interval.c:1.4
--- xsrc/external/mit/xorg-server/dist/glx/swap_interval.c:1.3 Thu Aug 11 00:04:27 2016
+++ xsrc/external/mit/xorg-server/dist/glx/swap_interval.c Thu Jan 10 16:16:31 2019
@@ -48,8 +48,6 @@ DoSwapInterval(__GLXclientState * cl, GL
REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 4);
-REQUEST_FIXED_SIZE(xGLXVendorPrivateReq, 4);
-
cx = __glXLookupContextByTag(cl, tag);
if ((cx == NULL) || (cx->pGlxScreen == NULL)) {
CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting
Module Name:xsrc
Committed By: maya
Date: Thu Jan 10 14:33:11 UTC 2019
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
driver.c
Log Message:
pEnt isn't initialized at this point, don't free it
Undo diff to upstream.
There's a good chance we aren't using this code at all.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c:1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c:1.3 Mon Dec 31 09:50:00 2018
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c Thu Jan 10 14:33:11 2019
@@ -901,15 +901,12 @@ PreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
if (flags & PROBE_DETECT) {
- free(pEnt);
return FALSE;
}
/* Allocate driverPrivate */
-if (!GetRec(pScrn)) {
- free(pEnt);
+if (!GetRec(pScrn))
return FALSE;
-}
pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common
Module Name:xsrc
Committed By: maya
Date: Thu Jan 10 14:28:44 UTC 2019
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86pciBus.c
Log Message:
Undo unnecessary diff to vendor branch.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c:1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c:1.4 Mon Dec 31 09:50:00 2018
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c Thu Jan 10 14:28:44 2019
@@ -1072,7 +1072,8 @@ xf86VideoPtrToDriverList(struct pci_devi
any device */
const char *driverList[5] = { NULL, NULL, NULL, NULL, NULL };
-switch (dev->vendor_id) { /* AMD Geode LX */
+switch (dev->vendor_id) {
+/* AMD Geode LX */
case 0x1022:
if (dev->device_id == 0x2081)
driverList[0] = "geode";
CVS commit: src/lib/libwrap
Module Name:src
Committed By: christos
Date: Thu Jan 10 13:53:27 UTC 2019
Modified Files:
src/lib/libwrap: diag.c
Log Message:
PR/53851: Andreas Gustafsson: libwrap prints "m" instead of errno
Handle %m inline if needed, otherwise vasprintf strips the %m and...
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/libwrap/diag.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libwrap/diag.c
diff -u src/lib/libwrap/diag.c:1.11 src/lib/libwrap/diag.c:1.12
--- src/lib/libwrap/diag.c:1.11 Wed Oct 14 11:54:21 2015
+++ src/lib/libwrap/diag.c Thu Jan 10 08:53:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: diag.c,v 1.11 2015/10/14 15:54:21 christos Exp $ */
+/* $NetBSD: diag.c,v 1.12 2019/01/10 13:53:26 christos Exp $ */
/*
* Routines to report various classes of problems. Each report is decorated
@@ -16,7 +16,7 @@
#if 0
static char sccsid[] = "@(#) diag.c 1.1 94/12/28 17:42:20";
#else
-__RCSID("$NetBSD: diag.c,v 1.11 2015/10/14 15:54:21 christos Exp $");
+__RCSID("$NetBSD: diag.c,v 1.12 2019/01/10 13:53:26 christos Exp $");
#endif
#endif
@@ -45,26 +45,33 @@ static void tcpd_diag(int, const char *,
static void
tcpd_diag(int severity, const char *tag, const char *fmt, va_list ap)
{
-char *buf;
-int oerrno;
+char *buf, *buf2, *ptr;
-/* save errno in case we need it */
-oerrno = errno;
-
-if (vasprintf(, fmt, ap) == -1)
+if ((ptr = strstr(fmt, "%m")) != NULL) {
+ if (asprintf(, "%.*s%s%s", (int)(ptr - fmt), fmt, strerror(errno),
+ ptr + 2) == -1)
+ buf = __UNCONST(fmt);
+} else {
buf = __UNCONST(fmt);
+}
+
+
+if (vasprintf(, buf, ap) == -1)
+ buf2 = buf;
errno = oerrno;
/* contruct the tag for the log entry */
if (tcpd_context.file)
syslog(severity, "%s: %s, line %d: %s",
- tag, tcpd_context.file, tcpd_context.line, buf);
+ tag, tcpd_context.file, tcpd_context.line, buf2);
else
- syslog(severity, "%s: %s", tag, buf);
+ syslog(severity, "%s: %s", tag, buf2);
if (buf != fmt)
free(buf);
+if (buf2 != buf)
+ free(buf2);
}
/* tcpd_warn - report problem of some sort and proceed */
CVS commit: src/lib/libwrap
Module Name:src
Committed By: christos
Date: Thu Jan 10 13:53:58 UTC 2019
Modified Files:
src/lib/libwrap: diag.c
Log Message:
delete unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libwrap/diag.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libwrap/diag.c
diff -u src/lib/libwrap/diag.c:1.12 src/lib/libwrap/diag.c:1.13
--- src/lib/libwrap/diag.c:1.12 Thu Jan 10 08:53:26 2019
+++ src/lib/libwrap/diag.c Thu Jan 10 08:53:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: diag.c,v 1.12 2019/01/10 13:53:26 christos Exp $ */
+/* $NetBSD: diag.c,v 1.13 2019/01/10 13:53:58 christos Exp $ */
/*
* Routines to report various classes of problems. Each report is decorated
@@ -16,7 +16,7 @@
#if 0
static char sccsid[] = "@(#) diag.c 1.1 94/12/28 17:42:20";
#else
-__RCSID("$NetBSD: diag.c,v 1.12 2019/01/10 13:53:26 christos Exp $");
+__RCSID("$NetBSD: diag.c,v 1.13 2019/01/10 13:53:58 christos Exp $");
#endif
#endif
@@ -59,8 +59,6 @@ tcpd_diag(int severity, const char *tag,
if (vasprintf(, buf, ap) == -1)
buf2 = buf;
-errno = oerrno;
-
/* contruct the tag for the log entry */
if (tcpd_context.file)
syslog(severity, "%s: %s, line %d: %s",
CVS commit: [pgoyette-compat] src/tests/lib/libc/net/getaddrinfo
Module Name:src
Committed By: pgoyette
Date: Thu Jan 10 11:15:49 UTC 2019
Modified Files:
src/tests/lib/libc/net/getaddrinfo [pgoyette-compat]: t_getaddrinfo.sh
Log Message:
Import fix from HEAD.
Now that the test behaves normally under failure (mismatched actual vs
expected outputs), maybe I can figure out why it actually fails.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.40.1 \
src/tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh
diff -u src/tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh:1.2 src/tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh:1.2.40.1
--- src/tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh:1.2 Wed Jun 15 07:54:32 2011
+++ src/tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh Thu Jan 10 11:15:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_getaddrinfo.sh,v 1.2 2011/06/15 07:54:32 jmmv Exp $
+# $NetBSD: t_getaddrinfo.sh,v 1.2.40.1 2019/01/10 11:15:49 pgoyette Exp $
#
# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, and 2002 WIDE Project.
@@ -55,7 +55,7 @@ check_output()
fi
cmp -s $(atf_get_srcdir)/data/${exp} out && return
- diff -u $(atf_get_srcdir)/data/${exp} out && \
+ diff -u $(atf_get_srcdir)/data/${exp} out
atf_fail "Actual output does not match expected output"
}
CVS commit: src/tests/lib/libc/net/getaddrinfo
Module Name:src
Committed By: pgoyette
Date: Thu Jan 10 11:13:50 UTC 2019
Modified Files:
src/tests/lib/libc/net/getaddrinfo: t_getaddrinfo.sh
Log Message:
Remove extraneous && from check_output()
With this extra && the test case exits abnormally when the actual and
expected outputs don't match.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh
diff -u src/tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh:1.2 src/tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh:1.3
--- src/tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh:1.2 Wed Jun 15 07:54:32 2011
+++ src/tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh Thu Jan 10 11:13:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_getaddrinfo.sh,v 1.2 2011/06/15 07:54:32 jmmv Exp $
+# $NetBSD: t_getaddrinfo.sh,v 1.3 2019/01/10 11:13:50 pgoyette Exp $
#
# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, and 2002 WIDE Project.
@@ -55,7 +55,7 @@ check_output()
fi
cmp -s $(atf_get_srcdir)/data/${exp} out && return
- diff -u $(atf_get_srcdir)/data/${exp} out && \
+ diff -u $(atf_get_srcdir)/data/${exp} out
atf_fail "Actual output does not match expected output"
}
CVS commit: src/sys/arch/sparc64
Module Name:src
Committed By: mrg
Date: Thu Jan 10 10:33:50 UTC 2019
Modified Files:
src/sys/arch/sparc64/include: pmap.h
src/sys/arch/sparc64/sparc64: db_interface.c pmap.c
Log Message:
- move pmap_ctx() macro into pmap.h instead of duplicating it.
- fix description of some mach ddb commands.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/sparc64/include/pmap.h
cvs rdiff -u -r1.133 -r1.134 src/sys/arch/sparc64/sparc64/db_interface.c
cvs rdiff -u -r1.309 -r1.310 src/sys/arch/sparc64/sparc64/pmap.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/sparc64/include/pmap.h
diff -u src/sys/arch/sparc64/include/pmap.h:1.61 src/sys/arch/sparc64/include/pmap.h:1.62
--- src/sys/arch/sparc64/include/pmap.h:1.61 Fri Nov 4 05:41:01 2016
+++ src/sys/arch/sparc64/include/pmap.h Thu Jan 10 10:33:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.61 2016/11/04 05:41:01 macallan Exp $ */
+/* $NetBSD: pmap.h,v 1.62 2019/01/10 10:33:49 mrg Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -269,6 +269,13 @@ do { \
(pg)->mdpage.mdpg_pvh.pv_va = 0;\
} while (/*CONSTCOND*/0)
+#ifdef MULTIPROCESSOR
+#define pmap_ctx_cpu(PM, C) ((PM)->pm_ctx[(C)])
+#define pmap_ctx(PM) pmap_ctx_cpu((PM), cpu_number())
+#else
+#define pmap_ctx(PM) ((PM)->pm_ctx[0])
+#endif
+
#endif /* _KERNEL */
#endif /* _LOCORE */
Index: src/sys/arch/sparc64/sparc64/db_interface.c
diff -u src/sys/arch/sparc64/sparc64/db_interface.c:1.133 src/sys/arch/sparc64/sparc64/db_interface.c:1.134
--- src/sys/arch/sparc64/sparc64/db_interface.c:1.133 Sun May 1 20:12:54 2016
+++ src/sys/arch/sparc64/sparc64/db_interface.c Thu Jan 10 10:33:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.133 2016/05/01 20:12:54 palle Exp $ */
+/* $NetBSD: db_interface.c,v 1.134 2019/01/10 10:33:49 mrg Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.133 2016/05/01 20:12:54 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.134 2019/01/10 10:33:49 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -90,15 +90,6 @@ extern struct traptrace {
u_int tfault; /* MMU tag access */
} trap_trace[], trap_trace_end[];
-/*
- * Helpers for ddb variables.
- */
-#ifdef MULTIPROCESSOR
-#define pmap_ctx(PM) ((PM)->pm_ctx[cpu_number()])
-#else
-#define pmap_ctx(PM) ((PM)->pm_ctx[0])
-#endif
-
void fill_ddb_regs_from_tf(struct trapframe64 *tf);
void ddb_restore_state(void);
bool ddb_running_on_this_cpu(void);
@@ -428,7 +419,7 @@ db_prom_cmd(db_expr_t addr, bool have_ad
void
db_dump_dtlb(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
{
- extern void print_dtlb(size_t, int);
+ extern void print_dtlb(size_t /*tlbsize*/, int /*tlbmask*/);
if (CPU_IS_USIII_UP()) {
print_dtlb(TLB_SIZE_CHEETAH_D16, TLB_CHEETAH_D16);
@@ -443,7 +434,7 @@ db_dump_dtlb(db_expr_t addr, bool have_a
void
db_dump_itlb(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
{
- extern void print_itlb(size_t, int);
+ extern void print_itlb(size_t /*tlbsize*/, int /*tlbmask*/);
if (CPU_IS_USIII_UP()) {
print_itlb(TLB_SIZE_CHEETAH_I16, TLB_CHEETAH_I16);
@@ -1056,10 +1047,10 @@ const struct db_command db_machine_comma
"switch to another cpu", "cpu-no", NULL) },
#endif
{ DDB_ADD_CMD("dtlb", db_dump_dtlb, 0,
- "Print data translation look-aside buffer context information.",
+ "Display data translation look-aside buffer context information.",
NULL,NULL) },
{ DDB_ADD_CMD("itlb", db_dump_itlb, 0,
- "Display instruction translation storage buffer information.",
+ "Display instruction translation look-aside buffer information.",
NULL,NULL) },
{ DDB_ADD_CMD("dtsb", db_dump_dtsb, 0,
"Display data translation storage buffer information.", NULL,NULL) },
Index: src/sys/arch/sparc64/sparc64/pmap.c
diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.309 src/sys/arch/sparc64/sparc64/pmap.c:1.310
--- src/sys/arch/sparc64/sparc64/pmap.c:1.309 Thu Nov 29 20:58:36 2018
+++ src/sys/arch/sparc64/sparc64/pmap.c Thu Jan 10 10:33:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.309 2018/11/29 20:58:36 palle Exp $ */
+/* $NetBSD: pmap.c,v 1.310 2019/01/10 10:33:49 mrg Exp $ */
/*
*
* Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.309 2018/11/29 20:58:36 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.310 2019/01/10 10:33:49 mrg Exp $");
#undef NO_VCACHE /* Don't forget the locked TLB in dostart */
#define HWREF
@@ -194,12 +194,6 @@ pmap_has_ctx(struct pmap *p)
return false;
}
-#ifdef MULTIPROCESSOR
-#define pmap_ctx(PM) ((PM)->pm_ctx[cpu_number()])
-#else
-#define pmap_ctx(PM) ((PM)->pm_ctx[0])
-#endif
-
/*
* Check if this pmap has a live mapping on
CVS commit: src/external/bsd/acpica/bin/iasl
Module Name:src
Committed By: martin
Date: Thu Jan 10 10:04:43 UTC 2019
Modified Files:
src/external/bsd/acpica/bin/iasl: Makefile
Log Message:
Use the make pid when naming the temporary file to create aslcompilerparse.y,
so tow parallel make instances won't step on each others toe.
Pointed out by Christos.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/acpica/bin/iasl/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/bsd/acpica/bin/iasl/Makefile
diff -u src/external/bsd/acpica/bin/iasl/Makefile:1.23 src/external/bsd/acpica/bin/iasl/Makefile:1.24
--- src/external/bsd/acpica/bin/iasl/Makefile:1.23 Wed Jan 9 09:27:29 2019
+++ src/external/bsd/acpica/bin/iasl/Makefile Thu Jan 10 10:04:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/01/09 09:27:29 martin Exp $
+# $NetBSD: Makefile,v 1.24 2019/01/10 10:04:43 martin Exp $
.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64")
PROG= iasl
@@ -277,8 +277,8 @@ aslparser.y: asltokens.y asltypes.y aslr
YPREFIX.aslcompilerparse.y=AslCompiler
aslcompilerparse.y: aslparser.y
- ${TOOL_M4} -P -I${TOPDIR} ${.ALLSRC} > ${.TARGET}.tmp \
- && mv ${.TARGET}.tmp ${.TARGET}
+ ${TOOL_M4} -P -I${TOPDIR} ${.ALLSRC} > ${.TARGET}.tmp.${.MAKE.PID} \
+ && mv ${.TARGET}.tmp.${.MAKE.PID} ${.TARGET}
aslcompiler.y.h: aslcompilerparse.h
ln -sf ${.ALLSRC} ${.TARGET}
CVS commit: xsrc/external/mit/libdrm/dist/amdgpu
Module Name:xsrc
Committed By: mrg
Date: Thu Jan 10 09:13:52 UTC 2019
Modified Files:
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu_vamgr.c
Log Message:
don't mark a static function with default visibility. (avoids warnings.)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c
diff -u xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c:1.1.1.4 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c:1.2
--- xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c:1.1.1.4 Thu Jan 10 08:49:54 2019
+++ xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c Thu Jan 10 09:13:52 2019
@@ -69,7 +69,7 @@ drm_private void amdgpu_vamgr_deinit(str
pthread_mutex_destroy(>bo_va_mutex);
}
-static drm_private uint64_t
+static uint64_t
amdgpu_vamgr_find_va(struct amdgpu_bo_va_mgr *mgr, uint64_t size,
uint64_t alignment, uint64_t base_required)
{
@@ -130,7 +130,7 @@ amdgpu_vamgr_find_va(struct amdgpu_bo_va
return AMDGPU_INVALID_VA_ADDRESS;
}
-static drm_private void
+static void
amdgpu_vamgr_free_va(struct amdgpu_bo_va_mgr *mgr, uint64_t va, uint64_t size)
{
struct amdgpu_bo_va_hole *hole, *next;
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Thu Jan 10 09:12:47 UTC 2019
Modified Files:
src/sys/dev/ic: isp_library.c
Log Message:
When handles returned by the device do not match our expectations,
log more details.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/isp_library.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/ic/isp_library.c
diff -u src/sys/dev/ic/isp_library.c:1.7 src/sys/dev/ic/isp_library.c:1.8
--- src/sys/dev/ic/isp_library.c:1.7 Mon Feb 28 17:17:55 2011
+++ src/sys/dev/ic/isp_library.c Thu Jan 10 09:12:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_library.c,v 1.7 2011/02/28 17:17:55 mjacob Exp $ */
+/* $NetBSD: isp_library.c,v 1.8 2019/01/10 09:12:47 martin Exp $ */
/*
* Copyright (c) 2006-2007 by Matthew Jacob
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#ifdef __NetBSD__
#include
-__KERNEL_RCSID(0, "$NetBSD: isp_library.c,v 1.7 2011/02/28 17:17:55 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_library.c,v 1.8 2019/01/10 09:12:47 martin Exp $");
#include
#endif
#ifdef __FreeBSD__
@@ -294,7 +294,12 @@ uint32_t
isp_handle_index(ispsoftc_t *isp, uint32_t handle)
{
if (!ISP_VALID_HANDLE(isp, handle)) {
- isp_prt(isp, ISP_LOGERR, "%s: bad handle 0x%x", __func__, handle);
+ int cmd = handle & ISP_HANDLE_CMD_MASK;
+ if (cmd > isp->isp_maxcmds)
+ cmd = 0;
+ isp_prt(isp, ISP_LOGERR, "%s: bad handle 0x%x (isp_seqno: %d,"
+ " isp_xflist[%d].handle = 0x%x)", __func__,
+ handle, isp->isp_seqno, cmd, isp->isp_xflist[cmd].handle);
return (ISP_BAD_HANDLE_INDEX);
} else {
return (handle & ISP_HANDLE_CMD_MASK);
CVS commit: src/external/mit/xorg/lib/libdrm_intel
Module Name:src
Committed By: mrg
Date: Thu Jan 10 09:12:57 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libdrm_intel: Makefile
Log Message:
add new source for libdrm 2.4.96.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libdrm_intel/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/mit/xorg/lib/libdrm_intel/Makefile
diff -u src/external/mit/xorg/lib/libdrm_intel/Makefile:1.9 src/external/mit/xorg/lib/libdrm_intel/Makefile:1.10
--- src/external/mit/xorg/lib/libdrm_intel/Makefile:1.9 Tue Jun 3 13:51:52 2014
+++ src/external/mit/xorg/lib/libdrm_intel/Makefile Thu Jan 10 09:12:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/06/03 13:51:52 riastradh Exp $
+# $NetBSD: Makefile,v 1.10 2019/01/10 09:12:57 mrg Exp $
.include
@@ -6,7 +6,7 @@ LIB= drm_intel
.PATH: ${X11SRCDIR.drm}/intel
SRCS= intel_bufmgr.c intel_bufmgr_fake.c intel_bufmgr_gem.c \
- intel_decode.c mm.c
+ intel_chipset.c intel_decode.c mm.c
CFLAGS+= -std=c99
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: mrg
Date: Thu Jan 10 09:10:31 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile.defines
src/external/mit/xorg/lib/libdrm_amdgpu: Makefile
Log Message:
build fixes for libdrm 2.4.96.
XXX: may still have build issues, and cleandir before
XXX: update builds is likely needed
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libdrm/Makefile.defines
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libdrm_amdgpu/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/mit/xorg/lib/libdrm/Makefile.defines
diff -u src/external/mit/xorg/lib/libdrm/Makefile.defines:1.3 src/external/mit/xorg/lib/libdrm/Makefile.defines:1.4
--- src/external/mit/xorg/lib/libdrm/Makefile.defines:1.3 Wed Mar 14 07:23:00 2018
+++ src/external/mit/xorg/lib/libdrm/Makefile.defines Thu Jan 10 09:10:31 2019
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile.defines,v 1.3 2018/03/14 07:23:00 mrg Exp $
+# $NetBSD: Makefile.defines,v 1.4 2019/01/10 09:10:31 mrg Exp $
# common defiles for libdrm components
-CPPFLAGS+= -DHAVE_INTTYPES_H \
+CPPFLAGS+= \
+ -DHAVE_INTTYPES_H \
+ -DHAVE_OPEN_MEMSTREAM \
+ -DHAVE_VISIBILITY \
+ -DHAVE_SETENV \
-DHAVE_STDINT_H \
-DHAVE_STRINGS_H \
-DHAVE_STRING_H \
@@ -10,10 +14,12 @@ CPPFLAGS+= -DHAVE_INTTYPES_H \
-DHAVE_SYS_SYSCTL_H \
-DHAVE_SYS_TYPES_H \
-DHAVE_UNISTD_H
-CPPFLAGS+= -DHAVE_SETENV
# NetBSD has __sync_*().
CPPFLAGS+= -DHAVE_LIBDRM_ATOMIC_PRIMITIVES \
CPPFLAGS+= -DHAVE_NOUVEAU \
+ -DHAVE_AMDGPU \
-DHAVE_RADEON
+
+COPTS+= -fvisibility=hidden
Index: src/external/mit/xorg/lib/libdrm_amdgpu/Makefile
diff -u src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.4 src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.5
--- src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.4 Wed Mar 14 07:23:00 2018
+++ src/external/mit/xorg/lib/libdrm_amdgpu/Makefile Thu Jan 10 09:10:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/03/14 07:23:00 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2019/01/10 09:10:31 mrg Exp $
.include
@@ -14,8 +14,7 @@ SRCS= \
amdgpu_gpu_info.c \
amdgpu_vamgr.c \
amdgpu_vm.c \
- util_hash.c \
- util_hash_table.c
+ handle_table.c
LIBDRMDATADIR= ${X11ROOTDIR}/share/libdrm
# XXX goes away in new libdrm.
CVS commit: xsrc/external/mit/libdrm/dist
Module Name:xsrc
Committed By: mrg
Date: Thu Jan 10 08:59:43 UTC 2019
Modified Files:
xsrc/external/mit/libdrm/dist: xf86atomic.h xf86drm.c xf86drmMode.c
xsrc/external/mit/libdrm/dist/include/drm: drm.h i915_drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/radeon: radeon_bo_gem.c radeon_cs_gem.c
radeon_surface.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
Removed Files:
xsrc/external/mit/libdrm/dist/amdgpu: util_hash.c util_hash.h
util_hash_table.c util_hash_table.h
xsrc/external/mit/libdrm/dist/freedreno/msm: msm_drm.h
Log Message:
merge libdrm 2.4.96.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/libdrm/dist/xf86atomic.h
cvs rdiff -u -r1.21 -r1.22 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libdrm/dist/amdgpu/util_hash.c \
xsrc/external/mit/libdrm/dist/amdgpu/util_hash.h \
xsrc/external/mit/libdrm/dist/amdgpu/util_hash_table.c \
xsrc/external/mit/libdrm/dist/amdgpu/util_hash_table.h
cvs rdiff -u -r1.1.1.6 -r0 \
xsrc/external/mit/libdrm/dist/freedreno/msm/msm_drm.h
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/libdrm/dist/include/drm/drm.h
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c \
xsrc/external/mit/libdrm/dist/radeon/radeon_cs_gem.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/xf86atomic.h
diff -u xsrc/external/mit/libdrm/dist/xf86atomic.h:1.10 xsrc/external/mit/libdrm/dist/xf86atomic.h:1.11
--- xsrc/external/mit/libdrm/dist/xf86atomic.h:1.10 Wed Mar 14 07:19:26 2018
+++ xsrc/external/mit/libdrm/dist/xf86atomic.h Thu Jan 10 08:59:43 2019
@@ -34,10 +34,6 @@
#ifndef LIBDRM_ATOMICS_H
#define LIBDRM_ATOMICS_H
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#if HAVE_LIBDRM_ATOMIC_PRIMITIVES
#define HAS_ATOMIC_OPS 1
Index: xsrc/external/mit/libdrm/dist/xf86drm.c
diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.21 xsrc/external/mit/libdrm/dist/xf86drm.c:1.22
--- xsrc/external/mit/libdrm/dist/xf86drm.c:1.21 Fri Sep 21 18:33:08 2018
+++ xsrc/external/mit/libdrm/dist/xf86drm.c Thu Jan 10 08:59:43 2019
@@ -31,9 +31,6 @@
* DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-# include
-#endif
#include
#include
#include
@@ -128,7 +125,7 @@ struct drm_pciinfo {
static drmServerInfoPtr drm_server_info;
-void drmSetServerInfo(drmServerInfoPtr info)
+drm_public void drmSetServerInfo(drmServerInfoPtr info)
{
drm_server_info = info;
}
@@ -148,7 +145,7 @@ drmDebugPrint(const char *format, va_lis
return vfprintf(stderr, format, ap);
}
-void
+drm_public void
drmMsg(const char *format, ...)
{
va_list ap;
@@ -168,17 +165,17 @@ drmMsg(const char *format, ...)
static void *drmHashTable = NULL; /* Context switch callbacks */
-void *drmGetHashTable(void)
+drm_public void *drmGetHashTable(void)
{
return drmHashTable;
}
-void *drmMalloc(int size)
+drm_public void *drmMalloc(int size)
{
return calloc(1, size);
}
-void drmFree(void *pt)
+drm_public void drmFree(void *pt)
{
free(pt);
}
@@ -186,7 +183,7 @@ void drmFree(void *pt)
/**
* Call ioctl, restarting if it is interupted
*/
-int
+drm_public int
drmIoctl(int fd, unsigned long request, void *arg)
{
int ret;
@@ -206,7 +203,7 @@ static unsigned long drmGetKeyFromFd(int
return st.st_rdev;
}
-drmHashEntry *drmGetEntry(int fd)
+drm_public drmHashEntry *drmGetEntry(int fd)
{
unsigned long key = drmGetKeyFromFd(fd);
void *value;
@@ -297,7 +294,7 @@ static int drmMatchBusID(const char *id1
* If any other failure happened then it will output error mesage using
* drmMsg() call.
*/
-#if !defined(UDEV)
+#if !UDEV
static int chown_check_return(const char *path, uid_t owner, gid_t group)
{
int rv;
@@ -336,7 +333,7 @@ static int drmOpenDevice(dev_t dev, int
int fd;
mode_t devmode = DRM_DEV_MODE, serv_mode;
gid_t serv_group;
-#if !defined(UDEV)
+#if !UDEV
int isroot = !geteuid();
uid_t user= DRM_DEV_UID;
gid_t group = DRM_DEV_GID;
@@ -365,7 +362,7 @@ static int drmOpenDevice(dev_t dev, int
devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
}
-#if !defined(UDEV)
+#if !UDEV
if (stat(DRM_DIR_NAME, )) {
if (!isroot)
return
CVS import: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Thu Jan 10 08:49:56 UTC 2019 Update of /cvsroot/xsrc/external/mit/libdrm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24250 Log Message: initial import of libdrm-2.4.96 Status: Vendor Tag: xorg Release Tags: libdrm-2-4-96 C xsrc/external/mit/libdrm/dist/xf86drmMode.c U xsrc/external/mit/libdrm/dist/Makefile.sources U xsrc/external/mit/libdrm/dist/xf86drmSL.c U xsrc/external/mit/libdrm/dist/xf86drmHash.h U xsrc/external/mit/libdrm/dist/xf86drm.h U xsrc/external/mit/libdrm/dist/meson_options.txt U xsrc/external/mit/libdrm/dist/util_double_list.h U xsrc/external/mit/libdrm/dist/meson.build U xsrc/external/mit/libdrm/dist/xf86drmHash.c U xsrc/external/mit/libdrm/dist/libdrm_macros.h C xsrc/external/mit/libdrm/dist/xf86drm.c U xsrc/external/mit/libdrm/dist/README U xsrc/external/mit/libdrm/dist/libdrm_lists.h U xsrc/external/mit/libdrm/dist/aclocal.m4 U xsrc/external/mit/libdrm/dist/Makefile.in U xsrc/external/mit/libdrm/dist/xf86drmRandom.h U xsrc/external/mit/libdrm/dist/config.h.in C xsrc/external/mit/libdrm/dist/util_math.h C xsrc/external/mit/libdrm/dist/xf86atomic.h U xsrc/external/mit/libdrm/dist/configure U xsrc/external/mit/libdrm/dist/xf86drmRandom.c U xsrc/external/mit/libdrm/dist/Makefile.am U xsrc/external/mit/libdrm/dist/configure.ac U xsrc/external/mit/libdrm/dist/libsync.h U xsrc/external/mit/libdrm/dist/xf86drmMode.h U xsrc/external/mit/libdrm/dist/libdrm.pc.in U xsrc/external/mit/libdrm/dist/nouveau/Makefile.sources U xsrc/external/mit/libdrm/dist/nouveau/nouveau-symbol-check U xsrc/external/mit/libdrm/dist/nouveau/abi16.c U xsrc/external/mit/libdrm/dist/nouveau/meson.build U xsrc/external/mit/libdrm/dist/nouveau/private.h U xsrc/external/mit/libdrm/dist/nouveau/bufctx.c U xsrc/external/mit/libdrm/dist/nouveau/pushbuf.c U xsrc/external/mit/libdrm/dist/nouveau/Makefile.in U xsrc/external/mit/libdrm/dist/nouveau/nouveau.h U xsrc/external/mit/libdrm/dist/nouveau/nouveau.c U xsrc/external/mit/libdrm/dist/nouveau/libdrm_nouveau.pc.in U xsrc/external/mit/libdrm/dist/nouveau/Makefile.am U xsrc/external/mit/libdrm/dist/nouveau/nvif/unpack.h U xsrc/external/mit/libdrm/dist/nouveau/nvif/class.h U xsrc/external/mit/libdrm/dist/nouveau/nvif/if0003.h U xsrc/external/mit/libdrm/dist/nouveau/nvif/cl9097.h U xsrc/external/mit/libdrm/dist/nouveau/nvif/if0002.h U xsrc/external/mit/libdrm/dist/nouveau/nvif/ioctl.h U xsrc/external/mit/libdrm/dist/nouveau/nvif/cl0080.h U xsrc/external/mit/libdrm/dist/man/drmModeGetResources.xml U xsrc/external/mit/libdrm/dist/man/meson.build U xsrc/external/mit/libdrm/dist/man/drmHandleEvent.xml U xsrc/external/mit/libdrm/dist/man/drm-memory.xml U xsrc/external/mit/libdrm/dist/man/Makefile.in U xsrc/external/mit/libdrm/dist/man/drm-kms.xml U xsrc/external/mit/libdrm/dist/man/drmAvailable.xml U xsrc/external/mit/libdrm/dist/man/Makefile.am U xsrc/external/mit/libdrm/dist/man/drm.xml U xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/meson.build U xsrc/external/mit/libdrm/dist/freedreno/freedreno_drmif.h U xsrc/external/mit/libdrm/dist/freedreno/libdrm_freedreno.pc.in U xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h U xsrc/external/mit/libdrm/dist/freedreno/Makefile.in U xsrc/external/mit/libdrm/dist/freedreno/freedreno-symbol-check U xsrc/external/mit/libdrm/dist/freedreno/freedreno_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_priv.h U xsrc/external/mit/libdrm/dist/freedreno/Makefile.am U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo_cache.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_priv.h U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_device.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_drm.h U xsrc/external/mit/libdrm/dist/freedreno/kgsl/msm_kgsl.h U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_bo.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_bo.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_priv.h U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_device.c U xsrc/external/mit/libdrm/dist/build-aux/depcomp U xsrc/external/mit/libdrm/dist/build-aux/ltmain.sh U xsrc/external/mit/libdrm/dist/build-aux/compile U xsrc/external/mit/libdrm/dist/build-aux/missing U xsrc/external/mit/libdrm/dist/build-aux/test-driver U xsrc/external/mit/libdrm/dist/build-aux/config.guess U xsrc/external/mit/libdrm/dist/build-aux/install-sh U xsrc/external/mit/libdrm/dist/build-aux/config.sub U xsrc/external/mit/libdrm/dist/intel/Makefile.sources U
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Jan 10 08:27:21 UTC 2019
Modified Files:
src/sys/dev/pci: if_bce.c
Log Message:
Remove extra register read in bce_mii_write().
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/if_bce.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/pci/if_bce.c
diff -u src/sys/dev/pci/if_bce.c:1.48 src/sys/dev/pci/if_bce.c:1.49
--- src/sys/dev/pci/if_bce.c:1.48 Sun Dec 9 11:14:02 2018
+++ src/sys/dev/pci/if_bce.c Thu Jan 10 08:27:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bce.c,v 1.48 2018/12/09 11:14:02 jdolecek Exp $ */
+/* $NetBSD: if_bce.c,v 1.49 2019/01/10 08:27:21 msaitoh Exp $ */
/*
* Copyright (c) 2003 Clifford Wright. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.48 2018/12/09 11:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.49 2019/01/10 08:27:21 msaitoh Exp $");
#include "vlan.h"
@@ -1425,7 +1425,6 @@ bce_mii_write(device_t self, int phy, in
break;
delay(10);
}
- rval = bus_space_read_4(sc->bce_btag, sc->bce_bhandle, BCE_MI_COMM);
if (i == BCE_TIMEOUT) {
aprint_error_dev(sc->bce_dev,
"PHY timed out writing phy %d, reg %d, val = 0x%08x\n", phy,
