diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-19 01:21:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-19 01:21:40 -0700 |
| commit | 88b6548eaf2cf8130580138c2b395ec385e5f54e (patch) | |
| tree | 5b4511adbf6a0035fc7fc1903a8e889992997359 /kernel | |
| parent | dfb9c436d78ca78c7c3fdc879e4c4691e19e95d1 (diff) | |
| parent | b35a6769c113563a88f6d0919b8b8b93bc9bd638 (diff) | |
Merge evo:v2.6/linux into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/posix-timers.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 3de4d0ae9d26..f846b77a205e 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -189,7 +189,11 @@ static u64 do_posix_clock_monotonic_gettime_parts( int do_posix_clock_monotonic_gettime(struct timespec *tp); int do_posix_clock_monotonic_settime(struct timespec *tp); static struct k_itimer *lock_timer(timer_t timer_id, unsigned long *flags); -static inline void unlock_timer(struct k_itimer *timr, unsigned long flags); + +static inline void unlock_timer(struct k_itimer *timr, unsigned long flags) +{ + spin_unlock_irqrestore(&timr->it_lock, flags); +} /* * Initialize everything, well, just everything in Posix clocks/timers ;) @@ -553,11 +557,6 @@ static int good_timespec(const struct timespec *ts) return 1; } -static inline void unlock_timer(struct k_itimer *timr, unsigned long flags) -{ - spin_unlock_irqrestore(&timr->it_lock, flags); -} - /* * Locking issues: We need to protect the result of the id look up until * we get the timer locked down so it is not deleted under us. The |