Module Name: src Committed By: pooka Date: Fri Apr 25 18:31:35 UTC 2014
Modified Files: src/sys/rump/librump/rumpkern: kobj_rename.c src/sys/rump/librump/rumpvfs: rump_vfs.c Log Message: gardenize: function calls over #ifdefs To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpkern/kobj_rename.c cvs rdiff -u -r1.77 -r1.78 src/sys/rump/librump/rumpvfs/rump_vfs.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/librump/rumpkern/kobj_rename.c diff -u src/sys/rump/librump/rumpkern/kobj_rename.c:1.1 src/sys/rump/librump/rumpkern/kobj_rename.c:1.2 --- src/sys/rump/librump/rumpkern/kobj_rename.c:1.1 Mon Apr 26 23:17:13 2010 +++ src/sys/rump/librump/rumpkern/kobj_rename.c Fri Apr 25 18:31:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kobj_rename.c,v 1.1 2010/04/26 23:17:13 pooka Exp $ */ +/* $NetBSD: kobj_rename.c,v 1.2 2014/04/25 18:31:35 pooka Exp $ */ /*- * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kobj_rename.c,v 1.1 2010/04/26 23:17:13 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kobj_rename.c,v 1.2 2014/04/25 18:31:35 pooka Exp $"); #define ELFSIZE ARCH_ELFSIZE @@ -36,6 +36,8 @@ __KERNEL_RCSID(0, "$NetBSD: kobj_rename. #include <sys/kobj.h> #include <sys/systm.h> +#include <rump/rump.h> + /* * Mangle symbols into rump kernel namespace. This means * putting "rumpns" in front of select symbols. @@ -70,15 +72,12 @@ kobj_renamespace(Elf_Sym *symtab, size_t size_t worktabsz, worktabidx; unsigned i; const size_t prefixlen = strlen(RUMPNS); - -#ifndef _RUMP_NATIVE_ABI static int warned; - if (!warned) { + if (!rump_nativeabi_p() && !warned) { printf("warning: kernel ABI not supported on this arch\n"); warned = 1; } -#endif /* allocate space for worst-case stringtab */ worktabsz = *strtabsz + symcount * prefixlen; Index: src/sys/rump/librump/rumpvfs/rump_vfs.c diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.77 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.78 --- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.77 Mon Jun 10 19:48:22 2013 +++ src/sys/rump/librump/rumpvfs/rump_vfs.c Fri Apr 25 18:31:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_vfs.c,v 1.77 2013/06/10 19:48:22 pooka Exp $ */ +/* $NetBSD: rump_vfs.c,v 1.78 2014/04/25 18:31:35 pooka Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.77 2013/06/10 19:48:22 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.78 2014/04/25 18:31:35 pooka Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -93,6 +93,7 @@ RUMP_COMPONENT(RUMP__FACTION_VFS) { extern struct vfsops rumpfs_vfsops; char buf[64]; + char *mbase; int rv, i; /* initialize indirect interfaces */ @@ -153,20 +154,17 @@ RUMP_COMPONENT(RUMP__FACTION_VFS) * host module directory to rump. This means that kernel * modules from the host will be autoloaded to rump kernels. */ -#ifdef _RUMP_NATIVE_ABI - { - char *mbase; - - if (rumpuser_getparam("RUMP_MODULEBASE", buf, sizeof(buf)) == 0) - mbase = buf; - else - mbase = module_base; - - if (strlen(mbase) != 0 && *mbase != '0') { - rump_etfs_register(module_base, mbase, RUMP_ETFS_DIR_SUBDIRS); - } + if (rump_nativeabi_p()) { + if (rumpuser_getparam("RUMP_MODULEBASE", buf, sizeof(buf)) == 0) + mbase = buf; + else + mbase = module_base; + + if (strlen(mbase) != 0 && *mbase != '0') { + rump_etfs_register(module_base, mbase, + RUMP_ETFS_DIR_SUBDIRS); + } } -#endif module_init_class(MODULE_CLASS_VFS);