Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't compile kern_lock for rump any more, it's no longer required.

Browse Source 
Allows us to get rid of the incorrect _RUMPKERNEL ifdefs outside sys/rump.
This commit is contained in:
pooka 2008-06-25 13:16:58 +00:00
parent 2b1a1a9c7f
commit d496f014ff
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/kern/kern_lock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_lock.c,v 1.144 2008/05/31 13:15:21 ad Exp $ */
/* $NetBSD: kern_lock.c,v 1.145 2008/06/25 13:16:58 pooka Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.144 2008/05/31 13:15:21 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.145 2008/06/25 13:16:58 pooka Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@ -59,7 +59,6 @@ __cpu_simple_lock_t kernel_lock[CACHE_LINE_SIZE / sizeof(__cpu_simple_lock_t)]
void
assert_sleepable(void)
{
#if !defined(_RUMPKERNEL)
const char *reason;
if (panicstr != NULL) {
@ -83,18 +82,9 @@ assert_sleepable(void)
panic("%s: %s caller=%p", __func__, reason,
(void *)RETURN_ADDRESS);
}
#endif /* !defined(_RUMPKERNEL) */
}
#endif /* defined(DEBUG) || defined(LKM) */
/*
* rump doesn't need the kernel lock so force it out. We cannot
* currently easily include it for compilation because of
* a) SPINLOCK_* b) membar_producer(). They are defined in different
* places / way for each arch, so just simply do not bother to
* fight a lot for no gain (i.e. pain but still no gain).
*/
#ifndef _RUMPKERNEL
/*
* Functions for manipulating the kernel_lock. We put them here
* so that they show up in profiles.
@ -307,4 +297,3 @@ _kernel_unlock(int nlocks, int *countp)
if (countp != NULL)
*countp = olocks;
}
#endif /* !_RUMPKERNEL */

4
sys/rump/librump/rumpkern/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.35 2008/06/05 12:43:52 ad Exp $
# $NetBSD: Makefile,v 1.36 2008/06/25 13:16:58 pooka Exp $
#
.include <bsd.own.mk>
@ -19,7 +19,7 @@ SRCS= rump.c atomic.c auth.c emul.c intr.c genfs_io.c locks.c \
SRCS+= fstrans_stub.c misc_stub.c pmap_stub.c vfsops_stub.c
# sys/kern
SRCS+= clock_subr.c kern_descrip.c kern_lock.c kern_stub.c param.c \
SRCS+= clock_subr.c kern_descrip.c kern_stub.c param.c \
subr_bufq.c subr_hash.c subr_prf2.c subr_specificdata.c \
subr_time.c subr_workqueue.c sys_descrip.c sys_generic.c vfs_bio.c \
vfs_cache.c vfs_getcwd.c vfs_hooks.c vfs_init.c vfs_lookup.c \

9
sys/rump/librump/rumpkern/emul.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: emul.c,v 1.40 2008/06/24 14:11:44 pooka Exp $ */
/* $NetBSD: emul.c,v 1.41 2008/06/25 13:16:58 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@ -568,3 +568,10 @@ device_xname(device_t dv)
{
return "bogus0";
}
void
assert_sleepable(void)
{
/* always sleepable, although we should improve this */
}