[src/trunk]: src/sys/rump Remove individual opt_foo.h files, continue consoli...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/988caa26b47f
branches:  trunk
changeset: 340154:988caa26b47f
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Aug 24 22:52:15 2015 +0000

description:
Remove individual opt_foo.h files, continue consolidating to opt_rumpkernel.h

diffstat:

 sys/rump/Makefile.rump                             |  3 +--
 sys/rump/include/opt/config_file.h                 |  1 +
 sys/rump/include/opt/ksyms.h                       |  3 +++
 sys/rump/include/opt/opt_rumpkernel.h              |  5 ++++-
 sys/rump/include/opt/veriexec.h                    |  1 +
 sys/rump/librump/rumpkern/opt/config_file.h        |  1 -
 sys/rump/librump/rumpkern/opt/ksyms.h              |  3 ---
 sys/rump/librump/rumpkern/opt/opt_bufcache.h       |  1 -
 sys/rump/librump/rumpkern/opt/opt_compat_43.h      |  1 -
 sys/rump/librump/rumpkern/opt/opt_compat_netbsd.h  |  1 -
 sys/rump/librump/rumpkern/opt/opt_ddb.h            |  1 -
 sys/rump/librump/rumpkern/opt/opt_defcorename.h    |  3 ---
 sys/rump/librump/rumpkern/opt/opt_dump.h           |  3 ---
 sys/rump/librump/rumpkern/opt/opt_fileassoc.h      |  1 -
 sys/rump/librump/rumpkern/opt/opt_hz.h             |  1 -
 sys/rump/librump/rumpkern/opt/opt_ipkdb.h          |  3 ---
 sys/rump/librump/rumpkern/opt/opt_kgdb.h           |  3 ---
 sys/rump/librump/rumpkern/opt/opt_ktrace.h         |  1 -
 sys/rump/librump/rumpkern/opt/opt_lockdebug.h      |  1 -
 sys/rump/librump/rumpkern/opt/opt_magiclinks.h     |  1 -
 sys/rump/librump/rumpkern/opt/opt_modular.h        |  3 ---
 sys/rump/librump/rumpkern/opt/opt_multiprocessor.h |  3 ---
 sys/rump/librump/rumpkern/opt/opt_nmbclusters.h    |  1 -
 sys/rump/librump/rumpkern/opt/opt_pool.h           |  1 -
 sys/rump/librump/rumpkern/opt/opt_poollog.h        |  1 -
 sys/rump/librump/rumpkern/opt/opt_ptrace.h         |  1 -
 sys/rump/librump/rumpkern/opt/opt_revcache.h       |  1 -
 sys/rump/librump/rumpkern/opt/opt_rnd_printf.h     |  1 -
 sys/rump/librump/rumpkern/opt/opt_rtc_offset.h     |  1 -
 sys/rump/librump/rumpkern/opt/opt_sysv.h           |  1 -
 sys/rump/librump/rumpkern/opt/opt_sysvparam.h      |  1 -
 sys/rump/librump/rumpkern/opt/opt_uvmhist.h        |  1 -
 sys/rump/librump/rumpkern/opt/veriexec.h           |  1 -
 33 files changed, 10 insertions(+), 45 deletions(-)

diffs (207 lines):

diff -r 530b13908582 -r 988caa26b47f sys/rump/Makefile.rump
--- a/sys/rump/Makefile.rump    Mon Aug 24 22:50:32 2015 +0000
+++ b/sys/rump/Makefile.rump    Mon Aug 24 22:52:15 2015 +0000
@@ -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${RUMPTOP}/../../common/include
 CPPFLAGS+=     -I${RUMPTOP}/include
 CPPFLAGS+=     -I${RUMPTOP}/include/opt
-CPPFLAGS+=     -I${RUMPTOP}/librump/rumpkern/opt
 
 SHLIB_MAJOR?=  0
 SHLIB_MINOR?=  0
diff -r 530b13908582 -r 988caa26b47f sys/rump/include/opt/config_file.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/config_file.h        Mon Aug 24 22:52:15 2015 +0000
@@ -0,0 +1,1 @@
+/*     $NetBSD: config_file.h,v 1.1 2015/08/24 22:52:15 pooka Exp $    */
diff -r 530b13908582 -r 988caa26b47f sys/rump/include/opt/ksyms.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/ksyms.h      Mon Aug 24 22:52:15 2015 +0000
@@ -0,0 +1,3 @@
+/*     $NetBSD: ksyms.h,v 1.1 2015/08/24 22:52:15 pooka Exp $  */
+
+#define NKSYMS 0
diff -r 530b13908582 -r 988caa26b47f sys/rump/include/opt/opt_rumpkernel.h
--- a/sys/rump/include/opt/opt_rumpkernel.h     Mon Aug 24 22:50:32 2015 +0000
+++ b/sys/rump/include/opt/opt_rumpkernel.h     Mon Aug 24 22:52:15 2015 +0000
@@ -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
diff -r 530b13908582 -r 988caa26b47f sys/rump/include/opt/veriexec.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/opt/veriexec.h   Mon Aug 24 22:52:15 2015 +0000
@@ -0,0 +1,1 @@
+/*     $NetBSD: veriexec.h,v 1.1 2015/08/24 22:52:15 pooka Exp $       */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/config_file.h
--- a/sys/rump/librump/rumpkern/opt/config_file.h       Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: config_file.h,v 1.1 2007/08/08 09:06:12 pooka Exp $    */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/ksyms.h
--- a/sys/rump/librump/rumpkern/opt/ksyms.h     Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: ksyms.h,v 1.3 2015/08/21 06:56:12 christos Exp $       */
-
-#define NKSYMS 0
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_bufcache.h
--- a/sys/rump/librump/rumpkern/opt/opt_bufcache.h      Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_bufcache.h,v 1.1 2007/08/14 13:54:15 pooka Exp $   */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_compat_43.h
--- a/sys/rump/librump/rumpkern/opt/opt_compat_43.h     Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_compat_43.h,v 1.1 2008/01/27 19:07:22 pooka Exp $  */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_compat_netbsd.h
--- a/sys/rump/librump/rumpkern/opt/opt_compat_netbsd.h Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_compat_netbsd.h,v 1.1 2008/01/27 19:07:22 pooka Exp $      */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_ddb.h
--- a/sys/rump/librump/rumpkern/opt/opt_ddb.h   Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_ddb.h,v 1.2 2009/01/01 19:43:57 pooka Exp $        */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_defcorename.h
--- a/sys/rump/librump/rumpkern/opt/opt_defcorename.h   Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_defcorename.h,v 1.1 2008/08/01 19:34:51 pooka Exp $        */
-
-#define DEFCORENAME    "rumpdump"
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_dump.h
--- a/sys/rump/librump/rumpkern/opt/opt_dump.h  Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_dump.h,v 1.1 2009/01/02 02:54:13 pooka Exp $       */
-
-#define DUMP_ON_PANIC 0
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_fileassoc.h
--- a/sys/rump/librump/rumpkern/opt/opt_fileassoc.h     Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_fileassoc.h,v 1.1 2008/03/11 10:50:16 pooka Exp $  */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_hz.h
--- a/sys/rump/librump/rumpkern/opt/opt_hz.h    Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_hz.h,v 1.1 2007/08/08 09:06:13 pooka Exp $ */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_ipkdb.h
--- a/sys/rump/librump/rumpkern/opt/opt_ipkdb.h Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_ipkdb.h,v 1.1 2009/01/01 19:43:57 pooka Exp $      */
-
-/* dummy */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_kgdb.h
--- a/sys/rump/librump/rumpkern/opt/opt_kgdb.h  Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_kgdb.h,v 1.1 2009/01/02 02:54:13 pooka Exp $       */
-
-/* dummy */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_ktrace.h
--- a/sys/rump/librump/rumpkern/opt/opt_ktrace.h        Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_ktrace.h,v 1.1 2007/08/16 21:26:21 pooka Exp $     */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_lockdebug.h
--- a/sys/rump/librump/rumpkern/opt/opt_lockdebug.h     Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_lockdebug.h,v 1.1 2009/01/23 13:14:17 pooka Exp $  */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_magiclinks.h
--- a/sys/rump/librump/rumpkern/opt/opt_magiclinks.h    Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_magiclinks.h,v 1.1 2008/01/24 22:41:08 pooka Exp $ */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_modular.h
--- a/sys/rump/librump/rumpkern/opt/opt_modular.h       Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_modular.h,v 1.2 2010/04/17 13:02:34 pooka Exp $    */
-
-#define MODULAR 1
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_multiprocessor.h
--- a/sys/rump/librump/rumpkern/opt/opt_multiprocessor.h        Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_multiprocessor.h,v 1.2 2010/04/17 13:02:34 pooka Exp $     */
-
-#define MULTIPROCESSOR 1
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_nmbclusters.h
--- a/sys/rump/librump/rumpkern/opt/opt_nmbclusters.h   Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_nmbclusters.h,v 1.1 2007/08/08 09:06:13 pooka Exp $        */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_pool.h
--- a/sys/rump/librump/rumpkern/opt/opt_pool.h  Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_pool.h,v 1.1 2009/01/23 13:14:17 pooka Exp $       */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_poollog.h
--- a/sys/rump/librump/rumpkern/opt/opt_poollog.h       Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_poollog.h,v 1.1 2009/01/23 13:14:17 pooka Exp $    */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_ptrace.h
--- a/sys/rump/librump/rumpkern/opt/opt_ptrace.h        Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_ptrace.h,v 1.1 2007/08/16 21:26:21 pooka Exp $     */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_revcache.h
--- a/sys/rump/librump/rumpkern/opt/opt_revcache.h      Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_revcache.h,v 1.1 2007/08/08 09:06:13 pooka Exp $   */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_rnd_printf.h
--- a/sys/rump/librump/rumpkern/opt/opt_rnd_printf.h    Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_rnd_printf.h,v 1.2 2014/08/10 16:44:36 tls Exp $ */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_rtc_offset.h
--- a/sys/rump/librump/rumpkern/opt/opt_rtc_offset.h    Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_rtc_offset.h,v 1.1 2007/08/08 09:06:13 pooka Exp $ */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_sysv.h
--- a/sys/rump/librump/rumpkern/opt/opt_sysv.h  Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_sysv.h,v 1.1 2007/08/08 09:06:13 pooka Exp $       */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_sysvparam.h
--- a/sys/rump/librump/rumpkern/opt/opt_sysvparam.h     Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_sysvparam.h,v 1.1 2007/08/08 09:06:14 pooka Exp $  */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/opt_uvmhist.h
--- a/sys/rump/librump/rumpkern/opt/opt_uvmhist.h       Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_uvmhist.h,v 1.1 2009/08/04 23:58:29 pooka Exp $    */
diff -r 530b13908582 -r 988caa26b47f sys/rump/librump/rumpkern/opt/veriexec.h
--- a/sys/rump/librump/rumpkern/opt/veriexec.h  Mon Aug 24 22:50:32 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: veriexec.h,v 1.1 2007/08/13 13:57:21 pooka Exp $       */