PERFORCE change 91108 for review

Kip Macy kmacy at FreeBSD.org
Sat Feb 4 12:39:36 PST 2006


http://perforce.freebsd.org/chv.cgi?CH=91108

Change 91108 by kmacy at kmacy:freebsd7_xen3 on 2006/02/04 20:38:49

	all vm86_initialize to proceed
	don't call vm86_intcall in atkbd code as it is only needed for bios option checking

Affected files ...

.. //depot/projects/xen3/src/sys/dev/atkbdc/atkbd.c#2 edit
.. //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#11 edit
.. //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#13 edit

Differences ...

==== //depot/projects/xen3/src/sys/dev/atkbdc/atkbd.c#2 (text+ko) ====

@@ -1056,7 +1056,7 @@
 static int
 get_typematic(keyboard_t *kbd)
 {
-#ifdef __i386__
+#if defined(__i386__) && !defined(XEN) 
 	/*
 	 * Only some systems allow us to retrieve the keyboard repeat 
 	 * rate previously set via the BIOS...

==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#11 (text+ko) ====

@@ -2456,10 +2456,7 @@
 	dblfault_tss.tss_cs = GSEL(GCODE_SEL, SEL_KPL);
 	dblfault_tss.tss_ldt = GSEL(GLDT_SEL, SEL_KPL);
 
-#ifndef XEN
-	/* XXX - this can be made to work */
 	vm86_initialize();
-#endif
 	getmemsize(first);
 	init_param2(physmem);
 

==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#13 (text+ko) ====

@@ -520,6 +520,7 @@
 extern unsigned long *SMPpt;
 extern  struct user	*proc0uarea;
 extern  vm_offset_t	proc0kstack;
+extern int vm86paddr, vm86phystk;
 char *bootmem_start, *bootmem_current, *bootmem_end; 
 
 pteinfo_t *pteinfo_list;
@@ -653,6 +654,14 @@
 	ldt = (union descriptor *)PFNTOV(tmpindex);
 	tmpindex++; 
 
+	/* vm86/bios stack */
+	tmpindex += 1;
+
+	/* Map space for the vm86 region */
+	vm86paddr = (vm_offset_t)PFNTOV(tmpindex);
+	tmpindex += 3;
+
+
 	/* initialize page directory shadow page */
 	pdir_shadow = (vm_offset_t *)PFNTOV(tmpindex);
 	i686_pagezero(pdir_shadow);
@@ -670,7 +679,7 @@
 			    KPTphys | PG_V | PG_A);
 
 	xen_flush_queue();
-	/* allocate remainder of NKPT pages */
+
 
 
 #ifdef SMP


More information about the p4-projects mailing list