File tree Expand file tree Collapse file tree 4 files changed +11
-46
lines changed
Expand file tree Collapse file tree 4 files changed +11
-46
lines changed Original file line number Diff line number Diff line change 11pub mod paging;
2-
3- use crate :: mm:: { FrameAlloc , PageAlloc , PageRangeAllocator } ;
4-
5- pub unsafe fn init ( ) {
6- unsafe {
7- paging:: init ( ) ;
8- }
9- unsafe {
10- FrameAlloc :: init ( ) ;
11- }
12- unsafe {
13- PageAlloc :: init ( ) ;
14- }
15- }
Original file line number Diff line number Diff line change 11pub mod paging;
2-
3- use crate :: mm:: { FrameAlloc , PageAlloc , PageRangeAllocator } ;
4-
5- pub unsafe fn init ( ) {
6- unsafe {
7- paging:: init ( ) ;
8- }
9- unsafe {
10- FrameAlloc :: init ( ) ;
11- }
12- unsafe {
13- PageAlloc :: init ( ) ;
14- }
15- }
Original file line number Diff line number Diff line change 11pub ( crate ) mod paging;
22
33use memory_addresses:: arch:: x86_64:: { PhysAddr , VirtAddr } ;
4-
5- use crate :: mm:: { FrameAlloc , PageAlloc , PageRangeAllocator } ;
6-
7- pub unsafe fn init ( ) {
8- unsafe {
9- paging:: init ( ) ;
10- }
11- unsafe {
12- FrameAlloc :: init ( ) ;
13- }
14- unsafe {
15- paging:: log_page_tables ( ) ;
16- }
17- unsafe {
18- PageAlloc :: init ( ) ;
19- }
20- }
Original file line number Diff line number Diff line change @@ -93,7 +93,17 @@ pub(crate) fn init() {
9393 Lazy :: force ( & KERNEL_ADDR_RANGE ) ;
9494
9595 unsafe {
96- arch:: mm:: init ( ) ;
96+ arch:: mm:: paging:: init ( ) ;
97+ }
98+ unsafe {
99+ FrameAlloc :: init ( ) ;
100+ }
101+ #[ cfg( target_arch = "x86_64" ) ]
102+ unsafe {
103+ arch:: mm:: paging:: log_page_tables ( ) ;
104+ }
105+ unsafe {
106+ PageAlloc :: init ( ) ;
97107 }
98108
99109 let total_mem = physicalmem:: total_memory_size ( ) ;
You can’t perform that action at this time.
0 commit comments