[src/trunk]: src/sys/rump/kern/lib/libsolaris Remove the unneeded rump compon...

[njoly <njoly%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/be5be22dd464
branches:  trunk
changeset: 771888:be5be22dd464
user:      njoly <njoly%NetBSD.org@localhost>
date:      Tue Dec 06 18:12:25 2011 +0000

description:
Remove the unneeded rump component; the library already includes the
module code that will be initialised by rump.

Fix PR/44708, t_zpool:create test failure for RUMP_LOCKDEBUG=yes
builds.

diffstat:

 sys/rump/kern/lib/libsolaris/Makefile    |   7 +---
 sys/rump/kern/lib/libsolaris/component.c |  54 --------------------------------
 2 files changed, 1 insertions(+), 60 deletions(-)

diffs (80 lines):

diff -r 839a93d9a69d -r be5be22dd464 sys/rump/kern/lib/libsolaris/Makefile
--- a/sys/rump/kern/lib/libsolaris/Makefile     Tue Dec 06 18:04:31 2011 +0000
+++ b/sys/rump/kern/lib/libsolaris/Makefile     Tue Dec 06 18:12:25 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2011/01/18 22:21:23 haad Exp $
+#      $NetBSD: Makefile,v 1.2 2011/12/06 18:12:25 njoly Exp $
 #
 
 S!=             cd ${.PARSEDIR}/../../../../;pwd
@@ -7,12 +7,7 @@
 
 LIB=   rumpkern_solaris
 
-# RUMP Stuff
-CPPFLAGS+=      -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpvfs\
-               -I${RUMPTOP}/librump/rumpdev
 CPPFLAGS+=     -DASSERT=KASSERT
 
-SRCS+= component.c
-
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r 839a93d9a69d -r be5be22dd464 sys/rump/kern/lib/libsolaris/component.c
--- a/sys/rump/kern/lib/libsolaris/component.c  Tue Dec 06 18:04:31 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*     $NetBSD: component.c,v 1.1 2011/01/18 22:21:23 haad Exp $ */
-
-/*
- * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.1 2011/01/18 22:21:23 haad Exp $");
-
-#include <sys/param.h>
-#include <sys/conf.h>
-#include <sys/stat.h>
-#include <sys/kthread.h>
-#include <sys/callb.h>
-
-#include "rump_private.h"
-#include "rump_vfs_private.h"
-
-void opensolaris_init(void *);
-void opensolaris_fini(void *);
-
-RUMP_COMPONENT(RUMP_COMPONENT_KERN_VFS)
-{
-
-       extern void taskq_init(void);
-       extern void taskq_fini(void);
-
-       callb_init(NULL);
-       taskq_init();
-       opensolaris_init(NULL);
-
-       return;
-}