git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unnecessary includes of spinlock.h under include/linux
[safe/jmp/linux-2.6]
/
include
/
linux
/
timer.h
diff --git
a/include/linux/timer.h
b/include/linux/timer.h
index
e0c5c16
..
2b59e6d
100644
(file)
--- a/
include/linux/timer.h
+++ b/
include/linux/timer.h
@@
-3,7
+3,6
@@
#include <linux/list.h>
#include <linux/ktime.h>
#include <linux/list.h>
#include <linux/ktime.h>
-#include <linux/spinlock.h>
#include <linux/stddef.h>
struct tvec_t_base_s;
#include <linux/stddef.h>
struct tvec_t_base_s;
@@
-69,6
+68,12
@@
extern int __mod_timer(struct timer_list *timer, unsigned long expires);
extern int mod_timer(struct timer_list *timer, unsigned long expires);
/*
extern int mod_timer(struct timer_list *timer, unsigned long expires);
/*
+ * The jiffies value which is added to now, when there is no timer
+ * in the timer wheel:
+ */
+#define NEXT_TIMER_MAX_DELTA ((1UL << 30) - 1)
+
+/*
* Return when the next timer-wheel timeout occurs (in absolute jiffies),
* locks the timer base:
*/
* Return when the next timer-wheel timeout occurs (in absolute jiffies),
* locks the timer base:
*/