Move dsched to sys/kern/.
authorSascha Wildner <saw@online.de>
Sun, 25 Apr 2010 14:30:58 +0000 (16:30 +0200)
committerSascha Wildner <saw@online.de>
Sun, 25 Apr 2010 14:31:22 +0000 (16:31 +0200)
sys/Makefile
sys/Makefile.modules
sys/conf/files
sys/dsched/fq/Makefile [deleted file]
sys/kern/Makefile
sys/kern/dsched/Makefile [moved from sys/dsched/Makefile with 100% similarity]
sys/kern/dsched/fq/Makefile [new file with mode: 0644]
sys/kern/dsched/fq/flow.txt [moved from sys/dsched/fq/flow.txt with 100% similarity]
sys/kern/dsched/fq/fq.h [moved from sys/dsched/fq/dsched_fq.h with 100% similarity]
sys/kern/dsched/fq/fq_core.c [moved from sys/dsched/fq/dsched_fq_core.c with 99% similarity]
sys/kern/dsched/fq/fq_diskops.c [moved from sys/dsched/fq/dsched_fq_diskops.c with 99% similarity]

index eec32db..06dca54 100644 (file)
@@ -14,7 +14,6 @@ SUBDIR+=${MODULES_OVERRIDE}
 .else
 SUBDIR+=bus crypto emulation dev kern net netbt netgraph netproto vfs
 SUBDIR+=libiconv
-SUBDIR+=dsched
 .endif
 .endif
 
index 9081671..bd5f3ba 100644 (file)
@@ -9,7 +9,6 @@ SUBDIR=bus
 .endif
 SUBDIR+=crypto emulation dev kern net netbt netgraph netproto vfs
 SUBDIR+=libiconv
-SUBDIR+=dsched
 .endif
 
 .include <bsd.subdir.mk>
index 25e52f2..b863401 100644 (file)
@@ -1782,8 +1782,8 @@ ${OSACPI_MI_DIR}/acpi_video/acpi_video.c  optional acpi_video acpi
 ${OSACPI_MI_DIR}/aibs/atk0110.c                        optional aibs acpi
 
 #dsched stuff
-dsched/fq/dsched_fq_core.c             optional dsched_fq
-dsched/fq/dsched_fq_diskops.c          optional dsched_fq
+kern/dsched/fq/fq_core.c               optional dsched_fq
+kern/dsched/fq/fq_diskops.c            optional dsched_fq
 
 # ACPICA code
 ${ACPICA_DIR}/debugger/dbcmds.c                        optional acpi acpi_debug
diff --git a/sys/dsched/fq/Makefile b/sys/dsched/fq/Makefile
deleted file mode 100644 (file)
index 5d15d6f..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-KMOD=  dsched_fq
-SRCS=  dsched_fq_core.c dsched_fq_diskops.c
-
-.include <bsd.kmod.mk>
index 9a2591a..b8d5d36 100644 (file)
@@ -5,7 +5,7 @@
 # Makefile for kernel tags files, init_sysent, etc.
 
 TAGARCH= i386 # luna68k news3400 pmax sparc tahoe vax
-SUBDIR= firmware libmchain
+SUBDIR= dsched firmware libmchain
 
 # Kernel tags:
 # Tags files are built in the top-level directory for each architecture,
similarity index 100%
rename from sys/dsched/Makefile
rename to sys/kern/dsched/Makefile
diff --git a/sys/kern/dsched/fq/Makefile b/sys/kern/dsched/fq/Makefile
new file mode 100644 (file)
index 0000000..5e38e9a
--- /dev/null
@@ -0,0 +1,4 @@
+KMOD=  dsched_fq
+SRCS=  fq_core.c fq_diskops.c
+
+.include <bsd.kmod.mk>
similarity index 99%
rename from sys/dsched/fq/dsched_fq_core.c
rename to sys/kern/dsched/fq/fq_core.c
index 213f2f5..7598430 100644 (file)
@@ -49,7 +49,7 @@
 #include <sys/dsched.h>
 #include <machine/param.h>
 
-#include <dsched/fq/dsched_fq.h>
+#include <kern/dsched/fq/fq.h>
 
 static int     dsched_fq_version_maj = 1;
 static int     dsched_fq_version_min = 0;
similarity index 99%
rename from sys/dsched/fq/dsched_fq_diskops.c
rename to sys/kern/dsched/fq/fq_diskops.c
index 965eae8..3156853 100644 (file)
@@ -49,7 +49,7 @@
 #include <sys/dsched.h>
 #include <machine/param.h>
 
-#include <dsched/fq/dsched_fq.h>
+#include <kern/dsched/fq/fq.h>
 
 static dsched_prepare_t                fq_prepare;
 static dsched_teardown_t       fq_teardown;