Integrate patch from Andrew Fish to make it run on OS X.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9194 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 10 insertions, 7 deletions

diff --git a/UnixPkg/CpuRuntimeDxe/Cpu.c b/UnixPkg/CpuRuntimeDxe/Cpu.c
index dc25d4d81..a151aafc0 100644
--- a/UnixPkg/CpuRuntimeDxe/Cpu.c
+++ b/UnixPkg/CpuRuntimeDxe/Cpu.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation

+Copyright (c) 2006 - 2009, Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -58,12 +58,15 @@ CPU_ARCH_PROTOCOL_PRIVATE mCpuTemplate = {
     4

   },

   {

-    CpuMemoryServiceRead,

-    CpuMemoryServiceWrite,

-    CpuIoServiceRead,

-    CpuIoServiceWrite

+    {

+      CpuMemoryServiceRead,

+      CpuMemoryServiceWrite

+    },

+    {

+      CpuIoServiceRead,

+      CpuIoServiceWrite

+    }

   },

-  0,

   TRUE

 };

 

@@ -430,7 +433,7 @@ Returns:
   //

   // Locate DataHub protocol.

   //

-  Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, &DataHub);

+  Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, (VOID **)&DataHub);

   if (EFI_ERROR (Status)) {

     return;

   }