Merge branch 'master' of https://github.com/rcore-os/riscv into hypervisorext

Author: gjz010

src/paging/page_table.rs

@@ -42,6 +42,7 @@ impl PTEIterableSlice<PageTableEntryX64> for Entries64 {
     }
 }
 
+#[repr(C)]
 pub struct PageTableWith<T: PTEIterableSlice<E>, E: PTE> {
     entries: T,
     phantom: PhantomData<E>,
@@ -118,6 +119,7 @@ pub trait PTE {
     fn flags_mut(&mut self) -> &mut PageTableFlags;
 }
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct PageTableEntryX32(u32);
 
 impl PTE for PageTableEntryX32 {

src/paging/recursive.rs

@@ -37,7 +37,7 @@ pub trait Mapper {
         flags: PageTableFlags,
     ) -> Result<Self::MapperFlush, FlagUpdateError> {
         self.ref_entry(page).map(|e| {
-            *e.flags_mut() = flags;
+            e.set(e.frame::<Self::P>(), flags);
             Self::MapperFlush::new(page)
         })
     }