Added included framework in Linux Makefile and added fw_task in task_struct p/jkrieg/master
authorJens Krieg <jkrieg@mailbox.tu-berlin.de>
Wed, 16 Apr 2014 12:26:34 +0000 (14:26 +0200)
committerJens Krieg <jkrieg@mailbox.tu-berlin.de>
Wed, 16 Apr 2014 12:26:34 +0000 (14:26 +0200)
Makefile
include/linux/sched.h
kernel/sched/modsched/Makefile

index 8fe6991..6115b2b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1429,3 +1429,10 @@ FORCE:
 # Declare the contents of the .PHONY variable as phony.  We keep that
 # 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 fadb104..561386b 100644 (file)
@@ -55,6 +55,10 @@ struct sched_param {
 
 #include <asm/processor.h>
 
+#ifdef CONFIG_MOD_SCHED
+#include <fw_task.h>
+#endif
+
 struct exec_domain;
 struct futex_pi_state;
 struct robust_list_head;
@@ -1578,6 +1582,9 @@ struct task_struct {
 #ifdef CONFIG_UPROBES
        struct uprobe_task *utask;
 #endif
+#ifdef CONFIG_MOD_SCHED
+       struct fw_task fw_task;
+#endif
 };
 
 /* Future-safe accessor for struct task_struct's cpus_allowed. */
index 8b056af..30493d8 100644 (file)
@@ -13,8 +13,4 @@ endif
 
 obj-y += core.o clock.o cputime.o
 
-KBUILD_CFLAGS += -DFW_OS_LINUX
-KBUILD_CFLAGS +=       -Ikernel/sched/modsched/framework/include \
-                                       -Ikernel/sched/modsched/framework/include/generated 
-
 obj-y += framework/os/linux/