Revert "[PATCH] x86_64: Only do the clustered systems have unsynchronized TSC assumpt...

This reverts commit 13a229abc25640813f1480c0478dfc6bdbc1c19e.

Quoth Andi:
  "After some consideration and feedback from various people it turns
   out this wasn't that good an idea.  It has some problems and needs
   more work.  Since it was only an optimization anyways it's best to
   just back it out again for now."

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 8309a7b2cd63fc7640200e2f156ff119baabfc70..79577f0ace98847ee39a4f7ad4c9842f3ea88ec6 100644 (file)
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -44,6 +44,9 @@ extern void __init clustered_apic_check(void);
 extern int gsi_irq_sharing(int gsi);
 #include <asm/proto.h>
 
 extern int gsi_irq_sharing(int gsi);
 #include <asm/proto.h>
 

+static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 0; }
+
+

 #else                          /* X86 */
 
 #ifdef CONFIG_X86_LOCAL_APIC
 #else                          /* X86 */
 
 #ifdef CONFIG_X86_LOCAL_APIC

diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
index d70605eda3339904b2349edb57e61cab4ce6228c..e5b14c57eaa0644fa8e4106a445b58e3d1f51e1d 100644 (file)
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
@@ -962,14 +962,12 @@ void smp_apic_timer_interrupt(struct pt_regs *regs)
        irq_exit();
 }
 
        irq_exit();
 }
 

-int __initdata unsync_tsc_on_multicluster;
-

 /*
  * oem_force_hpet_timer -- force HPET mode for some boxes.
  *
  * Thus far, the major user of this is IBM's Summit2 series:
  *
 /*
  * oem_force_hpet_timer -- force HPET mode for some boxes.
  *
  * Thus far, the major user of this is IBM's Summit2 series:
  *

- * Some clustered boxes may have unsynced TSC problems if they are
+ * Clustered boxes may have unsynced TSC problems if they are

  * multi-chassis. Use available data to take a good guess.
  * If in doubt, go HPET.
  */
  * multi-chassis. Use available data to take a good guess.
  * If in doubt, go HPET.
  */


@@ -979,11 +977,6 @@ __cpuinit int oem_force_hpet_timer(void)
        unsigned id;
        DECLARE_BITMAP(clustermap, NUM_APIC_CLUSTERS);
 
        unsigned id;
        DECLARE_BITMAP(clustermap, NUM_APIC_CLUSTERS);
 

-       /* Only do this check on IBM machines - big Unisys systems
-          use multiple clusters too, but have synchronized TSC */
-       if (!unsync_tsc_on_multicluster)
-               return 0;
-

        bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
 
        for (i = 0; i < NR_CPUS; i++) {
        bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
 
        for (i = 0; i < NR_CPUS; i++) {

diff --git a/include/asm-x86_64/acpi.h b/include/asm-x86_64/acpi.h
index e2b9923189a0fc578a202f6d7b45ad10161ca80d..aa1c7b2e438cb36d3c9756b153d37a04c2570e9a 100644 (file)
--- a/include/asm-x86_64/acpi.h
+++ b/include/asm-x86_64/acpi.h
@@ -164,20 +164,6 @@ extern u8 x86_acpiid_to_apicid[];
 
 extern int acpi_skip_timer_override;
 
 
 extern int acpi_skip_timer_override;
 

-extern int unsync_tsc_on_multicluster;
-
-static inline int acpi_madt_oem_check(char *oem, char *productid) 
-{ 
-       /* Copied from i386. Probably has too many entries. */
-       if (!strncmp(oem, "IBM ENSW", 8) && 
-               (!strncmp(productid, "VIGIL SMP", 9) 
-                       || !strncmp(productid, "EXA", 3)
-                       || !strncmp(productid, "RUTHLESS SMP", 12))) {
-               unsync_tsc_on_multicluster = 1;
-        }
-        return 0;
-}
-

 #endif /*__KERNEL__*/
 
 #endif /*_ASM_ACPI_H*/
 #endif /*__KERNEL__*/
 
 #endif /*_ASM_ACPI_H*/