rm sched-Extend-enqueue_task-to-allow-head-queueing.patch - ea87bb78

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

2 files changed, 0 insertions, 117 deletions

diff --git a/sched-Extend-enqueue_task-to-allow-head-queueing.patch b/sched-Extend-enqueue_task-to-allow-head-queueing.patch
deleted file mode 100644
index 0272143..0000000
--- a/sched-Extend-enqueue_task-to-allow-head-queueing.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From a5a6cc908a1f980fe8325d27d25630be2a595aea Mon Sep 17 00:00:00 2001
-From: Thomas Gleixner <tglx@linutronix.de>
-Date: Tue, 19 Jan 2010 16:09:11 +0100
-Subject: [PATCH] sched: Extend enqueue_task to allow head queueing
-
-commit 6640be50e8a2f9bd526beddafd23b49406a4af07 in tip.
-
-The ability of enqueueing a task to the head of a SCHED_FIFO priority
-list is required to fix some violations of POSIX scheduling policy.
-
-Extend the related functions with a "head" argument.
-
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-
-diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 98b705f..77166d7 100644
---- a/include/linux/sched.h
-+++ b/include/linux/sched.h
-@@ -1116,7 +1116,8 @@ struct sched_domain;
- struct sched_class {
- 	const struct sched_class *next;
- 
--	void (*enqueue_task) (struct rq *rq, struct task_struct *p, int wakeup);
-+	void (*enqueue_task) (struct rq *rq, struct task_struct *p, int wakeup,
-+			      bool head);
- 	void (*dequeue_task) (struct rq *rq, struct task_struct *p, int sleep);
- 	void (*yield_task) (struct rq *rq);
- 
-diff --git a/kernel/sched.c b/kernel/sched.c
-index 29349e0..89829aa 100644
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -1972,13 +1972,14 @@ static void update_avg(u64 *avg, u64 sample)
- 	*avg += diff >> 3;
- }
- 
--static void enqueue_task(struct rq *rq, struct task_struct *p, int wakeup)
-+static void
-+enqueue_task(struct rq *rq, struct task_struct *p, int wakeup, bool head)
- {
- 	if (wakeup)
- 		p->se.start_runtime = p->se.sum_exec_runtime;
- 
- 	sched_info_queued(p);
--	p->sched_class->enqueue_task(rq, p, wakeup);
-+	p->sched_class->enqueue_task(rq, p, wakeup, head);
- 	p->se.on_rq = 1;
- }
- 
-@@ -2056,7 +2057,7 @@ static void activate_task(struct rq *rq, struct task_struct *p, int wakeup)
- 	if (task_contributes_to_load(p))
- 		rq->nr_uninterruptible--;
- 
--	enqueue_task(rq, p, wakeup);
-+	enqueue_task(rq, p, wakeup, false);
- 	inc_nr_running(rq);
- }
- 
-@@ -6377,7 +6378,7 @@ void task_setprio(struct task_struct *p, int prio)
- 	if (running)
- 		p->sched_class->set_curr_task(rq);
- 	if (on_rq) {
--		enqueue_task(rq, p, 0);
-+		enqueue_task(rq, p, 0, false);
- 
- 		check_class_changed(rq, p, prev_class, oldprio, running);
- 	}
-@@ -6421,7 +6422,7 @@ void set_user_nice(struct task_struct *p, long nice)
- 	delta = p->prio - old_prio;
- 
- 	if (on_rq) {
--		enqueue_task(rq, p, 0);
-+		enqueue_task(rq, p, 0, false);
- 		/*
- 		 * If the task increased its priority or is running and
- 		 * lowered its priority, then reschedule its CPU:
-@@ -10509,7 +10510,7 @@ void sched_move_task(struct task_struct *tsk)
- 	if (unlikely(running))
- 		tsk->sched_class->set_curr_task(rq);
- 	if (on_rq)
--		enqueue_task(rq, tsk, 0);
-+		enqueue_task(rq, tsk, 0, false);
- 
- 	task_rq_unlock(rq, &flags);
- }
-diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
-index be1772e..cff45e4 100644
---- a/kernel/sched_fair.c
-+++ b/kernel/sched_fair.c
-@@ -1057,7 +1057,8 @@ static inline void hrtick_update(struct rq *rq)
-  * increased. Here we update the fair scheduling stats and
-  * then put the task into the rbtree:
-  */
--static void enqueue_task_fair(struct rq *rq, struct task_struct *p, int wakeup)
-+static void
-+enqueue_task_fair(struct rq *rq, struct task_struct *p, int wakeup, bool head)
- {
- 	struct cfs_rq *cfs_rq;
- 	struct sched_entity *se = &p->se;
-diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
-index 9204fe1..569d18e 100644
---- a/kernel/sched_rt.c
-+++ b/kernel/sched_rt.c
-@@ -927,7 +927,8 @@ unsigned long rt_nr_uninterruptible_cpu(int cpu)
- /*
-  * Adding/removing a task to/from a priority array:
-  */
--static void enqueue_task_rt(struct rq *rq, struct task_struct *p, int wakeup)
-+static void
-+enqueue_task_rt(struct rq *rq, struct task_struct *p, int wakeup, bool head)
- {
- 	struct sched_rt_entity *rt_se = &p->rt;
- 
--- 
-1.7.1.1
-
diff --git a/series b/series
index 2d0c61e..e357441 100644
--- a/series
+++ b/series
@@ -349,7 +349,6 @@ capabilities-Use-rcu-to-protect-task-lookup-in-sys_c.patch
 fs-Add-missing-rcu-protection-for-__task_cred-in-sys.patch
 security-Fix-invalid-rcu-assumptions-in-comments.patch
 oom-Add-missing-rcu-protection-of-__task_cred-in-dum.patch
-sched-Extend-enqueue_task-to-allow-head-queueing.patch
 sched-Implement-head-queueing-for-sched_rt.patch
 sched-Queue-a-deboosted-task-to-the-head-of-the-RT-p.patch
 sched-Extend-activate_task-to-allow-queueing-to-the-.patch