This commit was manufactured by cvs2svn to create tag 'RELEASE_7_0_0'.release/7.0.0

3 files changed, 0 insertions, 92 deletions

diff --git a/emulators/kqemu-kmod-devel/files/kqemu.in b/emulators/kqemu-kmod-devel/files/kqemu.in
deleted file mode 100644
index 7662ca3cccd1..000000000000
--- a/emulators/kqemu-kmod-devel/files/kqemu.in
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-# PROVIDE: kqemu
-# KEYWORD: nojail
-#
-# Add the following line to /etc/rc.conf[.local] to enable kqemu
-#
-# kqemu_enable="YES"
-#
-
-. /etc/rc.subr
-
-name="kqemu"
-rcvar=${name}_enable
-
-load_rc_config $name
-
-: ${kqemu_enable="NO"}
-
-start_cmd=kqemu_start
-stop_cmd=kqemu_stop
-
-kqemu_start()
-{
-	# load aio if needed
-	if ! kldstat -qm aio; then
-		if kldload aio; then
-			info 'aio module loaded.'
-		else
-			warn 'aio module failed to load.'
-			return 1
-		fi
-	fi
-	if ! kldstat -qm kqemu; then
-		if kldload kqemu; then
-			echo 'kqemu module loaded.'
-		else
-			warn 'kqemu module failed to load.'
-			return 1
-		fi
-	fi
-	return 0
-}
-
-kqemu_stop()
-{
-	if kldstat -qm kqemu && kldunload kqemu; then
-		echo 'kqemu module unloaded.'
-	fi
-}
-
-run_rc_command "$1"
diff --git a/emulators/kqemu-kmod-devel/files/patch-Makefile.freebsd b/emulators/kqemu-kmod-devel/files/patch-Makefile.freebsd
deleted file mode 100644
index b75420fa0cc7..000000000000
--- a/emulators/kqemu-kmod-devel/files/patch-Makefile.freebsd
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.freebsd.orig	Fri Jul 29 06:37:06 2005
-+++ Makefile.freebsd	Tue Oct 25 21:08:43 2005
-@@ -5,6 +5,7 @@
- .elif ${MACHINE_ARCH} == "amd64"
- OBJS=	kqemu-mod-x86_64.o
- .endif
-+CC=	cc
- WERROR=
- 
- .include <bsd.kmod.mk>
diff --git a/emulators/kqemu-kmod-devel/files/patch-kqemu-freebsd.c b/emulators/kqemu-kmod-devel/files/patch-kqemu-freebsd.c
deleted file mode 100644
index 73e23f4b7d24..000000000000
--- a/emulators/kqemu-kmod-devel/files/patch-kqemu-freebsd.c
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: kqemu-freebsd.c
-@@ -208,9 +208,17 @@
- int CDECL kqemu_schedule(void)
- {
-     /* kqemu_log("kqemu_schedule\n"); */
-+#if __FreeBSD_version < 700044
-     mtx_lock_spin(&sched_lock);
-     mi_switch(SW_VOL, NULL);
-     mtx_unlock_spin(&sched_lock);
-+#else
-+    /* -current no longer uses sched_lock */
-+    struct thread *td = curthread;
-+    thread_lock(td);
-+    mi_switch(SW_VOL, NULL);
-+    thread_unlock(td);
-+#endif
-     return SIGPENDING(curthread);
- }
- #endif
-@@ -320,6 +328,9 @@
- #if __FreeBSD_version >= 500000
-     dev->si_drv1 = NULL;
-     TAILQ_REMOVE(&kqemuhead, ks, kqemu_ent);
-+#if __FreeBSD_version >= 700024
-+    dev_relthread(dev); 
-+#endif
-     destroy_dev(dev);
- #endif
-     free(ks, M_KQEMU);