From 97b4d31355b24e4868c5742357e96737d2f8d8a7 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Fri, 19 Aug 2022 20:54:02 -0600
Subject: [PATCH] Match aarch64 PHYS_OFFSET with x86_64

---
 rmm                        | 2 +-
 src/arch/aarch64/consts.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rmm b/rmm
index e05868e..c5eb435 160000
--- a/rmm
+++ b/rmm
@@ -1 +1 @@
-Subproject commit e05868e1dcf52b55e03a65435325cee3916ca83a
+Subproject commit c5eb435d79a558a4a398a80f0bda57af6192e1fe
diff --git a/src/arch/aarch64/consts.rs b/src/arch/aarch64/consts.rs
index 23cee5d..dc31f89 100644
--- a/src/arch/aarch64/consts.rs
+++ b/src/arch/aarch64/consts.rs
@@ -46,7 +46,7 @@
 
     /// Offset of physmap
     // This needs to match RMM's PHYS_OFFSET
-    pub const PHYS_OFFSET: usize = 0xFFFF_FE00_0000_0000;
+    pub const PHYS_OFFSET: usize = 0xFFFF_8000_0000_0000;
     pub const PHYS_PML4: usize = (PHYS_OFFSET & PML4_MASK)/PML4_SIZE;
 
     /// Offset to user image