| From 1d69cb2f49e57b61483843705efd9cfdc4471f53 Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Tue, 31 May 2011 16:59:16 +0200 |
| Subject: [PATCH 124/256] sched-delay-put-task.patch |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| --- |
| include/linux/sched.h | 13 +++++++++++++ |
| kernel/fork.c | 11 +++++++++++ |
| 2 files changed, 24 insertions(+) |
| |
| diff --git a/include/linux/sched.h b/include/linux/sched.h |
| index b997506..0fbffda 100644 |
| --- a/include/linux/sched.h |
| +++ b/include/linux/sched.h |
| @@ -1635,6 +1635,9 @@ struct task_struct { |
| #ifdef CONFIG_HAVE_HW_BREAKPOINT |
| atomic_t ptrace_bp_refcnt; |
| #endif |
| +#ifdef CONFIG_PREEMPT_RT_BASE |
| + struct rcu_head put_rcu; |
| +#endif |
| }; |
| |
| /* Future-safe accessor for struct task_struct's cpus_allowed. */ |
| @@ -1819,6 +1822,15 @@ extern struct pid *cad_pid; |
| extern void free_task(struct task_struct *tsk); |
| #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0) |
| |
| +#ifdef CONFIG_PREEMPT_RT_BASE |
| +extern void __put_task_struct_cb(struct rcu_head *rhp); |
| + |
| +static inline void put_task_struct(struct task_struct *t) |
| +{ |
| + if (atomic_dec_and_test(&t->usage)) |
| + call_rcu(&t->put_rcu, __put_task_struct_cb); |
| +} |
| +#else |
| extern void __put_task_struct(struct task_struct *t); |
| |
| static inline void put_task_struct(struct task_struct *t) |
| @@ -1826,6 +1838,7 @@ static inline void put_task_struct(struct task_struct *t) |
| if (atomic_dec_and_test(&t->usage)) |
| __put_task_struct(t); |
| } |
| +#endif |
| |
| extern void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st); |
| extern void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st); |
| diff --git a/kernel/fork.c b/kernel/fork.c |
| index 45a45b7..e13be8a 100644 |
| --- a/kernel/fork.c |
| +++ b/kernel/fork.c |
| @@ -202,7 +202,18 @@ void __put_task_struct(struct task_struct *tsk) |
| if (!profile_handoff_task(tsk)) |
| free_task(tsk); |
| } |
| +#ifndef CONFIG_PREEMPT_RT_BASE |
| EXPORT_SYMBOL_GPL(__put_task_struct); |
| +#else |
| +void __put_task_struct_cb(struct rcu_head *rhp) |
| +{ |
| + struct task_struct *tsk = container_of(rhp, struct task_struct, rcu); |
| + |
| + __put_task_struct(tsk); |
| + |
| +} |
| +EXPORT_SYMBOL_GPL(__put_task_struct_cb); |
| +#endif |
| |
| /* |
| * macro override instead of weak attribute alias, to workaround |
| -- |
| 1.7.10.4 |
| |