@@ -112,7 +112,7 @@ pub unsafe fn identity_mapped_page_table() -> OffsetPageTable<'static> {
112112 ptr:: with_exposed_provenance_mut :: < PageTable > ( level_4_table_addr. try_into ( ) . unwrap ( ) ) ;
113113 unsafe {
114114 let level_4_table = level_4_table_ptr. as_mut ( ) . unwrap ( ) ;
115- OffsetPageTable :: new ( level_4_table, x86_64:: addr:: VirtAddr :: new ( 0x0 ) )
115+ OffsetPageTable :: from_phys_offset ( level_4_table, x86_64:: addr:: VirtAddr :: new ( 0x0 ) )
116116 }
117117}
118118
@@ -179,7 +179,7 @@ pub fn map<S>(
179179 for ( page, frame) in pages. zip ( frames) {
180180 // TODO: Require explicit unmaps
181181 let unmap = mapper. unmap ( page) ;
182- if let Ok ( ( _frame, flush) ) = unmap {
182+ if let Ok ( ( _frame, _flags , flush) ) = unmap {
183183 unmapped = true ;
184184 flush. flush ( ) ;
185185 debug ! ( "Had to unmap page {page:?} before mapping." ) ;
@@ -265,7 +265,7 @@ where
265265 for page in range {
266266 let unmap_result = unsafe { identity_mapped_page_table ( ) } . unmap ( page) ;
267267 match unmap_result {
268- Ok ( ( _frame, flush) ) => flush. flush ( ) ,
268+ Ok ( ( _frame, _flags , flush) ) => flush. flush ( ) ,
269269 // FIXME: Some sentinel pages around stacks are supposed to be unmapped.
270270 // We should handle this case there instead of here.
271271 Err ( UnmapError :: PageNotMapped ) => {
@@ -372,7 +372,7 @@ pub unsafe fn log_page_tables() {
372372 }
373373
374374 let page_table = unsafe { identity_mapped_page_table ( ) } ;
375- trace ! ( "Page tables:\n {}" , page_table . display( ) ) ;
375+ trace ! ( "Page tables:\n {}" , OffsetPageTableExt :: display( & page_table ) ) ;
376376}
377377
378378pub mod mapped_page_range_display {
@@ -961,7 +961,7 @@ mod walker {
961961 ) -> Result < & ' b PageTable , PageTableWalkError > {
962962 let page_table_ptr = self
963963 . page_table_frame_mapping
964- . frame_to_pointer ( entry. frame ( ) ?) ;
964+ . frame_to_pointer ( entry. frame ( false ) ?) ;
965965 let page_table: & PageTable = unsafe { & * page_table_ptr } ;
966966
967967 Ok ( page_table)
0 commit comments