diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
commit | 506c10f26c481b7f8ef27c1c79290f68989b2e9e (patch) | |
tree | 03de82e812f00957aa6276dac2fe51c3358e88d7 /kernel/Makefile | |
parent | e1df957670aef74ffd9a4ad93e6d2c90bf6b4845 (diff) | |
parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) |
Merge commit 'v2.6.29-rc1' into perfcounters/core
Conflicts:
include/linux/kernel_stat.h
Diffstat (limited to 'kernel/Makefile')
-rw-r--r-- | kernel/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 4476da868f86..8b2628c7914b 100644 --- a/kernel/Makefile +++ b/kernel/Makefile | |||
@@ -9,7 +9,8 @@ obj-y = sched.o 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 pm_qos_params.o sched_clock.o cred.o | 12 | notifier.o ksysfs.o pm_qos_params.o sched_clock.o cred.o \ |
13 | async.o | ||
13 | 14 | ||
14 | ifdef CONFIG_FUNCTION_TRACER | 15 | ifdef CONFIG_FUNCTION_TRACER |
15 | # Do not trace debug files and internal ftrace files | 16 | # Do not trace debug files and internal ftrace files |
@@ -73,10 +74,10 @@ obj-$(CONFIG_GENERIC_HARDIRQS) += irq/ | |||
73 | obj-$(CONFIG_SECCOMP) += seccomp.o | 74 | obj-$(CONFIG_SECCOMP) += seccomp.o |
74 | obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o | 75 | obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o |
75 | obj-$(CONFIG_CLASSIC_RCU) += rcuclassic.o | 76 | obj-$(CONFIG_CLASSIC_RCU) += rcuclassic.o |
77 | obj-$(CONFIG_TREE_RCU) += rcutree.o | ||
76 | obj-$(CONFIG_PREEMPT_RCU) += rcupreempt.o | 78 | obj-$(CONFIG_PREEMPT_RCU) += rcupreempt.o |
77 | ifeq ($(CONFIG_PREEMPT_RCU),y) | 79 | obj-$(CONFIG_TREE_RCU_TRACE) += rcutree_trace.o |
78 | obj-$(CONFIG_RCU_TRACE) += rcupreempt_trace.o | 80 | obj-$(CONFIG_PREEMPT_RCU_TRACE) += rcupreempt_trace.o |
79 | endif | ||
80 | obj-$(CONFIG_RELAY) += relay.o | 81 | obj-$(CONFIG_RELAY) += relay.o |
81 | obj-$(CONFIG_SYSCTL) += utsname_sysctl.o | 82 | obj-$(CONFIG_SYSCTL) += utsname_sysctl.o |
82 | obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o | 83 | obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o |