From 645a92be1628c97cfbf37f5c7afdaaedf9a3c3ab Mon Sep 17 00:00:00 2001
From: Mikhail Krichanov <mikhailkrichanov@gmail.com>
Date: Mon, 23 Dec 2024 11:47:33 +0300
Subject: [PATCH] ArmPkg: Fixed compilation.

---
 ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c | 5 +----
 ArmPkg/Library/CpuArchLib/CpuMmuCommon.c         | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
index 4379056ddf..0a648b79ea 100644
--- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
+++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
@@ -795,14 +795,11 @@ ArmMakeUserPageTableTemplate (
 {
   VOID        *TranslationTable;
   UINTN       MaxAddressBits;
-  UINT64      MaxAddress;
   UINTN       T0SZ;
   UINTN       RootTableEntryCount;
   EFI_STATUS  Status;
 
-  MaxAddressBits = MIN (ArmGetPhysicalAddressBits (), MAX_VA_BITS);
-  MaxAddress     = LShiftU64 (1ULL, MaxAddressBits) - 1;
-
+  MaxAddressBits      = MIN (ArmGetPhysicalAddressBits (), MAX_VA_BITS);
   T0SZ                = 64 - MaxAddressBits;
   RootTableEntryCount = GetRootTableEntryCount (T0SZ);
 
diff --git a/ArmPkg/Library/CpuArchLib/CpuMmuCommon.c b/ArmPkg/Library/CpuArchLib/CpuMmuCommon.c
index 382692d46a..5015c0b112 100644
--- a/ArmPkg/Library/CpuArchLib/CpuMmuCommon.c
+++ b/ArmPkg/Library/CpuArchLib/CpuMmuCommon.c
@@ -240,7 +240,8 @@ CpuGetMemoryAttributes (
   Status            = GetMemoryRegion (&RegionBaseAddress, &RegionLength, &RegionArmAttributes, 0);
 
   if (EFI_ERROR (Status)) {
-    return EFI_NOT_FOUND;
+    *Attributes = 0;
+    return Status;
   }
 
   *Attributes = RegionAttributeToGcdAttribute (RegionArmAttributes);