MdeModulePkg/Core: fix feature conflict between NX and heap guard

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / Mem / HeapGuard.h

diff --git a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.h b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.h
index bd7abd7c53266703871a32f642391fdfeb5d0629..7208ab143719a2b2923b9db97585d52de000f891 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.h
+++ b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.h
@@ -158,8 +158,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 // Memory type to guard (matching the related PCD definition)\r
 //\r
 //\r
 // Memory type to guard (matching the related PCD definition)\r
 //\r

-#define GUARD_HEAP_TYPE_POOL        BIT0\r
-#define GUARD_HEAP_TYPE_PAGE        BIT1\r
+#define GUARD_HEAP_TYPE_PAGE        BIT0\r
+#define GUARD_HEAP_TYPE_POOL        BIT1\r

 \r
 //\r
 // Debug message level\r
 \r
 //\r
 // Debug message level\r


@@ -389,6 +389,16 @@ AdjustPoolHeadF (
   IN EFI_PHYSICAL_ADDRESS    Memory\r
   );\r
 \r
   IN EFI_PHYSICAL_ADDRESS    Memory\r
   );\r
 \r

+/**\r
+  Check to see if the heap guard is enabled for page and/or pool allocation.\r
+\r
+  @return TRUE/FALSE.\r
+**/\r
+BOOLEAN\r
+IsHeapGuardEnabled (\r
+  VOID\r
+  );\r
+\r

 extern BOOLEAN mOnGuarding;\r
 \r
 #endif\r
 extern BOOLEAN mOnGuarding;\r
 \r
 #endif\r