72 lines
2.2 KiB
Diff
72 lines
2.2 KiB
Diff
Subject: sched-delay-put-task.patch
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Tue, 31 May 2011 16:59:16 +0200
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
include/linux/sched.h | 13 +++++++++++++
|
|
kernel/fork.c | 11 +++++++++++
|
|
2 files changed, 24 insertions(+)
|
|
|
|
Index: linux-3.2/include/linux/sched.h
|
|
===================================================================
|
|
--- linux-3.2.orig/include/linux/sched.h
|
|
+++ linux-3.2/include/linux/sched.h
|
|
@@ -1591,6 +1591,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. */
|
|
@@ -1775,6 +1778,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)
|
|
@@ -1782,6 +1794,7 @@ static inline void put_task_struct(struc
|
|
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);
|
|
Index: linux-3.2/kernel/fork.c
|
|
===================================================================
|
|
--- linux-3.2.orig/kernel/fork.c
|
|
+++ linux-3.2/kernel/fork.c
|
|
@@ -196,7 +196,18 @@ void __put_task_struct(struct task_struc
|
|
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
|