Re: CVS commit: src/lib/libpthread
On Mon, Aug 24, 2015 at 12:45:15PM +, Antti Kantee wrote: I started work on this again by doing a web search for the error, and found this: http://bugs.musicpd.org/view.php?id=4110 There you argue that using constexpr for PTHREAD_MUTEX_INITIALIZER is broken. So if we assume that you are correct, shouldn't we remove the constexprs from libc++/dist/libcxx/include/__mutex_base? Except that the standard requires it. Joerg
CVS commit: src/sys
Module Name:src
Committed By: uebayasi
Date: Mon Aug 24 14:04:25 UTC 2015
Modified Files:
src/sys/arch/aarch64/conf: Makefile.aarch64
src/sys/arch/amd64/conf: Makefile.amd64
src/sys/arch/cats/conf: Makefile.cats.inc
src/sys/arch/epoc32/conf: Makefile.epoc32.inc
src/sys/arch/evbarm/conf: Makefile.evbarm.inc
src/sys/arch/hppa/conf: Makefile.hppa
src/sys/arch/i386/conf: Makefile.i386
src/sys/arch/ia64/conf: Makefile.ia64
src/sys/arch/mips/conf: Makefile.mips
src/sys/arch/netwinder/conf: Makefile.netwinder.inc
src/sys/arch/powerpc/conf: Makefile.powerpc
src/sys/arch/shark/conf: Makefile.shark.inc
src/sys/arch/sparc/conf: Makefile.sparc
src/sys/arch/sparc64/conf: Makefile.sparc64
src/sys/arch/usermode/conf: Makefile.usermode
src/sys/arch/xen/conf: Makefile.xen
src/sys/arch/zaurus/conf: Makefile.zaurus.inc
src/sys/conf: Makefile.kern.inc
Log Message:
Define ${LINKSCRIPT} in one place.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/aarch64/conf/Makefile.aarch64
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/cats/conf/Makefile.cats.inc
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/epoc32/conf/Makefile.epoc32.inc
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/conf/Makefile.evbarm.inc
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/conf/Makefile.hppa
cvs rdiff -u -r1.184 -r1.185 src/sys/arch/i386/conf/Makefile.i386
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/conf/Makefile.ia64
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/mips/conf/Makefile.mips
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/netwinder/conf/Makefile.netwinder.inc
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/powerpc/conf/Makefile.powerpc
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/shark/conf/Makefile.shark.inc
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/sparc/conf/Makefile.sparc
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/usermode/conf/Makefile.usermode
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/xen/conf/Makefile.xen
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/conf/Makefile.zaurus.inc
cvs rdiff -u -r1.185 -r1.186 src/sys/conf/Makefile.kern.inc
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/aarch64/conf/Makefile.aarch64
diff -u src/sys/arch/aarch64/conf/Makefile.aarch64:1.5 src/sys/arch/aarch64/conf/Makefile.aarch64:1.6
--- src/sys/arch/aarch64/conf/Makefile.aarch64:1.5 Thu Aug 20 06:19:36 2015
+++ src/sys/arch/aarch64/conf/Makefile.aarch64 Mon Aug 24 14:04:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.aarch64,v 1.5 2015/08/20 06:19:36 uebayasi Exp $
+# $NetBSD: Makefile.aarch64,v 1.6 2015/08/24 14:04:24 uebayasi Exp $
# Makefile for NetBSD
#
@@ -61,9 +61,6 @@ locore.o: ${A64}/aarch64/locore.S assym.
KERNLDSCRIPT?= ${A64}/conf/kern.ldscript
LOADADDRESS?= 0x
LINKFLAGS_NORMAL= -X
-.if ${KERNLDSCRIPT} !=
-LINKSCRIPT= -T ${KERNLDSCRIPT}
-.endif
# Strip AArch64 mapping symbols from the kernel image, as they interfere
# with ddb. Do it differently if 'makeoptions DEBUG=-g' was specified.
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.50 src/sys/arch/amd64/conf/Makefile.amd64:1.51
--- src/sys/arch/amd64/conf/Makefile.amd64:1.50 Tue Aug 18 10:18:20 2015
+++ src/sys/arch/amd64/conf/Makefile.amd64 Mon Aug 24 14:04:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.50 2015/08/18 10:18:20 uebayasi Exp $
+# $NetBSD: Makefile.amd64,v 1.51 2015/08/24 14:04:24 uebayasi Exp $
# Makefile for NetBSD
#
@@ -80,7 +80,6 @@ TEXTADDR?= 0x8010
EXTRA_LINKFLAGS= -z max-page-size=0x10
LINKFLAGS_NORMAL= -X
KERNLDSCRIPT?= ${AMD64}/conf/kern.ldscript
-LINKSCRIPT= -T ${KERNLDSCRIPT}
##
## (6) port specific target dependencies
Index: src/sys/arch/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.34 src/sys/arch/cats/conf/Makefile.cats.inc:1.35
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.34 Thu Aug 20 06:20:19 2015
+++ src/sys/arch/cats/conf/Makefile.cats.inc Mon Aug 24 14:04:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cats.inc,v 1.34 2015/08/20 06:20:19 uebayasi Exp $
+# $NetBSD: Makefile.cats.inc,v 1.35 2015/08/24 14:04:24 uebayasi Exp $
MACHINE_ARCH?= arm
CPPFLAGS+= -D${MACHINE}
@@ -33,4 +33,3 @@ SYSTEM_LD_TAIL_EXTRA+=; \
${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout
.endif
-LINKSCRIPT= -T ${KERNLDSCRIPT}
Index: src/sys/arch/epoc32/conf/Makefile.epoc32.inc
diff -u src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.3 src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.4
--- src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.3 Thu Aug 20 06:21:02 2015
+++ src/sys/arch/epoc32/conf/Makefile.epoc32.inc Mon Aug 24 14:04:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.epoc32.inc,v 1.3
Re: CVS commit: src/lib/libpthread
Returning to this pickle.
On 26/06/15 18:24, Joerg Sonnenberger wrote:
On Fri, Jun 26, 2015 at 12:49:09PM +, Antti Kantee wrote:
This is the simplest program to repeat the problem with g++ 5.1 and NetBSD's
pthread_types.h:
#include pthread.h
class foo {
pthread_mutex_t m;
public:
constexpr foo() : m(PTHREAD_MUTEX_INITIALIZER) {}
};
(plus or minus typos since I typed it by hand from the virtual machine
console)
If there's some way to say pthread_types.h is even more of a system header
than with -isystem and compilers should not generate errors, then I'd like
to hear it.
You don't understand. The system header is not pthread_types.h, it is
mutex.
Also, if this is really the correct DR, I'm not sure how a flaw in the
standard translates to gcc bug
http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1911
(especially when there's no fix for the defect in the standard)
The fix is to apply the C++14 rules, which is more relaxed.
So, I really don't see how to sweep the issue under the rug except by a)
figuring out a workaround b) labeling all C++ compilers which happen to
implement the current standard as incompatible with NetBSD.
DRs are retroactive, e.g. bug fixes and corrections. As such they are
part of the current standard (and of course, it is not the current
standard, since that would be C++14).
I started work on this again by doing a web search for the error, and
found this:
http://bugs.musicpd.org/view.php?id=4110
There you argue that using constexpr for PTHREAD_MUTEX_INITIALIZER is
broken. So if we assume that you are correct, shouldn't we remove the
constexprs from libc++/dist/libcxx/include/__mutex_base?
CVS commit: src/sys
Module Name:src
Committed By: uebayasi
Date: Mon Aug 24 14:04:25 UTC 2015
Modified Files:
src/sys/arch/aarch64/conf: Makefile.aarch64
src/sys/arch/amd64/conf: Makefile.amd64
src/sys/arch/cats/conf: Makefile.cats.inc
src/sys/arch/epoc32/conf: Makefile.epoc32.inc
src/sys/arch/evbarm/conf: Makefile.evbarm.inc
src/sys/arch/hppa/conf: Makefile.hppa
src/sys/arch/i386/conf: Makefile.i386
src/sys/arch/ia64/conf: Makefile.ia64
src/sys/arch/mips/conf: Makefile.mips
src/sys/arch/netwinder/conf: Makefile.netwinder.inc
src/sys/arch/powerpc/conf: Makefile.powerpc
src/sys/arch/shark/conf: Makefile.shark.inc
src/sys/arch/sparc/conf: Makefile.sparc
src/sys/arch/sparc64/conf: Makefile.sparc64
src/sys/arch/usermode/conf: Makefile.usermode
src/sys/arch/xen/conf: Makefile.xen
src/sys/arch/zaurus/conf: Makefile.zaurus.inc
src/sys/conf: Makefile.kern.inc
Log Message:
Define ${LINKSCRIPT} in one place.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/aarch64/conf/Makefile.aarch64
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/cats/conf/Makefile.cats.inc
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/epoc32/conf/Makefile.epoc32.inc
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/conf/Makefile.evbarm.inc
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/conf/Makefile.hppa
cvs rdiff -u -r1.184 -r1.185 src/sys/arch/i386/conf/Makefile.i386
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/conf/Makefile.ia64
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/mips/conf/Makefile.mips
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/netwinder/conf/Makefile.netwinder.inc
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/powerpc/conf/Makefile.powerpc
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/shark/conf/Makefile.shark.inc
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/sparc/conf/Makefile.sparc
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/usermode/conf/Makefile.usermode
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/xen/conf/Makefile.xen
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/conf/Makefile.zaurus.inc
cvs rdiff -u -r1.185 -r1.186 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Re: CVS commit: src/lib/libpthread
On Mon, Aug 24, 2015 at 02:20:55PM +, Antti Kantee wrote: On 24/08/15 13:26, Joerg Sonnenberger wrote: On Mon, Aug 24, 2015 at 12:45:15PM +, Antti Kantee wrote: I started work on this again by doing a web search for the error, and found this: http://bugs.musicpd.org/view.php?id=4110 There you argue that using constexpr for PTHREAD_MUTEX_INITIALIZER is broken. So if we assume that you are correct, shouldn't we remove the constexprs from libc++/dist/libcxx/include/__mutex_base? Except that the standard requires it. So are you now saying that that what you said in the above URL is wrong and that the NetBSD headers are broken? Let me quote the relevant part of what you said: Stop inventing things, please. Nothing in ISO C11, ISO C++11 or POSIX requires PTHREAD_MUTEX_INITIALIZER to qualify for constexpr. But now you are saying that the standard does require PTHREAD_MUTEX_INITIALIZER to qualify for constexpr. A mutex has to be constexpr constructable. That's in the standard. How a mutex is implemented is not. Nothing in mpd requires the constexpr property, so requiring it just makes things more difficult for no good reason. Joerg
Re: CVS commit: src/lib/libpthread
On 24/08/15 13:26, Joerg Sonnenberger wrote: On Mon, Aug 24, 2015 at 12:45:15PM +, Antti Kantee wrote: I started work on this again by doing a web search for the error, and found this: http://bugs.musicpd.org/view.php?id=4110 There you argue that using constexpr for PTHREAD_MUTEX_INITIALIZER is broken. So if we assume that you are correct, shouldn't we remove the constexprs from libc++/dist/libcxx/include/__mutex_base? Except that the standard requires it. So are you now saying that that what you said in the above URL is wrong and that the NetBSD headers are broken? Let me quote the relevant part of what you said: Nothing in ISO C11, ISO C++11 or POSIX requires PTHREAD_MUTEX_INITIALIZER to qualify for constexpr. But now you are saying that the standard does require PTHREAD_MUTEX_INITIALIZER to qualify for constexpr. Feel free to reply in a fashion where you actually explain your stance instead of just dropping some facts. Otherwise I'll have to guess what you mean, and that prevents me from fixing things the right way.
Re: CVS commit: src/lib/libpthread
On 24/08/15 14:36, Joerg Sonnenberger wrote: On Mon, Aug 24, 2015 at 02:20:55PM +, Antti Kantee wrote: On 24/08/15 13:26, Joerg Sonnenberger wrote: On Mon, Aug 24, 2015 at 12:45:15PM +, Antti Kantee wrote: I started work on this again by doing a web search for the error, and found this: http://bugs.musicpd.org/view.php?id=4110 There you argue that using constexpr for PTHREAD_MUTEX_INITIALIZER is broken. So if we assume that you are correct, shouldn't we remove the constexprs from libc++/dist/libcxx/include/__mutex_base? Except that the standard requires it. So are you now saying that that what you said in the above URL is wrong and that the NetBSD headers are broken? Let me quote the relevant part of what you said: Stop inventing things, please. A simple yes/no[, because ...] is more effective than evading the question. I'm still not sure which one it is. Nothing in ISO C11, ISO C++11 or POSIX requires PTHREAD_MUTEX_INITIALIZER to qualify for constexpr. But now you are saying that the standard does require PTHREAD_MUTEX_INITIALIZER to qualify for constexpr. A mutex has to be constexpr constructable. That's in the standard. How a mutex is implemented is not. Nothing in mpd requires the constexpr property, so requiring it just makes things more difficult for no good reason. What I understand from that response: the same code is wrong in mpd (and presumably every other application) but right in libc++; it's standard-compliant to implement mutex in a way which does not compile.
Re: CVS commit: src/lib/libpthread
On Mon, Aug 24, 2015 at 03:03:28PM +, Antti Kantee wrote: On 24/08/15 14:36, Joerg Sonnenberger wrote: On Mon, Aug 24, 2015 at 02:20:55PM +, Antti Kantee wrote: On 24/08/15 13:26, Joerg Sonnenberger wrote: On Mon, Aug 24, 2015 at 12:45:15PM +, Antti Kantee wrote: I started work on this again by doing a web search for the error, and found this: http://bugs.musicpd.org/view.php?id=4110 There you argue that using constexpr for PTHREAD_MUTEX_INITIALIZER is broken. So if we assume that you are correct, shouldn't we remove the constexprs from libc++/dist/libcxx/include/__mutex_base? Except that the standard requires it. So are you now saying that that what you said in the above URL is wrong and that the NetBSD headers are broken? Let me quote the relevant part of what you said: Stop inventing things, please. A simple yes/no[, because ...] is more effective than evading the question. I'm still not sure which one it is. Nothing in ISO C11, ISO C++11 or POSIX requires PTHREAD_MUTEX_INITIALIZER to qualify for constexpr. But now you are saying that the standard does require PTHREAD_MUTEX_INITIALIZER to qualify for constexpr. A mutex has to be constexpr constructable. That's in the standard. How a mutex is implemented is not. Nothing in mpd requires the constexpr property, so requiring it just makes things more difficult for no good reason. What I understand from that response: the same code is wrong in mpd (and presumably every other application) but right in libc++; it's standard-compliant to implement mutex in a way which does not compile. Whether or not all the rules apply to system headers is a question outside the scope of what I am willing to discuss. If you build a system with strange flags that explicitly disable the normal system header logic, you are on your own. The code in mpd depends on the language DR to be resolved without having a good reason to do so. Because I don't trust a compiler to behave certainly doesn't qualify. There are two approaches to implement a mutex in a standard-compliant way with a PTHREAD_MUTEX_INITIALIZER using volatile elements: (1) Assume that the compiler has a fix for the DR. (2) Defer the actual mutex setup until a later point. Clang implements the DR behavior in so far as skipping the check for system headers. I have no idea what GCC is doing. The second option comes with a significant penalty and simple is not acceptable. Joerg
CVS commit: src/sys/conf
Module Name:src Committed By: uebayasi Date: Mon Aug 24 15:50:47 UTC 2015 Modified Files: src/sys/conf: Makefile.kern.inc Log Message: If a kernel linker script is provided, preprocess it by cpp(1). Thus some constants (PAGE_SIZE, COHERENCY_UNIT, ...) can be replaced in linker scripts without setting unnecessary temporary symbols, or doing ugly sed(1) hacks. No headers are included yet. To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/sys/conf/Makefile.kern.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Mon Aug 24 16:07:11 UTC 2015
Modified Files:
src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c
systrace_args.c
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c
src/sys/sys: syscall.h syscallargs.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.287 -r1.288 src/sys/kern/syscalls.c
cvs rdiff -u -r1.5 -r1.6 src/sys/kern/syscalls_autoload.c
cvs rdiff -u -r1.6 -r1.7 src/sys/kern/systrace_args.c
cvs rdiff -u -r1.88 -r1.89 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.113 -r1.114 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.282 -r1.283 src/sys/sys/syscall.h
cvs rdiff -u -r1.266 -r1.267 src/sys/sys/syscallargs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.298 src/sys/kern/init_sysent.c:1.299
--- src/sys/kern/init_sysent.c:1.298 Thu Jun 18 15:19:50 2015
+++ src/sys/kern/init_sysent.c Mon Aug 24 16:07:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysent.c,v 1.298 2015/06/18 15:19:50 pooka Exp $ */
+/* $NetBSD: init_sysent.c,v 1.299 2015/08/24 16:07:10 pooka Exp $ */
/*
* System call switch table.
@@ -8,7 +8,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.298 2015/06/18 15:19:50 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.299 2015/08/24 16:07:10 pooka Exp $);
#include opt_modular.h
#include opt_ntp.h
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.287 src/sys/kern/syscalls.c:1.288
--- src/sys/kern/syscalls.c:1.287 Thu Jun 18 15:19:50 2015
+++ src/sys/kern/syscalls.c Mon Aug 24 16:07:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: syscalls.c,v 1.287 2015/06/18 15:19:50 pooka Exp $ */
+/* $NetBSD: syscalls.c,v 1.288 2015/08/24 16:07:10 pooka Exp $ */
/*
* System call names.
@@ -8,7 +8,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.287 2015/06/18 15:19:50 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.288 2015/08/24 16:07:10 pooka Exp $);
#if defined(_KERNEL_OPT)
#include opt_modular.h
Index: src/sys/kern/syscalls_autoload.c
diff -u src/sys/kern/syscalls_autoload.c:1.5 src/sys/kern/syscalls_autoload.c:1.6
--- src/sys/kern/syscalls_autoload.c:1.5 Thu Jun 18 15:19:50 2015
+++ src/sys/kern/syscalls_autoload.c Mon Aug 24 16:07:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: syscalls_autoload.c,v 1.5 2015/06/18 15:19:50 pooka Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.6 2015/08/24 16:07:10 pooka Exp $ */
/*
* System call autoload table.
@@ -8,7 +8,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: syscalls_autoload.c,v 1.5 2015/06/18 15:19:50 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: syscalls_autoload.c,v 1.6 2015/08/24 16:07:10 pooka Exp $);
static struct {
u_int al_code;
Index: src/sys/kern/systrace_args.c
diff -u src/sys/kern/systrace_args.c:1.6 src/sys/kern/systrace_args.c:1.7
--- src/sys/kern/systrace_args.c:1.6 Wed May 13 02:13:08 2015
+++ src/sys/kern/systrace_args.c Mon Aug 24 16:07:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace_args.c,v 1.6 2015/05/13 02:13:08 pgoyette Exp $ */
+/* $NetBSD: systrace_args.c,v 1.7 2015/08/24 16:07:10 pooka Exp $ */
/*
* System call argument to DTrace register array converstion.
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.88 src/sys/rump/include/rump/rump_syscalls.h:1.89
--- src/sys/rump/include/rump/rump_syscalls.h:1.88 Thu Jun 18 15:19:51 2015
+++ src/sys/rump/include/rump/rump_syscalls.h Mon Aug 24 16:07:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syscalls.h,v 1.88 2015/06/18 15:19:51 pooka Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.89 2015/08/24 16:07:11 pooka Exp $ */
/*
* System call protos in rump namespace.
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.113 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.114
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.113 Thu Jun 18 15:19:50 2015
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Mon Aug 24 16:07:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syscalls.c,v 1.113 2015/06/18 15:19:50 pooka Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.114 2015/08/24 16:07:11 pooka Exp $ */
/*
* System call vector and marshalling for rump.
@@ -15,7 +15,7 @@
#ifdef __NetBSD__
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.113 2015/06/18 15:19:50 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.114 2015/08/24 16:07:11 pooka Exp $);
#include sys/fstypes.h
#include sys/proc.h
Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.282 src/sys/sys/syscall.h:1.283
--- src/sys/sys/syscall.h:1.282 Thu Jun 18 15:19:50 2015
+++
CVS commit: src/sys/conf
Module Name:src
Committed By: uebayasi
Date: Mon Aug 24 15:50:47 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
If a kernel linker script is provided, preprocess it by cpp(1).
Thus some constants (PAGE_SIZE, COHERENCY_UNIT, ...) can be replaced in linker
scripts without setting unnecessary temporary symbols, or doing ugly sed(1)
hacks. No headers are included yet.
To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.187 src/sys/conf/Makefile.kern.inc:1.188
--- src/sys/conf/Makefile.kern.inc:1.187 Mon Aug 24 15:44:01 2015
+++ src/sys/conf/Makefile.kern.inc Mon Aug 24 15:50:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.187 2015/08/24 15:44:01 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.188 2015/08/24 15:50:47 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -230,8 +230,7 @@ SYSTEM_OBJ?= ${MD_OBJS} ${MI_OBJS} ${OBJ
.endif
SYSTEM_DEP+= Makefile ${SYSTEM_OBJ} .gdbinit
.if defined(KERNLDSCRIPT)
-SYSTEM_DEP+= ${KERNLDSCRIPT}
-LINKSCRIPT= -T ${KERNLDSCRIPT}
+SYSTEM_DEP+= ${.TARGET}.ldscript
.endif
.if defined(CTFMERGE)
SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
@@ -251,6 +250,15 @@ ${KERNLDSCRIPT}: ${SYSTEM_OBJ}
.endif
.endif
+.if defined(KERNLDSCRIPT)
+.for k in ${KERNELS}
+EXTRA_CLEAN+= ${k}.ldscript
+${k}.ldscript: ${KERNLDSCRIPT}
+ ${CPP} ${KERNLDSCRIPT} | grep -v '^#' $@
+.endfor
+LINKSCRIPT= -T ${.TARGET}.ldscript
+.endif
+
TEXTADDR?= ${LOADADDRESS} # backwards compatibility
LINKTEXT?= ${TEXTADDR:C/.+/-Ttext /}
LINKDATA?= ${DATAADDR:C/.+/-Tdata /}
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Mon Aug 24 16:07:11 UTC 2015 Modified Files: src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c systrace_args.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.298 -r1.299 src/sys/kern/init_sysent.c cvs rdiff -u -r1.287 -r1.288 src/sys/kern/syscalls.c cvs rdiff -u -r1.5 -r1.6 src/sys/kern/syscalls_autoload.c cvs rdiff -u -r1.6 -r1.7 src/sys/kern/systrace_args.c cvs rdiff -u -r1.88 -r1.89 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.113 -r1.114 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.282 -r1.283 src/sys/sys/syscall.h cvs rdiff -u -r1.266 -r1.267 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/conf
Module Name:src
Committed By: uebayasi
Date: Mon Aug 24 15:44:01 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Fix vers.o dependency:
o Depend on ${SYSTEM_OBJ} instead of ${SYSTEM_DEP}. The latter is obviously
meant for kernels.
o Depend on Makefile instead of ${SYSTEM_SWAP_DEP}, which has existed since
Rev. 1.1, but seems not used now. Makefile is a file that must be updated
after every config(1) run. This is simpler than dependency on swapkernel.c.
To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/conf
Module Name:src
Committed By: uebayasi
Date: Mon Aug 24 15:44:01 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Fix vers.o dependency:
o Depend on ${SYSTEM_OBJ} instead of ${SYSTEM_DEP}. The latter is obviously
meant for kernels.
o Depend on Makefile instead of ${SYSTEM_SWAP_DEP}, which has existed since
Rev. 1.1, but seems not used now. Makefile is a file that must be updated
after every config(1) run. This is simpler than dependency on swapkernel.c.
To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.186 src/sys/conf/Makefile.kern.inc:1.187
--- src/sys/conf/Makefile.kern.inc:1.186 Mon Aug 24 14:04:25 2015
+++ src/sys/conf/Makefile.kern.inc Mon Aug 24 15:44:01 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.186 2015/08/24 14:04:25 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.187 2015/08/24 15:44:01 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -316,7 +316,7 @@ _NVFLAGS=${NVFLAGS}
.if !target(vers.o)
newvers: vers.o
-vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} $S/conf/newvers.sh \
+vers.o: ${SYSTEM_OBJ} Makefile $S/conf/newvers.sh \
$S/conf/osrelease.sh ${_NETBSD_VERSION_DEPENDS}
${_MKMSG_CREATE} vers.c
${HOST_SH} $S/conf/newvers.sh ${_NVFLAGS}
CVS commit: src/sys/kern
Module Name:src Committed By: pooka Date: Mon Aug 24 16:05:46 UTC 2015 Modified Files: src/sys/kern: syscalls.conf Log Message: sys/mount.h is necessary only with !RUMP_CLIENT, so include it only in that case. Fixes build for Hurd (which does not provide sys/mount.h) from r...@gnu.org To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/kern/syscalls.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: pooka Date: Mon Aug 24 16:05:46 UTC 2015 Modified Files: src/sys/kern: syscalls.conf Log Message: sys/mount.h is necessary only with !RUMP_CLIENT, so include it only in that case. Fixes build for Hurd (which does not provide sys/mount.h) from r...@gnu.org To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/kern/syscalls.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/syscalls.conf diff -u src/sys/kern/syscalls.conf:1.23 src/sys/kern/syscalls.conf:1.24 --- src/sys/kern/syscalls.conf:1.23 Sat May 9 05:57:18 2015 +++ src/sys/kern/syscalls.conf Mon Aug 24 16:05:46 2015 @@ -1,11 +1,11 @@ -# $NetBSD: syscalls.conf,v 1.23 2015/05/09 05:57:18 pgoyette Exp $ +# $NetBSD: syscalls.conf,v 1.24 2015/08/24 16:05:46 pooka Exp $ sysnames=syscalls.c sysnumhdr=../sys/syscall.h syssw=init_sysent.c systrace=systrace_args.c sysarghdr=../sys/syscallargs.h -sysarghdrextra='#include sys/mount.h\n#ifndef RUMP_CLIENT\n#include sys/sched.h\n#endif\n#include sys/socket.h\n\n' +sysarghdrextra='#ifndef RUMP_CLIENT\n#include sys/mount.h\n#include sys/sched.h\n#endif\n#include sys/socket.h\n\n' sysautoload=syscalls_autoload.c sysalign=1 rumpcalls=../rump/librump/rumpkern/rump_syscalls.c
CVS commit: src/sbin/dump
Module Name:src
Committed By: bouyer
Date: Mon Aug 24 17:34:03 UTC 2015
Modified Files:
src/sbin/dump: dump.8 main.c rcache.c
Log Message:
Default the read block size (-k default value) to kern.maxphys (usually
64k these days). This gives a noticable performance boost on large filesystems.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sbin/dump/dump.8
cvs rdiff -u -r1.71 -r1.72 src/sbin/dump/main.c
cvs rdiff -u -r1.24 -r1.25 src/sbin/dump/rcache.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/dump/dump.8
diff -u src/sbin/dump/dump.8:1.66 src/sbin/dump/dump.8:1.67
--- src/sbin/dump/dump.8:1.66 Tue Apr 28 09:48:30 2015
+++ src/sbin/dump/dump.8 Mon Aug 24 17:34:03 2015
@@ -1,4 +1,4 @@
-.\ $NetBSD: dump.8,v 1.66 2015/04/28 09:48:30 prlw1 Exp $
+.\ $NetBSD: dump.8,v 1.67 2015/08/24 17:34:03 bouyer Exp $
.\
.\ Copyright (c) 1980, 1991, 1993
.\ Regents of the University of California.
@@ -30,7 +30,7 @@
.\
.\ @(#)dump.8 8.3 (Berkeley) 5/1/95
.\
-.Dd February 19, 2012
+.Dd August 24, 2015
.Dt DUMP 8
.Os
.Sh NAME
@@ -207,7 +207,9 @@ dump.
.It Fl k Ar read-blocksize
The size in kilobytes of the read buffers, rounded up to a multiple of the
file system block size.
-Default is 32k.
+Default is the value of the
+.Xr sysctl 7
+kern.maxphys.
.It Fl L Ar label
The user-supplied text string
.Ar label
Index: src/sbin/dump/main.c
diff -u src/sbin/dump/main.c:1.71 src/sbin/dump/main.c:1.72
--- src/sbin/dump/main.c:1.71 Sun Sep 8 13:26:05 2013
+++ src/sbin/dump/main.c Mon Aug 24 17:34:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.71 2013/09/08 13:26:05 mlelstv Exp $ */
+/* $NetBSD: main.c,v 1.72 2015/08/24 17:34:03 bouyer Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = @(#)main.c 8.6 (Berkeley) 5/1/95;
#else
-__RCSID($NetBSD: main.c,v 1.71 2013/09/08 13:26:05 mlelstv Exp $);
+__RCSID($NetBSD: main.c,v 1.72 2015/08/24 17:34:03 bouyer Exp $);
#endif
#endif /* not lint */
@@ -47,6 +47,7 @@ __RCSID($NetBSD: main.c,v 1.71 2013/09/
#include sys/time.h
#include sys/stat.h
#include sys/mount.h
+#include sys/sysctl.h
#include ufs/ffs/fs.h
#include ufs/ffs/ffs_extern.h
@@ -79,7 +80,7 @@ long dev_bsize = 1; /* recalculated bel
long blocksperfile; /* output blocks per file */
const char *host; /* remote host (if any) */
int readcache = -1; /* read cache size (in readblksize blks) */
-int readblksize = 32 * 1024; /* read block size */
+int readblksize = -1; /* read block size */
chardefault_time_string[] = %T %Z; /* default timestamp string */
char*time_string = default_time_string; /* timestamp string */
Index: src/sbin/dump/rcache.c
diff -u src/sbin/dump/rcache.c:1.24 src/sbin/dump/rcache.c:1.25
--- src/sbin/dump/rcache.c:1.24 Sat Jun 15 01:27:19 2013
+++ src/sbin/dump/rcache.c Mon Aug 24 17:34:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rcache.c,v 1.24 2013/06/15 01:27:19 christos Exp $ */
+/* $NetBSD: rcache.c,v 1.25 2015/08/24 17:34:03 bouyer Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: rcache.c,v 1.24 2013/06/15 01:27:19 christos Exp $);
+__RCSID($NetBSD: rcache.c,v 1.25 2015/08/24 17:34:03 bouyer Exp $);
#endif /* not lint */
#include sys/types.h
@@ -98,6 +98,19 @@ initcache(int cachesize, int readblksize
size_t len;
size_t sharedSize;
+ if (readblksize == -1) { /* use kern.maxphys */
+ int kern_maxphys;
+ int mib[2] = { CTL_KERN, KERN_MAXPHYS };
+
+ len = sizeof(kern_maxphys);
+ if (sysctl(mib, 2, kern_maxphys, len, NULL, 0) 0) {
+ msg(sysctl(kern.maxphys) failed: %s\n,
+ strerror(errno));
+ return;
+ }
+ readblksize = kern_maxphys;
+ }
+
/* Convert read block size in terms of filesystem block size */
nblksread = howmany(readblksize, ufsib-ufs_bsize);
CVS commit: src/sbin/dump
Module Name:src Committed By: bouyer Date: Mon Aug 24 17:34:03 UTC 2015 Modified Files: src/sbin/dump: dump.8 main.c rcache.c Log Message: Default the read block size (-k default value) to kern.maxphys (usually 64k these days). This gives a noticable performance boost on large filesystems. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sbin/dump/dump.8 cvs rdiff -u -r1.71 -r1.72 src/sbin/dump/main.c cvs rdiff -u -r1.24 -r1.25 src/sbin/dump/rcache.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/dump
Module Name:src Committed By: bouyer Date: Mon Aug 24 17:37:10 UTC 2015 Modified Files: src/sbin/dump: main.c tape.c Log Message: Consistently use iswap64() and 64bit intermediate variable, as well as 64bit formats for c_tapea. Fixes tape useage report for large filesystems. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sbin/dump/main.c cvs rdiff -u -r1.53 -r1.54 src/sbin/dump/tape.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/dump
Module Name:src
Committed By: bouyer
Date: Mon Aug 24 17:37:10 UTC 2015
Modified Files:
src/sbin/dump: main.c tape.c
Log Message:
Consistently use iswap64() and 64bit intermediate variable, as well as
64bit formats for c_tapea. Fixes tape useage report for large filesystems.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sbin/dump/main.c
cvs rdiff -u -r1.53 -r1.54 src/sbin/dump/tape.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/dump/main.c
diff -u src/sbin/dump/main.c:1.72 src/sbin/dump/main.c:1.73
--- src/sbin/dump/main.c:1.72 Mon Aug 24 17:34:03 2015
+++ src/sbin/dump/main.c Mon Aug 24 17:37:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.72 2015/08/24 17:34:03 bouyer Exp $ */
+/* $NetBSD: main.c,v 1.73 2015/08/24 17:37:10 bouyer Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = @(#)main.c 8.6 (Berkeley) 5/1/95;
#else
-__RCSID($NetBSD: main.c,v 1.72 2015/08/24 17:34:03 bouyer Exp $);
+__RCSID($NetBSD: main.c,v 1.73 2015/08/24 17:37:10 bouyer Exp $);
#endif
#endif /* not lint */
@@ -641,10 +641,10 @@ main(int argc, char *argv[])
for (i = 0; i ntrec; i++)
writeheader(maxino - 1);
if (pipeout)
- msg(%d tape blocks\n,iswap32(spcl.c_tapea));
+ msg(%lld tape blocks\n,(long long)iswap64(spcl.c_tapea));
else
- msg(%d tape blocks on %d volume%s\n,
- iswap32(spcl.c_tapea), iswap32(spcl.c_volume),
+ msg(%lld tape blocks on %d volume%s\n,
+ (long long)iswap64(spcl.c_tapea), iswap32(spcl.c_volume),
(iswap32(spcl.c_volume) == 1) ? : s);
tnow = do_stats();
date = iswap32(spcl.c_date);
Index: src/sbin/dump/tape.c
diff -u src/sbin/dump/tape.c:1.53 src/sbin/dump/tape.c:1.54
--- src/sbin/dump/tape.c:1.53 Sat Jun 15 01:27:19 2013
+++ src/sbin/dump/tape.c Mon Aug 24 17:37:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tape.c,v 1.53 2013/06/15 01:27:19 christos Exp $ */
+/* $NetBSD: tape.c,v 1.54 2015/08/24 17:37:10 bouyer Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)tape.c 8.4 (Berkeley) 5/1/95;
#else
-__RCSID($NetBSD: tape.c,v 1.53 2013/06/15 01:27:19 christos Exp $);
+__RCSID($NetBSD: tape.c,v 1.54 2015/08/24 17:37:10 bouyer Exp $);
#endif
#endif /* not lint */
@@ -333,7 +333,7 @@ flushtape(void)
if (spcl.c_addr[i] != 0)
blks++;
}
- slp-count = lastspclrec + blks + 1 - iswap32(spcl.c_tapea);
+ slp-count = lastspclrec + blks + 1 - iswap64(spcl.c_tapea);
slp-tapea = iswap64(spcl.c_tapea);
slp-firstrec = lastfirstrec + ntrec;
slp-inode = curino;
@@ -457,7 +457,8 @@ rollforward(void)
{
struct req *p, *q, *prev;
struct slave *tslp;
- int i, size, savedtapea, got;
+ int i, size, got;
+ int64_t savedtapea;
union u_spcl *ntb, *otb;
tslp = slaves[SLAVES];
ntb = (union u_spcl *)tslp-tblock[1];
@@ -498,10 +499,10 @@ rollforward(void)
q-count = 1;
trecno = 0;
nextblock = tslp-tblock;
- savedtapea = iswap32(spcl.c_tapea);
- spcl.c_tapea = iswap32(slp-tapea);
+ savedtapea = iswap64(spcl.c_tapea);
+ spcl.c_tapea = iswap64(slp-tapea);
startnewtape(0);
- spcl.c_tapea = iswap32(savedtapea);
+ spcl.c_tapea = iswap64(savedtapea);
lastspclrec = savedtapea - 1;
}
size = (char *)ntb - (char *)q;
@@ -579,7 +580,7 @@ startnewtape(int top)
interrupt_save = signal(SIGINT, SIG_IGN);
parentpid = getpid();
- tapea_volume = iswap32(spcl.c_tapea);
+ tapea_volume = iswap64(spcl.c_tapea);
(void)time(tstart_volume);
restore_check_point:
CVS commit: src/sys/conf
Module Name:src Committed By: christos Date: Mon Aug 24 18:02:55 UTC 2015 Modified Files: src/sys/conf: Makefile.kern.inc Log Message: Fix the build: provide compatibility with ports that define KERNLDSCRIPT to a file? To generate a diff of this commit: cvs rdiff -u -r1.188 -r1.189 src/sys/conf/Makefile.kern.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Mon Aug 24 18:02:55 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Fix the build: provide compatibility with ports that define KERNLDSCRIPT to
a file?
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.188 src/sys/conf/Makefile.kern.inc:1.189
--- src/sys/conf/Makefile.kern.inc:1.188 Mon Aug 24 11:50:47 2015
+++ src/sys/conf/Makefile.kern.inc Mon Aug 24 14:02:55 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.188 2015/08/24 15:50:47 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.189 2015/08/24 18:02:55 christos Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -230,8 +230,12 @@ SYSTEM_OBJ?= ${MD_OBJS} ${MI_OBJS} ${OBJ
.endif
SYSTEM_DEP+= Makefile ${SYSTEM_OBJ} .gdbinit
.if defined(KERNLDSCRIPT)
+.if exists(${KERNLDSCRIPT})
+SYSTEM_DEP+= -T ${KERNLDSCRIPT}
+.else
SYSTEM_DEP+= ${.TARGET}.ldscript
.endif
+.endif
.if defined(CTFMERGE)
SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
.else
@@ -256,8 +260,12 @@ EXTRA_CLEAN+= ${k}.ldscript
${k}.ldscript: ${KERNLDSCRIPT}
${CPP} ${KERNLDSCRIPT} | grep -v '^#' $@
.endfor
+.if exists(${KERNLDSCRIPT})
+LINKSCRIPT= -T ${KERNLDSCRIPT}
+.else
LINKSCRIPT= -T ${.TARGET}.ldscript
.endif
+.endif
TEXTADDR?= ${LOADADDRESS} # backwards compatibility
LINKTEXT?= ${TEXTADDR:C/.+/-Ttext /}
CVS commit: src/sys/dev/cadence
Module Name:src Committed By: rjs Date: Mon Aug 24 18:11:12 UTC 2015 Modified Files: src/sys/dev/cadence: if_cemac.c Log Message: printf - aprint. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/cadence/if_cemac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/cadence
Module Name:src
Committed By: rjs
Date: Mon Aug 24 18:11:12 UTC 2015
Modified Files:
src/sys/dev/cadence: if_cemac.c
Log Message:
printf - aprint.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/cadence/if_cemac.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/cadence/if_cemac.c
diff -u src/sys/dev/cadence/if_cemac.c:1.3 src/sys/dev/cadence/if_cemac.c:1.4
--- src/sys/dev/cadence/if_cemac.c:1.3 Thu Aug 13 14:51:35 2015
+++ src/sys/dev/cadence/if_cemac.c Mon Aug 24 18:11:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cemac.c,v 1.3 2015/08/13 14:51:35 rjs Exp $ */
+/* $NetBSD: if_cemac.c,v 1.4 2015/08/24 18:11:12 rjs Exp $ */
/*
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_cemac.c,v 1.3 2015/08/13 14:51:35 rjs Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_cemac.c,v 1.4 2015/08/24 18:11:12 rjs Exp $);
#include sys/types.h
#include sys/param.h
@@ -698,7 +698,7 @@ cemac_tick(void *arg)
if (!ISSET(sc-cemac_flags, CEMAC_FLAG_GEM)) {
uint32_t misses = CEMAC_READ(ETH_DRFC);
if (misses 0)
- printf(%s: %d rx misses\n, device_xname(sc-sc_dev), misses);
+ aprint_normal_ifnet(ifp, %d rx misses\n, misses);
}
s = splnet();
@@ -848,8 +848,8 @@ cemac_ifwatchdog(struct ifnet *ifp)
if ((ifp-if_flags IFF_RUNNING) == 0)
return;
- printf(%s: device timeout, CTL = 0x%08x, CFG = 0x%08x\n,
- device_xname(sc-sc_dev), CEMAC_READ(ETH_CTL), CEMAC_READ(ETH_CFG));
+ aprint_error_ifnet(ifp, device timeout, CTL = 0x%08x, CFG = 0x%08x\n,
+ CEMAC_READ(ETH_CTL), CEMAC_READ(ETH_CFG));
}
static int
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Mon Aug 24 18:17:05 UTC 2015 Modified Files: src/sys/rump: Makefile.rump Log Message: Remove unnecessary DPSRCS+= -imacros automatically results in a dependency. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/rump/Makefile.rump Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Mon Aug 24 18:17:05 UTC 2015
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Remove unnecessary DPSRCS+=
-imacros automatically results in a dependency.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.115 src/sys/rump/Makefile.rump:1.116
--- src/sys/rump/Makefile.rump:1.115 Mon Aug 24 09:45:44 2015
+++ src/sys/rump/Makefile.rump Mon Aug 24 18:17:04 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.115 2015/08/24 09:45:44 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.116 2015/08/24 18:17:04 pooka Exp $
#
.if !defined(_RUMP_MK)
@@ -131,7 +131,6 @@ CPPFLAGS+= -DPPC_OEA
# If any of these files change, we need a full rebuild
DPSRCS+= ${RUMPTOP}/Makefile.rump
-DPSRCS+= ${RUMPTOP}/include/opt/opt_rumpkernel.h
#
# Support for component-specific hypercalls
CVS commit: src/sys/dev/cadence
Module Name:src Committed By: rjs Date: Mon Aug 24 18:26:51 UTC 2015 Modified Files: src/sys/dev/cadence: if_cemac.c Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/cadence/if_cemac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/cadence
Module Name:src Committed By: rjs Date: Mon Aug 24 18:26:51 UTC 2015 Modified Files: src/sys/dev/cadence: if_cemac.c Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/cadence/if_cemac.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/cadence/if_cemac.c diff -u src/sys/dev/cadence/if_cemac.c:1.4 src/sys/dev/cadence/if_cemac.c:1.5 --- src/sys/dev/cadence/if_cemac.c:1.4 Mon Aug 24 18:11:12 2015 +++ src/sys/dev/cadence/if_cemac.c Mon Aug 24 18:26:51 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cemac.c,v 1.4 2015/08/24 18:11:12 rjs Exp $ */ +/* $NetBSD: if_cemac.c,v 1.5 2015/08/24 18:26:51 rjs Exp $ */ /* * Copyright (c) 2015 Genetec Corporation. All rights reserved. @@ -40,7 +40,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_cemac.c,v 1.4 2015/08/24 18:11:12 rjs Exp $); +__KERNEL_RCSID(0, $NetBSD: if_cemac.c,v 1.5 2015/08/24 18:26:51 rjs Exp $); #include sys/types.h #include sys/param.h @@ -848,7 +848,7 @@ cemac_ifwatchdog(struct ifnet *ifp) if ((ifp-if_flags IFF_RUNNING) == 0) return; - aprint_error_ifnet(ifp, device timeout, CTL = 0x%08x, CFG = 0x%08x\n, + aprint_error_ifnet(ifp, device timeout, CTL = 0x%08x, CFG = 0x%08x\n, CEMAC_READ(ETH_CTL), CEMAC_READ(ETH_CFG)); }
CVS commit: src/sys/dev/cadence
Module Name:src Committed By: rjs Date: Mon Aug 24 18:40:57 UTC 2015 Modified Files: src/sys/dev/cadence: if_cemac.c Log Message: Fix logic for setting multicast addresses. Setting CRC values for hashes is broken so all multicast addresses are accepted for now. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/cadence/if_cemac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/cadence
Module Name:src
Committed By: rjs
Date: Mon Aug 24 18:40:57 UTC 2015
Modified Files:
src/sys/dev/cadence: if_cemac.c
Log Message:
Fix logic for setting multicast addresses.
Setting CRC values for hashes is broken so all multicast addresses are
accepted for now.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/cadence/if_cemac.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/cadence/if_cemac.c
diff -u src/sys/dev/cadence/if_cemac.c:1.5 src/sys/dev/cadence/if_cemac.c:1.6
--- src/sys/dev/cadence/if_cemac.c:1.5 Mon Aug 24 18:26:51 2015
+++ src/sys/dev/cadence/if_cemac.c Mon Aug 24 18:40:57 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cemac.c,v 1.5 2015/08/24 18:26:51 rjs Exp $ */
+/* $NetBSD: if_cemac.c,v 1.6 2015/08/24 18:40:57 rjs Exp $ */
/*
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_cemac.c,v 1.5 2015/08/24 18:26:51 rjs Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_cemac.c,v 1.6 2015/08/24 18:40:57 rjs Exp $);
#include sys/types.h
#include sys/param.h
@@ -949,7 +949,7 @@ cemac_setaddr(struct ifnet *ifp)
* ranges is for IP multicast routing, for which the
* range is big enough to require all bits set.)
*/
- cfg |= ETH_CFG_CAF;
+ cfg |= ETH_CFG_MTI;
hashes[0] = 0xUL;
hashes[1] = 0xUL;
ifp-if_flags |= IFF_ALLMULTI;
@@ -969,8 +969,12 @@ cemac_setaddr(struct ifnet *ifp)
/* Just want the 6 most-significant bits. */
h = h 26;
-
+#if 0
hashes[h / 32] |= (1 (h % 32));
+#else
+ hashes[0] = 0xUL;
+ hashes[1] = 0xUL;
+#endif
cfg |= ETH_CFG_MTI;
}
ETHER_NEXT_MULTI(step, enm);
@@ -986,7 +990,7 @@ cemac_setaddr(struct ifnet *ifp)
| (sc-sc_enaddr[0]));
CEMAC_GEM_WRITE(SA1H, (sc-sc_enaddr[5] 8)
| (sc-sc_enaddr[4]));
- if (nma 1) {
+ if (nma 0) {
DPRINTFN(1,(%s: en1 %02x:%02x:%02x:%02x:%02x:%02x\n, __FUNCTION__,
ias[0][0], ias[0][1], ias[0][2],
ias[0][3], ias[0][4], ias[0][5]));
@@ -996,7 +1000,7 @@ cemac_setaddr(struct ifnet *ifp)
CEMAC_WRITE(ETH_SA2H, (ias[0][4] 8)
| (ias[0][5]));
}
- if (nma 2) {
+ if (nma 1) {
DPRINTFN(1,(%s: en2 %02x:%02x:%02x:%02x:%02x:%02x\n, __FUNCTION__,
ias[1][0], ias[1][1], ias[1][2],
ias[1][3], ias[1][4], ias[1][5]));
@@ -1006,14 +1010,14 @@ cemac_setaddr(struct ifnet *ifp)
CEMAC_WRITE(ETH_SA3H, (ias[1][4] 8)
| (ias[1][5]));
}
- if (nma 3) {
+ if (nma 2) {
DPRINTFN(1,(%s: en3 %02x:%02x:%02x:%02x:%02x:%02x\n, __FUNCTION__,
ias[2][0], ias[2][1], ias[2][2],
ias[2][3], ias[2][4], ias[2][5]));
- CEMAC_WRITE(ETH_SA3L, (ias[2][3] 24)
+ CEMAC_WRITE(ETH_SA4L, (ias[2][3] 24)
| (ias[2][2] 16) | (ias[2][1] 8)
| (ias[2][0]));
- CEMAC_WRITE(ETH_SA3H, (ias[2][4] 8)
+ CEMAC_WRITE(ETH_SA4H, (ias[2][4] 8)
| (ias[2][5]));
}
CEMAC_GEM_WRITE(HSH, hashes[0]);
CVS commit: src/sys/dev/cadence
Module Name:src Committed By: rjs Date: Mon Aug 24 18:51:37 UTC 2015 Modified Files: src/sys/dev/cadence: cemacreg.h if_cemac.c Log Message: Add hardware checksumming support. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/cadence/cemacreg.h cvs rdiff -u -r1.6 -r1.7 src/sys/dev/cadence/if_cemac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Mon Aug 24 07:21:14 UTC 2015
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
handle blacklistd properly.
To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.201 src/usr.sbin/postinstall/postinstall
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/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.200 src/usr.sbin/postinstall/postinstall:1.201
--- src/usr.sbin/postinstall/postinstall:1.200 Fri Aug 21 08:02:07 2015
+++ src/usr.sbin/postinstall/postinstall Mon Aug 24 03:21:14 2015
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.200 2015/08/21 12:02:07 jnemeth Exp $
+# $NetBSD: postinstall,v 1.201 2015/08/24 07:21:14 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1336,7 +1336,6 @@ accounting
altqd
amd
apmd
-blacklistd
bluetooth
bootconf.sh
bootparams
@@ -1507,6 +1506,16 @@ do_rc()
${extra_scripts}
failed=$(( ${failed} + $? ))
+ if ! find_file_in_dirlist blacklistd blacklistd \
+ ${SRC_DIR}/external/bsd/blacklist/etc/rc.d \
+ ${SRC_DIR}/etc/rc.d; then
+ failed=1
+ else
+ populate_dir $op true ${dir} ${DEST_DIR}/etc/rc.d 555 \
+ blacklistd
+ failed=$(( ${failed} + $? ))
+ fi
+
if $SOURCEMODE [ -n ${generated_scripts} ]; then
# generate scripts
mkdir ${SCRATCHDIR}/rc
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Mon Aug 24 07:21:14 UTC 2015 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: handle blacklistd properly. To generate a diff of this commit: cvs rdiff -u -r1.200 -r1.201 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys
On 08/17/15 07:16, Kengo NAKAHARA wrote:
Module Name:src
Committed By: knakahara
Date: Mon Aug 17 06:16:03 UTC 2015
Hi,
Unfortunately, the following doesn't work for platforms that don't define
interrupt_construct_intrids. Should a new stub that returns NULL be created?
Maybe RUN_ONCE is required here?
Index: src/sys/kern/subr_interrupt.c
diff -u /dev/null src/sys/kern/subr_interrupt.c:1.1
--- /dev/null Mon Aug 17 06:16:03 2015
+++ src/sys/kern/subr_interrupt.c Mon Aug 17 06:16:03 2015
...
+/*
+ * Return the size of interrupts list data on success.
+ * Reterun 0 on failed.
+ */
+static size_t
+interrupt_intrio_list_size(void)
+{
...
+ /* il_line body */
+ ii_handler = interrupt_construct_intrids(kcpuset_running);
+ if (ii_handler == NULL)
+ return 0;
...
Index: src/sys/kern/kern_stub.c
diff -u src/sys/kern/kern_stub.c:1.39 src/sys/kern/kern_stub.c:1.40
--- src/sys/kern/kern_stub.c:1.39 Mon Apr 27 06:42:53 2015
+++ src/sys/kern/kern_stub.cMon Aug 17 06:16:03 2015
...
+__weak_alias(interrupt_construct_intrids, eopnotsupp);
I found this by running sysctl -A on an evbarm platform
Nick
CVS commit: src/sys/fs/udf
Module Name:src
Committed By: hannken
Date: Mon Aug 24 08:31:56 UTC 2015
Modified Files:
src/sys/fs/udf: udf.h udf_subr.c udf_vfsops.c
Log Message:
Use vfs_vnode_iterator for udf_do_sync.
- Build rb_tree to get an ordered list of nodes, sync them and
clean the tree.
- Stop abusing mntvnode_lock to serialize udf_do_sync, use new
mutex ump-sync_lock instead.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/fs/udf/udf.h
cvs rdiff -u -r1.131 -r1.132 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.70 -r1.71 src/sys/fs/udf/udf_vfsops.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/fs/udf/udf.h
diff -u src/sys/fs/udf/udf.h:1.49 src/sys/fs/udf/udf.h:1.50
--- src/sys/fs/udf/udf.h:1.49 Mon Aug 24 08:30:17 2015
+++ src/sys/fs/udf/udf.h Mon Aug 24 08:31:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.h,v 1.49 2015/08/24 08:30:17 hannken Exp $ */
+/* $NetBSD: udf.h,v 1.50 2015/08/24 08:31:56 hannken Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -339,11 +339,11 @@ struct udf_mount {
uint8_t metadata_flags;
/* rb tree for lookup icb to udf_node and sorted list for sync */
- kmutex_t ihash_lock;
struct rb_tree udf_node_tree;
/* syncing */
int syncing; /* are we syncing? */
+ kmutex_t sync_lock; /* serialize syncing */
/* late allocation */
int32_t uncommitted_lbs[UDF_PARTITIONS];
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.131 src/sys/fs/udf/udf_subr.c:1.132
--- src/sys/fs/udf/udf_subr.c:1.131 Mon Aug 24 08:30:17 2015
+++ src/sys/fs/udf/udf_subr.c Mon Aug 24 08:31:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.131 2015/08/24 08:30:17 hannken Exp $ */
+/* $NetBSD: udf_subr.c,v 1.132 2015/08/24 08:31:56 hannken Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_subr.c,v 1.131 2015/08/24 08:30:17 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_subr.c,v 1.132 2015/08/24 08:31:56 hannken Exp $);
#endif /* not lint */
@@ -3444,29 +3444,6 @@ udf_init_nodes_tree(struct udf_mount *um
}
-static void
-udf_register_node(struct udf_node *udf_node)
-{
- struct udf_mount *ump = udf_node-ump;
-
- /* add node to the rb tree */
- mutex_enter(ump-ihash_lock);
- rb_tree_insert_node(ump-udf_node_tree, udf_node);
- mutex_exit(ump-ihash_lock);
-}
-
-
-static void
-udf_deregister_node(struct udf_node *udf_node)
-{
- struct udf_mount *ump = udf_node-ump;
-
- /* remove node from the rb tree */
- mutex_enter(ump-ihash_lock);
- rb_tree_remove_node(ump-udf_node_tree, udf_node);
- mutex_exit(ump-ihash_lock);
-}
-
/* - */
static int
@@ -5310,9 +5287,6 @@ udf_loadvnode(struct mount *mp, struct v
sizeof(struct long_ad)) == 0)
vp-v_vflag |= VV_ROOT;
- /* insert into the hash lookup */
- udf_register_node(udf_node);
-
icb_loc = node_icb_loc;
needs_indirect = 0;
strat4096 = 0;
@@ -5681,16 +5655,15 @@ udf_dispose_node(struct udf_node *udf_no
/* remove dirhash if present */
dirhash_purge(udf_node-dir_hash);
- /* remove from our hash lookup table */
- udf_deregister_node(udf_node);
-
/* destroy our lock */
mutex_destroy(udf_node-node_mutex);
cv_destroy(udf_node-node_lock);
/* dissociate our udf_node from the vnode */
genfs_node_destroy(udf_node-vnode);
+ mutex_enter(vp-v_interlock);
vp-v_data = NULL;
+ mutex_exit(vp-v_interlock);
/* free associated memory and the node itself */
for (extnr = 0; extnr udf_node-num_extensions; extnr++) {
@@ -5828,9 +5801,6 @@ udf_newvnode(struct mount *mp, struct vn
/* initialise genfs */
genfs_node_init(vp, udf_genfsops);
- /* insert into the hash lookup */
- udf_register_node(udf_node);
-
/* get parent's unique ID for refering '..' if its a directory */
if (dir_node-fe) {
parent_unique_id = udf_rw64(dir_node-fe-unique_id);
@@ -6316,64 +6286,27 @@ brokendir:
/* - */
static void
-udf_sync_pass(struct udf_mount *ump, kauth_cred_t cred, int waitfor,
- int pass, int *ndirty)
+udf_sync_pass(struct udf_mount *ump, kauth_cred_t cred, int pass, int *ndirty)
{
struct udf_node *udf_node, *n_udf_node;
struct vnode *vp;
int vdirty, error;
- int on_type, on_flags, on_vnode;
-derailed:
- KASSERT(mutex_owned(mntvnode_lock));
+ KASSERT(mutex_owned(ump-sync_lock));
DPRINTF(SYNC, (sync_pass %d\n, pass));
udf_node = RB_TREE_MIN(ump-udf_node_tree);
for (;udf_node; udf_node = n_udf_node) {
DPRINTF(SYNC, (.));
- udf_node-i_flags = ~IN_SYNCED;
vp = udf_node-vnode;
- mutex_enter(vp-v_interlock);
n_udf_node = rb_tree_iterate(ump-udf_node_tree,
udf_node, RB_DIR_RIGHT);
- if (n_udf_node)
- n_udf_node-i_flags |= IN_SYNCED;
-
- /* system nodes are not synced this way */
- if (vp-v_vflag
CVS commit: src/sys/fs/udf
Module Name:src Committed By: hannken Date: Mon Aug 24 08:31:56 UTC 2015 Modified Files: src/sys/fs/udf: udf.h udf_subr.c udf_vfsops.c Log Message: Use vfs_vnode_iterator for udf_do_sync. - Build rb_tree to get an ordered list of nodes, sync them and clean the tree. - Stop abusing mntvnode_lock to serialize udf_do_sync, use new mutex ump-sync_lock instead. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/fs/udf/udf.h cvs rdiff -u -r1.131 -r1.132 src/sys/fs/udf/udf_subr.c cvs rdiff -u -r1.70 -r1.71 src/sys/fs/udf/udf_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/udf
Module Name:src
Committed By: hannken
Date: Mon Aug 24 08:30:17 UTC 2015
Modified Files:
src/sys/fs/udf: udf.h udf_allocation.c udf_subr.c udf_vfsops.c
Log Message:
Remove dirtynodes_cv, it is only used for timed waits without any signals.
Replace the cv_timedwait with kpause.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/fs/udf/udf.h
cvs rdiff -u -r1.37 -r1.38 src/sys/fs/udf/udf_allocation.c
cvs rdiff -u -r1.130 -r1.131 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.68 -r1.69 src/sys/fs/udf/udf_vfsops.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/fs/udf/udf.h
diff -u src/sys/fs/udf/udf.h:1.48 src/sys/fs/udf/udf.h:1.49
--- src/sys/fs/udf/udf.h:1.48 Mon Apr 6 08:39:23 2015
+++ src/sys/fs/udf/udf.h Mon Aug 24 08:30:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.h,v 1.48 2015/04/06 08:39:23 hannken Exp $ */
+/* $NetBSD: udf.h,v 1.49 2015/08/24 08:30:17 hannken Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -344,7 +344,6 @@ struct udf_mount {
/* syncing */
int syncing; /* are we syncing? */
- kcondvar_t dirtynodes_cv; /* sleeping on sync */
/* late allocation */
int32_t uncommitted_lbs[UDF_PARTITIONS];
Index: src/sys/fs/udf/udf_allocation.c
diff -u src/sys/fs/udf/udf_allocation.c:1.37 src/sys/fs/udf/udf_allocation.c:1.38
--- src/sys/fs/udf/udf_allocation.c:1.37 Wed Dec 3 21:34:55 2014
+++ src/sys/fs/udf/udf_allocation.c Mon Aug 24 08:30:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_allocation.c,v 1.37 2014/12/03 21:34:55 reinoud Exp $ */
+/* $NetBSD: udf_allocation.c,v 1.38 2015/08/24 08:30:17 hannken Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_allocation.c,v 1.37 2014/12/03 21:34:55 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_allocation.c,v 1.38 2015/08/24 08:30:17 hannken Exp $);
#endif /* not lint */
@@ -1084,11 +1084,8 @@ udf_reserve_space(struct udf_mount *ump,
DPRINTF(RESERVE, (udf_reserve_space: issuing sync\n));
mutex_exit(ump-allocate_mutex);
udf_do_sync(ump, FSCRED, 0);
- mutex_enter(mntvnode_lock);
/* 1/8 second wait */
- cv_timedwait(ump-dirtynodes_cv, mntvnode_lock,
- hz/8);
- mutex_exit(mntvnode_lock);
+ kpause(udfsync2, false, hz/8, NULL);
mutex_enter(ump-allocate_mutex);
}
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.130 src/sys/fs/udf/udf_subr.c:1.131
--- src/sys/fs/udf/udf_subr.c:1.130 Mon Apr 20 13:44:16 2015
+++ src/sys/fs/udf/udf_subr.c Mon Aug 24 08:30:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.130 2015/04/20 13:44:16 riastradh Exp $ */
+/* $NetBSD: udf_subr.c,v 1.131 2015/08/24 08:30:17 hannken Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_subr.c,v 1.130 2015/04/20 13:44:16 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_subr.c,v 1.131 2015/08/24 08:30:17 hannken Exp $);
#endif /* not lint */
@@ -6433,8 +6433,7 @@ recount:
if (ndirty) {
/* 1/4 second wait */
- cv_timedwait(ump-dirtynodes_cv, mntvnode_lock,
-hz/4);
+ kpause(udfsync2, false, hz/4, NULL);
goto recount;
}
}
Index: src/sys/fs/udf/udf_vfsops.c
diff -u src/sys/fs/udf/udf_vfsops.c:1.68 src/sys/fs/udf/udf_vfsops.c:1.69
--- src/sys/fs/udf/udf_vfsops.c:1.68 Mon Apr 6 08:39:23 2015
+++ src/sys/fs/udf/udf_vfsops.c Mon Aug 24 08:30:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_vfsops.c,v 1.68 2015/04/06 08:39:23 hannken Exp $ */
+/* $NetBSD: udf_vfsops.c,v 1.69 2015/08/24 08:30:17 hannken Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_vfsops.c,v 1.68 2015/04/06 08:39:23 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_vfsops.c,v 1.69 2015/08/24 08:30:17 hannken Exp $);
#endif /* not lint */
@@ -262,7 +262,6 @@ free_udf_mountinfo(struct mount *mp)
mutex_destroy(ump-ihash_lock);
mutex_destroy(ump-logvol_mutex);
mutex_destroy(ump-allocate_mutex);
- cv_destroy(ump-dirtynodes_cv);
MPFREE(ump-vat_table, M_UDFVOLD);
@@ -583,7 +582,6 @@ udf_mountfs(struct vnode *devvp, struct
mutex_init(ump-logvol_mutex, MUTEX_DEFAULT, IPL_NONE);
mutex_init(ump-ihash_lock, MUTEX_DEFAULT, IPL_NONE);
mutex_init(ump-allocate_mutex, MUTEX_DEFAULT, IPL_NONE);
- cv_init(ump-dirtynodes_cv, udfsync2);
/* init rbtree for nodes, ordered by their icb address (long_ad) */
udf_init_nodes_tree(ump);
CVS commit: src/sys/fs/udf
Module Name:src
Committed By: hannken
Date: Mon Aug 24 08:30:52 UTC 2015
Modified Files:
src/sys/fs/udf: udf_vfsops.c
Log Message:
Use vfs_vnode_iterator for udf_unmount_sanity_check.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/fs/udf/udf_vfsops.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/fs/udf/udf_vfsops.c
diff -u src/sys/fs/udf/udf_vfsops.c:1.69 src/sys/fs/udf/udf_vfsops.c:1.70
--- src/sys/fs/udf/udf_vfsops.c:1.69 Mon Aug 24 08:30:17 2015
+++ src/sys/fs/udf/udf_vfsops.c Mon Aug 24 08:30:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_vfsops.c,v 1.69 2015/08/24 08:30:17 hannken Exp $ */
+/* $NetBSD: udf_vfsops.c,v 1.70 2015/08/24 08:30:52 hannken Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_vfsops.c,v 1.69 2015/08/24 08:30:17 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_vfsops.c,v 1.70 2015/08/24 08:30:52 hannken Exp $);
#endif /* not lint */
@@ -438,20 +438,28 @@ udf_mount(struct mount *mp, const char *
/* - */
#ifdef DEBUG
+static bool
+udf_sanity_selector(void *cl, struct vnode *vp)
+{
+
+ vprint(, vp);
+ if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) {
+ printf( is locked\n);
+ }
+ if (vp-v_usecount 1)
+ printf( more than one usecount %d\n, vp-v_usecount);
+ return false;
+}
+
static void
udf_unmount_sanity_check(struct mount *mp)
{
- struct vnode *vp;
+ struct vnode_iterator *marker;
printf(On unmount, i found the following nodes:\n);
- TAILQ_FOREACH(vp, mp-mnt_vnodelist, v_mntvnodes) {
- vprint(, vp);
- if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) {
- printf( is locked\n);
- }
- if (vp-v_usecount 1)
- printf( more than one usecount %d\n, vp-v_usecount);
- }
+ vfs_vnode_iterator_init(mp, marker);
+ vfs_vnode_iterator_next(marker, udf_sanity_selector, NULL);
+ vfs_vnode_iterator_destroy(marker);
}
#endif
CVS commit: src/sys/fs/udf
Module Name:src Committed By: hannken Date: Mon Aug 24 08:30:52 UTC 2015 Modified Files: src/sys/fs/udf: udf_vfsops.c Log Message: Use vfs_vnode_iterator for udf_unmount_sanity_check. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/fs/udf/udf_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/udf
Module Name:src Committed By: hannken Date: Mon Aug 24 08:30:17 UTC 2015 Modified Files: src/sys/fs/udf: udf.h udf_allocation.c udf_subr.c udf_vfsops.c Log Message: Remove dirtynodes_cv, it is only used for timed waits without any signals. Replace the cv_timedwait with kpause. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/fs/udf/udf.h cvs rdiff -u -r1.37 -r1.38 src/sys/fs/udf/udf_allocation.c cvs rdiff -u -r1.130 -r1.131 src/sys/fs/udf/udf_subr.c cvs rdiff -u -r1.68 -r1.69 src/sys/fs/udf/udf_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys
Hi,
On 2015/08/24 16:18, Nick Hudson wrote:
On 08/17/15 07:16, Kengo NAKAHARA wrote:
Module Name:src
Committed By:knakahara
Date:Mon Aug 17 06:16:03 UTC 2015
Hi,
Unfortunately, the following doesn't work for platforms that don't define
interrupt_construct_intrids. Should a new stub that returns NULL be created?
Maybe RUN_ONCE is required here?
Index: src/sys/kern/subr_interrupt.c
diff -u /dev/null src/sys/kern/subr_interrupt.c:1.1
--- /dev/nullMon Aug 17 06:16:03 2015
+++ src/sys/kern/subr_interrupt.cMon Aug 17 06:16:03 2015
...
+/*
+ * Return the size of interrupts list data on success.
+ * Reterun 0 on failed.
+ */
+static size_t
+interrupt_intrio_list_size(void)
+{
...
+/* il_line body */
+ii_handler = interrupt_construct_intrids(kcpuset_running);
+if (ii_handler == NULL)
+return 0;
...
Index: src/sys/kern/kern_stub.c
diff -u src/sys/kern/kern_stub.c:1.39 src/sys/kern/kern_stub.c:1.40
--- src/sys/kern/kern_stub.c:1.39Mon Apr 27 06:42:53 2015
+++ src/sys/kern/kern_stub.cMon Aug 17 06:16:03 2015
...
+__weak_alias(interrupt_construct_intrids, eopnotsupp);
I found this by running sysctl -A on an evbarm platform
Sorry, some interrupt_* stub functions are incorrect.
Could you try below patch?
diff --git a/sys/kern/kern_stub.c b/sys/kern/kern_stub.c
index da6377f..f7f638c 100644
--- a/sys/kern/kern_stub.c
+++ b/sys/kern/kern_stub.c
@@ -147,12 +147,12 @@ __weak_alias(userconf_prompt, voidop);
__weak_alias(kobj_renamespace, nullop);
-__weak_alias(interrupt_get_count, eopnotsupp);
-__weak_alias(interrupt_get_assigned, eopnotsupp);
-__weak_alias(interrupt_get_available, eopnotsupp);
-__weak_alias(interrupt_get_devname, eopnotsupp);
-__weak_alias(interrupt_construct_intrids, eopnotsupp);
-__weak_alias(interrupt_destruct_intrids, eopnotsupp);
+__weak_alias(interrupt_get_count, nullop);
+__weak_alias(interrupt_get_assigned, voidop);
+__weak_alias(interrupt_get_available, voidop);
+__weak_alias(interrupt_get_devname, voidop);
+__weak_alias(interrupt_construct_intrids, enomem);
+__weak_alias(interrupt_destruct_intrids, voidop);
__weak_alias(interrupt_distribute, eopnotsupp);
__weak_alias(interrupt_distribute_handler, eopnotsupp);
@@ -267,6 +267,17 @@ eopnotsupp(void)
}
/*
+ * Return error for operation not supported
+ * on a specific allocate operation.
+ */
+void *
+enomem(void)
+{
+
+ return (NULL);
+}
+
+/*
* Generic null operation, void return value.
*/
void
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 1778af6..d4b16ce 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -169,6 +169,7 @@ int enosys(void);
intenoioctl(void);
intenxio(void);
inteopnotsupp(void);
+void* enomem(void);
enum hashtype {
HASH_LIST,
Thanks,
--
//
Internet Initiative Japan Inc.
Device Engineering Section,
Core Product Development Department,
Product Division,
Technology Unit
Kengo NAKAHARA k-nakah...@iij.ad.jp
CVS commit: src/sys/arch
Module Name:src
Committed By: uebayasi
Date: Mon Aug 24 08:13:07 UTC 2015
Modified Files:
src/sys/arch/aarch64/conf: kern.ldscript
src/sys/arch/dreamcast/conf: shl.x
src/sys/arch/hpcsh/conf: shl-elf.x
src/sys/arch/ia64/conf: kern.ldscript
src/sys/arch/mips/conf: kern.ldscript
src/sys/arch/powerpc/conf: kern-mb.ldscript kern.ldscript
kern64.ldscript
src/sys/arch/riscv/conf: kern.ldscript
src/sys/arch/sparc/conf: kern.ldscript
src/sys/arch/sparc64/conf: kern.ldscript kern32.ldscript
Log Message:
Don't mention stab and DWARF sections, because these (poorly mtaintained)
lists only help to make them harder to read.
If those sections are found in inputs, they simply appear in outputs as
orphaned sections, sorted by section types and attributes.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/conf/kern.ldscript
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/dreamcast/conf/shl.x
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hpcsh/conf/shl-elf.x
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/conf/kern.ldscript
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/conf/kern.ldscript
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/conf/kern-mb.ldscript \
src/sys/arch/powerpc/conf/kern64.ldscript
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/conf/kern.ldscript
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/conf/kern.ldscript
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc/conf/kern.ldscript
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc64/conf/kern.ldscript
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sparc64/conf/kern32.ldscript
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/aarch64/conf/kern.ldscript
diff -u src/sys/arch/aarch64/conf/kern.ldscript:1.2 src/sys/arch/aarch64/conf/kern.ldscript:1.3
--- src/sys/arch/aarch64/conf/kern.ldscript:1.2 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/aarch64/conf/kern.ldscript Mon Aug 24 08:13:07 2015
@@ -71,39 +71,6 @@ SECTIONS
__end__ = . ;
_end = .; PROVIDE (end = .);
. = DATA_SEGMENT_END (.);
- .comment 0 : { *(.comment) }
- .ident 0 : { *(.ident) }
- /* DWARF debug sections.
- Symbols in the DWARF debugging sections are relative to the beginning
- of the section so we begin them at 0. */
- /* DWARF 1 */
- .debug 0 : { *(.debug) }
- .line 0 : { *(.line) }
- /* GNU DWARF 1 extensions */
- .debug_srcinfo 0 : { *(.debug_srcinfo) }
- .debug_sfnames 0 : { *(.debug_sfnames) }
- /* DWARF 1.1 and DWARF 2 */
- .debug_aranges 0 : { *(.debug_aranges) }
- .debug_pubnames 0 : { *(.debug_pubnames) }
- /* DWARF 2 */
- .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) }
- .debug_abbrev 0 : { *(.debug_abbrev) }
- .debug_line 0 : { *(.debug_line) }
- .debug_frame0 : { *(.debug_frame) }
- .debug_str 0 : { *(.debug_str) }
- .debug_loc 0 : { *(.debug_loc) }
- .debug_macinfo 0 : { *(.debug_macinfo) }
- /* SGI/MIPS DWARF 2 extensions */
- .debug_weaknames 0 : { *(.debug_weaknames) }
- .debug_funcnames 0 : { *(.debug_funcnames) }
- .debug_typenames 0 : { *(.debug_typenames) }
- .debug_varnames 0 : { *(.debug_varnames) }
- /* DWARF 3 */
- .debug_pubtypes 0 : { *(.debug_pubtypes) }
- .debug_ranges 0 : { *(.debug_ranges) }
- /* DWARF Extension. */
- .debug_macro0 : { *(.debug_macro) }
.ARM.attributes 0 : { KEEP (*(.ARM.attributes)) KEEP (*(.gnu.attributes)) }
.note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }
- /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }
}
Index: src/sys/arch/dreamcast/conf/shl.x
diff -u src/sys/arch/dreamcast/conf/shl.x:1.8 src/sys/arch/dreamcast/conf/shl.x:1.9
--- src/sys/arch/dreamcast/conf/shl.x:1.8 Thu Aug 20 06:53:11 2015
+++ src/sys/arch/dreamcast/conf/shl.x Mon Aug 24 08:13:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: shl.x,v 1.8 2015/08/20 06:53:11 uebayasi Exp $ */
+/* $NetBSD: shl.x,v 1.9 2015/08/24 08:13:07 uebayasi Exp $ */
OUTPUT_FORMAT(elf32-shl-nbsd)
OUTPUT_ARCH(sh)
@@ -40,39 +40,4 @@ SECTIONS
. = ALIGN(4);
end = . ;
PROVIDE (end = .);
-
- /* Stabs debugging sections. */
- .stab 0 : { *(.stab) }
- .stabstr 0 : { *(.stabstr) }
- .stab.excl 0 : { *(.stab.excl) }
- .stab.exclstr 0 : { *(.stab.exclstr) }
- .stab.index 0 : { *(.stab.index) }
- .stab.indexstr 0 : { *(.stab.indexstr) }
- .comment 0 : { *(.comment) }
- /* DWARF debug sections.
- Symbols in the DWARF debugging section are relative to the beginning
- of the section so we begin .debug at 0. */
- /* DWARF 1 */
- .debug 0 : { *(.debug) }
- .line 0 : { *(.line) }
- /* GNU DWARF 1 extensions */
- .debug_srcinfo 0 : { *(.debug_srcinfo) }
- .debug_sfnames 0 : { *(.debug_sfnames) }
- /* DWARF 1.1 and DWARF 2 */
- .debug_aranges 0 : { *(.debug_aranges) }
- .debug_pubnames 0 : { *(.debug_pubnames) }
- /* DWARF 2 */
-
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Mon Aug 24 08:13:07 UTC 2015 Modified Files: src/sys/arch/aarch64/conf: kern.ldscript src/sys/arch/dreamcast/conf: shl.x src/sys/arch/hpcsh/conf: shl-elf.x src/sys/arch/ia64/conf: kern.ldscript src/sys/arch/mips/conf: kern.ldscript src/sys/arch/powerpc/conf: kern-mb.ldscript kern.ldscript kern64.ldscript src/sys/arch/riscv/conf: kern.ldscript src/sys/arch/sparc/conf: kern.ldscript src/sys/arch/sparc64/conf: kern.ldscript kern32.ldscript Log Message: Don't mention stab and DWARF sections, because these (poorly mtaintained) lists only help to make them harder to read. If those sections are found in inputs, they simply appear in outputs as orphaned sections, sorted by section types and attributes. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/conf/kern.ldscript cvs rdiff -u -r1.8 -r1.9 src/sys/arch/dreamcast/conf/shl.x cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hpcsh/conf/shl-elf.x cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/conf/kern.ldscript cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/conf/kern.ldscript cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/conf/kern-mb.ldscript \ src/sys/arch/powerpc/conf/kern64.ldscript cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/conf/kern.ldscript cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/conf/kern.ldscript cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc/conf/kern.ldscript cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc64/conf/kern.ldscript cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sparc64/conf/kern32.ldscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet6
Module Name:src
Committed By: ozaki-r
Date: Mon Aug 24 09:45:29 UTC 2015
Modified Files:
src/sys/netinet6: icmp6.c nd6_rtr.c
Log Message:
Change 0 to NULL for rtrequest's last argument (struct rtentry **ret_nrt)
To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.102 -r1.103 src/sys/netinet6/nd6_rtr.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/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.173 src/sys/netinet6/icmp6.c:1.174
--- src/sys/netinet6/icmp6.c:1.173 Fri Aug 7 08:11:33 2015
+++ src/sys/netinet6/icmp6.c Mon Aug 24 09:45:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.173 2015/08/07 08:11:33 ozaki-r Exp $ */
+/* $NetBSD: icmp6.c,v 1.174 2015/08/24 09:45:29 ozaki-r Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: icmp6.c,v 1.173 2015/08/07 08:11:33 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: icmp6.c,v 1.174 2015/08/24 09:45:29 ozaki-r Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -2717,7 +2717,7 @@ icmp6_mtudisc_timeout(struct rtentry *rt
if ((rt-rt_flags (RTF_DYNAMIC | RTF_HOST)) ==
(RTF_DYNAMIC | RTF_HOST)) {
rtrequest((int) RTM_DELETE, rt_getkey(rt),
- rt-rt_gateway, rt_mask(rt), rt-rt_flags, 0);
+ rt-rt_gateway, rt_mask(rt), rt-rt_flags, NULL);
} else {
if (!(rt-rt_rmx.rmx_locks RTV_MTU))
rt-rt_rmx.rmx_mtu = 0;
@@ -2732,7 +2732,7 @@ icmp6_redirect_timeout(struct rtentry *r
if ((rt-rt_flags (RTF_GATEWAY | RTF_DYNAMIC | RTF_HOST)) ==
(RTF_GATEWAY | RTF_DYNAMIC | RTF_HOST)) {
rtrequest((int) RTM_DELETE, rt_getkey(rt),
- rt-rt_gateway, rt_mask(rt), rt-rt_flags, 0);
+ rt-rt_gateway, rt_mask(rt), rt-rt_flags, NULL);
}
}
Index: src/sys/netinet6/nd6_rtr.c
diff -u src/sys/netinet6/nd6_rtr.c:1.102 src/sys/netinet6/nd6_rtr.c:1.103
--- src/sys/netinet6/nd6_rtr.c:1.102 Fri Aug 7 08:11:33 2015
+++ src/sys/netinet6/nd6_rtr.c Mon Aug 24 09:45:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_rtr.c,v 1.102 2015/08/07 08:11:33 ozaki-r Exp $ */
+/* $NetBSD: nd6_rtr.c,v 1.103 2015/08/24 09:45:29 ozaki-r Exp $ */
/* $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nd6_rtr.c,v 1.102 2015/08/07 08:11:33 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: nd6_rtr.c,v 1.103 2015/08/24 09:45:29 ozaki-r Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2122,7 +2122,7 @@ rt6_deleteroute(struct rtentry *rt, void
return (0);
return (rtrequest(RTM_DELETE, rt_getkey(rt), rt-rt_gateway,
- rt_mask(rt), rt-rt_flags, 0));
+ rt_mask(rt), rt-rt_flags, NULL));
#undef SIN6
}
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Mon Aug 24 09:45:45 UTC 2015
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Use BUILDRUMP_IMACROS if specified.
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.114 src/sys/rump/Makefile.rump:1.115
--- src/sys/rump/Makefile.rump:1.114 Fri Aug 21 12:39:07 2015
+++ src/sys/rump/Makefile.rump Mon Aug 24 09:45:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.114 2015/08/21 12:39:07 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.115 2015/08/24 09:45:44 pooka Exp $
#
.if !defined(_RUMP_MK)
@@ -46,6 +46,9 @@ CFLAGS+= -ffreestanding -fno-strict-alia
CWARNFLAGS+= -Wno-format-zero-length -Wno-pointer-sign
CPPFLAGS+= -imacros ${RUMPTOP}/include/opt/opt_rumpkernel.h
+.ifdef BUILDRUMP_IMACROS
+CPPFLAGS+= -imacros ${BUILDRUMP_IMACROS}
+.endif
CPPFLAGS+= -I${.CURDIR} -I.
CPPFLAGS+= -I${RUMPTOP}/../../common/include
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Mon Aug 24 09:45:45 UTC 2015 Modified Files: src/sys/rump: Makefile.rump Log Message: Use BUILDRUMP_IMACROS if specified. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/sys/rump/Makefile.rump Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet6
Module Name:src Committed By: ozaki-r Date: Mon Aug 24 09:45:29 UTC 2015 Modified Files: src/sys/netinet6: icmp6.c nd6_rtr.c Log Message: Change 0 to NULL for rtrequest's last argument (struct rtentry **ret_nrt) To generate a diff of this commit: cvs rdiff -u -r1.173 -r1.174 src/sys/netinet6/icmp6.c cvs rdiff -u -r1.102 -r1.103 src/sys/netinet6/nd6_rtr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: martin Date: Mon Aug 24 09:49:08 UTC 2015 Modified Files: src/distrib/sets/lists/xdebug: md.evbarm Log Message: Add some missing obsolete markers To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xdebug/md.evbarm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: martin Date: Mon Aug 24 09:49:08 UTC 2015 Modified Files: src/distrib/sets/lists/xdebug: md.evbarm Log Message: Add some missing obsolete markers To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xdebug/md.evbarm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xdebug/md.evbarm diff -u src/distrib/sets/lists/xdebug/md.evbarm:1.8 src/distrib/sets/lists/xdebug/md.evbarm:1.9 --- src/distrib/sets/lists/xdebug/md.evbarm:1.8 Mon Aug 17 17:18:53 2015 +++ src/distrib/sets/lists/xdebug/md.evbarm Mon Aug 24 09:49:08 2015 @@ -1,18 +1,18 @@ -# $NetBSD: md.evbarm,v 1.8 2015/08/17 17:18:53 christos Exp $ -./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/modules/extensions/libglx_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/modules/extensions/librecord_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/modules/extensions/libshadow_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/modules/libexa_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/modules/libfb_g.a -unknown- debuglib,xorg +# $NetBSD: md.evbarm,v 1.9 2015/08/24 09:49:08 martin Exp $ +./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,obsolete +./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg,obsolete +./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg,obsolete +./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown- debuglib,xorg,obsolete +./usr/X11R7/lib/modules/extensions/libglx_g.a -unknown- debuglib,xorg,obsolete +./usr/X11R7/lib/modules/extensions/librecord_g.a -unknown- debuglib,xorg,obsolete +./usr/X11R7/lib/modules/extensions/libshadow_g.a -unknown- debuglib,xorg,obsolete +./usr/X11R7/lib/modules/libexa_g.a -unknown- debuglib,xorg,obsolete +./usr/X11R7/lib/modules/libfb_g.a -unknown- debuglib,xorg,obsolete ./usr/X11R7/lib/modules/libi2c_g.a -unknown- debuglib,xorg,obsolete -./usr/X11R7/lib/modules/libshadowfb_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/modules/libvbe_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/modules/libvgahw_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/modules/libxaa_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/libshadowfb_g.a -unknown- debuglib,xorg,obsolete +./usr/X11R7/lib/modules/libvbe_g.a -unknown- debuglib,xorg,obsolete +./usr/X11R7/lib/modules/libvgahw_g.a -unknown- debuglib,xorg,obsolete +./usr/X11R7/lib/modules/libxaa_g.a -unknown- debuglib,xorg,obsolete ./usr/X11R7/lib/modules/libxf8_16bpp_g.a -unknown- obsolete ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/bin/cvt.debug -unknown- xorg,debug
Re: CVS commit: src/sys
Hi,
On 2015/08/24 18:24, Nick Hudson wrote:
On 08/24/15 09:36, Kengo NAKAHARA wrote:
Hi,
On 2015/08/24 16:18, Nick Hudson wrote:
+__weak_alias(interrupt_construct_intrids, eopnotsupp);
I found this by running sysctl -A on an evbarm platform
Sorry, some interrupt_* stub functions are incorrect.
Could you try below patch?
...
It works, but I don't think enomem is the function name here. nullret?
As you indicated, I also think enomem() is not suitable for this function.
It does not return ENOMEM different from enodev(), enxio(), enoioctl()
and so on.
The improved patch is here.
diff --git a/sys/kern/kern_stub.c b/sys/kern/kern_stub.c
index da6377f..9bd79a8 100644
--- a/sys/kern/kern_stub.c
+++ b/sys/kern/kern_stub.c
@@ -147,12 +147,12 @@ __weak_alias(userconf_prompt, voidop);
__weak_alias(kobj_renamespace, nullop);
-__weak_alias(interrupt_get_count, eopnotsupp);
-__weak_alias(interrupt_get_assigned, eopnotsupp);
-__weak_alias(interrupt_get_available, eopnotsupp);
-__weak_alias(interrupt_get_devname, eopnotsupp);
-__weak_alias(interrupt_construct_intrids, eopnotsupp);
-__weak_alias(interrupt_destruct_intrids, eopnotsupp);
+__weak_alias(interrupt_get_count, nullop);
+__weak_alias(interrupt_get_assigned, voidop);
+__weak_alias(interrupt_get_available, voidop);
+__weak_alias(interrupt_get_devname, voidop);
+__weak_alias(interrupt_construct_intrids, nullret);
+__weak_alias(interrupt_destruct_intrids, voidop);
__weak_alias(interrupt_distribute, eopnotsupp);
__weak_alias(interrupt_distribute_handler, eopnotsupp);
@@ -284,6 +284,16 @@ nullop(void *v)
return (0);
}
+/*
+ * Generic null operation, always returns null.
+ */
+void *
+nullret(void)
+{
+
+ return (NULL);
+}
+
bool
default_bus_space_handle_is_equal(bus_space_tag_t t,
bus_space_handle_t h1, bus_space_handle_t h2)
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 1778af6..ac65c8b 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -164,6 +164,7 @@ extern void (*v_putc)(int); /* Virtual console putc routine
*/
*/
void voidop(void);
intnullop(void *);
+void* nullret(void);
intenodev(void);
intenosys(void);
intenoioctl(void);
If there is no issue, should I commit above patch?
Thanks,
--
//
Internet Initiative Japan Inc.
Device Engineering Section,
Core Product Development Department,
Product Division,
Technology Unit
Kengo NAKAHARA k-nakah...@iij.ad.jp
CVS commit: src/sys/net80211
Module Name:src Committed By: pooka Date: Mon Aug 24 20:58:47 UTC 2015 Modified Files: src/sys/net80211: ieee80211_amrr.c Log Message: + include opt_inet.h for INET (or lack thereof) + include net/in_ether.h, not netinet/in_ether.h (did not cause a meltdown only because opt_inet.h was missing) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/net80211/ieee80211_amrr.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/net80211/ieee80211_amrr.c diff -u src/sys/net80211/ieee80211_amrr.c:1.2 src/sys/net80211/ieee80211_amrr.c:1.3 --- src/sys/net80211/ieee80211_amrr.c:1.2 Tue Dec 11 12:40:10 2007 +++ src/sys/net80211/ieee80211_amrr.c Mon Aug 24 20:58:47 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ieee80211_amrr.c,v 1.2 2007/12/11 12:40:10 lukem Exp $ */ +/* $NetBSD: ieee80211_amrr.c,v 1.3 2015/08/24 20:58:47 pooka Exp $ */ /* $OpenBSD: ieee80211_amrr.c,v 1.1 2006/06/17 19:07:19 damien Exp $ */ /*- @@ -19,7 +19,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ieee80211_amrr.c,v 1.2 2007/12/11 12:40:10 lukem Exp $); +__KERNEL_RCSID(0, $NetBSD: ieee80211_amrr.c,v 1.3 2015/08/24 20:58:47 pooka Exp $); + +#ifdef _KERNEL_OPT +#include opt_inet.h +#endif #include sys/param.h #include sys/kernel.h @@ -27,11 +31,11 @@ __KERNEL_RCSID(0, $NetBSD: ieee80211_am #include sys/sysctl.h #include net/if.h +#include net/if_ether.h #include net/if_media.h #ifdef INET #include netinet/in.h -#include netinet/if_ether.h #endif #include net80211/ieee80211.h
CVS commit: src/sys/net80211
Module Name:src Committed By: pooka Date: Mon Aug 24 20:58:47 UTC 2015 Modified Files: src/sys/net80211: ieee80211_amrr.c Log Message: + include opt_inet.h for INET (or lack thereof) + include net/in_ether.h, not netinet/in_ether.h (did not cause a meltdown only because opt_inet.h was missing) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/net80211/ieee80211_amrr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Mon Aug 24 22:25:50 UTC 2015 Modified Files: src/sys/rump/include/opt: opt_rumpkernel.h Removed Files: src/sys/rump/librump/rumpkern/opt: rnd.h src/sys/rump/librump/rumpnet/opt: opt_atalk.h opt_dccp.h opt_inet.h opt_inet6.h opt_mbuftrace.h opt_natm.h opt_pipe.h opt_route.h opt_sb_max.h opt_sock_counters.h opt_somaxkva.h opt_sosend_loan.h src/sys/rump/net/lib/libnet/opt: opt_mpls.h opt_net_mpsafe.h opt_pfil_hooks.h opt_pppoe.h opt_route.h src/sys/rump/net/lib/libnetinet/opt: opt_eon.h opt_gateway.h opt_inet_conf.h opt_inet_csum.h opt_ipsec.h opt_mrouting.h opt_pim.h opt_tcp_compat_42.h opt_tcp_congctl.h opt_tcp_debug.h opt_tcp_space.h opt_wlan.h rnd.h Log Message: Remove a bunch of opt files. It's a cute idea to have component-specific opt files, but also a completely stupid one since there's no way of knowing how options transcend component boundaries, and therefore if a set of options is conflicting or not. So, just continue concentrating all of opt_foo.h in opt_rumpkernel.h in accordance with the monolithic opt model. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/opt/opt_rumpkernel.h cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpkern/opt/rnd.h cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpnet/opt/opt_atalk.h \ src/sys/rump/librump/rumpnet/opt/opt_dccp.h \ src/sys/rump/librump/rumpnet/opt/opt_inet6.h \ src/sys/rump/librump/rumpnet/opt/opt_mbuftrace.h \ src/sys/rump/librump/rumpnet/opt/opt_natm.h \ src/sys/rump/librump/rumpnet/opt/opt_pipe.h \ src/sys/rump/librump/rumpnet/opt/opt_route.h \ src/sys/rump/librump/rumpnet/opt/opt_sb_max.h \ src/sys/rump/librump/rumpnet/opt/opt_sock_counters.h \ src/sys/rump/librump/rumpnet/opt/opt_somaxkva.h \ src/sys/rump/librump/rumpnet/opt/opt_sosend_loan.h cvs rdiff -u -r1.4 -r0 src/sys/rump/librump/rumpnet/opt/opt_inet.h cvs rdiff -u -r1.3 -r0 src/sys/rump/net/lib/libnet/opt/opt_mpls.h cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnet/opt/opt_net_mpsafe.h \ src/sys/rump/net/lib/libnet/opt/opt_pfil_hooks.h \ src/sys/rump/net/lib/libnet/opt/opt_pppoe.h \ src/sys/rump/net/lib/libnet/opt/opt_route.h cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnetinet/opt/opt_eon.h \ src/sys/rump/net/lib/libnetinet/opt/opt_gateway.h \ src/sys/rump/net/lib/libnetinet/opt/opt_inet_conf.h \ src/sys/rump/net/lib/libnetinet/opt/opt_inet_csum.h \ src/sys/rump/net/lib/libnetinet/opt/opt_ipsec.h \ src/sys/rump/net/lib/libnetinet/opt/opt_mrouting.h \ src/sys/rump/net/lib/libnetinet/opt/opt_pim.h \ src/sys/rump/net/lib/libnetinet/opt/opt_tcp_compat_42.h \ src/sys/rump/net/lib/libnetinet/opt/opt_tcp_congctl.h \ src/sys/rump/net/lib/libnetinet/opt/opt_tcp_debug.h \ src/sys/rump/net/lib/libnetinet/opt/opt_tcp_space.h \ src/sys/rump/net/lib/libnetinet/opt/opt_wlan.h \ src/sys/rump/net/lib/libnetinet/opt/rnd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/include/opt/opt_rumpkernel.h diff -u src/sys/rump/include/opt/opt_rumpkernel.h:1.1 src/sys/rump/include/opt/opt_rumpkernel.h:1.2 --- src/sys/rump/include/opt/opt_rumpkernel.h:1.1 Fri Aug 21 12:39:07 2015 +++ src/sys/rump/include/opt/opt_rumpkernel.h Mon Aug 24 22:25:50 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: opt_rumpkernel.h,v 1.1 2015/08/21 12:39:07 pooka Exp $ */ +/* $NetBSD: opt_rumpkernel.h,v 1.2 2015/08/24 22:25:50 pooka Exp $ */ #ifndef __NetBSD__ #define __NetBSD__ @@ -12,3 +12,14 @@ #define MAXUSERS 32 #define DEBUGPRINT + +#define INET 1 +#define INET6 1 +#define GATEWAY 1 + +#define MPLS 1 + +#define SOSEND_NO_LOAN + +#undef PIPE_SOCKETPAIR /* would need uipc_usrreq.c */ +#define PIPE_NODIRECT
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Mon Aug 24 22:25:50 UTC 2015 Modified Files: src/sys/rump/include/opt: opt_rumpkernel.h Removed Files: src/sys/rump/librump/rumpkern/opt: rnd.h src/sys/rump/librump/rumpnet/opt: opt_atalk.h opt_dccp.h opt_inet.h opt_inet6.h opt_mbuftrace.h opt_natm.h opt_pipe.h opt_route.h opt_sb_max.h opt_sock_counters.h opt_somaxkva.h opt_sosend_loan.h src/sys/rump/net/lib/libnet/opt: opt_mpls.h opt_net_mpsafe.h opt_pfil_hooks.h opt_pppoe.h opt_route.h src/sys/rump/net/lib/libnetinet/opt: opt_eon.h opt_gateway.h opt_inet_conf.h opt_inet_csum.h opt_ipsec.h opt_mrouting.h opt_pim.h opt_tcp_compat_42.h opt_tcp_congctl.h opt_tcp_debug.h opt_tcp_space.h opt_wlan.h rnd.h Log Message: Remove a bunch of opt files. It's a cute idea to have component-specific opt files, but also a completely stupid one since there's no way of knowing how options transcend component boundaries, and therefore if a set of options is conflicting or not. So, just continue concentrating all of opt_foo.h in opt_rumpkernel.h in accordance with the monolithic opt model. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/opt/opt_rumpkernel.h cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpkern/opt/rnd.h cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpnet/opt/opt_atalk.h \ src/sys/rump/librump/rumpnet/opt/opt_dccp.h \ src/sys/rump/librump/rumpnet/opt/opt_inet6.h \ src/sys/rump/librump/rumpnet/opt/opt_mbuftrace.h \ src/sys/rump/librump/rumpnet/opt/opt_natm.h \ src/sys/rump/librump/rumpnet/opt/opt_pipe.h \ src/sys/rump/librump/rumpnet/opt/opt_route.h \ src/sys/rump/librump/rumpnet/opt/opt_sb_max.h \ src/sys/rump/librump/rumpnet/opt/opt_sock_counters.h \ src/sys/rump/librump/rumpnet/opt/opt_somaxkva.h \ src/sys/rump/librump/rumpnet/opt/opt_sosend_loan.h cvs rdiff -u -r1.4 -r0 src/sys/rump/librump/rumpnet/opt/opt_inet.h cvs rdiff -u -r1.3 -r0 src/sys/rump/net/lib/libnet/opt/opt_mpls.h cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnet/opt/opt_net_mpsafe.h \ src/sys/rump/net/lib/libnet/opt/opt_pfil_hooks.h \ src/sys/rump/net/lib/libnet/opt/opt_pppoe.h \ src/sys/rump/net/lib/libnet/opt/opt_route.h cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnetinet/opt/opt_eon.h \ src/sys/rump/net/lib/libnetinet/opt/opt_gateway.h \ src/sys/rump/net/lib/libnetinet/opt/opt_inet_conf.h \ src/sys/rump/net/lib/libnetinet/opt/opt_inet_csum.h \ src/sys/rump/net/lib/libnetinet/opt/opt_ipsec.h \ src/sys/rump/net/lib/libnetinet/opt/opt_mrouting.h \ src/sys/rump/net/lib/libnetinet/opt/opt_pim.h \ src/sys/rump/net/lib/libnetinet/opt/opt_tcp_compat_42.h \ src/sys/rump/net/lib/libnetinet/opt/opt_tcp_congctl.h \ src/sys/rump/net/lib/libnetinet/opt/opt_tcp_debug.h \ src/sys/rump/net/lib/libnetinet/opt/opt_tcp_space.h \ src/sys/rump/net/lib/libnetinet/opt/opt_wlan.h \ src/sys/rump/net/lib/libnetinet/opt/rnd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Mon Aug 24 22:21:27 UTC 2015 Modified Files: src/sys/kern: uipc_mbuf.c uipc_socket.c uipc_socket2.c uipc_syscalls.c src/sys/net: if_arcsubr.c if_atmsubr.c if_ecosubr.c if_etherip.c if_ethersubr.c if_fddisubr.c if_gif.c if_gre.c if_hippisubr.c if_ieee1394subr.c if_loop.c if_mpls.c if_ppp.c if_pppoe.c if_sl.c if_srt.c if_stf.c if_strip.c if_tokensubr.c if_tun.c ppp_tty.c radix.c route.c rtbl.c slcompress.c src/sys/net/agr: if_agr.c if_agrsubr.c src/sys/net80211: ieee80211.c ieee80211_crypto.c ieee80211_input.c ieee80211_ioctl.c ieee80211_node.c ieee80211_output.c ieee80211_proto.c src/sys/netinet: dccp_cc_sw.c dccp_tcplike.c dccp_tfrc.c dccp_usrreq.c if_arp.c if_atm.c igmp.c in.c in_gif.c in_pcb.c in_proto.c in_selsrc.c ip_carp.c ip_ecn.c ip_encap.c ip_etherip.c ip_icmp.c ip_input.c ip_mroute.c ip_output.c portalgo.c raw_ip.c tcp_congctl.c tcp_debug.c tcp_input.c tcp_output.c tcp_sack.c tcp_subr.c tcp_timer.c tcp_usrreq.c tcp_vtw.c udp_usrreq.c src/sys/netinet6: dccp6_usrreq.c icmp6.c in6.c in6_gif.c in6_pcb.c in6_proto.c in6_src.c ip6_etherip.c ip6_forward.c ip6_input.c ip6_mroute.c ip6_output.c mld6.c nd6.c nd6_nbr.c raw_ip6.c udp6_output.c udp6_usrreq.c src/sys/netmpls: mpls_proto.c mpls_ttl.c mpls_var.h Log Message: sprinkle _KERNEL_OPT To generate a diff of this commit: cvs rdiff -u -r1.162 -r1.163 src/sys/kern/uipc_mbuf.c cvs rdiff -u -r1.245 -r1.246 src/sys/kern/uipc_socket.c cvs rdiff -u -r1.121 -r1.122 src/sys/kern/uipc_socket2.c cvs rdiff -u -r1.179 -r1.180 src/sys/kern/uipc_syscalls.c cvs rdiff -u -r1.67 -r1.68 src/sys/net/if_arcsubr.c cvs rdiff -u -r1.53 -r1.54 src/sys/net/if_atmsubr.c cvs rdiff -u -r1.43 -r1.44 src/sys/net/if_ecosubr.c \ src/sys/net/if_hippisubr.c cvs rdiff -u -r1.36 -r1.37 src/sys/net/if_etherip.c cvs rdiff -u -r1.211 -r1.212 src/sys/net/if_ethersubr.c cvs rdiff -u -r1.92 -r1.93 src/sys/net/if_fddisubr.c cvs rdiff -u -r1.87 -r1.88 src/sys/net/if_gif.c cvs rdiff -u -r1.166 -r1.167 src/sys/net/if_gre.c cvs rdiff -u -r1.49 -r1.50 src/sys/net/if_ieee1394subr.c cvs rdiff -u -r1.82 -r1.83 src/sys/net/if_loop.c cvs rdiff -u -r1.18 -r1.19 src/sys/net/if_mpls.c cvs rdiff -u -r1.148 -r1.149 src/sys/net/if_ppp.c src/sys/net/route.c cvs rdiff -u -r1.103 -r1.104 src/sys/net/if_pppoe.c cvs rdiff -u -r1.120 -r1.121 src/sys/net/if_sl.c cvs rdiff -u -r1.19 -r1.20 src/sys/net/if_srt.c cvs rdiff -u -r1.81 -r1.82 src/sys/net/if_stf.c cvs rdiff -u -r1.100 -r1.101 src/sys/net/if_strip.c cvs rdiff -u -r1.69 -r1.70 src/sys/net/if_tokensubr.c cvs rdiff -u -r1.122 -r1.123 src/sys/net/if_tun.c cvs rdiff -u -r1.58 -r1.59 src/sys/net/ppp_tty.c cvs rdiff -u -r1.44 -r1.45 src/sys/net/radix.c cvs rdiff -u -r1.1 -r1.2 src/sys/net/rtbl.c cvs rdiff -u -r1.38 -r1.39 src/sys/net/slcompress.c cvs rdiff -u -r1.32 -r1.33 src/sys/net/agr/if_agr.c cvs rdiff -u -r1.9 -r1.10 src/sys/net/agr/if_agrsubr.c cvs rdiff -u -r1.55 -r1.56 src/sys/net80211/ieee80211.c cvs rdiff -u -r1.16 -r1.17 src/sys/net80211/ieee80211_crypto.c cvs rdiff -u -r1.78 -r1.79 src/sys/net80211/ieee80211_input.c cvs rdiff -u -r1.59 -r1.60 src/sys/net80211/ieee80211_ioctl.c cvs rdiff -u -r1.68 -r1.69 src/sys/net80211/ieee80211_node.c cvs rdiff -u -r1.52 -r1.53 src/sys/net80211/ieee80211_output.c cvs rdiff -u -r1.30 -r1.31 src/sys/net80211/ieee80211_proto.c cvs rdiff -u -r1.1 -r1.2 src/sys/netinet/dccp_cc_sw.c \ src/sys/netinet/dccp_tcplike.c src/sys/netinet/dccp_tfrc.c cvs rdiff -u -r1.6 -r1.7 src/sys/netinet/dccp_usrreq.c cvs rdiff -u -r1.172 -r1.173 src/sys/netinet/if_arp.c cvs rdiff -u -r1.35 -r1.36 src/sys/netinet/if_atm.c cvs rdiff -u -r1.55 -r1.56 src/sys/netinet/igmp.c cvs rdiff -u -r1.156 -r1.157 src/sys/netinet/in.c cvs rdiff -u -r1.64 -r1.65 src/sys/netinet/in_gif.c cvs rdiff -u -r1.161 -r1.162 src/sys/netinet/in_pcb.c cvs rdiff -u -r1.112 -r1.113 src/sys/netinet/in_proto.c cvs rdiff -u -r1.13 -r1.14 src/sys/netinet/in_selsrc.c \ src/sys/netinet/tcp_vtw.c cvs rdiff -u -r1.61 -r1.62 src/sys/netinet/ip_carp.c cvs rdiff -u -r1.15 -r1.16 src/sys/netinet/ip_ecn.c cvs rdiff -u -r1.45 -r1.46 src/sys/netinet/ip_encap.c cvs rdiff -u -r1.14 -r1.15 src/sys/netinet/ip_etherip.c cvs rdiff -u -r1.140 -r1.141 src/sys/netinet/ip_icmp.c cvs rdiff -u -r1.323 -r1.324 src/sys/netinet/ip_input.c cvs rdiff -u -r1.131 -r1.132 src/sys/netinet/ip_mroute.c cvs rdiff -u -r1.245 -r1.246 src/sys/netinet/ip_output.c cvs rdiff -u -r1.8 -r1.9 src/sys/netinet/portalgo.c cvs rdiff -u -r1.152 -r1.153 src/sys/netinet/raw_ip.c cvs rdiff -u -r1.19 -r1.20 src/sys/netinet/tcp_congctl.c cvs rdiff -u -r1.28 -r1.29 src/sys/netinet/tcp_debug.c cvs rdiff -u -r1.343 -r1.344 src/sys/netinet/tcp_input.c cvs rdiff -u -r1.184 -r1.185 src/sys/netinet/tcp_output.c cvs rdiff -u -r1.31 -r1.32
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Mon Aug 24 23:01:59 UTC 2015
Modified Files:
src/sys/rump/dev/lib: Makefile.inc
src/sys/rump/dev/lib/libsysmon: Makefile
src/sys/rump/dev/lib/libusb: Makefile
src/sys/rump/dev/lib/libwscons: Makefile
Added Files:
src/sys/rump/include/opt: sysmon_envsys.h sysmon_power.h sysmon_wdog.h
wsdisplay.h wskbd.h wsmouse.h wsmux.h
Removed Files:
src/sys/rump/dev/lib/libsysmon/opt: sysmon_envsys.h sysmon_power.h
sysmon_wdog.h
src/sys/rump/dev/lib/libusb/opt: opt_usb.h opt_usbverbose.h
src/sys/rump/dev/lib/libwscons/opt: opt_wsdisplay_compat.h wsdisplay.h
wskbd.h wsmouse.h wsmux.h
src/sys/rump/librump/rumpdev/opt: wsdisplay.h
Log Message:
continue consolidating non-modular option files
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libsysmon/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libsysmon/opt/sysmon_envsys.h \
src/sys/rump/dev/lib/libsysmon/opt/sysmon_power.h \
src/sys/rump/dev/lib/libsysmon/opt/sysmon_wdog.h
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/dev/lib/libusb/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libusb/opt/opt_usb.h \
src/sys/rump/dev/lib/libusb/opt/opt_usbverbose.h
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libwscons/Makefile
cvs rdiff -u -r1.1 -r0 \
src/sys/rump/dev/lib/libwscons/opt/opt_wsdisplay_compat.h \
src/sys/rump/dev/lib/libwscons/opt/wskbd.h \
src/sys/rump/dev/lib/libwscons/opt/wsmouse.h \
src/sys/rump/dev/lib/libwscons/opt/wsmux.h
cvs rdiff -u -r1.2 -r0 src/sys/rump/dev/lib/libwscons/opt/wsdisplay.h
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/sysmon_envsys.h \
src/sys/rump/include/opt/sysmon_power.h \
src/sys/rump/include/opt/sysmon_wdog.h \
src/sys/rump/include/opt/wsdisplay.h src/sys/rump/include/opt/wskbd.h \
src/sys/rump/include/opt/wsmouse.h src/sys/rump/include/opt/wsmux.h
cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpdev/opt/wsdisplay.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/Makefile.inc
diff -u src/sys/rump/dev/lib/Makefile.inc:1.3 src/sys/rump/dev/lib/Makefile.inc:1.4
--- src/sys/rump/dev/lib/Makefile.inc:1.3 Mon Mar 1 13:12:19 2010
+++ src/sys/rump/dev/lib/Makefile.inc Mon Aug 24 23:01:58 2015
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.3 2010/03/01 13:12:19 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.4 2015/08/24 23:01:58 pooka Exp $
#
RUMPTOP= ${.CURDIR}/../../..
-CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpdev \
- -I${RUMPTOP}/librump/rumpdev/opt
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpdev
.include ${RUMPTOP}/Makefile.rump
Index: src/sys/rump/dev/lib/libsysmon/Makefile
diff -u src/sys/rump/dev/lib/libsysmon/Makefile:1.6 src/sys/rump/dev/lib/libsysmon/Makefile:1.7
--- src/sys/rump/dev/lib/libsysmon/Makefile:1.6 Thu Mar 13 01:47:07 2014
+++ src/sys/rump/dev/lib/libsysmon/Makefile Mon Aug 24 23:01:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/03/13 01:47:07 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2015/08/24 23:01:58 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/sysmon
@@ -12,7 +12,7 @@ SRCS= sysmon_taskq.c sysmon_power.c sysm
SRCS+= sysmon_component.c
-CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs -I${.CURDIR}/opt
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
.include bsd.lib.mk
.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libusb/Makefile
diff -u src/sys/rump/dev/lib/libusb/Makefile:1.7 src/sys/rump/dev/lib/libusb/Makefile:1.8
--- src/sys/rump/dev/lib/libusb/Makefile:1.7 Wed May 20 11:53:08 2015
+++ src/sys/rump/dev/lib/libusb/Makefile Mon Aug 24 23:01:59 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/05/20 11:53:08 pooka Exp $
+# $NetBSD: Makefile,v 1.8 2015/08/24 23:01:59 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb
@@ -17,7 +17,5 @@ SRCS= dummy.c
#CPPFLAGS+= -DUHUB_DEBUG
-CPPFLAGS+= -I${.CURDIR}/opt
-
.include bsd.lib.mk
.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libwscons/Makefile
diff -u src/sys/rump/dev/lib/libwscons/Makefile:1.4 src/sys/rump/dev/lib/libwscons/Makefile:1.5
--- src/sys/rump/dev/lib/libwscons/Makefile:1.4 Thu Mar 13 01:48:08 2014
+++ src/sys/rump/dev/lib/libwscons/Makefile Mon Aug 24 23:01:59 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/03/13 01:48:08 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2015/08/24 23:01:59 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/wscons
@@ -10,7 +10,7 @@ SRCS= wsevent.c wskbd.c wskbdutil.c ws
SRCS+= wscons_component.c
-CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs -I${.CURDIR}/opt
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
.include bsd.lib.mk
.include bsd.klinks.mk
Added files:
Index: src/sys/rump/include/opt/sysmon_envsys.h
diff -u /dev/null
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Mon Aug 24 23:01:59 UTC 2015 Modified Files: src/sys/rump/dev/lib: Makefile.inc src/sys/rump/dev/lib/libsysmon: Makefile src/sys/rump/dev/lib/libusb: Makefile src/sys/rump/dev/lib/libwscons: Makefile Added Files: src/sys/rump/include/opt: sysmon_envsys.h sysmon_power.h sysmon_wdog.h wsdisplay.h wskbd.h wsmouse.h wsmux.h Removed Files: src/sys/rump/dev/lib/libsysmon/opt: sysmon_envsys.h sysmon_power.h sysmon_wdog.h src/sys/rump/dev/lib/libusb/opt: opt_usb.h opt_usbverbose.h src/sys/rump/dev/lib/libwscons/opt: opt_wsdisplay_compat.h wsdisplay.h wskbd.h wsmouse.h wsmux.h src/sys/rump/librump/rumpdev/opt: wsdisplay.h Log Message: continue consolidating non-modular option files To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/Makefile.inc cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libsysmon/Makefile cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libsysmon/opt/sysmon_envsys.h \ src/sys/rump/dev/lib/libsysmon/opt/sysmon_power.h \ src/sys/rump/dev/lib/libsysmon/opt/sysmon_wdog.h cvs rdiff -u -r1.7 -r1.8 src/sys/rump/dev/lib/libusb/Makefile cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libusb/opt/opt_usb.h \ src/sys/rump/dev/lib/libusb/opt/opt_usbverbose.h cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libwscons/Makefile cvs rdiff -u -r1.1 -r0 \ src/sys/rump/dev/lib/libwscons/opt/opt_wsdisplay_compat.h \ src/sys/rump/dev/lib/libwscons/opt/wskbd.h \ src/sys/rump/dev/lib/libwscons/opt/wsmouse.h \ src/sys/rump/dev/lib/libwscons/opt/wsmux.h cvs rdiff -u -r1.2 -r0 src/sys/rump/dev/lib/libwscons/opt/wsdisplay.h cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/sysmon_envsys.h \ src/sys/rump/include/opt/sysmon_power.h \ src/sys/rump/include/opt/sysmon_wdog.h \ src/sys/rump/include/opt/wsdisplay.h src/sys/rump/include/opt/wskbd.h \ src/sys/rump/include/opt/wsmouse.h src/sys/rump/include/opt/wsmux.h cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpdev/opt/wsdisplay.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: pooka Date: Mon Aug 24 23:13:15 UTC 2015 Modified Files: src/sys/dev/scsipi: if_se.c scsipi_base.c sd.c sdvar.h ses.c st.c st_atapi.c st_scsi.c Log Message: would you like some freshly ground _KERNEL_OPT with that? yes? excellent choice, sir/madam. To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/sys/dev/scsipi/if_se.c cvs rdiff -u -r1.164 -r1.165 src/sys/dev/scsipi/scsipi_base.c cvs rdiff -u -r1.316 -r1.317 src/sys/dev/scsipi/sd.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/scsipi/sdvar.h \ src/sys/dev/scsipi/st_scsi.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/scsipi/ses.c cvs rdiff -u -r1.226 -r1.227 src/sys/dev/scsipi/st.c cvs rdiff -u -r1.29 -r1.30 src/sys/dev/scsipi/st_atapi.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/if_se.c diff -u src/sys/dev/scsipi/if_se.c:1.87 src/sys/dev/scsipi/if_se.c:1.88 --- src/sys/dev/scsipi/if_se.c:1.87 Fri Jul 25 08:10:38 2014 +++ src/sys/dev/scsipi/if_se.c Mon Aug 24 23:13:15 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_se.c,v 1.87 2014/07/25 08:10:38 dholland Exp $ */ +/* $NetBSD: if_se.c,v 1.88 2015/08/24 23:13:15 pooka Exp $ */ /* * Copyright (c) 1997 Ian W. Dall ian.d...@dsto.defence.gov.au @@ -59,10 +59,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_se.c,v 1.87 2014/07/25 08:10:38 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: if_se.c,v 1.88 2015/08/24 23:13:15 pooka Exp $); +#ifdef _KERNEL_OPT #include opt_inet.h #include opt_atalk.h +#endif #include sys/param.h #include sys/systm.h Index: src/sys/dev/scsipi/scsipi_base.c diff -u src/sys/dev/scsipi/scsipi_base.c:1.164 src/sys/dev/scsipi/scsipi_base.c:1.165 --- src/sys/dev/scsipi/scsipi_base.c:1.164 Tue Nov 18 17:03:41 2014 +++ src/sys/dev/scsipi/scsipi_base.c Mon Aug 24 23:13:15 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: scsipi_base.c,v 1.164 2014/11/18 17:03:41 joerg Exp $ */ +/* $NetBSD: scsipi_base.c,v 1.165 2015/08/24 23:13:15 pooka Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc. @@ -31,9 +31,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: scsipi_base.c,v 1.164 2014/11/18 17:03:41 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: scsipi_base.c,v 1.165 2015/08/24 23:13:15 pooka Exp $); +#ifdef _KERNEL_OPT #include opt_scsi.h +#endif #include sys/param.h #include sys/systm.h Index: src/sys/dev/scsipi/sd.c diff -u src/sys/dev/scsipi/sd.c:1.316 src/sys/dev/scsipi/sd.c:1.317 --- src/sys/dev/scsipi/sd.c:1.316 Sun Apr 26 15:15:20 2015 +++ src/sys/dev/scsipi/sd.c Mon Aug 24 23:13:15 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sd.c,v 1.316 2015/04/26 15:15:20 mlelstv Exp $ */ +/* $NetBSD: sd.c,v 1.317 2015/08/24 23:13:15 pooka Exp $ */ /*- * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc. @@ -47,9 +47,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sd.c,v 1.316 2015/04/26 15:15:20 mlelstv Exp $); +__KERNEL_RCSID(0, $NetBSD: sd.c,v 1.317 2015/08/24 23:13:15 pooka Exp $); +#ifdef _KERNEL_OPT #include opt_scsi.h +#endif #include sys/param.h #include sys/systm.h Index: src/sys/dev/scsipi/sdvar.h diff -u src/sys/dev/scsipi/sdvar.h:1.36 src/sys/dev/scsipi/sdvar.h:1.37 --- src/sys/dev/scsipi/sdvar.h:1.36 Mon Apr 13 16:33:25 2015 +++ src/sys/dev/scsipi/sdvar.h Mon Aug 24 23:13:15 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sdvar.h,v 1.36 2015/04/13 16:33:25 riastradh Exp $ */ +/* $NetBSD: sdvar.h,v 1.37 2015/08/24 23:13:15 pooka Exp $ */ /*- * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -49,7 +49,9 @@ #ifndef _DEV_SCSIPI_SDVAR_H_ #define _DEV_SCSIPI_SDVAR_H_ +#ifdef _KERNEL_OPT #include opt_scsi.h +#endif #include sys/rndsource.h Index: src/sys/dev/scsipi/st_scsi.c diff -u src/sys/dev/scsipi/st_scsi.c:1.36 src/sys/dev/scsipi/st_scsi.c:1.37 --- src/sys/dev/scsipi/st_scsi.c:1.36 Sat Oct 18 08:33:28 2014 +++ src/sys/dev/scsipi/st_scsi.c Mon Aug 24 23:13:15 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: st_scsi.c,v 1.36 2014/10/18 08:33:28 snj Exp $ */ +/* $NetBSD: st_scsi.c,v 1.37 2015/08/24 23:13:15 pooka Exp $ */ /*- * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -50,9 +50,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: st_scsi.c,v 1.36 2014/10/18 08:33:28 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: st_scsi.c,v 1.37 2015/08/24 23:13:15 pooka Exp $); +#ifdef _KERNEL_OPT #include opt_scsi.h +#endif #include sys/param.h #include sys/device.h Index: src/sys/dev/scsipi/ses.c diff -u src/sys/dev/scsipi/ses.c:1.47 src/sys/dev/scsipi/ses.c:1.48 --- src/sys/dev/scsipi/ses.c:1.47 Fri Jul 25 08:10:38 2014 +++ src/sys/dev/scsipi/ses.c Mon Aug 24 23:13:15 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ses.c,v 1.47 2014/07/25 08:10:38 dholland Exp $ */ +/* $NetBSD: ses.c,v 1.48 2015/08/24 23:13:15 pooka Exp $ */ /* * Copyright (C) 2000 National Aeronautics Space Administration * All rights reserved. @@ -26,9
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: pooka Date: Mon Aug 24 23:13:15 UTC 2015 Modified Files: src/sys/dev/scsipi: if_se.c scsipi_base.c sd.c sdvar.h ses.c st.c st_atapi.c st_scsi.c Log Message: would you like some freshly ground _KERNEL_OPT with that? yes? excellent choice, sir/madam. To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/sys/dev/scsipi/if_se.c cvs rdiff -u -r1.164 -r1.165 src/sys/dev/scsipi/scsipi_base.c cvs rdiff -u -r1.316 -r1.317 src/sys/dev/scsipi/sd.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/scsipi/sdvar.h \ src/sys/dev/scsipi/st_scsi.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/scsipi/ses.c cvs rdiff -u -r1.226 -r1.227 src/sys/dev/scsipi/st.c cvs rdiff -u -r1.29 -r1.30 src/sys/dev/scsipi/st_atapi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Mon Aug 24 23:21:51 UTC 2015 Modified Files: src/sys/rump/dev/lib/libmiiphy: Makefile src/sys/rump/dev/lib/libpci: Makefile src/sys/rump/dev/lib/libpci_usbhc: Makefile src/sys/rump/dev/lib/libscsipi: Makefile src/sys/rump/dev/lib/libumass: Makefile Added Files: src/sys/rump/include/opt: atapibus.h scsibus.h wd.h Removed Files: src/sys/rump/dev/lib/libmiiphy/opt: opt_mii.h src/sys/rump/dev/lib/libpci/opt: opt_pci.h opt_pciide.h src/sys/rump/dev/lib/libscsipi/opt: atapibus.h opt_compat_freebsd.h opt_scsi.h scsibus.h wd.h Log Message: opt files were nop't To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libmiiphy/Makefile cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libmiiphy/opt/opt_mii.h cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libpci/Makefile cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci/opt/opt_pci.h \ src/sys/rump/dev/lib/libpci/opt/opt_pciide.h cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libpci_usbhc/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libscsipi/Makefile cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libscsipi/opt/atapibus.h \ src/sys/rump/dev/lib/libscsipi/opt/opt_compat_freebsd.h \ src/sys/rump/dev/lib/libscsipi/opt/opt_scsi.h \ src/sys/rump/dev/lib/libscsipi/opt/scsibus.h \ src/sys/rump/dev/lib/libscsipi/opt/wd.h cvs rdiff -u -r1.8 -r1.9 src/sys/rump/dev/lib/libumass/Makefile cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/atapibus.h \ src/sys/rump/include/opt/scsibus.h src/sys/rump/include/opt/wd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Mon Aug 24 23:21:51 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libmiiphy: Makefile
src/sys/rump/dev/lib/libpci: Makefile
src/sys/rump/dev/lib/libpci_usbhc: Makefile
src/sys/rump/dev/lib/libscsipi: Makefile
src/sys/rump/dev/lib/libumass: Makefile
Added Files:
src/sys/rump/include/opt: atapibus.h scsibus.h wd.h
Removed Files:
src/sys/rump/dev/lib/libmiiphy/opt: opt_mii.h
src/sys/rump/dev/lib/libpci/opt: opt_pci.h opt_pciide.h
src/sys/rump/dev/lib/libscsipi/opt: atapibus.h opt_compat_freebsd.h
opt_scsi.h scsibus.h wd.h
Log Message:
opt files were nop't
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libmiiphy/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libmiiphy/opt/opt_mii.h
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libpci/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci/opt/opt_pci.h \
src/sys/rump/dev/lib/libpci/opt/opt_pciide.h
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libpci_usbhc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libscsipi/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libscsipi/opt/atapibus.h \
src/sys/rump/dev/lib/libscsipi/opt/opt_compat_freebsd.h \
src/sys/rump/dev/lib/libscsipi/opt/opt_scsi.h \
src/sys/rump/dev/lib/libscsipi/opt/scsibus.h \
src/sys/rump/dev/lib/libscsipi/opt/wd.h
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/dev/lib/libumass/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/atapibus.h \
src/sys/rump/include/opt/scsibus.h src/sys/rump/include/opt/wd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/libmiiphy/Makefile
diff -u src/sys/rump/dev/lib/libmiiphy/Makefile:1.2 src/sys/rump/dev/lib/libmiiphy/Makefile:1.3
--- src/sys/rump/dev/lib/libmiiphy/Makefile:1.2 Mon May 26 19:55:53 2014
+++ src/sys/rump/dev/lib/libmiiphy/Makefile Mon Aug 24 23:21:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/05/26 19:55:53 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/24 23:21:50 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -16,7 +16,7 @@ SRCS+= acphy.c amhphy.c atphy.c bmtphy.c
inphy.c iophy.c lxtphy.c makphy.c nsphy.c nsphyter.c pnaphy.c \
qsphy.c rdcphy.c rgephy.c rlphy.c sqphy.c tlphy.c tqphy.c urlphy.c
-CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${.CURDIR}/opt
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
.include ${RUMPTOP}/Makefile.rump
.include bsd.lib.mk
Index: src/sys/rump/dev/lib/libpci/Makefile
diff -u src/sys/rump/dev/lib/libpci/Makefile:1.6 src/sys/rump/dev/lib/libpci/Makefile:1.7
--- src/sys/rump/dev/lib/libpci/Makefile:1.6 Mon Jun 15 15:38:52 2015
+++ src/sys/rump/dev/lib/libpci/Makefile Mon Aug 24 23:21:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/06/15 15:38:52 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2015/08/24 23:21:50 pooka Exp $
#
RUMPTOP= ${TOPRUMP}
@@ -22,7 +22,7 @@ SRCS+= rumpdev_bus_dma.c
SRCS+= pci_at_mainbus.c
-CPPFLAGS+= -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpkern
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
.if ${RUMP_PCI_IOSPACE:Uno} == yes
Index: src/sys/rump/dev/lib/libpci_usbhc/Makefile
diff -u src/sys/rump/dev/lib/libpci_usbhc/Makefile:1.1 src/sys/rump/dev/lib/libpci_usbhc/Makefile:1.2
--- src/sys/rump/dev/lib/libpci_usbhc/Makefile:1.1 Wed May 20 12:21:38 2015
+++ src/sys/rump/dev/lib/libpci_usbhc/Makefile Mon Aug 24 23:21:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/05/20 12:21:38 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2015/08/24 23:21:51 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -15,7 +15,6 @@ SRCS+= ehci_pci.c ehci.c
SRCS+= usb_pci.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/../dev
-CPPFLAGS+= -I${.CURDIR}/../libusb/opt
.include ${RUMPTOP}/Makefile.rump
.include bsd.lib.mk
Index: src/sys/rump/dev/lib/libscsipi/Makefile
diff -u src/sys/rump/dev/lib/libscsipi/Makefile:1.2 src/sys/rump/dev/lib/libscsipi/Makefile:1.3
--- src/sys/rump/dev/lib/libscsipi/Makefile:1.2 Thu Mar 13 01:58:20 2014
+++ src/sys/rump/dev/lib/libscsipi/Makefile Mon Aug 24 23:21:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/03/13 01:58:20 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/24 23:21:51 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/scsipi
@@ -16,7 +16,7 @@ SRCS+= scsipi_verbose.c
SRCS+= scsipi_component.c
-CPPFLAGS+= -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpvfs
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
.include bsd.lib.mk
.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.8 src/sys/rump/dev/lib/libumass/Makefile:1.9
--- src/sys/rump/dev/lib/libumass/Makefile:1.8 Sat Jun 13 23:33:20 2015
+++ src/sys/rump/dev/lib/libumass/Makefile Mon Aug 24 23:21:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/06/13 23:33:20 pooka
CVS commit: src/sys/dev
Module Name:src
Committed By: pooka
Date: Mon Aug 24 23:55:04 UTC 2015
Modified Files:
src/sys/dev/mii: igphy.c ukphy.c
src/sys/dev/pci: pci.c pci_stub.c pci_usrreq.c pciidevar.h
src/sys/dev/usb: ehci.c
Log Message:
add some _KERNEL_OPT as the finishing touch
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/mii/igphy.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/mii/ukphy.c
cvs rdiff -u -r1.147 -r1.148 src/sys/dev/pci/pci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/pci_stub.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/pci_usrreq.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/pci/pciidevar.h
cvs rdiff -u -r1.243 -r1.244 src/sys/dev/usb/ehci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/igphy.c
diff -u src/sys/dev/mii/igphy.c:1.23 src/sys/dev/mii/igphy.c:1.24
--- src/sys/dev/mii/igphy.c:1.23 Mon Jun 16 16:48:16 2014
+++ src/sys/dev/mii/igphy.c Mon Aug 24 23:55:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: igphy.c,v 1.23 2014/06/16 16:48:16 msaitoh Exp $ */
+/* $NetBSD: igphy.c,v 1.24 2015/08/24 23:55:04 pooka Exp $ */
/*
* The Intel copyright applies to the analog register setup, and the
@@ -70,9 +70,11 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: igphy.c,v 1.23 2014/06/16 16:48:16 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: igphy.c,v 1.24 2015/08/24 23:55:04 pooka Exp $);
+#ifdef _KERNEL_OPT
#include opt_mii.h
+#endif
#include sys/param.h
#include sys/systm.h
Index: src/sys/dev/mii/ukphy.c
diff -u src/sys/dev/mii/ukphy.c:1.46 src/sys/dev/mii/ukphy.c:1.47
--- src/sys/dev/mii/ukphy.c:1.46 Tue Jun 11 16:18:48 2013
+++ src/sys/dev/mii/ukphy.c Mon Aug 24 23:55:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ukphy.c,v 1.46 2013/06/11 16:18:48 msaitoh Exp $ */
+/* $NetBSD: ukphy.c,v 1.47 2015/08/24 23:55:04 pooka Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -59,9 +59,11 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ukphy.c,v 1.46 2013/06/11 16:18:48 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: ukphy.c,v 1.47 2015/08/24 23:55:04 pooka Exp $);
+#ifdef _KERNEL_OPT
#include opt_mii.h
+#endif
#include sys/param.h
#include sys/systm.h
Index: src/sys/dev/pci/pci.c
diff -u src/sys/dev/pci/pci.c:1.147 src/sys/dev/pci/pci.c:1.148
--- src/sys/dev/pci/pci.c:1.147 Thu Aug 13 04:39:33 2015
+++ src/sys/dev/pci/pci.c Mon Aug 24 23:55:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.c,v 1.147 2015/08/13 04:39:33 msaitoh Exp $ */
+/* $NetBSD: pci.c,v 1.148 2015/08/24 23:55:04 pooka Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 1998
@@ -36,9 +36,11 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci.c,v 1.147 2015/08/13 04:39:33 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci.c,v 1.148 2015/08/24 23:55:04 pooka Exp $);
+#ifdef _KERNEL_OPT
#include opt_pci.h
+#endif
#include sys/param.h
#include sys/malloc.h
Index: src/sys/dev/pci/pci_stub.c
diff -u src/sys/dev/pci/pci_stub.c:1.2 src/sys/dev/pci/pci_stub.c:1.3
--- src/sys/dev/pci/pci_stub.c:1.2 Mon Aug 17 06:16:03 2015
+++ src/sys/dev/pci/pci_stub.c Mon Aug 24 23:55:04 2015
@@ -1,7 +1,9 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_stub.c,v 1.2 2015/08/17 06:16:03 knakahara Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_stub.c,v 1.3 2015/08/24 23:55:04 pooka Exp $);
+#ifdef _KERNEL_OPT
#include opt_pci.h
+#endif
#include sys/param.h
#include sys/systm.h
Index: src/sys/dev/pci/pci_usrreq.c
diff -u src/sys/dev/pci/pci_usrreq.c:1.28 src/sys/dev/pci/pci_usrreq.c:1.29
--- src/sys/dev/pci/pci_usrreq.c:1.28 Fri Jul 25 08:10:38 2014
+++ src/sys/dev/pci/pci_usrreq.c Mon Aug 24 23:55:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_usrreq.c,v 1.28 2014/07/25 08:10:38 dholland Exp $ */
+/* $NetBSD: pci_usrreq.c,v 1.29 2015/08/24 23:55:04 pooka Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,11 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_usrreq.c,v 1.28 2014/07/25 08:10:38 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_usrreq.c,v 1.29 2015/08/24 23:55:04 pooka Exp $);
+
+#ifdef _KERNEL_OPT
+#include opt_pci.h
+#endif
#include sys/param.h
#include sys/conf.h
@@ -56,8 +60,6 @@ __KERNEL_RCSID(0, $NetBSD: pci_usrreq.c
#include dev/pci/pcivar.h
#include dev/pci/pciio.h
-#include opt_pci.h
-
static int
pciopen(dev_t dev, int flags, int mode, struct lwp *l)
{
Index: src/sys/dev/pci/pciidevar.h
diff -u src/sys/dev/pci/pciidevar.h:1.46 src/sys/dev/pci/pciidevar.h:1.47
--- src/sys/dev/pci/pciidevar.h:1.46 Tue Jul 31 15:50:36 2012
+++ src/sys/dev/pci/pciidevar.h Mon Aug 24 23:55:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pciidevar.h,v 1.46 2012/07/31 15:50:36 bouyer Exp $ */
+/* $NetBSD: pciidevar.h,v 1.47 2015/08/24 23:55:04 pooka Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -39,11 +39,14 @@
* Author: Christopher G. Demetriou, March 2, 1998.
*/
+#ifdef
CVS commit: src/sys/dev
Module Name:src Committed By: pooka Date: Mon Aug 24 23:55:04 UTC 2015 Modified Files: src/sys/dev/mii: igphy.c ukphy.c src/sys/dev/pci: pci.c pci_stub.c pci_usrreq.c pciidevar.h src/sys/dev/usb: ehci.c Log Message: add some _KERNEL_OPT as the finishing touch To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/dev/mii/igphy.c cvs rdiff -u -r1.46 -r1.47 src/sys/dev/mii/ukphy.c cvs rdiff -u -r1.147 -r1.148 src/sys/dev/pci/pci.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/pci_stub.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/pci_usrreq.c cvs rdiff -u -r1.46 -r1.47 src/sys/dev/pci/pciidevar.h cvs rdiff -u -r1.243 -r1.244 src/sys/dev/usb/ehci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/fs/lib/libnfs
Module Name:src
Committed By: pooka
Date: Mon Aug 24 23:19:33 UTC 2015
Modified Files:
src/sys/rump/fs/lib/libnfs: Makefile
Log Message:
don't -I imaginary opt directories
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/fs/lib/libnfs/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/rump/fs/lib/libnfs/Makefile
diff -u src/sys/rump/fs/lib/libnfs/Makefile:1.11 src/sys/rump/fs/lib/libnfs/Makefile:1.12
--- src/sys/rump/fs/lib/libnfs/Makefile:1.11 Tue Mar 2 23:37:16 2010
+++ src/sys/rump/fs/lib/libnfs/Makefile Mon Aug 24 23:19:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/03/02 23:37:16 pooka Exp $
+# $NetBSD: Makefile,v 1.12 2015/08/24 23:19:33 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../nfs
@@ -9,8 +9,6 @@ SRCS= krpc_subr.c nfs_bio.c nfs_boot.c n
nfs_socket.c nfs_clntsocket.c nfs_clntsubs.c nfs_subs.c \
nfs_iod.c nfs_vfsops.c nfs_vnops.c nfs_bootdhcp.c nfs_bootparam.c
-CPPFLAGS+= -I${.CURDIR}/../../../net/lib/libnet/opt
-CPPFLAGS+= -I${.CURDIR}/../../../net/lib/libnetinet/opt
CPPFLAGS+= -DNFS_BOOT_DHCP -DNFS_BOOT_BOOTPARAM
.include bsd.lib.mk
CVS commit: src/sys/rump/fs/lib/libnfs
Module Name:src Committed By: pooka Date: Mon Aug 24 23:19:33 UTC 2015 Modified Files: src/sys/rump/fs/lib/libnfs: Makefile Log Message: don't -I imaginary opt directories To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/rump/fs/lib/libnfs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Tue Aug 25 00:08:56 UTC 2015 Modified Files: src/sys/rump/librump/rumpdev: Makefile.rumpdev src/sys/rump/net/lib/libnetinet6: Makefile.inc Log Message: some final -Ifoo/opt removal To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpdev/Makefile.rumpdev cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libnetinet6/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/arp
Module Name:src Committed By: ozaki-r Date: Tue Aug 25 02:24:34 UTC 2015 Modified Files: src/tests/net/arp: t_dad.sh Log Message: Give a chance to send a DAD announce packet ifconfig -w ensures IP addresses have left tentative state, however, it doesn't guarantee that a DAD announce packet is sent. The kernel clears tentative flag and then sends the packet so that ifconfig -w can return before the kernel sends the packet. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/net/arp/t_dad.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/arp/t_dad.sh diff -u src/tests/net/arp/t_dad.sh:1.5 src/tests/net/arp/t_dad.sh:1.6 --- src/tests/net/arp/t_dad.sh:1.5 Mon Aug 24 02:02:25 2015 +++ src/tests/net/arp/t_dad.sh Tue Aug 25 02:24:34 2015 @@ -1,4 +1,4 @@ -# $NetBSD: t_dad.sh,v 1.5 2015/08/24 02:02:25 ozaki-r Exp $ +# $NetBSD: t_dad.sh,v 1.6 2015/08/25 02:24:34 ozaki-r Exp $ # # Copyright (c) 2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -124,6 +124,8 @@ dad_basic_body() # Waiting for DAD complete atf_check -s exit:0 rump.ifconfig -w 10 + # Give a chance to send a DAD announce packet + atf_check -s exit:0 sleep 1 extract_new_packets ./out $DEBUG cat ./out @@ -151,6 +153,8 @@ dad_basic_body() # Waiting for DAD complete atf_check -s exit:0 rump.ifconfig -w 10 + # Give a chance to send a DAD announce packet + atf_check -s exit:0 sleep 1 extract_new_packets ./out $DEBUG cat ./out
CVS commit: src/tests/net/arp
Module Name:src Committed By: ozaki-r Date: Tue Aug 25 02:24:34 UTC 2015 Modified Files: src/tests/net/arp: t_dad.sh Log Message: Give a chance to send a DAD announce packet ifconfig -w ensures IP addresses have left tentative state, however, it doesn't guarantee that a DAD announce packet is sent. The kernel clears tentative flag and then sends the packet so that ifconfig -w can return before the kernel sends the packet. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/net/arp/t_dad.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Mon Aug 24 23:04:43 UTC 2015 Modified Files: src/sys/rump/net/lib/libbridge: Makefile src/sys/rump/net/lib/libnet: Makefile src/sys/rump/net/lib/libnetinet: Makefile.inc src/sys/rump/net/lib/libnetmpls: Makefile src/sys/rump/net/lib/libtap: Makefile Added Files: src/sys/rump/include/opt: agr.h arcnet.h bridge.h carp.h ether.h etherip.h faith.h fddi.h gif.h gre.h pppoe.h token.h vlan.h Removed Files: src/sys/rump/net/lib/libnet/opt: agr.h bridge.h carp.h pppoe.h vlan.h src/sys/rump/net/lib/libnetinet/opt: arcnet.h ether.h etherip.h faith.h fddi.h gif.h gre.h token.h Log Message: purge rump/net of component-specific opt directories To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/agr.h \ src/sys/rump/include/opt/arcnet.h src/sys/rump/include/opt/bridge.h \ src/sys/rump/include/opt/carp.h src/sys/rump/include/opt/ether.h \ src/sys/rump/include/opt/etherip.h src/sys/rump/include/opt/faith.h \ src/sys/rump/include/opt/fddi.h src/sys/rump/include/opt/gif.h \ src/sys/rump/include/opt/gre.h src/sys/rump/include/opt/pppoe.h \ src/sys/rump/include/opt/token.h src/sys/rump/include/opt/vlan.h cvs rdiff -u -r1.3 -r1.4 src/sys/rump/net/lib/libbridge/Makefile cvs rdiff -u -r1.24 -r1.25 src/sys/rump/net/lib/libnet/Makefile cvs rdiff -u -r1.2 -r0 src/sys/rump/net/lib/libnet/opt/agr.h \ src/sys/rump/net/lib/libnet/opt/bridge.h \ src/sys/rump/net/lib/libnet/opt/carp.h cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnet/opt/pppoe.h \ src/sys/rump/net/lib/libnet/opt/vlan.h cvs rdiff -u -r1.12 -r1.13 src/sys/rump/net/lib/libnetinet/Makefile.inc cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnetinet/opt/arcnet.h \ src/sys/rump/net/lib/libnetinet/opt/ether.h \ src/sys/rump/net/lib/libnetinet/opt/etherip.h \ src/sys/rump/net/lib/libnetinet/opt/faith.h \ src/sys/rump/net/lib/libnetinet/opt/fddi.h \ src/sys/rump/net/lib/libnetinet/opt/gif.h \ src/sys/rump/net/lib/libnetinet/opt/gre.h \ src/sys/rump/net/lib/libnetinet/opt/token.h cvs rdiff -u -r1.3 -r1.4 src/sys/rump/net/lib/libnetmpls/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libtap/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Mon Aug 24 23:04:43 UTC 2015
Modified Files:
src/sys/rump/net/lib/libbridge: Makefile
src/sys/rump/net/lib/libnet: Makefile
src/sys/rump/net/lib/libnetinet: Makefile.inc
src/sys/rump/net/lib/libnetmpls: Makefile
src/sys/rump/net/lib/libtap: Makefile
Added Files:
src/sys/rump/include/opt: agr.h arcnet.h bridge.h carp.h ether.h
etherip.h faith.h fddi.h gif.h gre.h pppoe.h token.h vlan.h
Removed Files:
src/sys/rump/net/lib/libnet/opt: agr.h bridge.h carp.h pppoe.h vlan.h
src/sys/rump/net/lib/libnetinet/opt: arcnet.h ether.h etherip.h faith.h
fddi.h gif.h gre.h token.h
Log Message:
purge rump/net of component-specific opt directories
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/agr.h \
src/sys/rump/include/opt/arcnet.h src/sys/rump/include/opt/bridge.h \
src/sys/rump/include/opt/carp.h src/sys/rump/include/opt/ether.h \
src/sys/rump/include/opt/etherip.h src/sys/rump/include/opt/faith.h \
src/sys/rump/include/opt/fddi.h src/sys/rump/include/opt/gif.h \
src/sys/rump/include/opt/gre.h src/sys/rump/include/opt/pppoe.h \
src/sys/rump/include/opt/token.h src/sys/rump/include/opt/vlan.h
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/net/lib/libbridge/Makefile
cvs rdiff -u -r1.24 -r1.25 src/sys/rump/net/lib/libnet/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/rump/net/lib/libnet/opt/agr.h \
src/sys/rump/net/lib/libnet/opt/bridge.h \
src/sys/rump/net/lib/libnet/opt/carp.h
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnet/opt/pppoe.h \
src/sys/rump/net/lib/libnet/opt/vlan.h
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/net/lib/libnetinet/Makefile.inc
cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnetinet/opt/arcnet.h \
src/sys/rump/net/lib/libnetinet/opt/ether.h \
src/sys/rump/net/lib/libnetinet/opt/etherip.h \
src/sys/rump/net/lib/libnetinet/opt/faith.h \
src/sys/rump/net/lib/libnetinet/opt/fddi.h \
src/sys/rump/net/lib/libnetinet/opt/gif.h \
src/sys/rump/net/lib/libnetinet/opt/gre.h \
src/sys/rump/net/lib/libnetinet/opt/token.h
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/net/lib/libnetmpls/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libtap/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/rump/net/lib/libbridge/Makefile
diff -u src/sys/rump/net/lib/libbridge/Makefile:1.3 src/sys/rump/net/lib/libbridge/Makefile:1.4
--- src/sys/rump/net/lib/libbridge/Makefile:1.3 Thu Aug 20 12:20:09 2015
+++ src/sys/rump/net/lib/libbridge/Makefile Mon Aug 24 23:04:42 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/08/20 12:20:09 christos Exp $
+# $NetBSD: Makefile,v 1.4 2015/08/24 23:04:42 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../net
@@ -9,7 +9,5 @@ SRCS= if_bridge.c bridgestp.c
SRCS+= bridge_component.c
-CPPFLAGS+= -I${.CURDIR}/../libnet/opt
-
.include bsd.lib.mk
.include bsd.klinks.mk
Index: src/sys/rump/net/lib/libnet/Makefile
diff -u src/sys/rump/net/lib/libnet/Makefile:1.24 src/sys/rump/net/lib/libnet/Makefile:1.25
--- src/sys/rump/net/lib/libnet/Makefile:1.24 Thu Aug 20 12:20:09 2015
+++ src/sys/rump/net/lib/libnet/Makefile Mon Aug 24 23:04:43 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2015/08/20 12:20:09 christos Exp $
+# $NetBSD: Makefile,v 1.25 2015/08/24 23:04:43 pooka Exp $
#
@@ -18,8 +18,6 @@ SRCS+= net_component.c
SRCS+= rtsock_50.c uipc_syscalls_50.c
.endif
-CPPFLAGS+= -I${.CURDIR}/opt -I${.CURDIR}/../libnetinet/opt
-
.include ${.CURDIR}/../libnetinet/Makefile.inc
.include ${.CURDIR}/../libnetinet6/Makefile.inc
.include ${.CURDIR}/../libnetmpls/Makefile.inc
Index: src/sys/rump/net/lib/libnetinet/Makefile.inc
diff -u src/sys/rump/net/lib/libnetinet/Makefile.inc:1.12 src/sys/rump/net/lib/libnetinet/Makefile.inc:1.13
--- src/sys/rump/net/lib/libnetinet/Makefile.inc:1.12 Sun Jan 18 17:06:24 2015
+++ src/sys/rump/net/lib/libnetinet/Makefile.inc Mon Aug 24 23:04:43 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2015/01/18 17:06:24 justin Exp $
+# $NetBSD: Makefile.inc,v 1.13 2015/08/24 23:04:43 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../netinet
@@ -20,8 +20,6 @@ SRCS+= tcp_congctl.c tcp_input.c tcp_out
# UDP
SRCS+= udp_usrreq.c
-CPPFLAGS+= -I${.CURDIR}/opt -I${.CURDIR}/../libnet/opt
-
CPPFLAGS+= -DPORTALGO_INET4_DEFAULT=PORTALGO_RANDOM_START
# TCP debugging
Index: src/sys/rump/net/lib/libnetmpls/Makefile
diff -u src/sys/rump/net/lib/libnetmpls/Makefile:1.3 src/sys/rump/net/lib/libnetmpls/Makefile:1.4
--- src/sys/rump/net/lib/libnetmpls/Makefile:1.3 Thu Aug 20 12:20:09 2015
+++ src/sys/rump/net/lib/libnetmpls/Makefile Mon Aug 24 23:04:43 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/08/20 12:20:09 christos Exp $
+# $NetBSD: Makefile,v 1.4 2015/08/24 23:04:43 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../net
CVS commit: src/sys/rump/dev/wip
Module Name:src Committed By: pooka Date: Mon Aug 24 23:21:16 UTC 2015 Removed Files: src/sys/rump/dev/wip: Makefile Makefile.inc src/sys/rump/dev/wip/libukbd: Makefile UKBD.ioconf ukbd_at_usb.c src/sys/rump/dev/wip/libums: Makefile UMS.ioconf ums_at_usb.c src/sys/rump/dev/wip/libusbrum: Makefile rum_at_usb.c Log Message: These wip components have been in progress for 5 years. There hasn't been much progress. Let's just kill them, they're not even build-tested. To generate a diff of this commit: cvs rdiff -u -r1.7 -r0 src/sys/rump/dev/wip/Makefile cvs rdiff -u -r1.2 -r0 src/sys/rump/dev/wip/Makefile.inc cvs rdiff -u -r1.4 -r0 src/sys/rump/dev/wip/libukbd/Makefile \ src/sys/rump/dev/wip/libukbd/UKBD.ioconf cvs rdiff -u -r1.5 -r0 src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c cvs rdiff -u -r1.4 -r0 src/sys/rump/dev/wip/libums/Makefile \ src/sys/rump/dev/wip/libums/UMS.ioconf cvs rdiff -u -r1.5 -r0 src/sys/rump/dev/wip/libums/ums_at_usb.c cvs rdiff -u -r1.2 -r0 src/sys/rump/dev/wip/libusbrum/Makefile cvs rdiff -u -r1.4 -r0 src/sys/rump/dev/wip/libusbrum/rum_at_usb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/dev/wip
Module Name:src Committed By: pooka Date: Mon Aug 24 23:21:16 UTC 2015 Removed Files: src/sys/rump/dev/wip: Makefile Makefile.inc src/sys/rump/dev/wip/libukbd: Makefile UKBD.ioconf ukbd_at_usb.c src/sys/rump/dev/wip/libums: Makefile UMS.ioconf ums_at_usb.c src/sys/rump/dev/wip/libusbrum: Makefile rum_at_usb.c Log Message: These wip components have been in progress for 5 years. There hasn't been much progress. Let's just kill them, they're not even build-tested. To generate a diff of this commit: cvs rdiff -u -r1.7 -r0 src/sys/rump/dev/wip/Makefile cvs rdiff -u -r1.2 -r0 src/sys/rump/dev/wip/Makefile.inc cvs rdiff -u -r1.4 -r0 src/sys/rump/dev/wip/libukbd/Makefile \ src/sys/rump/dev/wip/libukbd/UKBD.ioconf cvs rdiff -u -r1.5 -r0 src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c cvs rdiff -u -r1.4 -r0 src/sys/rump/dev/wip/libums/Makefile \ src/sys/rump/dev/wip/libums/UMS.ioconf cvs rdiff -u -r1.5 -r0 src/sys/rump/dev/wip/libums/ums_at_usb.c cvs rdiff -u -r1.2 -r0 src/sys/rump/dev/wip/libusbrum/Makefile cvs rdiff -u -r1.4 -r0 src/sys/rump/dev/wip/libusbrum/rum_at_usb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: mrg
Date: Mon Aug 24 23:32:07 UTC 2015
Modified Files:
src/sys/arch/sparc64/dev: auxio.c
Log Message:
convert auxio(4) to use a mutex for exclusion (this existing code didn't
really work for MP systems, anyway -- it only went to splhigh.)
various cleanups:
- remove unused AUXIO_SBUS
- make most functions static
- introduce auxio_{read,write}_led() frontends
- avoid a potential NULL deref in auxio_fd_control()
the text is 32 bytes smaller.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sparc64/dev/auxio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/auxio.c
diff -u src/sys/arch/sparc64/dev/auxio.c:1.23 src/sys/arch/sparc64/dev/auxio.c:1.24
--- src/sys/arch/sparc64/dev/auxio.c:1.23 Sat Jul 11 10:32:46 2015
+++ src/sys/arch/sparc64/dev/auxio.c Mon Aug 24 23:32:07 2015
@@ -1,7 +1,7 @@
-/* $NetBSD: auxio.c,v 1.23 2015/07/11 10:32:46 kamil Exp $ */
+/* $NetBSD: auxio.c,v 1.24 2015/08/24 23:32:07 mrg Exp $ */
/*
- * Copyright (c) 2000, 2001 Matthew R. Green
+ * Copyright (c) 2000, 2001, 2015 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: auxio.c,v 1.23 2015/07/11 10:32:46 kamil Exp $);
+__KERNEL_RCSID(0, $NetBSD: auxio.c,v 1.24 2015/08/24 23:32:07 mrg Exp $);
#include opt_auxio.h
@@ -62,6 +62,8 @@ __KERNEL_RCSID(0, $NetBSD: auxio.c,v 1.
struct auxio_softc {
device_t sc_dev;
+ kmutex_t sc_lock;
+
/* parent's tag */
bus_space_tag_t sc_tag;
@@ -73,18 +75,20 @@ struct auxio_softc {
bus_space_handle_t sc_temp;
int sc_flags;
-#define AUXIO_LEDONLY 0x1
+#define AUXIO_LEDONLY 0x1 // only sc_led is valid
#define AUXIO_EBUS 0x2
-#define AUXIO_SBUS 0x4
};
#define AUXIO_ROM_NAME auxio
-void auxio_attach_common(struct auxio_softc *);
-int auxio_ebus_match(device_t, cfdata_t, void *);
-void auxio_ebus_attach(device_t, device_t, void *);
-int auxio_sbus_match(device_t, cfdata_t, void *);
-void auxio_sbus_attach(device_t, device_t, void *);
+
+static uint32_t auxio_read_led(struct auxio_softc *);
+static void auxio_write_led(struct auxio_softc *, uint32_t);
+static void auxio_attach_common(struct auxio_softc *);
+static int auxio_ebus_match(device_t, cfdata_t, void *);
+static void auxio_ebus_attach(device_t, device_t, void *);
+static int auxio_sbus_match(device_t, cfdata_t, void *);
+static void auxio_sbus_attach(device_t, device_t, void *);
CFATTACH_DECL_NEW(auxio_ebus, sizeof(struct auxio_softc),
auxio_ebus_match, auxio_ebus_attach, NULL, NULL);
@@ -94,6 +98,29 @@ CFATTACH_DECL_NEW(auxio_sbus, sizeof(str
extern struct cfdriver auxio_cd;
+static __inline__ uint32_t
+auxio_read_led(struct auxio_softc *sc)
+{
+ uint32_t led;
+
+ if (sc-sc_flags AUXIO_EBUS)
+ led = le32toh(bus_space_read_4(sc-sc_tag, sc-sc_led, 0));
+ else
+ led = bus_space_read_1(sc-sc_tag, sc-sc_led, 0);
+
+ return led;
+}
+
+static __inline__ void
+auxio_write_led(struct auxio_softc *sc, uint32_t led)
+{
+
+ if (sc-sc_flags AUXIO_EBUS)
+ bus_space_write_4(sc-sc_tag, sc-sc_led, 0, htole32(led));
+ else
+ bus_space_write_1(sc-sc_tag, sc-sc_led, 0, led);
+}
+
#ifdef BLINK
static callout_t blink_ch;
static void auxio_blink(void *);
@@ -111,18 +138,11 @@ auxio_blink(void *x)
if (do_blink == 0)
return;
- s = splhigh();
- if (sc-sc_flags AUXIO_EBUS)
- led = le32toh(bus_space_read_4(sc-sc_tag, sc-sc_led, 0));
- else
- led = bus_space_read_1(sc-sc_tag, sc-sc_led, 0);
-
+ mutex_enter(sc-sc_lock);
+ led = auxio_read_led(sc);
led = led ^ AUXIO_LED_LED;
- if (sc-sc_flags AUXIO_EBUS)
- bus_space_write_4(sc-sc_tag, sc-sc_led, 0, htole32(led));
- else
- bus_space_write_1(sc-sc_tag, sc-sc_led, 0, led);
- splx(s);
+ auxio_write_led(sc, led);
+ mutex_exit(sc-sc_lock);
/*
* Blink rate is:
@@ -136,7 +156,7 @@ auxio_blink(void *x)
}
#endif
-void
+static void
auxio_attach_common(struct auxio_softc *sc)
{
#ifdef BLINK
@@ -144,7 +164,8 @@ auxio_attach_common(struct auxio_softc *
/* only start one blinker */
if (do_once) {
- callout_init(blink_ch, 0);
+ mutex_init(sc-sc_lock, MUTEX_DEFAULT, IPL_HIGH);
+ callout_init(blink_ch, CALLOUT_MPSAFE);
auxio_blink(sc);
do_once = 0;
}
@@ -152,7 +173,7 @@ auxio_attach_common(struct auxio_softc *
printf(\n);
}
-int
+static int
auxio_ebus_match(device_t parent, cfdata_t cf, void *aux)
{
struct ebus_attach_args *ea = aux;
@@ -160,7 +181,7 @@ auxio_ebus_match(device_t parent, cfdata
return (strcmp(AUXIO_ROM_NAME, ea-ea_name) == 0);
}
-void
+static void
auxio_ebus_attach(device_t parent, device_t self, void *aux)
{
struct auxio_softc *sc = device_private(self);
@@ -174,13 +195,12 @@ auxio_ebus_attach(device_t parent, devic
return;
}
+ sc-sc_flags = AUXIO_EBUS;
if
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: mrg
Date: Mon Aug 24 23:32:07 UTC 2015
Modified Files:
src/sys/arch/sparc64/dev: auxio.c
Log Message:
convert auxio(4) to use a mutex for exclusion (this existing code didn't
really work for MP systems, anyway -- it only went to splhigh.)
various cleanups:
- remove unused AUXIO_SBUS
- make most functions static
- introduce auxio_{read,write}_led() frontends
- avoid a potential NULL deref in auxio_fd_control()
the text is 32 bytes smaller.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sparc64/dev/auxio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: pooka
Date: Mon Aug 24 23:52:18 UTC 2015
Modified Files:
src/sys/dev/pci: if_iwn.c
Log Message:
Remove #ifdef INET code. Por que? Because opt_inet.h was not included
and #ifdef INET was just a fancy way of saying #ifndef NetBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/pci/if_iwn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.74 src/sys/dev/pci/if_iwn.c:1.75
--- src/sys/dev/pci/if_iwn.c:1.74 Sun Nov 9 14:40:54 2014
+++ src/sys/dev/pci/if_iwn.c Mon Aug 24 23:52:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwn.c,v 1.74 2014/11/09 14:40:54 nonaka Exp $ */
+/* $NetBSD: if_iwn.c,v 1.75 2015/08/24 23:52:18 pooka Exp $ */
/* $OpenBSD: if_iwn.c,v 1.135 2014/09/10 07:22:09 dcoppa Exp $ */
/*-
@@ -22,7 +22,7 @@
* adapters.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_iwn.c,v 1.74 2014/11/09 14:40:54 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_iwn.c,v 1.75 2015/08/24 23:52:18 pooka Exp $);
#define IWN_USE_RBUF /* Use local storage for RX */
#undef IWN_HWCRYPTO /* XXX does not even compile yet */
@@ -3188,11 +3188,6 @@ iwn_ioctl(struct ifnet *ifp, u_long cmd,
switch (cmd) {
case SIOCSIFADDR:
ifp-if_flags |= IFF_UP;
-#ifdef INET
- struct ifaddr *ifa = (struct ifaddr *)data;
- if (ifa-ifa_addr-sa_family == AF_INET)
- arp_ifinit(ic-ic_ac, ifa);
-#endif
/* FALLTHROUGH */
case SIOCSIFFLAGS:
/* XXX Added as it is in every NetBSD driver */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: pooka Date: Mon Aug 24 23:52:18 UTC 2015 Modified Files: src/sys/dev/pci: if_iwn.c Log Message: Remove #ifdef INET code. Por que? Because opt_inet.h was not included and #ifdef INET was just a fancy way of saying #ifndef NetBSD. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/dev/pci/if_iwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Mon Aug 24 22:50:33 UTC 2015 Modified Files: src/sys/compat/common: rtsock_50.c src/sys/conf: param.c src/sys/dev/scsipi: scsipi_ioctl.c src/sys/dev/sysmon: sysmon_power.c src/sys/dev/wscons: wsdisplay.c wsdisplay_compat_usl.c wsdisplay_glyphcache.c wsemul_vt100.c wsevent.c wskbd.c wsmux.c src/sys/kern: kern_prot.c kern_stub.c kern_sysctl.c subr_extent.c subr_kobj.c subr_kobj_vfs.c subr_pool.c subr_prf.c subr_vmem.c sys_module.c tty.c tty_ptm.c vfs_bio.c vfs_cache.c vfs_lookup.c vfs_subr.c vfs_trans.c src/sys/uvm: uvm_aobj.c uvm_object.c uvm_vnode.c Log Message: to garnish, dust with _KERNEL_OPT To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/compat/common/rtsock_50.c cvs rdiff -u -r1.65 -r1.66 src/sys/conf/param.c cvs rdiff -u -r1.67 -r1.68 src/sys/dev/scsipi/scsipi_ioctl.c cvs rdiff -u -r1.55 -r1.56 src/sys/dev/sysmon/sysmon_power.c cvs rdiff -u -r1.138 -r1.139 src/sys/dev/wscons/wsdisplay.c cvs rdiff -u -r1.48 -r1.49 src/sys/dev/wscons/wsdisplay_compat_usl.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/wscons/wsdisplay_glyphcache.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/wscons/wsemul_vt100.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/wscons/wsevent.c cvs rdiff -u -r1.135 -r1.136 src/sys/dev/wscons/wskbd.c cvs rdiff -u -r1.59 -r1.60 src/sys/dev/wscons/wsmux.c cvs rdiff -u -r1.118 -r1.119 src/sys/kern/kern_prot.c cvs rdiff -u -r1.40 -r1.41 src/sys/kern/kern_stub.c cvs rdiff -u -r1.256 -r1.257 src/sys/kern/kern_sysctl.c cvs rdiff -u -r1.78 -r1.79 src/sys/kern/subr_extent.c cvs rdiff -u -r1.50 -r1.51 src/sys/kern/subr_kobj.c cvs rdiff -u -r1.7 -r1.8 src/sys/kern/subr_kobj_vfs.c cvs rdiff -u -r1.204 -r1.205 src/sys/kern/subr_pool.c cvs rdiff -u -r1.158 -r1.159 src/sys/kern/subr_prf.c cvs rdiff -u -r1.92 -r1.93 src/sys/kern/subr_vmem.c cvs rdiff -u -r1.18 -r1.19 src/sys/kern/sys_module.c cvs rdiff -u -r1.265 -r1.266 src/sys/kern/tty.c cvs rdiff -u -r1.36 -r1.37 src/sys/kern/tty_ptm.c cvs rdiff -u -r1.255 -r1.256 src/sys/kern/vfs_bio.c cvs rdiff -u -r1.106 -r1.107 src/sys/kern/vfs_cache.c cvs rdiff -u -r1.202 -r1.203 src/sys/kern/vfs_lookup.c cvs rdiff -u -r1.447 -r1.448 src/sys/kern/vfs_subr.c cvs rdiff -u -r1.33 -r1.34 src/sys/kern/vfs_trans.c cvs rdiff -u -r1.122 -r1.123 src/sys/uvm/uvm_aobj.c cvs rdiff -u -r1.12 -r1.13 src/sys/uvm/uvm_object.c cvs rdiff -u -r1.99 -r1.100 src/sys/uvm/uvm_vnode.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/compat/common/rtsock_50.c diff -u src/sys/compat/common/rtsock_50.c:1.3 src/sys/compat/common/rtsock_50.c:1.4 --- src/sys/compat/common/rtsock_50.c:1.3 Tue Feb 1 01:39:19 2011 +++ src/sys/compat/common/rtsock_50.c Mon Aug 24 22:50:33 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rtsock_50.c,v 1.3 2011/02/01 01:39:19 matt Exp $ */ +/* $NetBSD: rtsock_50.c,v 1.4 2015/08/24 22:50:33 pooka Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,9 +61,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rtsock_50.c,v 1.3 2011/02/01 01:39:19 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: rtsock_50.c,v 1.4 2015/08/24 22:50:33 pooka Exp $); +#ifdef _KERNEL_OPT #include opt_compat_netbsd.h +#endif #if defined(COMPAT_14) !defined(COMPAT_50) #define COMPAT_50 1 /* 1.4 needs 5.0 */ Index: src/sys/conf/param.c diff -u src/sys/conf/param.c:1.65 src/sys/conf/param.c:1.66 --- src/sys/conf/param.c:1.65 Wed May 13 02:06:25 2015 +++ src/sys/conf/param.c Mon Aug 24 22:50:33 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: param.c,v 1.65 2015/05/13 02:06:25 pgoyette Exp $ */ +/* $NetBSD: param.c,v 1.66 2015/08/24 22:50:33 pooka Exp $ */ /* * Copyright (c) 1980, 1986, 1989 Regents of the University of California. @@ -37,13 +37,15 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: param.c,v 1.65 2015/05/13 02:06:25 pgoyette Exp $); +__KERNEL_RCSID(0, $NetBSD: param.c,v 1.66 2015/08/24 22:50:33 pooka Exp $); +#ifdef _KERNEL_OPT #include opt_hz.h #include opt_rtc_offset.h #include opt_sysv.h #include opt_sysvparam.h #include opt_multiprocessor.h +#endif #include sys/param.h #include sys/systm.h Index: src/sys/dev/scsipi/scsipi_ioctl.c diff -u src/sys/dev/scsipi/scsipi_ioctl.c:1.67 src/sys/dev/scsipi/scsipi_ioctl.c:1.68 --- src/sys/dev/scsipi/scsipi_ioctl.c:1.67 Thu Apr 19 17:45:20 2012 +++ src/sys/dev/scsipi/scsipi_ioctl.c Mon Aug 24 22:50:33 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: scsipi_ioctl.c,v 1.67 2012/04/19 17:45:20 bouyer Exp $ */ +/* $NetBSD: scsipi_ioctl.c,v 1.68 2015/08/24 22:50:33 pooka Exp $ */ /*- * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -37,10 +37,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: scsipi_ioctl.c,v 1.67 2012/04/19 17:45:20 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: scsipi_ioctl.c,v 1.68 2015/08/24 22:50:33 pooka Exp $); +#ifdef
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Mon Aug 24 22:50:33 UTC 2015 Modified Files: src/sys/compat/common: rtsock_50.c src/sys/conf: param.c src/sys/dev/scsipi: scsipi_ioctl.c src/sys/dev/sysmon: sysmon_power.c src/sys/dev/wscons: wsdisplay.c wsdisplay_compat_usl.c wsdisplay_glyphcache.c wsemul_vt100.c wsevent.c wskbd.c wsmux.c src/sys/kern: kern_prot.c kern_stub.c kern_sysctl.c subr_extent.c subr_kobj.c subr_kobj_vfs.c subr_pool.c subr_prf.c subr_vmem.c sys_module.c tty.c tty_ptm.c vfs_bio.c vfs_cache.c vfs_lookup.c vfs_subr.c vfs_trans.c src/sys/uvm: uvm_aobj.c uvm_object.c uvm_vnode.c Log Message: to garnish, dust with _KERNEL_OPT To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/compat/common/rtsock_50.c cvs rdiff -u -r1.65 -r1.66 src/sys/conf/param.c cvs rdiff -u -r1.67 -r1.68 src/sys/dev/scsipi/scsipi_ioctl.c cvs rdiff -u -r1.55 -r1.56 src/sys/dev/sysmon/sysmon_power.c cvs rdiff -u -r1.138 -r1.139 src/sys/dev/wscons/wsdisplay.c cvs rdiff -u -r1.48 -r1.49 src/sys/dev/wscons/wsdisplay_compat_usl.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/wscons/wsdisplay_glyphcache.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/wscons/wsemul_vt100.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/wscons/wsevent.c cvs rdiff -u -r1.135 -r1.136 src/sys/dev/wscons/wskbd.c cvs rdiff -u -r1.59 -r1.60 src/sys/dev/wscons/wsmux.c cvs rdiff -u -r1.118 -r1.119 src/sys/kern/kern_prot.c cvs rdiff -u -r1.40 -r1.41 src/sys/kern/kern_stub.c cvs rdiff -u -r1.256 -r1.257 src/sys/kern/kern_sysctl.c cvs rdiff -u -r1.78 -r1.79 src/sys/kern/subr_extent.c cvs rdiff -u -r1.50 -r1.51 src/sys/kern/subr_kobj.c cvs rdiff -u -r1.7 -r1.8 src/sys/kern/subr_kobj_vfs.c cvs rdiff -u -r1.204 -r1.205 src/sys/kern/subr_pool.c cvs rdiff -u -r1.158 -r1.159 src/sys/kern/subr_prf.c cvs rdiff -u -r1.92 -r1.93 src/sys/kern/subr_vmem.c cvs rdiff -u -r1.18 -r1.19 src/sys/kern/sys_module.c cvs rdiff -u -r1.265 -r1.266 src/sys/kern/tty.c cvs rdiff -u -r1.36 -r1.37 src/sys/kern/tty_ptm.c cvs rdiff -u -r1.255 -r1.256 src/sys/kern/vfs_bio.c cvs rdiff -u -r1.106 -r1.107 src/sys/kern/vfs_cache.c cvs rdiff -u -r1.202 -r1.203 src/sys/kern/vfs_lookup.c cvs rdiff -u -r1.447 -r1.448 src/sys/kern/vfs_subr.c cvs rdiff -u -r1.33 -r1.34 src/sys/kern/vfs_trans.c cvs rdiff -u -r1.122 -r1.123 src/sys/uvm/uvm_aobj.c cvs rdiff -u -r1.12 -r1.13 src/sys/uvm/uvm_object.c cvs rdiff -u -r1.99 -r1.100 src/sys/uvm/uvm_vnode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Mon Aug 24 22:21:27 UTC 2015 Modified Files: src/sys/kern: uipc_mbuf.c uipc_socket.c uipc_socket2.c uipc_syscalls.c src/sys/net: if_arcsubr.c if_atmsubr.c if_ecosubr.c if_etherip.c if_ethersubr.c if_fddisubr.c if_gif.c if_gre.c if_hippisubr.c if_ieee1394subr.c if_loop.c if_mpls.c if_ppp.c if_pppoe.c if_sl.c if_srt.c if_stf.c if_strip.c if_tokensubr.c if_tun.c ppp_tty.c radix.c route.c rtbl.c slcompress.c src/sys/net/agr: if_agr.c if_agrsubr.c src/sys/net80211: ieee80211.c ieee80211_crypto.c ieee80211_input.c ieee80211_ioctl.c ieee80211_node.c ieee80211_output.c ieee80211_proto.c src/sys/netinet: dccp_cc_sw.c dccp_tcplike.c dccp_tfrc.c dccp_usrreq.c if_arp.c if_atm.c igmp.c in.c in_gif.c in_pcb.c in_proto.c in_selsrc.c ip_carp.c ip_ecn.c ip_encap.c ip_etherip.c ip_icmp.c ip_input.c ip_mroute.c ip_output.c portalgo.c raw_ip.c tcp_congctl.c tcp_debug.c tcp_input.c tcp_output.c tcp_sack.c tcp_subr.c tcp_timer.c tcp_usrreq.c tcp_vtw.c udp_usrreq.c src/sys/netinet6: dccp6_usrreq.c icmp6.c in6.c in6_gif.c in6_pcb.c in6_proto.c in6_src.c ip6_etherip.c ip6_forward.c ip6_input.c ip6_mroute.c ip6_output.c mld6.c nd6.c nd6_nbr.c raw_ip6.c udp6_output.c udp6_usrreq.c src/sys/netmpls: mpls_proto.c mpls_ttl.c mpls_var.h Log Message: sprinkle _KERNEL_OPT To generate a diff of this commit: cvs rdiff -u -r1.162 -r1.163 src/sys/kern/uipc_mbuf.c cvs rdiff -u -r1.245 -r1.246 src/sys/kern/uipc_socket.c cvs rdiff -u -r1.121 -r1.122 src/sys/kern/uipc_socket2.c cvs rdiff -u -r1.179 -r1.180 src/sys/kern/uipc_syscalls.c cvs rdiff -u -r1.67 -r1.68 src/sys/net/if_arcsubr.c cvs rdiff -u -r1.53 -r1.54 src/sys/net/if_atmsubr.c cvs rdiff -u -r1.43 -r1.44 src/sys/net/if_ecosubr.c \ src/sys/net/if_hippisubr.c cvs rdiff -u -r1.36 -r1.37 src/sys/net/if_etherip.c cvs rdiff -u -r1.211 -r1.212 src/sys/net/if_ethersubr.c cvs rdiff -u -r1.92 -r1.93 src/sys/net/if_fddisubr.c cvs rdiff -u -r1.87 -r1.88 src/sys/net/if_gif.c cvs rdiff -u -r1.166 -r1.167 src/sys/net/if_gre.c cvs rdiff -u -r1.49 -r1.50 src/sys/net/if_ieee1394subr.c cvs rdiff -u -r1.82 -r1.83 src/sys/net/if_loop.c cvs rdiff -u -r1.18 -r1.19 src/sys/net/if_mpls.c cvs rdiff -u -r1.148 -r1.149 src/sys/net/if_ppp.c src/sys/net/route.c cvs rdiff -u -r1.103 -r1.104 src/sys/net/if_pppoe.c cvs rdiff -u -r1.120 -r1.121 src/sys/net/if_sl.c cvs rdiff -u -r1.19 -r1.20 src/sys/net/if_srt.c cvs rdiff -u -r1.81 -r1.82 src/sys/net/if_stf.c cvs rdiff -u -r1.100 -r1.101 src/sys/net/if_strip.c cvs rdiff -u -r1.69 -r1.70 src/sys/net/if_tokensubr.c cvs rdiff -u -r1.122 -r1.123 src/sys/net/if_tun.c cvs rdiff -u -r1.58 -r1.59 src/sys/net/ppp_tty.c cvs rdiff -u -r1.44 -r1.45 src/sys/net/radix.c cvs rdiff -u -r1.1 -r1.2 src/sys/net/rtbl.c cvs rdiff -u -r1.38 -r1.39 src/sys/net/slcompress.c cvs rdiff -u -r1.32 -r1.33 src/sys/net/agr/if_agr.c cvs rdiff -u -r1.9 -r1.10 src/sys/net/agr/if_agrsubr.c cvs rdiff -u -r1.55 -r1.56 src/sys/net80211/ieee80211.c cvs rdiff -u -r1.16 -r1.17 src/sys/net80211/ieee80211_crypto.c cvs rdiff -u -r1.78 -r1.79 src/sys/net80211/ieee80211_input.c cvs rdiff -u -r1.59 -r1.60 src/sys/net80211/ieee80211_ioctl.c cvs rdiff -u -r1.68 -r1.69 src/sys/net80211/ieee80211_node.c cvs rdiff -u -r1.52 -r1.53 src/sys/net80211/ieee80211_output.c cvs rdiff -u -r1.30 -r1.31 src/sys/net80211/ieee80211_proto.c cvs rdiff -u -r1.1 -r1.2 src/sys/netinet/dccp_cc_sw.c \ src/sys/netinet/dccp_tcplike.c src/sys/netinet/dccp_tfrc.c cvs rdiff -u -r1.6 -r1.7 src/sys/netinet/dccp_usrreq.c cvs rdiff -u -r1.172 -r1.173 src/sys/netinet/if_arp.c cvs rdiff -u -r1.35 -r1.36 src/sys/netinet/if_atm.c cvs rdiff -u -r1.55 -r1.56 src/sys/netinet/igmp.c cvs rdiff -u -r1.156 -r1.157 src/sys/netinet/in.c cvs rdiff -u -r1.64 -r1.65 src/sys/netinet/in_gif.c cvs rdiff -u -r1.161 -r1.162 src/sys/netinet/in_pcb.c cvs rdiff -u -r1.112 -r1.113 src/sys/netinet/in_proto.c cvs rdiff -u -r1.13 -r1.14 src/sys/netinet/in_selsrc.c \ src/sys/netinet/tcp_vtw.c cvs rdiff -u -r1.61 -r1.62 src/sys/netinet/ip_carp.c cvs rdiff -u -r1.15 -r1.16 src/sys/netinet/ip_ecn.c cvs rdiff -u -r1.45 -r1.46 src/sys/netinet/ip_encap.c cvs rdiff -u -r1.14 -r1.15 src/sys/netinet/ip_etherip.c cvs rdiff -u -r1.140 -r1.141 src/sys/netinet/ip_icmp.c cvs rdiff -u -r1.323 -r1.324 src/sys/netinet/ip_input.c cvs rdiff -u -r1.131 -r1.132 src/sys/netinet/ip_mroute.c cvs rdiff -u -r1.245 -r1.246 src/sys/netinet/ip_output.c cvs rdiff -u -r1.8 -r1.9 src/sys/netinet/portalgo.c cvs rdiff -u -r1.152 -r1.153 src/sys/netinet/raw_ip.c cvs rdiff -u -r1.19 -r1.20 src/sys/netinet/tcp_congctl.c cvs rdiff -u -r1.28 -r1.29 src/sys/netinet/tcp_debug.c cvs rdiff -u -r1.343 -r1.344 src/sys/netinet/tcp_input.c cvs rdiff -u -r1.184 -r1.185 src/sys/netinet/tcp_output.c cvs rdiff -u -r1.31 -r1.32
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Mon Aug 24 22:31:34 UTC 2015 Modified Files: src/sys/rump: Makefile.rump src/sys/rump/librump/rumpnet: Makefile.rumpnet src/sys/rump/net/lib: Makefile.inc Added Files: src/sys/rump/include/opt: arp.h pfsync.h Removed Files: src/sys/rump/librump/rumpnet/opt: arp.h pfsync.h Log Message: remove librump/rumpnet/opt, consolidate in rump/include/opt To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/rump/Makefile.rump cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/arp.h \ src/sys/rump/include/opt/pfsync.h cvs rdiff -u -r1.17 -r1.18 src/sys/rump/librump/rumpnet/Makefile.rumpnet cvs rdiff -u -r1.2 -r0 src/sys/rump/librump/rumpnet/opt/arp.h cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpnet/opt/pfsync.h cvs rdiff -u -r1.4 -r1.5 src/sys/rump/net/lib/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Mon Aug 24 22:31:34 UTC 2015
Modified Files:
src/sys/rump: Makefile.rump
src/sys/rump/librump/rumpnet: Makefile.rumpnet
src/sys/rump/net/lib: Makefile.inc
Added Files:
src/sys/rump/include/opt: arp.h pfsync.h
Removed Files:
src/sys/rump/librump/rumpnet/opt: arp.h pfsync.h
Log Message:
remove librump/rumpnet/opt, consolidate in rump/include/opt
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/rump/Makefile.rump
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/arp.h \
src/sys/rump/include/opt/pfsync.h
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/librump/rumpnet/Makefile.rumpnet
cvs rdiff -u -r1.2 -r0 src/sys/rump/librump/rumpnet/opt/arp.h
cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpnet/opt/pfsync.h
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/net/lib/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/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.116 src/sys/rump/Makefile.rump:1.117
--- src/sys/rump/Makefile.rump:1.116 Mon Aug 24 18:17:04 2015
+++ src/sys/rump/Makefile.rump Mon Aug 24 22:31:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.116 2015/08/24 18:17:04 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.117 2015/08/24 22:31:33 pooka Exp $
#
.if !defined(_RUMP_MK)
@@ -53,6 +53,7 @@ CPPFLAGS+= -imacros ${BUILDRUMP_IMACROS}
CPPFLAGS+= -I${.CURDIR} -I.
CPPFLAGS+= -I${RUMPTOP}/../../common/include
CPPFLAGS+= -I${RUMPTOP}/include
+CPPFLAGS+= -I${RUMPTOP}/include/opt
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern/opt
SHLIB_MAJOR?= 0
Index: src/sys/rump/librump/rumpnet/Makefile.rumpnet
diff -u src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.17 src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.18
--- src/sys/rump/librump/rumpnet/Makefile.rumpnet:1.17 Wed Dec 3 00:19:04 2014
+++ src/sys/rump/librump/rumpnet/Makefile.rumpnet Mon Aug 24 22:31:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpnet,v 1.17 2014/12/03 00:19:04 christos Exp $
+# $NetBSD: Makefile.rumpnet,v 1.18 2015/08/24 22:31:33 pooka Exp $
#
LIB= rumpnet
@@ -37,7 +37,7 @@ SRCS+=
# bpf stubs, required for all kernels
SRCS+= bpf_stub.c
-CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpnet/opt
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
.include ${RUMPTOP}/Makefile.rump
Index: src/sys/rump/net/lib/Makefile.inc
diff -u src/sys/rump/net/lib/Makefile.inc:1.4 src/sys/rump/net/lib/Makefile.inc:1.5
--- src/sys/rump/net/lib/Makefile.inc:1.4 Mon Mar 1 13:12:20 2010
+++ src/sys/rump/net/lib/Makefile.inc Mon Aug 24 22:31:34 2015
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.4 2010/03/01 13:12:20 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.5 2015/08/24 22:31:34 pooka Exp $
#
RUMPTOP= ${.CURDIR}/../../..
-CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpnet \
- -I${RUMPTOP}/librump/rumpnet/opt
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpnet
.include ${RUMPTOP}/Makefile.rump
Added files:
Index: src/sys/rump/include/opt/arp.h
diff -u /dev/null src/sys/rump/include/opt/arp.h:1.1
--- /dev/null Mon Aug 24 22:31:34 2015
+++ src/sys/rump/include/opt/arp.h Mon Aug 24 22:31:33 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: arp.h,v 1.1 2015/08/24 22:31:33 pooka Exp $ */
+
+#define NARP 1
Index: src/sys/rump/include/opt/pfsync.h
diff -u /dev/null src/sys/rump/include/opt/pfsync.h:1.1
--- /dev/null Mon Aug 24 22:31:34 2015
+++ src/sys/rump/include/opt/pfsync.h Mon Aug 24 22:31:33 2015
@@ -0,0 +1,2 @@
+/* $NetBSD: pfsync.h,v 1.1 2015/08/24 22:31:33 pooka Exp $ */
+
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Mon Aug 24 22:52:15 UTC 2015 Modified Files: src/sys/rump: Makefile.rump src/sys/rump/include/opt: opt_rumpkernel.h Added Files: src/sys/rump/include/opt: config_file.h ksyms.h veriexec.h Removed Files: src/sys/rump/librump/rumpkern/opt: config_file.h ksyms.h opt_bufcache.h opt_compat_43.h opt_compat_netbsd.h opt_ddb.h opt_defcorename.h opt_dump.h opt_fileassoc.h opt_hz.h opt_ipkdb.h opt_kgdb.h opt_ktrace.h opt_lockdebug.h opt_magiclinks.h opt_modular.h opt_multiprocessor.h opt_nmbclusters.h opt_pool.h opt_poollog.h opt_ptrace.h opt_revcache.h opt_rnd_printf.h opt_rtc_offset.h opt_sysv.h opt_sysvparam.h opt_uvmhist.h veriexec.h Log Message: Remove individual opt_foo.h files, continue consolidating to opt_rumpkernel.h To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/sys/rump/Makefile.rump cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/config_file.h \ src/sys/rump/include/opt/ksyms.h src/sys/rump/include/opt/veriexec.h cvs rdiff -u -r1.2 -r1.3 src/sys/rump/include/opt/opt_rumpkernel.h cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpkern/opt/config_file.h \ src/sys/rump/librump/rumpkern/opt/opt_bufcache.h \ src/sys/rump/librump/rumpkern/opt/opt_compat_43.h \ src/sys/rump/librump/rumpkern/opt/opt_compat_netbsd.h \ src/sys/rump/librump/rumpkern/opt/opt_defcorename.h \ src/sys/rump/librump/rumpkern/opt/opt_dump.h \ src/sys/rump/librump/rumpkern/opt/opt_fileassoc.h \ src/sys/rump/librump/rumpkern/opt/opt_hz.h \ src/sys/rump/librump/rumpkern/opt/opt_ipkdb.h \ src/sys/rump/librump/rumpkern/opt/opt_kgdb.h \ src/sys/rump/librump/rumpkern/opt/opt_ktrace.h \ src/sys/rump/librump/rumpkern/opt/opt_lockdebug.h \ src/sys/rump/librump/rumpkern/opt/opt_magiclinks.h \ src/sys/rump/librump/rumpkern/opt/opt_nmbclusters.h \ src/sys/rump/librump/rumpkern/opt/opt_pool.h \ src/sys/rump/librump/rumpkern/opt/opt_poollog.h \ src/sys/rump/librump/rumpkern/opt/opt_ptrace.h \ src/sys/rump/librump/rumpkern/opt/opt_revcache.h \ src/sys/rump/librump/rumpkern/opt/opt_rtc_offset.h \ src/sys/rump/librump/rumpkern/opt/opt_sysv.h \ src/sys/rump/librump/rumpkern/opt/opt_sysvparam.h \ src/sys/rump/librump/rumpkern/opt/opt_uvmhist.h \ src/sys/rump/librump/rumpkern/opt/veriexec.h cvs rdiff -u -r1.3 -r0 src/sys/rump/librump/rumpkern/opt/ksyms.h cvs rdiff -u -r1.2 -r0 src/sys/rump/librump/rumpkern/opt/opt_ddb.h \ src/sys/rump/librump/rumpkern/opt/opt_modular.h \ src/sys/rump/librump/rumpkern/opt/opt_multiprocessor.h \ src/sys/rump/librump/rumpkern/opt/opt_rnd_printf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Mon Aug 24 22:52:15 UTC 2015
Modified Files:
src/sys/rump: Makefile.rump
src/sys/rump/include/opt: opt_rumpkernel.h
Added Files:
src/sys/rump/include/opt: config_file.h ksyms.h veriexec.h
Removed Files:
src/sys/rump/librump/rumpkern/opt: config_file.h ksyms.h opt_bufcache.h
opt_compat_43.h opt_compat_netbsd.h opt_ddb.h opt_defcorename.h
opt_dump.h opt_fileassoc.h opt_hz.h opt_ipkdb.h opt_kgdb.h
opt_ktrace.h opt_lockdebug.h opt_magiclinks.h opt_modular.h
opt_multiprocessor.h opt_nmbclusters.h opt_pool.h opt_poollog.h
opt_ptrace.h opt_revcache.h opt_rnd_printf.h opt_rtc_offset.h
opt_sysv.h opt_sysvparam.h opt_uvmhist.h veriexec.h
Log Message:
Remove individual opt_foo.h files, continue consolidating to opt_rumpkernel.h
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/rump/Makefile.rump
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/config_file.h \
src/sys/rump/include/opt/ksyms.h src/sys/rump/include/opt/veriexec.h
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/include/opt/opt_rumpkernel.h
cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpkern/opt/config_file.h \
src/sys/rump/librump/rumpkern/opt/opt_bufcache.h \
src/sys/rump/librump/rumpkern/opt/opt_compat_43.h \
src/sys/rump/librump/rumpkern/opt/opt_compat_netbsd.h \
src/sys/rump/librump/rumpkern/opt/opt_defcorename.h \
src/sys/rump/librump/rumpkern/opt/opt_dump.h \
src/sys/rump/librump/rumpkern/opt/opt_fileassoc.h \
src/sys/rump/librump/rumpkern/opt/opt_hz.h \
src/sys/rump/librump/rumpkern/opt/opt_ipkdb.h \
src/sys/rump/librump/rumpkern/opt/opt_kgdb.h \
src/sys/rump/librump/rumpkern/opt/opt_ktrace.h \
src/sys/rump/librump/rumpkern/opt/opt_lockdebug.h \
src/sys/rump/librump/rumpkern/opt/opt_magiclinks.h \
src/sys/rump/librump/rumpkern/opt/opt_nmbclusters.h \
src/sys/rump/librump/rumpkern/opt/opt_pool.h \
src/sys/rump/librump/rumpkern/opt/opt_poollog.h \
src/sys/rump/librump/rumpkern/opt/opt_ptrace.h \
src/sys/rump/librump/rumpkern/opt/opt_revcache.h \
src/sys/rump/librump/rumpkern/opt/opt_rtc_offset.h \
src/sys/rump/librump/rumpkern/opt/opt_sysv.h \
src/sys/rump/librump/rumpkern/opt/opt_sysvparam.h \
src/sys/rump/librump/rumpkern/opt/opt_uvmhist.h \
src/sys/rump/librump/rumpkern/opt/veriexec.h
cvs rdiff -u -r1.3 -r0 src/sys/rump/librump/rumpkern/opt/ksyms.h
cvs rdiff -u -r1.2 -r0 src/sys/rump/librump/rumpkern/opt/opt_ddb.h \
src/sys/rump/librump/rumpkern/opt/opt_modular.h \
src/sys/rump/librump/rumpkern/opt/opt_multiprocessor.h \
src/sys/rump/librump/rumpkern/opt/opt_rnd_printf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.117 src/sys/rump/Makefile.rump:1.118
--- src/sys/rump/Makefile.rump:1.117 Mon Aug 24 22:31:33 2015
+++ src/sys/rump/Makefile.rump Mon Aug 24 22:52:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.117 2015/08/24 22:31:33 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.118 2015/08/24 22:52:15 pooka Exp $
#
.if !defined(_RUMP_MK)
@@ -54,7 +54,6 @@ CPPFLAGS+= -I${.CURDIR} -I.
CPPFLAGS+= -I${RUMPTOP}/../../common/include
CPPFLAGS+= -I${RUMPTOP}/include
CPPFLAGS+= -I${RUMPTOP}/include/opt
-CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern/opt
SHLIB_MAJOR?= 0
SHLIB_MINOR?= 0
Index: src/sys/rump/include/opt/opt_rumpkernel.h
diff -u src/sys/rump/include/opt/opt_rumpkernel.h:1.2 src/sys/rump/include/opt/opt_rumpkernel.h:1.3
--- src/sys/rump/include/opt/opt_rumpkernel.h:1.2 Mon Aug 24 22:25:50 2015
+++ src/sys/rump/include/opt/opt_rumpkernel.h Mon Aug 24 22:52:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_rumpkernel.h,v 1.2 2015/08/24 22:25:50 pooka Exp $ */
+/* $NetBSD: opt_rumpkernel.h,v 1.3 2015/08/24 22:52:15 pooka Exp $ */
#ifndef __NetBSD__
#define __NetBSD__
@@ -13,6 +13,9 @@
#define DEBUGPRINT
+#define DEFCORENAME rumpdump
+#define DUMP_ON_PANIC 0
+
#define INET 1
#define INET6 1
#define GATEWAY 1
Added files:
Index: src/sys/rump/include/opt/config_file.h
diff -u /dev/null src/sys/rump/include/opt/config_file.h:1.1
--- /dev/null Mon Aug 24 22:52:15 2015
+++ src/sys/rump/include/opt/config_file.h Mon Aug 24 22:52:15 2015
@@ -0,0 +1 @@
+/* $NetBSD: config_file.h,v 1.1 2015/08/24 22:52:15 pooka Exp $ */
Index: src/sys/rump/include/opt/ksyms.h
diff -u /dev/null src/sys/rump/include/opt/ksyms.h:1.1
--- /dev/null Mon Aug 24 22:52:15 2015
+++ src/sys/rump/include/opt/ksyms.h Mon Aug 24 22:52:15 2015
@@ -0,0 +1,3 @@
+/* $NetBSD: ksyms.h,v 1.1 2015/08/24 22:52:15 pooka Exp $ */
+
+#define NKSYMS 0
Index: src/sys/rump/include/opt/veriexec.h
diff -u /dev/null src/sys/rump/include/opt/veriexec.h:1.1
--- /dev/null Mon Aug 24 22:52:15 2015
+++ src/sys/rump/include/opt/veriexec.h Mon Aug 24 22:52:15 2015
@@ -0,0
CVS commit: src/sys/arch/sgimips/gio
Module Name:src
Committed By: macallan
Date: Tue Aug 25 02:09:18 UTC 2015
Modified Files:
src/sys/arch/sgimips/gio: newport.c
Log Message:
- pass the right address to bus_space_mmap() so this works on N32 kernels
- don't mess with XMAP9 when switching to graphics mode
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sgimips/gio/newport.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/sgimips/gio/newport.c
diff -u src/sys/arch/sgimips/gio/newport.c:1.18 src/sys/arch/sgimips/gio/newport.c:1.19
--- src/sys/arch/sgimips/gio/newport.c:1.18 Mon Jun 2 15:16:23 2014
+++ src/sys/arch/sgimips/gio/newport.c Tue Aug 25 02:09:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: newport.c,v 1.18 2014/06/02 15:16:23 macallan Exp $ */
+/* $NetBSD: newport.c,v 1.19 2015/08/25 02:09:18 macallan Exp $ */
/*
* Copyright (c) 2003 Ilpo Ruotsalainen
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: newport.c,v 1.18 2014/06/02 15:16:23 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: newport.c,v 1.19 2015/08/25 02:09:18 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -58,10 +58,9 @@ struct newport_softc {
};
struct newport_devconfig {
- uint32_t dc_addr;
-
bus_space_tag_t dc_st;
bus_space_handle_t dc_sh;
+ bus_addr_t dc_addr;
int dc_boardrev;
int dc_vc2rev;
@@ -909,12 +908,6 @@ newport_ioctl(void *v, void *vs, u_long
rex3_wait_gfifo(dc);
newport_setup_hw(dc);
vcons_redraw_screen(vd-active);
- } else {
-xmap9_write_mode(dc, 0,
- XMAP9_MODE_GAMMA_BYPASS |
-XMAP9_CONFIG_RGBMAP_2 |
- XMAP9_MODE_PIXSIZE_24BPP);
-xmap9_write(dc, XMAP9_DCBCRS_MODE_SELECT, 0);
}
}
return 0;
@@ -934,5 +927,5 @@ newport_mmap(void *v, void *vs, off_t of
if ( offset = 0xf)
return -1;
- return bus_space_mmap(dc-dc_st, dc-dc_sh, offset, prot, 0);
+ return bus_space_mmap(dc-dc_st, dc-dc_addr, offset, prot, 0);
}
CVS commit: src/sys/arch/sgimips/gio
Module Name:src Committed By: macallan Date: Tue Aug 25 02:09:18 UTC 2015 Modified Files: src/sys/arch/sgimips/gio: newport.c Log Message: - pass the right address to bus_space_mmap() so this works on N32 kernels - don't mess with XMAP9 when switching to graphics mode To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sgimips/gio/newport.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/conf
Module Name:src
Committed By: uebayasi
Date: Tue Aug 25 02:57:32 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Redo Rev. 1.188:
o Explicitly add dependency of `kernel' on `kernel.ldscript', instead of
relying on ${SYSTEM_DEP}, which is evaluated much earlier than
`sys/conf/Makefile.kern.inc' is included, to avoid evaluation ordering
problems.
o Print a message when creating a `kernel.ldscript'.
o Trim empty lines in `kernel.ldscript'.
To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.189 src/sys/conf/Makefile.kern.inc:1.190
--- src/sys/conf/Makefile.kern.inc:1.189 Mon Aug 24 18:02:55 2015
+++ src/sys/conf/Makefile.kern.inc Tue Aug 25 02:57:32 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.189 2015/08/24 18:02:55 christos Exp $
+# $NetBSD: Makefile.kern.inc,v 1.190 2015/08/25 02:57:32 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -229,13 +229,6 @@ SYSTEM_OBJ?= ${MD_OBJS} ${MI_OBJS} ${OBJ
SYSTEM_OBJ?= ${MD_OBJS} ${MI_OBJS} ${OBJS:O} ${SYSLIBCOMPAT} ${LIBKERN}
.endif
SYSTEM_DEP+= Makefile ${SYSTEM_OBJ} .gdbinit
-.if defined(KERNLDSCRIPT)
-.if exists(${KERNLDSCRIPT})
-SYSTEM_DEP+= -T ${KERNLDSCRIPT}
-.else
-SYSTEM_DEP+= ${.TARGET}.ldscript
-.endif
-.endif
.if defined(CTFMERGE)
SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
.else
@@ -257,15 +250,13 @@ ${KERNLDSCRIPT}: ${SYSTEM_OBJ}
.if defined(KERNLDSCRIPT)
.for k in ${KERNELS}
EXTRA_CLEAN+= ${k}.ldscript
+${k}: ${k}.ldscript
${k}.ldscript: ${KERNLDSCRIPT}
- ${CPP} ${KERNLDSCRIPT} | grep -v '^#' $@
+ ${_MKTARGET_CREATE}
+ ${CPP} ${KERNLDSCRIPT} | grep -v '^#' | grep -v '^$$' $@
.endfor
-.if exists(${KERNLDSCRIPT})
-LINKSCRIPT= -T ${KERNLDSCRIPT}
-.else
LINKSCRIPT= -T ${.TARGET}.ldscript
.endif
-.endif
TEXTADDR?= ${LOADADDRESS} # backwards compatibility
LINKTEXT?= ${TEXTADDR:C/.+/-Ttext /}
CVS commit: src/sys/conf
Module Name:src
Committed By: uebayasi
Date: Tue Aug 25 02:57:32 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Redo Rev. 1.188:
o Explicitly add dependency of `kernel' on `kernel.ldscript', instead of
relying on ${SYSTEM_DEP}, which is evaluated much earlier than
`sys/conf/Makefile.kern.inc' is included, to avoid evaluation ordering
problems.
o Print a message when creating a `kernel.ldscript'.
o Trim empty lines in `kernel.ldscript'.
To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Tue Aug 25 02:59:00 UTC 2015 Modified Files: src/sys/arch/sparc/conf: kern.ldscript src/sys/arch/sparc64/conf: kern.ldscript kern32.ldscript Log Message: Don't expand unwanted symbols by cpp(1). To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/conf/kern.ldscript cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc64/conf/kern.ldscript cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc64/conf/kern32.ldscript 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/sparc/conf/kern.ldscript diff -u src/sys/arch/sparc/conf/kern.ldscript:1.11 src/sys/arch/sparc/conf/kern.ldscript:1.12 --- src/sys/arch/sparc/conf/kern.ldscript:1.11 Mon Aug 24 08:13:07 2015 +++ src/sys/arch/sparc/conf/kern.ldscript Tue Aug 25 02:58:59 2015 @@ -1,4 +1,6 @@ -/* $NetBSD: kern.ldscript,v 1.11 2015/08/24 08:13:07 uebayasi Exp $ */ +/* $NetBSD: kern.ldscript,v 1.12 2015/08/25 02:58:59 uebayasi Exp $ */ + +#undef sparc /* * Kernel linker script for NetBSD/sparc. This script is based on Index: src/sys/arch/sparc64/conf/kern.ldscript diff -u src/sys/arch/sparc64/conf/kern.ldscript:1.16 src/sys/arch/sparc64/conf/kern.ldscript:1.17 --- src/sys/arch/sparc64/conf/kern.ldscript:1.16 Mon Aug 24 08:13:07 2015 +++ src/sys/arch/sparc64/conf/kern.ldscript Tue Aug 25 02:59:00 2015 @@ -1,4 +1,6 @@ -/* $NetBSD: kern.ldscript,v 1.16 2015/08/24 08:13:07 uebayasi Exp $ */ +/* $NetBSD: kern.ldscript,v 1.17 2015/08/25 02:59:00 uebayasi Exp $ */ + +#undef sparc /* * Kernel linker script for NetBSD/sparc64. This script is based on Index: src/sys/arch/sparc64/conf/kern32.ldscript diff -u src/sys/arch/sparc64/conf/kern32.ldscript:1.15 src/sys/arch/sparc64/conf/kern32.ldscript:1.16 --- src/sys/arch/sparc64/conf/kern32.ldscript:1.15 Mon Aug 24 08:13:07 2015 +++ src/sys/arch/sparc64/conf/kern32.ldscript Tue Aug 25 02:59:00 2015 @@ -1,4 +1,6 @@ -/* $NetBSD: kern32.ldscript,v 1.15 2015/08/24 08:13:07 uebayasi Exp $ */ +/* $NetBSD: kern32.ldscript,v 1.16 2015/08/25 02:59:00 uebayasi Exp $ */ + +#undef sparc /* * Kernel linker script for NetBSD/sparc. This script is based on
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Tue Aug 25 02:59:00 UTC 2015 Modified Files: src/sys/arch/sparc/conf: kern.ldscript src/sys/arch/sparc64/conf: kern.ldscript kern32.ldscript Log Message: Don't expand unwanted symbols by cpp(1). To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/conf/kern.ldscript cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc64/conf/kern.ldscript cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc64/conf/kern32.ldscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/conf
Sorry, my bad. :(
There seems an evaluation order problem around ${SYSTEM_DEP} ... it is
added to `netbsd' as a dependency much earlier than
`sys/conf/Makefile.kern.inc' is included. I'll simply redo by adding
netbsd: netbsd.ldscript in `sys/conf/Makefile.kern.inc' instead of
relying on ${SYSTEM_DEP}.
On Tue, Aug 25, 2015 at 3:02 AM, Christos Zoulas chris...@netbsd.org wrote:
Module Name:src
Committed By: christos
Date: Mon Aug 24 18:02:55 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Fix the build: provide compatibility with ports that define KERNLDSCRIPT to
a file?
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src
Committed By: uebayasi
Date: Tue Aug 25 02:38:15 UTC 2015
Modified Files:
src/sys/arch/epoc32/conf: Makefile.epoc32.inc
src/sys/arch/evbarm/conf: Makefile.evbarm.inc
src/sys/arch/zaurus/conf: Makefile.zaurus.inc
Log Message:
Print a message when creating a temporary ldscript.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/epoc32/conf/Makefile.epoc32.inc
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/Makefile.evbarm.inc
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/zaurus/conf/Makefile.zaurus.inc
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/epoc32/conf/Makefile.epoc32.inc
diff -u src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.4 src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.5
--- src/sys/arch/epoc32/conf/Makefile.epoc32.inc:1.4 Mon Aug 24 14:04:24 2015
+++ src/sys/arch/epoc32/conf/Makefile.epoc32.inc Tue Aug 25 02:38:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.epoc32.inc,v 1.4 2015/08/24 14:04:24 uebayasi Exp $
+# $NetBSD: Makefile.epoc32.inc,v 1.5 2015/08/25 02:38:15 uebayasi Exp $
MACHINE_ARCH= arm
CPPFLAGS+= -D${MACHINE}
@@ -17,6 +17,7 @@ ${KERNLDSCRIPT}: \
${THISARM}/conf/ldscript.epoc32 \
${THISARM}/conf/Makefile.epoc32.inc \
Makefile
+ ${_MKTARGET_CREATE}
${TOOL_SED} -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
${THISARM}/conf/ldscript.epoc32 tmp mv tmp $@
Index: src/sys/arch/evbarm/conf/Makefile.evbarm.inc
diff -u src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.33 src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.34
--- src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.33 Mon Aug 24 14:04:24 2015
+++ src/sys/arch/evbarm/conf/Makefile.evbarm.inc Tue Aug 25 02:38:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.evbarm.inc,v 1.33 2015/08/24 14:04:24 uebayasi Exp $
+# $NetBSD: Makefile.evbarm.inc,v 1.34 2015/08/25 02:38:15 uebayasi Exp $
#
# If this is a install kernel and the ramdisk image exists in the object
@@ -42,7 +42,7 @@ ${KERNLDSCRIPT}: \
${THISARM}/conf/Makefile.evbarm.inc \
Makefile \
${BOARDMKFRAG}
- echo ${KERNELS}
+ ${_MKTARGET_CREATE}
${TOOL_SED} -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
${THISARM}/conf/ldscript.evbarm tmp mv tmp $@
Index: src/sys/arch/zaurus/conf/Makefile.zaurus.inc
diff -u src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.8 src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.9
--- src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.8 Mon Aug 24 14:04:25 2015
+++ src/sys/arch/zaurus/conf/Makefile.zaurus.inc Tue Aug 25 02:38:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zaurus.inc,v 1.8 2015/08/24 14:04:25 uebayasi Exp $
+# $NetBSD: Makefile.zaurus.inc,v 1.9 2015/08/25 02:38:15 uebayasi Exp $
MACHINE_ARCH?= arm
CPPFLAGS+= -D${MACHINE}
@@ -25,6 +25,7 @@ EXTRA_CLEAN+= netbsd.map assym.d ldscri
# generate ldscript from common template
ldscript: ${THISARM}/conf/ldscript.zaurus ${THISARM}/conf/Makefile.zaurus.inc Makefile
+ ${_MKTARGET_CREATE}
${TOOL_SED} -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
${THISARM}/conf/ldscript.zaurus tmp mv tmp $@
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Tue Aug 25 02:38:15 UTC 2015 Modified Files: src/sys/arch/epoc32/conf: Makefile.epoc32.inc src/sys/arch/evbarm/conf: Makefile.evbarm.inc src/sys/arch/zaurus/conf: Makefile.zaurus.inc Log Message: Print a message when creating a temporary ldscript. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/epoc32/conf/Makefile.epoc32.inc cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/Makefile.evbarm.inc cvs rdiff -u -r1.8 -r1.9 src/sys/arch/zaurus/conf/Makefile.zaurus.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
