summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2005-07-29 19:40:39 +0000
committerjhb <jhb@FreeBSD.org>2005-07-29 19:40:39 +0000
commit114f6b764dc0d3dd378fd79c55dd4c8f340b8a71 (patch)
tree104a8c7ab650a8b3e4674f18d6b957489e7d57ad /sys
parentb27bc13318d5bdb49f4bf2b44073462741413797 (diff)
downloadFreeBSD-src-114f6b764dc0d3dd378fd79c55dd4c8f340b8a71.zip
FreeBSD-src-114f6b764dc0d3dd378fd79c55dd4c8f340b8a71.tar.gz
Move MODULE_DEPEND() statements for SYSVIPC dependencies to linux_ipc.c
so that they aren't duplicated 3 times and are also in the same file as the code that depends on the SYSVIPC modules.
Diffstat (limited to 'sys')
-rw-r--r--sys/alpha/linux/linux_sysvec.c5
-rw-r--r--sys/amd64/linux32/linux32_sysvec.c3
-rw-r--r--sys/compat/linux/linux_ipc.c4
-rw-r--r--sys/i386/linux/linux_sysvec.c3
4 files changed, 5 insertions, 10 deletions
diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index a09dfdc..784ec81 100644
--- a/sys/alpha/linux/linux_sysvec.c
+++ b/sys/alpha/linux/linux_sysvec.c
@@ -66,10 +66,6 @@ __FBSDID("$FreeBSD$");
#undef szsigcode
MODULE_VERSION(linux, 1);
-MODULE_DEPEND(linux, osf1, 1, 1, 1);
-MODULE_DEPEND(linux, sysvmsg, 1, 1, 1);
-MODULE_DEPEND(linux, sysvsem, 1, 1, 1);
-MODULE_DEPEND(linux, sysvshm, 1, 1, 1);
MALLOC_DEFINE(M_LINUX, "linux", "Linux mode structures");
@@ -288,4 +284,5 @@ static moduledata_t linux_elf_mod = {
DUMMY(rt_sigreturn);
+MODULE_DEPEND(linux, osf1, 1, 1, 1);
DECLARE_MODULE(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY);
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index 8e0fc95..4ac409a 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -84,9 +84,6 @@ __FBSDID("$FreeBSD$");
#include <compat/linux/linux_util.h>
MODULE_VERSION(linux, 1);
-MODULE_DEPEND(linux, sysvmsg, 1, 1, 1);
-MODULE_DEPEND(linux, sysvsem, 1, 1, 1);
-MODULE_DEPEND(linux, sysvshm, 1, 1, 1);
MALLOC_DEFINE(M_LINUX, "linux", "Linux mode structures");
diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index 83c0188..0989847 100644
--- a/sys/compat/linux/linux_ipc.c
+++ b/sys/compat/linux/linux_ipc.c
@@ -815,3 +815,7 @@ linux_shmctl(struct thread *td, struct linux_shmctl_args *args)
return EINVAL;
}
}
+
+MODULE_DEPEND(linux, sysvmsg, 1, 1, 1);
+MODULE_DEPEND(linux, sysvsem, 1, 1, 1);
+MODULE_DEPEND(linux, sysvshm, 1, 1, 1);
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index c20556f..db1b617 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -73,9 +73,6 @@ __FBSDID("$FreeBSD$");
#include <compat/linux/linux_util.h>
MODULE_VERSION(linux, 1);
-MODULE_DEPEND(linux, sysvmsg, 1, 1, 1);
-MODULE_DEPEND(linux, sysvsem, 1, 1, 1);
-MODULE_DEPEND(linux, sysvshm, 1, 1, 1);
MALLOC_DEFINE(M_LINUX, "linux", "Linux mode structures");
OpenPOWER on IntegriCloud