Merge tag 'v3.15' into p/abusse/merge_upgrade
[projects/modsched/linux.git] / Makefile
index 6d1e304..6be587a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -394,7 +394,6 @@ KBUILD_CPPFLAGS := -D__KERNEL__
 
 KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
                   -fno-strict-aliasing -fno-common \
-                  -Werror-implicit-function-declaration \
                   -Wno-format-security \
                   $(call cc-option,-fno-delete-null-pointer-checks,)
 KBUILD_AFLAGS_KERNEL :=
@@ -1520,3 +1519,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
+