Module Name: src
Committed By: dsl
Date: Thu Oct 4 21:23:46 UTC 2012
Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0 XEN3_DOMU files.amd64
src/sys/arch/x86/include: psl.h
src/sys/arch/x86/x86: sys_machdep.c
Log Message:
Remove references to VM86 from the amd64 kernel configs.
VM86 mode isn't supported while in long mode.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/amd64/conf/files.amd64
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x86/include/psl.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x86/x86/sys_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.88 src/sys/arch/amd64/conf/XEN3_DOM0:1.89
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.88 Mon Sep 24 23:13:37 2012
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Thu Oct 4 21:23:45 2012
@@ -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"
@@ -16,7 +16,6 @@ options DOM0OPS
# boot messages with MPBIOS, acpi and ioapic can be quite large
options MSGBUFSIZE=24576
-#options VM86 # virtual 8086 emulation
#options USER_LDT # user-settable LDT; used by WINE
# CPU features
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.39 src/sys/arch/amd64/conf/XEN3_DOMU:1.40
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.39 Sun Sep 23 01:05:21 2012
+++ src/sys/arch/amd64/conf/XEN3_DOMU Thu Oct 4 21:23:45 2012
@@ -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"
@@ -16,7 +16,6 @@ maxusers 32 # estimated number of users
options MAXPHYS=32768 #xbd doesn't handle 64k transfers
#options DOM0OPS
-#options VM86 # virtual 8086 emulation
#options USER_LDT # user-settable LDT; used by WINE
#options MTRR # memory-type range register syscall support
Index: src/sys/arch/amd64/conf/files.amd64
diff -u src/sys/arch/amd64/conf/files.amd64:1.77 src/sys/arch/amd64/conf/files.amd64:1.78
--- src/sys/arch/amd64/conf/files.amd64:1.77 Thu Sep 27 18:28:55 2012
+++ src/sys/arch/amd64/conf/files.amd64 Thu Oct 4 21:23:45 2012
@@ -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
#
@@ -25,7 +25,6 @@ defparam opt_physmem.h PHYSMEM_MAX_ADDR
#
defflag USER_LDT
-defflag VM86
defflag eisa.h EISA
file arch/amd64/amd64/amd64func.S
Index: src/sys/arch/x86/include/psl.h
diff -u src/sys/arch/x86/include/psl.h:1.7 src/sys/arch/x86/include/psl.h:1.8
--- src/sys/arch/x86/include/psl.h:1.7 Fri Apr 20 18:28:43 2012
+++ src/sys/arch/x86/include/psl.h Thu Oct 4 21:23:45 2012
@@ -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.
@@ -62,9 +62,11 @@
#define PSL_MBZ 0xffc08028 /* must be zero bits */
#define PSL_USERSET (PSL_MBO | PSL_I)
+#ifdef i386
#if defined(_KERNEL_OPT)
#include "opt_vm86.h"
#endif
+#endif
#ifdef VM86
#define PSL_USERSTATIC (PSL_MBO | PSL_MBZ | PSL_I | PSL_IOPL | PSL_NT | PSL_VIF | PSL_VIP)
#else
Index: src/sys/arch/x86/x86/sys_machdep.c
diff -u src/sys/arch/x86/x86/sys_machdep.c:1.25 src/sys/arch/x86/x86/sys_machdep.c:1.26
--- src/sys/arch/x86/x86/sys_machdep.c:1.25 Mon Oct 10 15:15:28 2011
+++ src/sys/arch/x86/x86/sys_machdep.c Thu Oct 4 21:23:45 2012
@@ -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.
@@ -30,12 +30,14 @@
*/
#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_perfctrs.h"
#include "opt_user_ldt.h"
+#ifdef i386
#include "opt_vm86.h"
+#endif
#include "opt_xen.h"
#include <sys/param.h>
@@ -68,7 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: sys_machdep.
/* Need to be checked. */
#undef USER_LDT
#undef PERFCTRS
-#undef VM86
#undef IOPERM
#else
#if defined(XEN)
