diff options
| author | AlmuHS <almuhs@github.com> | 2019-05-13 21:16:24 +0200 |
|---|---|---|
| committer | AlmuHS <almuhs@github.com> | 2019-05-13 21:16:24 +0200 |
| commit | ce30d2addfb42de0b36bfdebe22ee9096d053dba (patch) | |
| tree | ae1aaaa8034bc65063371c1aefd042155113a0a9 | |
| parent | 12478c0d40c8a036e939b04bbc57d3b0974c8418 (diff) | |
Revert "experiment: try to enable pagging"
This reverts commit 2df0c646aa188aab00f2b119574da61a94353b59.
revert failed experiments
| -rw-r--r-- | i386/i386/cpuboot.S | 21 | ||||
| -rw-r--r-- | i386/i386/mp_desc.c | 11 |
2 files changed, 2 insertions, 30 deletions
diff --git a/i386/i386/cpuboot.S b/i386/i386/cpuboot.S index 289016f4..03b4a470 100644 --- a/i386/i386/cpuboot.S +++ b/i386/i386/cpuboot.S @@ -96,26 +96,9 @@ _apboot: popf pushl stack_ptr - cli - - /* Initialize pagging */ - mov kernel_page_dir, %eax - add KERNELBASE,%eax - mov %eax, %cr3 - - mov %cr0,%eax - or $0x80010000,%eax - - mov %eax,%cr0 - mov %cr0,%eax - and $0x9fffffff,%eax - mov %eax,%cr0 - mov %cr4,%eax - or $0x80,%al - mov %eax,%cr4 - - call cpu_ap_main + call cpu_ap_main + cli .align 0x10 diff --git a/i386/i386/mp_desc.c b/i386/i386/mp_desc.c index eff54c87..1c8ca47d 100644 --- a/i386/i386/mp_desc.c +++ b/i386/i386/mp_desc.c @@ -346,16 +346,6 @@ cpu_setup() break; } -#if 0 - -#ifdef MACH_PV_PAGETABLES - for (i = 0; i < PDPNUM; i++) - pmap_set_page_readonly_init((void*) kernel_page_dir + i * INTEL_PGBYTES); -#if PAE - pmap_set_page_readonly_init(kernel_pmap->pdpbase); -#endif /* PAE */ -#endif /* MACH_PV_PAGETABLES */ - #if PAE set_cr3((unsigned)_kvtophys(kernel_pmap->pdpbase)); #ifndef MACH_HYP @@ -377,7 +367,6 @@ cpu_setup() set_cr4(get_cr4() | CR4_PGE); #endif /* MACH_HYP */ -#endif //slave_main(i); printf("cpu %d enabled\n", cpu_number()); |