Module Name: src
Committed By: pooka
Date: Sat May 2 14:16:52 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern misc_stub.c
Log Message:
Do not include securelevel, it includes too many dependencies on
vfs in its current form.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.21 -r1.22 src/sys/rump/librump/rumpkern/misc_stub.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.44 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.45
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.44 Wed Apr 29 17:51:47 2009
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Sat May 2 14:16:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.44 2009/04/29 17:51:47 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.45 2009/05/02 14:16:52 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -9,7 +9,7 @@
${RUMPTOP}/../kern \
${RUMPTOP}/../conf \
${RUMPTOP}/../dev \
- ${RUMPTOP}/../secmodel/bsd44 ${RUMPTOP}/../secmodel/securelevel
+ ${RUMPTOP}/../secmodel/bsd44
#
# Source modules, first the ones specifically implemented for librump.
@@ -40,8 +40,7 @@
subr_specificdata.c subr_time.c subr_workqueue.c
# 4.4BSD secmodel. selection is hardcoded for now
-SRCS+= secmodel_bsd44.c secmodel_bsd44_logic.c secmodel_bsd44_suser.c \
- secmodel_securelevel.c
+SRCS+= secmodel_bsd44.c secmodel_bsd44_logic.c secmodel_bsd44_suser.c
# the funny bit. this doesn't really belong here, but helps with the
# needs of kern_descrip.c. And since it's a fully dynamic interface,
Index: src/sys/rump/librump/rumpkern/misc_stub.c
diff -u src/sys/rump/librump/rumpkern/misc_stub.c:1.21 src/sys/rump/librump/rumpkern/misc_stub.c:1.22
--- src/sys/rump/librump/rumpkern/misc_stub.c:1.21 Sun Mar 29 18:22:08 2009
+++ src/sys/rump/librump/rumpkern/misc_stub.c Sat May 2 14:16:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: misc_stub.c,v 1.21 2009/03/29 18:22:08 pooka Exp $ */
+/* $NetBSD: misc_stub.c,v 1.22 2009/05/02 14:16:52 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,18 +28,21 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: misc_stub.c,v 1.21 2009/03/29 18:22:08 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: misc_stub.c,v 1.22 2009/05/02 14:16:52 pooka Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
#include <sys/evcnt.h>
#include <sys/event.h>
+#include <sys/kauth.h>
#include <sys/sched.h>
#include <sys/sysctl.h>
#include <sys/systm.h>
#include <sys/syscallvar.h>
#include <sys/xcall.h>
+#include <secmodel/securelevel/securelevel.h>
+
#ifdef __sparc__
/*
* XXX Least common denominator - smallest sparc pagesize.
@@ -109,3 +112,25 @@
{
}
+
+/*
+ * XXX: bsd44 secmodel depends on securelevel
+ */
+int
+secmodel_securelevel_sysctl(SYSCTLFN_ARGS)
+{
+
+ return 0;
+}
+
+void
+secmodel_securelevel_init()
+{
+
+}
+
+void
+secmodel_securelevel_start()
+{
+
+}
