From 278fdbe43a15ab4f772a1666054bc60e8128c57f Mon Sep 17 00:00:00 2001
From: john stultz <johnstul@us.ibm.com>
Date: Tue, 27 Sep 2005 21:45:36 -0700
Subject: [PATCH] --- yaml --- r: 9391 b: refs/heads/master c:
 6c132b5fe6579ed4b4892c02fe6c05f7e3afc579 h: refs/heads/master i:   9389:
 125ba4e5b94c61c16c483d674038cad694842b90   9387:
 c2bee984c94bf1dfc300388bfddd0a8ae348b8fb   9383:
 ebb4344f376d68f687e6664af0e6c6f900a3780f   9375:
 fe6f4a29ba96899ef128a504ea39f444d36a1d3e v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86_64/kernel/time.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c6ce461cb4bd..6a2ce2d0de62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9d014afc3609e3094fd06176380ed057edd4a1b
+refs/heads/master: 6c132b5fe6579ed4b4892c02fe6c05f7e3afc579
diff --git a/trunk/arch/x86_64/kernel/time.c b/trunk/arch/x86_64/kernel/time.c
index 2373cb8b8625..703acde2a1a5 100644
--- a/trunk/arch/x86_64/kernel/time.c
+++ b/trunk/arch/x86_64/kernel/time.c
@@ -959,9 +959,6 @@ static __init int unsynchronized_tsc(void)
  	   are handled in the OEM check above. */
  	if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)
  		return 0;
- 	/* All in a single socket - should be synchronized */
- 	if (cpus_weight(cpu_core_map[0]) == num_online_cpus())
- 		return 0;
 #endif
  	/* Assume multi socket systems are not synchronized */
  	return num_online_cpus() > 1;