Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove references to VM86 from the amd64 kernel configs. 

VM86 mode isn't supported while in long mode.
This commit is contained in:
dsl 2012-10-04 21:23:45 +00:00
parent 1ebcbda526
commit 9fb5a66c05
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/arch/amd64/conf/XEN3_DOM0
View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3_DOM0,v 1.88 2012/09/24 23:13:37 khorben Exp $ # $NetBSD: XEN3_DOM0,v 1.89 2012/10/04 21:23:45 dsl Exp $
include "arch/amd64/conf/std.xen" include "arch/amd64/conf/std.xen"
@ -16,7 +16,6 @@ options DOM0OPS
# boot messages with MPBIOS, acpi and ioapic can be quite large # boot messages with MPBIOS, acpi and ioapic can be quite large
options MSGBUFSIZE=24576 options MSGBUFSIZE=24576
#options VM86 # virtual 8086 emulation
#options USER_LDT # user-settable LDT; used by WINE #options USER_LDT # user-settable LDT; used by WINE
# CPU features # CPU features

3
sys/arch/amd64/conf/XEN3_DOMU
View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3_DOMU,v 1.39 2012/09/23 01:05:21 chs Exp $ # $NetBSD: XEN3_DOMU,v 1.40 2012/10/04 21:23:45 dsl Exp $
include "arch/amd64/conf/std.xen" include "arch/amd64/conf/std.xen"
@ -16,7 +16,6 @@ maxusers 32 # estimated number of users
options MAXPHYS=32768 #xbd doesn't handle 64k transfers options MAXPHYS=32768 #xbd doesn't handle 64k transfers
#options DOM0OPS #options DOM0OPS
#options VM86 # virtual 8086 emulation
#options USER_LDT # user-settable LDT; used by WINE #options USER_LDT # user-settable LDT; used by WINE
#options MTRR # memory-type range register syscall support #options MTRR # memory-type range register syscall support

3
sys/arch/amd64/conf/files.amd64
View File

@ -1,4 +1,4 @@
# $NetBSD: files.amd64,v 1.77 2012/09/27 18:28:55 alnsn Exp $ # $NetBSD: files.amd64,v 1.78 2012/10/04 21:23:45 dsl Exp $
# #
# new style config file for amd64 architecture # new style config file for amd64 architecture
# #
@ -25,7 +25,6 @@ defparam opt_physmem.h PHYSMEM_MAX_ADDR PHYSMEM_MAX_SIZE
# #
defflag USER_LDT defflag USER_LDT
defflag VM86
defflag eisa.h EISA defflag eisa.h EISA
file arch/amd64/amd64/amd64func.S file arch/amd64/amd64/amd64func.S

4
sys/arch/x86/include/psl.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: psl.h,v 1.7 2012/04/20 18:28:43 jym Exp $ */ /* $NetBSD: psl.h,v 1.8 2012/10/04 21:23:45 dsl Exp $ */
/*- /*-
* Copyright (c) 1990 The Regents of the University of California. * Copyright (c) 1990 The Regents of the University of California.
@ -62,9 +62,11 @@
#define PSL_MBZ 0xffc08028 /* must be zero bits */ #define PSL_MBZ 0xffc08028 /* must be zero bits */
#define PSL_USERSET (PSL_MBO | PSL_I) #define PSL_USERSET (PSL_MBO | PSL_I)
#ifdef i386
#if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT)
#include "opt_vm86.h" #include "opt_vm86.h"
#endif #endif
#endif
#ifdef VM86 #ifdef VM86
#define PSL_USERSTATIC (PSL_MBO | PSL_MBZ | PSL_I | PSL_IOPL | PSL_NT | PSL_VIF | PSL_VIP) #define PSL_USERSTATIC (PSL_MBO | PSL_MBZ | PSL_I | PSL_IOPL | PSL_NT | PSL_VIF | PSL_VIP)
#else #else

7
sys/arch/x86/x86/sys_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sys_machdep.c,v 1.25 2011/10/10 15:15:28 jakllsch Exp $ */ /* $NetBSD: sys_machdep.c,v 1.26 2012/10/04 21:23:45 dsl Exp $ */
/*- /*-
* Copyright (c) 1998, 2007, 2009 The NetBSD Foundation, Inc. * Copyright (c) 1998, 2007, 2009 The NetBSD Foundation, Inc.
@ -30,12 +30,14 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.25 2011/10/10 15:15:28 jakllsch Exp $"); __KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.26 2012/10/04 21:23:45 dsl Exp $");
#include "opt_mtrr.h" #include "opt_mtrr.h"
#include "opt_perfctrs.h" #include "opt_perfctrs.h"
#include "opt_user_ldt.h" #include "opt_user_ldt.h"
#ifdef i386
#include "opt_vm86.h" #include "opt_vm86.h"
#endif
#include "opt_xen.h" #include "opt_xen.h"
#include <sys/param.h> #include <sys/param.h>
@ -68,7 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.25 2011/10/10 15:15:28 jakllsch Ex
/* Need to be checked. */ /* Need to be checked. */
#undef USER_LDT #undef USER_LDT
#undef PERFCTRS #undef PERFCTRS
#undef VM86
#undef IOPERM #undef IOPERM
#else #else
#if defined(XEN) #if defined(XEN)