2 files changed, 19 insertions, 25 deletions
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
index 44a8f0666c..301fcaaf61 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
+++ b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
@@ -6,7 +6,7 @@
 # provides debug-agent to periodically gain control during operation of the machine to
 # check for asynchronous commands form the host.
 #
-# Copyright (c) 2006 - 2008, Intel Corporation
+# Copyright (c) 2006 - 2009, Intel Corporation
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -84,10 +84,6 @@
   gEfiDebugSupportProtocolGuid                  ## PRODUCED
 
 
-[FeaturePcd.IA32]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable
-
-
 [Depex]
   TRUE
 
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c
index 290fea69d5..b7c182f580 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c
@@ -115,31 +115,29 @@ ManageIdtEntryTable (
 
   Status = EFI_SUCCESS;
 
-  if (!FeaturePcdGet (PcdNtEmulatorEnable)) {
-    if (CompareMem (&IdtEntryTable[ExceptionType].NewDesc, &NullDesc, sizeof (IA32_IDT_GATE_DESCRIPTOR)) != 0) {
+  if (CompareMem (&IdtEntryTable[ExceptionType].NewDesc, &NullDesc, sizeof (IA32_IDT_GATE_DESCRIPTOR)) != 0) {
+    //
+    // we've already installed to this vector
+    //
+    if (NewCallback != NULL) {
       //
-      // we've already installed to this vector
+      // if the input handler is non-null, error
       //
-      if (NewCallback != NULL) {
-        //
-        // if the input handler is non-null, error
-        //
-        Status = EFI_ALREADY_STARTED;
-      } else {
-        UnhookEntry (ExceptionType);
-      }
+      Status = EFI_ALREADY_STARTED;
     } else {
+      UnhookEntry (ExceptionType);
+    }
+  } else {
+    //
+    // no user handler installed on this vector
+    //
+    if (NewCallback == NULL) {
       //
-      // no user handler installed on this vector
+      // if the input handler is null, error
       //
-      if (NewCallback == NULL) {
-        //
-        // if the input handler is null, error
-        //
-        Status = EFI_INVALID_PARAMETER;
-      } else {
-        HookEntry (ExceptionType, NewCallback);
-      }
+      Status = EFI_INVALID_PARAMETER;
+    } else {
+      HookEntry (ExceptionType, NewCallback);
     }
   }