CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Thu May 14 06:44:57 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: amend amendment to 754 To generate a diff of this commit: cvs rdiff -u -r1.1.2.295 -r1.1.2.296 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.295 src/doc/CHANGES-7.0:1.1.2.296 --- src/doc/CHANGES-7.0:1.1.2.295 Thu May 14 00:32:45 2015 +++ src/doc/CHANGES-7.0 Thu May 14 06:44:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.295 2015/05/14 00:32:45 riz Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.296 2015/05/14 06:44:57 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -23016,6 +23016,9 @@ usr.sbin/sysinst/net.c1.9-1.10 Google Public V4 DNS servers to the list. The other field can take an IPv4 or IPv6 name server of choice. Fixes PR install/49231. + rtsol is no longer used. + Only prompt for one nameserver, let the user decide if it's a + pre-determined google server other another one. [martin, ticket #754] usr.sbin/syslogd/syslogd.c 1.120 @@ -23026,11 +23029,3 @@ usr.sbin/syslogd/syslogd.c 1.120 - don't truncate IP addresses when reading syslogd.conf [jnemeth, ticket #760] - -rtsol is no longer used. - - -Only prompt for one nameserver, let the user decide if it's a -pre-determined google server other another one. -[riz, ticket #754] -
CVS commit: src/sys/arch
Module Name:src
Committed By: hsuenaga
Date: Thu May 14 05:39:32 UTC 2015
Modified Files:
src/sys/arch/arm/arm: cpufunc.c cpufunc_asm_pj4b.S
src/sys/arch/arm/include: cpufunc_proto.h
src/sys/arch/arm/marvell: armadaxp.c armadaxpreg.h mvsocreg.h
src/sys/arch/evbarm/marvell: marvell_machdep.c
Log Message:
add synchronization barrier for AURORA_IO_CACHE_COHERENCY.
cleanup MARVELL L2 cache code.
To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/sys/arch/arm/arm/cpufunc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/cpufunc_asm_pj4b.S
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/include/cpufunc_proto.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/marvell/armadaxp.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/marvell/armadaxpreg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/marvell/mvsocreg.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/marvell/marvell_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.153 src/sys/arch/arm/arm/cpufunc.c:1.154
--- src/sys/arch/arm/arm/cpufunc.c:1.153 Fri Apr 17 13:39:01 2015
+++ src/sys/arch/arm/arm/cpufunc.c Thu May 14 05:39:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.153 2015/04/17 13:39:01 hsuenaga Exp $ */
+/* $NetBSD: cpufunc.c,v 1.154 2015/05/14 05:39:32 hsuenaga Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.153 2015/04/17 13:39:01 hsuenaga Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.154 2015/05/14 05:39:32 hsuenaga Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cpuoptions.h"
@@ -1371,8 +1371,7 @@ struct cpu_functions pj4bv7_cpufuncs = {
.cf_tlb_flushD = armv7_tlb_flushID,
.cf_tlb_flushD_SE = armv7_tlb_flushID_SE,
- /* Cache operations */
-
+ /* Cache operations (see also pj4bv7_setup) */
.cf_icache_sync_all = armv7_idcache_wbinv_all,
.cf_icache_sync_range = armv7_icache_sync_range,
@@ -1381,18 +1380,6 @@ struct cpu_functions pj4bv7_cpufuncs = {
.cf_dcache_inv_range = armv7_dcache_inv_range,
.cf_dcache_wb_range = armv7_dcache_wb_range,
-#if defined(L2CACHE_ENABLE) && \
-!defined(AURORA_IO_CACHE_COHERENCY) && \
-defined(ARMADAXP)
- .cf_sdcache_wbinv_range = armadaxp_sdcache_wbinv_range,
- .cf_sdcache_inv_range = armadaxp_sdcache_inv_range,
- .cf_sdcache_wb_range = armadaxp_sdcache_wb_range,
-#else
- .cf_sdcache_wbinv_range = (void *)cpufunc_nullop,
- .cf_sdcache_inv_range = (void *)cpufunc_nullop,
- .cf_sdcache_wb_range = (void *)cpufunc_nullop,
-#endif
-
.cf_idcache_wbinv_all = armv7_idcache_wbinv_all,
.cf_idcache_wbinv_range = armv7_idcache_wbinv_range,
@@ -3096,6 +3083,36 @@ pj4bv7_setup(char *args)
cpuctrl |= CPU_CONTROL_VECRELOC;
#endif
+#ifdef L2CACHE_ENABLE
+ /* Setup L2 cache */
+ arm_scache.cache_type = CPU_CT_CTYPE_WT;
+ arm_scache.cache_unified = 1;
+ arm_scache.dcache_type = arm_scache.icache_type = CACHE_TYPE_PIPT;
+ arm_scache.dcache_size = arm_scache.icache_size = ARMADAXP_L2_SIZE;
+ arm_scache.dcache_ways = arm_scache.icache_ways = ARMADAXP_L2_WAYS;
+ arm_scache.dcache_way_size = arm_scache.icache_way_size =
+ ARMADAXP_L2_WAY_SIZE;
+ arm_scache.dcache_line_size = arm_scache.icache_line_size =
+ ARMADAXP_L2_LINE_SIZE;
+ arm_scache.dcache_sets = arm_scache.icache_sets =
+ ARMADAXP_L2_SETS;
+
+ cpufuncs.cf_sdcache_wbinv_range = armadaxp_sdcache_wbinv_range;
+ cpufuncs.cf_sdcache_inv_range = armadaxp_sdcache_inv_range;
+ cpufuncs.cf_sdcache_wb_range = armadaxp_sdcache_wb_range;
+#endif
+
+#ifdef AURORA_IO_CACHE_COHERENCY
+ /* use AMBA and I/O Coherency Fabric to maintain cache */
+ cpufuncs.cf_dcache_wbinv_range = pj4b_dcache_cfu_wbinv_range;
+ cpufuncs.cf_dcache_inv_range = pj4b_dcache_cfu_inv_range;
+ cpufuncs.cf_dcache_wb_range = pj4b_dcache_cfu_wb_range;
+
+ cpufuncs.cf_sdcache_wbinv_range = (void *)cpufunc_nullop;
+ cpufuncs.cf_sdcache_inv_range = (void *)cpufunc_nullop;
+ cpufuncs.cf_sdcache_wb_range = (void *)cpufunc_nullop;
+#endif
+
/* Clear out the cache */
cpu_idcache_wbinv_all();
@@ -3104,6 +3121,9 @@ pj4bv7_setup(char *args)
/* And again. */
cpu_idcache_wbinv_all();
+#ifdef L2CACHE_ENABLE
+ armadaxp_sdcache_wbinv_all();
+#endif
curcpu()->ci_ctrl = cpuctrl;
}
Index: src/sys/arch/arm/arm/cpufunc_asm_pj4b.S
diff -u src/sys/arch/arm/arm/cpufunc_asm_pj4b.S:1.7 src/sys/arch/arm/arm/cpufunc_asm_pj4b.S:1.8
--- src/sys/arch/arm/arm/cpufunc_asm_pj4b.S:1.7 Wed Apr 15 10:52:18 2015
+++ src/sys/arch/arm/arm/cpufunc_asm_pj4b.S Thu May 14 05:39:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc_asm_pj4b.S,v 1.7 2015/04/15 10:52:18 hsuenaga Exp $ */
+/* $NetBSD: cpufunc_asm_pj4b.S,v 1.8 2015/05/14 05:39:32 hsuenaga Exp $ */
/***
Copyright (C) Marvell International Lt
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src
Committed By: mrg
Date: Thu May 14 02:43:33 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
Log Message:
switch the default method to SNA.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/drivers/xf86-video-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/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.20 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.21
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.20 Fri Jan 16 21:35:34 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Thu May 14 02:43:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2015/01/16 21:35:34 snj Exp $
+# $NetBSD: Makefile,v 1.21 2015/05/14 02:43:33 mrg Exp $
.include
@@ -144,7 +144,7 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/xvmc
# Use the Intel-style __sync_* atomic primitives.
-CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=UXA
+CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=SNA
CPPFLAGS+= -DENABLE_XVMC=1
CPPFLAGS+= -DHAS_PIXMAN_GLYPHS=1
CPPFLAGS+= -DHAS_PIXMAN_TRIANGLES=1
CVS commit: src/sys/modules
Module Name:src Committed By: pgoyette Date: Thu May 14 01:34:31 UTC 2015 Modified Files: src/sys/modules: Makefile Log Message: Descend into the examples to build them all the time. (They will not be installed, but we still want to make sure they build to avoid any bit-rot). To generate a diff of this commit: cvs rdiff -u -r1.153 -r1.154 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.153 src/sys/modules/Makefile:1.154 --- src/sys/modules/Makefile:1.153 Wed May 13 02:15:34 2015 +++ src/sys/modules/Makefile Thu May 14 01:34:31 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.153 2015/05/13 02:15:34 pgoyette Exp $ +# $NetBSD: Makefile,v 1.154 2015/05/14 01:34:31 pgoyette Exp $ .include @@ -331,4 +331,6 @@ SUBDIR+= emdtv SUBDIR+= iscsi .endif +SUBDIR+= examples # build these regularly to avoid bit-rot + .include
CVS commit: src/etc/etc.evbarm
Module Name:src Committed By: jmcneill Date: Thu May 14 00:59:03 UTC 2015 Modified Files: src/etc/etc.evbarm: Makefile.inc Log Message: hook JETSONTK1 kernel into build To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/etc/etc.evbarm/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.evbarm/Makefile.inc diff -u src/etc/etc.evbarm/Makefile.inc:1.72 src/etc/etc.evbarm/Makefile.inc:1.73 --- src/etc/etc.evbarm/Makefile.inc:1.72 Thu Apr 9 10:55:23 2015 +++ src/etc/etc.evbarm/Makefile.inc Thu May 14 00:59:03 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.72 2015/04/09 10:55:23 jmcneill Exp $ +# $NetBSD: Makefile.inc,v 1.73 2015/05/14 00:59:03 jmcneill Exp $ # # etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets # @@ -99,6 +99,8 @@ EVBARM_BOARDS.armv7hf+= HUMMINGBIRD_A31 EVBARM_BOARDS.armv7+= ALLWINNER_A80 EVBARM_BOARDS.armv7hf+= ALLWINNER_A80 #EVBARM_BOARDS.armv7+= IGEPV2 +EVBARM_BOARDS.armv7+= JETSONTK1 +EVBARM_BOARDS.armv7hf+= JETSONTK1 EVBARM_BOARDS.armv7+= MIRABOX EVBARM_BOARDS.armv7hf+= MIRABOX #EVBARM_BOARDS.armv7+= N900
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: riz Date: Thu May 14 00:32:45 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Adjust entry for ticket 754. To generate a diff of this commit: cvs rdiff -u -r1.1.2.294 -r1.1.2.295 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.294 src/doc/CHANGES-7.0:1.1.2.295 --- src/doc/CHANGES-7.0:1.1.2.294 Wed May 13 19:20:30 2015 +++ src/doc/CHANGES-7.0 Thu May 14 00:32:45 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.294 2015/05/13 19:20:30 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.295 2015/05/14 00:32:45 riz Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -23003,12 +23003,14 @@ sys/arch/vax/vax/ka660.c 1.11 Fixes bug introduced in earlier cleanup. [ragge, ticket #757] -usr.sbin/sysinst/menus.mi 1.6 +usr.sbin/sysinst/defs.h1.4 +usr.sbin/sysinst/menus.mi 1.5-1.6 usr.sbin/sysinst/msg.mi.de 1.5 usr.sbin/sysinst/msg.mi.en 1.5 usr.sbin/sysinst/msg.mi.es 1.5 usr.sbin/sysinst/msg.mi.fr 1.5 usr.sbin/sysinst/msg.mi.pl 1.5 +usr.sbin/sysinst/net.c1.9-1.10 Change the IPv6 DNS selection to use DNS selection and add the Google Public V4 DNS servers to the list. @@ -23024,3 +23026,11 @@ usr.sbin/syslogd/syslogd.c 1.120 - don't truncate IP addresses when reading syslogd.conf [jnemeth, ticket #760] + +rtsol is no longer used. + + +Only prompt for one nameserver, let the user decide if it's a +pre-determined google server other another one. +[riz, ticket #754] +
CVS commit: [netbsd-7] src/usr.sbin/sysinst
Module Name:src
Committed By: riz
Date: Thu May 14 00:30:50 UTC 2015
Modified Files:
src/usr.sbin/sysinst [netbsd-7]: defs.h menus.mi net.c
Log Message:
Pull up following revision(s) to fix the build (requested by riz in ticket
#754):
usr.sbin/sysinst/net.c: revision 1.10
usr.sbin/sysinst/menus.mi: revision 1.5
usr.sbin/sysinst/net.c: revision 1.9
usr.sbin/sysinst/defs.h: revision 1.4
rtsol is no longer used.
Only prompt for one nameserver, let the user decide if it's a
pre-determined google server other another one.
To generate a diff of this commit:
cvs rdiff -u -r1.3.4.3 -r1.3.4.4 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.4.4.3 -r1.4.4.4 src/usr.sbin/sysinst/menus.mi
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/usr.sbin/sysinst/net.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.3.4.3 src/usr.sbin/sysinst/defs.h:1.3.4.4
--- src/usr.sbin/sysinst/defs.h:1.3.4.3 Sat May 9 13:50:15 2015
+++ src/usr.sbin/sysinst/defs.h Thu May 14 00:30:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.3.4.3 2015/05/09 13:50:15 msaitoh Exp $ */
+/* $NetBSD: defs.h,v 1.3.4.4 2015/05/14 00:30:50 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -490,7 +490,7 @@ int get_real_geom(const char *, struct d
/* from net.c */
extern int network_up;
-extern char net_namesvr6[STRSIZE];
+extern char net_namesvr[STRSIZE];
int get_via_ftp(const char *);
int get_via_nfs(void);
int config_network(void);
Index: src/usr.sbin/sysinst/menus.mi
diff -u src/usr.sbin/sysinst/menus.mi:1.4.4.3 src/usr.sbin/sysinst/menus.mi:1.4.4.4
--- src/usr.sbin/sysinst/menus.mi:1.4.4.3 Wed May 13 17:04:27 2015
+++ src/usr.sbin/sysinst/menus.mi Thu May 14 00:30:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi,v 1.4.4.3 2015/05/13 17:04:27 snj Exp $ */
+/* $NetBSD: menus.mi,v 1.4.4.4 2015/05/14 00:30:50 riz Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -501,8 +501,8 @@ menu namesrv6, title MSG_Select_DNS_serv
option "google-public-dns-a.google.com (IPv6)", exit, action
{
#ifdef INET6
- strlcpy(net_namesvr6, "2001:4860:4860::",
- sizeof(net_namesvr6));
+ strlcpy(net_namesvr, "2001:4860:4860::",
+ sizeof(net_namesvr));
yesno = 1;
#else
yesno = 0;
@@ -511,8 +511,8 @@ menu namesrv6, title MSG_Select_DNS_serv
option "google-public-dns-b.google.com (IPv6)", exit, action
{
#ifdef INET6
- strlcpy(net_namesvr6, "2001:4860:4860::8844",
- sizeof(net_namesvr6));
+ strlcpy(net_namesvr, "2001:4860:4860::8844",
+ sizeof(net_namesvr));
yesno = 1;
#else
yesno = 0;
Index: src/usr.sbin/sysinst/net.c
diff -u src/usr.sbin/sysinst/net.c:1.2.4.2 src/usr.sbin/sysinst/net.c:1.2.4.3
--- src/usr.sbin/sysinst/net.c:1.2.4.2 Fri Feb 27 11:29:44 2015
+++ src/usr.sbin/sysinst/net.c Thu May 14 00:30:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.2.4.2 2015/02/27 11:29:44 martin Exp $ */
+/* $NetBSD: net.c,v 1.2.4.3 2015/05/14 00:30:50 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -76,7 +76,7 @@ static char net_host[STRSIZE];
static char net_ip[SSTRSIZE];
static char net_srv_ip[SSTRSIZE];
static char net_mask[SSTRSIZE];
-static char net_namesvr[STRSIZE];
+char net_namesvr[STRSIZE];
static char net_defroute[STRSIZE];
static char net_media[STRSIZE];
static char sl_flags[STRSIZE];
@@ -87,8 +87,6 @@ static int net_dhcpconf;
#define DHCPCONF_DOMAIN 0x08
#ifdef INET6
static char net_ip6[STRSIZE];
-char net_namesvr6[STRSIZE];
-static int net_ip6conf;
#define IP6CONF_AUTOHOST0x01
#endif
@@ -108,8 +106,6 @@ static void get_dhcp_value(char *, size_
#ifdef INET6
static int is_v6kernel (void);
-static void init_v6kernel (int);
-static int get_v6wait (void);
#endif
/*
@@ -435,41 +431,6 @@ is_v6kernel(void)
close(s);
return 1;
}
-
-/*
- * initialize as v6 client.
- * we are sure that we will never become router with boot floppy :-)
- * (include and use sysctl(8) if you are willing to)
- */
-static void
-init_v6kernel(int autoconf)
-{
- int v;
- int mib[4] = {CTL_NET, PF_INET6, IPPROTO_IPV6, 0};
-
- mib[3] = IPV6CTL_FORWARDING;
- v = 0;
- (void)sysctl(mib, 4, NULL, NULL, (void *)&v, sizeof(v));
-
- mib[3] = IPV6CTL_ACCEPT_RTADV;
- v = autoconf ? 1 : 0;
- (void)sysctl(mib, 4, NULL, NULL, (void *)&v, sizeof(v));
-}
-
-static int
-get_v6wait(void)
-{
- size_t len = sizeof(int);
- int v;
- int mib[4] = {CTL_NET, PF_INET6, IPPROTO_IPV6, IPV6CTL_DAD_COUNT};
-
- len = sizeof(v);
- if (sysctl(mib, 4, (void *)&v, &len, NULL, 0) < 0) {
- /* warn("sysctl(net.inet6.ip6.dadcount)"); */
- return 1; /* guess */
- }
- return v;
-}
#endif
static int
@@ -731,28 +692,19 @@ again:
sizeof net_defroute);
}
- if (!dhcp_config || net_namesvr[0] == 0)
+ if (!(net_dhcpconf & DHCPCONF_NAMESVR)) {
+#ifdef INET6
+
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Thu May 14 00:07:04 UTC 2015 Added Files: src/sys/arch/evbarm/conf: JETSONTK1_INSTALL Log Message: add INSTALL kernel for JETSONTK1 To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/JETSONTK1_INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/evbarm/conf/JETSONTK1_INSTALL diff -u /dev/null src/sys/arch/evbarm/conf/JETSONTK1_INSTALL:1.1 --- /dev/null Thu May 14 00:07:04 2015 +++ src/sys/arch/evbarm/conf/JETSONTK1_INSTALL Thu May 14 00:07:04 2015 @@ -0,0 +1,10 @@ +# $NetBSD: JETSONTK1_INSTALL,v 1.1 2015/05/14 00:07:04 jmcneill Exp $ +# +# JETSONTK1_INSTALL -- NVIDIA JETSONTK1 kernel with +# installation-sized ramdisk +# + +include "arch/evbarm/conf/JETSONTK1" +include "arch/evbarm/conf/INSTALL" + +options BOOTHOWTO=RB_SINGLE
CVS commit: src/share/man/man9
Module Name:src Committed By: pgoyette Date: Thu May 14 00:08:44 UTC 2015 Modified Files: src/share/man/man9: Makefile Added Files: src/share/man/man9: devsw_attach.9 Log Message: Add new man page for devsw_attach() and friends. >From Kamil Ritarowski with some editting by myself. To generate a diff of this commit: cvs rdiff -u -r1.386 -r1.387 src/share/man/man9/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man9/devsw_attach.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.386 src/share/man/man9/Makefile:1.387 --- src/share/man/man9/Makefile:1.386 Mon Apr 27 07:03:57 2015 +++ src/share/man/man9/Makefile Thu May 14 00:08:44 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.386 2015/04/27 07:03:57 knakahara Exp $ +# $NetBSD: Makefile,v 1.387 2015/05/14 00:08:44 pgoyette Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -16,7 +16,7 @@ MAN= accept_filter.9 accf_data.9 accf_ht cpu_startup.9 cpu_switchto.9 cpufreq.9 \ csf.9 ctod.9 \ curproc.9 \ - delay.9 disk.9 ddc.9 disklabel.9 dofileread.9 \ + delay.9 devsw_attach.9 disk.9 ddc.9 disklabel.9 dofileread.9 \ dopowerhooks.9 do_setresuid.9 doshutdownhooks.9 driver.9 \ edid.9 errno.9 ethersubr.9 evcnt.9 extattr.9 extent.9 \ fetch.9 file.9 fileassoc.9 filedesc.9 firmload.9 flash.9 \ @@ -278,6 +278,11 @@ MLINKS+=ctod.9 dtoc.9 \ ctod.9 btodb.9 MLINKS+=curproc.9 curcpu.9 curproc.9 curlwp.9 MLINKS+=delay.9 DELAY.9 +MLINKS+=devsw_attach.9 devsw_detach.9 \ + devsw_attach.9 bdevsw_lookup.9 \ + devsw_attach.9 cdevsw_lookup.9 \ + devsw_attach.9 bdevsw_lookup_major.9 \ + devsw_attach.9 cdevsw_lookup_major.9 MLINKS+=disk.9 disk_attach.9 disk.9 disk_detach.9 \ disk.9 disk_busy.9 disk.9 disk_unbusy.9 disk.9 disk_find.9 \ disk.9 disk_init.9 disk.9 disk_destroy.9 disk.9 disk_begindetach.9 Added files: Index: src/share/man/man9/devsw_attach.9 diff -u /dev/null src/share/man/man9/devsw_attach.9:1.1 --- /dev/null Thu May 14 00:08:44 2015 +++ src/share/man/man9/devsw_attach.9 Thu May 14 00:08:44 2015 @@ -0,0 +1,178 @@ +.\" $NetBSD: devsw_attach.9,v 1.1 2015/05/14 00:08:44 pgoyette Exp $ +.\" +.\" Copyright (c) 2015 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" This code is derived from software contributed to The NetBSD Foundation +.\" by Kamil Rytarowski. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.Dd May 13, 2015 +.Dt DEVSW_ATTACH 9 +.Os +.Sh NAME +.Nm devsw_attach , +.Nm devsw_detach , +.Nm bdevsw_lookup , +.Nm cdevsw_lookup , +.Nm bdevsw_lookup_major , +.Nm cdevsw_lookup_major +.Nd character and block device switch functions +.Sh SYNOPSIS +.In sys/conf.h +.Ft int +.Fo devsw_attach +.Fa "const char *devname" +.Fa "const struct bdevsw *bev" +.Fa "devmajor_t *bmajor" +.Fa "const struct cdevsw *cdev" +.Fa "devmajor_t *cmajor" +.Fc +.Ft int +.Fo devsw_detach +.Fa "const struct bdevsw *bdev" +.Fa "const struct cdevsw *cdev" +.Fc +.Ft "const struct bdevsw *" +.Fo bdevsw_lookup +.Fa "dev_t dev" +.Fc +.Ft "const struct cdevsw *" +.Fo cdevsw_lookup +.Fa "dev_t dev" +.Fc +.Ft devmajor_t +.Fo bdevsw_lookup_major +.Fa "const struct bdevsw *bdev" +.Fc +.Ft devmajor_t +.Fo cdevsw_lookup_major +.Fa "const struct cdevsw *cdev" +.Fc +.Sh DESCRIPTION +If a device driver has character device interfaces accessed from +userland, the driver must define a +.Em cdevsw +structure. +If the driver also has block device interfaces, the driver must +additionally define a +.Em bdevsw +structure. +These structures are constant, and are defined within the
CVS commit: src/sys/arch/evbarm/tegra
Module Name:src
Committed By: jmcneill
Date: Thu May 14 00:02:00 UTC 2015
Modified Files:
src/sys/arch/evbarm/tegra: tegra_machdep.c
Log Message:
5V/12V power to molex connector on Jetson TK1 is controlled by GPIO EE2
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/tegra/tegra_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/tegra/tegra_machdep.c
diff -u src/sys/arch/evbarm/tegra/tegra_machdep.c:1.14 src/sys/arch/evbarm/tegra/tegra_machdep.c:1.15
--- src/sys/arch/evbarm/tegra/tegra_machdep.c:1.14 Wed May 13 11:07:02 2015
+++ src/sys/arch/evbarm/tegra/tegra_machdep.c Thu May 14 00:02:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_machdep.c,v 1.14 2015/05/13 11:07:02 jmcneill Exp $ */
+/* $NetBSD: tegra_machdep.c,v 1.15 2015/05/14 00:02:00 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.14 2015/05/13 11:07:02 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.15 2015/05/14 00:02:00 jmcneill Exp $");
#include "opt_tegra.h"
#include "opt_machdep.h"
@@ -390,6 +390,11 @@ tegra_device_register(device_t self, voi
}
}
+ if (device_is_a(self, "ahcisata")
+ && device_is_a(device_parent(self), "tegraio")) {
+ prop_dictionary_set_cstring(dict, "power-gpio", "EE2");
+ }
+
if (device_is_a(self, "ehci")
&& device_is_a(device_parent(self), "tegraio")) {
struct tegraio_attach_args * const tio = aux;
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: pgoyette Date: Thu May 14 00:09:55 UTC 2015 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Update sets lists for new devsw_attach(9) man page and its MLINKS To generate a diff of this commit: cvs rdiff -u -r1.1957 -r1.1958 src/distrib/sets/lists/comp/mi 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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1957 src/distrib/sets/lists/comp/mi:1.1958 --- src/distrib/sets/lists/comp/mi:1.1957 Wed May 6 15:57:07 2015 +++ src/distrib/sets/lists/comp/mi Thu May 14 00:09:54 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1957 2015/05/06 15:57:07 hannken Exp $ +# $NetBSD: mi,v 1.1958 2015/05/14 00:09:54 pgoyette Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -9871,6 +9871,8 @@ ./usr/share/man/cat9/bcdtobin.0 comp-sys-catman .cat ./usr/share/man/cat9/bcmp.0 comp-sys-catman .cat ./usr/share/man/cat9/bcopy.0 comp-sys-catman .cat +./usr/share/man/cat9/bdevsw_lookup.0 comp-sys-catman .cat +./usr/share/man/cat9/bdevsw_lookup_major.0 comp-sys-catman .cat ./usr/share/man/cat9/bdevvp.0 comp-sys-catman .cat ./usr/share/man/cat9/bdwrite.0 comp-sys-catman .cat ./usr/share/man/cat9/be16dec.0 comp-sys-catman .cat @@ -10010,6 +10012,8 @@ ./usr/share/man/cat9/cardbus_make_tag.0 comp-sys-catman .cat ./usr/share/man/cat9/cardbus_mapreg_map.0 comp-sys-catman .cat ./usr/share/man/cat9/cardbus_mapreg_unmap.0 comp-sys-catman .cat +./usr/share/man/cat9/cdevsw_lookup.0 comp-sys-catman .cat +./usr/share/man/cat9/cdevsw_lookup_major.0 comp-sys-catman .cat ./usr/share/man/cat9/cdevvp.0 comp-sys-catman .cat ./usr/share/man/cat9/checkalias.0 comp-obsolete obsolete ./usr/share/man/cat9/child_return.0 comp-sys-catman .cat @@ -10158,6 +10162,8 @@ ./usr/share/man/cat9/deviter_init.0 comp-sys-catman .cat ./usr/share/man/cat9/deviter_next.0 comp-sys-catman .cat ./usr/share/man/cat9/deviter_release.0 comp-sys-catman .cat +./usr/share/man/cat9/devsw_attach.0 comp-sys-catman .cat +./usr/share/man/cat9/devsw_detach.0 comp-sys-catman .cat ./usr/share/man/cat9/disk.0 comp-sys-catman .cat ./usr/share/man/cat9/disk_attach.0 comp-sys-catman .cat ./usr/share/man/cat9/disk_begindetach.0 comp-sys-catman .cat @@ -16673,6 +16679,8 @@ ./usr/share/man/html9/bcdtobin.html comp-sys-htmlman html ./usr/share/man/html9/bcmp.html comp-sys-htmlman html ./usr/share/man/html9/bcopy.html comp-sys-htmlman html +./usr/share/man/html9/bdevsw_lookup.html comp-sys-htmlman html +./usr/share/man/html9/bdevsw_lookup_major.html comp-sys-htmlman html ./usr/share/man/html9/bdevvp.html comp-sys-htmlman html ./usr/share/man/html9/bdwrite.html comp-sys-htmlman html ./usr/share/man/html9/be16dec.html comp-sys-htmlman html @@ -16810,6 +16818,8 @@ ./usr/share/man/html9/cardbus_make_tag.html comp-sys-htmlman html ./usr/share/man/html9/cardbus_mapreg_map.html comp-sys-htmlman html ./usr/share/man/html9/cardbus_mapreg_unmap.html comp-sys-htmlman html +./usr/share/man/html9/cdevsw_lookup.html comp-sys-htmlman html +./usr/share/man/html9/cdevsw_lookup_major.html comp-sys-htmlman html ./usr/share/man/html9/cdevvp.html comp-sys-htmlman html ./usr/share/man/html9/checkalias.html comp-obsolete obsolete ./usr/share/man/html9/child_return.html comp-sys-htmlman html @@ -16942,6 +16952,8 @@ ./usr/share/man/html9/deviter_init.html comp-sys-htmlman html ./usr/share/man/html9/deviter_next.html comp-sys-htmlman html ./usr/share/man/html9/deviter_release.html comp-sys-htmlman html +./usr/share/man/html9/devsw_attach.html comp-sys-htmlman html +./usr/share/man/html9/devsw_detach.html comp-sys-htmlman html ./usr/share/man/html9/disk.html comp-sys-htmlman html ./usr/share/man/html9/disk_attach.html comp-sys-htmlman html ./usr/share/man/html9/disk_begindetach.html comp-sys-htmlman html @@ -23601,6 +23613,8 @@ ./usr/share/man/man9/bcdtobin.9 comp-sys-man .man ./usr/share/man/man9/bcmp.9 comp-sys-man .man ./usr/share/man/man9/bcopy.9 comp-sys-man .man +./usr/share/man/man9/bdevsw_lookup.9 comp-sys-man .man +./usr/share/man/man9/bdevsw_lookup_major.9 comp-sys-man .man ./usr/share/man/man9/bdevvp.9 comp-sys-man .man ./usr/share/man/man9/bdwrite.9 comp-sys-man .man ./usr/share/man/man9/be16dec.9 comp-sys-man .man @@ -23740,6 +23754,8 @@ ./usr/share/man/man9/cardbus_make_tag.9 comp-sys-man .man ./usr/share/man/man9/cardbus_mapreg_map.9 comp-sys-man .man ./usr/share/man/man9/cardbus_mapreg_unmap.9 comp-sys-man .man +./usr/share/man/man9/cdevsw_lookup.9 comp-sys-man .man +./usr/share/man/man9/cdevsw_lookup_major.9 comp-sys-man .man ./usr/share/man/man9/cdevvp.9 comp-sys-man .man ./usr/share/man/man9/checkalias.9 comp-obsolete obsolete ./usr/share/man/man9/child_return.9 comp-sys-man .man @@ -23882,6 +23898,8 @@
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Thu May 14 00:00:44 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_ahcisata.c tegra_car.c tegra_carreg.h
Log Message:
fix SATA controller init
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nvidia/tegra_ahcisata.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/nvidia/tegra_car.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/nvidia/tegra_carreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_ahcisata.c
diff -u src/sys/arch/arm/nvidia/tegra_ahcisata.c:1.3 src/sys/arch/arm/nvidia/tegra_ahcisata.c:1.4
--- src/sys/arch/arm/nvidia/tegra_ahcisata.c:1.3 Sun May 10 15:31:48 2015
+++ src/sys/arch/arm/nvidia/tegra_ahcisata.c Thu May 14 00:00:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_ahcisata.c,v 1.3 2015/05/10 15:31:48 jmcneill Exp $ */
+/* $NetBSD: tegra_ahcisata.c,v 1.4 2015/05/14 00:00:44 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -29,7 +29,7 @@
#include "locators.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_ahcisata.c,v 1.3 2015/05/10 15:31:48 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_ahcisata.c,v 1.4 2015/05/14 00:00:44 jmcneill Exp $");
#include
#include
@@ -54,6 +54,8 @@ struct tegra_ahcisata_softc {
bus_space_tag_t sc_bst;
bus_space_handle_t sc_bsh;
void *sc_ih;
+
+ struct tegra_gpio_pin *sc_pin_power;
};
static void tegra_ahcisata_init(struct tegra_ahcisata_softc *);
@@ -73,6 +75,8 @@ tegra_ahcisata_attach(device_t parent, d
struct tegra_ahcisata_softc * const sc = device_private(self);
struct tegraio_attach_args * const tio = aux;
const struct tegra_locators * const loc = &tio->tio_loc;
+ prop_dictionary_t prop = device_properties(self);
+ const char *pin;
sc->sc_bst = tio->tio_bst;
bus_space_subregion(tio->tio_bst, tio->tio_bsh,
@@ -81,7 +85,7 @@ tegra_ahcisata_attach(device_t parent, d
sc->sc.sc_atac.atac_dev = self;
sc->sc.sc_dmat = tio->tio_dmat;
sc->sc.sc_ahcit = tio->tio_bst;
- sc->sc.sc_ahcis = loc->loc_size;
+ sc->sc.sc_ahcis = loc->loc_size - TEGRA_AHCISATA_OFFSET;
bus_space_subregion(tio->tio_bst, tio->tio_bsh,
loc->loc_offset + TEGRA_AHCISATA_OFFSET,
loc->loc_size - TEGRA_AHCISATA_OFFSET, &sc->sc.sc_ahcih);
@@ -90,6 +94,12 @@ tegra_ahcisata_attach(device_t parent, d
aprint_naive("\n");
aprint_normal(": SATA\n");
+ if (prop_dictionary_get_cstring_nocopy(prop, "power-gpio", &pin)) {
+ sc->sc_pin_power = tegra_gpio_acquire(pin, GPIO_PIN_OUTPUT);
+ if (sc->sc_pin_power)
+ tegra_gpio_write(sc->sc_pin_power, 1);
+ }
+
tegra_car_periph_sata_enable();
tegra_ahcisata_init(sc);
Index: src/sys/arch/arm/nvidia/tegra_car.c
diff -u src/sys/arch/arm/nvidia/tegra_car.c:1.11 src/sys/arch/arm/nvidia/tegra_car.c:1.12
--- src/sys/arch/arm/nvidia/tegra_car.c:1.11 Wed May 13 11:06:13 2015
+++ src/sys/arch/arm/nvidia/tegra_car.c Thu May 14 00:00:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_car.c,v 1.11 2015/05/13 11:06:13 jmcneill Exp $ */
+/* $NetBSD: tegra_car.c,v 1.12 2015/05/14 00:00:44 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -29,7 +29,7 @@
#include "locators.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_car.c,v 1.11 2015/05/13 11:06:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_car.c,v 1.12 2015/05/14 00:00:44 jmcneill Exp $");
#include
#include
@@ -462,6 +462,23 @@ tegra_car_periph_sata_enable(void)
tegra_car_get_bs(&bst, &bsh);
+ const u_int pllp_rate = tegra_car_pllp0_rate();
+
+ /* Set SATA_OOB clock source to PLLP, 204MHz */
+ const u_int sataoob_div = pllp_rate / 2;
+ bus_space_write_4(bst, bsh, CAR_CLKSRC_SATA_OOB_REG,
+ __SHIFTIN(CAR_CLKSRC_SATA_SRC_PLLP_OUT0,
+ CAR_CLKSRC_SATA_SRC) |
+ __SHIFTIN(sataoob_div - 1, CAR_CLKSRC_SATA_OOB_DIV));
+
+ /* Set SATA clock source to PLLP, 102MHz */
+ const u_int sata_div = pllp_rate / 1;
+ bus_space_write_4(bst, bsh, CAR_CLKSRC_SATA_REG,
+ CAR_CLKSRC_SATA_AUX_CLK_ENB |
+ __SHIFTIN(CAR_CLKSRC_SATA_SRC_PLLP_OUT0,
+ CAR_CLKSRC_SATA_SRC) |
+ __SHIFTIN(sata_div - 1, CAR_CLKSRC_SATA_DIV));
+
/* Enable CML clock for SATA */
tegra_reg_set_clear(bst, bsh, CAR_PLLE_AUX_REG,
CAR_PLLE_AUX_CML1_OEN, 0);
@@ -475,6 +492,7 @@ tegra_car_periph_sata_enable(void)
tegra_pmc_power(PMC_PARTID_SAX, true);
/* Turn on the clocks to SATA and de-assert resets */
+ bus_space_write_4(bst, bsh, CAR_CLK_ENB_W_SET_REG, CAR_DEV_W_SATACOLD);
bus_space_write_4(bst, bsh, CAR_CLK_ENB_V_SET_REG, CAR_DEV_V_SATA);
bus_space_write_4(bst, bsh, CAR_RST_DEV_W_CLR_REG, CAR_DEV_W_SATACOLD);
bus_space_write_4(bst, bsh, CAR_RST_DEV_V_CLR_REG, CAR_DEV_V_SATA);
Index: src/sys/arch/arm/nvidia/tegra_carreg.h
diff -u src/sys/arch/arm/nvidia/tegra_carreg.h:1.12 src/sys/arch/arm/nvidia/tegra_carreg.h:1.13
--- src/sys/arch/arm/nvidia/tegra_carreg.h:1.12 Wed May 1
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: riastradh
Date: Wed May 13 23:57:02 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c
Log Message:
Remove workaround for PR kern/49195.
Problem seems to have been properly fixed in rev. 1.25.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.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_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.29 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.30
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.29 Fri Apr 3 01:06:05 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Wed May 13 23:57:02 2015
@@ -2806,21 +2806,10 @@ void i915_vma_move_to_active(struct i915
static void
i915_gem_object_move_to_inactive(struct drm_i915_gem_object *obj)
{
- struct drm_device *dev = obj->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = obj->base.dev->dev_private;
struct i915_address_space *vm;
struct i915_vma *vma;
- if ((obj->base.write_domain & I915_GEM_DOMAIN_GTT) != 0) {
- printk(KERN_ERR "%s: %p 0x%x flushing gtt\n", __func__, obj,
- obj->base.write_domain);
- i915_gem_object_flush_gtt_write_domain(obj);
- }
- if ((obj->base.write_domain & I915_GEM_DOMAIN_CPU) != 0) {
- printk(KERN_ERR "%s: %p 0x%x flushing cpu\n", __func__, obj,
- obj->base.write_domain);
- i915_gem_object_flush_cpu_write_domain(obj, false);
- }
BUG_ON(obj->base.write_domain & ~I915_GEM_GPU_DOMAINS);
BUG_ON(!obj->active);
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: justin
Date: Wed May 13 23:15:57 UTC 2015
Modified Files:
src/lib/libc/gen: arc4random.c
Log Message:
Missing MAP_PRIVATE on mmap
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/gen/arc4random.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/libc/gen/arc4random.c
diff -u src/lib/libc/gen/arc4random.c:1.29 src/lib/libc/gen/arc4random.c:1.30
--- src/lib/libc/gen/arc4random.c:1.29 Thu Mar 19 05:46:25 2015
+++ src/lib/libc/gen/arc4random.c Wed May 13 23:15:57 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: arc4random.c,v 1.29 2015/03/19 05:46:25 riastradh Exp $ */
+/* $NetBSD: arc4random.c,v 1.30 2015/05/13 23:15:57 justin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include
-__RCSID("$NetBSD: arc4random.c,v 1.29 2015/03/19 05:46:25 riastradh Exp $");
+__RCSID("$NetBSD: arc4random.c,v 1.30 2015/05/13 23:15:57 justin Exp $");
#include "namespace.h"
#include "reentrant.h"
@@ -444,7 +444,7 @@ arc4random_prng_create(void)
struct arc4random_prng *prng;
const size_t size = roundup(sizeof(*prng), sysconf(_SC_PAGESIZE));
- prng = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0);
+ prng = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
if (prng == MAP_FAILED)
goto fail0;
if (minherit(prng, size, MAP_INHERIT_ZERO) == -1)
CVS commit: src/sys/modules/examples
Module Name:src Committed By: pgoyette Date: Wed May 13 22:41:48 UTC 2015 Modified Files: src/sys/modules/examples: README Log Message: Fix up another internal reference to renamed module, and adjust some English grammar. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/examples/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/examples/README diff -u src/sys/modules/examples/README:1.1 src/sys/modules/examples/README:1.2 --- src/sys/modules/examples/README:1.1 Wed May 13 07:07:36 2015 +++ src/sys/modules/examples/README Wed May 13 22:41:48 2015 @@ -1,4 +1,4 @@ - $NetBSD: README,v 1.1 2015/05/13 07:07:36 pgoyette Exp $ + $NetBSD: README,v 1.2 2015/05/13 22:41:48 pgoyette Exp $ Kernel Developer's Manual @@ -10,7 +10,7 @@ DESCRIPTION * properties - handle incoming properties during the module load * readhappy - basic implementation of read(9) with happy numbers * ping- basic ioctl(9) - * hellolua- the simplest `hello world' Lua module + * luahello- the simplest `hello world' Lua module To build the examples you need a local copy of NetBSD sources. You also need the comp set with toolchain. To build the module just enter a @@ -52,7 +52,7 @@ HISTORY Husemann, Adam Hamsik, John Nemeth and Mindaugas Rasiukevicius. This document and additional modules (hello, readhappy, properties, - and ping, hellolua) first appeared in NetBSD 8.0 and they were written + ping, and luahello) first appeared in NetBSD 8.0; they were written by Kamil Rytarowski. AUTHORS
CVS commit: src/sys/modules/examples/luahello
Module Name:src Committed By: pgoyette Date: Wed May 13 22:37:53 UTC 2015 Modified Files: src/sys/modules/examples/luahello: luahello.lua Log Message: Fix instructions to match reality. (I renamed the example from the original submitter, but didn't catch all internal references.) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/examples/luahello/luahello.lua Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/examples/luahello/luahello.lua diff -u src/sys/modules/examples/luahello/luahello.lua:1.1 src/sys/modules/examples/luahello/luahello.lua:1.2 --- src/sys/modules/examples/luahello/luahello.lua:1.1 Wed May 13 07:07:36 2015 +++ src/sys/modules/examples/luahello/luahello.lua Wed May 13 22:37:53 2015 @@ -1,4 +1,4 @@ -# $NetBSD: luahello.lua,v 1.1 2015/05/13 07:07:36 pgoyette Exp $ +# $NetBSD: luahello.lua,v 1.2 2015/05/13 22:37:53 pgoyette Exp $ # # # Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ #luactl require state1 systm # # 4. Load our code in state1 -#luactl load state1 ./hellolua.lua +#luactl load state1 ./luahello.lua # # NB. The path with our code must contain at least single '/' character
CVS commit: src/share/man
Module Name:src Committed By: pgoyette Date: Wed May 13 22:31:16 UTC 2015 Modified Files: src/share/man/man9: module.9 src/share/man/man9lua: intro.9lua Log Message: Add a reference to the recently added module examples. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/share/man/man9/module.9 cvs rdiff -u -r1.4 -r1.5 src/share/man/man9lua/intro.9lua Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/module.9 diff -u src/share/man/man9/module.9:1.34 src/share/man/man9/module.9:1.35 --- src/share/man/man9/module.9:1.34 Wed May 13 12:21:04 2015 +++ src/share/man/man9/module.9 Wed May 13 22:31:16 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: module.9,v 1.34 2015/05/13 12:21:04 pgoyette Exp $ +.\" $NetBSD: module.9,v 1.35 2015/05/13 22:31:16 pgoyette Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -446,6 +446,10 @@ needed when a module is loaded or unload deals with resolution of relocatable symbols. .Fn module_init_md is for finding modules passed in by the boot loader. +.Sh EXAMPLES +A set of example modules is available in the +.Pa src/sys/modules.examples +directory hierarchy. .Sh SEE ALSO .Xr modctl 2 , .Xr module 7 , Index: src/share/man/man9lua/intro.9lua diff -u src/share/man/man9lua/intro.9lua:1.4 src/share/man/man9lua/intro.9lua:1.5 --- src/share/man/man9lua/intro.9lua:1.4 Mon Jan 6 13:03:01 2014 +++ src/share/man/man9lua/intro.9lua Wed May 13 22:31:16 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: intro.9lua,v 1.4 2014/01/06 13:03:01 wiz Exp $ +.\" $NetBSD: intro.9lua,v 1.5 2015/05/13 22:31:16 pgoyette Exp $ .\" .\" Copyright (c) 2013 Marc Balmer . All rights reserved. .\" @@ -36,6 +36,10 @@ .Sh DESCRIPTION This section provides an overview of the Lua kernel bindings, their functions, error returns and other common definitions and concepts. +.Sh EXAMPLES +An example module is available in the +.Pa src/sys/modules/examples/ +directory hierarchy. .Sh SEE ALSO .Xr lua 1 , .Xr luac 1 ,
CVS commit: src/usr.bin/rpcgen
Module Name:src Committed By: joerg Date: Wed May 13 20:13:22 UTC 2015 Modified Files: src/usr.bin/rpcgen: rpc_util.h Log Message: Mark error as dead. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/usr.bin/rpcgen/rpc_util.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/rpcgen/rpc_util.h diff -u src/usr.bin/rpcgen/rpc_util.h:1.11 src/usr.bin/rpcgen/rpc_util.h:1.12 --- src/usr.bin/rpcgen/rpc_util.h:1.11 Sat May 9 23:28:43 2015 +++ src/usr.bin/rpcgen/rpc_util.h Wed May 13 20:13:21 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rpc_util.h,v 1.11 2015/05/09 23:28:43 dholland Exp $ */ +/* $NetBSD: rpc_util.h,v 1.12 2015/05/13 20:13:21 joerg Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape @@ -114,7 +114,7 @@ int isvectordef(const char *, relation); char *locase(const char *); void pvname_svc(const char *, const char *); void pvname(const char *, const char *); -__printflike(1, 2) void error(const char *, ...); +__dead __printflike(1, 2) void error(const char *, ...); void crash(void); void record_open(const char *); void expected1(tok_kind) __dead;
CVS commit: src/lib/libc/ssp
Module Name:src
Committed By: joerg
Date: Wed May 13 19:57:16 UTC 2015
Modified Files:
src/lib/libc/ssp: memcpy_chk.c
Log Message:
void * is bad for computation, so cast to const char * first.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/ssp/memcpy_chk.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/libc/ssp/memcpy_chk.c
diff -u src/lib/libc/ssp/memcpy_chk.c:1.6 src/lib/libc/ssp/memcpy_chk.c:1.7
--- src/lib/libc/ssp/memcpy_chk.c:1.6 Sat May 9 15:42:21 2015
+++ src/lib/libc/ssp/memcpy_chk.c Wed May 13 19:57:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: memcpy_chk.c,v 1.6 2015/05/09 15:42:21 christos Exp $ */
+/* $NetBSD: memcpy_chk.c,v 1.7 2015/05/13 19:57:16 joerg Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: memcpy_chk.c,v 1.6 2015/05/09 15:42:21 christos Exp $");
+__RCSID("$NetBSD: memcpy_chk.c,v 1.7 2015/05/13 19:57:16 joerg Exp $");
/*LINTLIBRARY*/
@@ -47,7 +47,7 @@ __memcpy_chk(void * __restrict dst, cons
if (len > slen)
__chk_fail();
- if (__ssp_overlap(src, dst, len))
+ if (__ssp_overlap((const char *)src, (const char *)dst, len))
__chk_fail();
return memcpy(dst, src, len);
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Wed May 13 19:20:30 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 737, 760 To generate a diff of this commit: cvs rdiff -u -r1.1.2.293 -r1.1.2.294 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.293 src/doc/CHANGES-7.0:1.1.2.294 --- src/doc/CHANGES-7.0:1.1.2.293 Wed May 13 17:30:57 2015 +++ src/doc/CHANGES-7.0 Wed May 13 19:20:30 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.293 2015/05/13 17:30:57 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.294 2015/05/13 19:20:30 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -22851,8 +22851,10 @@ sys/dev/microcode/radeon/Makefile 1.3 [mrg, ticket #736] sys/miscfs/fdesc/fdesc_vfsops.c 1.90 +sys/miscfs/fdesc/fdesc_vnops.c 1.125 via patch Fix type of /dev/tty + Restore VNON setting code and then set the proper type in lookup. [riz, ticket #737] distrib/evbarm/instkernel/sshramdisk/Makefile patch @@ -23014,3 +23016,11 @@ usr.sbin/sysinst/msg.mi.pl 1.5 Fixes PR install/49231. [martin, ticket #754] +usr.sbin/syslogd/syslogd.c 1.120 + + - when checking hostname of incoming remote messages, fallback + to checking remote host if the message doesn't contain a + hostname + - don't truncate IP addresses when reading syslogd.conf + [jnemeth, ticket #760] +
CVS commit: [netbsd-7] src/usr.sbin/syslogd
Module Name:src
Committed By: snj
Date: Wed May 13 19:19:19 UTC 2015
Modified Files:
src/usr.sbin/syslogd [netbsd-7]: syslogd.c
Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #760):
usr.sbin/syslogd/syslogd.c: revision 1.120
- when checking hostname of incoming remote messages, fallback to checking
remote host if the message doesn't contain a hostname
- don't truncate IP addresses when reading syslogd.conf
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.119.4.1 src/usr.sbin/syslogd/syslogd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/syslogd/syslogd.c
diff -u src/usr.sbin/syslogd/syslogd.c:1.119 src/usr.sbin/syslogd/syslogd.c:1.119.4.1
--- src/usr.sbin/syslogd/syslogd.c:1.119 Wed Nov 27 20:48:28 2013
+++ src/usr.sbin/syslogd/syslogd.c Wed May 13 19:19:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: syslogd.c,v 1.119 2013/11/27 20:48:28 christos Exp $ */
+/* $NetBSD: syslogd.c,v 1.119.4.1 2015/05/13 19:19:19 snj Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: syslogd.c,v 1.119 2013/11/27 20:48:28 christos Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.119.4.1 2015/05/13 19:19:19 snj Exp $");
#endif
#endif /* not lint */
@@ -1854,21 +1854,22 @@ logmsg(struct buf_msg *buffer)
}
for (f = Files; f; f = f->f_next) {
+ char *h; /* host to use for comparing */
+
/* skip messages that are incorrect priority */
if (!MATCH_PRI(f, fac, prilev)
|| f->f_pmask[fac] == INTERNAL_NOPRI)
continue;
/* skip messages with the incorrect host name */
- /* do we compare with host (IMHO correct) or recvhost */
- /* (compatible)? */
- if (f->f_host != NULL && buffer->host != NULL) {
- char shost[MAXHOSTNAMELEN + 1], *h;
- if (!BSDOutputFormat) {
-h = buffer->host;
- } else {
-(void)strlcpy(shost, buffer->host,
-sizeof(shost));
+ /* compare with host (which is supposedly more correct), */
+ /* but fallback to recvhost if host is NULL */
+ h = (buffer->host != NULL) ? buffer->host : buffer->recvhost;
+ if (f->f_host != NULL && h != NULL) {
+ char shost[MAXHOSTNAMELEN + 1];
+
+ if (BSDOutputFormat) {
+(void)strlcpy(shost, h, sizeof(shost));
trim_anydomain(shost);
h = shost;
}
@@ -3740,7 +3741,7 @@ cfline(size_t linenum, const char *line,
f->f_host = NULL;
else {
f->f_host = strdup(host);
- trim_anydomain(f->f_host);
+ trim_anydomain(&f->f_host[1]); /* skip +/- at beginning */
}
/* save program name, if any */
CVS commit: [netbsd-7] src/sys/miscfs/fdesc
Module Name:src Committed By: snj Date: Wed May 13 19:16:14 UTC 2015 Modified Files: src/sys/miscfs/fdesc [netbsd-7]: fdesc_vnops.c Log Message: Pull up following revision(s) (requested by riz in ticket #737): sys/miscfs/fdesc/fdesc_vnops.c: revision 1.125 via patch The comment about toxicity was correct, restore VNON setting code and then set the proper type in lookup. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.121.2.1 src/sys/miscfs/fdesc/fdesc_vnops.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/miscfs/fdesc/fdesc_vnops.c diff -u src/sys/miscfs/fdesc/fdesc_vnops.c:1.121 src/sys/miscfs/fdesc/fdesc_vnops.c:1.121.2.1 --- src/sys/miscfs/fdesc/fdesc_vnops.c:1.121 Fri Jul 25 08:20:52 2014 +++ src/sys/miscfs/fdesc/fdesc_vnops.c Wed May 13 19:16:14 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: fdesc_vnops.c,v 1.121 2014/07/25 08:20:52 dholland Exp $ */ +/* $NetBSD: fdesc_vnops.c,v 1.121.2.1 2015/05/13 19:16:14 snj Exp $ */ /* * Copyright (c) 1992, 1993 @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.121 2014/07/25 08:20:52 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.121.2.1 2015/05/13 19:16:14 snj Exp $"); #include #include @@ -295,6 +295,8 @@ bad: good: KASSERT(ix != -1); error = vcache_get(dvp->v_mount, &ix, sizeof(ix), vpp); + if (error == 0 && ix == FD_CTTY) + (*vpp)->v_type = VCHR; return error; }
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Wed May 13 17:30:57 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 754 To generate a diff of this commit: cvs rdiff -u -r1.1.2.292 -r1.1.2.293 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.292 src/doc/CHANGES-7.0:1.1.2.293 --- src/doc/CHANGES-7.0:1.1.2.292 Wed May 13 14:14:10 2015 +++ src/doc/CHANGES-7.0 Wed May 13 17:30:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.292 2015/05/13 14:14:10 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.293 2015/05/13 17:30:57 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -23001,3 +23001,16 @@ sys/arch/vax/vax/ka660.c 1.11 Fixes bug introduced in earlier cleanup. [ragge, ticket #757] +usr.sbin/sysinst/menus.mi 1.6 +usr.sbin/sysinst/msg.mi.de 1.5 +usr.sbin/sysinst/msg.mi.en 1.5 +usr.sbin/sysinst/msg.mi.es 1.5 +usr.sbin/sysinst/msg.mi.fr 1.5 +usr.sbin/sysinst/msg.mi.pl 1.5 + + Change the IPv6 DNS selection to use DNS selection and add the + Google Public V4 DNS servers to the list. + The other field can take an IPv4 or IPv6 name server of choice. + Fixes PR install/49231. + [martin, ticket #754] +
CVS commit: [netbsd-7] src/usr.sbin/sysinst
Module Name:src
Committed By: snj
Date: Wed May 13 17:04:27 UTC 2015
Modified Files:
src/usr.sbin/sysinst [netbsd-7]: menus.mi msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl
Log Message:
Pull up following revision(s) (requested by martin in ticket #754):
usr.sbin/sysinst/menus.mi: revision 1.6
usr.sbin/sysinst/msg.mi.de: revision 1.5
usr.sbin/sysinst/msg.mi.en: revision 1.5
usr.sbin/sysinst/msg.mi.es: revision 1.5
usr.sbin/sysinst/msg.mi.fr: revision 1.5
usr.sbin/sysinst/msg.mi.pl: revision 1.5
Change the IPv6 DNS selection to use DNS selection and add the
Google Public V4 DNS servers to the list.
The other field can take an IPv4 or IPv6 name server of choice.
Fixes PR install/49231.
To generate a diff of this commit:
cvs rdiff -u -r1.4.4.2 -r1.4.4.3 src/usr.sbin/sysinst/menus.mi
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 src/usr.sbin/sysinst/msg.mi.de \
src/usr.sbin/sysinst/msg.mi.es src/usr.sbin/sysinst/msg.mi.fr
cvs rdiff -u -r1.2.4.4 -r1.2.4.5 src/usr.sbin/sysinst/msg.mi.en
cvs rdiff -u -r1.2.4.3 -r1.2.4.4 src/usr.sbin/sysinst/msg.mi.pl
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.4.4.2 src/usr.sbin/sysinst/menus.mi:1.4.4.3
--- src/usr.sbin/sysinst/menus.mi:1.4.4.2 Sat May 9 13:52:37 2015
+++ src/usr.sbin/sysinst/menus.mi Wed May 13 17:04:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi,v 1.4.4.2 2015/05/09 13:52:37 msaitoh Exp $ */
+/* $NetBSD: menus.mi,v 1.4.4.3 2015/05/13 17:04:27 snj Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -477,8 +477,28 @@ menu localdirsource, y=-4, x=0, w=70, no
action { src_prompt(MSG_Set_dir_src, set_dir_src, 60); };
option MSG_exit_menu_generic, exit, action { yesno = SET_RETRY; };
-menu namesrv6, title MSG_Select_IPv6_DNS_server;
- option "google-public-dns-a.google.com", exit, action
+menu namesrv6, title MSG_Select_DNS_server;
+ option "google-public-dns-a.google.com (IPv4)", exit, action
+ {
+#ifdef INET6
+ strlcpy(net_namesvr, "8.8.8.8",
+ sizeof(net_namesvr));
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
+ option "google-public-dns-b.google.com (IPv4)", exit, action
+ {
+#ifdef INET6
+ strlcpy(net_namesvr, "8.8.4.4",
+ sizeof(net_namesvr));
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
+ option "google-public-dns-a.google.com (IPv6)", exit, action
{
#ifdef INET6
strlcpy(net_namesvr6, "2001:4860:4860::",
@@ -488,7 +508,7 @@ menu namesrv6, title MSG_Select_IPv6_DNS
yesno = 0;
#endif
};
- option "google-public-dns-b.google.com", exit, action
+ option "google-public-dns-b.google.com (IPv6)", exit, action
{
#ifdef INET6
strlcpy(net_namesvr6, "2001:4860:4860::8844",
Index: src/usr.sbin/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.2.4.1 src/usr.sbin/sysinst/msg.mi.de:1.2.4.2
--- src/usr.sbin/sysinst/msg.mi.de:1.2.4.1 Tue Jan 20 09:42:31 2015
+++ src/usr.sbin/sysinst/msg.mi.de Wed May 13 17:04:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.2.4.1 2015/01/20 09:42:31 martin Exp $ */
+/* $NetBSD: msg.mi.de,v 1.2.4.2 2015/05/13 17:04:27 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1006,7 +1006,7 @@ message Abandon {Installation abbrechen}
message Abort_fetch {Holen abbrechen}
message Device {Gerät}
message File_system {Dateisystem}
-message Select_IPv6_DNS_server { Auswählen eines IPv6 DNS Servers}
+message Select_DNS_server { Auswählen eines DNS Servers}
message other {andere }
message Perform_IPv6_autoconfiguration {IPv6 automatisch konfigurieren?}
message Perform_DHCP_autoconfiguration {Konfiguration per DHCP ermitteln?}
Index: src/usr.sbin/sysinst/msg.mi.es
diff -u src/usr.sbin/sysinst/msg.mi.es:1.2.4.1 src/usr.sbin/sysinst/msg.mi.es:1.2.4.2
--- src/usr.sbin/sysinst/msg.mi.es:1.2.4.1 Tue Jan 20 09:42:31 2015
+++ src/usr.sbin/sysinst/msg.mi.es Wed May 13 17:04:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.2.4.1 2015/01/20 09:42:31 martin Exp $ */
+/* $NetBSD: msg.mi.es,v 1.2.4.2 2015/05/13 17:04:27 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -972,7 +972,7 @@ message Abandon {Abandonar instalación}
message Abort_fetch {Abortar lectura}
message Device {Dispositivo}
message File_system {Sistema de archivos}
-message Select_IPv6_DNS_server { Seleccione servidor DNS de IPv6}
+message Select_DNS_server { Seleccione servidor DNS}
message other {otro }
message Perform_IPv6_autoconfiguration {¿Realizar autoconfiguración IPv6?}
message Perform_DHCP_autoconfiguration {¿Realizar autoconfiguración DHCP ?}
Index: src/usr.sbin/sysinst/msg.mi.fr
diff -u src/usr.sbin/sysinst/msg.mi.fr:1.2.4.1 src/usr.sbin/sysinst/msg.mi.fr:1.2.4.2
--- src/usr.sbin/sysinst/msg.mi.fr:1.2.4.1 Tue Jan 20 09:42:31 2015
+++ src/usr.sbin/sysinst/msg.mi.fr Wed May 13 17:04:2
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: skrll
Date: Wed May 13 15:33:47 UTC 2015
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Use PDE_SYNC when syncing pdeps
To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 src/sys/arch/arm/arm32/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/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.321 src/sys/arch/arm/arm32/pmap.c:1.322
--- src/sys/arch/arm/arm32/pmap.c:1.321 Mon May 11 22:28:22 2015
+++ src/sys/arch/arm/arm32/pmap.c Wed May 13 15:33:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.321 2015/05/11 22:28:22 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.322 2015/05/13 15:33:47 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -216,7 +216,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.321 2015/05/11 22:28:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.322 2015/05/13 15:33:47 skrll Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -1569,7 +1569,7 @@ pmap_alloc_l2_bucket(pmap_t pm, vaddr_t
| L1_C_DOM(pmap_domain(pm));
KASSERT(*pdep == 0);
l1pte_setone(pdep, npde);
- PTE_SYNC(pdep);
+ PDE_SYNC(pdep);
#endif
}
@@ -3359,7 +3359,7 @@ pmap_enter(pmap_t pm, vaddr_t va, paddr_
| L1_C_DOM(pmap_domain(pm));
if (*pdep != pde) {
l1pte_setone(pdep, pde);
- PTE_SYNC(pdep);
+ PDE_SYNC(pdep);
}
}
}
@@ -4546,7 +4546,7 @@ pmap_fault_fixup(pmap_t pm, vaddr_t va,
pd_entry_t pde = L1_C_PROTO | l2b->l2b_pa | L1_C_DOM(pmap_domain(pm));
if (*pdep != pde) {
l1pte_setone(pdep, pde);
- PTE_SYNC(pdep);
+ PDE_SYNC(pdep);
rv = 1;
PMAPCOUNT(fixup_pdes);
}
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Wed May 13 14:14:10 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #757 To generate a diff of this commit: cvs rdiff -u -r1.1.2.291 -r1.1.2.292 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.291 src/doc/CHANGES-7.0:1.1.2.292 --- src/doc/CHANGES-7.0:1.1.2.291 Wed May 13 13:35:25 2015 +++ src/doc/CHANGES-7.0 Wed May 13 14:14:10 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.291 2015/05/13 13:35:25 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.292 2015/05/13 14:14:10 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -22996,3 +22996,8 @@ lib/libedit/readline.c1.112-1.115 improve readline compatibility, clang build fix. [christos, #753] +sys/arch/vax/vax/ka660.c 1.11 + + Fixes bug introduced in earlier cleanup. + [ragge, ticket #757] +
CVS commit: [netbsd-7] src/sys/arch/vax/vax
Module Name:src
Committed By: martin
Date: Wed May 13 14:09:09 UTC 2015
Modified Files:
src/sys/arch/vax/vax [netbsd-7]: ka660.c
Log Message:
Pull up following revision(s) (requested by ragge in ticket #757):
sys/arch/vax/vax/ka660.c: revision 1.11
PR port-vax/49884
Fixes bug introduced in earlier cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.34.1 src/sys/arch/vax/vax/ka660.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/vax/vax/ka660.c
diff -u src/sys/arch/vax/vax/ka660.c:1.10 src/sys/arch/vax/vax/ka660.c:1.10.34.1
--- src/sys/arch/vax/vax/ka660.c:1.10 Tue Dec 14 23:44:49 2010
+++ src/sys/arch/vax/vax/ka660.c Wed May 13 14:09:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ka660.c,v 1.10 2010/12/14 23:44:49 matt Exp $ */
+/* $NetBSD: ka660.c,v 1.10.34.1 2015/05/13 14:09:09 martin Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ka660.c,v 1.10 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka660.c,v 1.10.34.1 2015/05/13 14:09:09 martin Exp $");
#include
#include
@@ -61,7 +61,7 @@ static void ka660_cache_enable(void);
static void ka660_attach_cpu(device_t);
static int ka660_mchk(void *);
-static const char * const ka660_devs[] = { "cpu", "sgec", "vsbus", NULL };
+static const char * const ka660_devs[] = { "cpu", "sgec", "shac", "uba", NULL };
/*
* Declaration of 660-specific calls.
@@ -92,7 +92,7 @@ void
ka660_attach_cpu(device_t self)
{
aprint_normal(
- ": %s, Rigel (ucode rev. %d), 2KB L1 cache, 128KB L2 cache\n",
+ ": %s, SOC (ucode rev. %d), 6KB L1 cache\n",
"KA660",
vax_cpudata & 0377);
}
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Wed May 13 13:35:25 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #753 To generate a diff of this commit: cvs rdiff -u -r1.1.2.290 -r1.1.2.291 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.290 src/doc/CHANGES-7.0:1.1.2.291 --- src/doc/CHANGES-7.0:1.1.2.290 Mon May 11 11:02:42 2015 +++ src/doc/CHANGES-7.0 Wed May 13 13:35:25 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.290 2015/05/11 11:02:42 msaitoh Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.291 2015/05/13 13:35:25 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -22983,3 +22983,16 @@ sys/dev/cadence/if_cemacvar.h 1.1 Initial Zynq (Xilinx) support. [nonaka, ticket #751] + +lib/libedit/Makefile1.53 +lib/libedit/chartype.h1.13 +lib/libedit/editline.31.83-1.84 +lib/libedit/editrc.51.28-1.29 +lib/libedit/eln.c1.18 +lib/libedit/filecomplete.c 1.33-1.34 +lib/libedit/readline.c1.112-1.115 + + Man page improvements, fix overlapping strcpy, + improve readline compatibility, clang build fix. + [christos, #753] +
CVS commit: [netbsd-7] src/lib/libedit
Module Name:src
Committed By: martin
Date: Wed May 13 13:33:55 UTC 2015
Modified Files:
src/lib/libedit [netbsd-7]: Makefile chartype.h editline.3 editrc.5
eln.c filecomplete.c readline.c
Log Message:
Sync lib/libedit with head, requested by christos in #753:
lib/libedit/Makefile 1.53
lib/libedit/chartype.h 1.13
lib/libedit/editline.3 1.83-1.84
lib/libedit/editrc.5 1.28-1.29
lib/libedit/eln.c 1.18
lib/libedit/filecomplete.c 1.33-1.34
lib/libedit/readline.c 1.112-1.115
Man page improvements, fix overlapping strcpy, improve readline
compatibility, clang build fix.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.52.2.1 src/lib/libedit/Makefile
cvs rdiff -u -r1.10.18.1 -r1.10.18.2 src/lib/libedit/chartype.h
cvs rdiff -u -r1.82 -r1.82.2.1 src/lib/libedit/editline.3
cvs rdiff -u -r1.27 -r1.27.8.1 src/lib/libedit/editrc.5
cvs rdiff -u -r1.17 -r1.17.2.1 src/lib/libedit/eln.c
cvs rdiff -u -r1.32 -r1.32.2.1 src/lib/libedit/filecomplete.c
cvs rdiff -u -r1.111 -r1.111.2.1 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/Makefile
diff -u src/lib/libedit/Makefile:1.52 src/lib/libedit/Makefile:1.52.2.1
--- src/lib/libedit/Makefile:1.52 Sat Jun 14 20:49:37 2014
+++ src/lib/libedit/Makefile Wed May 13 13:33:55 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2014/06/14 20:49:37 mrg Exp $
+# $NetBSD: Makefile,v 1.52.2.1 2015/05/13 13:33:55 martin Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
USE_SHLIBDIR= yes
@@ -13,6 +13,7 @@ LIBDPLIBS+= terminfo ${.CURDIR}/../l
COPTS+= -Wunused-parameter
CWARNFLAGS.gcc+= -Wconversion
+CWARNFLAGS.clang+= -Wno-cast-qual
OSRCS= chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \
hist.c keymacro.c map.c chartype.c \
Index: src/lib/libedit/chartype.h
diff -u src/lib/libedit/chartype.h:1.10.18.1 src/lib/libedit/chartype.h:1.10.18.2
--- src/lib/libedit/chartype.h:1.10.18.1 Tue Apr 14 05:30:24 2015
+++ src/lib/libedit/chartype.h Wed May 13 13:33:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: chartype.h,v 1.10.18.1 2015/04/14 05:30:24 snj Exp $ */
+/* $NetBSD: chartype.h,v 1.10.18.2 2015/05/13 13:33:55 martin Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
* supports non-BMP code points without requiring UTF-16, but nothing
* seems to actually advertise this properly, despite Unicode 3.1 having
* been around since 2001... */
-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__))
+#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__)
#ifndef __STDC_ISO_10646__
/* In many places it is assumed that the first 127 code points are ASCII
* compatible, so ensure wchar_t indeed does ISO 10646 and not some other
Index: src/lib/libedit/editline.3
diff -u src/lib/libedit/editline.3:1.82 src/lib/libedit/editline.3:1.82.2.1
--- src/lib/libedit/editline.3:1.82 Sun May 11 09:01:42 2014
+++ src/lib/libedit/editline.3 Wed May 13 13:33:55 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: editline.3,v 1.82 2014/05/11 09:01:42 wiz Exp $
+.\" $NetBSD: editline.3,v 1.82.2.1 2015/05/13 13:33:55 martin Exp $
.\"
.\" Copyright (c) 1997-2014 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -26,7 +26,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd May 10, 2014
+.Dd December 25, 2014
.Dt EDITLINE 3
.Os
.Sh NAME
@@ -190,7 +190,9 @@ The following functions are available:
.Bl -tag -width 4n
.It Fn el_init
Initialise the line editor, and return a data structure
-to be used by all other line editing functions.
+to be used by all other line editing functions, or
+.Dv NULL
+on failure.
.Fa prog
is the name of the invoking program, used when reading the
.Xr editrc 5
@@ -290,6 +292,7 @@ parameters.
.Fa op
determines which parameter to set, and each operation has its
own parameter list.
+Returns 0 on success, \-1 on failure.
.Pp
The following values for
.Fa op
@@ -605,6 +608,8 @@ Refer to
.Xr editrc 5
for details on the format of
.Fa file .
+.Fn el_source
+returns 0 on success and \-1 on error.
.It Fn el_resize
Must be called if the terminal size changes.
If
@@ -665,7 +670,9 @@ The following functions are available:
.Bl -tag -width 4n
.It Fn history_init
Initialise the history list, and return a data structure
-to be used by all other history list functions.
+to be used by all other history list functions, or
+.Dv NULL
+on failure.
.It Fn history_end
Clean up and finish with
.Fa h ,
@@ -734,12 +741,12 @@ as a new element to the history, and, if
removing the oldest entry to keep the list to the created size.
If
.Dv H_SETUNIQUE
-was has been called with a non-zero arguments, the element
+has been called with a non-zero argument, the element
CVS commit: src/share/man/man9
Module Name:src Committed By: pgoyette Date: Wed May 13 12:21:04 UTC 2015 Modified Files: src/share/man/man9: module.9 Log Message: Add the correct cross-ref, to intro(9lua) To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/share/man/man9/module.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/module.9 diff -u src/share/man/man9/module.9:1.33 src/share/man/man9/module.9:1.34 --- src/share/man/man9/module.9:1.33 Wed May 13 10:49:26 2015 +++ src/share/man/man9/module.9 Wed May 13 12:21:04 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: module.9,v 1.33 2015/05/13 10:49:26 pgoyette Exp $ +.\" $NetBSD: module.9,v 1.34 2015/05/13 12:21:04 pgoyette Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -448,7 +448,8 @@ deals with resolution of relocatable sym is for finding modules passed in by the boot loader. .Sh SEE ALSO .Xr modctl 2 , -.Xr module 7 +.Xr module 7 , +.Xr intro 9lua .Sh HISTORY The kernel module subsystem first appeared in .Nx 5.0 .
CVS commit: src/sys/modules/examples/ping
Module Name:src
Committed By: joerg
Date: Wed May 13 12:13:38 UTC 2015
Modified Files:
src/sys/modules/examples/ping: cmd_ping.c
Log Message:
Fix RCS ID.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/examples/ping/cmd_ping.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/modules/examples/ping/cmd_ping.c
diff -u src/sys/modules/examples/ping/cmd_ping.c:1.1 src/sys/modules/examples/ping/cmd_ping.c:1.2
--- src/sys/modules/examples/ping/cmd_ping.c:1.1 Wed May 13 07:07:36 2015
+++ src/sys/modules/examples/ping/cmd_ping.c Wed May 13 12:13:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cmd_ping.c,v 1.1 2015/05/13 07:07:36 pgoyette Exp $ */
+/* $NetBSD: cmd_ping.c,v 1.2 2015/05/13 12:13:38 joerg Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD $");
+__RCSID("$NetBSD: cmd_ping.c,v 1.2 2015/05/13 12:13:38 joerg Exp $");
#include
#include
CVS commit: src/tests/net/mpls
Module Name:src
Committed By: martin
Date: Wed May 13 12:01:24 UTC 2015
Modified Files:
src/tests/net/mpls: t_ldp_regen.sh
Log Message:
Before pinging, wait for addresses to come out of tentative state
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/net/mpls/t_ldp_regen.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/net/mpls/t_ldp_regen.sh
diff -u src/tests/net/mpls/t_ldp_regen.sh:1.5 src/tests/net/mpls/t_ldp_regen.sh:1.6
--- src/tests/net/mpls/t_ldp_regen.sh:1.5 Mon May 4 10:57:17 2015
+++ src/tests/net/mpls/t_ldp_regen.sh Wed May 13 12:01:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: t_ldp_regen.sh,v 1.5 2015/05/04 10:57:17 martin Exp $
+# $NetBSD: t_ldp_regen.sh,v 1.6 2015/05/13 12:01:24 martin Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -57,6 +57,8 @@ newaddr_and_ping() {
# Add new address on R4
RUMP_SERVER=${RUMP_SERVER4} atf_check -s exit:0 \
rump.ifconfig shmif1 10.0.5.1/24 alias
+ RUMP_SERVER=${RUMP_SERVER4} atf_check -s exit:0 \
+ rump.ifconfig -w 60
# Now ldpd on R5 should take notice of the new route and announce it
# to R4's ldpd. ldpd on R4 should verify that the next hop
@@ -145,6 +147,8 @@ create_servers() {
wait_ldp_ok() {
RUMP_SERVER=${RUMP_SERVER1} atf_check -s exit:0 -o ignore -e ignore \
+ rump.ifconfig -w 60
+ RUMP_SERVER=${RUMP_SERVER1} atf_check -s exit:0 -o ignore -e ignore \
rump.ping -o -w 60 10.0.4.1
}
CVS commit: src/share/man/man7
Module Name:src Committed By: shm Date: Wed May 13 11:36:12 UTC 2015 Modified Files: src/share/man/man7: security.7 Log Message: 0 mappings are currently disabled on all architectures. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man7/security.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/security.7 diff -u src/share/man/man7/security.7:1.11 src/share/man/man7/security.7:1.12 --- src/share/man/man7/security.7:1.11 Tue Mar 18 18:20:40 2014 +++ src/share/man/man7/security.7 Wed May 13 11:36:12 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: security.7,v 1.11 2014/03/18 18:20:40 riastradh Exp $ +.\" $NetBSD: security.7,v 1.12 2015/05/13 11:36:12 shm Exp $ .\" .\" Copyright (c) 2006, 2011 Elad Efrat .\" All rights reserved. @@ -351,8 +351,7 @@ In .Nx it is possible to restrict whether user processes are allowed to make mappings at the zero address. -By default, address 0 mappings are restricted -on the i386 and amd64 architectures. +By default, address 0 mappings are restricted on all architectures. It is however known that some third-party programs may not function properly with the restriction. Such mappings can be allowed either by using the
CVS commit: src/sys/arch/evbarm/tegra
Module Name:src
Committed By: skrll
Date: Wed May 13 11:21:38 UTC 2015
Modified Files:
src/sys/arch/evbarm/tegra: tegra_start.S
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/tegra/tegra_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/tegra/tegra_start.S
diff -u src/sys/arch/evbarm/tegra/tegra_start.S:1.5 src/sys/arch/evbarm/tegra/tegra_start.S:1.6
--- src/sys/arch/evbarm/tegra/tegra_start.S:1.5 Wed May 13 11:21:04 2015
+++ src/sys/arch/evbarm/tegra/tegra_start.S Wed May 13 11:21:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_start.S,v 1.5 2015/05/13 11:21:04 skrll Exp $ */
+/* $NetBSD: tegra_start.S,v 1.6 2015/05/13 11:21:38 skrll Exp $ */
/*-
* Copyright (c) 2014, 2015 The NetBSD Foundation, Inc.
@@ -41,9 +41,9 @@
#include "assym.h"
#include
-#include
+#include
-RCSID("$NetBSD: tegra_start.S,v 1.5 2015/05/13 11:21:04 skrll Exp $")
+RCSID("$NetBSD: tegra_start.S,v 1.6 2015/05/13 11:21:38 skrll Exp $")
#if defined(VERBOSE_INIT_ARM)
#define XPUTC(n) mov r0, n; bl xputc
CVS commit: src/sys/arch/evbarm/tegra
Module Name:src
Committed By: skrll
Date: Wed May 13 11:21:04 UTC 2015
Modified Files:
src/sys/arch/evbarm/tegra: tegra_start.S
Log Message:
One comment is enough for anybody
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/tegra/tegra_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/tegra/tegra_start.S
diff -u src/sys/arch/evbarm/tegra/tegra_start.S:1.4 src/sys/arch/evbarm/tegra/tegra_start.S:1.5
--- src/sys/arch/evbarm/tegra/tegra_start.S:1.4 Tue May 12 10:37:20 2015
+++ src/sys/arch/evbarm/tegra/tegra_start.S Wed May 13 11:21:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_start.S,v 1.4 2015/05/12 10:37:20 jmcneill Exp $ */
+/* $NetBSD: tegra_start.S,v 1.5 2015/05/13 11:21:04 skrll Exp $ */
/*-
* Copyright (c) 2014, 2015 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#include
#include
-RCSID("$NetBSD: tegra_start.S,v 1.4 2015/05/12 10:37:20 jmcneill Exp $")
+RCSID("$NetBSD: tegra_start.S,v 1.5 2015/05/13 11:21:04 skrll Exp $")
#if defined(VERBOSE_INIT_ARM)
#define XPUTC(n) mov r0, n; bl xputc
@@ -117,10 +117,6 @@ _C_LABEL(tegra_start):
bne 2b
1:
-/*
- * Turn on the SMP bit
- */
-
/*
* Turn on the SMP bit
*/
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Wed May 13 11:07:28 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: JETSONTK1 Log Message: select max cpu frequency (~2.3GHz) at boot To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/JETSONTK1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/JETSONTK1 diff -u src/sys/arch/evbarm/conf/JETSONTK1:1.16 src/sys/arch/evbarm/conf/JETSONTK1:1.17 --- src/sys/arch/evbarm/conf/JETSONTK1:1.16 Tue May 12 20:54:30 2015 +++ src/sys/arch/evbarm/conf/JETSONTK1 Wed May 13 11:07:28 2015 @@ -1,5 +1,5 @@ # -# $NetBSD: JETSONTK1,v 1.16 2015/05/12 20:54:30 jmcneill Exp $ +# $NetBSD: JETSONTK1,v 1.17 2015/05/13 11:07:28 jmcneill Exp $ # # NVIDIA Jetson TK1 - Tegra K1 development kit # https://developer.nvidia.com/jetson-tk1 @@ -11,6 +11,7 @@ include "arch/evbarm/conf/GENERIC.common options CPU_CORTEXA15 options SOC_TEGRA124 options BOARD_JETSONTK1 +options CPUFREQ_BOOT=2292 #options MULTIPROCESSOR #options MEMSIZE=2048
CVS commit: src/sys/arch/evbarm/tegra
Module Name:src
Committed By: jmcneill
Date: Wed May 13 11:07:02 UTC 2015
Modified Files:
src/sys/arch/evbarm/tegra: tegra_machdep.c
Log Message:
initialize cpufreq subsystem
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/tegra/tegra_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/tegra/tegra_machdep.c
diff -u src/sys/arch/evbarm/tegra/tegra_machdep.c:1.13 src/sys/arch/evbarm/tegra/tegra_machdep.c:1.14
--- src/sys/arch/evbarm/tegra/tegra_machdep.c:1.13 Tue May 12 10:37:20 2015
+++ src/sys/arch/evbarm/tegra/tegra_machdep.c Wed May 13 11:07:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_machdep.c,v 1.13 2015/05/12 10:37:20 jmcneill Exp $ */
+/* $NetBSD: tegra_machdep.c,v 1.14 2015/05/13 11:07:02 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.13 2015/05/12 10:37:20 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.14 2015/05/13 11:07:02 jmcneill Exp $");
#include "opt_tegra.h"
#include "opt_machdep.h"
@@ -373,6 +373,10 @@ tegra_device_register(device_t self, voi
return;
}
+ if (device_is_a(self, "cpu") && device_unit(self) == 0) {
+ tegra_cpuinit();
+ }
+
#ifdef BOARD_JETSONTK1
if (device_is_a(self, "sdhc")
&& device_is_a(device_parent(self), "tegraio")) {
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Wed May 13 11:06:13 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: files.tegra soc_tegra124.c tegra_car.c
tegra_carreg.h tegra_soc.c tegra_var.h
Added Files:
src/sys/arch/arm/nvidia: tegra_cpufreq.c
Log Message:
Tegra K1 CPU frequency scaling support.
jetsontk1# sysctl machdep.cpu
machdep.cpu.frequency.target = 2292
machdep.cpu.frequency.current = 2292
machdep.cpu.frequency.available = 2292 2100 1896 1692 1500 1296 1092 900 696
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/files.tegra
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/soc_tegra124.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/nvidia/tegra_car.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/nvidia/tegra_carreg.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/nvidia/tegra_cpufreq.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nvidia/tegra_soc.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/nvidia/tegra_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/files.tegra
diff -u src/sys/arch/arm/nvidia/files.tegra:1.9 src/sys/arch/arm/nvidia/files.tegra:1.10
--- src/sys/arch/arm/nvidia/files.tegra:1.9 Sun May 10 23:50:21 2015
+++ src/sys/arch/arm/nvidia/files.tegra Wed May 13 11:06:13 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.tegra,v 1.9 2015/05/10 23:50:21 jmcneill Exp $
+# $NetBSD: files.tegra,v 1.10 2015/05/13 11:06:13 jmcneill Exp $
#
# Configuration info for NVIDIA Tegra ARM Peripherals
#
@@ -14,6 +14,7 @@ file arch/arm/arm32/armv7_generic_space.
file arch/arm/arm/bus_space_a4x.S
file arch/arm/nvidia/tegra_soc.c
+file arch/arm/nvidia/tegra_cpufreq.c
file arch/arm/nvidia/soc_tegra124.c soc_tegra124
# On-board I/O
@@ -89,6 +90,9 @@ defparam opt_tegra.h CONMODE
# Memory parameters
defparam opt_tegra.h MEMSIZE
+# CPU parameters
+defparam opt_tegra.h CPUFREQ_BOOT
+
# SOC parameters
defflag opt_tegra.h SOC_TEGRAK1
defflag opt_tegra.h SOC_TEGRA124: SOC_TEGRAK1
Index: src/sys/arch/arm/nvidia/soc_tegra124.c
diff -u src/sys/arch/arm/nvidia/soc_tegra124.c:1.2 src/sys/arch/arm/nvidia/soc_tegra124.c:1.3
--- src/sys/arch/arm/nvidia/soc_tegra124.c:1.2 Sun Apr 26 22:04:28 2015
+++ src/sys/arch/arm/nvidia/soc_tegra124.c Wed May 13 11:06:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: soc_tegra124.c,v 1.2 2015/04/26 22:04:28 jmcneill Exp $ */
+/* $NetBSD: soc_tegra124.c,v 1.3 2015/05/13 11:06:13 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -30,7 +30,7 @@
#include "opt_multiprocessor.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: soc_tegra124.c,v 1.2 2015/04/26 22:04:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: soc_tegra124.c,v 1.3 2015/05/13 11:06:13 jmcneill Exp $");
#include
#include
@@ -47,6 +47,80 @@ __KERNEL_RCSID(0, "$NetBSD: soc_tegra124
#define EVP_RESET_VECTOR_0_REG 0x100
+static u_int tegra124_cpufreq_set_rate(u_int);
+static u_int tegra124_cpufreq_get_rate(void);
+static size_t tegra124_cpufreq_get_available(u_int *, size_t);
+
+static const struct tegra_cpufreq_func tegra124_cpufreq_func = {
+ .set_rate = tegra124_cpufreq_set_rate,
+ .get_rate = tegra124_cpufreq_get_rate,
+ .get_available = tegra124_cpufreq_get_available,
+};
+
+static struct tegra124_cpufreq_rate {
+ u_int rate;
+ u_int divm;
+ u_int divn;
+ u_int divp;
+} tegra124_cpufreq_rates[] = {
+ { 2292, 1, 191, 0 },
+ { 2100, 1, 175, 0 },
+ { 1896, 1, 158, 0 },
+ { 1692, 1, 141, 0 },
+ { 1500, 1, 125, 0 },
+ { 1296, 1, 108, 0 },
+ { 1092, 1, 91, 0 },
+ { 900, 1, 75, 0 },
+ { 696, 1, 58, 0 }
+};
+
+void
+tegra124_cpuinit(void)
+{
+ tegra_cpufreq_register(&tegra124_cpufreq_func);
+}
+
+static u_int
+tegra124_cpufreq_set_rate(u_int rate)
+{
+ const u_int nrates = __arraycount(tegra124_cpufreq_rates);
+ const struct tegra124_cpufreq_rate *r = NULL;
+
+ for (int i = 0; i < nrates; i++) {
+ if (tegra124_cpufreq_rates[i].rate == rate) {
+ r = &tegra124_cpufreq_rates[i];
+ break;
+ }
+ }
+ if (r == NULL)
+ return EINVAL;
+
+ tegra_car_pllx_set_rate(r->divm, r->divn, r->divp);
+
+ return 0;
+}
+
+static u_int
+tegra124_cpufreq_get_rate(void)
+{
+ return tegra_car_pllx_rate() / 100;
+}
+
+static size_t
+tegra124_cpufreq_get_available(u_int *pavail, size_t maxavail)
+{
+ const u_int nrates = __arraycount(tegra124_cpufreq_rates);
+ u_int n;
+
+ KASSERT(nrates <= maxavail);
+
+ for (n = 0; n < nrates; n++) {
+ pavail[n] = tegra124_cpufreq_rates[n].rate;
+ }
+
+ return nrates;
+}
+
void
tegra124_mpinit(void)
{
Index: src/sys/arch/arm/nvidia/tegra_car.c
diff -u src/sys/arch/arm/nvidia/tegra_car.c:1.10 src/sys/arch/arm/nvidia/tegra_car.c:1.11
--- src/sys/arch/arm/nvidia/tegra_car.c:1.10 Sun May 10 23:56:21 2015
+++ src/sys/arch/arm/nvidia/tegra_car.c Wed May 13 11:06:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_car.c,v 1.10 2015/05/10 23:56:21 jmcneill Exp $ */
+/* $NetBSD: tegra_car.c,v 1.11 2015/05/13 11:
CVS commit: src/share/man/man9
Module Name:src Committed By: pgoyette Date: Wed May 13 10:49:26 UTC 2015 Modified Files: src/share/man/man9: module.9 Log Message: Note to self: if you're going to revert, do it right. This should restore the original SEE ALSO section. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/share/man/man9/module.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/module.9 diff -u src/share/man/man9/module.9:1.32 src/share/man/man9/module.9:1.33 --- src/share/man/man9/module.9:1.32 Wed May 13 10:17:27 2015 +++ src/share/man/man9/module.9 Wed May 13 10:49:26 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: module.9,v 1.32 2015/05/13 10:17:27 pgoyette Exp $ +.\" $NetBSD: module.9,v 1.33 2015/05/13 10:49:26 pgoyette Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -447,8 +447,8 @@ deals with resolution of relocatable sym .Fn module_init_md is for finding modules passed in by the boot loader. .Sh SEE ALSO -.Xr modctl 2 -.Xr lua 9lua +.Xr modctl 2 , +.Xr module 7 .Sh HISTORY The kernel module subsystem first appeared in .Nx 5.0 .
CVS commit: src/share/man/man9
Module Name:src Committed By: pgoyette Date: Wed May 13 10:17:27 UTC 2015 Modified Files: src/share/man/man9: module.9 Log Message: Revert revision 1.31 - the referenced page does not exist and I am not qualified to write it! To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/share/man/man9/module.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/module.9 diff -u src/share/man/man9/module.9:1.31 src/share/man/man9/module.9:1.32 --- src/share/man/man9/module.9:1.31 Wed May 13 09:04:38 2015 +++ src/share/man/man9/module.9 Wed May 13 10:17:27 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: module.9,v 1.31 2015/05/13 09:04:38 pgoyette Exp $ +.\" $NetBSD: module.9,v 1.32 2015/05/13 10:17:27 pgoyette Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -447,8 +447,7 @@ deals with resolution of relocatable sym .Fn module_init_md is for finding modules passed in by the boot loader. .Sh SEE ALSO -.Xr modctl 2 , -.Xr module 7 , +.Xr modctl 2 .Xr lua 9lua .Sh HISTORY The kernel module subsystem first appeared in
CVS commit: src
Module Name:src
Committed By: ozaki-r
Date: Wed May 13 10:04:44 UTC 2015
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/net/net: Makefile
Added Files:
src/tests/net/net: t_forwarding.sh
Log Message:
Add basic tests for IP forwarding
To generate a diff of this commit:
cvs rdiff -u -r1.619 -r1.620 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.8 -r1.9 src/tests/net/net/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/net/t_forwarding.sh
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.619 src/distrib/sets/lists/tests/mi:1.620
--- src/distrib/sets/lists/tests/mi:1.619 Mon May 11 17:22:37 2015
+++ src/distrib/sets/lists/tests/mi Wed May 13 10:04:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.619 2015/05/11 17:22:37 christos Exp $
+# $NetBSD: mi,v 1.620 2015/05/13 10:04:44 ozaki-r Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3164,6 +3164,7 @@
./usr/tests/net/nettests-net-tests
./usr/tests/net/net/Atffile tests-net-tests atf
./usr/tests/net/net/Kyuafile tests-net-tests atf,kyua
+./usr/tests/net/net/t_forwarding tests-net-tests atf,rump
./usr/tests/net/net/t_pktinfo tests-net-tests atf
./usr/tests/net/net/t_raw tests-net-tests atf,rump
./usr/tests/net/net/t_tcp tests-net-tests atf
Index: src/tests/net/net/Makefile
diff -u src/tests/net/net/Makefile:1.8 src/tests/net/net/Makefile:1.9
--- src/tests/net/net/Makefile:1.8 Tue Jun 10 04:28:40 2014
+++ src/tests/net/net/Makefile Wed May 13 10:04:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/06/10 04:28:40 he Exp $
+# $NetBSD: Makefile,v 1.9 2015/05/13 10:04:44 ozaki-r Exp $
#
.include
@@ -16,4 +16,6 @@ TESTS_C+= t_raw
LDADD.t_raw+= -lrumpnet_local -lrumpnet_netinet -lrumpnet_net
LDADD.t_raw+= -lrumpnet -lrumpvfs -lrump -lrumpuser -lrump -lpthread
+TESTS_SH= t_forwarding
+
.include
Added files:
Index: src/tests/net/net/t_forwarding.sh
diff -u /dev/null src/tests/net/net/t_forwarding.sh:1.1
--- /dev/null Wed May 13 10:04:44 2015
+++ src/tests/net/net/t_forwarding.sh Wed May 13 10:04:44 2015
@@ -0,0 +1,375 @@
+# $NetBSD: t_forwarding.sh,v 1.1 2015/05/13 10:04:44 ozaki-r Exp $
+#
+# Copyright (c) 2015 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+inetserver="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
+inet6server="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 -lrumpnet_shmif"
+
+SOCKSRC=unix://commsock1
+SOCKFWD=unix://commsock2
+SOCKDST=unix://commsock3
+IP4SRC=10.0.1.2
+IP4SRCGW=10.0.1.1
+IP4DSTGW=10.0.2.1
+IP4DST=10.0.2.2
+IP6SRC=fc00:0:0:1::2
+IP6SRCGW=fc00:0:0:1::1
+IP6DSTGW=fc00:0:0:2::1
+IP6DST=fc00:0:0:2::2
+
+DEBUG=false
+
+atf_test_case basic cleanup
+atf_test_case basic6 cleanup
+
+basic_head()
+{
+ atf_set "descr" "Does IPv4 forwarding tests"
+ atf_set "require.progs" "rump_server"
+}
+
+basic6_head()
+{
+ atf_set "descr" "Does IPv6 forwarding tests"
+ atf_set "require.progs" "rump_server"
+}
+
+setup_endpoint()
+{
+ sock=${1}
+ addr=${2}
+ bus=${3}
+ mode=${4}
+ gw=${5}
+
+ export RUMP_SERVER=${sock}
+ atf_check -s exit:0 rump.ifconfig shmif0 create
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr ${bus}
+ if [ $mode = "ipv6" ]; then
+ atf_check -s exit:0 rump.ifconfig shmif0 inet6 ${addr}
+ atf_check -s exit:0 -o ignore rump.route add -inet6 default ${gw}
+ else
+ atf_check -s exit:0 rump.ifconfig shmif0 inet ${addr} netmask 0xff00
+ atf_check -s exit:0 -o ignore rump.route add default ${gw}
+ fi
+ at
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Wed May 13 09:15:21 UTC 2015 Modified Files: src/share/man/man4: drvctl.4 Log Message: Fix typos, sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/drvctl.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/drvctl.4 diff -u src/share/man/man4/drvctl.4:1.1 src/share/man/man4/drvctl.4:1.2 --- src/share/man/man4/drvctl.4:1.1 Wed May 13 07:28:49 2015 +++ src/share/man/man4/drvctl.4 Wed May 13 09:15:21 2015 @@ -1,4 +1,4 @@ -.\"$NetBSD: drvctl.4,v 1.1 2015/05/13 07:28:49 mlelstv Exp $ +.\"$NetBSD: drvctl.4,v 1.2 2015/05/13 09:15:21 wiz Exp $ .\" .\" Copyright (c) 2015 Michael van Elst .\" All rights reserved. @@ -35,7 +35,7 @@ The .Nm driver allows to control some -.Xr autoconfig 9 +.Xr autoconf 9 operations from userland through the .Pa /dev/drvctl device and the @@ -124,7 +124,7 @@ Send a command formatted as a property l The property list includes all arguments like the driver name, the result is again a property list. Currently the only supported command is "get-properties", -the property list is contructed like: +the property list is constructed like: .Bd -literal -offset indent const char *device = "sd0"; const char *command = "get-properties"; @@ -182,7 +182,7 @@ otherwise it waits for the next event. All names used in the ioctl arguments are zero-terminated strings. A driver name is the name of a driver instance with the appended unit number like -.Dv sd0, atabus3, ... +.Dv sd0 , atabus3 , ... .Sh FILES .Bl -tag .It Pa /dev/drvctl @@ -191,10 +191,10 @@ access device .El .Sh SEE ALSO .Xr ioctl 2 , -.Xr proplib 3 , .Xr prop_send_ioctl 3 , -.Xr drvctl 8 , +.Xr proplib 3 , .Xr devpubd 8 , +.Xr drvctl 8 , .Xr autoconf 9 .Sh HISTORY The
CVS commit: src/share/man/man9
Module Name:src Committed By: pgoyette Date: Wed May 13 09:04:38 UTC 2015 Modified Files: src/share/man/man9: module.9 Log Message: Add an entry for lue(9lua) to the SEE ALSO list. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/share/man/man9/module.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/module.9 diff -u src/share/man/man9/module.9:1.30 src/share/man/man9/module.9:1.31 --- src/share/man/man9/module.9:1.30 Tue Mar 18 18:20:40 2014 +++ src/share/man/man9/module.9 Wed May 13 09:04:38 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: module.9,v 1.30 2014/03/18 18:20:40 riastradh Exp $ +.\" $NetBSD: module.9,v 1.31 2015/05/13 09:04:38 pgoyette Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -448,7 +448,8 @@ deals with resolution of relocatable sym is for finding modules passed in by the boot loader. .Sh SEE ALSO .Xr modctl 2 , -.Xr module 7 +.Xr module 7 , +.Xr lua 9lua .Sh HISTORY The kernel module subsystem first appeared in .Nx 5.0 .
CVS commit: src
Module Name:src Committed By: mlelstv Date: Wed May 13 07:28:49 UTC 2015 Modified Files: src/distrib/sets/lists/man: mi src/sbin/drvctl: drvctl.8 src/share/man/man4: Makefile Added Files: src/share/man/man4: drvctl.4 Log Message: Add documentation for the drvctl driver and add reference. Fixes PR 49895. To generate a diff of this commit: cvs rdiff -u -r1.1500 -r1.1501 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.15 -r1.16 src/sbin/drvctl/drvctl.8 cvs rdiff -u -r1.619 -r1.620 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/drvctl.4 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1500 src/distrib/sets/lists/man/mi:1.1501 --- src/distrib/sets/lists/man/mi:1.1500 Mon May 4 02:43:45 2015 +++ src/distrib/sets/lists/man/mi Wed May 13 07:28:49 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1500 2015/05/04 02:43:45 pgoyette Exp $ +# $NetBSD: mi,v 1.1501 2015/05/13 07:28:49 mlelstv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -4064,6 +4064,7 @@ ./usr/share/man/html4/dreamcast/pvr.html man-sys-htmlman html ./usr/share/man/html4/drm.html man-sys-htmlman html ./usr/share/man/html4/drum.html man-sys-htmlman html +./usr/share/man/html4/drvctl.html man-sys-htmlman html ./usr/share/man/html4/dtide.html man-sys-htmlman html ./usr/share/man/html4/dtv.html man-sys-htmlman html ./usr/share/man/html4/dtviic.html man-sys-htmlman html @@ -6897,6 +6898,7 @@ ./usr/share/man/man4/dreamcast/pvr.4 man-sys-man .man ./usr/share/man/man4/drm.4 man-sys-man .man ./usr/share/man/man4/drum.4 man-sys-man .man +./usr/share/man/man4/drvctl.4 man-sys-man .man ./usr/share/man/man4/dtide.4 man-sys-man .man ./usr/share/man/man4/dtv.4 man-sys-man .man ./usr/share/man/man4/dtviic.4 man-sys-man .man Index: src/sbin/drvctl/drvctl.8 diff -u src/sbin/drvctl/drvctl.8:1.15 src/sbin/drvctl/drvctl.8:1.16 --- src/sbin/drvctl/drvctl.8:1.15 Wed Feb 25 09:01:08 2015 +++ src/sbin/drvctl/drvctl.8 Wed May 13 07:28:49 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: drvctl.8,v 1.15 2015/02/25 09:01:08 wiz Exp $ +.\" $NetBSD: drvctl.8,v 1.16 2015/05/13 07:28:49 mlelstv Exp $ .\" .\" Copyright (c) 2004 .\" Matthias Drochner. All rights reserved. @@ -150,7 +150,7 @@ output. .Pa /dev/drvctl .Sh SEE ALSO .Xr proplib 3 , -.\" .Xr drvctl 4 , +.Xr drvctl 4 , .Xr autoconf 9 .Sh BUGS Currently, there is no good way to get information about locator Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.619 src/share/man/man4/Makefile:1.620 --- src/share/man/man4/Makefile:1.619 Sun Feb 8 16:44:09 2015 +++ src/share/man/man4/Makefile Wed May 13 07:28:49 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.619 2015/02/08 16:44:09 wiz Exp $ +# $NetBSD: Makefile,v 1.620 2015/05/13 07:28:49 mlelstv Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -21,7 +21,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a clockctl.4 cmdide.4 cmpci.4 cms.4 cnw.4 \ com.4 coram.4 crypto.4 cs80bus.4 cuda.4 cypide.4 cxdtv.4 \ ddb.4 ddc.4 de.4 dge.4 dk.4 dm.4 dmoverio.4 \ - dmphy.4 dpt.4 dpti.4 drm.4 drum.4 dtv.4 dtviic.4 dwctwo.4 \ + dmphy.4 dpt.4 dpti.4 drm.4 drum.4 drvctl.4 dtv.4 dtviic.4 dwctwo.4 \ eap.4 ebus.4 edc.4 elmc.4 emuxki.4 en.4 envsys.4 ep.4 esh.4 \ esa.4 esiop.4 esm.4 eso.4 et.4 etherip.4 etphy.4 exphy.4 \ fast_ipsec.4 fd.4 filemon.4 finsio.4 flash.4 fpa.4 fms.4 fss.4 fujbp.4 fxp.4 \ Added files: Index: src/share/man/man4/drvctl.4 diff -u /dev/null src/share/man/man4/drvctl.4:1.1 --- /dev/null Wed May 13 07:28:49 2015 +++ src/share/man/man4/drvctl.4 Wed May 13 07:28:49 2015 @@ -0,0 +1,205 @@ +.\"$NetBSD: drvctl.4,v 1.1 2015/05/13 07:28:49 mlelstv Exp $ +.\" +.\" Copyright (c) 2015 Michael van Elst +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
CVS commit: src/sys/modules/examples
Module Name:src Committed By: pgoyette Date: Wed May 13 07:07:36 UTC 2015 Added Files: src/sys/modules/examples: Makefile Makefile.inc README src/sys/modules/examples/hello: Makefile hello.c src/sys/modules/examples/luahello: luahello.lua src/sys/modules/examples/ping: Makefile cmd_ping.c ping.c ping.h src/sys/modules/examples/properties: Makefile properties.c src/sys/modules/examples/readhappy: Makefile readhappy.c Log Message: A set of more comprehensive example kernel modules to replace our previous single example. These examples were provided by Kamil Rytarowski. XXX These modules are built as part of a system build, but they XXX are NOT installed in $DESTDIR. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/modules/examples/Makefile \ src/sys/modules/examples/Makefile.inc src/sys/modules/examples/README cvs rdiff -u -r0 -r1.1 src/sys/modules/examples/hello/Makefile \ src/sys/modules/examples/hello/hello.c cvs rdiff -u -r0 -r1.1 src/sys/modules/examples/luahello/luahello.lua cvs rdiff -u -r0 -r1.1 src/sys/modules/examples/ping/Makefile \ src/sys/modules/examples/ping/cmd_ping.c \ src/sys/modules/examples/ping/ping.c src/sys/modules/examples/ping/ping.h cvs rdiff -u -r0 -r1.1 src/sys/modules/examples/properties/Makefile \ src/sys/modules/examples/properties/properties.c cvs rdiff -u -r0 -r1.1 src/sys/modules/examples/readhappy/Makefile \ src/sys/modules/examples/readhappy/readhappy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/modules/examples/Makefile diff -u /dev/null src/sys/modules/examples/Makefile:1.1 --- /dev/null Wed May 13 07:07:36 2015 +++ src/sys/modules/examples/Makefile Wed May 13 07:07:36 2015 @@ -0,0 +1,11 @@ +# $NetBSD: Makefile,v 1.1 2015/05/13 07:07:36 pgoyette Exp $ + +.include + +SUBDIR+= hello +#SUBDIR+= luahello # Nothing to build here, only text files +SUBDIR+= ping # Needs an additional helper program +SUBDIR+= properties +SUBDIR+= readhappy + +.include Index: src/sys/modules/examples/Makefile.inc diff -u /dev/null src/sys/modules/examples/Makefile.inc:1.1 --- /dev/null Wed May 13 07:07:36 2015 +++ src/sys/modules/examples/Makefile.inc Wed May 13 07:07:36 2015 @@ -0,0 +1,9 @@ +# $NetBSD: Makefile.inc,v 1.1 2015/05/13 07:07:36 pgoyette Exp $ + +# We only build the example modules; we don't want to install them anywhere + +kmodinstall: + +# Include parent's Makefile.inc + +.include "../Makefile.inc" Index: src/sys/modules/examples/README diff -u /dev/null src/sys/modules/examples/README:1.1 --- /dev/null Wed May 13 07:07:36 2015 +++ src/sys/modules/examples/README Wed May 13 07:07:36 2015 @@ -0,0 +1,59 @@ + $NetBSD: README,v 1.1 2015/05/13 07:07:36 pgoyette Exp $ + + Kernel Developer's Manual + +DESCRIPTION + The kernel example dynamic modules. + + This directory contains the following example modules: + * hello - the simplest `hello world' module + * properties - handle incoming properties during the module load + * readhappy - basic implementation of read(9) with happy numbers + * ping- basic ioctl(9) + * hellolua- the simplest `hello world' Lua module + + To build the examples you need a local copy of NetBSD sources. You also + need the comp set with toolchain. To build the module just enter a + directory with example modules and use make(1): + + # make + + To load, unload, and stat the module use modload(8), modunload(8) and + modstat(8). + + The S parameter in the Makefile files points to src/sys and it can be + overloaded in this way: + + # make S=/data/netbsd/src/sys + + The code of a module does not need to be in src/sys unless you use + the autoconf(9) framework. + + A cross-built of a module for a target platform is possible with the + build.sh framework. You need to generate the toolchain and set + appropriately PATH to point bin/ in the TOOLDIR path. An example command + to cross-build a module with the amd64 toolchain is as follows: + +# nbmake-amd64 S=/data/netbsd/src/sys + + + The example modules should not be used on a production machine. + + All modules that create a cdevsw should be verified that the major number + should not conflict with a real device. + +SEE ALSO + lua(9lua), modctl(2), modload(8), module(7), module(9), modstat(8), + modunload(8) + +HISTORY + An example of handling incoming properties first appeared in NetBSD 5.0 + and was written by Julio Merino with further modifications by Martin + Husemann, Adam Hamsik, John Nemeth and Mindaugas Rasiukevicius. + + This document and additional modules (hello, readhappy, properties, + and ping, hellolua) first appeared in NetBSD 8.0 and they were written + by Kamil Rytarowski. + +AUTHORS +
CVS commit: src/sys/modules/example
Module Name:src Committed By: pgoyette Date: Wed May 13 07:02:16 UTC 2015 Removed Files: src/sys/modules/example: Makefile example.c Log Message: Soon to be replaced with a more comprehensive set of examples. To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/sys/modules/example/Makefile cvs rdiff -u -r1.7 -r0 src/sys/modules/example/example.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
