diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 16:11:02 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 16:11:02 +0200 |
commit | d14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8 (patch) | |
tree | 38cead29b9b34b9d26b5cfe7b2c2673d6f7ac052 /kernel/Makefile | |
parent | d59fdcf2ac501de99c3dfb452af5e254d4342886 (diff) | |
parent | 873a6ed6288b6c2c0d2cc84d3b2bf2fab9ba0181 (diff) | |
download | op-kernel-dev-d14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8.zip op-kernel-dev-d14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8.tar.gz |
Merge branch 'sched/for-linus' into tracing/for-linus
Diffstat (limited to 'kernel/Makefile')
-rw-r--r-- | kernel/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 1c9938a..6c55301 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -3,7 +3,7 @@ # obj-y = sched.o fork.o exec_domain.o panic.o printk.o profile.o \ - exit.o itimer.o time.o softirq.o resource.o \ + cpu.o exit.o itimer.o time.o softirq.o resource.o \ sysctl.o capability.o ptrace.o timer.o user.o \ signal.o sys.o kmod.o workqueue.o pid.o \ rcupdate.o extable.o params.o posix-timers.o \ @@ -27,7 +27,7 @@ obj-$(CONFIG_RT_MUTEXES) += rtmutex.o obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o -obj-$(CONFIG_SMP) += cpu.o spinlock.o +obj-$(CONFIG_SMP) += spinlock.o obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o obj-$(CONFIG_PROVE_LOCKING) += spinlock.o obj-$(CONFIG_UID16) += uid16.o @@ -69,6 +69,7 @@ obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o obj-$(CONFIG_MARKERS) += marker.o obj-$(CONFIG_LATENCYTOP) += latencytop.o +obj-$(CONFIG_SMP) += sched_cpupri.o ifneq ($(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER),y) # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is |