Rename rumpuser_dl_module_bootstrap() to rumpuser_dl_bootstrap(),
since it hasn't been involved only with modules for quite a while now.
This commit is contained in:
parent
28b2fc3a6f
commit
5b02e50b03
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: rumpuser.h,v 1.35 2009/12/23 17:17:59 stacktic Exp $ */
|
/* $NetBSD: rumpuser.h,v 1.36 2010/02/26 15:23:20 pooka Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
|
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
|
||||||
|
@ -200,6 +200,6 @@ typedef struct prop_dictionary *prop_dictionary_t;
|
||||||
struct modinfo;
|
struct modinfo;
|
||||||
typedef int (*rump_modinit_fn)(struct modinfo *, prop_dictionary_t);
|
typedef int (*rump_modinit_fn)(struct modinfo *, prop_dictionary_t);
|
||||||
typedef int (*rump_symload_fn)(void *, uint64_t, char *, uint64_t);
|
typedef int (*rump_symload_fn)(void *, uint64_t, char *, uint64_t);
|
||||||
void rumpuser_dl_module_bootstrap(rump_modinit_fn, rump_symload_fn);
|
void rumpuser_dl_bootstrap(rump_modinit_fn, rump_symload_fn);
|
||||||
|
|
||||||
#endif /* _RUMP_RUMPUSER_H_ */
|
#endif /* _RUMP_RUMPUSER_H_ */
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: rump.c,v 1.152 2010/02/09 16:53:13 pooka Exp $ */
|
/* $NetBSD: rump.c,v 1.153 2010/02/26 15:23:20 pooka Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
|
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.152 2010/02/09 16:53:13 pooka Exp $");
|
__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.153 2010/02/26 15:23:20 pooka Exp $");
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/atomic.h>
|
#include <sys/atomic.h>
|
||||||
|
@ -299,7 +299,7 @@ rump__init(int rump_version)
|
||||||
|
|
||||||
sysctl_finalize();
|
sysctl_finalize();
|
||||||
|
|
||||||
rumpuser_dl_module_bootstrap(rump_module_init, rump_kernelfsym_load);
|
rumpuser_dl_bootstrap(rump_module_init, rump_kernelfsym_load);
|
||||||
|
|
||||||
rumpuser_gethostname(hostname, MAXHOSTNAMELEN, &error);
|
rumpuser_gethostname(hostname, MAXHOSTNAMELEN, &error);
|
||||||
hostnamelen = strlen(hostname);
|
hostnamelen = strlen(hostname);
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: rumpuser_dl.c,v 1.11 2009/12/08 08:12:49 stacktic Exp $ */
|
/* $NetBSD: rumpuser_dl.c,v 1.12 2010/02/26 15:23:20 pooka Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
|
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
|
||||||
|
@ -31,7 +31,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
__RCSID("$NetBSD: rumpuser_dl.c,v 1.11 2009/12/08 08:12:49 stacktic Exp $");
|
__RCSID("$NetBSD: rumpuser_dl.c,v 1.12 2010/02/26 15:23:20 pooka Exp $");
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
@ -332,7 +332,7 @@ process(const char *soname, rump_modinit_fn domodinit)
|
||||||
* from all objects in the linkmap.
|
* from all objects in the linkmap.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
rumpuser_dl_module_bootstrap(rump_modinit_fn domodinit,
|
rumpuser_dl_bootstrap(rump_modinit_fn domodinit,
|
||||||
rump_symload_fn symload)
|
rump_symload_fn symload)
|
||||||
{
|
{
|
||||||
struct link_map *map, *origmap;
|
struct link_map *map, *origmap;
|
||||||
|
@ -404,11 +404,10 @@ rumpuser_dl_module_bootstrap(rump_modinit_fn domodinit,
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
void
|
void
|
||||||
rumpuser_dl_module_bootstrap(rump_modinit_fn domodinit,
|
rumpuser_dl_bootstrap(rump_modinit_fn domodinit,
|
||||||
rump_symload_fn symload)
|
rump_symload_fn symload)
|
||||||
{
|
{
|
||||||
|
|
||||||
fprintf(stderr, "Warning, dlinfo() unsupported on host?\n");
|
fprintf(stderr, "Warning, dlinfo() unsupported on host?\n");
|
||||||
fprintf(stderr, "module bootstrap unavailable\n");
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue