[PATCH] Enable timer_cyclone code

Patch from john stultz <johnstul@us.ibm.com>

        This patch simply enables the existing timer_cyclone code for
Summit/x440 systems.

diff --git a/arch/i386/kernel/timers/Makefile b/arch/i386/kernel/timers/Makefile
index f16c0c0b263f1db08f2da29d2f6205d54a78def3..fcffc11ff90a3e9dfed30f5b4517c000041eb276 100644 (file)
--- a/arch/i386/kernel/timers/Makefile
+++ b/arch/i386/kernel/timers/Makefile
@@ -4,4 +4,4 @@
 
 obj-y := timer.o timer_none.o timer_tsc.o timer_pit.o
 
-obj-$(CONFIG_X86_CYCLONE)      += timer_cyclone.o
+obj-$(CONFIG_X86_SUMMIT)       += timer_cyclone.o

diff --git a/arch/i386/kernel/timers/timer.c b/arch/i386/kernel/timers/timer.c
index 1ef706d8f8781bbc8d01ecddefdbee11ba33960a..c8c2c4f72f0c475a142578c7926b26a1316dac6f 100644 (file)
--- a/arch/i386/kernel/timers/timer.c
+++ b/arch/i386/kernel/timers/timer.c
@@ -4,9 +4,14 @@
 /* list of externed timers */
 extern struct timer_opts timer_pit;
 extern struct timer_opts timer_tsc;
-
+#ifdef CONFIG_X86_SUMMIT
+extern struct timer_opts timer_cyclone;
+#endif
 /* list of timers, ordered by preference, NULL terminated */
 static struct timer_opts* timers[] = {
+#ifdef CONFIG_X86_SUMMIT
+       &timer_cyclone,
+#endif
        &timer_tsc,
        &timer_pit,
        NULL,

diff --git a/include/asm-i386/fixmap.h b/include/asm-i386/fixmap.h
index a5ccad80c2627f622063785ed25c9a3182005817..40373cd7a163979d1f8baba0fee09f712b502da7 100644 (file)
--- a/include/asm-i386/fixmap.h
+++ b/include/asm-i386/fixmap.h
@@ -60,7 +60,7 @@ enum fixed_addresses {
 #ifdef CONFIG_X86_F00F_BUG
        FIX_F00F_IDT,   /* Virtual mapping for IDT */
 #endif
-#ifdef CONFIG_X86_CYCLONE
+#ifdef CONFIG_X86_SUMMIT
        FIX_CYCLONE_TIMER, /*cyclone timer register*/
 #endif 
 #ifdef CONFIG_HIGHMEM

diff --git a/include/asm-i386/mach-summit/mach_mpparse.h b/include/asm-i386/mach-summit/mach_mpparse.h
index cb0c875b58ce4668ef78814c74c9d91afc8d40b5..6f43a885ef5949f9aa20e67e872fe8fe8467aa8d 100644 (file)
--- a/include/asm-i386/mach-summit/mach_mpparse.h
+++ b/include/asm-i386/mach-summit/mach_mpparse.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_MACH_MPPARSE_H
 #define __ASM_MACH_MPPARSE_H
 
+extern int use_cyclone;
+
 static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, 
                                struct mpc_config_translation *translation)
 {
@@ -17,14 +19,18 @@ static inline void mps_oem_check(struct mp_config_table *mpc, char *oem,
 {
        if (!strncmp(oem, "IBM ENSW", 8) && 
                        (!strncmp(productid, "VIGIL SMP", 9) 
-                        || !strncmp(productid, "RUTHLESS SMP", 12)))
+                        || !strncmp(productid, "RUTHLESS SMP", 12))){
                x86_summit = 1;
+               use_cyclone = 1; /*enable cyclone-timer*/
+       }
 }
 
 /* Hook from generic ACPI tables.c */
 static inline void acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
-       if (!strncmp(oem_id, "IBM", 3) && !strncmp(oem_table_id, "SERVIGIL", 8))
+       if (!strncmp(oem_id, "IBM", 3) && !strncmp(oem_table_id, "SERVIGIL", 8)){
                x86_summit = 1;
+               use_cyclone = 1; /*enable cyclone-timer*/
+       }
 }
 #endif /* __ASM_MACH_MPPARSE_H */