Module Name: src
Committed By: tsutsui
Date: Sun Nov 27 00:38:12 UTC 2011
Modified Files:
src/sys/kern: subr_disk_open.c
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Log Message:
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?)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/kern/subr_disk_open.c
cvs rdiff -u -r1.112 -r1.113 src/sys/rump/librump/rumpkern/Makefile.rumpkern
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_disk_open.c
diff -u src/sys/kern/subr_disk_open.c:1.5 src/sys/kern/subr_disk_open.c:1.6
--- src/sys/kern/subr_disk_open.c:1.5 Fri Nov 25 17:53:20 2011
+++ src/sys/kern/subr_disk_open.c Sun Nov 27 00:38:12 2011
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: subr_disk_op
#include <sys/vnode.h>
#include <miscfs/specfs/specdev.h>
-#ifndef _RUMPKERNEL
struct vnode *
opendisk(struct device *dv)
{
@@ -110,7 +109,6 @@ getdisksize(struct vnode *vp, uint64_t *
return error;
}
-#endif
int
getdiskinfo(struct vnode *vp, struct dkwedge_info *dkw)
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.112 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.113
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.112 Fri Nov 25 17:54:15 2011
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Sun Nov 27 00:38:12 2011
@@ -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 @@ SRCS+= init_sysctl_base.c \
subr_callback.c \
subr_copy.c \
subr_device.c \
- subr_disk_open.c \
subr_evcnt.c \
subr_extent.c \
subr_hash.c \
