Module Name: src
Committed By: pooka
Date: Mon Mar 10 22:44:11 UTC 2014
Modified Files:
src/sys/rump/include/rump: rump.h rumpkern_if_pub.h
src/sys/rump/librump/rumpkern: rump.c rumpkern.ifspec
rumpkern_if_priv.h rumpkern_if_wrappers.c
Log Message:
rump_getversion() does not require a thread context, so make it a straight
call instead of being wrapped around rump_pub_getversion().
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/rump/include/rump/rump.h
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/include/rump/rumpkern_if_pub.h
cvs rdiff -u -r1.288 -r1.289 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/librump/rumpkern/rumpkern.ifspec
cvs rdiff -u -r1.13 -r1.14 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h \
src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.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/rump/include/rump/rump.h
diff -u src/sys/rump/include/rump/rump.h:1.59 src/sys/rump/include/rump/rump.h:1.60
--- src/sys/rump/include/rump/rump.h:1.59 Mon Mar 10 22:38:53 2014
+++ src/sys/rump/include/rump/rump.h Mon Mar 10 22:44:10 2014
@@ -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 @@ enum rump_etfs_type {
_BEGIN_DECLS
#endif
+int rump_getversion(void);
int rump_nativeabi_p(void);
int rump_boot_gethowto(void);
Index: src/sys/rump/include/rump/rumpkern_if_pub.h
diff -u src/sys/rump/include/rump/rumpkern_if_pub.h:1.14 src/sys/rump/include/rump/rumpkern_if_pub.h:1.15
--- src/sys/rump/include/rump/rumpkern_if_pub.h:1.14 Thu Mar 7 18:51:02 2013
+++ src/sys/rump/include/rump/rumpkern_if_pub.h Mon Mar 10 22:44:10 2014
@@ -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);
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.288 src/sys/rump/librump/rumpkern/rump.c:1.289
--- src/sys/rump/librump/rumpkern/rump.c:1.288 Mon Mar 10 22:38:53 2014
+++ src/sys/rump/librump/rumpkern/rump.c Mon Mar 10 22:44:11 2014
@@ -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 @@ rump_getversion(void)
return __NetBSD_Version__;
}
+/* compat */
+__strong_alias(rump_pub_getversion,rump_getversion);
int
rump_nativeabi_p(void)
Index: src/sys/rump/librump/rumpkern/rumpkern.ifspec
diff -u src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.11 src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.12
--- src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.11 Thu Mar 7 18:49:13 2013
+++ src/sys/rump/librump/rumpkern/rumpkern.ifspec Mon Mar 10 22:44:11 2014
@@ -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 @@ WRAPPERS|librump/rumpkern/rumpkern_if_wr
; 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
Index: src/sys/rump/librump/rumpkern/rumpkern_if_priv.h
diff -u src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.13 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.14
--- src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.13 Thu Mar 7 18:50:17 2013
+++ src/sys/rump/librump/rumpkern/rumpkern_if_priv.h Mon Mar 10 22:44:11 2014
@@ -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);
Index: src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c
diff -u src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c:1.13 src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c:1.14
--- src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c:1.13 Thu Mar 7 18:50:17 2013
+++ src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c Mon Mar 10 22:44:11 2014
@@ -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 @@ rump_kern_unavailable(void)
}
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;
