diff options
author | Olivier Martin <Olivier.Martin@arm.com> | 2014-12-12 02:01:54 +0000 |
---|---|---|
committer | erictian <erictian@Edk2> | 2014-12-12 02:01:54 +0000 |
commit | 99730361ec4724c07f6898a59615a8d33166e62f (patch) | |
tree | 2cce86d8e75724b708ba986e876fbd8cb5edf1e2 /MdeModulePkg | |
parent | 41089802d5046d5d4790bb64ae35f87db3115cb2 (diff) | |
download | edk2-platforms-99730361ec4724c07f6898a59615a8d33166e62f.tar.xz |
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 <Olivier.Martin@arm.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16501 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg')
-rw-r--r-- | MdeModulePkg/Core/Dxe/Mem/Page.c | 14 | ||||
-rw-r--r-- | MdeModulePkg/Core/Dxe/Mem/Pool.c | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/MdeModulePkg/Core/Dxe/Mem/Page.c b/MdeModulePkg/Core/Dxe/Mem/Page.c index 64967259a2..f4ec48ff67 100644 --- a/MdeModulePkg/Core/Dxe/Mem/Page.c +++ b/MdeModulePkg/Core/Dxe/Mem/Page.c @@ -1402,13 +1402,13 @@ CoreFreePages ( )
{
EFI_STATUS 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;
-}
+ + 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; +} /**
This function checks to see if the last memory map descriptor in a memory map
diff --git a/MdeModulePkg/Core/Dxe/Mem/Pool.c b/MdeModulePkg/Core/Dxe/Mem/Pool.c index 1891bb7387..6bf289b38f 100644 --- a/MdeModulePkg/Core/Dxe/Mem/Pool.c +++ b/MdeModulePkg/Core/Dxe/Mem/Pool.c @@ -433,13 +433,13 @@ CoreFreePool ( )
{
EFI_STATUS Status;
-
- Status = CoreInternalFreePool (Buffer);
- if (!EFI_ERROR (Status)) {
- CoreUpdateProfile ((EFI_PHYSICAL_ADDRESS) (UINTN) RETURN_ADDRESS (0), MemoryProfileActionFreePool, 0, 0, Buffer);
- }
- return 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; +} /**
Internal function to free a pool entry.
|