CVS commit: src/sys/dev/pci
Module Name:src Committed By: mrg Date: Sat Apr 26 07:32:26 UTC 2014 Modified Files: src/sys/dev/pci: pcidevs Log Message: add some new Attansic ethernet devices (but no driver) To generate a diff of this commit: cvs rdiff -u -r1.1187 -r1.1188 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1187 src/sys/dev/pci/pcidevs:1.1188 --- src/sys/dev/pci/pcidevs:1.1187 Wed Apr 9 10:21:10 2014 +++ src/sys/dev/pci/pcidevs Sat Apr 26 07:32:26 2014 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1187 2014/04/09 10:21:10 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1188 2014/04/26 07:32:26 mrg Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1175,6 +1175,10 @@ product ATTANSIC AR8132 0x1062 AR8132 F product ATTANSIC AR8131 0x1063 AR8131 Gigabit Ethernet Adapter product ATTANSIC AR8151 0x1073 AR8151 v1.0 Gigabit Ethernet Adapter product ATTANSIC AR8151_V2 0x1083 AR8151 v2.0 Gigabit Ethernet Adapter +product ATTANSIC AR8162 0x1090 AR8162 +product ATTANSIC AR8161 0x1091 AR8161 +product ATTANSIC AR8172 0x10a0 AR8172 +product ATTANSIC AR8171 0x10a1 AR8171 product ATTANSIC ETHERNET_100 0x2048 L2 100 Mbit Ethernet Adapter product ATTANSIC AR8152_B 0x2060 AR8152 v1.1 Fast Ethernet Adapter product ATTANSIC AR8152_B2 0x2062 AR8152 v2.0 Fast Ethernet Adapter
CVS commit: src/sys/arch/hp300/stand
Module Name:src Committed By: tsutsui Date: Sat Apr 26 07:53:41 UTC 2014 Modified Files: src/sys/arch/hp300/stand/inst: version src/sys/arch/hp300/stand/uboot: version Log Message: Bump versions to denote recent 425e related changes. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hp300/stand/inst/version cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp300/stand/uboot/version 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/hp300/stand/inst/version diff -u src/sys/arch/hp300/stand/inst/version:1.11 src/sys/arch/hp300/stand/inst/version:1.12 --- src/sys/arch/hp300/stand/inst/version:1.11 Sat Feb 12 05:09:15 2011 +++ src/sys/arch/hp300/stand/inst/version Sat Apr 26 07:53:41 2014 @@ -1,4 +1,4 @@ -$NetBSD: version,v 1.11 2011/02/12 05:09:15 tsutsui Exp $ +$NetBSD: version,v 1.12 2014/04/26 07:53:41 tsutsui Exp $ 1.1: Initial version 1.2: Added support for HP-IB cartridge tapes @@ -11,3 +11,4 @@ $NetBSD: version,v 1.11 2011/02/12 05:09 1.9: Change boot messages to replace build date and maker with kernrev. 1.10: Pull OpenBSD's ite driver reorganization. 1.11: Add support for framebuffers on HP362 and HP382. +1.12: Add and fix support for HP425e mcclock, sti framebuffer, apci and dnkbd. Index: src/sys/arch/hp300/stand/uboot/version diff -u src/sys/arch/hp300/stand/uboot/version:1.18 src/sys/arch/hp300/stand/uboot/version:1.19 --- src/sys/arch/hp300/stand/uboot/version:1.18 Sat Feb 12 05:09:15 2011 +++ src/sys/arch/hp300/stand/uboot/version Sat Apr 26 07:53:41 2014 @@ -1,4 +1,4 @@ -$NetBSD: version,v 1.18 2011/02/12 05:09:15 tsutsui Exp $ +$NetBSD: version,v 1.19 2014/04/26 07:53:41 tsutsui Exp $ 1.1: Initial version 1.2: Added support for network booting @@ -18,3 +18,4 @@ $NetBSD: version,v 1.18 2011/02/12 05:09 1.16: Change boot messages to replace build date and maker with kernrev. 1.17: Pull OpenBSD's ite driver reorganization. 1.18: Add support for framebuffers on HP362 and HP382. +1.19: Add and fix support for HP425e mcclock, sti framebuffer, apci and dnkbd.
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Sat Apr 26 11:10:10 UTC 2014
Modified Files:
src/sys/kern: sys_socket.c
src/sys/net: route.c route.h
Log Message:
It's been 20years since rtioctl() did something. Let's just
remove that special way of returning EOPNOTSUPP.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/kern/sys_socket.c
cvs rdiff -u -r1.129 -r1.130 src/sys/net/route.c
cvs rdiff -u -r1.82 -r1.83 src/sys/net/route.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/kern/sys_socket.c
diff -u src/sys/kern/sys_socket.c:1.65 src/sys/kern/sys_socket.c:1.66
--- src/sys/kern/sys_socket.c:1.65 Tue Dec 20 23:56:28 2011
+++ src/sys/kern/sys_socket.c Sat Apr 26 11:10:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_socket.c,v 1.65 2011/12/20 23:56:28 christos Exp $ */
+/* $NetBSD: sys_socket.c,v 1.66 2014/04/26 11:10:10 pooka Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_socket.c,v 1.65 2011/12/20 23:56:28 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_socket.c,v 1.66 2014/04/26 11:10:10 pooka Exp $);
#include sys/param.h
#include sys/systm.h
@@ -198,8 +198,6 @@ soo_ioctl(file_t *fp, u_long cmd, void *
KERNEL_LOCK(1, NULL);
if (IOCGROUP(cmd) == 'i')
error = ifioctl(so, cmd, data, curlwp);
- else if (IOCGROUP(cmd) == 'r')
- error = rtioctl(cmd, data, curlwp);
else {
error = (*so-so_proto-pr_usrreq)(so, PRU_CONTROL,
(struct mbuf *)cmd, (struct mbuf *)data, NULL,
Index: src/sys/net/route.c
diff -u src/sys/net/route.c:1.129 src/sys/net/route.c:1.130
--- src/sys/net/route.c:1.129 Sat Mar 22 07:46:35 2014
+++ src/sys/net/route.c Sat Apr 26 11:10:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.129 2014/03/22 07:46:35 maxv Exp $ */
+/* $NetBSD: route.c,v 1.130 2014/04/26 11:10:10 pooka Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
#include opt_route.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: route.c,v 1.129 2014/03/22 07:46:35 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: route.c,v 1.130 2014/04/26 11:10:10 pooka Exp $);
#include sys/param.h
#include sys/kmem.h
@@ -568,15 +568,6 @@ rtflushclone(sa_family_t family, struct
rt_walktree(family, rtflushclone1, (void *)parent);
}
-/*
- * Routing table ioctl interface.
- */
-int
-rtioctl(u_long req, void *data, struct lwp *l)
-{
- return EOPNOTSUPP;
-}
-
struct ifaddr *
ifa_ifwithroute(int flags, const struct sockaddr *dst,
const struct sockaddr *gateway)
Index: src/sys/net/route.h
diff -u src/sys/net/route.h:1.82 src/sys/net/route.h:1.83
--- src/sys/net/route.h:1.82 Fri Mar 1 18:25:57 2013
+++ src/sys/net/route.h Sat Apr 26 11:10:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: route.h,v 1.82 2013/03/01 18:25:57 joerg Exp $ */
+/* $NetBSD: route.h,v 1.83 2014/04/26 11:10:10 pooka Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -389,7 +389,6 @@ struct rtentry *
void rtfree(struct rtentry *);
int rt_getifa(struct rt_addrinfo *);
int rtinit(struct ifaddr *, int, int);
-int rtioctl(u_long, void *, struct lwp *);
void rtredirect(const struct sockaddr *, const struct sockaddr *,
const struct sockaddr *, int, const struct sockaddr *,
struct rtentry **);
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Sat Apr 26 11:16:22 UTC 2014
Modified Files:
src/sys/kern: sys_socket.c
src/sys/net: if.c if.h
Log Message:
Decouple sockets linkage from interface code by making ifioctl() a pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/kern/sys_socket.c
cvs rdiff -u -r1.272 -r1.273 src/sys/net/if.c
cvs rdiff -u -r1.162 -r1.163 src/sys/net/if.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/kern/sys_socket.c
diff -u src/sys/kern/sys_socket.c:1.66 src/sys/kern/sys_socket.c:1.67
--- src/sys/kern/sys_socket.c:1.66 Sat Apr 26 11:10:10 2014
+++ src/sys/kern/sys_socket.c Sat Apr 26 11:16:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_socket.c,v 1.66 2014/04/26 11:10:10 pooka Exp $ */
+/* $NetBSD: sys_socket.c,v 1.67 2014/04/26 11:16:22 pooka Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_socket.c,v 1.66 2014/04/26 11:10:10 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_socket.c,v 1.67 2014/04/26 11:16:22 pooka Exp $);
#include sys/param.h
#include sys/systm.h
@@ -92,6 +92,8 @@ const struct fileops socketops = {
.fo_restart = soo_restart,
};
+int (*ifioctl)(struct socket *, u_long, void *, struct lwp *) = (void *)eopnotsupp;
+
/* ARGSUSED */
int
soo_read(file_t *fp, off_t *offset, struct uio *uio, kauth_cred_t cred,
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.272 src/sys/net/if.c:1.273
--- src/sys/net/if.c:1.272 Tue Feb 25 18:30:12 2014
+++ src/sys/net/if.c Sat Apr 26 11:16:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.272 2014/02/25 18:30:12 pooka Exp $ */
+/* $NetBSD: if.c,v 1.273 2014/04/26 11:16:22 pooka Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if.c,v 1.272 2014/02/25 18:30:12 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if.c,v 1.273 2014/04/26 11:16:22 pooka Exp $);
#include opt_inet.h
@@ -168,6 +168,7 @@ pfil_head_t * if_pfil;
static kauth_listener_t if_listener;
+static int doifioctl(struct socket *, u_long, void *, struct lwp *);
static int ifioctl_attach(struct ifnet *);
static void ifioctl_detach(struct ifnet *);
static void ifnet_lock_enter(struct ifnet_lock *);
@@ -226,6 +227,9 @@ ifinit(void)
if_listener = kauth_listen_scope(KAUTH_SCOPE_NETWORK,
if_listener_cb, NULL);
+
+ /* interfaces are available, inform socket code */
+ ifioctl = doifioctl;
}
/*
@@ -1788,8 +1792,8 @@ ifnet_lock_exit(struct ifnet_lock *il)
/*
* Interface ioctls.
*/
-int
-ifioctl(struct socket *so, u_long cmd, void *data, struct lwp *l)
+static int
+doifioctl(struct socket *so, u_long cmd, void *data, struct lwp *l)
{
struct ifnet *ifp;
struct ifreq *ifr;
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.162 src/sys/net/if.h:1.163
--- src/sys/net/if.h:1.162 Thu Apr 17 15:45:39 2014
+++ src/sys/net/if.h Sat Apr 26 11:16:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.162 2014/04/17 15:45:39 christos Exp $ */
+/* $NetBSD: if.h,v 1.163 2014/04/26 11:16:22 pooka Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -885,7 +885,7 @@ void ifinit(void);
void ifinit1(void);
int ifaddrpref_ioctl(struct socket *, u_long, void *, struct ifnet *,
lwp_t *);
-int ifioctl(struct socket *, u_long, void *, struct lwp *);
+extern int (*ifioctl)(struct socket *, u_long, void *, struct lwp *);
int ifioctl_common(struct ifnet *, u_long, void *);
int ifpromisc(struct ifnet *, int);
struct ifnet *ifunit(const char *);
CVS commit: src/sys/rump/librump
Module Name:src
Committed By: pooka
Date: Sat Apr 26 11:17:55 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: rump.c
src/sys/rump/librump/rumpnet: net_stub.c
Log Message:
kill weak aliases which are no longer necessary
To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/librump/rumpnet/net_stub.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/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.302 src/sys/rump/librump/rumpkern/rump.c:1.303
--- src/sys/rump/librump/rumpkern/rump.c:1.302 Fri Apr 25 19:56:01 2014
+++ src/sys/rump/librump/rumpkern/rump.c Sat Apr 26 11:17:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.302 2014/04/25 19:56:01 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.303 2014/04/26 11:17:55 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.302 2014/04/25 19:56:01 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.303 2014/04/26 11:17:55 pooka Exp $);
#include sys/systm.h
#define ELFSIZE ARCH_ELFSIZE
@@ -134,7 +134,6 @@ int rump__unavailable(void);
int rump__unavailable() {return EOPNOTSUPP;}
__weak_alias(biodone,rump__unavailable);
-__weak_alias(sopoll,rump__unavailable);
rump_proc_vfs_init_fn rump_proc_vfs_init = (void *)nullop;
rump_proc_vfs_release_fn rump_proc_vfs_release = (void *)nullop;
Index: src/sys/rump/librump/rumpnet/net_stub.c
diff -u src/sys/rump/librump/rumpnet/net_stub.c:1.14 src/sys/rump/librump/rumpnet/net_stub.c:1.15
--- src/sys/rump/librump/rumpnet/net_stub.c:1.14 Wed Jun 26 17:10:23 2013
+++ src/sys/rump/librump/rumpnet/net_stub.c Sat Apr 26 11:17:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: net_stub.c,v 1.14 2013/06/26 17:10:23 pooka Exp $ */
+/* $NetBSD: net_stub.c,v 1.15 2014/04/26 11:17:55 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: net_stub.c,v 1.14 2013/06/26 17:10:23 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: net_stub.c,v 1.15 2014/04/26 11:17:55 pooka Exp $);
#include sys/param.h
#include sys/protosw.h
@@ -45,9 +45,8 @@ __rumpnet_stub(void)
panic(component not available);
}
-__weak_alias(rtioctl,__rumpnet_stub);
+
__weak_alias(rtrequest,__rumpnet_stub);
-__weak_alias(ifioctl,__rumpnet_stub);
__weak_alias(ifunit,__rumpnet_stub);
__weak_alias(ifreq_setaddr,__rumpnet_stub);
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Sat Apr 26 11:23:03 UTC 2014
Modified Files:
src/sys/rump/librump/rumpnet: net_stub.c
src/sys/rump/net/lib/libsockin: sockin.c
Log Message:
Move a few stubs to where they really belong; allows us to create
them as strong instead of weak symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/rump/librump/rumpnet/net_stub.c
cvs rdiff -u -r1.36 -r1.37 src/sys/rump/net/lib/libsockin/sockin.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/rump/librump/rumpnet/net_stub.c
diff -u src/sys/rump/librump/rumpnet/net_stub.c:1.15 src/sys/rump/librump/rumpnet/net_stub.c:1.16
--- src/sys/rump/librump/rumpnet/net_stub.c:1.15 Sat Apr 26 11:17:55 2014
+++ src/sys/rump/librump/rumpnet/net_stub.c Sat Apr 26 11:23:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: net_stub.c,v 1.15 2014/04/26 11:17:55 pooka Exp $ */
+/* $NetBSD: net_stub.c,v 1.16 2014/04/26 11:23:03 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: net_stub.c,v 1.15 2014/04/26 11:17:55 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: net_stub.c,v 1.16 2014/04/26 11:23:03 pooka Exp $);
#include sys/param.h
#include sys/protosw.h
@@ -46,10 +46,6 @@ __rumpnet_stub(void)
panic(component not available);
}
-__weak_alias(rtrequest,__rumpnet_stub);
-__weak_alias(ifunit,__rumpnet_stub);
-__weak_alias(ifreq_setaddr,__rumpnet_stub);
-
/*
* Weak symbols so that we can optionally leave components out.
* (would be better to fix sys/net* to be more modular, though)
Index: src/sys/rump/net/lib/libsockin/sockin.c
diff -u src/sys/rump/net/lib/libsockin/sockin.c:1.36 src/sys/rump/net/lib/libsockin/sockin.c:1.37
--- src/sys/rump/net/lib/libsockin/sockin.c:1.36 Thu Mar 13 01:40:30 2014
+++ src/sys/rump/net/lib/libsockin/sockin.c Sat Apr 26 11:23:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sockin.c,v 1.36 2014/03/13 01:40:30 pooka Exp $ */
+/* $NetBSD: sockin.c,v 1.37 2014/04/26 11:23:03 pooka Exp $ */
/*
* Copyright (c) 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sockin.c,v 1.36 2014/03/13 01:40:30 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: sockin.c,v 1.37 2014/04/26 11:23:03 pooka Exp $);
#include sys/param.h
#include sys/condvar.h
@@ -560,3 +560,14 @@ sockin_ctloutput(int op, struct socket *
return rumpcomp_sockin_setsockopt(SO2S(so), sopt-sopt_level,
sopt-sopt_name, sopt-sopt_data, sopt-sopt_size);
}
+
+int sockin_unavailable(void);
+int
+sockin_unavailable(void)
+{
+
+panic(interface not available in with sockin);
+}
+__strong_alias(rtrequest,sockin_unavailable);
+__strong_alias(ifunit,sockin_unavailable);
+__strong_alias(ifreq_setaddr,sockin_unavailable);
CVS commit: src/sys/rump/librump/rumpnet
Module Name:src
Committed By: pooka
Date: Sat Apr 26 11:23:56 UTC 2014
Modified Files:
src/sys/rump/librump/rumpnet: net_stub.c
Log Message:
don't invade the __toolchain namespace
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/rump/librump/rumpnet/net_stub.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/rump/librump/rumpnet/net_stub.c
diff -u src/sys/rump/librump/rumpnet/net_stub.c:1.16 src/sys/rump/librump/rumpnet/net_stub.c:1.17
--- src/sys/rump/librump/rumpnet/net_stub.c:1.16 Sat Apr 26 11:23:03 2014
+++ src/sys/rump/librump/rumpnet/net_stub.c Sat Apr 26 11:23:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: net_stub.c,v 1.16 2014/04/26 11:23:03 pooka Exp $ */
+/* $NetBSD: net_stub.c,v 1.17 2014/04/26 11:23:56 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: net_stub.c,v 1.16 2014/04/26 11:23:03 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: net_stub.c,v 1.17 2014/04/26 11:23:56 pooka Exp $);
#include sys/param.h
#include sys/protosw.h
@@ -38,9 +38,9 @@ __KERNEL_RCSID(0, $NetBSD: net_stub.c,v
#include compat/sys/socket.h
#include compat/sys/sockio.h
-int __rumpnet_stub(void);
+int rumpnet_stub(void);
int
-__rumpnet_stub(void)
+rumpnet_stub(void)
{
panic(component not available);
@@ -52,14 +52,14 @@ __rumpnet_stub(void)
*/
/* bridge */
-__weak_alias(bridge_ifdetach,__rumpnet_stub);
-__weak_alias(bridge_output,__rumpnet_stub);
-__weak_alias(bridge_input,__rumpnet_stub);
+__weak_alias(bridge_ifdetach,rumpnet_stub);
+__weak_alias(bridge_output,rumpnet_stub);
+__weak_alias(bridge_input,rumpnet_stub);
/* agr */
-__weak_alias(agr_input,__rumpnet_stub);
-__weak_alias(ieee8023ad_lacp_input,__rumpnet_stub);
-__weak_alias(ieee8023ad_marker_input,__rumpnet_stub);
+__weak_alias(agr_input,rumpnet_stub);
+__weak_alias(ieee8023ad_lacp_input,rumpnet_stub);
+__weak_alias(ieee8023ad_marker_input,rumpnet_stub);
struct ifnet_head ifnet;
CVS commit: src/sbin/tunefs
Module Name:src
Committed By: martin
Date: Sat Apr 26 13:23:49 UTC 2014
Modified Files:
src/sbin/tunefs: tunefs.c
Log Message:
Provide proper alignement for buf - it is casted to a struct fs pointer,
so it requires the same alignement.
Fixes crashes on armv5.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sbin/tunefs/tunefs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/tunefs/tunefs.c
diff -u src/sbin/tunefs/tunefs.c:1.46 src/sbin/tunefs/tunefs.c:1.47
--- src/sbin/tunefs/tunefs.c:1.46 Sun Jun 23 02:06:05 2013
+++ src/sbin/tunefs/tunefs.c Sat Apr 26 13:23:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tunefs.c,v 1.46 2013/06/23 02:06:05 dholland Exp $ */
+/* $NetBSD: tunefs.c,v 1.47 2014/04/26 13:23:49 martin Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = @(#)tunefs.c 8.3 (Berkeley) 5/3/95;
#else
-__RCSID($NetBSD: tunefs.c,v 1.46 2013/06/23 02:06:05 dholland Exp $);
+__RCSID($NetBSD: tunefs.c,v 1.47 2014/04/26 13:23:49 martin Exp $);
#endif
#endif /* not lint */
@@ -71,10 +71,9 @@ __RCSID($NetBSD: tunefs.c,v 1.46 2013/0
union {
struct fs sb;
- char pad[MAXBSIZE];
-} sbun;
+ char data[MAXBSIZE];
+} sbun, buf;
#define sblock sbun.sb
-char buf[MAXBSIZE];
int fi;
long dev_bsize = 512;
@@ -326,14 +325,14 @@ main(int argc, char *argv[])
exit(0);
}
- memcpy(buf, (char *)sblock, SBLOCKSIZE);
+ memcpy(buf, (char *)sblock, SBLOCKSIZE);
if (needswap)
- ffs_sb_swap((struct fs*)buf, (struct fs*)buf);
- bwrite(sblockloc, buf, SBLOCKSIZE, special);
+ ffs_sb_swap((struct fs*)buf, (struct fs*)buf);
+ bwrite(sblockloc, buf.data, SBLOCKSIZE, special);
if (Aflag)
for (i = 0; i sblock.fs_ncg; i++)
bwrite(FFS_FSBTODB(sblock, cgsblock(sblock, i)),
- buf, SBLOCKSIZE, special);
+ buf.data, SBLOCKSIZE, special);
close(fi);
exit(0);
}
CVS commit: src/sbin/newfs
Module Name:src
Committed By: martin
Date: Sat Apr 26 14:15:08 UTC 2014
Modified Files:
src/sbin/newfs: mkfs.c
Log Message:
Increase alignement of the global buf variable to cover all pointers it
is casted too. Fixes a crash on arm v5.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sbin/newfs/mkfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs/mkfs.c
diff -u src/sbin/newfs/mkfs.c:1.121 src/sbin/newfs/mkfs.c:1.122
--- src/sbin/newfs/mkfs.c:1.121 Sat Apr 5 12:32:27 2014
+++ src/sbin/newfs/mkfs.c Sat Apr 26 14:15:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs.c,v 1.121 2014/04/05 12:32:27 justin Exp $ */
+/* $NetBSD: mkfs.c,v 1.122 2014/04/26 14:15:08 martin Exp $ */
/*
* Copyright (c) 1980, 1989, 1993
@@ -73,7 +73,7 @@
#if 0
static char sccsid[] = @(#)mkfs.c 8.11 (Berkeley) 5/3/95;
#else
-__RCSID($NetBSD: mkfs.c,v 1.121 2014/04/05 12:32:27 justin Exp $);
+__RCSID($NetBSD: mkfs.c,v 1.122 2014/04/26 14:15:08 martin Exp $);
#endif
#endif /* not lint */
@@ -131,10 +131,15 @@ static void *mkfs_malloc(size_t size);
union {
struct fs fs;
- char pad[SBLOCKSIZE];
+ char data[SBLOCKSIZE];
} fsun;
#define sblock fsun.fs
+union {
+ struct quota2_header q2h;
+ char data[MAXBSIZE];
+} buf;
+
struct csum *fscs_0; /* first block of cylinder summaries */
struct csum *fscs_next; /* place for next summary */
struct csum *fscs_end; /* end of summary buffer */
@@ -1012,7 +1017,7 @@ struct odirect olost_found_dir[] = {
{ 0, DIRBLKSIZ, 0, 0 },
};
#endif
-char buf[MAXBSIZE];
+
static void copy_dir(struct direct *, struct direct *);
int
@@ -1124,7 +1129,7 @@ fsinit(const struct timeval *tv, mode_t
node.dp1.di_blocks = btodb(ffs_fragroundup(sblock,
node.dp1.di_size));
qblocks += node.dp1.di_blocks;
- wtfs(FFS_FSBTODB(sblock, node.dp1.di_db[0]), sblock.fs_fsize, buf);
+ wtfs(FFS_FSBTODB(sblock, node.dp1.di_db[0]), sblock.fs_fsize, buf);
} else {
if (mfs) {
node.dp2.di_mode = IFDIR | mfsmode;
@@ -1151,7 +1156,7 @@ fsinit(const struct timeval *tv, mode_t
node.dp2.di_blocks = btodb(ffs_fragroundup(sblock,
node.dp2.di_size));
qblocks += node.dp2.di_blocks;
- wtfs(FFS_FSBTODB(sblock, node.dp2.di_db[0]), sblock.fs_fsize, buf);
+ wtfs(FFS_FSBTODB(sblock, node.dp2.di_db[0]), sblock.fs_fsize, buf);
}
qinos++;
iput(node, UFS_ROOTINO);
@@ -1177,12 +1182,12 @@ fsinit(const struct timeval *tv, mode_t
if ((quotas FS_Q2_DO_TYPE(i)) == 0)
continue;
- quota2_create_blk0(sblock.fs_bsize, buf, q2h_hash_shift,
+ quota2_create_blk0(sblock.fs_bsize, buf, q2h_hash_shift,
i, needswap);
/* grab an entry from header for root dir */
- q2h = (void *)buf;
+ q2h = buf.q2h;
offset = ufs_rw64(q2h-q2h_free, needswap);
- q2e = (void *)((char *)buf + offset);
+ q2e = (void *)((char *)buf + offset);
q2h-q2h_free = q2e-q2e_next;
memcpy(q2e, q2h-q2h_defentry, sizeof(*q2e));
q2e-q2e_uid = ufs_rw32(uid, needswap);
@@ -1213,7 +1218,7 @@ fsinit(const struct timeval *tv, mode_t
node.dp1.di_uid = geteuid();
node.dp1.di_gid = getegid();
wtfs(FFS_FSBTODB(sblock, node.dp1.di_db[0]),
- node.dp1.di_size, buf);
+ node.dp1.di_size, buf);
} else {
node.dp2.di_atime = tv-tv_sec;
node.dp2.di_atimensec = tv-tv_usec * 1000;
@@ -1235,7 +1240,7 @@ fsinit(const struct timeval *tv, mode_t
node.dp2.di_uid = geteuid();
node.dp2.di_gid = getegid();
wtfs(FFS_FSBTODB(sblock, node.dp2.di_db[0]),
- node.dp2.di_size, buf);
+ node.dp2.di_size, buf);
}
iput(node, nextino);
sblock.fs_quotafile[i] = nextino;
@@ -1257,9 +1262,9 @@ makedir(struct direct *protodir, int ent
if (isappleufs)
dirblksiz = APPLEUFS_DIRBLKSIZ;
- memset(buf, 0, UFS_DIRBLKSIZ);
+ memset(buf, 0, UFS_DIRBLKSIZ);
spcleft = dirblksiz;
- for (cp = buf, i = 0; i entries - 1; i++) {
+ for (cp = buf.data, i = 0; i entries - 1; i++) {
protodir[i].d_reclen = UFS_DIRSIZ(Oflag == 0, protodir[i], 0);
copy_dir(protodir[i], (struct direct*)cp);
cp += protodir[i].d_reclen;
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: riastradh
Date: Sat Apr 26 14:55:43 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_drv.h
Log Message:
Replace cpu_relax() by DELAY(1) or DELAY(1000) to wait us/ms.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.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/external/bsd/drm2/dist/drm/i915/intel_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h:1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h:1.3 Fri Apr 25 18:38:54 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h Sat Apr 26 14:55:43 2014
@@ -56,7 +56,7 @@
if ((W) drm_can_sleep()) { \
msleep(W);\
} else { \
-cpu_relax();\
+DELAY(1000);\
} \
} \
}\
@@ -81,7 +81,7 @@
ret__ = -ETIMEDOUT; \
break; \
} \
- cpu_relax(); \
+ DELAY(1); \
} \
}\
ret__;\
CVS commit: src/sys/kern
Module Name:src Committed By: abs Date: Sat Apr 26 16:30:05 UTC 2014 Modified Files: src/sys/kern: subr_pool.c Log Message: Ensure pool_head is non static - for vmstat -i To generate a diff of this commit: cvs rdiff -u -r1.201 -r1.202 src/sys/kern/subr_pool.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/subr_pool.c diff -u src/sys/kern/subr_pool.c:1.201 src/sys/kern/subr_pool.c:1.202 --- src/sys/kern/subr_pool.c:1.201 Mon Feb 17 20:40:06 2014 +++ src/sys/kern/subr_pool.c Sat Apr 26 16:30:05 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_pool.c,v 1.201 2014/02/17 20:40:06 para Exp $ */ +/* $NetBSD: subr_pool.c,v 1.202 2014/04/26 16:30:05 abs Exp $ */ /*- * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010 @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_pool.c,v 1.201 2014/02/17 20:40:06 para Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_pool.c,v 1.202 2014/04/26 16:30:05 abs Exp $); #include opt_ddb.h #include opt_lockdebug.h @@ -67,8 +67,8 @@ __KERNEL_RCSID(0, $NetBSD: subr_pool.c, * an internal pool of page headers (`phpool'). */ -/* List of all pools */ -static TAILQ_HEAD(, pool) pool_head = TAILQ_HEAD_INITIALIZER(pool_head); +/* List of all pools. Non static as needed by 'vmstat -i' */ +TAILQ_HEAD(, pool) pool_head = TAILQ_HEAD_INITIALIZER(pool_head); /* Private pool for page header structures */ #define PHPOOL_MAX 8
CVS commit: src/tests/dev/scsipi/libscsitest
Module Name:src
Committed By: christos
Date: Sat Apr 26 18:53:21 UTC 2014
Modified Files:
src/tests/dev/scsipi/libscsitest: Makefile
Log Message:
Include bsd.own.mk (hi pooka)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/dev/scsipi/libscsitest/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/dev/scsipi/libscsitest/Makefile
diff -u src/tests/dev/scsipi/libscsitest/Makefile:1.2 src/tests/dev/scsipi/libscsitest/Makefile:1.3
--- src/tests/dev/scsipi/libscsitest/Makefile:1.2 Thu Apr 24 20:17:48 2014
+++ src/tests/dev/scsipi/libscsitest/Makefile Sat Apr 26 14:53:21 2014
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2014/04/25 00:17:48 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2014/04/26 18:53:21 christos Exp $
#
+.include bsd.own.mk
+
RUMPTOP= ${NETBSDSRCDIR}/sys/rump
LIB= rumpdev_scsitest
CVS commit: src
Module Name:src
Committed By: joerg
Date: Sat Apr 26 20:15:48 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
src/sys/lib/libunwind: Registers.hpp unwind_registers.S
Log Message:
Add initial unwind support for MIPS and MIPS64.
To generate a diff of this commit:
cvs rdiff -u -r1.800 -r1.801 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.13 -r1.14 src/sys/lib/libunwind/Registers.hpp
cvs rdiff -u -r1.11 -r1.12 src/sys/lib/libunwind/unwind_registers.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.800 src/share/mk/bsd.own.mk:1.801
--- src/share/mk/bsd.own.mk:1.800 Tue Apr 22 13:20:58 2014
+++ src/share/mk/bsd.own.mk Sat Apr 26 20:15:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.800 2014/04/22 13:20:58 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.801 2014/04/26 20:15:48 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -97,6 +97,10 @@ _LIBC_UNWIND_SUPPORT.alpha= yes
_LIBC_UNWIND_SUPPORT.hppa= yes
_LIBC_UNWIND_SUPPORT.i386= yes
_LIBC_UNWIND_SUPPORT.m68k= yes
+_LIBC_UNWIND_SUPPORT.mipseb= yes
+_LIBC_UNWIND_SUPPORT.mipsel= yes
+_LIBC_UNWIND_SUPPORT.mips64eb= yes
+_LIBC_UNWIND_SUPPORT.mipse64l= yes
_LIBC_UNWIND_SUPPORT.powerpc= yes
_LIBC_UNWIND_SUPPORT.sh3el= yes
_LIBC_UNWIND_SUPPORT.sh3eb= yes
Index: src/sys/lib/libunwind/Registers.hpp
diff -u src/sys/lib/libunwind/Registers.hpp:1.13 src/sys/lib/libunwind/Registers.hpp:1.14
--- src/sys/lib/libunwind/Registers.hpp:1.13 Sat Apr 19 21:21:24 2014
+++ src/sys/lib/libunwind/Registers.hpp Sat Apr 26 20:15:48 2014
@@ -793,6 +793,150 @@ private:
uint32_t fpreg[56];
};
+enum {
+ DWARF_MIPS_R1 = 0,
+ DWARF_MIPS_R31 = 31,
+ DWARF_MIPS_F0 = 32,
+ DWARF_MIPS_F31 = 63,
+
+ REGNO_MIPS_PC = 0,
+ REGNO_MIPS_R1 = 0,
+ REGNO_MIPS_R29 = 29,
+ REGNO_MIPS_R31 = 31,
+ REGNO_MIPS_F0 = 33,
+ REGNO_MIPS_F31 = 64
+};
+
+class Registers_MIPS {
+public:
+ enum {
+LAST_REGISTER = REGNO_MIPS_F31,
+LAST_RESTORE_REG = REGNO_MIPS_F31,
+RETURN_REG = REGNO_MIPS_R31,
+RETURN_OFFSET = 0,
+ };
+
+ __dso_hidden Registers_MIPS();
+
+ static int dwarf2regno(int num) {
+if (num = DWARF_MIPS_R1 num = DWARF_MIPS_R31)
+ return REGNO_MIPS_R1 + (num - DWARF_MIPS_R1);
+if (num = DWARF_MIPS_F0 num = DWARF_MIPS_F31)
+ return REGNO_MIPS_F0 + (num - DWARF_MIPS_F0);
+return LAST_REGISTER + 1;
+ }
+
+ bool validRegister(int num) const {
+return num = REGNO_MIPS_PC num = REGNO_MIPS_R31;
+ }
+
+ uint64_t getRegister(int num) const {
+assert(validRegister(num));
+return reg[num];
+ }
+
+ void setRegister(int num, uint64_t value) {
+assert(validRegister(num));
+reg[num] = value;
+ }
+
+ uint64_t getIP() const { return reg[REGNO_MIPS_PC]; }
+
+ void setIP(uint64_t value) { reg[REGNO_MIPS_PC] = value; }
+
+ uint64_t getSP() const { return reg[REGNO_MIPS_R29]; }
+
+ void setSP(uint64_t value) { reg[REGNO_MIPS_R29] = value; }
+
+ bool validFloatVectorRegister(int num) const {
+return num = DWARF_MIPS_F0 num = DWARF_MIPS_F31;
+ }
+
+ void copyFloatVectorRegister(int num, uint64_t addr_) {
+assert(validFloatVectorRegister(num));
+const void *addr = reinterpret_castconst void *(addr_);
+memcpy(fpreg + (num - REGNO_MIPS_F0), addr, sizeof(fpreg[0]));
+ }
+
+ __dso_hidden void jumpto() const __dead;
+
+private:
+ uint32_t reg[REGNO_MIPS_R31 + 1];
+ uint64_t fpreg[32];
+};
+
+enum {
+ DWARF_MIPS64_R1 = 0,
+ DWARF_MIPS64_R31 = 31,
+ DWARF_MIPS64_F0 = 32,
+ DWARF_MIPS64_F31 = 63,
+
+ REGNO_MIPS64_PC = 0,
+ REGNO_MIPS64_R1 = 0,
+ REGNO_MIPS64_R29 = 29,
+ REGNO_MIPS64_R31 = 31,
+ REGNO_MIPS64_F0 = 33,
+ REGNO_MIPS64_F31 = 64
+};
+
+class Registers_MIPS64 {
+public:
+ enum {
+LAST_REGISTER = REGNO_MIPS64_F31,
+LAST_RESTORE_REG = REGNO_MIPS64_F31,
+RETURN_REG = REGNO_MIPS64_R31,
+RETURN_OFFSET = 0,
+ };
+
+ __dso_hidden Registers_MIPS64();
+
+ static int dwarf2regno(int num) {
+if (num = DWARF_MIPS64_R1 num = DWARF_MIPS64_R31)
+ return REGNO_MIPS64_R1 + (num - DWARF_MIPS64_R1);
+if (num = DWARF_MIPS64_F0 num = DWARF_MIPS64_F31)
+ return REGNO_MIPS64_F0 + (num - DWARF_MIPS64_F0);
+return LAST_REGISTER + 1;
+ }
+
+ bool validRegister(int num) const {
+return num = REGNO_MIPS64_PC num = REGNO_MIPS64_R31;
+ }
+
+ uint64_t getRegister(int num) const {
+assert(validRegister(num));
+return reg[num];
+ }
+
+ void setRegister(int num, uint64_t value) {
+assert(validRegister(num));
+reg[num] = value;
+ }
+
+ uint64_t getIP() const { return reg[REGNO_MIPS64_PC]; }
+
+ void setIP(uint64_t value) { reg[REGNO_MIPS64_PC] = value; }
+
+ uint64_t getSP() const { return reg[REGNO_MIPS64_R29]; }
+
+ void setSP(uint64_t value) { reg[REGNO_MIPS64_R29] = value; }
+
+ bool validFloatVectorRegister(int num) const {
+return num =
CVS commit: src/share/mk
Module Name:src Committed By: wiz Date: Sat Apr 26 20:25:07 UTC 2014 Modified Files: src/share/mk: bsd.own.mk Log Message: Fix typo in previous. To generate a diff of this commit: cvs rdiff -u -r1.801 -r1.802 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.801 src/share/mk/bsd.own.mk:1.802 --- src/share/mk/bsd.own.mk:1.801 Sat Apr 26 20:15:48 2014 +++ src/share/mk/bsd.own.mk Sat Apr 26 20:25:07 2014 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.801 2014/04/26 20:15:48 joerg Exp $ +# $NetBSD: bsd.own.mk,v 1.802 2014/04/26 20:25:07 wiz Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -100,7 +100,7 @@ _LIBC_UNWIND_SUPPORT.m68k= yes _LIBC_UNWIND_SUPPORT.mipseb= yes _LIBC_UNWIND_SUPPORT.mipsel= yes _LIBC_UNWIND_SUPPORT.mips64eb= yes -_LIBC_UNWIND_SUPPORT.mipse64l= yes +_LIBC_UNWIND_SUPPORT.mips64el= yes _LIBC_UNWIND_SUPPORT.powerpc= yes _LIBC_UNWIND_SUPPORT.sh3el= yes _LIBC_UNWIND_SUPPORT.sh3eb= yes
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: riastradh
Date: Sat Apr 26 20:26:26 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_dma.c i915_drv.h
i915_gem.c intel_display.c
Log Message:
Convert pending_flip_lock to spin lock -- interrupt handlers take it.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.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/external/bsd/drm2/dist/drm/i915/i915_dma.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.4 Fri Apr 4 15:16:29 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Sat Apr 26 20:26:26 2014
@@ -1756,7 +1756,7 @@ out_gem_unload:
spin_lock_destroy(dev_priv-dpio_lock);
linux_mutex_destroy(dev_priv-rps.hw_lock);
DRM_DESTROY_WAITQUEUE(dev_priv-pending_flip_queue);
- linux_mutex_destroy(dev_priv-pending_flip_lock);
+ spin_lock_destroy(dev_priv-pending_flip_lock);
destroy_completion(dev_priv-error_completion);
#endif
@@ -1878,7 +1878,7 @@ int i915_driver_unload(struct drm_device
#ifdef __NetBSD__
/* XXX Not sure this is the right place, but it looks safe. */
DRM_DESTROY_WAITQUEUE(dev_priv-pending_flip_queue);
- linux_mutex_destroy(dev_priv-pending_flip_lock);
+ spin_lock_destroy(dev_priv-pending_flip_lock);
destroy_completion(dev_priv-error_completion);
#endif
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.2 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Sat Apr 26 20:26:26 2014
@@ -891,7 +891,7 @@ typedef struct drm_i915_private {
struct drm_crtc *pipe_to_crtc_mapping[3];
#ifdef __NetBSD__
/* XXX The locking scheme looks broken. This mutex is a stop-gap. */
- struct mutex pending_flip_lock;
+ struct spinlock pending_flip_lock;
drm_waitqueue_t pending_flip_queue;
#else
wait_queue_head_t pending_flip_queue;
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Sat Apr 26 20:26:26 2014
@@ -4643,7 +4643,7 @@ i915_gem_load(struct drm_device *dev)
i915_gem_detect_bit_6_swizzle(dev);
#ifdef __NetBSD__
DRM_INIT_WAITQUEUE(dev_priv-pending_flip_queue, i915flip);
- linux_mutex_init(dev_priv-pending_flip_lock);
+ spin_lock_init(dev_priv-pending_flip_lock);
#else
init_waitqueue_head(dev_priv-pending_flip_queue);
#endif
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.3 Tue Mar 18 21:36:52 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Sat Apr 26 20:26:26 2014
@@ -2248,12 +2248,15 @@ intel_finish_fb(struct drm_framebuffer *
int ret;
#ifdef __NetBSD__
- mutex_lock(dev_priv-pending_flip_lock);
- DRM_WAIT_NOINTR_UNTIL(ret, dev_priv-pending_flip_queue,
+{
+ unsigned long flags;
+ spin_lock_irqsave(dev_priv-pending_flip_lock, flags);
+ DRM_SPIN_WAIT_NOINTR_UNTIL(ret, dev_priv-pending_flip_queue,
dev_priv-pending_flip_lock,
(atomic_read(dev_priv-mm.wedged) ||
atomic_read(obj-pending_flip) == 0));
- mutex_unlock(dev_priv-pending_flip_lock);
+ spin_unlock_irqrestore(dev_priv-pending_flip_lock, flags);
+}
#else
wait_event(dev_priv-pending_flip_queue,
atomic_read(dev_priv-mm.wedged) ||
@@ -2968,11 +2971,14 @@ static void intel_crtc_wait_for_pending_
return;
#ifdef __NetBSD__
- mutex_lock(dev_priv-pending_flip_lock);
- DRM_WAIT_NOINTR_UNTIL(error, dev_priv-pending_flip_queue,
+{
+ unsigned long flags;
+ spin_lock_irqsave(dev_priv-pending_flip_lock, flags);
+ DRM_SPIN_WAIT_NOINTR_UNTIL(error, dev_priv-pending_flip_queue,
dev_priv-pending_flip_lock,
!intel_crtc_has_pending_flip(crtc));
- mutex_unlock(dev_priv-pending_flip_lock);
+ spin_unlock_irqrestore(dev_priv-pending_flip_lock, flags);
+}
#else
wait_event(dev_priv-pending_flip_queue,
!intel_crtc_has_pending_flip(crtc));
@@ -7148,10 +7154,10 @@ static void do_intel_finish_page_flip(st
#ifdef __NetBSD__ /* XXX */
atomic_clear_mask(1 intel_crtc-plane, obj-pending_flip);
-
CVS commit: src/lib/libtelnet
Module Name:src Committed By: joerg Date: Sat Apr 26 22:10:40 UTC 2014 Modified Files: src/lib/libtelnet: kerberos5.c Log Message: Avoid enum type mismatch. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/lib/libtelnet/kerberos5.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/libtelnet/kerberos5.c diff -u src/lib/libtelnet/kerberos5.c:1.19 src/lib/libtelnet/kerberos5.c:1.20 --- src/lib/libtelnet/kerberos5.c:1.19 Mon Jan 9 15:25:33 2012 +++ src/lib/libtelnet/kerberos5.c Sat Apr 26 22:10:40 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kerberos5.c,v 1.19 2012/01/09 15:25:33 christos Exp $ */ +/* $NetBSD: kerberos5.c,v 1.20 2014/04/26 22:10:40 joerg Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -227,7 +227,8 @@ kerberos5_send(Authenticator *ap) } return (0); } - krb5_auth_con_setkeytype(telnet_context, auth_context, KEYTYPE_DES); + krb5_auth_con_setkeytype(telnet_context, auth_context, + ETYPE_DES_CBC_CRC); foo[0] = ap-type; foo[1] = ap-way;
CVS commit: src/external/gpl3/gcc/dist/libobjc
Module Name:src
Committed By: joerg
Date: Sat Apr 26 22:38:09 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/libobjc: encoding.c objects.c sendmsg.c
Log Message:
Don't use inline in C sources, it will certainly not work correctly with
a C99 compiler.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/libobjc/encoding.c \
src/external/gpl3/gcc/dist/libobjc/sendmsg.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl3/gcc/dist/libobjc/objects.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/gpl3/gcc/dist/libobjc/encoding.c
diff -u src/external/gpl3/gcc/dist/libobjc/encoding.c:1.3 src/external/gpl3/gcc/dist/libobjc/encoding.c:1.4
--- src/external/gpl3/gcc/dist/libobjc/encoding.c:1.3 Sat Mar 1 09:04:13 2014
+++ src/external/gpl3/gcc/dist/libobjc/encoding.c Sat Apr 26 22:38:09 2014
@@ -648,7 +648,6 @@ objc_promoted_size (const char *type)
occurring in method prototype encodings.
*/
-inline
const char *
objc_skip_type_qualifiers (const char *type)
{
@@ -666,7 +665,6 @@ objc_skip_type_qualifiers (const char *t
return type;
}
-inline
const char *
objc_skip_typespec (const char *type)
{
@@ -801,7 +799,6 @@ objc_skip_typespec (const char *type)
Skip an offset as part of a method encoding. This is prepended by a
'+' if the argument is passed in registers.
*/
-inline
const char *
objc_skip_offset (const char *type)
{
Index: src/external/gpl3/gcc/dist/libobjc/sendmsg.c
diff -u src/external/gpl3/gcc/dist/libobjc/sendmsg.c:1.3 src/external/gpl3/gcc/dist/libobjc/sendmsg.c:1.4
--- src/external/gpl3/gcc/dist/libobjc/sendmsg.c:1.3 Sat Mar 1 09:04:13 2014
+++ src/external/gpl3/gcc/dist/libobjc/sendmsg.c Sat Apr 26 22:38:09 2014
@@ -105,7 +105,6 @@ struct objc_method * search_for_method_i
id nil_method (id, SEL);
/* Given a selector, return the proper forwarding implementation. */
-inline
IMP
__objc_get_forward_imp (id rcv, SEL sel)
{
@@ -320,7 +319,6 @@ get_implementation (id receiver, Class c
return res;
}
-inline
IMP
get_imp (Class class, SEL sel)
{
@@ -364,7 +362,6 @@ method_get_imp (struct objc_method * met
method can be forwarded. Since this requires the dispatch table to
installed, this function will implicitly invoke +initialize for the
class of OBJECT if it hasn't been invoked yet. */
-inline
BOOL
__objc_responds_to (id object, SEL sel)
{
Index: src/external/gpl3/gcc/dist/libobjc/objects.c
diff -u src/external/gpl3/gcc/dist/libobjc/objects.c:1.1.1.2 src/external/gpl3/gcc/dist/libobjc/objects.c:1.2
--- src/external/gpl3/gcc/dist/libobjc/objects.c:1.1.1.2 Sat Mar 1 08:43:36 2014
+++ src/external/gpl3/gcc/dist/libobjc/objects.c Sat Apr 26 22:38:09 2014
@@ -36,7 +36,6 @@ see the files COPYING3 and COPYING.RUNTI
#endif
/* FIXME: The semantics of extraBytes are not really clear. */
-inline
id
class_createInstance (Class class, size_t extraBytes)
{
CVS commit: src/sys/lib/libunwind
Module Name:src
Committed By: joerg
Date: Sat Apr 26 23:17:38 UTC 2014
Modified Files:
src/sys/lib/libunwind: DwarfInstructions.hpp DwarfParser.hpp
Registers.hpp
Log Message:
Use the return address register from the CIE. Based on patch from Nick
Kledzik.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/lib/libunwind/DwarfInstructions.hpp
cvs rdiff -u -r1.3 -r1.4 src/sys/lib/libunwind/DwarfParser.hpp
cvs rdiff -u -r1.14 -r1.15 src/sys/lib/libunwind/Registers.hpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libunwind/DwarfInstructions.hpp
diff -u src/sys/lib/libunwind/DwarfInstructions.hpp:1.4 src/sys/lib/libunwind/DwarfInstructions.hpp:1.5
--- src/sys/lib/libunwind/DwarfInstructions.hpp:1.4 Mon Apr 14 18:15:17 2014
+++ src/sys/lib/libunwind/DwarfInstructions.hpp Sat Apr 26 23:17:38 2014
@@ -48,9 +48,6 @@ private:
const typename CFI_ParserA, R::RegisterLocation );
static int lastRestoreReg(const R ) { return R::LAST_RESTORE_REG; }
- static bool isReturnAddressRegister(int regno, const R ) {
-return regno == R::RETURN_REG;
- }
static pint_t getCFA(A addressSpace,
const typename CFI_ParserA, R::PrologInfo prolog,
@@ -139,7 +136,7 @@ step_result DwarfInstructionsA, R::ste
for (int i = 0; i = lastRestoreReg(newRegisters); ++i) {
if (prolog.savedRegisters[i].location == CFI_ParserA, R::kRegisterUnused)
continue;
-if (isReturnAddressRegister(i, registers))
+if (i == (int)cieInfo.returnAddressRegister)
returnAddress = getSavedRegister(addressSpace, registers, cfa,
prolog.savedRegisters[i]);
else if (registers.validRegister(i))
Index: src/sys/lib/libunwind/DwarfParser.hpp
diff -u src/sys/lib/libunwind/DwarfParser.hpp:1.3 src/sys/lib/libunwind/DwarfParser.hpp:1.4
--- src/sys/lib/libunwind/DwarfParser.hpp:1.3 Tue Apr 15 11:44:26 2014
+++ src/sys/lib/libunwind/DwarfParser.hpp Sat Apr 26 23:17:38 2014
@@ -43,6 +43,7 @@ public:
uint8_t personalityOffsetInCIE;
bool isSignalFrame;
bool fdesHaveAugmentationData;
+uint8_t returnAddressRegister;
};
/// Information about an FDE (Frame Description Entry)
@@ -238,7 +239,7 @@ bool CFI_ParserA, R::parseCIE(A addre
// Parse data alignment factor
cieInfo-dataAlignFactor = addressSpace.getSLEB128(p, cieContentEnd);
// Parse return address register
- addressSpace.getULEB128(p, cieContentEnd);
+ cieInfo-returnAddressRegister = (uint8_t)addressSpace.getULEB128(p, cieContentEnd);
// Parse augmentation data based on augmentation string.
if (addressSpace.get8(strStart) == 'z') {
// parse augmentation data length
Index: src/sys/lib/libunwind/Registers.hpp
diff -u src/sys/lib/libunwind/Registers.hpp:1.14 src/sys/lib/libunwind/Registers.hpp:1.15
--- src/sys/lib/libunwind/Registers.hpp:1.14 Sat Apr 26 20:15:48 2014
+++ src/sys/lib/libunwind/Registers.hpp Sat Apr 26 23:17:38 2014
@@ -34,7 +34,6 @@ public:
enum {
LAST_REGISTER = REGNO_X86_EIP,
LAST_RESTORE_REG = REGNO_X86_EIP,
-RETURN_REG = REGNO_X86_EIP,
RETURN_OFFSET = 0,
};
@@ -100,7 +99,6 @@ public:
enum {
LAST_REGISTER = REGNO_X86_64_RIP,
LAST_RESTORE_REG = REGNO_X86_64_RIP,
-RETURN_REG = REGNO_X86_64_RIP,
RETURN_OFFSET = 0,
};
@@ -169,7 +167,6 @@ public:
enum {
LAST_REGISTER = REGNO_PPC32_V31,
LAST_RESTORE_REG = REGNO_PPC32_V31,
-RETURN_REG = REGNO_PPC32_LR,
RETURN_OFFSET = 0,
};
@@ -258,7 +255,6 @@ public:
enum {
LAST_REGISTER = REGNO_ARM32_D31,
LAST_RESTORE_REG = REGNO_ARM32_SPSR,
-RETURN_REG = REGNO_ARM32_SPSR,
RETURN_OFFSET = 0,
};
@@ -328,7 +324,6 @@ public:
enum {
LAST_REGISTER = REGNO_VAX_PSW,
LAST_RESTORE_REG = REGNO_VAX_PSW,
-RETURN_REG = REGNO_VAX_R15,
RETURN_OFFSET = 0,
};
@@ -400,7 +395,6 @@ public:
enum {
LAST_REGISTER = REGNO_M68K_FP7,
LAST_RESTORE_REG = REGNO_M68K_FP7,
-RETURN_REG = REGNO_M68K_PC,
RETURN_OFFSET = 0,
};
@@ -477,7 +471,6 @@ public:
enum {
LAST_REGISTER = REGNO_SH3_PR,
LAST_RESTORE_REG = REGNO_SH3_PR,
-RETURN_REG = REGNO_SH3_PR,
RETURN_OFFSET = 0,
};
@@ -542,7 +535,6 @@ public:
enum {
LAST_REGISTER = REGNO_SPARC64_PC,
LAST_RESTORE_REG = REGNO_SPARC64_PC,
-RETURN_REG = REGNO_SPARC64_R15,
RETURN_OFFSET = 8,
};
typedef uint64_t reg_t;
@@ -606,7 +598,6 @@ public:
enum {
LAST_REGISTER = REGNO_SPARC_PC,
LAST_RESTORE_REG = REGNO_SPARC_PC,
-RETURN_REG = REGNO_SPARC_R15,
RETURN_OFFSET = 8,
};
typedef uint32_t reg_t;
@@ -672,7 +663,6 @@ public:
enum {
LAST_REGISTER = REGNO_ALPHA_F30,
LAST_RESTORE_REG = REGNO_ALPHA_F30,
-RETURN_REG = REGNO_ALPHA_R26,
RETURN_OFFSET = 0,
};
typedef uint32_t reg_t;
@@
