commit b6463c911a13728f5a5e89c61c98e6829c21165e
author David Brazdil <dbrazdil@google.com> Mon Jul 11 15:50:43 2022 +0100
committer David Brazdil <dbrazdil@google.com> Tue Jul 12 12:51:34 2022 +0100
tree 1aea000750dba9860e096b5d5e38ceef2343c59a
parent 6629b6e5f85bdda1b93d9d3a5fe2799f329462fd

rialto: Remove activate_kernel_pgt function

Minor cleanup. Just call the activate() function from init_kernel_pgt.

Test: atest rialto_test
Change-Id: Ibc5762d91c06632da5d64e4c4ecddb3b61f8008b

rialto/src/main.rs

diff --git a/rialto/src/main.rs b/rialto/src/main.rs
index e95be30..8710c49 100644
--- a/rialto/src/main.rs
+++ b/rialto/src/main.rs
@@ -102,13 +102,9 @@
     pgt.map_range(&reg_rodata, PROT_RO)?;
     pgt.map_range(&reg_data, PROT_RW)?;
 
-    info!("Finished preparing kernel page table.");
-    Ok(())
-}
-
-fn activate_kernel_pgt(pgt: &mut IdMap) {
     pgt.activate();
     info!("Activated kernel page table.");
+    Ok(())
 }
 
 /// Entry point for Rialto.
@@ -120,7 +116,6 @@
 
     let mut pgt = IdMap::new(PT_ASID, PT_ROOT_LEVEL);
     init_kernel_pgt(&mut pgt).unwrap();
-    activate_kernel_pgt(&mut pgt);
 }
 
 extern "C" {