Andrew, all,
This patch fixes a bad declaration of jiffies in timer_tsc.c and
timer_cyclone.c, replacing it with the proper usage of jiffies.h.
Caught by gregkh.
thanks
-john
diff -Nru a/arch/i386/kernel/timers/timer_cyclone.c b/arch/i386/kernel/timers/timer_cyclone.c
--- a/arch/i386/kernel/timers/timer_cyclone.c Wed Jul 2 16:51:41 2003
+++ b/arch/i386/kernel/timers/timer_cyclone.c Wed Jul 2 16:51:41 2003
@@ -11,6 +11,7 @@
#include <linux/timex.h>
#include <linux/errno.h>
#include <linux/string.h>
+#include <linux/jiffies.h>
#include <asm/timer.h>
#include <asm/io.h>
@@ -18,7 +19,6 @@
#include <asm/fixmap.h>
extern spinlock_t i8253_lock;
-extern unsigned long jiffies;
extern unsigned long calibrate_tsc(void);
/* Number of usecs that the last interrupt was delayed */
diff -Nru a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c
--- a/arch/i386/kernel/timers/timer_tsc.c Wed Jul 2 16:51:41 2003
+++ b/arch/i386/kernel/timers/timer_tsc.c Wed Jul 2 16:51:41 2003
@@ -9,6 +9,7 @@
#include <linux/errno.h>
#include <linux/cpufreq.h>
#include <linux/string.h>
+#include <linux/jiffies.h>
#include <asm/timer.h>
#include <asm/io.h>
@@ -21,7 +22,6 @@
int tsc_disable __initdata = 0;
extern spinlock_t i8253_lock;
-extern unsigned long jiffies;
static int use_tsc;
/* Number of usecs that the last interrupt was delayed */
-
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/
This archive was generated by hypermail 2b29 : Mon Jul 07 2003 - 22:00:18 EST