Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/SmmMemoryAllocationLib

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c (modified) (5 diffs)
• MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c

@@ -12 +12 @@
   will always return NULL.
 
-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials                          
   are licensed and made available under the terms and conditions of the BSD License         
@@ -286 +286 @@
   specified alignment remaining to satisfy the request, then NULL is returned.
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().
+  If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().
 
   @param  MemoryType            The type of memory to allocate.
@@ -373 +374 @@
   
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().
+  If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().
 
   @param  Pages                 The number of 4 KB pages to allocate.
@@ -401 +403 @@
   
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().
+  If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().
 
   @param  Pages                 The number of 4 KB pages to allocate.
@@ -429 +432 @@
   
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().
+  If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().
 
   @param  Pages                 The number of 4 KB pages to allocate.

trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf

@@ -5 +5 @@
 # allocate and free memory.
 #
-# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
@@ -18 +18 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = SmmMemoryAllocationLib
+  MODULE_UNI_FILE                = SmmMemoryAllocationLib.uni
   FILE_GUID                      = 4DF30A5D-D5B0-4f85-80ED-6B16CD343C8E
   MODULE_TYPE                    = DXE_SMM_DRIVER
@@ -47 +48 @@
 [Depex]
   gEfiSmmAccess2ProtocolGuid
+