From 7f77a6e26605c26a23e5c1787f0a062542bff5c1 Mon Sep 17 00:00:00 2001 From: "Michael Mair-Keimberger (asterix)" Date: Mon, 6 Feb 2017 17:59:47 +0100 Subject: sys-kernel/ck-sources: remove unused patches --- sys-kernel/ck-sources/files/bfs462-rtmn-fix.patch | 26 ---------------- .../ck-sources/files/bfs462-update_inittask.patch | 30 ------------------ ...CK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch | 36 ---------------------- ...CK-Sched_Fix_Race_In_Task_Group-aCOSwt_P4.patch | 13 -------- ...-sources-3.4.81-update_cpu_load-aCOSwt_P9.patch | 13 -------- ...ck-sources-3.4.9-calc_load_idle-aCOSwt_P3.patch | 19 ------------ 6 files changed, 137 deletions(-) delete mode 100644 sys-kernel/ck-sources/files/bfs462-rtmn-fix.patch delete mode 100644 sys-kernel/ck-sources/files/bfs462-update_inittask.patch delete mode 100644 sys-kernel/ck-sources/files/ck-sources-3.4-3.5-PostCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch delete mode 100644 sys-kernel/ck-sources/files/ck-sources-3.4-3.5-PreCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P4.patch delete mode 100644 sys-kernel/ck-sources/files/ck-sources-3.4.81-update_cpu_load-aCOSwt_P9.patch delete mode 100644 sys-kernel/ck-sources/files/ck-sources-3.4.9-calc_load_idle-aCOSwt_P3.patch (limited to 'sys-kernel/ck-sources') diff --git a/sys-kernel/ck-sources/files/bfs462-rtmn-fix.patch b/sys-kernel/ck-sources/files/bfs462-rtmn-fix.patch deleted file mode 100644 index c3c77fd6854a..000000000000 --- a/sys-kernel/ck-sources/files/bfs462-rtmn-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix undefined reference to `register_task_migration_notifier' - --ck - ---- - kernel/sched/bfs.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -Index: linux-4.0.2-ck1/kernel/sched/bfs.c -=================================================================== ---- linux-4.0.2-ck1.orig/kernel/sched/bfs.c 2015-05-08 09:03:55.730280539 +1000 -+++ linux-4.0.2-ck1/kernel/sched/bfs.c 2015-05-08 09:18:42.266015120 +1000 -@@ -976,6 +976,13 @@ static inline void deactivate_task(struc - clear_sticky(p); - } - -+static ATOMIC_NOTIFIER_HEAD(task_migration_notifier); -+ -+void register_task_migration_notifier(struct notifier_block *n) -+{ -+ atomic_notifier_chain_register(&task_migration_notifier, n); -+} -+ - #ifdef CONFIG_SMP - void set_task_cpu(struct task_struct *p, unsigned int cpu) - { diff --git a/sys-kernel/ck-sources/files/bfs462-update_inittask.patch b/sys-kernel/ck-sources/files/bfs462-update_inittask.patch deleted file mode 100644 index 92321c7d1b59..000000000000 --- a/sys-kernel/ck-sources/files/bfs462-update_inittask.patch +++ /dev/null @@ -1,30 +0,0 @@ -Add missing init task changes. - --ck - ---- - include/linux/init_task.h | 4 ++++ - 1 file changed, 4 insertions(+) - -Index: linux-4.0.2-ck1/include/linux/init_task.h -=================================================================== ---- linux-4.0.2-ck1.orig/include/linux/init_task.h 2015-05-08 09:03:54.922287214 +1000 -+++ linux-4.0.2-ck1/include/linux/init_task.h 2015-05-08 14:09:52.046246570 +1000 -@@ -200,6 +200,9 @@ extern struct task_group root_task_group - .cpus_allowed = CPU_MASK_ALL, \ - .mm = NULL, \ - .active_mm = &init_mm, \ -+ .restart_block = { \ -+ .fn = do_no_restart_syscall, \ -+ }, \ - .run_list = LIST_HEAD_INIT(tsk.run_list), \ - .time_slice = HZ, \ - .tasks = LIST_HEAD_INIT(tsk.tasks), \ -@@ -243,6 +246,7 @@ extern struct task_group root_task_group - INIT_FTRACE_GRAPH \ - INIT_TRACE_RECURSION \ - INIT_TASK_RCU_PREEMPT(tsk) \ -+ INIT_KASAN(tsk) \ - } - #else /* CONFIG_SCHED_BFS */ - #define INIT_TASK_COMM "swapper" diff --git a/sys-kernel/ck-sources/files/ck-sources-3.4-3.5-PostCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch b/sys-kernel/ck-sources/files/ck-sources-3.4-3.5-PostCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch deleted file mode 100644 index 0414c31e3a4b..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-3.4-3.5-PostCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur a/include/linux/init_task.h b/include/linux/init_task.h ---- a/include/linux/init_task.h 2012-10-09 14:42:04.000000000 +0200 -+++ b/include/linux/init_task.h 2012-10-08 18:14:11.000000000 +0200 -@@ -123,6 +123,8 @@ - - extern struct cred init_cred; - -+#ifndef CONFIG_SCHED_BFS -+ - extern struct task_group root_task_group; - - #ifdef CONFIG_CGROUP_SCHED -@@ -132,6 +134,8 @@ - # define INIT_CGROUP_SCHED(tsk) - #endif - -+#endif -+ - #ifdef CONFIG_PERF_EVENTS - # define INIT_PERF_EVENTS(tsk) \ - .perf_event_mutex = \ -diff -Naur a/include/linux/sched.h b/include/linux/sched.h ---- a/include/linux/sched.h 2012-10-09 14:42:04.000000000 +0200 -+++ b/include/linux/sched.h 2012-10-08 18:36:50.000000000 +0200 -@@ -1264,6 +1264,11 @@ - const struct sched_class *sched_class; - struct sched_entity se; - struct sched_rt_entity rt; -+ -+#ifdef CONFIG_CGROUP_SCHED -+ struct task_group *sched_task_group; -+#endif -+ - #endif - - #ifdef CONFIG_PREEMPT_NOTIFIERS diff --git a/sys-kernel/ck-sources/files/ck-sources-3.4-3.5-PreCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P4.patch b/sys-kernel/ck-sources/files/ck-sources-3.4-3.5-PreCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P4.patch deleted file mode 100644 index d95953b968bc..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-3.4-3.5-PreCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -u -r a/include/linux/sched.h b/include/linux/sched.h ---- a/include/linux/sched.h 2012-10-03 02:54:00.000000000 +0200 -+++ b/include/linux/sched.h 2012-07-21 22:58:29.000000000 +0200 -@@ -1244,9 +1244,6 @@ - const struct sched_class *sched_class; - struct sched_entity se; - struct sched_rt_entity rt; --#ifdef CONFIG_CGROUP_SCHED -- struct task_group *sched_task_group; --#endif - - #ifdef CONFIG_PREEMPT_NOTIFIERS - /* list of struct preempt_notifier: */ diff --git a/sys-kernel/ck-sources/files/ck-sources-3.4.81-update_cpu_load-aCOSwt_P9.patch b/sys-kernel/ck-sources/files/ck-sources-3.4.81-update_cpu_load-aCOSwt_P9.patch deleted file mode 100644 index e5e673d78daa..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-3.4.81-update_cpu_load-aCOSwt_P9.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- kernel/sched/bfs.000 2014-02-25 23:02:00.000000000 +0100 -+++ kernel/sched/bfs.c 2014-02-25 23:04:49.000000000 +0100 -@@ -2599,6 +2599,10 @@ - void calc_load_exit_idle(void) - { - } -+ -+void update_cpu_load_nohz(void) -+{ -+} - #endif /* CONFIG_NO_HZ */ - - /* diff --git a/sys-kernel/ck-sources/files/ck-sources-3.4.9-calc_load_idle-aCOSwt_P3.patch b/sys-kernel/ck-sources/files/ck-sources-3.4.9-calc_load_idle-aCOSwt_P3.patch deleted file mode 100644 index f3de9292dfdc..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-3.4.9-calc_load_idle-aCOSwt_P3.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- kernel/sched/bfs.c.000 2012-09-06 09:05:05.000000000 +0200 -+++ kernel/sched/bfs.c 2012-09-06 09:06:07.000000000 +0200 -@@ -2591,6 +2591,16 @@ - { - } - -+#ifdef CONFIG_NO_HZ -+void calc_load_enter_idle(void) -+{ -+} -+ -+void calc_load_exit_idle(void) -+{ -+} -+#endif /* CONFIG_NO_HZ */ -+ - /* - * Account guest cpu time to a process. - * @p: the process that the cpu time gets accounted to -- cgit v1.2.3-65-gdbad