[src/trunk]: src/sys/rump rump_getversion() does not require a thread context...

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

details:   https://anonhg.NetBSD.org/src/rev/a9c9bd8a2da8
branches:  trunk
changeset: 794301:a9c9bd8a2da8
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Mar 10 22:44:10 2014 +0000

description:
rump_getversion() does not require a thread context, so make it a straight
call instead of being wrapped around rump_pub_getversion().

diffstat:

 sys/rump/include/rump/rump.h                     |   3 ++-
 sys/rump/include/rump/rumpkern_if_pub.h          |   3 +--
 sys/rump/librump/rumpkern/rump.c                 |   6 ++++--
 sys/rump/librump/rumpkern/rumpkern.ifspec        |   4 +---
 sys/rump/librump/rumpkern/rumpkern_if_priv.h     |   3 +--
 sys/rump/librump/rumpkern/rumpkern_if_wrappers.c |  14 +-------------
 6 files changed, 10 insertions(+), 23 deletions(-)

diffs (124 lines):

diff -r f6d8b24e5136 -r a9c9bd8a2da8 sys/rump/include/rump/rump.h
--- a/sys/rump/include/rump/rump.h      Mon Mar 10 22:38:53 2014 +0000
+++ b/sys/rump/include/rump/rump.h      Mon Mar 10 22:44:10 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rump.h,v 1.59 2014/03/10 22:38:53 pooka Exp $  */
+/*     $NetBSD: rump.h,v 1.60 2014/03/10 22:44:10 pooka Exp $  */
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -100,6 +100,7 @@
 _BEGIN_DECLS
 #endif
 
+int    rump_getversion(void);
 int    rump_nativeabi_p(void);
 
 int    rump_boot_gethowto(void);
diff -r f6d8b24e5136 -r a9c9bd8a2da8 sys/rump/include/rump/rumpkern_if_pub.h
--- a/sys/rump/include/rump/rumpkern_if_pub.h   Mon Mar 10 22:38:53 2014 +0000
+++ b/sys/rump/include/rump/rumpkern_if_pub.h   Mon Mar 10 22:44:10 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpkern_if_pub.h,v 1.14 2013/03/07 18:51:02 pooka Exp $       */
+/*     $NetBSD: rumpkern_if_pub.h,v 1.15 2014/03/10 22:44:10 pooka Exp $       */
 
 /*
  * Automatically generated.  DO NOT EDIT.
@@ -6,7 +6,6 @@
  * by:   NetBSD: makerumpif.sh,v 1.6 2013/02/14 10:54:54 pooka Exp 
  */
 
-int rump_pub_getversion(void);
 int rump_pub_module_init(const struct modinfo * const *, size_t);
 int rump_pub_module_fini(const struct modinfo *);
 int rump_pub_kernelfsym_load(void *, uint64_t, char *, uint64_t);
diff -r f6d8b24e5136 -r a9c9bd8a2da8 sys/rump/librump/rumpkern/rump.c
--- a/sys/rump/librump/rumpkern/rump.c  Mon Mar 10 22:38:53 2014 +0000
+++ b/sys/rump/librump/rumpkern/rump.c  Mon Mar 10 22:44:10 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rump.c,v 1.288 2014/03/10 22:38:53 pooka Exp $ */
+/*     $NetBSD: rump.c,v 1.289 2014/03/10 22:44:11 pooka Exp $ */
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.288 2014/03/10 22:38:53 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.289 2014/03/10 22:44:11 pooka Exp $");
 
 #include <sys/systm.h>
 #define ELFSIZE ARCH_ELFSIZE
@@ -942,6 +942,8 @@
 
        return __NetBSD_Version__;
 }
+/* compat */
+__strong_alias(rump_pub_getversion,rump_getversion);
 
 int
 rump_nativeabi_p(void)
diff -r f6d8b24e5136 -r a9c9bd8a2da8 sys/rump/librump/rumpkern/rumpkern.ifspec
--- a/sys/rump/librump/rumpkern/rumpkern.ifspec Mon Mar 10 22:38:53 2014 +0000
+++ b/sys/rump/librump/rumpkern/rumpkern.ifspec Mon Mar 10 22:44:10 2014 +0000
@@ -1,4 +1,4 @@
-;      $NetBSD: rumpkern.ifspec,v 1.11 2013/03/07 18:49:13 pooka Exp $
+;      $NetBSD: rumpkern.ifspec,v 1.12 2014/03/10 22:44:11 pooka Exp $
 
 NAME|kern
 PUBHDR|include/rump/rumpkern_if_pub.h
@@ -8,8 +8,6 @@
 ; type         | name          | args
 ;
 
-int            |getversion     |void
-
 int            |module_init    |const struct modinfo * const *, size_t
 int            |module_fini    |const struct modinfo *
 int            |kernelfsym_load|void *, uint64_t, char *, uint64_t
diff -r f6d8b24e5136 -r a9c9bd8a2da8 sys/rump/librump/rumpkern/rumpkern_if_priv.h
--- a/sys/rump/librump/rumpkern/rumpkern_if_priv.h      Mon Mar 10 22:38:53 2014 +0000
+++ b/sys/rump/librump/rumpkern/rumpkern_if_priv.h      Mon Mar 10 22:44:10 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpkern_if_priv.h,v 1.13 2013/03/07 18:50:17 pooka Exp $      */
+/*     $NetBSD: rumpkern_if_priv.h,v 1.14 2014/03/10 22:44:11 pooka Exp $      */
 
 /*
  * Automatically generated.  DO NOT EDIT.
@@ -6,7 +6,6 @@
  * by:   NetBSD: makerumpif.sh,v 1.6 2013/02/14 10:54:54 pooka Exp 
  */
 
-int rump_getversion(void);
 int rump_module_init(const struct modinfo * const *, size_t);
 int rump_module_fini(const struct modinfo *);
 int rump_kernelfsym_load(void *, uint64_t, char *, uint64_t);
diff -r f6d8b24e5136 -r a9c9bd8a2da8 sys/rump/librump/rumpkern/rumpkern_if_wrappers.c
--- a/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c  Mon Mar 10 22:38:53 2014 +0000
+++ b/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c  Mon Mar 10 22:44:10 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpkern_if_wrappers.c,v 1.13 2013/03/07 18:50:17 pooka Exp $  */
+/*     $NetBSD: rumpkern_if_wrappers.c,v 1.14 2014/03/10 22:44:11 pooka Exp $  */
 
 /*
  * Automatically generated.  DO NOT EDIT.
@@ -24,18 +24,6 @@
 }
 
 int
-rump_pub_getversion(void)
-{
-       int rv;
-
-       rump_schedule();
-       rv = rump_getversion();
-       rump_unschedule();
-
-       return rv;
-}
-
-int
 rump_pub_module_init(const struct modinfo * const *arg1, size_t arg2)
 {
        int rv;