Merge tag 'v3.18' into p/abusse/merge_upgrade
[projects/modsched/linux.git] / kernel / sched / idle.c
index c47fce7..d00c2d7 100644 (file)
 
 #include <trace/events/power.h>
 
 
 #include <trace/events/power.h>
 
-#include "sched.h"
+#ifdef CONFIG_MOD_SCHED
+#include <os/linux.h>
+#else
+#include "cfs/sched.h"
+#endif
 
 static int __read_mostly cpu_idle_force_poll;
 
 
 static int __read_mostly cpu_idle_force_poll;