diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-18 04:54:00 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-18 04:54:00 -0400 |
commit | 4741c336d27dec3ea68a35659abb8dc82b142388 (patch) | |
tree | a8576df82129354b77b0144c480c446ec7aba7b2 /include/linux/sched.h | |
parent | 26ec634c31a11a003040e10b4d650495158632fd (diff) | |
parent | a9a5cd5d2a57fb76dbae2115450f777b69beccf7 (diff) |
Merge branch 'master'
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 e3539c14e47e..b7d31e2e1729 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -911,7 +911,6 @@ static inline int pid_alive(struct task_struct *p) | |||
911 | extern void free_task(struct task_struct *tsk); | 911 | extern void free_task(struct task_struct *tsk); |
912 | #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0) | 912 | #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0) |
913 | 913 | ||
914 | extern void __put_task_struct_cb(struct rcu_head *rhp); | ||
915 | extern void __put_task_struct(struct task_struct *t); | 914 | extern void __put_task_struct(struct task_struct *t); |
916 | 915 | ||
917 | static inline void put_task_struct(struct task_struct *t) | 916 | static inline void put_task_struct(struct task_struct *t) |