diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-16 20:01:19 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-16 20:01:19 -0500 |
| commit | 23dd64011285010ac291f7dddf6e287bdb43a0ad (patch) | |
| tree | 0e4f4569d38d82f4dceb4150d5ad940e0fd5f24f /include/linux/sched.h | |
| parent | 516450179454de9e689e0a53ed8f34b896e8651c (diff) | |
| parent | 485ff09990416c75ae9593ddc71619939ab9dd51 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index ff2e09c953b9..62e6314382f0 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -892,7 +892,6 @@ static inline int pid_alive(struct task_struct *p) | |||
| 892 | } | 892 | } |
| 893 | 893 | ||
| 894 | extern void free_task(struct task_struct *tsk); | 894 | extern void free_task(struct task_struct *tsk); |
| 895 | extern void __put_task_struct(struct task_struct *tsk); | ||
| 896 | #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0) | 895 | #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0) |
| 897 | 896 | ||
| 898 | extern void __put_task_struct_cb(struct rcu_head *rhp); | 897 | extern void __put_task_struct_cb(struct rcu_head *rhp); |