+++ /dev/null
-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)
- {
+++ /dev/null
-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"
+++ /dev/null
-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
+++ /dev/null
-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: */
+++ /dev/null
---- 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 */
-
- /*
+++ /dev/null
---- 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