diff --git a/sys/rump/include/rump/rumpuser.h b/sys/rump/include/rump/rumpuser.h index 0bd62f527e5d..d5ca07faff15 100644 --- a/sys/rump/include/rump/rumpuser.h +++ b/sys/rump/include/rump/rumpuser.h @@ -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. @@ -200,6 +200,6 @@ typedef struct prop_dictionary *prop_dictionary_t; struct modinfo; typedef int (*rump_modinit_fn)(struct modinfo *, prop_dictionary_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_ */ diff --git a/sys/rump/librump/rumpkern/rump.c b/sys/rump/librump/rumpkern/rump.c index 41bbb5e71a49..29352ef3cc68 100644 --- a/sys/rump/librump/rumpkern/rump.c +++ b/sys/rump/librump/rumpkern/rump.c @@ -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. @@ -28,7 +28,7 @@ */ #include -__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 #include @@ -299,7 +299,7 @@ rump__init(int rump_version) 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); hostnamelen = strlen(hostname); diff --git a/sys/rump/librump/rumpuser/rumpuser_dl.c b/sys/rump/librump/rumpuser/rumpuser_dl.c index 0095062cfe28..742ec35e69c1 100644 --- a/sys/rump/librump/rumpuser/rumpuser_dl.c +++ b/sys/rump/librump/rumpuser/rumpuser_dl.c @@ -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. @@ -31,7 +31,7 @@ */ #include -__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 #include @@ -332,7 +332,7 @@ process(const char *soname, rump_modinit_fn domodinit) * from all objects in the linkmap. */ void -rumpuser_dl_module_bootstrap(rump_modinit_fn domodinit, +rumpuser_dl_bootstrap(rump_modinit_fn domodinit, rump_symload_fn symload) { struct link_map *map, *origmap; @@ -404,11 +404,10 @@ rumpuser_dl_module_bootstrap(rump_modinit_fn domodinit, } #else void -rumpuser_dl_module_bootstrap(rump_modinit_fn domodinit, +rumpuser_dl_bootstrap(rump_modinit_fn domodinit, rump_symload_fn symload) { fprintf(stderr, "Warning, dlinfo() unsupported on host?\n"); - fprintf(stderr, "module bootstrap unavailable\n"); } #endif