lkml.org 
[lkml]   [2003]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] linux-2.5.59_enable-cyclone_A0
From
Date
Linus, All, 
This patch simply enables the existing timer_cyclone code for
Summit/x440 systems. It depends on the previously posted
cyclone-fixes_A1.

Please apply.

thanks
-john


diff -Nru a/arch/i386/kernel/timers/Makefile b/arch/i386/kernel/timers/Makefile
--- a/arch/i386/kernel/timers/Makefile Wed Feb 5 17:53:19 2003
+++ b/arch/i386/kernel/timers/Makefile Wed Feb 5 17:53:19 2003
@@ -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 -Nru a/arch/i386/kernel/timers/timer.c b/arch/i386/kernel/timers/timer.c
--- a/arch/i386/kernel/timers/timer.c Wed Feb 5 17:53:19 2003
+++ b/arch/i386/kernel/timers/timer.c Wed Feb 5 17:53:19 2003
@@ -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 -Nru a/include/asm-i386/fixmap.h b/include/asm-i386/fixmap.h
--- a/include/asm-i386/fixmap.h Wed Feb 5 17:53:19 2003
+++ b/include/asm-i386/fixmap.h Wed Feb 5 17:53:19 2003
@@ -60,7 +60,7 @@
#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 -Nru a/include/asm-i386/mach-summit/mach_mpparse.h b/include/asm-i386/mach-summit/mach_mpparse.h
--- a/include/asm-i386/mach-summit/mach_mpparse.h Wed Feb 5 17:53:19 2003
+++ b/include/asm-i386/mach-summit/mach_mpparse.h Wed Feb 5 17:53:19 2003
@@ -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 @@
{
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 */



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:32    [W:0.063 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site