UefiCpuPkg/PiSmmCpuDxeSmm: Make code consistent with comments

[mirror_edk2.git] / UefiCpuPkg / PiSmmCpuDxeSmm / SmmProfileInternal.h

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h
index 5aaf945cfd5c644ad282c672bd511cc210f2275d..43f6935cf9dc448588f5a6e39a604969e9facec5 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h
@@ -1,22 +1,14 @@
 /** @file\r
 SMM profile internal header file.\r
 \r
-Copyright (c) 2012 - 2016, 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
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
 #ifndef _SMM_PROFILE_INTERNAL_H_\r
 #define _SMM_PROFILE_INTERNAL_H_\r
 \r
-#include <Guid/GlobalVariable.h>\r
-#include <Guid/Acpi.h>\r
 #include <Protocol/SmmReadyToLock.h>\r
 #include <Library/UefiRuntimeServicesTableLib.h>\r
 #include <Library/DxeServicesTableLib.h>\r
@@ -41,10 +33,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // Please disable it.\r
 //\r
 \r
-#define IA32_PF_EC_P                (1u << 0)\r
-#define IA32_PF_EC_WR               (1u << 1)\r
-#define IA32_PF_EC_US               (1u << 2)\r
-#define IA32_PF_EC_RSVD             (1u << 3)\r
 #define IA32_PF_EC_ID               (1u << 4)\r
 \r
 #define SMM_PROFILE_NAME            L"SmmProfileData"\r
@@ -68,6 +56,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define   MSR_DEBUG_CTL_BTINT        0x100\r
 #define MSR_DS_AREA                  0x600\r
 \r
+#define HEAP_GUARD_NONSTOP_MODE      \\r
+        ((PcdGet8 (PcdHeapGuardPropertyMask) & (BIT6|BIT3|BIT2)) > BIT6)\r
+\r
+#define NULL_DETECTION_NONSTOP_MODE  \\r
+        ((PcdGet8 (PcdNullPointerDetectionPropertyMask) & (BIT6|BIT1)) > BIT6)\r
+\r
 typedef struct {\r
   EFI_PHYSICAL_ADDRESS   Base;\r
   EFI_PHYSICAL_ADDRESS   Top;\r
@@ -104,6 +98,7 @@ typedef struct {
 extern SMM_S3_RESUME_STATE       *mSmmS3ResumeState;\r
 extern UINTN                     gSmiExceptionHandlers[];\r
 extern BOOLEAN                   mXdSupported;\r
+X86_ASSEMBLY_PATCH_LABEL         gPatchXdSupported;\r
 extern UINTN                     *mPFEntryCount;\r
 extern UINT64                    (*mLastPFEntryValue)[MAX_PF_ENTRY_COUNT];\r
 extern UINT64                    *(*mLastPFEntryPointer)[MAX_PF_ENTRY_COUNT];\r