summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--share/lkm/vfs/module/Makefile17
-rw-r--r--share/lkm/vfs/module/kernfsmod.c12
2 files changed, 17 insertions, 12 deletions
diff --git a/share/lkm/vfs/module/Makefile b/share/lkm/vfs/module/Makefile
index fbad9aa0e84..93e2263547b 100644
--- a/share/lkm/vfs/module/Makefile
+++ b/share/lkm/vfs/module/Makefile
@@ -33,7 +33,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $Id: Makefile,v 1.2 1997/03/03 05:10:56 flipk Exp $
+# $Id: Makefile,v 1.3 2000/01/28 05:29:59 fgsch Exp $
#
SRCS=kernfsmod.c
@@ -58,18 +58,21 @@ load:
unload:
modunload -n $(KMOD)
-kernfs_vfsops.o: /sys/miscfs/kernfs/kernfs_vfsops.c vnode_if.h
+kernfs_vfsops.o: /sys/miscfs/kernfs/kernfs_vfsops.c
$(CC) $(CFLAGS) -c -o $@ $<
-kernfs_vnops.o: /sys/miscfs/kernfs/kernfs_vnops.c vnode_if.h
+kernfs_vnops.o: /sys/miscfs/kernfs/kernfs_vnops.c
$(CC) $(CFLAGS) -c -o $@ $<
-vnode_if.h: /sys/kern/vnode_if.sh /sys/kern/vnode_if.src
- sh /sys/kern/vnode_if.sh /sys/kern/vnode_if.src
-
$(MODOBJ): $(OBJS) $(KOBJS)
$(LD) -r -o $(MODOBJ) $(OBJS) $(KOBJS)
+.include <bsd.own.mk>
+
+.if (${UVM} == "yes")
+CFLAGS+=-DUVM
+.endif
+
#
-# EOF -- This file has not been truncated
+# EOF -- This file has not been truncated.
#
diff --git a/share/lkm/vfs/module/kernfsmod.c b/share/lkm/vfs/module/kernfsmod.c
index 17becd7d755..7eb3cf1a931 100644
--- a/share/lkm/vfs/module/kernfsmod.c
+++ b/share/lkm/vfs/module/kernfsmod.c
@@ -33,11 +33,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: kernfsmod.c,v 1.1 1995/10/18 08:44:22 deraadt Exp $
+ * $Id: kernfsmod.c,v 1.2 2000/01/28 05:29:59 fgsch Exp $
*/
-#define printf I_HATE_ANSI
-#include <stdio.h>
-#undef printf
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/systm.h>
@@ -54,6 +51,10 @@
extern struct vfsops kernfs_vfsops;
extern struct vnodeopv_desc kernfs_vnodeop_opv_desc;
+struct vfsconf kernfs_vfsconf = {
+ &kernfs_vfsops, MOUNT_KERNFS, 11, 0, 0, NULL, NULL
+};
+
/*
* XXX THE FOLLOWING COMMENT IS PROBABLY BOGUS... - cgd, 12/24/94
* Currently, the mount system call is broken in the way it operates
@@ -68,7 +69,7 @@ extern struct vnodeopv_desc kernfs_vnodeop_opv_desc;
* change the file system operation: for instance, in ISOFS, this
* could be used to enable/disable Rockridge extensions.
*/
-MOD_VFS("kernfs", -1, &kernfs_vfsops)
+MOD_VFS("kernfs", -1, &kernfs_vfsconf)
/*
* External entry point; should generally match name of .o file. The
@@ -89,6 +90,7 @@ MOD_VFS("kernfs", -1, &kernfs_vfsops)
* The entry point should return 0 unless it is refusing load (in which
* case it should return an errno from errno.h).
*/
+int
kernfsmod(lkmtp, cmd, ver)
struct lkm_table *lkmtp;
int cmd;