===== xen/arch/x86/Rules.mk 1.29 vs edited =====
--- 1.29/xen/arch/x86/Rules.mk	2004-08-10 15:11:59 -06:00
+++ edited/xen/arch/x86/Rules.mk	2004-12-05 20:49:11 -07:00
@@ -12,7 +12,7 @@
 CFLAGS  += -msoft-float
 
 ifeq ($(TARGET_SUBARCH),x86_32)
-CFLAGS  += -m32 -march=i686
+CFLAGS  += -m32 -march=i586
 LDFLAGS := --oformat elf32-i386 
 endif
 
===== xen/arch/x86/setup.c 1.63 vs edited =====
--- 1.63/xen/arch/x86/setup.c	2004-08-25 09:40:13 -06:00
+++ edited/xen/arch/x86/setup.c	2004-12-05 20:49:11 -07:00
@@ -32,7 +32,7 @@
 #if defined(__x86_64__)
 unsigned long mmu_cr4_features = X86_CR4_PSE | X86_CR4_PGE | X86_CR4_PAE;
 #else
-unsigned long mmu_cr4_features = X86_CR4_PSE | X86_CR4_PGE;
+unsigned long mmu_cr4_features = X86_CR4_PGE;
 #endif
 EXPORT_SYMBOL(mmu_cr4_features);
 
===== xen/arch/x86/boot/x86_32.S 1.26 vs edited =====
--- 1.26/xen/arch/x86/boot/x86_32.S	2004-07-14 11:36:28 -06:00
+++ edited/xen/arch/x86/boot/x86_32.S	2004-12-05 20:49:12 -07:00
@@ -79,7 +79,7 @@
         /* Set up CR4, except global flag which Intel requires should be     */
         /* left until after paging is enabled (IA32 Manual Vol. 3, Sec. 2.5) */
         mov     mmu_cr4_features-__PAGE_OFFSET,%ecx
-        and     $0x7f,%cl   # CR4.PGE (global enable)
+        and     $0xf,%cl  # CR4.PGE (global enable)
         mov     %ecx,%cr4
                 
         cmp     $(SECONDARY_CPU_FLAG),%ebx
@@ -100,19 +100,29 @@
         xor     %eax,%eax
         rep     stosb
 
-        /* Initialize low and high mappings of all memory with 4MB pages */
-        mov     $idle_pg_table-__PAGE_OFFSET,%edi
-        mov     $0x1e3,%eax                  /* PRESENT+RW+A+D+4MB+GLOBAL */
-1:      mov     %eax,__PAGE_OFFSET>>20(%edi) /* high mapping */
+        /* Initialize low and high mappings of all memory */
+        /* build Page Table with 4kb pages */	
+        mov     $idle_pg_table_four-__PAGE_OFFSET,%edi
+        mov     $0x23,%eax                   /* PRESENT+RW+A */
+1:      mov     %eax,__PAGE_OFFSET>>10(%edi) /* high mapping */
         stosl                                /* low mapping */
-        add     $(1<<L2_PAGETABLE_SHIFT),%eax
-        cmp     $DIRECTMAP_PHYS_END+0x1e3,%eax
+        add     $(1<<L1_PAGETABLE_SHIFT),%eax
+        cmp     $DIRECTMAP_PHYS_END+0x23,%eax
         jne     1b
 1:      stosl   /* low mappings cover as much physmem as possible */
-        add     $(1<<L2_PAGETABLE_SHIFT),%eax
-        cmp     $__HYPERVISOR_VIRT_START+0x1e3,%eax
+        add     $(1<<L1_PAGETABLE_SHIFT),%eax
+        cmp     $__HYPERVISOR_VIRT_START+0x23,%eax
         jne     1b
-        
+
+	/* build Page Directory */
+        mov     $idle_pg_table-__PAGE_OFFSET,%edi
+        mov     $0x23,%eax                   /* PRESENT+RW+A */
+        add     $idle_pg_table_four-__PAGE_OFFSET,%eax
+1:      stosl
+        add     $(1<<L1_PAGETABLE_SHIFT),%eax
+        cmp     $idle_pg_table-__PAGE_OFFSET+0x1000-20,%edi
+        jne     1b
+
         /* Initialise IDT with simple error defaults. */
         lea     ignore_int,%edx
         mov     $(__HYPERVISOR_CS << 16),%eax
@@ -216,5 +226,7 @@
         .org 0x2000
 ENTRY(cpu0_stack)    # Initial stack is 8kB
         .org 0x4000
+ENTRY(idle_pg_table_four) # Initial page entries (4mb total)
+	.org 0x4000 + 4*1024*1024
 ENTRY(stext)
 ENTRY(_stext)
===== xen/arch/x86/x86_32/mm.c 1.46 vs edited =====
--- 1.46/xen/arch/x86/x86_32/mm.c	2004-08-24 03:48:48 -06:00
+++ edited/xen/arch/x86/x86_32/mm.c	2004-12-05 20:49:12 -07:00
@@ -81,13 +81,6 @@
 {
     unsigned long addr;
     void *ioremap_pt;
-    int i;
-
-    /* Idle page table 1:1 maps the first part of physical memory. */
-    for ( i = 0; i < DOMAIN_ENTRIES_PER_L2_PAGETABLE; i++ )
-        idle_pg_table[i] = 
-            mk_l2_pgentry((i << L2_PAGETABLE_SHIFT) | 
-                          __PAGE_HYPERVISOR | _PAGE_PSE);
 
     /*
      * Fixed mappings, only the page table structure has to be
===== xen/include/asm-x86/page.h 1.21 vs edited =====
--- 1.21/xen/include/asm-x86/page.h	2004-07-27 13:37:35 -06:00
+++ edited/xen/include/asm-x86/page.h	2004-12-05 20:49:13 -07:00
@@ -131,6 +131,7 @@
 #define va_to_l1mfn(_va) (l2_pgentry_val(linear_l2_table[_va>>L2_PAGETABLE_SHIFT]) >> PAGE_SHIFT)
 
 extern l2_pgentry_t idle_pg_table[ENTRIES_PER_L2_PAGETABLE];
+extern l2_pgentry_t idle_pg_table_four[ENTRIES_PER_L2_PAGETABLE*ENTRIES_PER_L2_PAGETABLE];
 extern void paging_init(void);
 
 #define __flush_tlb()                                             \