From owner-p4-projects Wed Dec 4 9:21: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2CAC37B404; Wed, 4 Dec 2002 09:20:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B2FF37B401 for ; Wed, 4 Dec 2002 09:20:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA15D43EA9 for ; Wed, 4 Dec 2002 09:20:56 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gB4HGfmV061701 for ; Wed, 4 Dec 2002 09:16:41 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gB4HGeL0061694 for perforce@freebsd.org; Wed, 4 Dec 2002 09:16:40 -0800 (PST) Date: Wed, 4 Dec 2002 09:16:40 -0800 (PST) Message-Id: <200212041716.gB4HGeL0061694@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 21918 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21918 Change 21918 by jhb@jhb_laptop on 2002/12/04 09:16:25 - Add a MI "linux" module that depends on the sysv modules. - Make the MD "linuxelf" and i386-only "linuxaout" depend on "linux". - Make the alpha "linuxelf" module depend on "osf1". This should fix all the linux module dependency bogons. Affected files ... .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#9 edit .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#30 edit .. //depot/projects/smpng/sys/i386/linux/imgact_linux.c#9 edit .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#24 edit Differences ... ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#9 (text+ko) ==== @@ -63,12 +63,6 @@ #include #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"); #if BYTE_ORDER == LITTLE_ENDIAN @@ -282,4 +276,6 @@ DUMMY(rt_sigreturn); +MODULE_DEPEND(linuxelf, osf1, 1, 1, 1); +MODULE_DEPEND(linuxelf, linux, 1, 1, 1); DECLARE_MODULE(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY); ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#30 (text+ko) ==== @@ -1317,3 +1317,16 @@ bsd.pid = args->pid; return getsid(td, &bsd); } + +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); + +static moduledata_t linux_mod = { + "linux", + NULL, + 0 +}; + +DECLARE_MODULE(linux, linux_mod, SI_SUB_EXEC, SI_ORDER_ANY); ==== //depot/projects/smpng/sys/i386/linux/imgact_linux.c#9 (text+ko) ==== @@ -242,4 +242,5 @@ * Tell kern_execve.c about it, with a little help from the linker. */ static struct execsw linux_execsw = { exec_linux_imgact, "linux a.out" }; +MODULE_DEPEND(linuxaout, linux, 1, 1, 1); EXEC_SET(linuxaout, linux_execsw); ==== //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#24 (text+ko) ==== @@ -73,11 +73,6 @@ #include #include -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"); #if BYTE_ORDER == LITTLE_ENDIAN @@ -938,4 +933,5 @@ 0 }; +MODULE_DEPEND(linuxelf, linux, 1, 1, 1); DECLARE_MODULE(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message