diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2016-06-02 17:46:25 +0200 |
---|---|---|
committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2016-06-02 17:46:25 +0200 |
commit | b888c44961779f0d86ac8a8e3b417fa45eceb4ea (patch) | |
tree | 7f87a51d7b320075ba82672e32579f8a8840fd6a | |
parent | 651cb42b4c2bdc1326a06204a30ef5d4e143f2aa (diff) | |
download | linux-rt-4.6.1-rt2-patches.tar.gz |
[ANNOUNCE] 4.6.1-rt2v4.6.1-rt2-patches
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-rw-r--r-- | patches/cgroups-use-simple-wait-in-css_release.patch | 6 | ||||
-rw-r--r-- | patches/i915-bogus-warning-from-i915-when-running-on-PREEMPT.patch | 2 | ||||
-rw-r--r-- | patches/localversion.patch | 2 | ||||
-rw-r--r-- | patches/net-move-xmit_recursion-to-per-task-variable-on-RT.patch | 2 | ||||
-rw-r--r-- | patches/preempt-lazy-support.patch | 16 | ||||
-rw-r--r-- | patches/sched-provide-a-tsk_nr_cpus_allowed-helper.patch | 14 | ||||
-rw-r--r-- | patches/sched-use-tsk_cpus_allowed-instead-of-accessing-cpus.patch | 4 | ||||
-rw-r--r-- | patches/skbufhead-raw-lock.patch | 2 | ||||
-rw-r--r-- | patches/workqueue-use-rcu.patch | 6 |
9 files changed, 27 insertions, 27 deletions
diff --git a/patches/cgroups-use-simple-wait-in-css_release.patch b/patches/cgroups-use-simple-wait-in-css_release.patch index 70d47b6bcf02..968b9f07aee2 100644 --- a/patches/cgroups-use-simple-wait-in-css_release.patch +++ b/patches/cgroups-use-simple-wait-in-css_release.patch @@ -52,7 +52,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> /* --- a/kernel/cgroup.c +++ b/kernel/cgroup.c -@@ -4943,10 +4943,10 @@ static void css_free_rcu_fn(struct rcu_h +@@ -5005,10 +5005,10 @@ static void css_free_rcu_fn(struct rcu_h queue_work(cgroup_destroy_wq, &css->destroy_work); } @@ -65,7 +65,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> struct cgroup_subsys *ss = css->ss; struct cgroup *cgrp = css->cgroup; -@@ -4987,8 +4987,8 @@ static void css_release(struct percpu_re +@@ -5049,8 +5049,8 @@ static void css_release(struct percpu_re struct cgroup_subsys_state *css = container_of(ref, struct cgroup_subsys_state, refcnt); @@ -76,7 +76,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> } static void init_and_link_css(struct cgroup_subsys_state *css, -@@ -5631,6 +5631,7 @@ static int __init cgroup_wq_init(void) +@@ -5694,6 +5694,7 @@ static int __init cgroup_wq_init(void) */ cgroup_destroy_wq = alloc_workqueue("cgroup_destroy", 0, 1); BUG_ON(!cgroup_destroy_wq); diff --git a/patches/i915-bogus-warning-from-i915-when-running-on-PREEMPT.patch b/patches/i915-bogus-warning-from-i915-when-running-on-PREEMPT.patch index 263c1c0fda88..b0ea81dcb908 100644 --- a/patches/i915-bogus-warning-from-i915-when-running-on-PREEMPT.patch +++ b/patches/i915-bogus-warning-from-i915-when-running-on-PREEMPT.patch @@ -18,7 +18,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c -@@ -11476,7 +11476,7 @@ void intel_check_page_flip(struct drm_de +@@ -11475,7 +11475,7 @@ void intel_check_page_flip(struct drm_de struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_unpin_work *work; diff --git a/patches/localversion.patch b/patches/localversion.patch index a02382e6df70..279489a1d145 100644 --- a/patches/localversion.patch +++ b/patches/localversion.patch @@ -10,4 +10,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- /dev/null +++ b/localversion-rt @@ -0,0 +1 @@ -+-rt1 ++-rt2 diff --git a/patches/net-move-xmit_recursion-to-per-task-variable-on-RT.patch b/patches/net-move-xmit_recursion-to-per-task-variable-on-RT.patch index ed090ff83428..19618c020fc8 100644 --- a/patches/net-move-xmit_recursion-to-per-task-variable-on-RT.patch +++ b/patches/net-move-xmit_recursion-to-per-task-variable-on-RT.patch @@ -22,7 +22,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -2393,11 +2393,20 @@ void netdev_freemem(struct net_device *d +@@ -2396,11 +2396,20 @@ void netdev_freemem(struct net_device *d void synchronize_net(void); int init_dummy_netdev(struct net_device *dev); diff --git a/patches/preempt-lazy-support.patch b/patches/preempt-lazy-support.patch index a2bf8cf0980d..092eabb2027e 100644 --- a/patches/preempt-lazy-support.patch +++ b/patches/preempt-lazy-support.patch @@ -358,7 +358,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> */ --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -3319,7 +3319,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq +@@ -3318,7 +3318,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq ideal_runtime = sched_slice(cfs_rq, curr); delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime; if (delta_exec > ideal_runtime) { @@ -367,7 +367,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> /* * The current task ran long enough, ensure it doesn't get * re-elected due to buddy favours. -@@ -3343,7 +3343,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq +@@ -3342,7 +3342,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq return; if (delta > ideal_runtime) @@ -376,7 +376,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> } static void -@@ -3488,7 +3488,7 @@ entity_tick(struct cfs_rq *cfs_rq, struc +@@ -3487,7 +3487,7 @@ entity_tick(struct cfs_rq *cfs_rq, struc * validating it and just reschedule. */ if (queued) { @@ -385,7 +385,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> return; } /* -@@ -3670,7 +3670,7 @@ static void __account_cfs_rq_runtime(str +@@ -3669,7 +3669,7 @@ static void __account_cfs_rq_runtime(str * hierarchy can be throttled */ if (!assign_cfs_rq_runtime(cfs_rq) && likely(cfs_rq->curr)) @@ -394,7 +394,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> } static __always_inline -@@ -4282,7 +4282,7 @@ static void hrtick_start_fair(struct rq +@@ -4281,7 +4281,7 @@ static void hrtick_start_fair(struct rq if (delta < 0) { if (rq->curr == p) @@ -403,7 +403,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> return; } hrtick_start(rq, delta); -@@ -5422,7 +5422,7 @@ static void check_preempt_wakeup(struct +@@ -5421,7 +5421,7 @@ static void check_preempt_wakeup(struct return; preempt: @@ -412,7 +412,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> /* * Only set the backward buddy when the current task is still * on the rq. This can happen when a wakeup gets interleaved -@@ -8173,7 +8173,7 @@ static void task_fork_fair(struct task_s +@@ -8172,7 +8172,7 @@ static void task_fork_fair(struct task_s * 'current' within the tree based on its new key value. */ swap(curr->vruntime, se->vruntime); @@ -421,7 +421,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> } se->vruntime -= cfs_rq->min_vruntime; -@@ -8198,7 +8198,7 @@ prio_changed_fair(struct rq *rq, struct +@@ -8197,7 +8197,7 @@ prio_changed_fair(struct rq *rq, struct */ if (rq->curr == p) { if (p->prio > oldprio) diff --git a/patches/sched-provide-a-tsk_nr_cpus_allowed-helper.patch b/patches/sched-provide-a-tsk_nr_cpus_allowed-helper.patch index 5d6a0fc046ce..18c6174d1149 100644 --- a/patches/sched-provide-a-tsk_nr_cpus_allowed-helper.patch +++ b/patches/sched-provide-a-tsk_nr_cpus_allowed-helper.patch @@ -116,7 +116,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> return -1; /* -@@ -1431,7 +1431,7 @@ static struct task_struct *pick_next_pus +@@ -1432,7 +1432,7 @@ static struct task_struct *pick_next_pus BUG_ON(rq->cpu != task_cpu(p)); BUG_ON(task_current(rq, p)); @@ -125,7 +125,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> BUG_ON(!task_on_rq_queued(p)); BUG_ON(!dl_task(p)); -@@ -1470,7 +1470,7 @@ static int push_dl_task(struct rq *rq) +@@ -1471,7 +1471,7 @@ static int push_dl_task(struct rq *rq) */ if (dl_task(rq->curr) && dl_time_before(next_task->dl.deadline, rq->curr->dl.deadline) && @@ -134,7 +134,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> resched_curr(rq); return 0; } -@@ -1617,9 +1617,9 @@ static void task_woken_dl(struct rq *rq, +@@ -1618,9 +1618,9 @@ static void task_woken_dl(struct rq *rq, { if (!task_running(rq, p) && !test_tsk_need_resched(rq->curr) && @@ -146,7 +146,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> !dl_entity_preempt(&p->dl, &rq->curr->dl))) { push_dl_tasks(rq); } -@@ -1723,7 +1723,7 @@ static void switched_to_dl(struct rq *rq +@@ -1724,7 +1724,7 @@ static void switched_to_dl(struct rq *rq if (task_on_rq_queued(p) && rq->curr != p) { #ifdef CONFIG_SMP @@ -229,7 +229,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> return -1; /* No other targets possible */ if (!cpupri_find(&task_rq(task)->rd->cpupri, task, lowest_mask)) -@@ -1761,7 +1761,7 @@ static struct task_struct *pick_next_pus +@@ -1762,7 +1762,7 @@ static struct task_struct *pick_next_pus BUG_ON(rq->cpu != task_cpu(p)); BUG_ON(task_current(rq, p)); @@ -238,7 +238,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> BUG_ON(!task_on_rq_queued(p)); BUG_ON(!rt_task(p)); -@@ -2121,9 +2121,9 @@ static void task_woken_rt(struct rq *rq, +@@ -2122,9 +2122,9 @@ static void task_woken_rt(struct rq *rq, { if (!task_running(rq, p) && !test_tsk_need_resched(rq->curr) && @@ -250,7 +250,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> rq->curr->prio <= p->prio)) push_rt_tasks(rq); } -@@ -2196,7 +2196,7 @@ static void switched_to_rt(struct rq *rq +@@ -2197,7 +2197,7 @@ static void switched_to_rt(struct rq *rq */ if (task_on_rq_queued(p) && rq->curr != p) { #ifdef CONFIG_SMP diff --git a/patches/sched-use-tsk_cpus_allowed-instead-of-accessing-cpus.patch b/patches/sched-use-tsk_cpus_allowed-instead-of-accessing-cpus.patch index 38b80d6b8d06..89f28df83efb 100644 --- a/patches/sched-use-tsk_cpus_allowed-instead-of-accessing-cpus.patch +++ b/patches/sched-use-tsk_cpus_allowed-instead-of-accessing-cpus.patch @@ -51,7 +51,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> if (unlikely(task_rq(task) != rq || !cpumask_test_cpu(later_rq->cpu, - &task->cpus_allowed) || -+ tsk_cpus_allowed(task)) || ++ tsk_cpus_allowed(task)) || task_running(rq, task) || + !dl_task(task) || !task_on_rq_queued(task))) { - double_unlock_balance(rq, later_rq); diff --git a/patches/skbufhead-raw-lock.patch b/patches/skbufhead-raw-lock.patch index 806824a6d22a..dcfa3240a27b 100644 --- a/patches/skbufhead-raw-lock.patch +++ b/patches/skbufhead-raw-lock.patch @@ -15,7 +15,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -2773,6 +2773,7 @@ struct softnet_data { +@@ -2776,6 +2776,7 @@ struct softnet_data { unsigned int dropped; struct sk_buff_head input_pkt_queue; struct napi_struct backlog; diff --git a/patches/workqueue-use-rcu.patch b/patches/workqueue-use-rcu.patch index aa6acc43e106..dfa04901b6ee 100644 --- a/patches/workqueue-use-rcu.patch +++ b/patches/workqueue-use-rcu.patch @@ -311,7 +311,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> } /* -@@ -4808,16 +4815,16 @@ bool freeze_workqueues_busy(void) +@@ -4819,16 +4826,16 @@ bool freeze_workqueues_busy(void) * nr_active is monotonically decreasing. It's safe * to peek without lock. */ @@ -331,7 +331,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> } out_unlock: mutex_unlock(&wq_pool_mutex); -@@ -5007,7 +5014,8 @@ static ssize_t wq_pool_ids_show(struct d +@@ -5018,7 +5025,8 @@ static ssize_t wq_pool_ids_show(struct d const char *delim = ""; int node, written = 0; @@ -341,7 +341,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> for_each_node(node) { written += scnprintf(buf + written, PAGE_SIZE - written, "%s%d:%d", delim, node, -@@ -5015,7 +5023,8 @@ static ssize_t wq_pool_ids_show(struct d +@@ -5026,7 +5034,8 @@ static ssize_t wq_pool_ids_show(struct d delim = " "; } written += scnprintf(buf + written, PAGE_SIZE - written, "\n"); |