3 files changed, 1 insertions, 13 deletions

diff --git a/arch/i386/kernel/paravirt.c b/arch/i386/kernel/paravirt.c
index 12e3bc49b83b..871448db1425 100644
--- a/arch/i386/kernel/paravirt.c
+++ b/arch/i386/kernel/paravirt.c
@@ -538,7 +538,6 @@ struct paravirt_ops paravirt_ops = {
 
         .set_iopl_mask = native_set_iopl_mask,
         .io_delay = native_io_delay,
-        .const_udelay = __const_udelay,
 
 #ifdef CONFIG_X86_LOCAL_APIC
         .apic_write = native_apic_write,
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index 48bfcaa13ecc..9b0dd2744c82 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -33,11 +33,6 @@
  *              Dave Jones      :       Report invalid combinations of Athlon CPUs.
 *               Rusty Russell   :       Hacked into shape for new "hotplug" boot process. */
 
-
-/* SMP boot always wants to use real time delay to allow sufficient time for
- * the APs to come online */
-#define USE_REAL_TIME_DELAY
-
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/arch/i386/kernel/vmi.c b/arch/i386/kernel/vmi.c
index bd1037bd124b..a8aa57e77029 100644
--- a/arch/i386/kernel/vmi.c
+++ b/arch/i386/kernel/vmi.c
@@ -48,7 +48,6 @@ typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
 
 static struct vrom_header *vmi_rom;
 static int license_gplok;
-static int disable_nodelay;
 static int disable_pge;
 static int disable_pse;
 static int disable_sep;
@@ -801,9 +800,6 @@ static inline int __init activate_vmi(void)
 
         para_fill(set_iopl_mask, SetIOPLMask);
         paravirt_ops.io_delay = (void *)vmi_nop;
-        if (!disable_nodelay) {
-                paravirt_ops.const_udelay = (void *)vmi_nop;
-        }
 
         para_fill(set_lazy_mode, SetLazyMode);
 
@@ -947,9 +943,7 @@ static int __init parse_vmi(char *arg)
         if (!arg)
                 return -EINVAL;
 
-        if (!strcmp(arg, "disable_nodelay"))
-                disable_nodelay = 1;
-        else if (!strcmp(arg, "disable_pge")) {
+        if (!strcmp(arg, "disable_pge")) {
                 clear_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability);
                 disable_pge = 1;
         } else if (!strcmp(arg, "disable_pse")) {