Revision: 16501
http://sourceforge.net/p/edk2/code/16501
Author: erictian
Date: 2014-12-12 02:01:54 +0000 (Fri, 12 Dec 2014)
Log Message:
-----------
MdeModulePkg/DxeCore: Fixed compiler error 'enumerated type mixed with another
type'
ARM Toolchain raises a warning/error when an integer is used instead
of a enum value.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <[email protected]>
Reviewed-by: Feng Tian <[email protected]>
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Page.c
trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Pool.c
Modified: trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Page.c
===================================================================
--- trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Page.c 2014-12-12 00:45:05 UTC (rev
16500)
+++ trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Page.c 2014-12-12 02:01:54 UTC (rev
16501)
@@ -1402,14 +1402,14 @@
)
{
EFI_STATUS Status;
+
+ Status = CoreInternalFreePages (Memory, NumberOfPages);
+ if (!EFI_ERROR (Status)) {
+ CoreUpdateProfile ((EFI_PHYSICAL_ADDRESS) (UINTN) RETURN_ADDRESS (0),
MemoryProfileActionFreePages, (EFI_MEMORY_TYPE) 0, EFI_PAGES_TO_SIZE
(NumberOfPages), (VOID *) (UINTN) Memory);
+ }
+ return Status;
+}
- Status = CoreInternalFreePages (Memory, NumberOfPages);
- if (!EFI_ERROR (Status)) {
- CoreUpdateProfile ((EFI_PHYSICAL_ADDRESS) (UINTN) RETURN_ADDRESS (0),
MemoryProfileActionFreePages, 0, EFI_PAGES_TO_SIZE (NumberOfPages), (VOID *)
(UINTN) Memory);
- }
- return Status;
-}
-
/**
This function checks to see if the last memory map descriptor in a memory map
can be merged with any of the other memory map descriptors in a memorymap.
Modified: trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Pool.c
===================================================================
--- trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Pool.c 2014-12-12 00:45:05 UTC (rev
16500)
+++ trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Pool.c 2014-12-12 02:01:54 UTC (rev
16501)
@@ -433,14 +433,14 @@
)
{
EFI_STATUS Status;
+
+ Status = CoreInternalFreePool (Buffer);
+ if (!EFI_ERROR (Status)) {
+ CoreUpdateProfile ((EFI_PHYSICAL_ADDRESS) (UINTN) RETURN_ADDRESS (0),
MemoryProfileActionFreePool, (EFI_MEMORY_TYPE) 0, 0, Buffer);
+ }
+ return Status;
+}
- Status = CoreInternalFreePool (Buffer);
- if (!EFI_ERROR (Status)) {
- CoreUpdateProfile ((EFI_PHYSICAL_ADDRESS) (UINTN) RETURN_ADDRESS (0),
MemoryProfileActionFreePool, 0, 0, Buffer);
- }
- return Status;
-}
-
/**
Internal function to free a pool entry.
Caller must have the memory lock held
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
