[src/trunk]: src/sys Revert "stopcap fix" for rump by christos, which causes ...

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

details:   https://anonhg.NetBSD.org/src/rev/4436e7404a83
branches:  trunk
changeset: 771638:4436e7404a83
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Nov 27 00:38:12 2011 +0000

description:
Revert "stopcap fix" for rump by christos, which causes build failure on
most non-x86 ports and seems unnecessary. (caused by wrong rump_namei.h?)

diffstat:

 sys/kern/subr_disk_open.c                   |  6 ++----
 sys/rump/librump/rumpkern/Makefile.rumpkern |  3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diffs (51 lines):

diff -r 78fd923452a1 -r 4436e7404a83 sys/kern/subr_disk_open.c
--- a/sys/kern/subr_disk_open.c Sun Nov 27 00:09:04 2011 +0000
+++ b/sys/kern/subr_disk_open.c Sun Nov 27 00:38:12 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_disk_open.c,v 1.5 2011/11/25 17:53:20 christos Exp $      */
+/*     $NetBSD: subr_disk_open.c,v 1.6 2011/11/27 00:38:12 tsutsui Exp $       */
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_disk_open.c,v 1.5 2011/11/25 17:53:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk_open.c,v 1.6 2011/11/27 00:38:12 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -39,7 +39,6 @@
 #include <sys/vnode.h>
 #include <miscfs/specfs/specdev.h>
 
-#ifndef _RUMPKERNEL
 struct vnode *
 opendisk(struct device *dv)
 {
@@ -110,7 +109,6 @@
 
        return error;
 }
-#endif
 
 int
 getdiskinfo(struct vnode *vp, struct dkwedge_info *dkw)
diff -r 78fd923452a1 -r 4436e7404a83 sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern       Sun Nov 27 00:09:04 2011 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern       Sun Nov 27 00:38:12 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpkern,v 1.112 2011/11/25 17:54:15 christos Exp $
+#      $NetBSD: Makefile.rumpkern,v 1.113 2011/11/27 00:38:12 tsutsui Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -84,7 +84,6 @@
        subr_callback.c         \
        subr_copy.c             \
        subr_device.c           \
-       subr_disk_open.c        \
        subr_evcnt.c            \
        subr_extent.c           \
        subr_hash.c             \