From d511d5d57ef5b40885eda2c87435ef70a6ef9bf6 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 22 May 2006 06:26:30 +0000 Subject: [PATCH] Mop up remains of the ibcs2/streams/svr4 removal: * Remove streams(4) and svr4(4) manual pages. * Add associated modules and their manual pages to the list of files to be removed upon 'make upgrade'. * Remove IBCS2 and SPX_HACK options. * Change M_ZOMBIE definition back to static. * Fix miscellaneous references & comments. --- etc/Makefile | 7 +- etc/rc.d/abi | 10 +- share/man/man4/kld.4 | 8 +- share/man/man4/man4.i386/Makefile | 4 +- share/man/man4/man4.i386/streams.4 | 79 ---------- share/man/man4/man4.i386/svr4.4 | 222 ----------------------------- share/man/man5/rc.conf.5 | 7 +- sys/Makefile | 3 +- sys/conf/files | 3 +- sys/conf/options | 3 +- sys/conf/options.amd64 | 3 +- sys/conf/options.i386 | 3 +- sys/config/LINT | 3 +- sys/i386/conf/LINT | 3 +- sys/i386/i386/trap.c | 5 +- sys/kern/kern_exit.c | 6 +- sys/platform/pc32/i386/trap.c | 5 +- usr.sbin/config/main.c | 4 +- 18 files changed, 28 insertions(+), 350 deletions(-) delete mode 100644 share/man/man4/man4.i386/streams.4 delete mode 100644 share/man/man4/man4.i386/svr4.4 diff --git a/etc/Makefile b/etc/Makefile index 5feb757ddb..ed1a8fa9bf 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,6 +1,6 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $ -# $DragonFly: src/etc/Makefile,v 1.109 2006/05/17 14:06:36 swildner Exp $ +# $DragonFly: src/etc/Makefile,v 1.110 2006/05/22 06:26:29 swildner Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -400,6 +400,11 @@ upgrade_etc: preupgrade csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}8/mount_umap.8.gz" csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}3/isinff.3.gz" csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}8/isnanf.3.gz" + rm -f ${DESTDIR}/modules/ibcs2.ko + rm -f ${DESTDIR}/modules/streams.ko + csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}4/streams.4.gz" + rm -f ${DESTDIR}/modules/svr4.ko + csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}4/svr4.4.gz" ldconfig -R .if !defined(BINARY_UPGRADE) # binary upgrade just copies these nodes .if !defined(NO_MAKEDEV) diff --git a/etc/rc.d/abi b/etc/rc.d/abi index 7b90b9e4eb..e5259ea8bf 100644 --- a/etc/rc.d/abi +++ b/etc/rc.d/abi @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD: src/etc/rc.d/abi,v 1.2 2003/05/05 15:38:41 mtm Exp $ -# $DragonFly: src/etc/rc.d/abi,v 1.3 2005/11/19 21:47:32 swildner Exp $ +# $DragonFly: src/etc/rc.d/abi,v 1.4 2006/05/22 06:26:29 swildner Exp $ # # PROVIDE: abi @@ -44,12 +44,4 @@ linux_start() load_rc_config $name run_rc_command "$1" -name="svr4" -rcvar=`set_rcvar` -start_precmd="echo -n ' svr4'" -start_cmd="kldload svr4 > /dev/null 2>&1" - -load_rc_config $name -run_rc_command "$1" - echo '.' diff --git a/share/man/man4/kld.4 b/share/man/man4/kld.4 index 5ce4344156..afb734e749 100644 --- a/share/man/man4/kld.4 +++ b/share/man/man4/kld.4 @@ -24,9 +24,9 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man4/kld.4,v 1.5.2.6 2001/08/17 13:08:38 ru Exp $ -.\" $DragonFly: src/share/man/man4/kld.4,v 1.4 2006/02/17 19:37:09 swildner Exp $ +.\" $DragonFly: src/share/man/man4/kld.4,v 1.5 2006/05/22 06:26:29 swildner Exp $ .\" -.Dd November 8, 1998 +.Dd May 21, 2006 .Dt KLD 4 .Os .Sh NAME @@ -56,10 +56,8 @@ system makes extensive use of loadable kernel modules, and provides loadable versions of most filesystems, the .Tn NFS client and server, all the screen-savers, and the -.Tn iBCS2 -and .Tn Linux -emulators. +emulator. .Nm modules are placed by default in the .Pa /modules diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile index c2b7ad0748..1899f97a5f 100644 --- a/share/man/man4/man4.i386/Makefile +++ b/share/man/man4/man4.i386/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.122.2.12 2003/04/15 17:23:32 fjoe Exp $ -# $DragonFly: src/share/man/man4/man4.i386/Makefile,v 1.7 2006/04/30 18:46:39 swildner Exp $ +# $DragonFly: src/share/man/man4/man4.i386/Makefile,v 1.8 2006/05/22 06:26:29 swildner Exp $ MAN= acpi_toshiba.4 aic.4 alpm.4 amdpm.4 apm.4 ar.4 asc.4 asr.4 \ cs.4 cx.4 cy.4 \ @@ -8,7 +8,7 @@ MAN= acpi_toshiba.4 aic.4 alpm.4 amdpm.4 apm.4 ar.4 asc.4 asr.4 \ meteor.4 mse.4 ndis.4 npx.4 \ oltr.4 pcf.4 perfmon.4 pnp.4 \ ray.4 rdp.4 sb.4 sbni.4 scd.4 \ - spkr.4 sr.4 streams.4 svr4.4 tw.4 \ + spkr.4 sr.4 tw.4 \ tx.4 viapm.4 vx.4 \ wl.4 wt.4 diff --git a/share/man/man4/man4.i386/streams.4 b/share/man/man4/man4.i386/streams.4 deleted file mode 100644 index 71dd36001e..0000000000 --- a/share/man/man4/man4.i386/streams.4 +++ /dev/null @@ -1,79 +0,0 @@ -.\" Copyright (c) 2000 Mark Newton -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $FreeBSD: src/share/man/man4/man4.i386/streams.4,v 1.7 2005/01/21 08:36:39 ru Exp $ -.\" $DragonFly: src/share/man/man4/man4.i386/Attic/streams.4,v 1.1 2006/04/30 18:46:39 swildner Exp $ -.Dd November 6, 2000 -.Dt STREAMS 4 i386 -.Os -.Sh NAME -.Nm streams -.Nd System V STREAMS networking ABI support -.Sh SYNOPSIS -To link System V Release 4 (SVR4) STREAMS interprocess communication ABI -support into the kernel: -.Cd pseudo-device streams -.Pp -To load the SVR4 STREAMS interprocess communication ABI support kernel -module: -.Dl kldload streams -.Sh DESCRIPTION -The -.Nm -module provides limited -System V Release 4 STREAMS interprocess communication ABI -(application binary interface) compatibility -for userland applications. -.Pp -Internally, -.Nm -provides STREAMS handles by using socket creation kernel routines, and -adding state-tracking information to the socket to permit manipulation -by STREAMS emulation code in -.Xr svr4 4 . -Hence, opening a stream device produces a result similar to what would be -obtained by calling -.Xr socket 2 . -.Pp -Applications should never use this interface directly: STREAMS -emulation is only provided as a service to support ABI requirements in -the SVR4 environment which -.Xr svr4 4 -needs to present to client binaries. -.Sh SEE ALSO -.Xr svr4 4 -.Sh HISTORY -System V Release 4 ABI support first appeared in -.Fx 4.0 . -The ABI was ported from an equivalent facility present in -.Nx 1.3 -written by Christos Zoulas. -.Sh BUGS -This whole interface is a crude hack to produce STREAMS semantics -through emulation over sockets. -.Pp -Programmers who hope to be able to use this interface to provide -SVR4 STREAMS services to -.Bx -applications will be sorely disappointed. diff --git a/share/man/man4/man4.i386/svr4.4 b/share/man/man4/man4.i386/svr4.4 deleted file mode 100644 index 0f2b73fb51..0000000000 --- a/share/man/man4/man4.i386/svr4.4 +++ /dev/null @@ -1,222 +0,0 @@ -.\" Copyright (c) 2000 Mark Newton -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $FreeBSD: src/share/man/man4/man4.i386/svr4.4,v 1.12 2005/02/13 23:45:49 ru Exp $ -.\" $DragonFly: src/share/man/man4/man4.i386/Attic/svr4.4,v 1.3 2006/05/01 09:22:14 swildner Exp $ -.Dd October 28, 2003 -.Dt SVR4 4 i386 -.Os -.Sh NAME -.Nm svr4 -.Nd System V Release 4 ABI support -.Sh SYNOPSIS -To link System V Release 4 (SVR4) ABI support into the kernel: -.Cd options COMPAT_SVR4 -.Pp -To load the SVR4 ABI support kernel module: -.Bd -literal -offset indent -kldload streams -kldload svr4 -.Ed -.Sh DESCRIPTION -The -.Nm -module provides limited -System V Release 4 ABI (application binary interface) compatibility -for userland applications. -The module provides the following significant facilities: -.Bl -bullet -.It -An image activator -for correctly branded -.Xr elf 5 -executable images -.It -Special signal handling for activated images -.It -SVR4 to native system call translation -.It -STREAMS network API emulation (via the -.Xr streams 4 -loadable module, or by means of -.Dl pseudo-device streams -in a kernel configuration file) -.It -Mappings between -.Fx -and SVR4 -.Xr ioctl 2 -calls, or, where no such mappings exist, reverse-engineered implementations -of the SVR4 calls. -.El -.Pp -It is important to note that the SVR4 ABI support -it not provided through an emulator. -Rather, a true (albeit limited) "clean room" reverse-engineered ABI -implementation is provided. -.Sh LIMITATIONS -Because the provided ABI has been developed in ignorance of actual SVR4 -source code, there are bound to be unforeseen interactions between SVR4 -client applications and the emulated ABI which cause applications to -malfunction. -.Pp -Additionally, some SVR4 operating systems do not adhere to the SVR4 -ELF standard. -In particular, Solaris does not set the ELF interpreter field in the -ELF header to a value which would allow the kernel to correctly -identify a client executable as an SVR4 application. -Thus, in certain instances it is necessary to use the -.Xr brandelf 1 -utility to explicitly brand the executable, or to set the -kern.fallback_elf_brand -.Xr sysctl 8 -variable to define a "default" ABI for unbranded executables. -Value ELFOSABI_SOLARIS represents Solaris; ELFOSABI_SYSV represents other -SysVR4 operating systems. -See -.In sys/elf_common.h -for ELFOSABI branding definitions, and -.Xr brandelf 1 -for information on branding executables. -.Pp -The -.Nm -module can be linked into the kernel statically with the -.Dv COMPAT_SVR4 -kernel configuration option -or loaded as required. -The following command will load the module -if it is neither linked into the kernel -nor already loaded as a module: -.Bd -literal -offset indent -if ! kldstat -v | grep -E 'streams.ko' > /dev/null; then - kldload streams > /dev/null 2>&1 -fi - -if ! kldstat -v | grep -E 'svr4.ko' > /dev/null; then - kldload svr4 > /dev/null 2>&1 -fi -.Ed -.Pp -The kernel -will check for the presence of the -.Xr streams 4 -module, and load it if necessary. -.Pp -Note that dynamically linked SVR4 executables -will require a suitable environment in -.Pa /compat/svr4 . -.Pp -For information on loading the -.Nm -kernel loadable module automatically on system startup, -see -.Xr rc.conf 5 . -This information applies -regardless of whether the -.Nm -module is statically linked into the kernel -or loaded as a module. -.Pp -STREAMS emulation is limited but (largely) functional. -Assuming the -.Xr streams 4 -module is loaded, a STREAMS handle can be obtained by opening one of the -relevant files in -.Pa /dev -or -.Pa /compat/svr4/dev . -Internally, the -.Xr streams 4 -driver produces a socket descriptor and -.Dq tags -it with additional STREAMS -state information before returning it to the client application. -The -.Nm -environment uses the additional state information to recognize and -manipulate emulated STREAMS handles when STREAMS-specific -.Xr ioctl 2 -calls are executed. -.Pp -The subset of STREAMS functionality which is provided is small, probably -little more than what is required to enable programs on the Solaris CD -sets to run. -.Sh FILES -.Bl -tag -width /sys/emulation/svr4/syscalls.master -compact -.It Pa /compat/svr4 -minimal SVR4 run-time environment -.It Pa /sys/emulation/svr4/syscalls.master -mappings between SVR4 syscalls and -.Nm -module entrypoints. -.El -.Sh SEE ALSO -.Xr brandelf 1 , -.Xr streams 4 , -.Xr elf 5 -.Sh HISTORY -System V Release 4 ABI support first appeared in -.Fx 4.0 . -The ABI was ported from an equivalent facility present in -.Nx 1.3 -written by Christos Zoulas. -.Sh BUGS -Emulation of signal handlers is buggy. -.Pp -Emulated connectionless STREAMS fail to receive data from the network in -some circumstances (but succeed in others -- probably due to particular -ways of initializing them which the -.Xr streams 4 -module is mishandling, and interaction between STREAMS and -.Xr poll 2 ) . -Connection-oriented STREAMS appear to be functional. -.Pp -Ironically, this SVR4 emulator does not (yet) support SVR4 semaphores or -shared memory. -.Pp -.Xr tar 1 -archives containing pre-populated -.Pa /compat/svr4 -trees can be obtained from -.Pa http://people.FreeBSD.org/~newton/freebsd-svr4/ . -.Pp -Extensive testing has only really been carried out with Solaris 2.x binaries, -with anecdotal reports of limited success coming from testers with -early-revision SCO media. -In theory, the basic SVR4 ABI should be constant -across the set of vendors who produce SVR4 operating systems, but in -practice that is probably not the case. -If necessary, future work can -either implement additional -.Xr kld 4 -modules which produce functionality which contains OS-dependent -departures from the behaviour which has been implemented in this -ABI implementation. -Alternatively, -.Xr sysctl 8 -variables could set the -.Dq personality -the environment should present to -client applications. diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index bc5a4b3c64..137a7c10e9 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.197 2003/07/28 13:56:00 mbr Exp $ -.\" $DragonFly: src/share/man/man5/rc.conf.5,v 1.19 2006/05/21 14:15:05 swildner Exp $ +.\" $DragonFly: src/share/man/man5/rc.conf.5,v 1.20 2006/05/22 06:26:29 swildner Exp $ .Dd March 3, 2002 .Dt RC.CONF 5 .Os @@ -2210,11 +2210,6 @@ Set to to enable OSF/1 (Digital UNIX) binary emulation at system initial boot time. (alpha) -.It Va svr4_enable -.Pq Vt bool -If set to -.Dq Li YES , -enable SysVR4 emulation at boot time. .It Va sysvipc_enable .Pq Vt bool If set to diff --git a/sys/Makefile b/sys/Makefile index f94b625e19..c5845ff9f0 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/Makefile,v 1.20.2.1 2000/07/10 08:22:34 obrien Exp $ -# $DragonFly: src/sys/Makefile,v 1.11 2006/05/20 18:26:32 dillon Exp $ +# $DragonFly: src/sys/Makefile,v 1.12 2006/05/22 06:26:29 swildner Exp $ # This is the old aout only boot loader. .if exists(${.CURDIR}/${MACHINE_ARCH}/boot) && ${OBJFORMAT} == "aout" @@ -30,7 +30,6 @@ HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", rele all_sysent: (cd ${.CURDIR}/kern; ${MAKE} sysent) (cd ${.CURDIR}/emulation/linux/i386; ${MAKE} sysent) - (cd ${.CURDIR}/emulation/ibcs2/i386; ${MAKE} sysent) # XXX this may be temporary, should the module build be incorporated # into the default build (make the SUBDIR additions above non-conditional)? diff --git a/sys/conf/files b/sys/conf/files index de8d9a73fe..4bb03b7b5a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/conf/files,v 1.340.2.137 2003/06/04 17:10:30 sam Exp $ -# $DragonFly: src/sys/conf/files,v 1.123 2006/05/20 09:13:09 sephe Exp $ +# $DragonFly: src/sys/conf/files,v 1.124 2006/05/22 06:26:29 swildner Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1122,7 +1122,6 @@ vm/vm_swap.c standard vm/vm_unix.c standard vm/vnode_pager.c standard vm/vm_zone.c standard -dev/misc/streams/streams.c optional streams # # USB support bus/usb/usb_if.m optional usb diff --git a/sys/conf/options b/sys/conf/options index f9cb61bf8c..5b90082b5f 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/conf/options,v 1.191.2.53 2003/06/04 17:56:58 sam Exp $ -# $DragonFly: src/sys/conf/options,v 1.46 2006/05/12 22:07:21 dillon Exp $ +# $DragonFly: src/sys/conf/options,v 1.47 2006/05/22 06:26:29 swildner Exp $ # # On the handling of kernel options # @@ -98,7 +98,6 @@ NSWAPDEV opt_swap.h NSWBUF_MIN opt_swap.h PPS_SYNC opt_ntp.h QUOTA -SPX_HACK SUIDDIR opt_suiddir.h SYSVMSG opt_sysvipc.h SYSVSEM opt_sysvipc.h diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index e6baa4c2e5..614b3cc35e 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/conf/options.i386,v 1.132.2.18 2003/03/14 21:22:35 jhb Exp $ -# $DragonFly: src/sys/conf/Attic/options.amd64,v 1.8 2006/05/20 18:26:34 dillon Exp $ +# $DragonFly: src/sys/conf/Attic/options.amd64,v 1.9 2006/05/22 06:26:29 swildner Exp $ DISABLE_PSE MATH_EMULATE opt_math_emulate.h @@ -22,7 +22,6 @@ BROKEN_KEYBOARD_RESET opt_reset.h # Options for emulators. These should only be used at config time, so # they are handled like options for static file systems # (see src/sys/conf/options), except for broken debugging options. -IBCS2 opt_dontuse.h COMPAT_LINUX opt_dontuse.h # i386 SMP options diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index ff977416c8..89795e5ba9 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/conf/options.i386,v 1.132.2.18 2003/03/14 21:22:35 jhb Exp $ -# $DragonFly: src/sys/conf/Attic/options.i386,v 1.17 2006/05/20 18:26:34 dillon Exp $ +# $DragonFly: src/sys/conf/Attic/options.i386,v 1.18 2006/05/22 06:26:29 swildner Exp $ DISABLE_PSE MATH_EMULATE opt_math_emulate.h @@ -22,7 +22,6 @@ BROKEN_KEYBOARD_RESET opt_reset.h # Options for emulators. These should only be used at config time, so # they are handled like options for static file systems # (see src/sys/conf/options), except for broken debugging options. -IBCS2 opt_dontuse.h COMPAT_LINUX opt_dontuse.h LINPROCFS #Linux compatible procfs diff --git a/sys/config/LINT b/sys/config/LINT index 5cb788a228..70dcaaca53 100644 --- a/sys/config/LINT +++ b/sys/config/LINT @@ -3,7 +3,7 @@ # as much of the source tree as it can. # # $FreeBSD: src/sys/i386/conf/LINT,v 1.749.2.144 2003/06/04 17:56:59 sam Exp $ -# $DragonFly: src/sys/config/LINT,v 1.79 2006/05/20 18:26:36 dillon Exp $ +# $DragonFly: src/sys/config/LINT,v 1.80 2006/05/22 06:26:29 swildner Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -2674,7 +2674,6 @@ options SIMPLELOCK_DEBUG options SI_DEBUG options SLIP_IFF_OPTS options SOCKBUF_DEBUG -options SPX_HACK options TIMER_FREQ="((14318182+6)/12)" options VFS_BIO_DEBUG options WI_SYMBOL_FIRMWARE diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 4df8d64dc9..05cd1133d4 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -3,7 +3,7 @@ # as much of the source tree as it can. # # $FreeBSD: src/sys/i386/conf/LINT,v 1.749.2.144 2003/06/04 17:56:59 sam Exp $ -# $DragonFly: src/sys/i386/conf/Attic/LINT,v 1.79 2006/05/20 18:26:36 dillon Exp $ +# $DragonFly: src/sys/i386/conf/Attic/LINT,v 1.80 2006/05/22 06:26:29 swildner Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -2674,7 +2674,6 @@ options SIMPLELOCK_DEBUG options SI_DEBUG options SLIP_IFF_OPTS options SOCKBUF_DEBUG -options SPX_HACK options TIMER_FREQ="((14318182+6)/12)" options VFS_BIO_DEBUG options WI_SYMBOL_FIRMWARE diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index d16763b951..ba66ddd694 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -36,7 +36,7 @@ * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * $FreeBSD: src/sys/i386/i386/trap.c,v 1.147.2.11 2003/02/27 19:09:59 luoqi Exp $ - * $DragonFly: src/sys/i386/i386/Attic/trap.c,v 1.74 2006/05/17 18:30:18 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/trap.c,v 1.75 2006/05/22 06:26:30 swildner Exp $ */ /* @@ -895,8 +895,7 @@ out2: ; * This version doesn't allow a page fault to user space while * in the kernel. The rest of the kernel needs to be made "safe" * before this can be used. I think the only things remaining - * to be made safe are the iBCS2 code and the process tracing/ - * debugging code. + * to be made safe is the process tracing/debugging code. */ static int trap_pfault(frame, usermode, eva) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index f7098de20c..a290afca75 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -37,7 +37,7 @@ * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 * $FreeBSD: src/sys/kern/kern_exit.c,v 1.92.2.11 2003/01/13 22:51:16 dillon Exp $ - * $DragonFly: src/sys/kern/kern_exit.c,v 1.53 2006/05/17 20:20:49 dillon Exp $ + * $DragonFly: src/sys/kern/kern_exit.c,v 1.54 2006/05/22 06:26:30 swildner Exp $ */ #include "opt_compat.h" @@ -78,10 +78,8 @@ #include -/* Required to be non-static for SysVR4 emulator */ -MALLOC_DEFINE(M_ZOMBIE, "zombie", "zombie proc status"); - static MALLOC_DEFINE(M_ATEXIT, "atexit", "atexit callback"); +static MALLOC_DEFINE(M_ZOMBIE, "zombie", "zombie proc status"); /* * callout list for things to do at exit time diff --git a/sys/platform/pc32/i386/trap.c b/sys/platform/pc32/i386/trap.c index 354cde1086..48d00b978e 100644 --- a/sys/platform/pc32/i386/trap.c +++ b/sys/platform/pc32/i386/trap.c @@ -36,7 +36,7 @@ * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * $FreeBSD: src/sys/i386/i386/trap.c,v 1.147.2.11 2003/02/27 19:09:59 luoqi Exp $ - * $DragonFly: src/sys/platform/pc32/i386/trap.c,v 1.74 2006/05/17 18:30:18 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/trap.c,v 1.75 2006/05/22 06:26:30 swildner Exp $ */ /* @@ -895,8 +895,7 @@ out2: ; * This version doesn't allow a page fault to user space while * in the kernel. The rest of the kernel needs to be made "safe" * before this can be used. I think the only things remaining - * to be made safe are the iBCS2 code and the process tracing/ - * debugging code. + * to be made safe is the process tracing/debugging code. */ static int trap_pfault(frame, usermode, eva) diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c index d2333d136e..68a17d112d 100644 --- a/usr.sbin/config/main.c +++ b/usr.sbin/config/main.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1993 The Regents of the University of California. All rights reserved. * @(#)main.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/config/main.c,v 1.37.2.3 2001/06/13 00:25:53 cg Exp $ - * $DragonFly: src/usr.sbin/config/main.c,v 1.15 2005/11/02 08:28:48 dillon Exp $ + * $DragonFly: src/usr.sbin/config/main.c,v 1.16 2006/05/22 06:26:30 swildner Exp $ */ #include @@ -83,7 +83,7 @@ main(int argc, char *argv[]) unsigned int i; char *p; char linksrc[64], linkdest[MAXPATHLEN]; - static const char *emus[] = { "linux", "svr4" }; + static const char *emus[] = { "linux" }; while ((ch = getopt(argc, argv, "d:gprn")) != -1) switch (ch) { -- 2.41.0