From 4da1fe545cd4c7d9b260cfcc62a8520fa5b3baf2 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sun, 23 Aug 2020 13:29:32 -0700 Subject: [PATCH] kern: fix linear mapped dram -> pool partition check --- mesosphere/kernel/source/arch/arm64/init/kern_init_core.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesosphere/kernel/source/arch/arm64/init/kern_init_core.cpp b/mesosphere/kernel/source/arch/arm64/init/kern_init_core.cpp index b3765f2cf..7bd77b13b 100644 --- a/mesosphere/kernel/source/arch/arm64/init/kern_init_core.cpp +++ b/mesosphere/kernel/source/arch/arm64/init/kern_init_core.cpp @@ -310,7 +310,7 @@ namespace ams::kern::init { /* All linear-mapped DRAM regions that we haven't tagged by this point will be allocated to some pool partition. Tag them. */ for (auto ®ion : KMemoryLayout::GetPhysicalMemoryRegionTree()) { - if (region.GetType() == KMemoryRegionType_Dram && region.HasTypeAttribute(KMemoryRegionAttr_LinearMapped)) { + if (region.GetType() == (KMemoryRegionType_Dram | KMemoryRegionAttr_LinearMapped)) { region.SetType(KMemoryRegionType_DramPoolPartition); } }