diff --git a/[refs] b/[refs] index 47059fc4408a..7fc9cc026cdd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd7d72bb27a8c7502a602bdc299f1bb0a9357975 +refs/heads/master: 519efbc0b3b6004a3b98d66a446bce30852c8171 diff --git a/trunk/arch/x86/kernel/time_64.c b/trunk/arch/x86/kernel/time_64.c index 61b17f5ec867..0380795121a6 100644 --- a/trunk/arch/x86/kernel/time_64.c +++ b/trunk/arch/x86/kernel/time_64.c @@ -120,8 +120,7 @@ void __init time_init(void) cpu_khz = tsc_khz; if (cpu_has(&boot_cpu_data, X86_FEATURE_CONSTANT_TSC) && - boot_cpu_data.x86_vendor == X86_VENDOR_AMD && - boot_cpu_data.x86 == 16) + (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)) cpu_khz = calculate_cpu_khz(); if (unsynchronized_tsc())