aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/common.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
-rw-r--r--arch/x86/kernel/cpu/common.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index c66991a04a8a..dfc9563fc4f0 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -446,10 +446,6 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
446 * we do "generic changes." 446 * we do "generic changes."
447 */ 447 */
448 448
449 /* TSC disabled? */
450 if ( tsc_disable )
451 clear_bit(X86_FEATURE_TSC, c->x86_capability);
452
453 /* If the model name is still unset, do table lookup. */ 449 /* If the model name is still unset, do table lookup. */
454 if ( !c->x86_model_id[0] ) { 450 if ( !c->x86_model_id[0] ) {
455 char *p; 451 char *p;
@@ -650,11 +646,6 @@ void __cpuinit cpu_init(void)
650 646
651 if (cpu_has_vme || cpu_has_tsc || cpu_has_de) 647 if (cpu_has_vme || cpu_has_tsc || cpu_has_de)
652 clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE); 648 clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE);
653 if (tsc_disable && cpu_has_tsc) {
654 printk(KERN_NOTICE "Disabling TSC...\n");
655 /**** FIX-HPA: DOES THIS REALLY BELONG HERE? ****/
656 clear_bit(X86_FEATURE_TSC, boot_cpu_data.x86_capability);
657 }
658 649
659 load_idt(&idt_descr); 650 load_idt(&idt_descr);
660 switch_to_new_gdt(); 651 switch_to_new_gdt();