UefiCpuPkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / UefiCpuPkg / Library / SmmCpuFeaturesLib / Ia32 / SmiException.nasm

diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm b/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm
index 93dc3005b7b2fdaa1d5f9a228918d5ae47097bbb..b9c7e0bb20b699997b223336f26c15e14dbeafe8 100644 (file)
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm
+++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm
@@ -1,12 +1,6 @@
 ;------------------------------------------------------------------------------ ;\r
-; Copyright (c) 2009 - 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
-; 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) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
 ;\r
@@ -18,6 +12,8 @@
 ;\r
 ;-------------------------------------------------------------------------------\r
 \r
+%include "StuffRsbNasm.inc"\r
+\r
 global  ASM_PFX(gcStmPsd)\r
 \r
 extern  ASM_PFX(SmmStmExceptionHandler)\r
@@ -130,7 +126,8 @@ ASM_PFX(OnStmSetup):
     wrmsr\r
 \r
 .71:\r
-  rsm\r
+    StuffRsb32\r
+    rsm\r
 \r
 global  ASM_PFX(OnStmTeardown)\r
 ASM_PFX(OnStmTeardown):\r
@@ -172,4 +169,5 @@ ASM_PFX(OnStmTeardown):
     wrmsr\r
 \r
 .72:\r
-  rsm\r
+    StuffRsb32\r
+    rsm\r