diff options
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 8 | ||||
| -rw-r--r-- | sys/arch/i386/i386/trap.c | 8 |
3 files changed, 3 insertions, 16 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 71ea77723b7..54e042e6a85 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.687 2010/07/03 03:59:16 krw Exp $ +# $OpenBSD: GENERIC,v 1.688 2010/07/05 22:20:22 tedu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -26,7 +26,6 @@ option APERTURE # in-kernel aperture driver for XFree86 option COMPAT_SVR4 # binary compatibility with SVR4 option COMPAT_LINUX # binary compatibility with Linux option COMPAT_FREEBSD # binary compatibility with FreeBSD -option COMPAT_BSDOS # binary compatibility with BSD/OS option COMPAT_AOUT # a.out binaries are emulated option PROCFS # /proc diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 409ecde3841..86faadd6e65 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.477 2010/07/03 04:54:32 kettenis Exp $ */ +/* $OpenBSD: machdep.c,v 1.478 2010/07/05 22:20:22 tedu Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -2932,12 +2932,6 @@ init386(paddr_t first_avail) setsegment(&gdt[GCPU_SEL].sd, &cpu_info_primary, sizeof(struct cpu_info)-1, SDT_MEMRWA, SEL_KPL, 0, 0); - /* make ldt gates and memory segments */ -#ifdef COMPAT_BSDOS - setgate(&ldt[LBSDICALLS_SEL].gd, &IDTVEC(osyscall), 1, SDT_SYS386CGT, - SEL_UPL, GCODE_SEL); -#endif - /* exceptions */ setgate(&idt[ 0], &IDTVEC(div), 0, SDT_SYS386TGT, SEL_KPL, GCODE_SEL); setgate(&idt[ 1], &IDTVEC(dbg), 0, SDT_SYS386TGT, SEL_KPL, GCODE_SEL); diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c index c6ff5ee3ce9..4170dd3794e 100644 --- a/sys/arch/i386/i386/trap.c +++ b/sys/arch/i386/i386/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.91 2010/07/01 19:47:07 tedu Exp $ */ +/* $OpenBSD: trap.c,v 1.92 2010/07/05 22:20:22 tedu Exp $ */ /* $NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $ */ /*- @@ -79,9 +79,6 @@ extern struct emul emul_linux_aout, emul_linux_elf; #ifdef COMPAT_FREEBSD extern struct emul emul_freebsd_aout, emul_freebsd_elf; #endif -#ifdef COMPAT_BSDOS -extern struct emul emul_bsdos; -#endif #ifdef COMPAT_AOUT extern struct emul emul_aout; #endif @@ -637,9 +634,6 @@ syscall(struct trapframe *frame) #ifdef COMPAT_AOUT && p->p_emul != &emul_aout #endif -#ifdef COMPAT_BSDOS - && p->p_emul != &emul_bsdos -#endif ) break; copyin(params + _QUAD_LOWWORD * sizeof(int), &code, sizeof(int)); |