aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/vmi.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/i386/kernel/vmi.c')
-rw-r--r--arch/i386/kernel/vmi.c8
1 files changed, 1 insertions, 7 deletions
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);
48 48
49static struct vrom_header *vmi_rom; 49static struct vrom_header *vmi_rom;
50static int license_gplok; 50static int license_gplok;
51static int disable_nodelay;
52static int disable_pge; 51static int disable_pge;
53static int disable_pse; 52static int disable_pse;
54static int disable_sep; 53static int disable_sep;
@@ -801,9 +800,6 @@ static inline int __init activate_vmi(void)
801 800
802 para_fill(set_iopl_mask, SetIOPLMask); 801 para_fill(set_iopl_mask, SetIOPLMask);
803 paravirt_ops.io_delay = (void *)vmi_nop; 802 paravirt_ops.io_delay = (void *)vmi_nop;
804 if (!disable_nodelay) {
805 paravirt_ops.const_udelay = (void *)vmi_nop;
806 }
807 803
808 para_fill(set_lazy_mode, SetLazyMode); 804 para_fill(set_lazy_mode, SetLazyMode);
809 805
@@ -947,9 +943,7 @@ static int __init parse_vmi(char *arg)
947 if (!arg) 943 if (!arg)
948 return -EINVAL; 944 return -EINVAL;
949 945
950 if (!strcmp(arg, "disable_nodelay")) 946 if (!strcmp(arg, "disable_pge")) {
951 disable_nodelay = 1;
952 else if (!strcmp(arg, "disable_pge")) {
953 clear_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability); 947 clear_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability);
954 disable_pge = 1; 948 disable_pge = 1;
955 } else if (!strcmp(arg, "disable_pse")) { 949 } else if (!strcmp(arg, "disable_pse")) {