Finish restructuring of the CoBaS code base.
authorAnselm Busse <mail@anselm-busse.de>
Sun, 21 Feb 2016 16:58:15 +0000 (17:58 +0100)
committerAnselm Busse <mail@anselm-busse.de>
Sun, 21 Feb 2016 16:58:15 +0000 (17:58 +0100)
Makefile
arch/x86/kernel/smp.c
kernel/cpu.c
kernel/sched/Makefile
kernel/sched/cfs/cpudeadline.c [moved from kernel/sched/cpudeadline.c with 100% similarity]
kernel/sched/cfs/cpudeadline.h [moved from kernel/sched/cpudeadline.h with 100% similarity]
kernel/sched/cfs/deadline.c [moved from kernel/sched/deadline.c with 100% similarity]
kernel/sched/cfs/loadavg.c [moved from kernel/sched/loadavg.c with 100% similarity]
kernel/sched/idle.c

index 6199e91..e2cdd97 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1594,9 +1594,3 @@ FORCE:
 # information in a variable so we can use it in if_changed and friends.
 .PHONY: $(PHONY)
 
-ifeq ($(CONFIG_MOD_SCHED), y)
-KBUILD_CFLAGS += -DFW_OS_LINUX
-KBUILD_CFLAGS += -Ikernel/sched/modsched/framework/include \
-                                -Ikernel/sched/modsched/framework/include/generated 
-endif
-
index 12c8286..d6faeac 100644 (file)
@@ -122,7 +122,7 @@ static bool smp_no_nmi_ipi = false;
 static void native_smp_send_reschedule(int cpu)
 {
        if (unlikely(cpu_is_offline(cpu))) {
-               WARN_ON(1);
+               //WARN_ON(1);
                return;
        }
        apic->send_IPI_mask(cpumask_of(cpu), RESCHEDULE_VECTOR);
index 934c143..1889e13 100644 (file)
@@ -25,7 +25,8 @@
 #include <trace/events/power.h>
 
 #ifdef CONFIG_MOD_SCHED
-    #include <fw_comm.h>
+    #include "sched/cobas/fw/fw/include/fw_comm.h"
+       #include "sched/cobas/fw/fw/include/topics/cpu_status.h"
 #endif
 
 #include "smpboot.h"
@@ -542,6 +543,10 @@ int cpu_up(unsigned int cpu)
 {
        int err = 0;
 
+#ifdef CONFIG_MOD_SCHED
+       fw_cpu_status_msg_t msg = {cpu, ONLINE};
+#endif
+
        if (!cpu_possible(cpu)) {
                pr_err("can't online cpu %d because it is not configured as may-hotadd at boot time\n",
                       cpu);
@@ -566,7 +571,7 @@ int cpu_up(unsigned int cpu)
 
 #ifdef CONFIG_MOD_SCHED
        if(!err)
-               fw_notify(FW_CPU_ONLINE,&cpu);
+               fw_notify(FW_TOPIC_CPU_STATUS, &msg);
 #endif
 
 out:
index 07cc707..59d516e 100644 (file)
@@ -5,4 +5,4 @@ obj-y += wait.o completion.o idle.o
 obj-$(CONFIG_SCHED_DEBUG) += debug.o
 obj-$(CONFIG_CGROUP_CPUACCT) += cpuacct.o
 obj-$(CONFIG_CFS_SCHED) += cfs/
-obj-$(CONFIG_MOD_SCHED) += modsched/
+obj-$(CONFIG_MOD_SCHED) += cobas/
index 789cd34..464fb7b 100644 (file)
@@ -14,7 +14,7 @@
 #include <trace/events/power.h>
 
 #ifdef CONFIG_MOD_SCHED
-#include <os/linux.h>
+#include "cobas/fw/os/linux/linux_sched.h"
 #else
 #include "cfs/sched.h"
 #endif