diff --git a/[refs] b/[refs] index cc1f8223bc39..aa9390988908 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 135302577bb964ebf23376e2d991405ef4ff0457 +refs/heads/master: 8424950b5e85543a494b5d940bb2f5f9f16f56a9 diff --git a/trunk/arch/x86/kernel/cpu/common.c b/trunk/arch/x86/kernel/cpu/common.c index 5f9c8e3a3e0f..c66991a04a8a 100644 --- a/trunk/arch/x86/kernel/cpu/common.c +++ b/trunk/arch/x86/kernel/cpu/common.c @@ -654,7 +654,6 @@ void __cpuinit cpu_init(void) printk(KERN_NOTICE "Disabling TSC...\n"); /**** FIX-HPA: DOES THIS REALLY BELONG HERE? ****/ clear_bit(X86_FEATURE_TSC, boot_cpu_data.x86_capability); - set_in_cr4(X86_CR4_TSD); } load_idt(&idt_descr);