CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Mon Sep 3 09:46:16 UTC 2012 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21829 Log Message: Import dhcpcd-5.6.2 with the following changes: Disable kernel RA earlier on Linux * Don't set if_up or if_down as true when testing * ra%d_prefix is now a space separated array of the finished address/len * If we fail to open sockets, don't bother sending the request * Send our NS solicitation directly to the router * Change the NS times so that we assume reachable until the reachable time expires, then send probes at retrans intervals until DELAY_FIRST_PROBE_TIME is reached at which point we expire the router * Remove -v from --version in usage * Only add our own host or destination routes to the build table when we are adding gateways * Ensure we have correct memory allocation for each prefix in the RA Status: Vendor Tag: roy Release Tags: dhcpcd-5-6-2 U src/external/bsd/dhcpcd/dist/arp.c U src/external/bsd/dhcpcd/dist/bind.c U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c U src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/configure.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/if-pref.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/net.c U src/external/bsd/dhcpcd/dist/signals.c U src/external/bsd/dhcpcd/dist/ipv6.c U src/external/bsd/dhcpcd/dist/ipv6rs.c U src/external/bsd/dhcpcd/dist/ipv6ns.c U src/external/bsd/dhcpcd/dist/bpf.c U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/platform-bsd.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/bind.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/configure.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if-pref.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6ns.h U src/external/bsd/dhcpcd/dist/ipv6rs.h U src/external/bsd/dhcpcd/dist/net.h U src/external/bsd/dhcpcd/dist/platform.h U src/external/bsd/dhcpcd/dist/signals.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind No conflicts created by this import
CVS commit: src/doc
Module Name:src Committed By: roy Date: Mon Sep 3 10:31:51 UTC 2012 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Import dhcpcd-5.6.2 To generate a diff of this commit: cvs rdiff -u -r1.965 -r1.966 src/doc/3RDPARTY cvs rdiff -u -r1.1741 -r1.1742 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.965 src/doc/3RDPARTY:1.966 --- src/doc/3RDPARTY:1.965 Fri Aug 31 20:23:33 2012 +++ src/doc/3RDPARTY Mon Sep 3 10:31:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.965 2012/08/31 20:23:33 is Exp $ +# $NetBSD: 3RDPARTY,v 1.966 2012/09/03 10:31:51 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -300,8 +300,8 @@ No changes for NetBSD integration - just top of the current tree. Package: dhcpcd -Version: 5.6.1 -Current Vers: 5.6.1 +Version: 5.6.2 +Current Vers: 5.6.2 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1741 src/doc/CHANGES:1.1742 --- src/doc/CHANGES:1.1741 Sat Sep 1 00:49:02 2012 +++ src/doc/CHANGES Mon Sep 3 10:31:51 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1741 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1742 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -115,3 +115,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: BCM5301X SoC. Add initial support for OMAP4430 and partial support for Freescale i.MX6. Add new common boot/kvminit code. [matt 20120831] + dhcpcd(8): Import dhcpcd-5.6.2 [roy 20120903]
CVS commit: src/lib
Module Name:src
Committed By: pooka
Date: Mon Sep 3 11:33:36 UTC 2012
Modified Files:
src/lib/librumphijack: hijack.c
src/lib/librumpuser: rumpuser_port.h
Log Message:
More fixes for Linux (or glibc, really).
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/lib/librumphijack/hijack.c
cvs rdiff -u -r1.2 -r1.3 src/lib/librumpuser/rumpuser_port.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.96 src/lib/librumphijack/hijack.c:1.97
--- src/lib/librumphijack/hijack.c:1.96 Sat Aug 25 18:00:06 2012
+++ src/lib/librumphijack/hijack.c Mon Sep 3 11:33:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.96 2012/08/25 18:00:06 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.97 2012/09/03 11:33:35 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
#include rumpuser_port.h
#include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.96 2012/08/25 18:00:06 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.97 2012/09/03 11:33:35 pooka Exp $);
#include sys/param.h
#include sys/types.h
@@ -92,8 +92,11 @@ enum dualcall {
DUALCALL_DUP2,
DUALCALL_CLOSE,
DUALCALL_POLLTS,
- DUALCALL_KEVENT,
+
+#ifndef __linux__
DUALCALL_STAT, DUALCALL_LSTAT, DUALCALL_FSTAT,
+#endif
+
DUALCALL_CHMOD, DUALCALL_LCHMOD, DUALCALL_FCHMOD,
DUALCALL_CHOWN, DUALCALL_LCHOWN, DUALCALL_FCHOWN,
DUALCALL_OPEN,
@@ -106,10 +109,23 @@ enum dualcall {
DUALCALL_UTIMES, DUALCALL_LUTIMES, DUALCALL_FUTIMES,
DUALCALL_TRUNCATE, DUALCALL_FTRUNCATE,
DUALCALL_FSYNC,
- DUALCALL___GETCWD,
DUALCALL_ACCESS,
+
+#ifndef __linux__
+ DUALCALL___GETCWD,
+#endif
+
+#ifndef __linux__
DUALCALL_MKNOD,
+#endif
+
+#ifdef PLATFORM_HAS_NBFILEHANDLE
DUALCALL_GETFH, DUALCALL_FHOPEN, DUALCALL_FHSTAT, DUALCALL_FHSTATVFS1,
+#endif
+
+#ifdef PLATFORM_HAS_KQUEUE
+ DUALCALL_KEVENT,
+#endif
#ifdef PLATFORM_HAS_NBSYSCTL
DUALCALL___SYSCTL,
@@ -146,9 +162,11 @@ enum dualcall {
/*
* Would be nice to get this automatically in sync with libc.
- * Also, this does not work for compat-using binaries!
+ * Also, this does not work for compat-using binaries (we should
+ * provide all previous interfaces, not just the current ones)
*/
-#ifdef __NetBSD__
+#if defined(__NetBSD__)
+
#if !__NetBSD_Prereq__(5,99,7)
#define REALSELECT select
#define REALPOLLTS pollts
@@ -174,6 +192,7 @@ enum dualcall {
#define REALMKNOD __mknod50
#define REALFHSTAT __fhstat50
#endif /* 5.99.7 */
+
#define REALREAD _sys_read
#define REALPREAD _sys_pread
#define REALPWRITE _sys_pwrite
@@ -188,25 +207,32 @@ enum dualcall {
#define LSEEK_ALIAS _lseek
#define VFORK __vfork14
-#else /* !NetBSD */
+int REALSTAT(const char *, struct stat *);
+int REALLSTAT(const char *, struct stat *);
+int REALFSTAT(int, struct stat *);
+int REALMKNOD(const char *, mode_t, dev_t);
+
+int __getcwd(char *, size_t);
+
+#elif defined(__linux__) /* glibc, really */
#define REALREAD read
#define REALPREAD pread
#define REALPWRITE pwrite
-#define REALGETDENTS getdents
+#define REALGETDENTS readdir
#define REALSELECT select
#define REALPOLLTS ppoll
-#define REALSTAT stat
-#define REALLSTAT lstat
-#define REALFSTAT fstat
#define REALUTIMES utimes
#define REALLUTIMES lutimes
#define REALFUTIMES futimes
-#define REALMKNOD mknod
#define REALFHSTAT fhstat
#define REALSOCKET socket
-#endif /* NetBSD */
+#else /* !NetBSD !linux */
+
+#error platform not supported
+
+#endif /* platform */
int REALSELECT(int, fd_set *, fd_set *, fd_set *, struct timeval *);
int REALPOLLTS(struct pollfd *, nfds_t,
@@ -216,16 +242,11 @@ int REALKEVENT(int, const struct kevent
ssize_t REALREAD(int, void *, size_t);
ssize_t REALPREAD(int, void *, size_t, off_t);
ssize_t REALPWRITE(int, const void *, size_t, off_t);
-int REALSTAT(const char *, struct stat *);
-int REALLSTAT(const char *, struct stat *);
-int REALFSTAT(int, struct stat *);
int REALGETDENTS(int, char *, size_t);
int REALUTIMES(const char *, const struct timeval [2]);
int REALLUTIMES(const char *, const struct timeval [2]);
int REALFUTIMES(int, const struct timeval [2]);
int REALMOUNT(const char *, const char *, int, void *, size_t);
-int __getcwd(char *, size_t);
-int REALMKNOD(const char *, mode_t, dev_t);
int REALGETFH(const char *, void *, size_t *);
int REALFHOPEN(const void *, size_t, int);
int REALFHSTAT(const void *, size_t, struct stat *);
@@ -269,10 +290,11 @@ struct sysnames {
{ DUALCALL_DUP2, dup2, RSYS_NAME(DUP2) },
{ DUALCALL_CLOSE, close, RSYS_NAME(CLOSE) },
{ DUALCALL_POLLTS, S(REALPOLLTS), RSYS_NAME(POLLTS) },
- { DUALCALL_KEVENT, S(REALKEVENT), RSYS_NAME(KEVENT) },
+#ifndef __linux__
{ DUALCALL_STAT, S(REALSTAT), RSYS_NAME(STAT) },
{ DUALCALL_LSTAT, S(REALLSTAT), RSYS_NAME(LSTAT) },
{ DUALCALL_FSTAT, S(REALFSTAT), RSYS_NAME(FSTAT) },
+#endif
{ DUALCALL_CHOWN,
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Mon Sep 3 12:07:42 UTC 2012
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
one more patch for supporting linux-based networking clients
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/lib/librumphijack/hijack.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/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.97 src/lib/librumphijack/hijack.c:1.98
--- src/lib/librumphijack/hijack.c:1.97 Mon Sep 3 11:33:35 2012
+++ src/lib/librumphijack/hijack.c Mon Sep 3 12:07:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.97 2012/09/03 11:33:35 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.98 2012/09/03 12:07:42 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
#include rumpuser_port.h
#include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.97 2012/09/03 11:33:35 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.98 2012/09/03 12:07:42 pooka Exp $);
#include sys/param.h
#include sys/types.h
@@ -102,7 +102,6 @@ enum dualcall {
DUALCALL_OPEN,
DUALCALL_CHDIR, DUALCALL_FCHDIR,
DUALCALL_LSEEK,
- DUALCALL_GETDENTS,
DUALCALL_UNLINK, DUALCALL_SYMLINK, DUALCALL_READLINK,
DUALCALL_LINK, DUALCALL_RENAME,
DUALCALL_MKDIR, DUALCALL_RMDIR,
@@ -113,6 +112,7 @@ enum dualcall {
#ifndef __linux__
DUALCALL___GETCWD,
+ DUALCALL_GETDENTS,
#endif
#ifndef __linux__
@@ -211,6 +211,7 @@ int REALSTAT(const char *, struct stat *
int REALLSTAT(const char *, struct stat *);
int REALFSTAT(int, struct stat *);
int REALMKNOD(const char *, mode_t, dev_t);
+int REALGETDENTS(int, char *, size_t);
int __getcwd(char *, size_t);
@@ -219,7 +220,6 @@ int __getcwd(char *, size_t);
#define REALREAD read
#define REALPREAD pread
#define REALPWRITE pwrite
-#define REALGETDENTS readdir
#define REALSELECT select
#define REALPOLLTS ppoll
#define REALUTIMES utimes
@@ -242,7 +242,6 @@ int REALKEVENT(int, const struct kevent
ssize_t REALREAD(int, void *, size_t);
ssize_t REALPREAD(int, void *, size_t, off_t);
ssize_t REALPWRITE(int, const void *, size_t, off_t);
-int REALGETDENTS(int, char *, size_t);
int REALUTIMES(const char *, const struct timeval [2]);
int REALLUTIMES(const char *, const struct timeval [2]);
int REALFUTIMES(int, const struct timeval [2]);
@@ -308,7 +307,6 @@ struct sysnames {
{ DUALCALL_CHDIR, chdir, RSYS_NAME(CHDIR) },
{ DUALCALL_FCHDIR, fchdir, RSYS_NAME(FCHDIR) },
{ DUALCALL_LSEEK, lseek, RSYS_NAME(LSEEK) },
- { DUALCALL_GETDENTS, S(REALGETDENTS),RSYS_NAME(GETDENTS) },
{ DUALCALL_UNLINK, unlink, RSYS_NAME(UNLINK) },
{ DUALCALL_SYMLINK, symlink, RSYS_NAME(SYMLINK) },
{ DUALCALL_READLINK, readlink, RSYS_NAME(READLINK) },
@@ -323,6 +321,7 @@ struct sysnames {
#ifndef __linux__
{ DUALCALL___GETCWD, __getcwd, RSYS_NAME(__GETCWD) },
+ { DUALCALL_GETDENTS, S(REALGETDENTS),RSYS_NAME(GETDENTS) },
#endif
#ifndef __linux__
@@ -2307,10 +2306,12 @@ FDCALL(off_t, lseek, DUALCALL_LSEEK,
__strong_alias(LSEEK_ALIAS,lseek);
#endif
+#ifndef __linux__
FDCALL(int, REALGETDENTS, DUALCALL_GETDENTS,\
(int fd, char *buf, size_t nbytes),\
(int, char *, size_t), \
(fd, buf, nbytes))
+#endif
FDCALL(int, fchown, DUALCALL_FCHOWN, \
(int fd, uid_t owner, gid_t group),\
CVS commit: src/lib/libl
Module Name:src Committed By: msaitoh Date: Mon Sep 3 13:23:13 UTC 2012 Removed Files: src/lib/libl: Makefile Log Message: Remove unused lib/libl. Approved by christos. To generate a diff of this commit: cvs rdiff -u -r1.13 -r0 src/lib/libl/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm
Module Name:src
Committed By: matt
Date: Mon Sep 3 14:21:24 UTC 2012
Modified Files:
src/sys/uvm: uvm_km.c
Log Message:
Fix a bug where the kernel was never grown to accomodate the kmem VA space
since that happens before the kernel_map is set.
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/uvm/uvm_km.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/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.128 src/sys/uvm/uvm_km.c:1.129
--- src/sys/uvm/uvm_km.c:1.128 Mon Jul 9 11:19:34 2012
+++ src/sys/uvm/uvm_km.c Mon Sep 3 14:21:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_km.c,v 1.128 2012/07/09 11:19:34 matt Exp $ */
+/* $NetBSD: uvm_km.c,v 1.129 2012/09/03 14:21:24 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -152,7 +152,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.128 2012/07/09 11:19:34 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.129 2012/09/03 14:21:24 matt Exp $);
#include opt_uvmhist.h
@@ -323,6 +323,20 @@ uvm_km_bootstrap(vaddr_t start, vaddr_t
kernel_map = kernel_map_store;
+#ifdef PMAP_GROWKERNEL
+ /*
+ * Since we just set kernel_map, the check in uvm_map_prepare to grow the
+ * kernel's VA space never happened so we must do it here. If the kernel
+ * pmap can't map the requested space, then allocate more resources for it.
+ */
+ if (uvm_maxkaddr kmembase + kmemsize) {
+ uvm_maxkaddr = pmap_growkernel(kmembase + kmemsize);
+ if (uvm_maxkaddr kmembase + kmemsize)
+ panic(%s: pmap_growkernel(%#PRIxVADDR) failed,
+ __func__, kmembase + kmemsize);
+ }
+#endif
+
pool_subsystem_init();
vmem_bootstrap();
CVS commit: src/tests/lib/libc/net
Module Name:src
Committed By: christos
Date: Mon Sep 3 15:32:18 UTC 2012
Modified Files:
src/tests/lib/libc/net: t_protoent.sh
Log Message:
whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/net/t_protoent.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/net/t_protoent.sh
diff -u src/tests/lib/libc/net/t_protoent.sh:1.1 src/tests/lib/libc/net/t_protoent.sh:1.2
--- src/tests/lib/libc/net/t_protoent.sh:1.1 Wed Jan 12 12:32:27 2011
+++ src/tests/lib/libc/net/t_protoent.sh Mon Sep 3 11:32:18 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_protoent.sh,v 1.1 2011/01/12 17:32:27 pgoyette Exp $
+# $NetBSD: t_protoent.sh,v 1.2 2012/09/03 15:32:18 christos Exp $
#
# Copyright (c) 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -39,29 +39,28 @@ protoent_body()
# (3) prune duplicates
#
tr '\t' ' ' /etc/protocols | awk '
- function add(key, name, i, n, ar) {
+ function add(key, name, i, n, ar) {
n = split(names[key], ar);
- for (i=1; i=n; i++) {
+ for (i = 1; i = n; i++) {
if (name == ar[i]) {
- return;
+return;
}
}
delete ar;
names[key] = names[key] name;
- }
-
- {
+ }
+ {
sub(#.*, , $0);
gsub( *, , $0);
- if (NF==0) {
+ if (NF == 0) {
next;
}
add($2, $1, 0);
- for (i=3; i=NF; i++) {
+ for (i = 3; i = NF; i++) {
add($2, $i, 1);
}
- }
- END {
+ }
+ END {
for (key in names) {
proto = key;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: kiyohara Date: Mon Sep 3 15:38:17 UTC 2012 Modified Files: src/sys/dev/pci: cmdide.c Log Message: Fix no wd on cmd680. Also move setting wdc_maxdrives into cmd*_chip_map(). To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pci/cmdide.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/cmdide.c diff -u src/sys/dev/pci/cmdide.c:1.37 src/sys/dev/pci/cmdide.c:1.38 --- src/sys/dev/pci/cmdide.c:1.37 Tue Jul 31 15:50:36 2012 +++ src/sys/dev/pci/cmdide.c Mon Sep 3 15:38:17 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: cmdide.c,v 1.37 2012/07/31 15:50:36 bouyer Exp $ */ +/* $NetBSD: cmdide.c,v 1.38 2012/09/03 15:38:17 kiyohara Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Manuel Bouyer. @@ -25,7 +25,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cmdide.c,v 1.37 2012/07/31 15:50:36 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: cmdide.c,v 1.38 2012/09/03 15:38:17 kiyohara Exp $); #include sys/param.h #include sys/systm.h @@ -148,7 +148,6 @@ cmd_channel_map(const struct pci_attach_ cp-name = PCIIDE_CHANNEL_NAME(channel); cp-ata_channel.ch_channel = channel; cp-ata_channel.ch_atac = sc-sc_wdcdev.sc_atac; - sc-sc_wdcdev.wdc_maxdrives = 2; /* * Older CMD64X doesn't have independent channels @@ -339,6 +338,7 @@ cmd0643_9_chip_map(struct pciide_softc * sc-sc_wdcdev.sc_atac.atac_pio_cap = 4; sc-sc_wdcdev.sc_atac.atac_dma_cap = 2; sc-sc_wdcdev.sc_atac.atac_set_modes = cmd0643_9_setup_channel; + sc-sc_wdcdev.wdc_maxdrives = 2; ATADEBUG_PRINT((cmd0643_9_chip_map: old timings reg 0x%x 0x%x\n, pci_conf_read(sc-sc_pc, sc-sc_tag, 0x54), @@ -483,6 +483,7 @@ cmd680_chip_map(struct pciide_softc *sc, sc-sc_wdcdev.sc_atac.atac_pio_cap = 4; sc-sc_wdcdev.sc_atac.atac_dma_cap = 2; sc-sc_wdcdev.sc_atac.atac_set_modes = cmd680_setup_channel; + sc-sc_wdcdev.wdc_maxdrives = 2; pciide_pci_write(sc-sc_pc, sc-sc_tag, 0x80, 0x00); pciide_pci_write(sc-sc_pc, sc-sc_tag, 0x84, 0x00);
CVS commit: src/sys/uvm
Module Name:src
Committed By: matt
Date: Mon Sep 3 15:55:43 UTC 2012
Modified Files:
src/sys/uvm: uvm_km.c
Log Message:
Don't try grow the entire kmem space but just do as needed in uvm_km_kmem_alloc
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sys/uvm/uvm_km.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/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.129 src/sys/uvm/uvm_km.c:1.130
--- src/sys/uvm/uvm_km.c:1.129 Mon Sep 3 14:21:24 2012
+++ src/sys/uvm/uvm_km.c Mon Sep 3 15:55:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_km.c,v 1.129 2012/09/03 14:21:24 matt Exp $ */
+/* $NetBSD: uvm_km.c,v 1.130 2012/09/03 15:55:42 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -152,7 +152,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.129 2012/09/03 14:21:24 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.130 2012/09/03 15:55:42 matt Exp $);
#include opt_uvmhist.h
@@ -323,20 +323,6 @@ uvm_km_bootstrap(vaddr_t start, vaddr_t
kernel_map = kernel_map_store;
-#ifdef PMAP_GROWKERNEL
- /*
- * Since we just set kernel_map, the check in uvm_map_prepare to grow the
- * kernel's VA space never happened so we must do it here. If the kernel
- * pmap can't map the requested space, then allocate more resources for it.
- */
- if (uvm_maxkaddr kmembase + kmemsize) {
- uvm_maxkaddr = pmap_growkernel(kmembase + kmemsize);
- if (uvm_maxkaddr kmembase + kmemsize)
- panic(%s: pmap_growkernel(%#PRIxVADDR) failed,
- __func__, kmembase + kmemsize);
- }
-#endif
-
pool_subsystem_init();
vmem_bootstrap();
@@ -794,6 +780,20 @@ again:
if (rc != 0)
return rc;
+#ifdef PMAP_GROWKERNEL
+ /*
+ * Since we just set kernel_map, the check in uvm_map_prepare to grow the
+ * kernel's VA space never happened so we must do it here. If the kernel
+ * pmap can't map the requested space, then allocate more resources for it.
+ */
+ if (uvm_maxkaddr va + size) {
+ uvm_maxkaddr = pmap_growkernel(va + size);
+ if (uvm_maxkaddr va + size)
+ panic(%s: pmap_growkernel(%#PRIxVADDR) failed,
+ __func__, va + size);
+ }
+#endif
+
loopva = va;
loopsize = size;
CVS commit: src/sys/uvm
Module Name:src Committed By: matt Date: Mon Sep 3 16:07:17 UTC 2012 Modified Files: src/sys/uvm: uvm_km.c Log Message: Shut up gcc printf warning. To generate a diff of this commit: cvs rdiff -u -r1.130 -r1.131 src/sys/uvm/uvm_km.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/uvm/uvm_km.c diff -u src/sys/uvm/uvm_km.c:1.130 src/sys/uvm/uvm_km.c:1.131 --- src/sys/uvm/uvm_km.c:1.130 Mon Sep 3 15:55:42 2012 +++ src/sys/uvm/uvm_km.c Mon Sep 3 16:07:17 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_km.c,v 1.130 2012/09/03 15:55:42 matt Exp $ */ +/* $NetBSD: uvm_km.c,v 1.131 2012/09/03 16:07:17 matt Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -152,7 +152,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.130 2012/09/03 15:55:42 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.131 2012/09/03 16:07:17 matt Exp $); #include opt_uvmhist.h @@ -790,7 +790,7 @@ again: uvm_maxkaddr = pmap_growkernel(va + size); if (uvm_maxkaddr va + size) panic(%s: pmap_growkernel(%#PRIxVADDR) failed, - __func__, va + size); + __func__, (vaddr_t) (va + size)); } #endif
CVS commit: src/sys/arch/shark/isa
Module Name:src
Committed By: matt
Date: Mon Sep 3 16:35:34 UTC 2012
Modified Files:
src/sys/arch/shark/isa: isa_irq.S
Log Message:
Don't use r7, use r5 instead
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/shark/isa/isa_irq.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/shark/isa/isa_irq.S
diff -u src/sys/arch/shark/isa/isa_irq.S:1.13 src/sys/arch/shark/isa/isa_irq.S:1.14
--- src/sys/arch/shark/isa/isa_irq.S:1.13 Mon Dec 20 00:25:43 2010
+++ src/sys/arch/shark/isa/isa_irq.S Mon Sep 3 16:35:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_irq.S,v 1.13 2010/12/20 00:25:43 matt Exp $ */
+/* $NetBSD: isa_irq.S,v 1.14 2012/09/03 16:35:33 matt Exp $ */
/*
* Copyright 1997
@@ -113,8 +113,8 @@
/*
* Register usage
*
+ * r5 - Pointer to handler pointer list
* r6 - Address of current handler
- * r7 - Pointer to handler pointer list
* r8 - Current IRQ requests.
* r9 - Used to count through possible IRQ bits.
* r10 - Base address of IOMD
@@ -183,17 +183,17 @@ ASENTRY_NP(irq_entry)
*/
mov r9, #(NIPL - 1)
- ldr r7, .Lspl_masks
+ ldr r5, .Lspl_masks
.Lfind_highest_ipl:
- ldr r2, [r7, r9, lsl #2]
+ ldr r2, [r5, r9, lsl #2]
tst r8, r2
subeq r9, r9, #1
beq .Lfind_highest_ipl
/* r9 = SPL level of highest priority interrupt */
add r9, r9, #1
- ldr r2, [r7, r9, lsl #2]
+ ldr r2, [r5, r9, lsl #2]
mvn r2, r2
orr r0, r0, r2
@@ -210,7 +210,7 @@ ASENTRY_NP(irq_entry)
bic r0, r0, #I32_bit
msr cpsr_all, r0
- ldr r7, .Lirqhandlers
+ ldr r5, .Lirqhandlers
mov r9, #0x0001
irqloop:
@@ -218,7 +218,7 @@ irqloop:
tst r8, r9 /* Is a bit set ? */
beq nextirq /* No ? try next bit */
- ldr r6, [r7] /* Get address of first handler structure */
+ ldr r6, [r5] /* Get address of first handler structure */
teq r6, #0x /* Do we have a handler */
moveq r0, r8 /* IRQ requests as arg 0 */
@@ -255,7 +255,7 @@ irqdone:
stmia r3, {r1-r2} /* store ev_count */
nextirq:
- add r7, r7, #0x0004 /* update pointer to handlers */
+ add r5, r5, #0x0004 /* update pointer to handlers */
mov r9, r9, lsl #1 /* move on to next bit */
teq r9, #(1 16) /* done the last bit ? */
bne irqloop /* no - loop back. */
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: msaitoh Date: Mon Sep 3 17:12:50 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: MV2120 Log Message: Bump SYMTAB_SPACE. The automatic SYMTAB_SPACE adustment doesn'w work with this style of definition. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/MV2120 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/MV2120 diff -u src/sys/arch/evbarm/conf/MV2120:1.9 src/sys/arch/evbarm/conf/MV2120:1.10 --- src/sys/arch/evbarm/conf/MV2120:1.9 Wed Aug 29 08:29:58 2012 +++ src/sys/arch/evbarm/conf/MV2120 Mon Sep 3 17:12:50 2012 @@ -1,11 +1,11 @@ -# $NetBSD: MV2120,v 1.9 2012/08/29 08:29:58 skrll Exp $ +# $NetBSD: MV2120,v 1.10 2012/09/03 17:12:50 msaitoh Exp $ # # This configuration supports for HP MV2120/MV5140/MV5150. include arch/evbarm/conf/std.mv2120 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -options SYMTAB_SPACE=(1024 * 912) +options SYMTAB_SPACE=(1024 * 1000) makeoptions DEBUG=-g
CVS commit: src/sys/uvm
Module Name:src
Committed By: matt
Date: Mon Sep 3 17:30:04 UTC 2012
Modified Files:
src/sys/uvm: uvm_km.c uvm_map.c
Log Message:
Cleanup comment. Change panic to KASSERTMSG.
Use kernel_map-misc_lock to make sure we don't call pmap_growkernel
concurrently and possibly mess up uvm_maxkaddr.
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/uvm/uvm_km.c
cvs rdiff -u -r1.319 -r1.320 src/sys/uvm/uvm_map.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/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.131 src/sys/uvm/uvm_km.c:1.132
--- src/sys/uvm/uvm_km.c:1.131 Mon Sep 3 16:07:17 2012
+++ src/sys/uvm/uvm_km.c Mon Sep 3 17:30:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_km.c,v 1.131 2012/09/03 16:07:17 matt Exp $ */
+/* $NetBSD: uvm_km.c,v 1.132 2012/09/03 17:30:04 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -152,7 +152,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.131 2012/09/03 16:07:17 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.132 2012/09/03 17:30:04 matt Exp $);
#include opt_uvmhist.h
@@ -782,16 +782,17 @@ again:
#ifdef PMAP_GROWKERNEL
/*
- * Since we just set kernel_map, the check in uvm_map_prepare to grow the
- * kernel's VA space never happened so we must do it here. If the kernel
- * pmap can't map the requested space, then allocate more resources for it.
+ * These VA allocations happen independently of uvm_map so if this allocation
+ * extends beyond the current limit, then allocate more resources for it.
*/
+ mutex_enter(kernel_map-misc_lock);
if (uvm_maxkaddr va + size) {
uvm_maxkaddr = pmap_growkernel(va + size);
- if (uvm_maxkaddr va + size)
- panic(%s: pmap_growkernel(%#PRIxVADDR) failed,
- __func__, (vaddr_t) (va + size));
+ KASSERTMSG(uvm_maxkaddr = va + size,
+ %#PRIxVADDR %#PRIxPTR %#zx,
+ uvm_maxkaddr, va, size);
}
+ mutex_exit(kernel_map-misc_lock);
#endif
loopva = va;
Index: src/sys/uvm/uvm_map.c
diff -u src/sys/uvm/uvm_map.c:1.319 src/sys/uvm/uvm_map.c:1.320
--- src/sys/uvm/uvm_map.c:1.319 Sat Aug 18 14:28:04 2012
+++ src/sys/uvm/uvm_map.c Mon Sep 3 17:30:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_map.c,v 1.319 2012/08/18 14:28:04 chs Exp $ */
+/* $NetBSD: uvm_map.c,v 1.320 2012/09/03 17:30:04 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_map.c,v 1.319 2012/08/18 14:28:04 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_map.c,v 1.320 2012/09/03 17:30:04 matt Exp $);
#include opt_ddb.h
#include opt_uvmhist.h
@@ -1182,8 +1182,10 @@ retry:
* If the kernel pmap can't map the requested space,
* then allocate more resources for it.
*/
+ mutex_enter(map-misc_lock);
if (map == kernel_map uvm_maxkaddr (start + size))
uvm_maxkaddr = pmap_growkernel(start + size);
+ mutex_exit(map-misc_lock);
#endif
UVMMAP_EVCNT_INCR(map_call);
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: msaitoh Date: Mon Sep 3 17:46:08 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: SHEEVAPLUG Log Message: Enable atapibus, cd and sd. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/SHEEVAPLUG 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/SHEEVAPLUG diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.19 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.20 --- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.19 Sat Sep 1 18:17:50 2012 +++ src/sys/arch/evbarm/conf/SHEEVAPLUG Mon Sep 3 17:46:08 2012 @@ -1,4 +1,4 @@ -# $NetBSD: SHEEVAPLUG,v 1.19 2012/09/01 18:17:50 jakllsch Exp $ +# $NetBSD: SHEEVAPLUG,v 1.20 2012/09/03 17:46:08 msaitoh Exp $ # # This configuration supports for generically Marvell SheevaPlug # @@ -229,12 +229,12 @@ ld* at sdmmc? #wd* at atabus? drive ? flags 0x # ATAPI bus support -#atapibus* at atapi? +atapibus* at atapi? # ATAPI devices # flags have the same meaning as for IDE drives. -#cd* at atapibus? drive ? flags 0x # ATAPI CD-ROM drives -#sd* at atapibus? drive ? flags 0x # ATAPI disk drives +cd* at atapibus? drive ? flags 0x # ATAPI CD-ROM drives +sd* at atapibus? drive ? flags 0x # ATAPI disk drives # USB bus support usb* at ehci?
CVS commit: [netbsd-6] src/sys/sys
Module Name:src Committed By: riz Date: Mon Sep 3 18:31:00 UTC 2012 Modified Files: src/sys/sys [netbsd-6]: param.h Log Message: report this as 6.0_POST_RC1, in order to make some fixes before RC2 is released, to make any PRs which show up in the meantime more clear. Not intended to set a precedent. :) To generate a diff of this commit: cvs rdiff -u -r1.408.2.3 -r1.408.2.4 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.408.2.3 src/sys/sys/param.h:1.408.2.4 --- src/sys/sys/param.h:1.408.2.3 Fri Aug 17 23:57:22 2012 +++ src/sys/sys/param.h Mon Sep 3 18:30:59 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.408.2.3 2012/08/17 23:57:22 riz Exp $ */ +/* $NetBSD: param.h,v 1.408.2.4 2012/09/03 18:30:59 riz Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 6 /* NetBSD 6.0_RC1 */ +#define __NetBSD_Version__ 6 /* NetBSD 6.0_POST_RC1 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: [netbsd-6] src/external/bsd/ntp/dist/ntpd
Module Name:src
Committed By: riz
Date: Mon Sep 3 18:32:38 UTC 2012
Modified Files:
src/external/bsd/ntp/dist/ntpd [netbsd-6]: ntp_io.c
Log Message:
Pull up following revision(s) (requested by kardel in ticket #522):
external/bsd/ntp/dist/ntpd/ntp_io.c: revision 1.10
re-enable broadcast client config after interface re-scanning
make broadcast transmission work again
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.2.1 src/external/bsd/ntp/dist/ntpd/ntp_io.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/ntpd/ntp_io.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_io.c:1.9 src/external/bsd/ntp/dist/ntpd/ntp_io.c:1.9.2.1
--- src/external/bsd/ntp/dist/ntpd/ntp_io.c:1.9 Wed Feb 1 21:21:25 2012
+++ src/external/bsd/ntp/dist/ntpd/ntp_io.c Mon Sep 3 18:32:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_io.c,v 1.9 2012/02/01 21:21:25 kardel Exp $ */
+/* $NetBSD: ntp_io.c,v 1.9.2.1 2012/09/03 18:32:38 riz Exp $ */
/*
* ntp_io.c - input/output routines for ntpd. The socket-opening code
@@ -1592,9 +1592,11 @@ refresh_interface(
{
#ifdef OS_MISSES_SPECIFIC_ROUTE_UPDATES
if (interface-fd != INVALID_SOCKET) {
+ int bcast = (interface-flags INT_BCASTOPEN) != 0;
close_and_delete_fd_from_list(interface-fd);
+ interface-flags = ~INT_BCASTOPEN;
interface-fd = open_socket(interface-sin,
- 0, 0, interface);
+ bcast, 0, interface);
/*
* reset TTL indication so TTL is is set again
* next time around
@@ -2047,6 +2049,9 @@ update_interfaces(
msyslog(LOG_INFO, peers refreshed);
}
+ if (sys_bclient)
+ io_setbclient();
+
return new_interface_found;
}
@@ -2074,9 +2079,6 @@ create_sockets(
update_interfaces(port, NULL, NULL);
- if (sys_bclient)
- io_setbclient();
-
/*
* Now that we have opened all the sockets, turn off the reuse
* flag for security.
CVS commit: [netbsd-6] src/sys/dev/scsipi
Module Name:src
Committed By: riz
Date: Mon Sep 3 18:36:33 UTC 2012
Modified Files:
src/sys/dev/scsipi [netbsd-6]: scsiconf.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #523):
sys/dev/scsipi/scsiconf.c: revision 1.269
If the controller supports more than 256 commands per target,
clamp it to 256 (maximum number of tags in SCSI). Newer controllers
(such as mpii(4), and mfi(4) when fixed to announce tagged queuing support)
support more than 256 outstanding commands and don't use the scsi tag,
but at this time scsipi will always allocate a tag, and panic if a periph
tries to send more than 256 commands.
To generate a diff of this commit:
cvs rdiff -u -r1.262.10.3 -r1.262.10.4 src/sys/dev/scsipi/scsiconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/scsipi/scsiconf.c
diff -u src/sys/dev/scsipi/scsiconf.c:1.262.10.3 src/sys/dev/scsipi/scsiconf.c:1.262.10.4
--- src/sys/dev/scsipi/scsiconf.c:1.262.10.3 Tue May 22 18:46:09 2012
+++ src/sys/dev/scsipi/scsiconf.c Mon Sep 3 18:36:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.c,v 1.262.10.3 2012/05/22 18:46:09 riz Exp $ */
+/* $NetBSD: scsiconf.c,v 1.262.10.4 2012/09/03 18:36:33 riz Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scsiconf.c,v 1.262.10.3 2012/05/22 18:46:09 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: scsiconf.c,v 1.262.10.4 2012/09/03 18:36:33 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -209,6 +209,22 @@ scsibusattach(device_t parent, device_t
chan-chan_nluns,
chan-chan_nluns == 1 ? : s);
+ /*
+ * XXX
+ * newer adapters support more than 256 outstanding commands
+ * per periph and don't use the tag (they eventually allocate one
+ * internally). Right now scsipi always allocate a tag and
+ * is limited to 256 tags, per scsi specs.
+ * this should be revisited
+ */
+ if (chan-chan_flags SCSIPI_CHAN_OPENINGS) {
+ if (chan-chan_max_periph 256)
+ chan-chan_max_periph = 256;
+ } else {
+ if (chan-chan_adapter-adapt_max_periph 256)
+ chan-chan_adapter-adapt_max_periph = 256;
+ }
+
if (scsipi_adapter_addref(chan-chan_adapter))
return;
CVS commit: [netbsd-6] src/sys/dev/ic
Module Name:src
Committed By: riz
Date: Mon Sep 3 18:38:34 UTC 2012
Modified Files:
src/sys/dev/ic [netbsd-6]: isp_netbsd.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #524):
sys/dev/ic/isp_netbsd.c: revision 1.86
Properly fill the struct timeval before using it: a timeout in microseconds has
to be converted to seconds and microseconds.
Fix KASSERT(usec = 0 usec 100) in tvtohz().
While there, simplify computation of to (avoids a timersub() in tvhzto()
and directly call tvtohz() with the interval).
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.85.2.1 src/sys/dev/ic/isp_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/isp_netbsd.c
diff -u src/sys/dev/ic/isp_netbsd.c:1.85 src/sys/dev/ic/isp_netbsd.c:1.85.2.1
--- src/sys/dev/ic/isp_netbsd.c:1.85 Mon Dec 12 18:28:34 2011
+++ src/sys/dev/ic/isp_netbsd.c Mon Sep 3 18:38:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_netbsd.c,v 1.85 2011/12/12 18:28:34 jdc Exp $ */
+/* $NetBSD: isp_netbsd.c,v 1.85.2.1 2012/09/03 18:38:34 riz Exp $ */
/*
* Platform (NetBSD) dependent common attachment code for Qlogic adapters.
*/
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: isp_netbsd.c,v 1.85 2011/12/12 18:28:34 jdc Exp $);
+__KERNEL_RCSID(0, $NetBSD: isp_netbsd.c,v 1.85.2.1 2012/09/03 18:38:34 riz Exp $);
#include dev/ic/isp_netbsd.h
#include dev/ic/isp_ioctl.h
@@ -1603,14 +1603,14 @@ isp_mbox_wait_complete(struct ispsoftc *
tv.tv_sec = 0;
tv.tv_usec = 0;
for (olim = 0; olim maxc; olim++) {
- utv.tv_sec = 0;
- utv.tv_usec = usecs;
+ utv.tv_sec = usecs / 100;
+ utv.tv_usec = usecs % 100;
timeradd(tv, utv, tv);
}
- timeradd(tv, start, tv);
- to = tvhzto(tv);
+ to = tvtohz(tv);
if (to == 0)
to = 1;
+ timeradd(tv, start, tv);
isp-isp_osinfo.mbox_sleep_ok = 0;
isp-isp_osinfo.mbox_sleeping = 1;
CVS commit: [netbsd-6] src/share/man/man3
Module Name:src Committed By: riz Date: Mon Sep 3 18:41:15 UTC 2012 Modified Files: src/share/man/man3 [netbsd-6]: rbtree.3 Log Message: Pull up following revision(s) (requested by dholland in ticket #526): share/man/man3/rbtree.3: revision 1.7 Add more function argument names to the man page, trying to address PR 46814 by Lloyd Parkes. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.6.1 src/share/man/man3/rbtree.3 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/man3/rbtree.3 diff -u src/share/man/man3/rbtree.3:1.5 src/share/man/man3/rbtree.3:1.5.6.1 --- src/share/man/man3/rbtree.3:1.5 Mon Mar 28 13:46:14 2011 +++ src/share/man/man3/rbtree.3 Mon Sep 3 18:41:15 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: rbtree.3,v 1.5 2011/03/28 13:46:14 ahoka Exp $ +.\ $NetBSD: rbtree.3,v 1.5.6.1 2012/09/03 18:41:15 riz Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd March 17, 2011 +.Dd August 19, 2012 .Dt RBTREE 3 .Os .Sh NAME @@ -38,19 +38,19 @@ .Sh SYNOPSIS .In sys/rbtree.h .Ft void -.Fn rb_tree_init rb_tree_t * const rb_tree_ops_t * +.Fn rb_tree_init rb_tree_t *rbt const rb_tree_ops_t *ops .Ft void * -.Fn rb_tree_insert_node rb_tree_t * void * +.Fn rb_tree_insert_node rb_tree_t *rbt void *rb .Ft void -.Fn rb_tree_remove_node rb_tree_t * void * +.Fn rb_tree_remove_node rb_tree_t *rbt void *rb .Ft void * -.Fn rb_tree_find_node rb_tree_t * const void * +.Fn rb_tree_find_node rb_tree_t *rbt const void *key .Ft void * -.Fn rb_tree_find_node_geq rb_tree_t * const void * +.Fn rb_tree_find_node_geq rb_tree_t *rbt const void *key .Ft void * -.Fn rb_tree_find_node_leq rb_tree_t * const void * +.Fn rb_tree_find_node_leq rb_tree_t *rbt const void *key .Ft void * -.Fn rb_tree_iterate rb_tree_t * void * const unsigned int +.Fn rb_tree_iterate rb_tree_t *rbt void *rb const unsigned int direction .Sh DESCRIPTION .Nm provides red-black trees. @@ -74,20 +74,39 @@ The maximum height of a red-black tree i .It Vt rb_tree_t A red-black tree. .It Vt typedef signed int \ -(*const rbto_compare_nodes_fn)(void *, const void *, const void *); +(*const rbto_compare_nodes_fn)(void *context, const void *node1, const void *node2); The node-comparison operator. Defines an ordering on nodes. -Returns a negative value if the first node precedes the second node. -Returns a positive value if the first node follows the second node. -Returns 0 if the first node and the second are identical according -to the ordering. +Returns a negative value if the first node +.Ar node1 +precedes the second node +.Ar node2 . +Returns a positive value if the first node +.Ar node1 +follows the second node +.Ar node2 . +Returns 0 if the first node +.Ar node1 +and the second node +.Ar node2 +are identical according to the ordering. .It Vt typedef signed int \ -(*const rbto_compare_key_fn)(void *, const void *, const void *); +(*const rbto_compare_key_fn)(void *context, const void *node, const void *key); The node-key comparison operator. Defines the order of nodes and keys. -Returns a negative value if the node precedes the key. -Returns a positive value if the node follows the key. -Returns 0 if the node is identical to the key according to the ordering. +Returns a negative value if the node +.Ar node +precedes the key +.Ar key . +Returns a positive value if the node +.Ar node +follows the key +.Ar key . +Returns 0 if the node +.Ar node +is identical to the key +.Ar key +according to the ordering. .It Vt rb_tree_ops_t Defines the operator for comparing two nodes in the same tree, the operator for comparing a node in the tree with a key,
CVS commit: [netbsd-6] src
Module Name:src Committed By: riz Date: Mon Sep 3 18:45:42 UTC 2012 Modified Files: src/distrib/notes/common [netbsd-6]: main src/doc [netbsd-6]: CHANGES Log Message: Pull up following revision(s) (requested by drochner in ticket #527): mention switch to FAST_IPSEC in January To generate a diff of this commit: cvs rdiff -u -r1.484.2.1 -r1.484.2.2 src/distrib/notes/common/main cvs rdiff -u -r1.1670.2.8 -r1.1670.2.9 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.484.2.1 src/distrib/notes/common/main:1.484.2.2 --- src/distrib/notes/common/main:1.484.2.1 Fri Aug 17 23:53:48 2012 +++ src/distrib/notes/common/main Mon Sep 3 18:45:42 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.484.2.1 2012/08/17 23:53:48 riz Exp $ +.\ $NetBSD: main,v 1.484.2.2 2012/09/03 18:45:42 riz Exp $ .\ .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -500,6 +500,15 @@ and .Xr groff 1 can still be found in pkgsrc as .Pa textproc/groff . +.It +.Xr kame_ipsec 4 +has been replaced by +.Xr fast_ipsec 4 . +The option to use the old implementation (see +.Xr options 4 ) +will be removed in the next +.Nx +release. .bullet) . .Ss The NetBSD Foundation @@ -747,6 +756,12 @@ using either the .Xr sysctl 8 command or through .Xr sysctl.conf 5 . +.Pp +The implementation of SHA2-HMAC in KAME_IPSEC as used in NetBSD-5 +and before did not comply to current standards. +FAST_IPSEC does, with the result that old and new systems cannot +communicate over IPSEC, if one of the affected authentication +algorithms (hmac_sha256, hmac_sha384, hmac_sha512) is used. . .Ss2 Issues affecting an upgrade from NetBSD 4.x releases .Pp Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1670.2.8 src/doc/CHANGES:1.1670.2.9 --- src/doc/CHANGES:1.1670.2.8 Mon Aug 13 20:33:05 2012 +++ src/doc/CHANGES Mon Sep 3 18:45:42 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1670.2.8 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1670.2.9 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1213,6 +1213,8 @@ Changes from NetBSD 5.0 to NetBSD 6.0: using large pages). [chs 20111204] adventure(6): New save file format. Please regenerate (restore and re-save) any old save files. [dholland 20120107] + ipsec(4): Make FAST_IPSEC the default IPSEC implementation. + [drochner 20120109] x86, xen: Add cpu ucode loading support via cpuctl(8). [cegger 20120113] sandpoint: Netronix NH-230/231 and compatible NAS are supported. [phx 20120114]
CVS commit: [netbsd-6] src/sys/arch/macppc/conf
Module Name:src Committed By: riz Date: Mon Sep 3 18:51:37 UTC 2012 Modified Files: src/sys/arch/macppc/conf [netbsd-6]: GENERIC Log Message: Pull up following patch (requested by macallan in ticket #528): Comment out radeonfb for the release, as it causes problems on some hardware. To generate a diff of this commit: cvs rdiff -u -r1.297 -r1.297.2.1 src/sys/arch/macppc/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/macppc/conf/GENERIC diff -u src/sys/arch/macppc/conf/GENERIC:1.297 src/sys/arch/macppc/conf/GENERIC:1.297.2.1 --- src/sys/arch/macppc/conf/GENERIC:1.297 Mon Jan 23 13:55:02 2012 +++ src/sys/arch/macppc/conf/GENERIC Mon Sep 3 18:51:36 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.297 2012/01/23 13:55:02 hauke Exp $ +# $NetBSD: GENERIC,v 1.297.2.1 2012/09/03 18:51:36 riz Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/macppc/conf/std.macppc options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.297 $ +#ident GENERIC-$Revision: 1.297.2.1 $ maxusers 32 @@ -283,8 +283,8 @@ trm* at pci? dev ? function ? # Tekram D chipsfb* at pci? function ? # CT 65550 machfb* at pci? function ? # ATI Mach 64, Rage, Rage Pro -radeonfb* at pci? function ? # ATI Radeon. R3xx is problematic -options RADEONFB_MMAP_BARS # allow mmap()ing BARs - needed for X +#radeonfb* at pci? function ? # ATI Radeon. R3xx is problematic +#options RADEONFB_MMAP_BARS # allow mmap()ing BARs - needed for X voodoofb* at pci? function ? # 3Dfx Voodoo3 r128fb* at pci? function ? # ATI Rage 128
CVS commit: [netbsd-6] src/sys/arch/x86/acpi
Module Name:src
Committed By: riz
Date: Mon Sep 3 18:55:11 UTC 2012
Modified Files:
src/sys/arch/x86/acpi [netbsd-6]: acpi_wakeup.c
Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #529):
sys/arch/x86/acpi/acpi_wakeup.c: revision 1.32
It turns out we're actually waiting for other processors to be unbusy, not busy.
Unbreaks ACPI suspend on uniprocessor. Probably fixes unnoticed bugs on MP.
Needs pullup to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.29.8.1 -r1.29.8.2 src/sys/arch/x86/acpi/acpi_wakeup.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/x86/acpi/acpi_wakeup.c
diff -u src/sys/arch/x86/acpi/acpi_wakeup.c:1.29.8.1 src/sys/arch/x86/acpi/acpi_wakeup.c:1.29.8.2
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.29.8.1 Wed May 9 03:22:54 2012
+++ src/sys/arch/x86/acpi/acpi_wakeup.c Mon Sep 3 18:55:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakeup.c,v 1.29.8.1 2012/05/09 03:22:54 riz Exp $ */
+/* $NetBSD: acpi_wakeup.c,v 1.29.8.2 2012/09/03 18:55:11 riz Exp $ */
/*-
* Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_wakeup.c,v 1.29.8.1 2012/05/09 03:22:54 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_wakeup.c,v 1.29.8.2 2012/09/03 18:55:11 riz Exp $);
/*-
* Copyright (c) 2001 Takanori Watanabe takaw...@jp.freebsd.org
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, $NetBSD: acpi_wakeup.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_wakeup.c,v 1.29.8.1 2012/05/09 03:22:54 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_wakeup.c,v 1.29.8.2 2012/09/03 18:55:11 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -320,7 +320,7 @@ acpi_md_sleep(int state)
/* Save and suspend Application Processors. */
x86_broadcast_ipi(X86_IPI_ACPI_CPU_SLEEP);
cid = cpu_index(curcpu());
- while (!kcpuset_isotherset(kcpuset_running, cid)) {
+ while (kcpuset_isotherset(kcpuset_running, cid)) {
delay(1);
}
#endif
CVS commit: [netbsd-6] src/sys/nfs
Module Name:src
Committed By: riz
Date: Mon Sep 3 18:57:11 UTC 2012
Modified Files:
src/sys/nfs [netbsd-6]: nfs_serv.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #530):
sys/nfs/nfs_serv.c: revision 1.164
fix error handling in nfsrv_rename(): when the first nfs_namei() fails,
don't try to free the resources allocated by a successful lookup.
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.163.2.1 src/sys/nfs/nfs_serv.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/nfs/nfs_serv.c
diff -u src/sys/nfs/nfs_serv.c:1.163 src/sys/nfs/nfs_serv.c:1.163.2.1
--- src/sys/nfs/nfs_serv.c:1.163 Wed Feb 1 02:27:24 2012
+++ src/sys/nfs/nfs_serv.c Mon Sep 3 18:57:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_serv.c,v 1.163 2012/02/01 02:27:24 matt Exp $ */
+/* $NetBSD: nfs_serv.c,v 1.163.2.1 2012/09/03 18:57:11 riz Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -55,7 +55,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_serv.c,v 1.163 2012/02/01 02:27:24 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_serv.c,v 1.163.2.1 2012/09/03 18:57:11 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1931,6 +1931,7 @@ nfsrv_rename(struct nfsrv_descript *nfsd
VOP_UNLOCK(fdirp);
}
if (error) {
+ fromnd.ni_cnd.cn_nameiop = 0;
nfsm_reply(2 * NFSX_WCCDATA(v3));
nfsm_srvwcc_data(fdirfor_ret, fdirfor, fdiraft_ret, fdiraft);
nfsm_srvwcc_data(tdirfor_ret, tdirfor, tdiraft_ret, tdiraft);
CVS commit: [netbsd-6] src/external/gpl3/binutils/dist/bfd
Module Name:src
Committed By: riz
Date: Mon Sep 3 18:59:24 UTC 2012
Modified Files:
src/external/gpl3/binutils/dist/bfd [netbsd-6]: elf32-vax.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #531):
external/gpl3/binutils/dist/bfd/elf32-vax.c: revision 1.7
Make this to produce working shared libraries again.
Resultant distribution was booted into single user using shared libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 \
src/external/gpl3/binutils/dist/bfd/elf32-vax.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/bfd/elf32-vax.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.5.2.1 src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.5.2.2
--- src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.5.2.1 Wed Jul 25 15:09:34 2012
+++ src/external/gpl3/binutils/dist/bfd/elf32-vax.c Mon Sep 3 18:59:23 2012
@@ -52,7 +52,7 @@ static bfd_vma elf_vax_plt_sym_val (bfd_
static bfd_boolean elf32_vax_set_private_flags (bfd *, flagword);
static bfd_boolean elf32_vax_merge_private_bfd_data (bfd *, bfd *);
-static bfd_boolean elf32_vax_print_private_bfd_data (bfd *, PTR);
+static bfd_boolean elf32_vax_print_private_bfd_data (bfd *, void *);
static reloc_howto_type howto_table[] = {
HOWTO (R_VAX_NONE, /* type */
@@ -422,7 +422,7 @@ static bfd_boolean elf_vax_instantiate_g
#define elf_vax_link_hash_traverse(table, func, info) \
(elf_link_hash_traverse \
((table),\
-(bfd_boolean (*) (struct elf_link_hash_entry *, PTR)) (func), \
+(bfd_boolean (*) (struct elf_link_hash_entry *, void *)) (func), \
(info)))
/* Create an entry in an VAX ELF linker hash table. */
@@ -531,7 +531,7 @@ elf32_vax_merge_private_bfd_data (bfd *i
/* Display the flags field */
static bfd_boolean
-elf32_vax_print_private_bfd_data (bfd *abfd, PTR ptr)
+elf32_vax_print_private_bfd_data (bfd *abfd, void * ptr)
{
FILE *file = (FILE *) ptr;
@@ -640,14 +640,13 @@ elf_vax_check_relocs (bfd *abfd, struct
srelgot = bfd_get_section_by_name (dynobj, .rela.got);
if (srelgot == NULL)
{
+ flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+| SEC_IN_MEMORY | SEC_LINKER_CREATED
+| SEC_READONLY);
+
srelgot = bfd_make_section_with_flags (dynobj,
.rela.got,
- (SEC_ALLOC
- | SEC_LOAD
- | SEC_HAS_CONTENTS
- | SEC_IN_MEMORY
- | SEC_LINKER_CREATED
- | SEC_READONLY));
+ flags);
if (srelgot == NULL
|| !bfd_set_section_alignment (dynobj, srelgot, 2))
return FALSE;
@@ -769,30 +768,14 @@ elf_vax_check_relocs (bfd *abfd, struct
if (sreloc == NULL)
return FALSE;
-#if 0
- BFD_ASSERT (CONST_STRNEQ (name, .rela)
- strcmp (bfd_get_section_name (abfd, sec),
- name + 5) == 0);
-
- sreloc = bfd_get_section_by_name (dynobj, name);
- if (sreloc == NULL)
+ if (sec-flags SEC_READONLY)
{
- sreloc = bfd_make_section_with_flags (dynobj,
- name,
- (SEC_ALLOC
- | SEC_LOAD
- | SEC_HAS_CONTENTS
- | SEC_IN_MEMORY
- | SEC_LINKER_CREATED
- | SEC_READONLY));
- if (sreloc == NULL
- || !bfd_set_section_alignment (dynobj, sreloc, 2))
- return FALSE;
+ if (info-warn_shared_textrel)
+ (*_bfd_error_handler)
+ (_(warning: dynamic relocation in readonly section `%s'),
+ sec-name);
+ info-flags |= DF_TEXTREL;
}
-#endif
-
- if (sec-flags SEC_READONLY)
- info-flags |= DF_TEXTREL;
}
sreloc-size += sizeof (Elf32_External_Rela);
@@ -973,14 +956,14 @@ elf_vax_adjust_dynamic_symbol (info, h)
if (h-type == STT_FUNC
|| h-needs_plt)
{
- if (h-plt.refcount == 0
- || SYMBOL_CALLS_LOCAL (info, 0)
+ if (h-plt.refcount = 0
+ || SYMBOL_CALLS_LOCAL (info, h)
|| (ELF_ST_VISIBILITY (h-other) != STV_DEFAULT
h-root.type == bfd_link_hash_undefweak))
{
/* This case can occur if we saw a PLTxx reloc in an input
file, but the symbol was never referred to by a dynamic
- object, or if all references were garbage collected.. In
+ object, or if all references were garbage collected. In
such a case, we don't actually need to build a procedure
linkage table, and we can just do a PCxx reloc instead. */
h-plt.offset = (bfd_vma) -1;
@@ -1057,13 +1040,6 @@ elf_vax_adjust_dynamic_symbol (info, h)
if (info-shared)
return TRUE;
- if (h-size == 0)
-{
- (*_bfd_error_handler) (_(dynamic variable `%s' is zero size),
- h-root.root.string);
- return TRUE;
-}
-
/* We must allocate the symbol in our .dynbss section, which will
become part of the .bss section of the executable. There will be
an entry for this symbol in the
CVS commit: [netbsd-6] src/sys/arch/vax/vax
Module Name:src Committed By: riz Date: Mon Sep 3 19:01:25 UTC 2012 Modified Files: src/sys/arch/vax/vax [netbsd-6]: machdep.c Log Message: Pull up following revision(s) (requested by martin in ticket #532): sys/arch/vax/vax/machdep.c: revision 1.189 Kernel crash dumps are not properly implemented - so do not pretend they would exist and set dumplo to 0 if dumpsize is 0. This makes savecore happy. XXX - implement real dumps, most of the needed code seems to be in place already. To generate a diff of this commit: cvs rdiff -u -r1.185.2.1 -r1.185.2.2 src/sys/arch/vax/vax/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/vax/vax/machdep.c diff -u src/sys/arch/vax/vax/machdep.c:1.185.2.1 src/sys/arch/vax/vax/machdep.c:1.185.2.2 --- src/sys/arch/vax/vax/machdep.c:1.185.2.1 Mon May 21 15:25:56 2012 +++ src/sys/arch/vax/vax/machdep.c Mon Sep 3 19:01:25 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.185.2.1 2012/05/21 15:25:56 riz Exp $ */ +/* $NetBSD: machdep.c,v 1.185.2.2 2012/09/03 19:01:25 riz Exp $ */ /* * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. @@ -83,7 +83,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.185.2.1 2012/05/21 15:25:56 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.185.2.2 2012/09/03 19:01:25 riz Exp $); #include opt_ddb.h #include opt_compat_netbsd.h @@ -247,6 +247,13 @@ cpu_dumpconf(void) */ if (dumplo btodb(PAGE_SIZE)) dumplo = btodb(PAGE_SIZE); + + /* + * If we have nothing to dump (XXX implement crash dumps), + * make it clear for savecore that there is no dump. + */ + if (dumpsize = 0) + dumplo = 0; } static int
CVS commit: [netbsd-6] src/sys/arch/i386/i386
Module Name:src Committed By: riz Date: Mon Sep 3 19:03:39 UTC 2012 Modified Files: src/sys/arch/i386/i386 [netbsd-6]: i386func.S Log Message: Pull up following revision(s) (requested by rmind in ticket #533): sys/arch/i386/i386/i386func.S: revision 1.17 tlbflushg/i386: test for the PGE feature flag first, before checking the %cr4. Add a comment explaining why need to check both and in such order. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/i386/i386/i386func.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/i386/i386/i386func.S diff -u src/sys/arch/i386/i386/i386func.S:1.16 src/sys/arch/i386/i386/i386func.S:1.16.8.1 --- src/sys/arch/i386/i386/i386func.S:1.16 Sun Jun 12 03:35:42 2011 +++ src/sys/arch/i386/i386/i386func.S Mon Sep 3 19:03:39 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: i386func.S,v 1.16 2011/06/12 03:35:42 rmind Exp $ */ +/* $NetBSD: i386func.S,v 1.16.8.1 2012/09/03 19:03:39 riz Exp $ */ /*- * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include machine/asm.h -__KERNEL_RCSID(0, $NetBSD: i386func.S,v 1.16 2011/06/12 03:35:42 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: i386func.S,v 1.16.8.1 2012/09/03 19:03:39 riz Exp $); #include machine/specialreg.h #include machine/segments.h @@ -99,9 +99,13 @@ END(lcr3) * * (the alternatives not quoted above are not an option here.) * - * If PGE is not in use, we reload CR3. + * If PGE is not in use, we reload CR3. Check for the PGE feature + * first since i486 does not have CR4. Note: the feature flag may + * be present while the actual PGE functionality not yet enabled. */ ENTRY(tlbflushg) + testl $CPUID_PGE, _C_LABEL(cpu_feature) + jz 1f movl %cr4, %eax testl $CR4_PGE, %eax jz 1f
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src
Committed By: riz
Date: Mon Sep 3 19:09:41 UTC 2012
Modified Files:
src/sys/dev/pci [netbsd-6]: if_wm.c if_wmreg.h
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #534):
sys/dev/pci/if_wmreg.h: revision 1.48
sys/dev/pci/if_wm.c: revision 1.232
sys/dev/pci/if_wm.c: revision 1.233
sys/dev/pci/if_wm.c: revision 1.234
Make vlan and all ip/ip6 checksum offload work for the I350.
On newer devices, when using the legacy TX descriptors, vlan-related flags
that were set on the last descriptor of a packet have to be set on the
first one.
For tso/checksum offloads, a new advanced descriptor format has to be
used.
Change wcd_txdescs to a union defining all types of descriptors (they
are all 16-bytes wide).
Define a new tx function wm_nq_start(), which handle newer devices.
There is some code duplication with wm_start(), but adding support to
the existing wm_start() would make it a if () {} else {} maze. This also
allows to get rid of some workaround for older chips that are not needed
here.
Use wm_nq_start() instead of wm_start() for the I350 (this should probably
be for all WM_F_NEWQUEUE devices, but I have no hardware but the I350 to
test). Call ifp-if_start() instead of wm_start() where is matters.
Tested on a I350, and a i80003 (which use the old format), both with and
without vlans, with and without checksum offloads.
Enable VLAN hardware tagging on all chips that have the new queue mechanism.
Tested with 82575{EB,GB}, 82576, 82580, I350 and ICH9.
Shut up gcc about some uninitialized variables.
To generate a diff of this commit:
cvs rdiff -u -r1.227.2.2 -r1.227.2.3 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.46.2.1 -r1.46.2.2 src/sys/dev/pci/if_wmreg.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/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.227.2.2 src/sys/dev/pci/if_wm.c:1.227.2.3
--- src/sys/dev/pci/if_wm.c:1.227.2.2 Thu Aug 9 08:00:55 2012
+++ src/sys/dev/pci/if_wm.c Mon Sep 3 19:09:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.227.2.2 2012/08/09 08:00:55 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.227.2.3 2012/09/03 19:09:41 riz Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.227.2.2 2012/08/09 08:00:55 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.227.2.3 2012/09/03 19:09:41 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -194,7 +194,10 @@ struct wm_control_data_82544 {
* The transmit descriptors. Put these at the end, because
* we might use a smaller number of them.
*/
- wiseman_txdesc_t wcd_txdescs[WM_NTXDESC_82544];
+ union {
+ wiseman_txdesc_t wcdu_txdescs[WM_NTXDESC_82544];
+ nq_txdesc_t wcdu_nq_txdescs[WM_NTXDESC_82544];
+ } wdc_u;
};
struct wm_control_data_82542 {
@@ -203,7 +206,7 @@ struct wm_control_data_82542 {
};
#define WM_CDOFF(x) offsetof(struct wm_control_data_82544, x)
-#define WM_CDTXOFF(x) WM_CDOFF(wcd_txdescs[(x)])
+#define WM_CDTXOFF(x) WM_CDOFF(wdc_u.wcdu_txdescs[(x)])
#define WM_CDRXOFF(x) WM_CDOFF(wcd_rxdescs[(x)])
/*
@@ -294,7 +297,8 @@ struct wm_softc {
int sc_cd_rseg; /* real number of control segment */
size_t sc_cd_size; /* control data size */
#define sc_cddma sc_cddmamap-dm_segs[0].ds_addr
-#define sc_txdescs sc_control_data-wcd_txdescs
+#define sc_txdescs sc_control_data-wdc_u.wcdu_txdescs
+#define sc_nq_txdescs sc_control_data-wdc_u.wcdu_nq_txdescs
#define sc_rxdescs sc_control_data-wcd_rxdescs
#ifdef WM_EVENT_COUNTERS
@@ -490,6 +494,7 @@ do { \
} while (/*CONSTCOND*/0)
static void wm_start(struct ifnet *);
+static void wm_nq_start(struct ifnet *);
static void wm_watchdog(struct ifnet *);
static int wm_ifflags_cb(struct ethercom *);
static int wm_ioctl(struct ifnet *, u_long, void *);
@@ -1877,7 +1882,10 @@ wm_attach(device_t parent, device_t self
ifp-if_softc = sc;
ifp-if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp-if_ioctl = wm_ioctl;
- ifp-if_start = wm_start;
+ if ((sc-sc_flags WM_F_NEWQUEUE) != 0)
+ ifp-if_start = wm_nq_start;
+ else
+ ifp-if_start = wm_start;
ifp-if_watchdog = wm_watchdog;
ifp-if_init = wm_init;
ifp-if_stop = wm_stop;
@@ -1926,9 +1934,7 @@ wm_attach(device_t parent, device_t self
/*
* If we're a i82543 or greater, we can support VLANs.
*/
- if (sc-sc_type == WM_T_82575 || sc-sc_type == WM_T_82576)
- sc-sc_ethercom.ec_capabilities |= ETHERCAP_VLAN_MTU;
- else if (sc-sc_type = WM_T_82543)
+ if (sc-sc_type = WM_T_82543)
sc-sc_ethercom.ec_capabilities |=
ETHERCAP_VLAN_MTU | ETHERCAP_VLAN_HWTAGGING;
@@ -2761,6 +2767,483 @@ wm_start(struct ifnet *ifp)
}
/*
+ * wm_nq_tx_offload:
+ *
+ * Set up TCP/IP checksumming parameters for the
+ * specified packet, for NEWQUEUE devices
+ */
+static int
+wm_nq_tx_offload(struct
CVS commit: [netbsd-6] src/sys/arch/powerpc/pic
Module Name:src
Committed By: riz
Date: Mon Sep 3 19:11:31 UTC 2012
Modified Files:
src/sys/arch/powerpc/pic [netbsd-6]: intr.c
Log Message:
Pull up following revision(s) (requested by macallan in ticket #535):
sys/arch/powerpc/pic/intr.c: revision 1.23
when calculating per-IPL virq masks, take into account that shared =20
IRQs may
request different IPLs
fixes vr(4)-related problems seen on ofppc
To generate a diff of this commit:
cvs rdiff -u -r1.20.2.1 -r1.20.2.2 src/sys/arch/powerpc/pic/intr.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/powerpc/pic/intr.c
diff -u src/sys/arch/powerpc/pic/intr.c:1.20.2.1 src/sys/arch/powerpc/pic/intr.c:1.20.2.2
--- src/sys/arch/powerpc/pic/intr.c:1.20.2.1 Tue Jun 12 19:35:46 2012
+++ src/sys/arch/powerpc/pic/intr.c Mon Sep 3 19:11:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.20.2.1 2012/06/12 19:35:46 riz Exp $ */
+/* $NetBSD: intr.c,v 1.20.2.2 2012/09/03 19:11:30 riz Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.20.2.1 2012/06/12 19:35:46 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.20.2.2 2012/09/03 19:11:30 riz Exp $);
#include opt_interrupt.h
#include opt_multiprocessor.h
@@ -352,8 +352,9 @@ intr_typename(int type)
static void
intr_calculatemasks(void)
{
- imask_t newmask[NIPL] = { [IPL_NONE...IPL_HIGH] = 0 };
+ imask_t newmask[NIPL];
struct intr_source *is;
+ struct intrhand *ih;
int irq;
for (u_int ipl = IPL_NONE; ipl NIPL; ipl++) {
@@ -362,7 +363,9 @@ intr_calculatemasks(void)
/* First, figure out which ipl each IRQ uses. */
for (irq = 0, is = intrsources; irq NVIRQ; irq++, is++) {
- newmask[is-is_ipl] |= PIC_VIRQ_TO_MASK(irq);
+ for (ih = is-is_hand; ih != NULL; ih = ih-ih_next) {
+ newmask[ih-ih_ipl] |= PIC_VIRQ_TO_MASK(irq);
+ }
}
/*
@@ -379,7 +382,7 @@ intr_calculatemasks(void)
newmask[ipl] |= newmask[ipl - 1];
}
-#ifdef DEBUG_IPL
+#ifdef PIC_DEBUG
for (u_int ipl = 0; ipl NIPL; ipl++) {
printf(%u: %08x - %08x\n, ipl, imask[ipl], newmask[ipl]);
}
@@ -661,10 +664,10 @@ spllower(int ncpl)
void
genppc_cpu_configure(void)
{
- aprint_normal(biomask %x netmask %x ttymask %x\n,
- (u_int)imask[IPL_BIO] 0x1fff,
- (u_int)imask[IPL_NET] 0x1fff,
- (u_int)imask[IPL_TTY] 0x1fff);
+ aprint_normal(vmmask %x schedmask %x highmask %x\n,
+ (u_int)imask[IPL_VM] 0x7fff,
+ (u_int)imask[IPL_SCHED] 0x7fff,
+ (u_int)imask[IPL_HIGH] 0x7fff);
spl0();
}
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src
Committed By: riz
Date: Mon Sep 3 19:13:35 UTC 2012
Modified Files:
src/sys/dev/pci [netbsd-6]: mfi_pci.c
Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #536):
sys/dev/pci/mfi_pci.c: revision 1.17
PR/46877 - Wolfgang Stukenbrock -- missing definition for Symbios SAS 9261-8i
To generate a diff of this commit:
cvs rdiff -u -r1.12.16.2 -r1.12.16.3 src/sys/dev/pci/mfi_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/mfi_pci.c
diff -u src/sys/dev/pci/mfi_pci.c:1.12.16.2 src/sys/dev/pci/mfi_pci.c:1.12.16.3
--- src/sys/dev/pci/mfi_pci.c:1.12.16.2 Sat May 19 15:06:03 2012
+++ src/sys/dev/pci/mfi_pci.c Mon Sep 3 19:13:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi_pci.c,v 1.12.16.2 2012/05/19 15:06:03 riz Exp $ */
+/* $NetBSD: mfi_pci.c,v 1.12.16.3 2012/09/03 19:13:35 riz Exp $ */
/* $OpenBSD: mfi_pci.c,v 1.11 2006/08/06 04:40:08 brad Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom ma...@peereboom.us
@@ -17,7 +17,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mfi_pci.c,v 1.12.16.2 2012/05/19 15:06:03 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: mfi_pci.c,v 1.12.16.3 2012/09/03 19:13:35 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -85,6 +85,7 @@ static const struct mfi_pci_subtype mfi_
static const struct mfi_pci_subtype mfi_gen2_subtypes[] = {
{ PCI_VENDOR_SYMBIOS, 0x9261, SAS 9260-8i },
+ { PCI_VENDOR_SYMBIOS, 0x9263, SAS 9261-8i },
{ PCI_VENDOR_IBM, 0x03c7, IBM ServeRAID M5014 SAS/SATA },
{ 0x0, 0, }
};
CVS commit: [netbsd-6] src/sys/nfs
Module Name:src Committed By: riz Date: Mon Sep 3 19:15:54 UTC 2012 Modified Files: src/sys/nfs [netbsd-6]: nfs_serv.c Log Message: Pull up following revision(s) (requested by christos in ticket #537): sys/nfs/nfs_serv.c: revision 1.165 When unloading the nfsserver module, call nfs_fini() so that the nfsrvdescpl pool gets destroyed. Otherwise we are left with a stray pool that points to unmapped memory behind (and bad things happen). Typically you get seemingly random page faults (without printing uvm_fault) that happen in various pool operations. Most frequent one is the pool_drain() from the page daemon. To generate a diff of this commit: cvs rdiff -u -r1.163.2.1 -r1.163.2.2 src/sys/nfs/nfs_serv.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/nfs/nfs_serv.c diff -u src/sys/nfs/nfs_serv.c:1.163.2.1 src/sys/nfs/nfs_serv.c:1.163.2.2 --- src/sys/nfs/nfs_serv.c:1.163.2.1 Mon Sep 3 18:57:11 2012 +++ src/sys/nfs/nfs_serv.c Mon Sep 3 19:15:54 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_serv.c,v 1.163.2.1 2012/09/03 18:57:11 riz Exp $ */ +/* $NetBSD: nfs_serv.c,v 1.163.2.2 2012/09/03 19:15:54 riz Exp $ */ /* * Copyright (c) 1989, 1993 @@ -55,7 +55,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: nfs_serv.c,v 1.163.2.1 2012/09/03 18:57:11 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: nfs_serv.c,v 1.163.2.2 2012/09/03 19:15:54 riz Exp $); #include sys/param.h #include sys/systm.h @@ -142,6 +142,7 @@ nfsserver_modcmd(modcmd_t cmd, void *arg /* Server uses server cache, so kill cache last. */ nfsrv_finicache(); + nfs_fini(); return 0; default: return ENOTTY;
CVS commit: [netbsd-6] src/sys/netipsec
Module Name:src Committed By: riz Date: Mon Sep 3 19:19:55 UTC 2012 Modified Files: src/sys/netipsec [netbsd-6]: key.c key.h Log Message: Apply patch requested by msaitoh in pullup-6 ticket #538: * add TAILQ satailq and sptailq - these queues are referenced from kernfs/ipsecsa, kernfs/ipsecsp as a weak_symbol. - KAME netkey has the two queues, but FAST-IPsec netkey doen't. This cause a panic. To prevent this panic, make a empty tailq. - The tailq doen't work, because there are no implementation yet... To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.76.2.1 src/sys/netipsec/key.c cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/netipsec/key.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/netipsec/key.c diff -u src/sys/netipsec/key.c:1.76 src/sys/netipsec/key.c:1.76.2.1 --- src/sys/netipsec/key.c:1.76 Mon Jan 9 15:42:08 2012 +++ src/sys/netipsec/key.c Mon Sep 3 19:19:54 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: key.c,v 1.76 2012/01/09 15:42:08 drochner Exp $ */ +/* $NetBSD: key.c,v 1.76.2.1 2012/09/03 19:19:54 riz Exp $ */ /* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: key.c,v 1.76 2012/01/09 15:42:08 drochner Exp $); +__KERNEL_RCSID(0, $NetBSD: key.c,v 1.76.2.1 2012/09/03 19:19:54 riz Exp $); /* * This code is referd to RFC 2367 @@ -139,6 +139,10 @@ static int key_prefered_oldsa = 0; /* pr static u_int32_t acq_seq = 0; +/* XXX: referenced by kernfs, but not implemented... */ +struct _satailq satailq; +struct _sptailq sptailq; + static LIST_HEAD(_sptree, secpolicy) sptree[IPSEC_DIR_MAX]; /* SPD */ static LIST_HEAD(_sahtree, secashead) sahtree; /* SAD */ static LIST_HEAD(_regtree, secreg) regtree[SADB_SATYPE_MAX + 1]; @@ -,6 +7781,9 @@ key_do_init(void) #endif LIST_INIT(spacqtree); + TAILQ_INIT(satailq); + TAILQ_INIT(sptailq); + /* system default */ ip4_def_policy.policy = IPSEC_POLICY_NONE; ip4_def_policy.refcnt++; /*never reclaim this*/ Index: src/sys/netipsec/key.h diff -u src/sys/netipsec/key.h:1.11 src/sys/netipsec/key.h:1.11.8.1 --- src/sys/netipsec/key.h:1.11 Thu Jun 9 19:54:18 2011 +++ src/sys/netipsec/key.h Mon Sep 3 19:19:55 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: key.h,v 1.11 2011/06/09 19:54:18 drochner Exp $ */ +/* $NetBSD: key.h,v 1.11.8.1 2012/09/03 19:19:55 riz Exp $ */ /* $FreeBSD: src/sys/netipsec/key.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */ /* $KAME: key.h,v 1.21 2001/07/27 03:51:30 itojun Exp $ */ @@ -117,5 +117,9 @@ u_int16_t key_portfromsaddr (const union MALLOC_DECLARE(M_SECA); #endif /* MALLOC_DECLARE */ +/* XXX: referenced by kernfs, but not implemented... */ +extern TAILQ_HEAD(_satailq, secasvar) satailq; +extern TAILQ_HEAD(_sptailq, secpolicy) sptailq; + #endif /* defined(_KERNEL) */ #endif /* !_NETIPSEC_KEY_H_ */
CVS commit: [netbsd-6] src/sys/arch/amd64/amd64
Module Name:src Committed By: riz Date: Mon Sep 3 19:22:47 UTC 2012 Modified Files: src/sys/arch/amd64/amd64 [netbsd-6]: machdep.c Log Message: Pull up following revision(s) (requested by cherry in ticket #539): sys/arch/amd64/amd64/machdep.c: revision 1.190 Revert to unmanaged x86 memory mapped isa and pci space. This is a revert of commit r1.169: http://mail-index.netbsd.org/source-changes/2011/11/06/msg028702.html This should allow X to run on NetBSD/xen amd64 dom0, and fixes PR #46634 To generate a diff of this commit: cvs rdiff -u -r1.175.2.6 -r1.175.2.7 src/sys/arch/amd64/amd64/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/amd64/amd64/machdep.c diff -u src/sys/arch/amd64/amd64/machdep.c:1.175.2.6 src/sys/arch/amd64/amd64/machdep.c:1.175.2.7 --- src/sys/arch/amd64/amd64/machdep.c:1.175.2.6 Tue Jun 12 23:13:07 2012 +++ src/sys/arch/amd64/amd64/machdep.c Mon Sep 3 19:22:45 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.175.2.6 2012/06/12 23:13:07 riz Exp $ */ +/* $NetBSD: machdep.c,v 1.175.2.7 2012/09/03 19:22:45 riz Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011 @@ -111,7 +111,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.175.2.6 2012/06/12 23:13:07 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.175.2.7 2012/09/03 19:22:45 riz Exp $); /* #define XENDEBUG_LOW */ @@ -1758,8 +1758,8 @@ init_x86_64(paddr_t first_avail) /* Determine physical address space */ avail_start = first_avail; avail_end = ctob(xen_start_info.nr_pages); - pmap_pa_start = XPMAP_OFFSET; - pmap_pa_end = pmap_pa_start + ctob(xen_start_info.nr_pages); + pmap_pa_start = (KERNTEXTOFF - KERNBASE); + pmap_pa_end = avail_end; __PRINTK((pmap_pa_start 0x%lx avail_start 0x%lx avail_end 0x%lx\n, pmap_pa_start, avail_start, avail_end)); #endif /* !XEN */
CVS commit: [netbsd-6] src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: riz
Date: Mon Sep 3 19:24:27 UTC 2012
Modified Files:
src/external/gpl3/gcc/dist/gcc [netbsd-6]: builtins.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #540):
external/gpl3/gcc/dist/gcc/builtins.c: revision 1.2
Make can_trust_pointer_alignment() always return false on STRICT_ALIGNMENT
archs - gcc 4.5 is not able to properly track alignment and backporting
the fix from 4.6/4.7 is not feasible (according to upstream).
See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46483 for details.
Fixes PR toolchain/46865.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \
src/external/gpl3/gcc/dist/gcc/builtins.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/builtins.c
diff -u src/external/gpl3/gcc/dist/gcc/builtins.c:1.1.1.1 src/external/gpl3/gcc/dist/gcc/builtins.c:1.1.1.1.4.1
--- src/external/gpl3/gcc/dist/gcc/builtins.c:1.1.1.1 Tue Jun 21 01:20:19 2011
+++ src/external/gpl3/gcc/dist/gcc/builtins.c Mon Sep 3 19:24:26 2012
@@ -347,7 +347,7 @@ bool
can_trust_pointer_alignment (void)
{
/* We rely on TER to compute accurate alignment information. */
- return (optimize flag_tree_ter);
+ return (!STRICT_ALIGNMENT optimize flag_tree_ter);
}
/* Return the alignment in bits of EXP, a pointer valued expression.
CVS commit: [netbsd-6] src/doc
Module Name:src
Committed By: riz
Date: Mon Sep 3 19:27:22 UTC 2012
Modified Files:
src/doc [netbsd-6]: CHANGES-6.0
Log Message:
Tickets:
+ [kardel, ticket #522]
+ [bouyer, ticket #523]
+ [bouyer, ticket #524]
+ [dholland, ticket #526]
+ [drochner, ticket #527]
+ [macallan, ticket #528]
+ [jakllsch, ticket #529]
+ [chs, ticket #530]
+ [martin, ticket #531]
+ [martin, ticket #532]
+ [rmind, ticket #533]
+ [bouyer, ticket #534]
+ [macallan, ticket #535]
+ [jnemeth, ticket #536]
+ [christos, ticket #537]
+ [msaitoh, ticket #537]
+ [cherry, ticket #539]
+ [martin, ticket #540]
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.197 -r1.1.2.198 src/doc/CHANGES-6.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-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.197 src/doc/CHANGES-6.0:1.1.2.198
--- src/doc/CHANGES-6.0:1.1.2.197 Tue Aug 21 05:36:23 2012
+++ src/doc/CHANGES-6.0 Mon Sep 3 19:27:21 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.197 2012/08/21 05:36:23 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.198 2012/09/03 19:27:21 riz Exp $
A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
until the 6.0 release:
@@ -8410,3 +8410,101 @@ sys/sys/param.h patched by hand
Welcome to NetBSD 6.0_RC1!
+external/bsd/ntp/dist/ntpd/ntp_io.c 1.10
+
+ Make ntpd broadcast transmission work again.
+ [kardel, ticket #522]
+
+sys/dev/scsipi/scsiconf.c 1.269
+
+ Don't send more than 256 commands per target, to avoid a panic.
+ [bouyer, ticket #523]
+
+sys/dev/ic/isp_netbsd.c1.86
+
+ Avoid a DIAGNOSTIC panic in the isp(4) driver.
+ [bouyer, ticket #524]
+
+share/man/man3/rbtree.31.7 via patch
+
+ Add more function argument names to the man page. PR#46814.
+ [dholland, ticket #526]
+
+doc/CHANGES patch
+distrib/notes/common/main patch
+
+ Mention switch to FAST_IPSEC in January.
+ [drochner, ticket #527]
+
+sys/arch/macppc/conf/GENERICpatch
+
+ Disable radeonfb for the release, as it causes problems on
+ some (but not all) hardware.
+ [macallan, ticket #528]
+
+sys/arch/x86/acpi/acpi_wakeup.c 1.32
+
+ Fix inverted test, which unbreaks ACPI suspend on UP, and possibly
+ other bugs on MP.
+ [jakllsch, ticket #529]
+
+sys/nfs/nfs_serv.c1.164
+
+ Fix panic that can happen when an NFS rename fails.
+ [chs, ticket #530]
+
+external/gpl3/binutils/dist/bfd/elf32-vax.c 1.7
+
+ Fix vax shared libraries, so the vax port works again.
+ [martin, ticket #531]
+
+sys/arch/vax/vax/machdep.c 1.189
+
+ Silence savecore warnings on vax - crash dumps are not
+ properly implemented on vax.
+ [martin, ticket #532]
+
+sys/arch/i386/i386/i386func.S 1.17
+
+ Fix support for 486.
+ [rmind, ticket #533]
+
+sys/dev/pci/if_wm.c1.232-1.234
+sys/dev/pci/if_wmreg.h1.48
+
+ Make VLANs and checksum offload work for WM_F_NEWQUEUE devices.
+ Tested on 82575{EB,GB}, 82576, 82580, I350 and ICH9.
+ [bouyer, ticket #534]
+
+sys/arch/powerpc/pic/intr.c 1.23
+
+ Fix interrupt problems on PPC.
+ [macallan, ticket #535]
+
+sys/dev/pci/mfi_pci.c1.17
+
+ Add missing definition for Symbios SAS 9261-8i. PR#46877.
+ [jnemeth, ticket #536]
+
+sys/nfs/nfs_serv.c1.165
+
+ Clean up properly after unloading nfsserver module, to avoid
+ crashes.
+ [christos, ticket #537]
+
+sys/netipsec/key.cpatch
+sys/netipsec/key.hpatch
+
+ Prevent a panic with FAST_IPSEC.
+ [msaitoh, ticket #537]
+
+sys/arch/amd64/amd64/machdep.c 1.190 via patch
+
+ Fix X on NetBSD/amd64 Xen DOM0. PR#46634.
+ [cherry, ticket #539]
+
+external/gpl3/gcc/dist/gcc/builtins.c 1.2
+
+ Fix gcc on STRICT_ALIGNMENT arches. PR#46865.
+ [martin, ticket #540]
+
CVS commit: src/sys/uvm
Module Name:src
Committed By: matt
Date: Mon Sep 3 19:53:43 UTC 2012
Modified Files:
src/sys/uvm: uvm_km.c uvm_map.c
Log Message:
Switch to a spin lock (uvm_kentry_lock) which, fortunately, was sitting there
unused.
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/sys/uvm/uvm_km.c
cvs rdiff -u -r1.320 -r1.321 src/sys/uvm/uvm_map.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/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.132 src/sys/uvm/uvm_km.c:1.133
--- src/sys/uvm/uvm_km.c:1.132 Mon Sep 3 17:30:04 2012
+++ src/sys/uvm/uvm_km.c Mon Sep 3 19:53:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_km.c,v 1.132 2012/09/03 17:30:04 matt Exp $ */
+/* $NetBSD: uvm_km.c,v 1.133 2012/09/03 19:53:42 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -152,7 +152,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.132 2012/09/03 17:30:04 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.133 2012/09/03 19:53:42 matt Exp $);
#include opt_uvmhist.h
@@ -785,14 +785,14 @@ again:
* These VA allocations happen independently of uvm_map so if this allocation
* extends beyond the current limit, then allocate more resources for it.
*/
- mutex_enter(kernel_map-misc_lock);
+ mutex_enter(uvm_kentry_lock);
if (uvm_maxkaddr va + size) {
uvm_maxkaddr = pmap_growkernel(va + size);
KASSERTMSG(uvm_maxkaddr = va + size,
%#PRIxVADDR %#PRIxPTR %#zx,
uvm_maxkaddr, va, size);
}
- mutex_exit(kernel_map-misc_lock);
+ mutex_exit(uvm_kentry_lock);
#endif
loopva = va;
Index: src/sys/uvm/uvm_map.c
diff -u src/sys/uvm/uvm_map.c:1.320 src/sys/uvm/uvm_map.c:1.321
--- src/sys/uvm/uvm_map.c:1.320 Mon Sep 3 17:30:04 2012
+++ src/sys/uvm/uvm_map.c Mon Sep 3 19:53:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_map.c,v 1.320 2012/09/03 17:30:04 matt Exp $ */
+/* $NetBSD: uvm_map.c,v 1.321 2012/09/03 19:53:42 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_map.c,v 1.320 2012/09/03 17:30:04 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_map.c,v 1.321 2012/09/03 19:53:42 matt Exp $);
#include opt_ddb.h
#include opt_uvmhist.h
@@ -1182,10 +1182,10 @@ retry:
* If the kernel pmap can't map the requested space,
* then allocate more resources for it.
*/
- mutex_enter(map-misc_lock);
+ mutex_enter(uvm_kentry_lock);
if (map == kernel_map uvm_maxkaddr (start + size))
uvm_maxkaddr = pmap_growkernel(start + size);
- mutex_exit(map-misc_lock);
+ mutex_exit(uvm_kentry_lock);
#endif
UVMMAP_EVCNT_INCR(map_call);
CVS commit: src/tests/net/bpfilter
Module Name:src Committed By: alnsn Date: Mon Sep 3 21:27:14 UTC 2012 Modified Files: src/tests/net/bpfilter: t_bpfilter.c Log Message: Fix test timeout. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/net/bpfilter/t_bpfilter.c 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/bpfilter/t_bpfilter.c diff -u src/tests/net/bpfilter/t_bpfilter.c:1.5 src/tests/net/bpfilter/t_bpfilter.c:1.6 --- src/tests/net/bpfilter/t_bpfilter.c:1.5 Fri Aug 31 04:02:21 2012 +++ src/tests/net/bpfilter/t_bpfilter.c Mon Sep 3 21:27:14 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: t_bpfilter.c,v 1.5 2012/08/31 04:02:21 pgoyette Exp $ */ +/* $NetBSD: t_bpfilter.c,v 1.6 2012/09/03 21:27:14 alnsn Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ #include sys/cdefs.h -__RCSID($NetBSD: t_bpfilter.c,v 1.5 2012/08/31 04:02:21 pgoyette Exp $); +__RCSID($NetBSD: t_bpfilter.c,v 1.6 2012/09/03 21:27:14 alnsn Exp $); #include sys/param.h #include sys/ioctl.h @@ -199,7 +199,6 @@ magic_ping_test(const char *name, unsign char *buf; pid_t child; int bpfd; - int status; char token; int channel[2]; @@ -219,10 +218,10 @@ magic_ping_test(const char *name, unsign atf_tc_fail_errno(fork failed); case 0: netcfg_rump_if(ifr.ifr_name, 10.1.1.10, 255.0.0.0); - ATF_CHECK(write(channel[1], U, 1) == 1); - ATF_CHECK(read(channel[0], token, 1) == 1 token == 'D'); close(channel[0]); + ATF_CHECK(write(channel[1], U, 1) == 1); close(channel[1]); + pause(); return; default: break; @@ -240,6 +239,7 @@ magic_ping_test(const char *name, unsign RL(rump_sys_ioctl(bpfd, BIOCSETF, prog)); RL(rump_sys_ioctl(bpfd, BIOCSETIF, ifr)); + close(channel[1]); ATF_CHECK(read(channel[0], token, 1) == 1 token == 'U'); pinged = pingtest(10.1.1.10, wirelen, magic_echo_reply_tail); @@ -261,13 +261,9 @@ magic_ping_test(const char *name, unsign rump_sys_close(bpfd); free(buf); - ATF_CHECK(write(channel[1], D, 1) == 1); - close(channel[0]); - close(channel[1]); - RL(waitpid(child, status, 0)); - ATF_CHECK(!WIFSIGNALED(status)); + kill(child, SIGKILL); } ATF_TC(bpfiltercontig);
CVS commit: src/sys/arch/evbarm/gumstix
Module Name:src Committed By: matt Date: Tue Sep 4 00:19:48 UTC 2012 Modified Files: src/sys/arch/evbarm/gumstix: if_smsh_gpmc.c Log Message: No reason to include gumstixvar.h so don't. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/gumstix/if_smsh_gpmc.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/gumstix/if_smsh_gpmc.c diff -u src/sys/arch/evbarm/gumstix/if_smsh_gpmc.c:1.1 src/sys/arch/evbarm/gumstix/if_smsh_gpmc.c:1.2 --- src/sys/arch/evbarm/gumstix/if_smsh_gpmc.c:1.1 Sat Aug 28 04:54:46 2010 +++ src/sys/arch/evbarm/gumstix/if_smsh_gpmc.c Tue Sep 4 00:19:48 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: if_smsh_gpmc.c,v 1.1 2010/08/28 04:54:46 kiyohara Exp $ */ +/* $NetBSD: if_smsh_gpmc.c,v 1.2 2012/09/04 00:19:48 matt Exp $ */ /* * Copyright (c) 2010 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_smsh_gpmc.c,v 1.1 2010/08/28 04:54:46 kiyohara Exp $); +__KERNEL_RCSID(0, $NetBSD: if_smsh_gpmc.c,v 1.2 2012/09/04 00:19:48 matt Exp $); #include sys/param.h #include sys/device.h @@ -36,8 +36,6 @@ __KERNEL_RCSID(0, $NetBSD: if_smsh_gpmc #include arm/omap/omap2_gpmcvar.h -#include evbarm/gumstix/gumstixvar.h - #include net/if.h #include net/if_ether.h #include net/if_media.h
CVS commit: src/sys/arch/arm/mainbus
Module Name:src
Committed By: matt
Date: Tue Sep 4 00:21:08 UTC 2012
Modified Files:
src/sys/arch/arm/mainbus: mainbus.h
Log Message:
Add multiple inclusion protection.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/mainbus/mainbus.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/mainbus/mainbus.h
diff -u src/sys/arch/arm/mainbus/mainbus.h:1.4 src/sys/arch/arm/mainbus/mainbus.h:1.5
--- src/sys/arch/arm/mainbus/mainbus.h:1.4 Wed Aug 29 23:16:35 2012
+++ src/sys/arch/arm/mainbus/mainbus.h Tue Sep 4 00:21:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.h,v 1.4 2012/08/29 23:16:35 matt Exp $ */
+/* $NetBSD: mainbus.h,v 1.5 2012/09/04 00:21:08 matt Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -41,6 +41,9 @@
* Created : 15/12/94
*/
+#ifndef _ARM_MAINBUS_MAINBUS_H_
+#define _ARM_MAINBUS_MAINBUS_H_
+
#include sys/bus.h
/*
@@ -58,4 +61,4 @@ struct mainbus_attach_args {
bus_space_tag_t mb_iot; /* bus space tag */
};
-/* End of mainbus.h */
+#endif /* _ARM_MAINBUS_MAINBUS_H_ */
