3 files changed, 13 insertions, 6 deletions
diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.c b/UefiCpuPkg/CpuDxe/CpuDxe.c
index 89dd2df5be..17513e758f 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.c
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.c
@@ -1,7 +1,7 @@
 /** @file
   CPU DXE Module.
 
-  Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2008 - 2012, 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
@@ -969,7 +969,7 @@ RefreshGcdMemoryAttributes (
   // Go for variable MTRRs with the attribute except for WB and UC attributes
   //
   for (Index = 0; Index < FirmwareVariableMtrrCount; Index++) {
-    if (VariableMtrr[Index].Valid &&                          
+    if (VariableMtrr[Index].Valid &&
         VariableMtrr[Index].Type != MTRR_CACHE_WRITE_BACK &&
         VariableMtrr[Index].Type != MTRR_CACHE_UNCACHEABLE) {
       Attributes = GetMemorySpaceAttributeFromMtrrType ((UINT8) VariableMtrr[Index].Type);
@@ -1161,7 +1161,7 @@ InitInterruptDescriptorTable (
     // preserve it.
     //
     if (Index < OldIdtSize) {
-      IntHandler = 
+      IntHandler =
         (VOID*) (
           OldIdt[Index].Bits.OffsetLow +
           (OldIdt[Index].Bits.OffsetHigh << 16)
@@ -1209,7 +1209,7 @@ InitInterruptDescriptorTable (
 
 /**
   Callback function for idle events.
- 
+
   @param  Event                 Event whose notification function is being invoked.
   @param  Context               The pointer to the notification function's context,
                                 which is implementation-dependent.
@@ -1263,6 +1263,11 @@ InitializeCpu (
   InitInterruptDescriptorTable ();
 
   //
+  // Enable the local APIC for Virtual Wire Mode.
+  //
+  ProgramVirtualWireMode ();
+
+  //
   // Install CPU Architectural Protocol
   //
   Status = gBS->InstallMultipleProtocolInterfaces (
diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.h b/UefiCpuPkg/CpuDxe/CpuDxe.h
index 6d0d83ba08..9baccb2565 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.h
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.h
@@ -1,7 +1,7 @@
 /** @file
   CPU DXE Module.
 
-  Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2008 - 2012, 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
@@ -28,6 +28,7 @@
 #include <Library/MemoryAllocationLib.h>
 #include <Library/DebugLib.h>
 #include <Library/MtrrLib.h>
+#include <Library/LocalApicLib.h>
 #include <Guid/IdleLoopEvent.h>
 
 //
diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.inf b/UefiCpuPkg/CpuDxe/CpuDxe.inf
index 0c70b3276d..3373efab16 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.inf
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.inf
@@ -2,7 +2,7 @@
 #
 #    Component description file for simple CPU driver
 #
-#  Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2008 - 2012, 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
@@ -37,6 +37,7 @@
   MtrrLib
   UefiBootServicesTableLib
   UefiDriverEntryPoint
+  LocalApicLib
 
 [Sources]
   CpuDxe.c