aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86_64/kernel/setup.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index a570c81c8316..05eaca41802b 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -732,11 +732,8 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
732 /* Fix cpuid4 emulation for more */ 732 /* Fix cpuid4 emulation for more */
733 num_cache_leaves = 3; 733 num_cache_leaves = 3;
734 734
735 /* When there is only one core no need to synchronize RDTSC */ 735 /* RDTSC can be speculated around */
736 if (num_possible_cpus() == 1) 736 clear_bit(X86_FEATURE_SYNC_RDTSC, &c->x86_capability);
737 set_bit(X86_FEATURE_SYNC_RDTSC, &c->x86_capability);
738 else
739 clear_bit(X86_FEATURE_SYNC_RDTSC, &c->x86_capability);
740} 737}
741 738
742static void __cpuinit detect_ht(struct cpuinfo_x86 *c) 739static void __cpuinit detect_ht(struct cpuinfo_x86 *c)