diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-01-31 11:36:42 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-01-31 11:36:42 +0100 |
| commit | 3d83912b046fca4710bb7e1034419215350d403b (patch) | |
| tree | 969b5b4c83213d4bcd8610dbc3eca1d2f921575a /i386 | |
| parent | 8e01f3e5f98c4b2507441c2c4c66f1c8930211dc (diff) | |
Enable pae_extended_cr3 in pmap_bootstrap
* i386/i386/gdt.c (gdt_init): Do not enable VMASST_TYPE_pae_extended_cr3.
* i386/intel/pmap.c (pmap_bootstrap): Enable VMASST_TYPE_pae_extended_cr3.
Diffstat (limited to 'i386')
| -rw-r--r-- | i386/i386/gdt.c | 2 | ||||
| -rw-r--r-- | i386/intel/pmap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/i386/i386/gdt.c b/i386/i386/gdt.c index a034791..f26a50c 100644 --- a/i386/i386/gdt.c +++ b/i386/i386/gdt.c @@ -71,8 +71,6 @@ gdt_init() panic("couldn't set gdt\n"); if (hyp_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments)) panic("couldn't set 4gb segments vm assist"); - if (hyp_vm_assist(VMASST_CMD_enable, VMASST_TYPE_pae_extended_cr3)) - panic("couldn't set extended cr3"); #if 0 if (hyp_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments_notify)) panic("couldn't set 4gb segments vm assist notify"); diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c index 3ee6338..f5df8a4 100644 --- a/i386/intel/pmap.c +++ b/i386/intel/pmap.c @@ -654,6 +654,8 @@ void pmap_bootstrap() } #ifdef MACH_XEN + /* We don't actually deal with the CR3 register content at all */ + hyp_vm_assist(VMASST_CMD_enable, VMASST_TYPE_pae_extended_cr3); /* * Xen may only provide as few as 512KB extra bootstrap linear memory, * which is far from enough to map all available memory, so we need to |