Index: UncachedMemoryAllocationLib.c
===================================================================
--- UncachedMemoryAllocationLib.c	(revision 14467)
+++ UncachedMemoryAllocationLib.c	(working copy)
@@ -42,8 +42,6 @@
   
   
 
-EFI_CPU_ARCH_PROTOCOL           *gDebugUncachedCpu;
-
 //
 // Assume all of memory has the same cache attributes, unless we do our magic
 //
@@ -265,7 +263,7 @@
   ASSERT (Pages != 0);
   
   Memory = (EFI_PHYSICAL_ADDRESS) (UINTN) Buffer;
-  Status = gDebugUncachedCpu->SetMemoryAttributes (gDebugUncachedCpu, Memory, EFI_PAGES_TO_SIZE (Pages), gAttributes);
+  Status = gDS->SetMemorySpaceAttributes (Memory, EFI_PAGES_TO_SIZE (Pages), gAttributes);
   
   Status = gBS->FreePages (Memory, Pages);
   ASSERT_EFI_ERROR (Status);
@@ -591,36 +589,3 @@
     Buffer = NULL;
   }
 }
-
-/**
-  The constructor function caches the pointer of DXE Services Table.
-
-  The constructor function caches the pointer of DXE Services Table.
-  It will ASSERT() if that operation fails.
-  It will ASSERT() if the pointer of DXE Services Table is NULL.
-  It will always return EFI_SUCCESS.
-
-  @param  ImageHandle   The firmware allocated handle for the EFI image.
-  @param  SystemTable   A pointer to the EFI System Table.
-
-  @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.
-
-**/
-EFI_STATUS
-EFIAPI
-UncachedMemoryAllocationLibConstructor (
-  IN EFI_HANDLE        ImageHandle,
-  IN EFI_SYSTEM_TABLE  *SystemTable
-  )
-{
-  EFI_STATUS    Status;
-  
-  Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **)&gDebugUncachedCpu);
-  ASSERT_EFI_ERROR(Status);
-
-
-  return Status;
-}
-
-
-
Index: UncachedMemoryAllocationLib.inf
===================================================================
--- UncachedMemoryAllocationLib.inf	(revision 14467)
+++ UncachedMemoryAllocationLib.inf	(working copy)
@@ -20,7 +20,6 @@
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = UncachedMemoryAllocationLib
-  CONSTRUCTOR                    = UncachedMemoryAllocationLibConstructor
 
 [Sources.common]
   UncachedMemoryAllocationLib.c
@@ -39,4 +38,4 @@
   DxeServicesTableLib
 
 [Depex]
-  gEfiCpuArchProtocolGuid    
+  gEfiCpuArchProtocolGuid