diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 78df49e9fa07..1733d1f2ad02 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $NetBSD: files.i386,v 1.102 1998/01/21 23:29:08 thorpej Exp $ +# $NetBSD: files.i386,v 1.103 1998/01/22 00:39:16 thorpej Exp $ # # new style config file for i386 architecture # @@ -17,6 +17,9 @@ defopt VM86 # Floating point emulation defopt MATH_EMULATE +# User-settable LDT (used by WINE) +defopt USER_LDT + file arch/i386/i386/autoconf.c file arch/i386/i386/conf.c file arch/i386/i386/db_disasm.c ddb diff --git a/sys/arch/i386/i386/linux_machdep.c b/sys/arch/i386/i386/linux_machdep.c index 6bea6d04d993..3902df49c0ae 100644 --- a/sys/arch/i386/i386/linux_machdep.c +++ b/sys/arch/i386/i386/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.35 1998/01/15 22:25:54 thorpej Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.36 1998/01/22 00:39:19 thorpej Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -32,6 +32,7 @@ */ #include "opt_vm86.h" +#include "opt_user_ldt.h" #include #include diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s index 76f91a8e387d..5b99990aec7a 100644 --- a/sys/arch/i386/i386/locore.s +++ b/sys/arch/i386/i386/locore.s @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.181 1998/01/15 22:25:56 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.182 1998/01/22 00:39:23 thorpej Exp $ */ /*- * Copyright (c) 1993, 1994, 1995, 1997 @@ -42,6 +42,7 @@ #include "opt_cputype.h" #include "opt_vm86.h" +#include "opt_user_ldt.h" #include "npx.h" #include "assym.h" diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index d5dd1ef3c669..3521550e0409 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.273 1998/01/18 14:48:55 drochner Exp $ */ +/* $NetBSD: machdep.c,v 1.274 1998/01/22 00:39:26 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -80,6 +80,7 @@ #include "opt_cputype.h" #include "opt_vm86.h" +#include "opt_user_ldt.h" #include #include diff --git a/sys/arch/i386/i386/svr4_machdep.c b/sys/arch/i386/i386/svr4_machdep.c index 3269d95c61cb..957bccf292bd 100644 --- a/sys/arch/i386/i386/svr4_machdep.c +++ b/sys/arch/i386/i386/svr4_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_machdep.c,v 1.30 1998/01/15 22:26:00 thorpej Exp $ */ +/* $NetBSD: svr4_machdep.c,v 1.31 1998/01/22 00:39:28 thorpej Exp $ */ /* * Copyright (c) 1994 Christos Zoulas @@ -28,6 +28,7 @@ */ #include "opt_vm86.h" +#include "opt_user_ldt.h" #include #include diff --git a/sys/arch/i386/i386/sys_machdep.c b/sys/arch/i386/i386/sys_machdep.c index b638b4d401ee..cdfc9265a2a3 100644 --- a/sys/arch/i386/i386/sys_machdep.c +++ b/sys/arch/i386/i386/sys_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: sys_machdep.c,v 1.36 1998/01/15 22:26:00 thorpej Exp $ */ +/* $NetBSD: sys_machdep.c,v 1.37 1998/01/22 00:39:30 thorpej Exp $ */ /*- * Copyright (c) 1995, 1997 @@ -41,6 +41,7 @@ */ #include "opt_vm86.h" +#include "opt_user_ldt.h" #include #include diff --git a/sys/arch/i386/i386/vm_machdep.c b/sys/arch/i386/i386/vm_machdep.c index cbc05fbb94bd..33551bf2a06e 100644 --- a/sys/arch/i386/i386/vm_machdep.c +++ b/sys/arch/i386/i386/vm_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.65 1997/11/04 01:37:04 thorpej Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.66 1998/01/22 00:39:31 thorpej Exp $ */ /*- * Copyright (c) 1995 Charles M. Hannum. All rights reserved. @@ -45,6 +45,8 @@ * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ */ +#include "opt_user_ldt.h" + #include #include #include diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index 4d8dfa99e7d3..1c31c5debb4c 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.43 1998/01/21 23:29:10 thorpej Exp $ */ +/* $NetBSD: cpu.h,v 1.44 1998/01/22 00:39:35 thorpej Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -164,6 +164,9 @@ int kvtop __P((caddr_t)); int math_emulate __P((struct trapframe *)); #endif +#if !defined(_LKM) +#include "opt_user_ldt.h" +#endif #ifdef USER_LDT /* sys_machdep.h */ void i386_user_cleanup __P((struct pcb *)); diff --git a/sys/compat/linux/arch/i386/linux_machdep.c b/sys/compat/linux/arch/i386/linux_machdep.c index 6bea6d04d993..3902df49c0ae 100644 --- a/sys/compat/linux/arch/i386/linux_machdep.c +++ b/sys/compat/linux/arch/i386/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.35 1998/01/15 22:25:54 thorpej Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.36 1998/01/22 00:39:19 thorpej Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -32,6 +32,7 @@ */ #include "opt_vm86.h" +#include "opt_user_ldt.h" #include #include diff --git a/sys/compat/linux/i386/linux_machdep.c b/sys/compat/linux/i386/linux_machdep.c index 6bea6d04d993..3902df49c0ae 100644 --- a/sys/compat/linux/i386/linux_machdep.c +++ b/sys/compat/linux/i386/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.35 1998/01/15 22:25:54 thorpej Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.36 1998/01/22 00:39:19 thorpej Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -32,6 +32,7 @@ */ #include "opt_vm86.h" +#include "opt_user_ldt.h" #include #include