diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2006-01-09 20:52:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 08:01:38 -0800 |
| commit | 2ff678b8da6478d861c1b0ecb3ac14575760e906 (patch) | |
| tree | 0ca983ce820ac8bb9f6e8b193926e0804116a7e0 /include | |
| parent | df78488de7befd387e9d060da6e18bb5d1cb882c (diff) | |
| download | kernel_samsung_smdk4412-2ff678b8da6478d861c1b0ecb3ac14575760e906.zip kernel_samsung_smdk4412-2ff678b8da6478d861c1b0ecb3ac14575760e906.tar.gz kernel_samsung_smdk4412-2ff678b8da6478d861c1b0ecb3ac14575760e906.tar.bz2 | |
[PATCH] hrtimer: switch itimers to hrtimer
switch itimers to a hrtimers-based implementation
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sched.h | 5 | ||||
| -rw-r--r-- | include/linux/timer.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 85b53f8..ee4677a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -105,6 +105,7 @@ extern unsigned long nr_iowait(void); #include <linux/param.h> #include <linux/resource.h> #include <linux/timer.h> +#include <linux/hrtimer.h> #include <asm/processor.h> @@ -398,8 +399,8 @@ struct signal_struct { struct list_head posix_timers; /* ITIMER_REAL timer for the process */ - struct timer_list real_timer; - unsigned long it_real_value, it_real_incr; + struct hrtimer real_timer; + ktime_t it_real_incr; /* ITIMER_PROF and ITIMER_VIRTUAL timers for the process */ cputime_t it_prof_expires, it_virt_expires; diff --git a/include/linux/timer.h b/include/linux/timer.h index 72f3a77..9b9877f 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -96,6 +96,6 @@ static inline void add_timer(struct timer_list *timer) extern void init_timers(void); extern void run_local_timers(void); -extern void it_real_fn(unsigned long); +extern int it_real_fn(void *); #endif |