From b1529bda752c37693f63536eef8926e46e1c7d46 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Thu, 14 Dec 1995 14:35:36 +0000 Subject: [PATCH] GENERIC/LINT: Remove redundant quoting on some option lines. LINT: add a couple of new/missing/undocumented options files.i386: add linux code so that you can compile a kernel with static linux emulation ("options LINUX") i386/*: use #if defined(COMPAT_LINUX) || defined(LINUX) to enable static support of linux emulation (just like "IBCS2" makes ibcs2 static) The main thing this is going to make obvious, is that the LINUX code (when compiled from LINT) has a lot of warnings, some of which dont look too pleasant.. --- sys/amd64/amd64/exception.S | 6 +++--- sys/amd64/amd64/exception.s | 6 +++--- sys/amd64/amd64/machdep.c | 6 +++--- sys/amd64/amd64/trap.c | 6 +++--- sys/amd64/conf/GENERIC | 8 ++++---- sys/conf/NOTES | 35 +++++++++++++++++++---------------- sys/conf/files.i386 | 13 ++++++++++++- sys/i386/conf/GENERIC | 8 ++++---- sys/i386/conf/LINT | 35 +++++++++++++++++++---------------- sys/i386/conf/NOTES | 35 +++++++++++++++++++---------------- sys/i386/conf/files.i386 | 13 ++++++++++++- sys/i386/i386/exception.s | 6 +++--- sys/i386/i386/machdep.c | 6 +++--- sys/i386/i386/trap.c | 6 +++--- sys/kern/subr_trap.c | 6 +++--- 15 files changed, 113 insertions(+), 82 deletions(-) diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index d6860a01876b..bba22722516a 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: exception.s,v 1.10 1995/08/15 19:23:33 bde Exp $ + * $Id: exception.s,v 1.11 1995/09/07 21:36:17 davidg Exp $ */ #include "npx.h" /* NNPX */ @@ -258,7 +258,7 @@ IDTVEC(syscall) MEXITCOUNT jmp _doreti -#ifdef COMPAT_LINUX +#if defined(COMPAT_LINUX) || defined(LINUX) /* * Call gate entry for Linux syscall (int 0x80) */ @@ -283,7 +283,7 @@ IDTVEC(linux_syscall) movb $1,_intr_nesting_level MEXITCOUNT jmp _doreti -#endif /* COMPAT_LINUX */ +#endif /* COMPAT_LINUX || LINUX */ /* * Include what was once config+isa-dependent code. diff --git a/sys/amd64/amd64/exception.s b/sys/amd64/amd64/exception.s index d6860a01876b..bba22722516a 100644 --- a/sys/amd64/amd64/exception.s +++ b/sys/amd64/amd64/exception.s @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: exception.s,v 1.10 1995/08/15 19:23:33 bde Exp $ + * $Id: exception.s,v 1.11 1995/09/07 21:36:17 davidg Exp $ */ #include "npx.h" /* NNPX */ @@ -258,7 +258,7 @@ IDTVEC(syscall) MEXITCOUNT jmp _doreti -#ifdef COMPAT_LINUX +#if defined(COMPAT_LINUX) || defined(LINUX) /* * Call gate entry for Linux syscall (int 0x80) */ @@ -283,7 +283,7 @@ IDTVEC(linux_syscall) movb $1,_intr_nesting_level MEXITCOUNT jmp _doreti -#endif /* COMPAT_LINUX */ +#endif /* COMPAT_LINUX || LINUX */ /* * Include what was once config+isa-dependent code. diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 52bb423819fa..39394edb193e 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.157 1995/12/10 13:36:26 phk Exp $ + * $Id: machdep.c,v 1.158 1995/12/13 15:12:23 julian Exp $ */ #include "npx.h" @@ -1245,7 +1245,7 @@ extern inthand_t IDTVEC(page), IDTVEC(rsvd), IDTVEC(fpu), IDTVEC(align), IDTVEC(syscall); -#ifdef COMPAT_LINUX +#if defined(COMPAT_LINUX) || defined(LINUX) extern inthand_t IDTVEC(linux_syscall); #endif @@ -1344,7 +1344,7 @@ init386(first) setidt(15, &IDTVEC(rsvd), SDT_SYS386TGT, SEL_KPL); setidt(16, &IDTVEC(fpu), SDT_SYS386TGT, SEL_KPL); setidt(17, &IDTVEC(align), SDT_SYS386TGT, SEL_KPL); -#ifdef COMPAT_LINUX +#if defined(COMPAT_LINUX) || defined(LINUX) setidt(0x80, &IDTVEC(linux_syscall), SDT_SYS386TGT, SEL_UPL); #endif diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 29de5a6eea95..21f1f8e9b264 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.64 1995/12/09 20:40:43 phk Exp $ + * $Id: trap.c,v 1.65 1995/12/14 08:21:29 phk Exp $ */ /* @@ -934,7 +934,7 @@ bad: #endif } -#ifdef COMPAT_LINUX +#if defined(COMPAT_LINUX) || defined(LINUX) void linux_syscall(frame) struct trapframe frame; @@ -1027,4 +1027,4 @@ linux_syscall(frame) ktrsysret(p->p_tracep, code, error, rval[0]); #endif } -#endif /* COMPAT_LINUX */ +#endif /* COMPAT_LINUX || LINUX */ diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 8a2e4281d550..1e35932f6fd5 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -1,7 +1,7 @@ # # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks # -# $Id: GENERIC,v 1.53 1995/12/10 22:14:15 bde Exp $ +# $Id: GENERIC,v 1.54 1995/12/12 08:46:34 gibbs Exp $ # machine "i386" @@ -19,7 +19,7 @@ options MSDOSFS #MSDOS Filesystem options "CD9660" #ISO 9660 Filesystem options PROCFS #Process filesystem options "COMPAT_43" #Compatible with BSD 4.3 -options "SCSI_DELAY=15" #Be pessimistic about Joe SCSI device +options SCSI_DELAY=15 #Be pessimistic about Joe SCSI device options BOUNCE_BUFFERS #include support for DMA bounce buffers options UCONSOLE #Allow users to grab the console @@ -80,11 +80,11 @@ device scd0 at isa? port 0x230 bio device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver #device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint -#options "PCVT_FREEBSD=210" # pcvt running on FreeBSD >= 2.0.5 +#options PCVT_FREEBSD=210 # pcvt running on FreeBSD >= 2.0.5 #options XSERVER # include code for XFree86 #options FAT_CURSOR # start with block cursor # If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines -#options "PCVT_SCANSET=2" # IBM keyboards are non-std +#options PCVT_SCANSET=2 # IBM keyboards are non-std device npx0 at isa? port "IO_NPX" irq 13 vector npxintr diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 0136547a5388..33a3d701eea4 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.220 1995/12/10 22:09:14 bde Exp $ +# $Id: LINT,v 1.221 1995/12/12 08:46:37 gibbs 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 @@ -39,8 +39,8 @@ maxusers 10 # defaults on bootup. (an example is a large news server in which # the uid, news, can sometimes need > 100 simultaneous processes running, # or perhaps a user using lots of windows under X). -options "CHILD_MAX=128" -options "OPEN_MAX=128" +options CHILD_MAX=128 +options OPEN_MAX=128 # # A math emulator is mandatory if you wish to run on hardware which @@ -133,8 +133,8 @@ options NS #Xerox NS communications protocols options IPX #IPX/SPX communications protocols options IPXIP #IPX in IP encapsulation (not available) options IPTUNNEL #IP in IPX encapsulation (not available) -options "IPXPRINTFS=0" #IPX/SPX Console Debugging Information -options "IPX_ERRPRINTFS=0" #IPX/SPX Console Debugging Information +options IPXPRINTFS=0 #IPX/SPX Console Debugging Information +options IPX_ERRPRINTFS=0 #IPX/SPX Console Debugging Information # These are currently broken and don't compile #options ISO @@ -250,10 +250,12 @@ options DEVFS #devices filesystem # Make space in the kernel for a MFS rootfilesystem. Define to the number # of kilobytes to reserve for the filesystem. -options "MFS_ROOT=10" +options MFS_ROOT=10 +# Allow the MFS_ROOT code to load the MFS image from floppy if it is missing. +options MFS_AUTOLOAD # Allow this many swap-devices. -options "NSWAPDEV=20" +options NSWAPDEV=20 # Disk quotas are supported when this option is enabled. If you # change the value of this option, you must do a `make clean' in your @@ -410,15 +412,15 @@ options "AUTO_EOI_1" options BOUNCE_BUFFERS #options DUMMY_NOPS #options "TUNE_1542" -#options "BROKEN_KEYBOARD_RESET" +#options BROKEN_KEYBOARD_RESET # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint -options "PCVT_FREEBSD=210" # pcvt running on FreeBSD >= 2.0.5 +options PCVT_FREEBSD=210 # pcvt running on FreeBSD >= 2.0.5 options XSERVER # include code for XFree86 options FAT_CURSOR # start with block cursor # This PCVT option is for keyboards such as those used on IBM ThinkPad laptops -options "PCVT_SCANSET=2" # IBM keyboards are non-std +options PCVT_SCANSET=2 # IBM keyboards are non-std # The syscons console driver (sco color console compatible) - default. device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr @@ -434,7 +436,7 @@ options HARDFONTS # MAXCONS is maximum number of virtual consoles, no more than 16 # default value: 12 # -options "MAXCONS=16" +options MAXCONS=16 # # This device is mandatory. @@ -549,8 +551,8 @@ tape ft0 at fdc0 drive 2 # usually sufficient. The units are inverse seconds, so a value of 16 # here means to wait 1/16th of a second; you should choose a power of # two. -# -options FDSEEKWAIT="16" +# XXX: this seems to be missing! +options FDSEEKWAIT=16 # # Other standard PC hardware: `lpt', `mse', `psm', `sio', etc. @@ -663,7 +665,7 @@ device nnic0 at isa? port 0x150 iomem 0xe0000 tty irq 12 vector nnicintr # options BROKEN_BUS_CLOCK #PAS-16 isn't working and OPTI chipset # options SYMPHONY_PAS #PAS-16 isn't working and SYMPHONY chipset # options EXCLUDE_SBPRO #PAS-16 -# options "SBC_IRQ=5" #PAS-16. Must match irq on sb0 line. +# options SBC_IRQ=5 #PAS-16. Must match irq on sb0 line. # PAS16: The order of the pas0/sb0/opl0 is important since the # sb emulation is enabled in the pas-16 attach. # @@ -802,10 +804,10 @@ controller ahc0 # # The 'meteor' device is a PCI video capture board. It can also have the # following options: -# options "METEOR_ALLOC_PAGES=xxx" preallocate kernel pages for data entry +# options METEOR_ALLOC_PAGES=xxx preallocate kernel pages for data entry # figure (ROWS*COLUMN*BYTES_PER_PIXEL*FRAME+PAGE_SIZE-1)/PAGE_SIZE # options METEOR_DEALLOC_PAGES remove all allocated pages on close(2) -# options "METEOR_DEALLOC_ABOVE=xxx" remove all allocated pages above the +# options METEOR_DEALLOC_ABOVE=xxx remove all allocated pages above the # specified amount. If this value is below the allocated amount no action # taken # @@ -843,3 +845,4 @@ options POWERFAIL_NMI # make it beep instead of panicing options COMPAT_LINUX options "EXT2FS" options "IBCS2" +options SHOW_BUSYBUFS # List buffers that prevent root unmount diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 48cb05292851..d976f1641861 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.116 1995/11/21 02:50:10 peter Exp $ +# $Id: files.i386,v 1.117 1995/12/12 08:46:40 gibbs Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \ @@ -180,6 +180,17 @@ i386/isa/atapi.c optional atapi device-driver i386/isa/wcd.c optional wcd device-driver i386/isa/wd7000.c optional wds device-driver i386/isa/wt.c optional wt device-driver +i386/linux/imgact_linux.c optional linux +i386/linux/linux_dummy.c optional linux +i386/linux/linux_file.c optional linux +i386/linux/linux_generic.c optional linux +i386/linux/linux_ioctl.c optional linux +i386/linux/linux_ipc.c optional linux +i386/linux/linux_misc.c optional linux +i386/linux/linux_signal.c optional linux +i386/linux/linux_socket.c optional linux +i386/linux/linux_stats.c optional linux +i386/linux/linux_sysent.c optional linux i386/scsi/aic7xxx.c optional ahc device-driver \ dependency "aic7xxx_seq.h" i386/scsi/bt.c optional bt device-driver diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 8a2e4281d550..1e35932f6fd5 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -1,7 +1,7 @@ # # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks # -# $Id: GENERIC,v 1.53 1995/12/10 22:14:15 bde Exp $ +# $Id: GENERIC,v 1.54 1995/12/12 08:46:34 gibbs Exp $ # machine "i386" @@ -19,7 +19,7 @@ options MSDOSFS #MSDOS Filesystem options "CD9660" #ISO 9660 Filesystem options PROCFS #Process filesystem options "COMPAT_43" #Compatible with BSD 4.3 -options "SCSI_DELAY=15" #Be pessimistic about Joe SCSI device +options SCSI_DELAY=15 #Be pessimistic about Joe SCSI device options BOUNCE_BUFFERS #include support for DMA bounce buffers options UCONSOLE #Allow users to grab the console @@ -80,11 +80,11 @@ device scd0 at isa? port 0x230 bio device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver #device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint -#options "PCVT_FREEBSD=210" # pcvt running on FreeBSD >= 2.0.5 +#options PCVT_FREEBSD=210 # pcvt running on FreeBSD >= 2.0.5 #options XSERVER # include code for XFree86 #options FAT_CURSOR # start with block cursor # If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines -#options "PCVT_SCANSET=2" # IBM keyboards are non-std +#options PCVT_SCANSET=2 # IBM keyboards are non-std device npx0 at isa? port "IO_NPX" irq 13 vector npxintr diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 0136547a5388..33a3d701eea4 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.220 1995/12/10 22:09:14 bde Exp $ +# $Id: LINT,v 1.221 1995/12/12 08:46:37 gibbs 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 @@ -39,8 +39,8 @@ maxusers 10 # defaults on bootup. (an example is a large news server in which # the uid, news, can sometimes need > 100 simultaneous processes running, # or perhaps a user using lots of windows under X). -options "CHILD_MAX=128" -options "OPEN_MAX=128" +options CHILD_MAX=128 +options OPEN_MAX=128 # # A math emulator is mandatory if you wish to run on hardware which @@ -133,8 +133,8 @@ options NS #Xerox NS communications protocols options IPX #IPX/SPX communications protocols options IPXIP #IPX in IP encapsulation (not available) options IPTUNNEL #IP in IPX encapsulation (not available) -options "IPXPRINTFS=0" #IPX/SPX Console Debugging Information -options "IPX_ERRPRINTFS=0" #IPX/SPX Console Debugging Information +options IPXPRINTFS=0 #IPX/SPX Console Debugging Information +options IPX_ERRPRINTFS=0 #IPX/SPX Console Debugging Information # These are currently broken and don't compile #options ISO @@ -250,10 +250,12 @@ options DEVFS #devices filesystem # Make space in the kernel for a MFS rootfilesystem. Define to the number # of kilobytes to reserve for the filesystem. -options "MFS_ROOT=10" +options MFS_ROOT=10 +# Allow the MFS_ROOT code to load the MFS image from floppy if it is missing. +options MFS_AUTOLOAD # Allow this many swap-devices. -options "NSWAPDEV=20" +options NSWAPDEV=20 # Disk quotas are supported when this option is enabled. If you # change the value of this option, you must do a `make clean' in your @@ -410,15 +412,15 @@ options "AUTO_EOI_1" options BOUNCE_BUFFERS #options DUMMY_NOPS #options "TUNE_1542" -#options "BROKEN_KEYBOARD_RESET" +#options BROKEN_KEYBOARD_RESET # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint -options "PCVT_FREEBSD=210" # pcvt running on FreeBSD >= 2.0.5 +options PCVT_FREEBSD=210 # pcvt running on FreeBSD >= 2.0.5 options XSERVER # include code for XFree86 options FAT_CURSOR # start with block cursor # This PCVT option is for keyboards such as those used on IBM ThinkPad laptops -options "PCVT_SCANSET=2" # IBM keyboards are non-std +options PCVT_SCANSET=2 # IBM keyboards are non-std # The syscons console driver (sco color console compatible) - default. device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr @@ -434,7 +436,7 @@ options HARDFONTS # MAXCONS is maximum number of virtual consoles, no more than 16 # default value: 12 # -options "MAXCONS=16" +options MAXCONS=16 # # This device is mandatory. @@ -549,8 +551,8 @@ tape ft0 at fdc0 drive 2 # usually sufficient. The units are inverse seconds, so a value of 16 # here means to wait 1/16th of a second; you should choose a power of # two. -# -options FDSEEKWAIT="16" +# XXX: this seems to be missing! +options FDSEEKWAIT=16 # # Other standard PC hardware: `lpt', `mse', `psm', `sio', etc. @@ -663,7 +665,7 @@ device nnic0 at isa? port 0x150 iomem 0xe0000 tty irq 12 vector nnicintr # options BROKEN_BUS_CLOCK #PAS-16 isn't working and OPTI chipset # options SYMPHONY_PAS #PAS-16 isn't working and SYMPHONY chipset # options EXCLUDE_SBPRO #PAS-16 -# options "SBC_IRQ=5" #PAS-16. Must match irq on sb0 line. +# options SBC_IRQ=5 #PAS-16. Must match irq on sb0 line. # PAS16: The order of the pas0/sb0/opl0 is important since the # sb emulation is enabled in the pas-16 attach. # @@ -802,10 +804,10 @@ controller ahc0 # # The 'meteor' device is a PCI video capture board. It can also have the # following options: -# options "METEOR_ALLOC_PAGES=xxx" preallocate kernel pages for data entry +# options METEOR_ALLOC_PAGES=xxx preallocate kernel pages for data entry # figure (ROWS*COLUMN*BYTES_PER_PIXEL*FRAME+PAGE_SIZE-1)/PAGE_SIZE # options METEOR_DEALLOC_PAGES remove all allocated pages on close(2) -# options "METEOR_DEALLOC_ABOVE=xxx" remove all allocated pages above the +# options METEOR_DEALLOC_ABOVE=xxx remove all allocated pages above the # specified amount. If this value is below the allocated amount no action # taken # @@ -843,3 +845,4 @@ options POWERFAIL_NMI # make it beep instead of panicing options COMPAT_LINUX options "EXT2FS" options "IBCS2" +options SHOW_BUSYBUFS # List buffers that prevent root unmount diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 0136547a5388..33a3d701eea4 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.220 1995/12/10 22:09:14 bde Exp $ +# $Id: LINT,v 1.221 1995/12/12 08:46:37 gibbs 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 @@ -39,8 +39,8 @@ maxusers 10 # defaults on bootup. (an example is a large news server in which # the uid, news, can sometimes need > 100 simultaneous processes running, # or perhaps a user using lots of windows under X). -options "CHILD_MAX=128" -options "OPEN_MAX=128" +options CHILD_MAX=128 +options OPEN_MAX=128 # # A math emulator is mandatory if you wish to run on hardware which @@ -133,8 +133,8 @@ options NS #Xerox NS communications protocols options IPX #IPX/SPX communications protocols options IPXIP #IPX in IP encapsulation (not available) options IPTUNNEL #IP in IPX encapsulation (not available) -options "IPXPRINTFS=0" #IPX/SPX Console Debugging Information -options "IPX_ERRPRINTFS=0" #IPX/SPX Console Debugging Information +options IPXPRINTFS=0 #IPX/SPX Console Debugging Information +options IPX_ERRPRINTFS=0 #IPX/SPX Console Debugging Information # These are currently broken and don't compile #options ISO @@ -250,10 +250,12 @@ options DEVFS #devices filesystem # Make space in the kernel for a MFS rootfilesystem. Define to the number # of kilobytes to reserve for the filesystem. -options "MFS_ROOT=10" +options MFS_ROOT=10 +# Allow the MFS_ROOT code to load the MFS image from floppy if it is missing. +options MFS_AUTOLOAD # Allow this many swap-devices. -options "NSWAPDEV=20" +options NSWAPDEV=20 # Disk quotas are supported when this option is enabled. If you # change the value of this option, you must do a `make clean' in your @@ -410,15 +412,15 @@ options "AUTO_EOI_1" options BOUNCE_BUFFERS #options DUMMY_NOPS #options "TUNE_1542" -#options "BROKEN_KEYBOARD_RESET" +#options BROKEN_KEYBOARD_RESET # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint -options "PCVT_FREEBSD=210" # pcvt running on FreeBSD >= 2.0.5 +options PCVT_FREEBSD=210 # pcvt running on FreeBSD >= 2.0.5 options XSERVER # include code for XFree86 options FAT_CURSOR # start with block cursor # This PCVT option is for keyboards such as those used on IBM ThinkPad laptops -options "PCVT_SCANSET=2" # IBM keyboards are non-std +options PCVT_SCANSET=2 # IBM keyboards are non-std # The syscons console driver (sco color console compatible) - default. device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr @@ -434,7 +436,7 @@ options HARDFONTS # MAXCONS is maximum number of virtual consoles, no more than 16 # default value: 12 # -options "MAXCONS=16" +options MAXCONS=16 # # This device is mandatory. @@ -549,8 +551,8 @@ tape ft0 at fdc0 drive 2 # usually sufficient. The units are inverse seconds, so a value of 16 # here means to wait 1/16th of a second; you should choose a power of # two. -# -options FDSEEKWAIT="16" +# XXX: this seems to be missing! +options FDSEEKWAIT=16 # # Other standard PC hardware: `lpt', `mse', `psm', `sio', etc. @@ -663,7 +665,7 @@ device nnic0 at isa? port 0x150 iomem 0xe0000 tty irq 12 vector nnicintr # options BROKEN_BUS_CLOCK #PAS-16 isn't working and OPTI chipset # options SYMPHONY_PAS #PAS-16 isn't working and SYMPHONY chipset # options EXCLUDE_SBPRO #PAS-16 -# options "SBC_IRQ=5" #PAS-16. Must match irq on sb0 line. +# options SBC_IRQ=5 #PAS-16. Must match irq on sb0 line. # PAS16: The order of the pas0/sb0/opl0 is important since the # sb emulation is enabled in the pas-16 attach. # @@ -802,10 +804,10 @@ controller ahc0 # # The 'meteor' device is a PCI video capture board. It can also have the # following options: -# options "METEOR_ALLOC_PAGES=xxx" preallocate kernel pages for data entry +# options METEOR_ALLOC_PAGES=xxx preallocate kernel pages for data entry # figure (ROWS*COLUMN*BYTES_PER_PIXEL*FRAME+PAGE_SIZE-1)/PAGE_SIZE # options METEOR_DEALLOC_PAGES remove all allocated pages on close(2) -# options "METEOR_DEALLOC_ABOVE=xxx" remove all allocated pages above the +# options METEOR_DEALLOC_ABOVE=xxx remove all allocated pages above the # specified amount. If this value is below the allocated amount no action # taken # @@ -843,3 +845,4 @@ options POWERFAIL_NMI # make it beep instead of panicing options COMPAT_LINUX options "EXT2FS" options "IBCS2" +options SHOW_BUSYBUFS # List buffers that prevent root unmount diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386 index 48cb05292851..d976f1641861 100644 --- a/sys/i386/conf/files.i386 +++ b/sys/i386/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.116 1995/11/21 02:50:10 peter Exp $ +# $Id: files.i386,v 1.117 1995/12/12 08:46:40 gibbs Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \ @@ -180,6 +180,17 @@ i386/isa/atapi.c optional atapi device-driver i386/isa/wcd.c optional wcd device-driver i386/isa/wd7000.c optional wds device-driver i386/isa/wt.c optional wt device-driver +i386/linux/imgact_linux.c optional linux +i386/linux/linux_dummy.c optional linux +i386/linux/linux_file.c optional linux +i386/linux/linux_generic.c optional linux +i386/linux/linux_ioctl.c optional linux +i386/linux/linux_ipc.c optional linux +i386/linux/linux_misc.c optional linux +i386/linux/linux_signal.c optional linux +i386/linux/linux_socket.c optional linux +i386/linux/linux_stats.c optional linux +i386/linux/linux_sysent.c optional linux i386/scsi/aic7xxx.c optional ahc device-driver \ dependency "aic7xxx_seq.h" i386/scsi/bt.c optional bt device-driver diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s index d6860a01876b..bba22722516a 100644 --- a/sys/i386/i386/exception.s +++ b/sys/i386/i386/exception.s @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: exception.s,v 1.10 1995/08/15 19:23:33 bde Exp $ + * $Id: exception.s,v 1.11 1995/09/07 21:36:17 davidg Exp $ */ #include "npx.h" /* NNPX */ @@ -258,7 +258,7 @@ IDTVEC(syscall) MEXITCOUNT jmp _doreti -#ifdef COMPAT_LINUX +#if defined(COMPAT_LINUX) || defined(LINUX) /* * Call gate entry for Linux syscall (int 0x80) */ @@ -283,7 +283,7 @@ IDTVEC(linux_syscall) movb $1,_intr_nesting_level MEXITCOUNT jmp _doreti -#endif /* COMPAT_LINUX */ +#endif /* COMPAT_LINUX || LINUX */ /* * Include what was once config+isa-dependent code. diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 52bb423819fa..39394edb193e 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.157 1995/12/10 13:36:26 phk Exp $ + * $Id: machdep.c,v 1.158 1995/12/13 15:12:23 julian Exp $ */ #include "npx.h" @@ -1245,7 +1245,7 @@ extern inthand_t IDTVEC(page), IDTVEC(rsvd), IDTVEC(fpu), IDTVEC(align), IDTVEC(syscall); -#ifdef COMPAT_LINUX +#if defined(COMPAT_LINUX) || defined(LINUX) extern inthand_t IDTVEC(linux_syscall); #endif @@ -1344,7 +1344,7 @@ init386(first) setidt(15, &IDTVEC(rsvd), SDT_SYS386TGT, SEL_KPL); setidt(16, &IDTVEC(fpu), SDT_SYS386TGT, SEL_KPL); setidt(17, &IDTVEC(align), SDT_SYS386TGT, SEL_KPL); -#ifdef COMPAT_LINUX +#if defined(COMPAT_LINUX) || defined(LINUX) setidt(0x80, &IDTVEC(linux_syscall), SDT_SYS386TGT, SEL_UPL); #endif diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 29de5a6eea95..21f1f8e9b264 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.64 1995/12/09 20:40:43 phk Exp $ + * $Id: trap.c,v 1.65 1995/12/14 08:21:29 phk Exp $ */ /* @@ -934,7 +934,7 @@ bad: #endif } -#ifdef COMPAT_LINUX +#if defined(COMPAT_LINUX) || defined(LINUX) void linux_syscall(frame) struct trapframe frame; @@ -1027,4 +1027,4 @@ linux_syscall(frame) ktrsysret(p->p_tracep, code, error, rval[0]); #endif } -#endif /* COMPAT_LINUX */ +#endif /* COMPAT_LINUX || LINUX */ diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 29de5a6eea95..21f1f8e9b264 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.64 1995/12/09 20:40:43 phk Exp $ + * $Id: trap.c,v 1.65 1995/12/14 08:21:29 phk Exp $ */ /* @@ -934,7 +934,7 @@ bad: #endif } -#ifdef COMPAT_LINUX +#if defined(COMPAT_LINUX) || defined(LINUX) void linux_syscall(frame) struct trapframe frame; @@ -1027,4 +1027,4 @@ linux_syscall(frame) ktrsysret(p->p_tracep, code, error, rval[0]); #endif } -#endif /* COMPAT_LINUX */ +#endif /* COMPAT_LINUX || LINUX */