aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/Makefile
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-11-15 11:14:39 -0500
committerIngo Molnar <mingo@elte.hu>2011-11-17 06:20:22 -0500
commit391e43da797a96aeb65410281891f6d0b0e9611c (patch)
tree0ce6784525a5a8f75b377170cf1a7d60abccea29 /kernel/Makefile
parent029632fbb7b7c9d85063cc9eb470de6c54873df3 (diff)
sched: Move all scheduler bits into kernel/sched/
There's too many sched*.[ch] files in kernel/, give them their own directory. (No code changed, other than Makefile glue added.) Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/Makefile')
-rw-r--r--kernel/Makefile20
1 files changed, 3 insertions, 17 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index 1a4d37d7f39a..f70396e5a24b 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -9,14 +9,9 @@ obj-y = fork.o exec_domain.o panic.o printk.o \
9 rcupdate.o extable.o params.o posix-timers.o \ 9 rcupdate.o extable.o params.o posix-timers.o \
10 kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \ 10 kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
11 hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \ 11 hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \
12 notifier.o ksysfs.o sched_clock.o cred.o \ 12 notifier.o ksysfs.o cred.o \
13 async.o range.o groups.o 13 async.o range.o groups.o
14 14
15obj-y += sched.o sched_idletask.o sched_fair.o sched_rt.o sched_stoptask.o
16obj-$(CONFIG_SCHED_AUTOGROUP) += sched_autogroup.o
17obj-$(CONFIG_SCHEDSTATS) += sched_stats.o
18obj-$(CONFIG_SCHED_DEBUG) += sched_debug.o
19
20ifdef CONFIG_FUNCTION_TRACER 15ifdef CONFIG_FUNCTION_TRACER
21# Do not trace debug files and internal ftrace files 16# Do not trace debug files and internal ftrace files
22CFLAGS_REMOVE_lockdep.o = -pg 17CFLAGS_REMOVE_lockdep.o = -pg
@@ -24,10 +19,11 @@ CFLAGS_REMOVE_lockdep_proc.o = -pg
24CFLAGS_REMOVE_mutex-debug.o = -pg 19CFLAGS_REMOVE_mutex-debug.o = -pg
25CFLAGS_REMOVE_rtmutex-debug.o = -pg 20CFLAGS_REMOVE_rtmutex-debug.o = -pg
26CFLAGS_REMOVE_cgroup-debug.o = -pg 21CFLAGS_REMOVE_cgroup-debug.o = -pg
27CFLAGS_REMOVE_sched_clock.o = -pg
28CFLAGS_REMOVE_irq_work.o = -pg 22CFLAGS_REMOVE_irq_work.o = -pg
29endif 23endif
30 24
25obj-y += sched/
26
31obj-$(CONFIG_FREEZER) += freezer.o 27obj-$(CONFIG_FREEZER) += freezer.o
32obj-$(CONFIG_PROFILING) += profile.o 28obj-$(CONFIG_PROFILING) += profile.o
33obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o 29obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
@@ -103,7 +99,6 @@ obj-$(CONFIG_TRACING) += trace/
103obj-$(CONFIG_X86_DS) += trace/ 99obj-$(CONFIG_X86_DS) += trace/
104obj-$(CONFIG_RING_BUFFER) += trace/ 100obj-$(CONFIG_RING_BUFFER) += trace/
105obj-$(CONFIG_TRACEPOINTS) += trace/ 101obj-$(CONFIG_TRACEPOINTS) += trace/
106obj-$(CONFIG_SMP) += sched_cpupri.o
107obj-$(CONFIG_IRQ_WORK) += irq_work.o 102obj-$(CONFIG_IRQ_WORK) += irq_work.o
108obj-$(CONFIG_CPU_PM) += cpu_pm.o 103obj-$(CONFIG_CPU_PM) += cpu_pm.o
109 104
@@ -114,15 +109,6 @@ obj-$(CONFIG_PADATA) += padata.o
114obj-$(CONFIG_CRASH_DUMP) += crash_dump.o 109obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
115obj-$(CONFIG_JUMP_LABEL) += jump_label.o 110obj-$(CONFIG_JUMP_LABEL) += jump_label.o
116 111
117ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
118# According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is
119# needed for x86 only. Why this used to be enabled for all architectures is beyond
120# me. I suspect most platforms don't need this, but until we know that for sure
121# I turn this off for IA-64 only. Andreas Schwab says it's also needed on m68k
122# to get a correct value for the wait-channel (WCHAN in ps). --davidm
123CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer
124endif
125
126$(obj)/configs.o: $(obj)/config_data.h 112$(obj)/configs.o: $(obj)/config_data.h
127 113
128# config_data.h contains the same information as ikconfig.h but gzipped. 114# config_data.h contains the same information as ikconfig.h but gzipped.