summaryrefslogtreecommitdiff
path: root/i386
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2011-03-06 22:11:02 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2011-03-06 22:11:02 +0100
commit90e80071a10c1b048bbf5a001e8d0b77c807874a (patch)
tree798f73366e898e653f8abe49d1ec87e39ac3e90d /i386
parent12c5bc346326449b0bd7d9e3a751884d4117eed3 (diff)
Enable global pages after enabling paging
* i386/i386at/model_dep.c (i386at_init): Enable CR4_PGE after enabling CR0_PG.
Diffstat (limited to 'i386')
-rw-r--r--i386/i386at/model_dep.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
index 6d029b8..f9ab691 100644
--- a/i386/i386at/model_dep.c
+++ b/i386/i386at/model_dep.c
@@ -414,10 +414,10 @@ i386at_init(void)
set_cr3((unsigned)_kvtophys(kernel_page_dir));
#endif /* PAE */
#ifndef MACH_HYP
- if (CPU_HAS_FEATURE(CPU_FEATURE_PGE))
- set_cr4(get_cr4() | CR4_PGE);
/* already set by Hypervisor */
set_cr0(get_cr0() | CR0_PG | CR0_WP);
+ if (CPU_HAS_FEATURE(CPU_FEATURE_PGE))
+ set_cr4(get_cr4() | CR4_PGE);
#endif /* MACH_HYP */
flush_instr_queue();
#ifdef MACH_XEN