Commit 88b6548e authored by Linus Torvalds's avatar Linus Torvalds

Merge evo:v2.6/linux into ppc970.osdl.org:/home/torvalds/v2.6/linux

parents dfb9c436 b35a6769
......@@ -341,8 +341,6 @@ static __inline__ void __sk_add_node(struct sock *sk, struct hlist_head *list)
hlist_add_head(&sk->sk_node, list);
}
static inline void sock_hold(struct sock *sk);
static __inline__ void sk_add_node(struct sock *sk, struct hlist_head *list)
{
sock_hold(sk);
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment