3 files changed, 2 insertions, 4 deletions
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
index 91f72bd483..19f19d578a 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
@@ -78,7 +78,6 @@
 [Guids]
   gEfiProcessorSubClassGuid                     # SOMETIMES_CONSUMED
   gEfiMiscSubClassGuid                          # SOMETIMES_CONSUMED
-  gEfiMemoryProducerGuid                        # SOMETIMES_CONSUMED
   gEfiMemorySubClassGuid                        # SOMETIMES_CONSUMED
 
 [Protocols]
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
index 3d86f16a93..df3ca8b986 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
@@ -25,7 +25,6 @@ Abstract:
 #include <FrameworkDxe.h>
 #include <WinNtDxe.h>
 #include <Guid/DataHubRecords.h>
-#include <Guid/DataHubProducer.h>
 #include <Protocol/DataHub.h>
 #include <Protocol/WinNtIo.h>
 #include <Library/BaseLib.h>
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
index 8c2bcc19ea..515ccbbc5b 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
@@ -314,7 +314,7 @@ Returns:
 
   MemorySubClassData.Record.ArrayStartAddress.MemoryArrayStartAddress               = 0;
   MemorySubClassData.Record.ArrayStartAddress.MemoryArrayEndAddress                 = LShiftU64 (TotalMemorySize, 20) - 1;
-  MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName  = gEfiMemoryProducerGuid;
+  MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName  = gEfiCallerIdGuid;
   MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.Instance      = 1;
   MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance   = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE;
   MemorySubClassData.Record.ArrayStartAddress.MemoryArrayPartitionWidth             = 0;
@@ -325,7 +325,7 @@ Returns:
   Status = DataHub->LogData (
                       DataHub,
                       &gEfiMemorySubClassGuid,
-                      &gEfiMemoryProducerGuid,
+                      &gEfiCallerIdGuid,
                       EFI_DATA_RECORD_CLASS_DATA,
                       &MemorySubClassData,
                       sizeof (EFI_SUBCLASS_TYPE1_HEADER) + sizeof (EFI_MEMORY_ARRAY_START_ADDRESS_DATA)