MdeModulePkg/Core: Fix feature conflict between NX and Stack guard

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / DxeMain.inf

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index 73347803261db09e6d17c3f68130277ffd36bdac..d2e7360ed441378e3bae86b069350d934e618722 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -3,7 +3,7 @@
 #\r
 #  It provides an implementation of DXE Core that is compliant with DXE CIS.\r
 #  \r
-#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
@@ -130,6 +130,7 @@
   gEfiPropertiesTableGuid                       ## SOMETIMES_PRODUCES   ## SystemTable\r
   gEfiMemoryAttributesTableGuid                 ## SOMETIMES_PRODUCES   ## SystemTable\r
   gEfiEndOfDxeEventGroupGuid                    ## SOMETIMES_CONSUMES   ## Event\r
+  gEfiHobMemoryAllocStackGuid                   ## SOMETIMES_CONSUMES   ## SystemTable\r
 \r
 [Ppis]\r
   gEfiVectorHandoffInfoPpiGuid                  ## UNDEFINED # HOB\r
@@ -198,6 +199,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPageType                       ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPoolType                       ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPropertyMask                   ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard                           ## CONSUMES\r
 \r
 # [Hob]\r
 # RESOURCE_DESCRIPTOR   ## CONSUMES\r