Rename recursive_level_4_table feature to recursive_page_table

Author: phil-opp

Cargo.toml

@@ -24,7 +24,7 @@ features = ["unicode"]
 [features]
 default = []
 vga_320x200 = []
-recursive_level_4_table = []
+recursive_page_table = []
 map_physical_memory = []
 
 [profile.dev]
@@ -36,4 +36,4 @@ lto = false
 debug = true
 
 [package.metadata.docs.rs]
-features = [ "recursive_level_4_table", "map_physical_memory" ]
+features = [ "recursive_page_table", "map_physical_memory" ]

Changelog.md

@@ -1,6 +1,6 @@
 ## Breaking
 
-- The level 4 page table is only recursively mapped if the `recursive_level_4_table` feature is enabled.
+- The level 4 page table is only recursively mapped if the `recursive_page_table` feature is enabled.
 - Replace `BootInfo::p4_table_addr` with `RECURSIVE_LEVEL_4_TABLE_ADDR` constant (only present if the cargo feature is enabled)
 - Remove `From<PhysFrameRange>` implemenations for x86_64 `FrameRange`
   - This only works when the versions align, so it is not a good general solution.

src/bootinfo/mod.rs

@@ -9,8 +9,8 @@ mod memory_map;
 pub struct BootInfo {
     pub memory_map: MemoryMap,
     /// The virtual address of the recursively mapped level 4 page table.
-    #[cfg(feature = "recursive_level_4_table")]
-    pub recursive_level_4_table_addr: u64,
+    #[cfg(feature = "recursive_page_table")]
+    pub recursive_page_table_addr: u64,
     /// The offset into the virtual address space where the physical memory is mapped.
     ///
     /// Physical addresses can be converted to virtual addresses by adding this offset to them.
@@ -26,11 +26,11 @@ pub struct BootInfo {
 
 impl BootInfo {
     #[allow(unused_variables)]
-    pub fn new(memory_map: MemoryMap, recursive_level_4_table_addr: u64, physical_memory_offset: u64) -> Self {
+    pub fn new(memory_map: MemoryMap, recursive_page_table_addr: u64, physical_memory_offset: u64) -> Self {
         BootInfo {
             memory_map,
-            #[cfg(feature = "recursive_level_4_table")]
-            recursive_level_4_table_addr,
+            #[cfg(feature = "recursive_page_table")]
+            recursive_page_table_addr,
             #[cfg(feature = "map_physical_memory")]
             physical_memory_offset,
             _non_exhaustive: 0,

src/main.rs

@@ -266,7 +266,7 @@ fn load_elf(
     // Make sure that the kernel respects the write-protection bits, even when in ring 0.
     enable_write_protect_bit();
 
-    if cfg!(not(feature = "recursive_level_4_table")) {
+    if cfg!(not(feature = "recursive_page_table")) {
         // unmap recursive entry
         rec_page_table
             .unmap(recursive_page_table_addr)