Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 80395
b: refs/heads/master
c: 519efbc
h: refs/heads/master
i:
  80393: 4e023eb
  80391: c5e2534
v: v3
  • Loading branch information
Andreas Herrmann3 authored and Ingo Molnar committed Jan 30, 2008
1 parent 3f4b368 commit e73d64c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cd7d72bb27a8c7502a602bdc299f1bb0a9357975
refs/heads/master: 519efbc0b3b6004a3b98d66a446bce30852c8171
3 changes: 1 addition & 2 deletions trunk/arch/x86/kernel/time_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down

0 comments on commit e73d64c

Please sign in to comment.