aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/time.c
diff options
context:
space:
mode:
authorVojtech Pavlik <vojtech@suse.cz>2006-06-26 07:58:23 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 13:48:19 -0400
commitf8bf3c65a962530821fa9a9b4bad43d8c7e13574 (patch)
treeb52d7fa60f52e877abced7470e705a6a544701b9 /arch/x86_64/kernel/time.c
parent05ebb76109f302b949e745724bbf0f0634dba43f (diff)
[PATCH] x86_64: Rename oem_force_hpet_timer to apic_is_clustered_box
Rename oem_force_hpet_timer to apic_is_clustered_box, to give the function a better fitting name - it really isn't at all about HPET. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/kernel/time.c')
-rw-r--r--arch/x86_64/kernel/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c
index 7392570f975d..54b14e3ef66f 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -956,10 +956,10 @@ void __init time_init(void)
956__cpuinit int unsynchronized_tsc(void) 956__cpuinit int unsynchronized_tsc(void)
957{ 957{
958#ifdef CONFIG_SMP 958#ifdef CONFIG_SMP
959 if (oem_force_hpet_timer()) 959 if (apic_is_clustered_box())
960 return 1; 960 return 1;
961 /* Intel systems are normally all synchronized. Exceptions 961 /* Intel systems are normally all synchronized. Exceptions
962 are handled in the OEM check above. */ 962 are handled in the check above. */
963 if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) 963 if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)
964 return 0; 964 return 0;
965#endif 965#endif