BaseTools/Capsule: Do not support -o with --dump-info

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

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h
index de6eb0aceb9c174c6bdf43f7f8986d4f3f034f6b..1613e9cd5cb97f59668d4fdccae29f3a70e98891 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h
@@ -1,7 +1,7 @@
 /** @file\r
 SMM profile internal header file.\r
 \r
-Copyright (c) 2012 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2012 - 2017, 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
@@ -41,10 +41,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
@@ -66,9 +62,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define   MSR_DEBUG_CTL_TR           0x40\r
 #define   MSR_DEBUG_CTL_BTS          0x80\r
 #define   MSR_DEBUG_CTL_BTINT        0x100\r
-#define MSR_LASTBRANCH_TOS           0x1C9\r
-#define MSR_LER_FROM_LIP             0x1DD\r
-#define MSR_LER_TO_LIP               0x1DE\r
 #define MSR_DS_AREA                  0x600\r
 \r
 typedef struct {\r
@@ -107,6 +100,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