aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2008-01-30 07:33:20 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:20 -0500
commit8424950b5e85543a494b5d940bb2f5f9f16f56a9 (patch)
tree8dd3c32ef00aa15d2f6bb907ed2aadc2f8417412 /arch/x86
parent135302577bb964ebf23376e2d991405ef4ff0457 (diff)
x86: don't disable RDTSC in userland for 32bit notsc
Modern 32bit userland doesn't even boot when the TSC is disabled because ld.so tends to contain RDTSCs. So make notsc only effective for the kernel, similar to 64bit. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/cpu/common.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 5f9c8e3a3e0f..c66991a04a8a 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -654,7 +654,6 @@ void __cpuinit cpu_init(void)
654 printk(KERN_NOTICE "Disabling TSC...\n"); 654 printk(KERN_NOTICE "Disabling TSC...\n");
655 /**** FIX-HPA: DOES THIS REALLY BELONG HERE? ****/ 655 /**** FIX-HPA: DOES THIS REALLY BELONG HERE? ****/
656 clear_bit(X86_FEATURE_TSC, boot_cpu_data.x86_capability); 656 clear_bit(X86_FEATURE_TSC, boot_cpu_data.x86_capability);
657 set_in_cr4(X86_CR4_TSD);
658 } 657 }
659 658
660 load_idt(&idt_descr); 659 load_idt(&idt_descr);