summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0109-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches-rt/0109-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0109-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch b/debian/patches-rt/0109-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch
index 0340f4f44..3a5c8ac62 100644
--- a/debian/patches-rt/0109-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch
+++ b/debian/patches-rt/0109-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch
@@ -1,8 +1,8 @@
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 25 Jun 2011 09:21:04 +0200
-Subject: [PATCH 109/342] sched: Add saved_state for tasks blocked on sleeping
+Subject: [PATCH 109/351] sched: Add saved_state for tasks blocked on sleeping
locks
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=2b049915c871102cb82a98f65f734bdf7963f933
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=93ed8db7e6295b227c390bffa860f7e5e833d6e4
Spinlocks are state preserving in !RT. RT changes the state when a
task gets blocked on a lock. So we need to remember the state before
@@ -18,10 +18,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
3 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 5e2ec9c86b4b..1b2884889dd0 100644
+index d627469bab35..44a5e80481bb 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
-@@ -600,6 +600,8 @@ struct task_struct {
+@@ -604,6 +604,8 @@ struct task_struct {
#endif
/* -1 unrunnable, 0 runnable, >0 stopped: */
volatile long state;
@@ -30,7 +30,7 @@ index 5e2ec9c86b4b..1b2884889dd0 100644
/*
* This begins the randomizable portion of task_struct. Only
-@@ -1621,6 +1623,7 @@ extern struct task_struct *find_get_task_by_vpid(pid_t nr);
+@@ -1625,6 +1627,7 @@ extern struct task_struct *find_get_task_by_vpid(pid_t nr);
extern int wake_up_state(struct task_struct *tsk, unsigned int state);
extern int wake_up_process(struct task_struct *tsk);
@@ -39,7 +39,7 @@ index 5e2ec9c86b4b..1b2884889dd0 100644
#ifdef CONFIG_SMP
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 089779e18440..3ec69104d0e0 100644
+index 4763faddac6b..165df30aad7b 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2002,8 +2002,27 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)