Linux build and configuration cleanup.
authorAnselm Busse <anselm.busse@tu-berlin.de>
Sun, 21 Feb 2016 18:06:38 +0000 (19:06 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Sun, 21 Feb 2016 18:06:38 +0000 (19:06 +0100)
framework/os/linux/Makefile
framework/os/linux/linux_sched.c
linux/kernel-4.4.0-config

index 7f8ba21..0124c89 100644 (file)
@@ -1,9 +1,9 @@
 KBUILD_CFLAGS += -DFW_OS_LINUX
-KBUILD_CFLAGS += -Ikernel/sched/cobas/fw/include \
-                                -Ikernel/sched/cobas/fw/include/generated \
-                                -Ikernel/sched/cobas/fw/lib/include \
-                                -Ikernel/sched/cobas/fw/fw/include \
-                                -Ikernel/sched/cobas/fw/components/include
+KBUILD_CFLAGS += -Ikernel/sched/cobas/include \
+                                -Ikernel/sched/cobas/include/generated \
+                                -Ikernel/sched/cobas/lib/include \
+                                -Ikernel/sched/cobas/fw/include \
+                                -Ikernel/sched/cobas/components/include
 
 obj-y += linux_sched.o os.o os_syscall.o
 obj-y += ../../fw/fw_comm.o \
index 25e5162..60eacc2 100644 (file)
 #include <topics/unblock.h>
 #include <topics/affinity.h>
 
+struct kernel_cpustat *kcpustat;
+
+void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut, cputime_t *st)
+{
+       return;
+}
+
+/*
+ * Accumulate raw cputime values of dead tasks (sig->[us]time) and live
+ * tasks (sum on group iteration) belonging to @tsk's group.
+ */
+void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times)
+{
+       return;
+}
+
+void task_cputime_adjusted(struct task_struct *p, cputime_t *ut, cputime_t *st)
+{
+       return;
+}
+
+
 unsigned int smp_started;
 
 /*
index 365e558..1c482f8 100644 (file)
@@ -458,6 +458,27 @@ CONFIG_MODIFY_LDT_SYSCALL=y
 CONFIG_HAVE_LIVEPATCH=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
+#
+# Scheduler
+#
+CONFIG_MOD_SCHED=y
+# CONFIG_CFS_SCHED is not set
+# CONFIG_TOPO_RR_SINGLE is not set
+# CONFIG_TOPO_LB_RR_SINGLE is not set
+# CONFIG_TOPO_LB_RR_DUAL is not set
+# CONFIG_TOPO_LB_RR_FCFS is not set
+# CONFIG_TOPO_LB_RR_QUAD is not set
+CONFIG_TOPO_LB_RR_MULTI=y
+
+#
+# Modules
+#
+# CONFIG_MOD_TEMPLATE is not set
+CONFIG_MOD_ROUND_ROBIN=y
+# CONFIG_MOD_FCFS is not set
+CONFIG_MOD_LOAD_BALANCING=y
+CONFIG_MOD_AFFINITIES=y
+
 #
 # Power management and ACPI options
 #
@@ -2157,23 +2178,6 @@ CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 CONFIG_X86_DEBUG_FPU=y
 # CONFIG_PUNIT_ATOM_DEBUG is not set
-CONFIG_MOD_SCHED=y
-# CONFIG_CFS_SCHED is not set
-# CONFIG_TOPO_RR_SINGLE is not set
-# CONFIG_TOPO_LB_RR_SINGLE is not set
-# CONFIG_TOPO_LB_RR_DUAL is not set
-# CONFIG_TOPO_LB_RR_FCFS is not set
-# CONFIG_TOPO_LB_RR_QUAD is not set
-CONFIG_TOPO_LB_RR_MULTI=y
-
-#
-# Modules
-#
-# CONFIG_MOD_TEMPLATE is not set
-CONFIG_MOD_ROUND_ROBIN=y
-# CONFIG_MOD_FCFS is not set
-CONFIG_MOD_LOAD_BALANCING=y
-CONFIG_MOD_AFFINITIES=y
 
 #
 # Security options