From 815ac3da4a6b783c799b32201d51c8d0fb9226f7 Mon Sep 17 00:00:00 2001
From: 4lDO2 <4lDO2@protonmail.com>
Date: Sun, 8 Sep 2024 20:22:46 +0200
Subject: [PATCH] Revert "Fix possible UB in rmm::init."

This reverts commit 4626c74b780c66fc62c024ec7d569a625862355d.
---
 src/arch/aarch64/rmm.rs | 4 ++--
 src/arch/x86/rmm.rs     | 4 ++--
 src/arch/x86_64/rmm.rs  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/arch/aarch64/rmm.rs b/src/arch/aarch64/rmm.rs
index c96719d9a8..7a741dda05 100644
--- a/src/arch/aarch64/rmm.rs
+++ b/src/arch/aarch64/rmm.rs
@@ -29,7 +29,7 @@ pub enum BootloaderMemoryKind {
 pub struct BootloaderMemoryEntry {
     pub base: u64,
     pub size: u64,
-    pub kind: u64,
+    pub kind: BootloaderMemoryKind,
 }
 
 unsafe fn page_flags<A: Arch>(virt: VirtualAddress) -> PageFlags<RmmA> {
@@ -347,7 +347,7 @@ pub unsafe fn init(
     // Copy memory map from bootloader location, and page align it
     let mut area_i = 0;
     for bootloader_area in bootloader_areas.iter() {
-        if { bootloader_area.kind } != BootloaderMemoryKind::Free as u64 {
+        if { bootloader_area.kind } != BootloaderMemoryKind::Free {
             // Not a free area
             continue;
         }
diff --git a/src/arch/x86/rmm.rs b/src/arch/x86/rmm.rs
index 5975aa51de..79cdec7ba1 100644
--- a/src/arch/x86/rmm.rs
+++ b/src/arch/x86/rmm.rs
@@ -29,7 +29,7 @@ pub enum BootloaderMemoryKind {
 pub struct BootloaderMemoryEntry {
     pub base: u64,
     pub size: u64,
-    pub kind: u64,
+    pub kind: BootloaderMemoryKind,
 }
 
 unsafe fn page_flags<A: Arch>(virt: VirtualAddress) -> PageFlags<A> {
@@ -327,7 +327,7 @@ pub unsafe fn init(
     // Copy memory map from bootloader location, and page align it
     let mut area_i = 0;
     for bootloader_area in bootloader_areas.iter() {
-        if { bootloader_area.kind } != BootloaderMemoryKind::Free as u64 {
+        if { bootloader_area.kind } != BootloaderMemoryKind::Free {
             // Not a free area
             continue;
         }
diff --git a/src/arch/x86_64/rmm.rs b/src/arch/x86_64/rmm.rs
index fb7ba2967a..503fc273ae 100644
--- a/src/arch/x86_64/rmm.rs
+++ b/src/arch/x86_64/rmm.rs
@@ -28,7 +28,7 @@ pub enum BootloaderMemoryKind {
 pub struct BootloaderMemoryEntry {
     pub base: u64,
     pub size: u64,
-    pub kind: u64,
+    pub kind: BootloaderMemoryKind,
 }
 
 unsafe fn page_flags<A: Arch>(virt: VirtualAddress) -> PageFlags<A> {
@@ -321,7 +321,7 @@ pub unsafe fn init(
     let areas_raw = &mut *AREAS.get();
 
     for bootloader_area in bootloader_areas.iter() {
-        if { bootloader_area.kind } != BootloaderMemoryKind::Free as u64 {
+        if { bootloader_area.kind } != BootloaderMemoryKind::Free {
             // Not a free area
             continue;
         }