diff --git a/[refs] b/[refs] index 1d82d3654983..000bcd62c52c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d89c929078588aa9b9c674ef03ee9aa816b59b8 +refs/heads/master: d4829cd5b4bd1ea58ba1bebad44d562f4027c290 diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index a6af77e9b4cf..20bd70749104 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -878,18 +878,6 @@ extern void free_task(struct task_struct *tsk); extern void __put_task_struct(struct task_struct *tsk); #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0) -static inline int get_task_struct_rcu(struct task_struct *t) -{ - int oldusage; - - do { - oldusage = atomic_read(&t->usage); - if (oldusage == 0) - return 0; - } while (cmpxchg(&t->usage.counter, oldusage, oldusage+1) != oldusage); - return 1; -} - extern void __put_task_struct_cb(struct rcu_head *rhp); static inline void put_task_struct(struct task_struct *t)