1 files changed, 10 insertions, 9 deletions
diff --git a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
index f42f51872..1e1b1ea64 100755
--- a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
+++ b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
@@ -1,6 +1,6 @@
 /** @file
 *
-*  Copyright (c) 2011-2012, ARM Limited. All rights reserved.
+*  Copyright (c) 2011-2014, ARM Limited. All rights reserved.
 *
 *  This program and the accompanying materials
 *  are licensed and made available under the terms and conditions of the BSD License
@@ -30,24 +30,25 @@ NonSecureWaitForFirmware (
   VOID
   )
 {
-  VOID (*secondary_start)(VOID);
-  UINTN Interrupt;
+  VOID (*SecondaryStart)(VOID);
+  UINTN AcknowledgeInterrupt;
+  UINTN InterruptId;
 
   // The secondary cores will execute the firmware once wake from WFI.
-  secondary_start = (VOID (*)())PcdGet32(PcdFvBaseAddress);
+  SecondaryStart = (VOID (*)())PcdGet32 (PcdFvBaseAddress);
 
-  ArmCallWFI();
+  ArmCallWFI ();
 
   // Acknowledge the interrupt and send End of Interrupt signal.
-  Interrupt = ArmGicAcknowledgeInterrupt (PcdGet32 (PcdGicInterruptInterfaceBase));
+  AcknowledgeInterrupt = ArmGicAcknowledgeInterrupt (PcdGet32 (PcdGicInterruptInterfaceBase), &InterruptId);
   // Check if it is a valid interrupt ID
-  if ((Interrupt & ARM_GIC_ICCIAR_ACKINTID) < ArmGicGetMaxNumInterrupts (PcdGet32 (PcdGicDistributorBase))) {
+  if (InterruptId < ArmGicGetMaxNumInterrupts (PcdGet32 (PcdGicDistributorBase))) {
     // Got a valid SGI number hence signal End of Interrupt
-    ArmGicEndOfInterrupt (PcdGet32 (PcdGicInterruptInterfaceBase), Interrupt);
+    ArmGicEndOfInterrupt (PcdGet32 (PcdGicInterruptInterfaceBase), AcknowledgeInterrupt);
   }
 
   // Jump to secondary core entry point.
-  secondary_start ();
+  SecondaryStart ();
 
   // PEI Core should always load and never return
   ASSERT (FALSE);