diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-02-16 10:27:49 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 17:13:58 +0100 |
| commit | c9cb2e3d7c9178ab75d0942f96abb3abe0369906 (patch) | |
| tree | 2d4a5470ece5efe82463653678c491c2f249d560 /kernel/itimer.c | |
| parent | [PATCH] Extend next_timer_interrupt() to use a reference jiffie (diff) | |
| download | linux-c9cb2e3d7c9178ab75d0942f96abb3abe0369906.tar.xz linux-c9cb2e3d7c9178ab75d0942f96abb3abe0369906.zip | |
[PATCH] hrtimers: namespace and enum cleanup
- hrtimers did not use the hrtimer_restart enum and relied on the implict
int representation. Fix the prototypes and the functions using the enums.
- Use seperate name spaces for the enumerations
- Convert hrtimer_restart macro to inline function
- Add comments
No functional changes.
[akpm@osdl.org: fix input driver]
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/itimer.c')
| -rw-r--r-- | kernel/itimer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/itimer.c b/kernel/itimer.c index 204ed7939e75..9cefe1d1eb13 100644 --- a/kernel/itimer.c +++ b/kernel/itimer.c @@ -128,7 +128,7 @@ asmlinkage long sys_getitimer(int which, struct itimerval __user *value) /* * The timer is automagically restarted, when interval != 0 */ -int it_real_fn(struct hrtimer *timer) +enum hrtimer_restart it_real_fn(struct hrtimer *timer) { struct signal_struct *sig = container_of(timer, struct signal_struct, real_timer); @@ -235,7 +235,7 @@ again: timeval_to_ktime(value->it_interval); expires = timeval_to_ktime(value->it_value); if (expires.tv64 != 0) - hrtimer_start(timer, expires, HRTIMER_REL); + hrtimer_start(timer, expires, HRTIMER_MODE_REL); spin_unlock_irq(&tsk->sighand->siglock); break; case ITIMER_VIRTUAL: |