Commit 04798180 authored by John Stultz's avatar John Stultz Committed by Greg Kroah-Hartman

[PATCH] jiffies include fix

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.
parent 1cf6d20f
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/timex.h> #include <linux/timex.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/jiffies.h>
#include <asm/timer.h> #include <asm/timer.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -18,7 +19,6 @@ ...@@ -18,7 +19,6 @@
#include <asm/fixmap.h> #include <asm/fixmap.h>
extern spinlock_t i8253_lock; extern spinlock_t i8253_lock;
extern unsigned long jiffies;
extern unsigned long calibrate_tsc(void); extern unsigned long calibrate_tsc(void);
/* Number of usecs that the last interrupt was delayed */ /* Number of usecs that the last interrupt was delayed */
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/cpufreq.h> #include <linux/cpufreq.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/jiffies.h>
#include <asm/timer.h> #include <asm/timer.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -21,7 +22,6 @@ ...@@ -21,7 +22,6 @@
int tsc_disable __initdata = 0; int tsc_disable __initdata = 0;
extern spinlock_t i8253_lock; extern spinlock_t i8253_lock;
extern unsigned long jiffies;
static int use_tsc; static int use_tsc;
/* Number of usecs that the last interrupt was delayed */ /* Number of usecs that the last interrupt was delayed */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment