[src/trunk]: src/sys/rump remove unnecesary verbosity: s/RUMP_CURLWP_MODEL/RU...

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

details:   https://anonhg.NetBSD.org/src/rev/1d6d8a8d4b1a
branches:  trunk
changeset: 327773:1d6d8a8d4b1a
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sun Mar 16 15:30:05 2014 +0000

description:
remove unnecesary verbosity: s/RUMP_CURLWP_MODEL/RUMP_CURLWP/

diffstat:

 sys/rump/include/rump/rumpuser.h                  |   6 +++---
 sys/rump/librump/rumpkern/lwproc.c                |   6 +++---
 sys/rump/librump/rumpkern/rump_curlwp.h           |  22 +++++++++++-----------
 sys/rump/librump/rumpkern/rump_curlwp___thread.h  |   4 ++--
 sys/rump/librump/rumpkern/rump_curlwp_hypercall.h |   4 ++--
 5 files changed, 21 insertions(+), 21 deletions(-)

diffs (126 lines):

diff -r 7e01407832a2 -r 1d6d8a8d4b1a sys/rump/include/rump/rumpuser.h
--- a/sys/rump/include/rump/rumpuser.h  Sun Mar 16 14:47:47 2014 +0000
+++ b/sys/rump/include/rump/rumpuser.h  Sun Mar 16 15:30:05 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpuser.h,v 1.109 2014/03/15 15:15:26 pooka Exp $     */
+/*     $NetBSD: rumpuser.h,v 1.110 2014/03/16 15:30:05 pooka Exp $     */
 
 /*
  * Copyright (c) 2007-2013 Antti Kantee.  All Rights Reserved.
@@ -175,14 +175,14 @@
 void rumpuser_thread_exit(void) __dead;
 int  rumpuser_thread_join(void *);
 
-#if defined(LIBRUMPUSER) || defined(RUMP_CURLWP_PRIVATE)
+#if defined(LIBRUMPUSER) || defined(RUMP__CURLWP_PRIVATE)
 enum rumplwpop {
        RUMPUSER_LWP_CREATE, RUMPUSER_LWP_DESTROY,
        RUMPUSER_LWP_SET, RUMPUSER_LWP_CLEAR
 };
 void rumpuser_curlwpop(int, struct lwp *);
 struct lwp *rumpuser_curlwp(void);
-#endif /* LIBRUMPUSER || RUMP_CURLWP_PRIVATE */
+#endif /* LIBRUMPUSER || RUMP__CURLWP_PRIVATE */
 
 struct rumpuser_mtx;
 #define RUMPUSER_MTX_SPIN      0x01
diff -r 7e01407832a2 -r 1d6d8a8d4b1a sys/rump/librump/rumpkern/lwproc.c
--- a/sys/rump/librump/rumpkern/lwproc.c        Sun Mar 16 14:47:47 2014 +0000
+++ b/sys/rump/librump/rumpkern/lwproc.c        Sun Mar 16 15:30:05 2014 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: lwproc.c,v 1.27 2014/03/15 15:15:27 pooka Exp $       */
+/*      $NetBSD: lwproc.c,v 1.28 2014/03/16 15:30:05 pooka Exp $       */
 
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -25,10 +25,10 @@
  * SUCH DAMAGE.
  */
 
-#define RUMP_CURLWP_PRIVATE
+#define RUMP__CURLWP_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.27 2014/03/15 15:15:27 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.28 2014/03/16 15:30:05 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
diff -r 7e01407832a2 -r 1d6d8a8d4b1a sys/rump/librump/rumpkern/rump_curlwp.h
--- a/sys/rump/librump/rumpkern/rump_curlwp.h   Sun Mar 16 14:47:47 2014 +0000
+++ b/sys/rump/librump/rumpkern/rump_curlwp.h   Sun Mar 16 15:30:05 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rump_curlwp.h,v 1.1 2014/03/15 15:15:27 pooka Exp $    */
+/*     $NetBSD: rump_curlwp.h,v 1.2 2014/03/16 15:30:05 pooka Exp $    */
 
 /*-
  * Copyright (c) 2014 Antti Kantee.  All Rights Reserved.
@@ -31,22 +31,22 @@
 struct lwp *    rump_lwproc_curlwp_hypercall(void);
 
 /* hattrick numbers to avoid someone accidentally using "1" as the value */
-#define RUMP_CURLWP_MODEL_HYPERCALL     10501
-#define RUMP_CURLWP_MODEL___THREAD      20502
-#define RUMP_CURLWP_MODEL_REGISTER      30503
-#define RUMP_CURLWP_MODEL_DEFAULT       RUMP_CURLWP_MODEL_HYPERCALL
+#define RUMP_CURLWP_HYPERCALL     10501
+#define RUMP_CURLWP___THREAD      20502
+#define RUMP_CURLWP_REGISTER      30503
+#define RUMP_CURLWP_DEFAULT       RUMP_CURLWP_HYPERCALL
 
-#ifndef RUMP_CURLWP_MODEL
-#define RUMP_CURLWP_MODEL RUMP_CURLWP_MODEL_DEFAULT
+#ifndef RUMP_CURLWP
+#define RUMP_CURLWP RUMP_CURLWP_DEFAULT
 #endif
 
 /* provides rump_curlwp_fast() */
-#if RUMP_CURLWP_MODEL == RUMP_CURLWP_MODEL_HYPERCALL
+#if RUMP_CURLWP == RUMP_CURLWP_HYPERCALL
 #include "rump_curlwp_hypercall.h"
-#elif RUMP_CURLWP_MODEL == RUMP_CURLWP_MODEL___THREAD
+#elif RUMP_CURLWP == RUMP_CURLWP___THREAD
 #include "rump_curlwp___thread.h"
-#elif RUMP_CURLWP_MODEL == RUMP_CURLWP_MODEL_REGISTER
-#error "RUMP_CURLWP_MODEL_REGISTER not yet implemented"
+#elif RUMP_CURLWP == RUMP_CURLWP_REGISTER
+#error "RUMP_CURLWP_REGISTER not yet implemented"
 #else
 #error "unknown RUMP_CURLWP"
 #endif
diff -r 7e01407832a2 -r 1d6d8a8d4b1a sys/rump/librump/rumpkern/rump_curlwp___thread.h
--- a/sys/rump/librump/rumpkern/rump_curlwp___thread.h  Sun Mar 16 14:47:47 2014 +0000
+++ b/sys/rump/librump/rumpkern/rump_curlwp___thread.h  Sun Mar 16 15:30:05 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rump_curlwp___thread.h,v 1.1 2014/03/15 15:15:27 pooka Exp $   */
+/*     $NetBSD: rump_curlwp___thread.h,v 1.2 2014/03/16 15:30:05 pooka Exp $   */
 
 /*-
  * Copyright (c) 2014 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 extern __thread struct lwp *curlwp_storage;
-#ifdef RUMP_CURLWP_PRIVATE
+#ifdef RUMP__CURLWP_PRIVATE
 #include <rump/rumpuser.h>
 
 __thread struct lwp *curlwp_storage;
diff -r 7e01407832a2 -r 1d6d8a8d4b1a sys/rump/librump/rumpkern/rump_curlwp_hypercall.h
--- a/sys/rump/librump/rumpkern/rump_curlwp_hypercall.h Sun Mar 16 14:47:47 2014 +0000
+++ b/sys/rump/librump/rumpkern/rump_curlwp_hypercall.h Sun Mar 16 15:30:05 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rump_curlwp_hypercall.h,v 1.1 2014/03/15 15:15:27 pooka Exp $  */
+/*     $NetBSD: rump_curlwp_hypercall.h,v 1.2 2014/03/16 15:30:05 pooka Exp $  */
 
 /*-
  * Copyright (c) 2014 Antti Kantee.  All Rights Reserved.
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef RUMP_CURLWP_PRIVATE
+#ifdef RUMP__CURLWP_PRIVATE
 #include <rump/rumpuser.h>
 static void
 lwproc_curlwpop(enum rumplwpop op, struct lwp *l)