Merging uefi-next/linaro-release into masterlinaro-uefi-2013.12

Signed-off-by: Steven Kinney <steven.kinney@linaro.org>

1 files changed, 6 insertions, 1 deletions

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
index 96ddaafd4..159d3c61f 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
@@ -3,7 +3,7 @@
 #

 #  This library instance supports SEC/PEI module only.

 #

-#  Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2012 - 2013, Intel Corporation. All rights reserved.<BR>

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

 #  which accompanies this distribution.  The full text of the license may be found at

@@ -32,11 +32,13 @@
   Ia32/ExceptionHandlerAsm.asm |MSFT

   Ia32/ExceptionHandlerAsm.S   |GCC

   Ia32/ArchExceptionHandler.c

+  Ia32/ArchInterruptDefs.h

 

 [Sources.X64]

   X64/ExceptionHandlerAsm.asm |MSFT

   X64/ExceptionHandlerAsm.S   |GCC

   X64/ArchExceptionHandler.c

+  X64/ArchInterruptDefs.h

 

 [Sources.common]

   CpuExceptionCommon.h

@@ -54,3 +56,6 @@
   PrintLib

   LocalApicLib

   PeCoffGetEntryPointLib

+

+[Ppis]

+  gEfiVectorHandoffInfoPpiGuid