git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
timer.h
diff --git
a/include/linux/timer.h
b/include/linux/timer.h
index
0a485be
..
fb5edaa
100644
(file)
--- a/
include/linux/timer.h
+++ b/
include/linux/timer.h
@@
-1,7
+1,6
@@
#ifndef _LINUX_TIMER_H
#define _LINUX_TIMER_H
#ifndef _LINUX_TIMER_H
#define _LINUX_TIMER_H
-#include <linux/config.h>
#include <linux/list.h>
#include <linux/spinlock.h>
#include <linux/stddef.h>
#include <linux/list.h>
#include <linux/spinlock.h>
#include <linux/stddef.h>
@@
-42,7
+41,7
@@
static inline void setup_timer(struct timer_list * timer,
init_timer(timer);
}
init_timer(timer);
}
-/**
*
+/**
* timer_pending - is a timer pending?
* @timer: the timer in question
*
* timer_pending - is a timer pending?
* @timer: the timer in question
*
@@
-64,7
+63,7
@@
extern int mod_timer(struct timer_list *timer, unsigned long expires);
extern unsigned long next_timer_interrupt(void);
extern unsigned long next_timer_interrupt(void);
-/**
*
+/**
* add_timer - start a timer
* @timer: the timer to be added
*
* add_timer - start a timer
* @timer: the timer to be added
*
@@
-99,4
+98,10
@@
extern void run_local_timers(void);
struct hrtimer;
extern int it_real_fn(struct hrtimer *);
struct hrtimer;
extern int it_real_fn(struct hrtimer *);
+unsigned long __round_jiffies(unsigned long j, int cpu);
+unsigned long __round_jiffies_relative(unsigned long j, int cpu);
+unsigned long round_jiffies(unsigned long j);
+unsigned long round_jiffies_relative(unsigned long j);
+
+
#endif
#endif