1 |
commit: 7f77a6e26605c26a23e5c1787f0a062542bff5c1 |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Feb 6 16:59:47 2017 +0000 |
4 |
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 6 20:14:20 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f77a6e2 |
7 |
|
8 |
sys-kernel/ck-sources: remove unused patches |
9 |
|
10 |
sys-kernel/ck-sources/files/bfs462-rtmn-fix.patch | 26 ---------------- |
11 |
.../ck-sources/files/bfs462-update_inittask.patch | 30 ------------------ |
12 |
...CK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch | 36 ---------------------- |
13 |
...CK-Sched_Fix_Race_In_Task_Group-aCOSwt_P4.patch | 13 -------- |
14 |
...-sources-3.4.81-update_cpu_load-aCOSwt_P9.patch | 13 -------- |
15 |
...ck-sources-3.4.9-calc_load_idle-aCOSwt_P3.patch | 19 ------------ |
16 |
6 files changed, 137 deletions(-) |
17 |
|
18 |
diff --git a/sys-kernel/ck-sources/files/bfs462-rtmn-fix.patch b/sys-kernel/ck-sources/files/bfs462-rtmn-fix.patch |
19 |
deleted file mode 100644 |
20 |
index c3c77fd6..00000000 |
21 |
--- a/sys-kernel/ck-sources/files/bfs462-rtmn-fix.patch |
22 |
+++ /dev/null |
23 |
@@ -1,26 +0,0 @@ |
24 |
-Fix undefined reference to `register_task_migration_notifier' |
25 |
- |
26 |
--ck |
27 |
- |
28 |
---- |
29 |
- kernel/sched/bfs.c | 7 +++++++ |
30 |
- 1 file changed, 7 insertions(+) |
31 |
- |
32 |
-Index: linux-4.0.2-ck1/kernel/sched/bfs.c |
33 |
-=================================================================== |
34 |
---- linux-4.0.2-ck1.orig/kernel/sched/bfs.c 2015-05-08 09:03:55.730280539 +1000 |
35 |
-+++ linux-4.0.2-ck1/kernel/sched/bfs.c 2015-05-08 09:18:42.266015120 +1000 |
36 |
-@@ -976,6 +976,13 @@ static inline void deactivate_task(struc |
37 |
- clear_sticky(p); |
38 |
- } |
39 |
- |
40 |
-+static ATOMIC_NOTIFIER_HEAD(task_migration_notifier); |
41 |
-+ |
42 |
-+void register_task_migration_notifier(struct notifier_block *n) |
43 |
-+{ |
44 |
-+ atomic_notifier_chain_register(&task_migration_notifier, n); |
45 |
-+} |
46 |
-+ |
47 |
- #ifdef CONFIG_SMP |
48 |
- void set_task_cpu(struct task_struct *p, unsigned int cpu) |
49 |
- { |
50 |
|
51 |
diff --git a/sys-kernel/ck-sources/files/bfs462-update_inittask.patch b/sys-kernel/ck-sources/files/bfs462-update_inittask.patch |
52 |
deleted file mode 100644 |
53 |
index 92321c7..00000000 |
54 |
--- a/sys-kernel/ck-sources/files/bfs462-update_inittask.patch |
55 |
+++ /dev/null |
56 |
@@ -1,30 +0,0 @@ |
57 |
-Add missing init task changes. |
58 |
- |
59 |
--ck |
60 |
- |
61 |
---- |
62 |
- include/linux/init_task.h | 4 ++++ |
63 |
- 1 file changed, 4 insertions(+) |
64 |
- |
65 |
-Index: linux-4.0.2-ck1/include/linux/init_task.h |
66 |
-=================================================================== |
67 |
---- linux-4.0.2-ck1.orig/include/linux/init_task.h 2015-05-08 09:03:54.922287214 +1000 |
68 |
-+++ linux-4.0.2-ck1/include/linux/init_task.h 2015-05-08 14:09:52.046246570 +1000 |
69 |
-@@ -200,6 +200,9 @@ extern struct task_group root_task_group |
70 |
- .cpus_allowed = CPU_MASK_ALL, \ |
71 |
- .mm = NULL, \ |
72 |
- .active_mm = &init_mm, \ |
73 |
-+ .restart_block = { \ |
74 |
-+ .fn = do_no_restart_syscall, \ |
75 |
-+ }, \ |
76 |
- .run_list = LIST_HEAD_INIT(tsk.run_list), \ |
77 |
- .time_slice = HZ, \ |
78 |
- .tasks = LIST_HEAD_INIT(tsk.tasks), \ |
79 |
-@@ -243,6 +246,7 @@ extern struct task_group root_task_group |
80 |
- INIT_FTRACE_GRAPH \ |
81 |
- INIT_TRACE_RECURSION \ |
82 |
- INIT_TASK_RCU_PREEMPT(tsk) \ |
83 |
-+ INIT_KASAN(tsk) \ |
84 |
- } |
85 |
- #else /* CONFIG_SCHED_BFS */ |
86 |
- #define INIT_TASK_COMM "swapper" |
87 |
|
88 |
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 |
89 |
deleted file mode 100644 |
90 |
index 0414c31..00000000 |
91 |
--- a/sys-kernel/ck-sources/files/ck-sources-3.4-3.5-PostCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch |
92 |
+++ /dev/null |
93 |
@@ -1,36 +0,0 @@ |
94 |
-diff -Naur a/include/linux/init_task.h b/include/linux/init_task.h |
95 |
---- a/include/linux/init_task.h 2012-10-09 14:42:04.000000000 +0200 |
96 |
-+++ b/include/linux/init_task.h 2012-10-08 18:14:11.000000000 +0200 |
97 |
-@@ -123,6 +123,8 @@ |
98 |
- |
99 |
- extern struct cred init_cred; |
100 |
- |
101 |
-+#ifndef CONFIG_SCHED_BFS |
102 |
-+ |
103 |
- extern struct task_group root_task_group; |
104 |
- |
105 |
- #ifdef CONFIG_CGROUP_SCHED |
106 |
-@@ -132,6 +134,8 @@ |
107 |
- # define INIT_CGROUP_SCHED(tsk) |
108 |
- #endif |
109 |
- |
110 |
-+#endif |
111 |
-+ |
112 |
- #ifdef CONFIG_PERF_EVENTS |
113 |
- # define INIT_PERF_EVENTS(tsk) \ |
114 |
- .perf_event_mutex = \ |
115 |
-diff -Naur a/include/linux/sched.h b/include/linux/sched.h |
116 |
---- a/include/linux/sched.h 2012-10-09 14:42:04.000000000 +0200 |
117 |
-+++ b/include/linux/sched.h 2012-10-08 18:36:50.000000000 +0200 |
118 |
-@@ -1264,6 +1264,11 @@ |
119 |
- const struct sched_class *sched_class; |
120 |
- struct sched_entity se; |
121 |
- struct sched_rt_entity rt; |
122 |
-+ |
123 |
-+#ifdef CONFIG_CGROUP_SCHED |
124 |
-+ struct task_group *sched_task_group; |
125 |
-+#endif |
126 |
-+ |
127 |
- #endif |
128 |
- |
129 |
- #ifdef CONFIG_PREEMPT_NOTIFIERS |
130 |
|
131 |
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 |
132 |
deleted file mode 100644 |
133 |
index d95953b..00000000 |
134 |
--- a/sys-kernel/ck-sources/files/ck-sources-3.4-3.5-PreCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P4.patch |
135 |
+++ /dev/null |
136 |
@@ -1,13 +0,0 @@ |
137 |
-diff -u -r a/include/linux/sched.h b/include/linux/sched.h |
138 |
---- a/include/linux/sched.h 2012-10-03 02:54:00.000000000 +0200 |
139 |
-+++ b/include/linux/sched.h 2012-07-21 22:58:29.000000000 +0200 |
140 |
-@@ -1244,9 +1244,6 @@ |
141 |
- const struct sched_class *sched_class; |
142 |
- struct sched_entity se; |
143 |
- struct sched_rt_entity rt; |
144 |
--#ifdef CONFIG_CGROUP_SCHED |
145 |
-- struct task_group *sched_task_group; |
146 |
--#endif |
147 |
- |
148 |
- #ifdef CONFIG_PREEMPT_NOTIFIERS |
149 |
- /* list of struct preempt_notifier: */ |
150 |
|
151 |
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 |
152 |
deleted file mode 100644 |
153 |
index e5e673d..00000000 |
154 |
--- a/sys-kernel/ck-sources/files/ck-sources-3.4.81-update_cpu_load-aCOSwt_P9.patch |
155 |
+++ /dev/null |
156 |
@@ -1,13 +0,0 @@ |
157 |
---- kernel/sched/bfs.000 2014-02-25 23:02:00.000000000 +0100 |
158 |
-+++ kernel/sched/bfs.c 2014-02-25 23:04:49.000000000 +0100 |
159 |
-@@ -2599,6 +2599,10 @@ |
160 |
- void calc_load_exit_idle(void) |
161 |
- { |
162 |
- } |
163 |
-+ |
164 |
-+void update_cpu_load_nohz(void) |
165 |
-+{ |
166 |
-+} |
167 |
- #endif /* CONFIG_NO_HZ */ |
168 |
- |
169 |
- /* |
170 |
|
171 |
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 |
172 |
deleted file mode 100644 |
173 |
index f3de929..00000000 |
174 |
--- a/sys-kernel/ck-sources/files/ck-sources-3.4.9-calc_load_idle-aCOSwt_P3.patch |
175 |
+++ /dev/null |
176 |
@@ -1,19 +0,0 @@ |
177 |
---- kernel/sched/bfs.c.000 2012-09-06 09:05:05.000000000 +0200 |
178 |
-+++ kernel/sched/bfs.c 2012-09-06 09:06:07.000000000 +0200 |
179 |
-@@ -2591,6 +2591,16 @@ |
180 |
- { |
181 |
- } |
182 |
- |
183 |
-+#ifdef CONFIG_NO_HZ |
184 |
-+void calc_load_enter_idle(void) |
185 |
-+{ |
186 |
-+} |
187 |
-+ |
188 |
-+void calc_load_exit_idle(void) |
189 |
-+{ |
190 |
-+} |
191 |
-+#endif /* CONFIG_NO_HZ */ |
192 |
-+ |
193 |
- /* |
194 |
- * Account guest cpu time to a process. |
195 |
- * @p: the process that the cpu time gets accounted to |