---

yaml --- r: 277379 b: refs/heads/master c: 391e43d h: refs/heads/master i: 277377: 2d82b50 277375: b37a1d9 v: v3
git-mirror · Nov 17, 2011 · 840f86e · 840f86e
1 parent 7a02268
commit 840f86e
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 29 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 029632fbb7b7c9d85063cc9eb470de6c54873df3
+refs/heads/master: 391e43da797a96aeb65410281891f6d0b0e9611c
diff --git a/trunk/kernel/Makefile b/trunk/kernel/Makefile
@@ -9,25 +9,21 @@ obj-y     = fork.o exec_domain.o panic.o printk.o \
 	    rcupdate.o extable.o params.o posix-timers.o \
 	    kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
 	    hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \
-	    notifier.o ksysfs.o sched_clock.o cred.o \
+	    notifier.o ksysfs.o cred.o \
 	    async.o range.o groups.o
 
-obj-y += sched.o sched_idletask.o sched_fair.o sched_rt.o sched_stoptask.o
-obj-$(CONFIG_SCHED_AUTOGROUP) += sched_autogroup.o
-obj-$(CONFIG_SCHEDSTATS) += sched_stats.o
-obj-$(CONFIG_SCHED_DEBUG) += sched_debug.o
-
 ifdef CONFIG_FUNCTION_TRACER
 # Do not trace debug files and internal ftrace files
 CFLAGS_REMOVE_lockdep.o = -pg
 CFLAGS_REMOVE_lockdep_proc.o = -pg
 CFLAGS_REMOVE_mutex-debug.o = -pg
 CFLAGS_REMOVE_rtmutex-debug.o = -pg
 CFLAGS_REMOVE_cgroup-debug.o = -pg
-CFLAGS_REMOVE_sched_clock.o = -pg
 CFLAGS_REMOVE_irq_work.o = -pg
 endif
 
+obj-y += sched/
+
 obj-$(CONFIG_FREEZER) += freezer.o
 obj-$(CONFIG_PROFILING) += profile.o
 obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
@@ -103,7 +99,6 @@ obj-$(CONFIG_TRACING) += trace/
 obj-$(CONFIG_X86_DS) += trace/
 obj-$(CONFIG_RING_BUFFER) += trace/
 obj-$(CONFIG_TRACEPOINTS) += trace/
-obj-$(CONFIG_SMP) += sched_cpupri.o
 obj-$(CONFIG_IRQ_WORK) += irq_work.o
 obj-$(CONFIG_CPU_PM) += cpu_pm.o
 
@@ -114,15 +109,6 @@ obj-$(CONFIG_PADATA) += padata.o
 obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
 obj-$(CONFIG_JUMP_LABEL) += jump_label.o
 
-ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
-# According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is
-# needed for x86 only.  Why this used to be enabled for all architectures is beyond
-# me.  I suspect most platforms don't need this, but until we know that for sure
-# I turn this off for IA-64 only.  Andreas Schwab says it's also needed on m68k
-# to get a correct value for the wait-channel (WCHAN in ps). --davidm
-CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer
-endif
-
 $(obj)/configs.o: $(obj)/config_data.h
 
 # config_data.h contains the same information as ikconfig.h but gzipped.

diff --git a/trunk/kernel/sched/Makefile b/trunk/kernel/sched/Makefile
@@ -0,0 +1,20 @@
+ifdef CONFIG_FUNCTION_TRACER
+CFLAGS_REMOVE_clock.o = -pg
+endif
+
+ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
+# According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is
+# needed for x86 only.  Why this used to be enabled for all architectures is beyond
+# me.  I suspect most platforms don't need this, but until we know that for sure
+# I turn this off for IA-64 only.  Andreas Schwab says it's also needed on m68k
+# to get a correct value for the wait-channel (WCHAN in ps). --davidm
+CFLAGS_core.o := $(PROFILING) -fno-omit-frame-pointer
+endif
+
+obj-y += core.o clock.o idle_task.o fair.o rt.o stop_task.o
+obj-$(CONFIG_SMP) += cpupri.o
+obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o
+obj-$(CONFIG_SCHEDSTATS) += stats.o
+obj-$(CONFIG_SCHED_DEBUG) += debug.o
+
+
diff --git a/trunk/kernel/sched_autogroup.c → trunk/kernel/sched/auto_group.c b/trunk/kernel/sched_autogroup.c → trunk/kernel/sched/auto_group.c
diff --git a/trunk/kernel/sched_autogroup.h → trunk/kernel/sched/auto_group.h b/trunk/kernel/sched_autogroup.h → trunk/kernel/sched/auto_group.h
diff --git a/trunk/kernel/sched_clock.c → trunk/kernel/sched/clock.c b/trunk/kernel/sched_clock.c → trunk/kernel/sched/clock.c
diff --git a/trunk/kernel/sched.c → trunk/kernel/sched/core.c b/trunk/kernel/sched.c → trunk/kernel/sched/core.c
@@ -1,5 +1,5 @@
 /*
- *  kernel/sched.c
+ *  kernel/sched/core.c
  *
  *  Kernel scheduler and related syscalls
  *
@@ -79,7 +79,7 @@
 #endif
 
 #include "sched.h"
-#include "workqueue_sched.h"
+#include "../workqueue_sched.h"
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/sched.h>
@@ -129,7 +129,7 @@ void update_rq_clock(struct rq *rq)
 	(1UL << __SCHED_FEAT_##name) * enabled |
 
 const_debug unsigned int sysctl_sched_features =
-#include "sched_features.h"
+#include "features.h"
 	0;
 
 #undef SCHED_FEAT
@@ -139,7 +139,7 @@ const_debug unsigned int sysctl_sched_features =
 	#name ,
 
 static __read_mostly char *sched_feat_names[] = {
-#include "sched_features.h"
+#include "features.h"
 	NULL
 };
 

diff --git a/trunk/kernel/sched_cpupri.c → trunk/kernel/sched/cpupri.c b/trunk/kernel/sched_cpupri.c → trunk/kernel/sched/cpupri.c
@@ -1,5 +1,5 @@
 /*
- *  kernel/sched_cpupri.c
+ *  kernel/sched/cpupri.c
  *
  *  CPU priority management
  *
@@ -28,7 +28,7 @@
  */
 
 #include <linux/gfp.h>
-#include "sched_cpupri.h"
+#include "cpupri.h"
 
 /* Convert between a 140 based task->prio, and our 102 based cpupri */
 static int convert_prio(int prio)

diff --git a/trunk/kernel/sched_cpupri.h → trunk/kernel/sched/cpupri.h b/trunk/kernel/sched_cpupri.h → trunk/kernel/sched/cpupri.h
diff --git a/trunk/kernel/sched_debug.c → trunk/kernel/sched/debug.c b/trunk/kernel/sched_debug.c → trunk/kernel/sched/debug.c
@@ -1,5 +1,5 @@
 /*
- * kernel/time/sched_debug.c
+ * kernel/sched/debug.c
  *
  * Print the CFS rbtree
  *

diff --git a/trunk/kernel/sched_fair.c → trunk/kernel/sched/fair.c b/trunk/kernel/sched_fair.c → trunk/kernel/sched/fair.c
diff --git a/trunk/kernel/sched_features.h → trunk/kernel/sched/features.h b/trunk/kernel/sched_features.h → trunk/kernel/sched/features.h
diff --git a/trunk/kernel/sched_idletask.c → trunk/kernel/sched/idle_task.c b/trunk/kernel/sched_idletask.c → trunk/kernel/sched/idle_task.c
diff --git a/trunk/kernel/sched_rt.c → trunk/kernel/sched/rt.c b/trunk/kernel/sched_rt.c → trunk/kernel/sched/rt.c
diff --git a/trunk/kernel/sched.h → trunk/kernel/sched/sched.h b/trunk/kernel/sched.h → trunk/kernel/sched/sched.h
@@ -4,7 +4,7 @@
 #include <linux/spinlock.h>
 #include <linux/stop_machine.h>
 
-#include "sched_cpupri.h"
+#include "cpupri.h"
 
 extern __read_mostly int scheduler_running;
 
@@ -507,8 +507,8 @@ DECLARE_PER_CPU(struct rq, runqueues);
 #define cpu_curr(cpu)		(cpu_rq(cpu)->curr)
 #define raw_rq()		(&__raw_get_cpu_var(runqueues))
 
-#include "sched_stats.h"
-#include "sched_autogroup.h"
+#include "stats.h"
+#include "auto_group.h"
 
 #ifdef CONFIG_CGROUP_SCHED
 
@@ -590,7 +590,7 @@ extern const_debug unsigned int sysctl_sched_features;
 	__SCHED_FEAT_##name ,
 
 enum {
-#include "sched_features.h"
+#include "features.h"
 };
 
 #undef SCHED_FEAT

diff --git a/trunk/kernel/sched_stats.c → trunk/kernel/sched/stats.c b/trunk/kernel/sched_stats.c → trunk/kernel/sched/stats.c
diff --git a/trunk/kernel/sched_stats.h → trunk/kernel/sched/stats.h b/trunk/kernel/sched_stats.h → trunk/kernel/sched/stats.h
diff --git a/trunk/kernel/sched_stoptask.c → trunk/kernel/sched/stop_task.c b/trunk/kernel/sched_stoptask.c → trunk/kernel/sched/stop_task.c