diff options
Diffstat (limited to 'arch/x86_64/kernel/apic.c')
-rw-r--r-- | arch/x86_64/kernel/apic.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c index 29ef99001e05..53fc17d894e8 100644 --- a/arch/x86_64/kernel/apic.c +++ b/arch/x86_64/kernel/apic.c | |||
@@ -983,7 +983,7 @@ void smp_apic_timer_interrupt(struct pt_regs *regs) | |||
983 | } | 983 | } |
984 | 984 | ||
985 | /* | 985 | /* |
986 | * oem_force_hpet_timer -- force HPET mode for some boxes. | 986 | * apic_is_clustered_box() -- Check if we can expect good TSC |
987 | * | 987 | * |
988 | * Thus far, the major user of this is IBM's Summit2 series: | 988 | * Thus far, the major user of this is IBM's Summit2 series: |
989 | * | 989 | * |
@@ -991,7 +991,7 @@ void smp_apic_timer_interrupt(struct pt_regs *regs) | |||
991 | * multi-chassis. Use available data to take a good guess. | 991 | * multi-chassis. Use available data to take a good guess. |
992 | * If in doubt, go HPET. | 992 | * If in doubt, go HPET. |
993 | */ | 993 | */ |
994 | __cpuinit int oem_force_hpet_timer(void) | 994 | __cpuinit int apic_is_clustered_box(void) |
995 | { | 995 | { |
996 | int i, clusters, zeros; | 996 | int i, clusters, zeros; |
997 | unsigned id; | 997 | unsigned id; |
@@ -1022,8 +1022,7 @@ __cpuinit int oem_force_hpet_timer(void) | |||
1022 | } | 1022 | } |
1023 | 1023 | ||
1024 | /* | 1024 | /* |
1025 | * If clusters > 2, then should be multi-chassis. Return 1 for HPET. | 1025 | * If clusters > 2, then should be multi-chassis. |
1026 | * Else return 0 to use TSC. | ||
1027 | * May have to revisit this when multi-core + hyperthreaded CPUs come | 1026 | * May have to revisit this when multi-core + hyperthreaded CPUs come |
1028 | * out, but AFAIK this will work even for them. | 1027 | * out, but AFAIK this will work even for them. |
1029 | */ | 1028 | */ |